- Alba-desarrollo - lists.ourproject.org

SVN Alba r4285 - in prosistem/alba/trunk/alba/apps/principal: modules/ciclolectivo/actions modules/ciclolectivo/templates modules/seguridad/actions modules/turnos/actions modules/turnos/config modules/turnos/templates modules/turnos/validate templates
by commits＠pressenter.com.ar 23 Feb '07

23 Feb '07

Author: ftoledo Date: 2007-02-23 13:54:12 -0300 (Fri, 23 Feb 2007) New Revision: 4285 Modified: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/cambiarSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/turnos/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/turnos/templates/_hora_fin.php prosistem/alba/trunk/alba/apps/principal/modules/turnos/templates/_hora_inicio.php prosistem/alba/trunk/alba/apps/principal/modules/turnos/validate/edit.yml prosistem/alba/trunk/alba/apps/principal/templates/layout.php Log: validando ciclo lectivo y turnos Modified: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php 2007-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php 2007-02-23 16:54:12 UTC (rev 4285) @@ -254,7 +254,23 @@ return $this->redirect($this->getRequestParameter('referer', '@homepage')); } - + + /** + * Elimino el ciclo lectivo si es el actual + * el usuario debe quedar con ciclolectivo "No seleccionado" + */ + public function executeDelete () { + + $this->ciclolectivo = CiclolectivoPeer::retrieveByPk($this->getRequestParameter('id')); + $this->forward404Unless($this->ciclolectivo); + + $this->deleteCiclolectivo($this->ciclolectivo); + if ($this->getUser()->getAttribute('fk_ciclolectivo_id') == $this->getRequestParameter('id')) { + $this->getUser()->setAttribute('fk_ciclolectivo_id',0); + $this->getUser()->setAttribute('ciclolectivo_descripcion','No seleccionado'); + } + return $this->redirect('ciclolectivo/list'); + } } -?> +?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/cambiarSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/cambiarSuccess.php 2007-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/cambiarSuccess.php 2007-02-23 16:54:12 UTC (rev 4285) @@ -1,12 +1,16 @@ <?php use_helper('Object')?> -<?php echo form_tag('ciclolectivo/actual')?> +<?php if (count($cicloslectivos) != 0) :?> + <?php echo form_tag('ciclolectivo/actual')?> - <div align="center">Seleccione el Ciclo Lectivo para administrar - <br><br> - <?php echo select_tag('ciclolectivo',objects_for_select($cicloslectivos,'getId','getDescripcion',$sf_user->getAttribute('fk_ciclolectivo_id')))?> - <?php echo input_hidden_tag('referer', $referer) ?> - <br><br> - <?php echo submit_tag('Seleccionar')?> - </div> - -</form> \ No newline at end of file + <div align="center">Seleccione el Ciclo Lectivo para administrar + <br><br> + <?php echo select_tag('ciclolectivo',objects_for_select($cicloslectivos,'getId','getDescripcion',$sf_user->getAttribute('fk_ciclolectivo_id')))?> + <?php echo input_hidden_tag('referer', $referer) ?> + <br><br> + <?php echo submit_tag('Seleccionar')?> + </div> + + </form> +<?php else: ?> + <div>Todavía no ha creado un Ciclo Lectivo?. Haga click <?php echo link_to('aquí','ciclolectivo/list')?>.</div> +<?php endif;?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php 2007-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php 2007-02-23 16:54:12 UTC (rev 4285) @@ -1,4 +1,4 @@ -<?php +<?php /** * This file is part of Alba. * @@ -22,8 +22,8 @@ * Seguridad Acciones * * @package alba - * @author Jos� Luis Di Biase <josx(a)interorganic.com.ar> - * @author H�ctor Sanchez <hsanchez(a)pressenter.com.ar> + * @author José Luis Di Biase <josx(a)interorganic.com.ar> + * @author Héctor Sanchez <hsanchez(a)pressenter.com.ar> * @author Fernando Toledo <ftoledo(a)pressenter.com.ar> * @version SVN: $Id$ * @filesource @@ -105,8 +105,10 @@ return sfView::SUCCESS; } } - else + else { + $this->referer = $this->getRequest()->getReferer(); $this->getRequest()->getParameterHolder()->set('referer', $this->getRequest()->getReferer()); + } } /* cierre de session */ Modified: prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php 2007-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php 2007-02-23 16:54:12 UTC (rev 4285) @@ -29,9 +29,7 @@ * @filesource * @license GPL */ - -class turnosActions extends autoturnosActions -{ +class turnosActions extends autoturnosActions { public function preExecute() { $this->vista = $this->getRequestParameter('vista'); } @@ -43,7 +41,6 @@ function saveTurnos($turno) { $turno->setFkCiclolectivoId($this->getUser()->getAttribute('fk_ciclolectivo_id')); $turno->save(); - } protected function updateTurnosFromRequest() { @@ -62,51 +59,14 @@ } if (isset($turnos['hora_fin'])) { - $this->turnos->setHoraFin($turnos['hora_fin']); + $this->turnos->setHoraFin($turnos['hora_fin']); } - } - + } function _add_zeros($string, $strlen) { - if ($strlen > strlen($string)) { - for ($x = strlen($string); $x < $strlen; $x++) { + if ($strlen > strlen($string)) + for ($x = strlen($string); $x < $strlen; $x++) $string = '0' . $string; - } - } return $string; } - - public function executeEdit () - { - $this->turnos = $this->getTurnosOrCreate(); - $this->turnos->setFkCiclolectivoId($this->getUser()->getAttribute('fk_ciclolectivo_id')); - if ($this->getRequest()->getMethod() == sfRequest::POST) - { - $this->turnos = $this->getTurnosOrCreate(); - - $this->updateTurnosFromRequest(); - - $this->saveTurnos($this->turnos); - - $this->setFlash('notice', 'Your modifications have been saved'); - - if ($this->getRequestParameter('save_and_add')) - { - return $this->redirect('turnos/create'); - } - else - { - return $this->redirect('turnos/edit?id='.$this->turnos->getId()); - } - } - else - { - // add javascripts - $this->getResponse()->addJavascript('/sf/js/prototype/prototype'); - $this->getResponse()->addJavascript('/sf/js/sf_admin/collapse'); - } - } - - } - ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/turnos/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/turnos/config/generator.yml 2007-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/config/generator.yml 2007-02-23 16:54:12 UTC (rev 4285) @@ -13,7 +13,6 @@ list: title: Listado de Turnos display: [=descripcion, hora_inicio, hora_fin ] - object_actions: - _edit: - - _delete: - \ No newline at end of file + _edit: - + _delete: - Modified: prosistem/alba/trunk/alba/apps/principal/modules/turnos/templates/_hora_fin.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/turnos/templates/_hora_fin.php 2007-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/templates/_hora_fin.php 2007-02-23 16:54:12 UTC (rev 4285) @@ -1 +1 @@ -<?echo select_time_tag("turnos[hora_fin]", $turnos->getHoraFin(), array('include_second' => false, '12hour_time' => true));?> \ No newline at end of file +<?php echo select_time_tag("turnos[hora_fin]", $turnos->getHoraFin(), array('include_second' => false, '12hour_time' => true));?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/turnos/templates/_hora_inicio.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/turnos/templates/_hora_inicio.php 2007-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/templates/_hora_inicio.php 2007-02-23 16:54:12 UTC (rev 4285) @@ -1 +1 @@ -<?echo select_time_tag("turnos[hora_inicio]", $turnos->getHoraInicio(), array('include_second' => false, '12hour_time' => true));?> \ No newline at end of file +<?php echo select_time_tag("turnos[hora_inicio]", $turnos->getHoraInicio(), array('include_second' => false, '12hour_time' => true));?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/turnos/validate/edit.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/turnos/validate/edit.yml 2007-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/validate/edit.yml 2007-02-23 16:54:12 UTC (rev 4285) @@ -28,5 +28,3 @@ param: max: 255 max_error: La maxima cantidad de caracteres permitida es de 255 - - Modified: prosistem/alba/trunk/alba/apps/principal/templates/layout.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-02-23 16:54:12 UTC (rev 4285) @@ -136,8 +136,11 @@ ?> </div> <?php if ($sf_user->isAuthenticated() && $sf_user->getAttribute('fk_ciclolectivo_id') == 0):?> - <div class="form-errors">No tiene un ciclo lectivo seleccionado.<br/> - Éste valor es requerido para algunos módulos, por favor seleccione uno. + <div class="form-errors"> + <ul> + <li>No tiene un ciclo lectivo seleccionado. Éste valor es requerido para algunos módulos, por favor seleccione uno. + </li> + </ul> </div> <?php endif;?> <br/>

1 0

SVN Alba r4284 - prosistem/alba/trunk/alba/apps/principal/templates
by commits＠pressenter.com.ar 23 Feb '07

23 Feb '07

Author: ftoledo Date: 2007-02-23 13:09:55 -0300 (Fri, 23 Feb 2007) New Revision: 4284 Modified: prosistem/alba/trunk/alba/apps/principal/templates/layout.php Log: salto de linea Modified: prosistem/alba/trunk/alba/apps/principal/templates/layout.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-02-23 16:06:52 UTC (rev 4283) +++ prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-02-23 16:09:55 UTC (rev 4284) @@ -135,13 +135,12 @@ } ?> </div> - <br> <?php if ($sf_user->isAuthenticated() && $sf_user->getAttribute('fk_ciclolectivo_id') == 0):?> <div class="form-errors">No tiene un ciclo lectivo seleccionado.<br/> Éste valor es requerido para algunos módulos, por favor seleccione uno. </div> <?php endif;?> - + <br/> <div id="content"><?php echo $content ?></div> </td> <td width="17" class="fder"> </td>

1 0

SVN Alba r4283 - prosistem/alba/trunk/alba/apps/principal/templates
by commits＠pressenter.com.ar 23 Feb '07

23 Feb '07

Author: ftoledo Date: 2007-02-23 13:06:52 -0300 (Fri, 23 Feb 2007) New Revision: 4283 Modified: prosistem/alba/trunk/alba/apps/principal/templates/layout.php Log: warinig para cuando el ciclo lectivo no esta seleccionado Modified: prosistem/alba/trunk/alba/apps/principal/templates/layout.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-02-23 14:54:23 UTC (rev 4282) +++ prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-02-23 16:06:52 UTC (rev 4283) @@ -3,160 +3,157 @@ if(!isset($vista)){ $vista=""; } - -if($vista == "noMuestraMenu") { - echo $content; -} else { ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/2000/REC-xhtml1-200000126/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> -<?php echo include_http_metas() ?> -<?php echo include_metas() ?> -<?php echo include_title() ?> +<?php if($vista == "noMuestraMenu"): ?> + <?php echo $content; ?> +<?php else: ?> + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/2000/REC-xhtml1-200000126/DTD/xhtml1-transitional.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> + <head> -<link rel="stylesheet" type="text/css" href="<?echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot() . '/js/jsmenu/themes/'.MENU_THEME.'/theme.css' ?>"/> -<link rel="shortcut icon" href="/favicon.ico" /> + <?php echo include_http_metas() ?> + <?php echo include_metas() ?> + <?php echo include_title() ?> -<style type="text/css"> -.fdown { - background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/index3_5x2.png"?>); -} -.fmedio { - background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fmedio.png"?>); -} -.ftop { - background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/index3_1x4.png"?>); -} -.fmenu { - background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fmenu.png"?>); -} -td { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; -} -.fizq { - background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fizq.png"?>); -} -.fizq-menu { - background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fizq-menu.png"?>); -} -.menuimg { - background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/index_2x1.png"?>); -} -.fder { - background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fder.png"?>); -} -</style> + <link rel="stylesheet" type="text/css" href="<?echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot() . '/js/jsmenu/themes/'.MENU_THEME.'/theme.css' ?>"/> + <link rel="shortcut icon" href="/favicon.ico" /> -<?php - if($vista == "imprimir") { -?><link rel="stylesheet" type="text/css" href="/~josx/alba/css/impresion.css" /><? + <style type="text/css"> + .fdown { + background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/index3_5x2.png"?>); } -?> + .fmedio { + background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fmedio.png"?>); + } + .ftop { + background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/index3_1x4.png"?>); + } + .fmenu { + background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fmenu.png"?>); + } + td { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + } + .fizq { + background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fizq.png"?>); + } + .fizq-menu { + background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fizq-menu.png"?>); + } + .menuimg { + background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/index_2x1.png"?>); + } + .fder { + background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fder.png"?>); + } + </style> -</head> -<body> + <?php if($vista == "imprimir") :?> + <link rel="stylesheet" type="text/css" href="/~josx/alba/css/impresion.css" /> + <? endif;?> -<?php - if($vista == "imprimir") { - echo $content; - } else { -?> + </head> + <body> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr valign="top"> - <td colspan="2" class="fmedio"> - <table cellpadding="0" cellspacing="0" width="100%"> - <tr> - <td class="fmedio"><?=image_tag("gui/index_1x1.png", array ( 'width' => '758' , 'heigth' => '77' ) )?></td> - <td class="fmedio" align="right"> - <?php if($sf_user->isAuthenticated() == true): ?> + <?php if($vista == "imprimir") :?> + <?php echo $content; ?> + <?php else: ?> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr valign="top"> + <td colspan="2" class="fmedio"> + <table cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td class="fmedio"><?=image_tag("gui/index_1x1.png", array ( 'width' => '758' , 'heigth' => '77' ) )?></td> + <td class="fmedio" align="right"> + <?php if($sf_user->isAuthenticated() == true): ?> - <table class="user-info"> - <tr> - <td nowrap="nowrap">Bienvenido, <a href="#" onmouseover="this.T_BGCOLOR='#d3e3f6';this.T_SHADOWWIDTH=3;this.T_FONTCOLOR='blue';this.T_BORDERWIDTH=2;this.T_BORDERCOLOR='#000000'; return escape('Organización: <?echo $sf_user->getAttribute("organizacion_nombre")?> ' )"><?php echo $sf_user->getAttribute('usuario')?></a> - <?php if (SF_DEBUG) - echo ' #'. $sf_user->getAttribute('id'); - ?> - </td> - </tr> - <tr> - <td nowrap="nowrap"><?php echo link_to($sf_user->getAttribute('establecimiento_nombre'),'establecimiento/cambiar')?> - <?php if (SF_DEBUG) - echo ' #'. $sf_user->getAttribute('fk_establecimiento_id'); - ?> - </td> - </tr> - <tr> - <td nowrap="nowrap">Ciclo: <?php echo link_to($sf_user->getAttribute('ciclolectivo_descripcion'),'ciclolectivo/cambiar')?> - <?php if (SF_DEBUG) - echo ' #'. $sf_user->getAttribute('fk_ciclolectivo_id'); - ?> - </td> - </tr> - - </table> - <?php else: ?> - Bienvenido, Anónimo - <?php endif; ?> - </td> - </tr> - </table> - </td> - - <td><?=image_tag("gui/index_1x2.png", array ( 'width' => '17' , 'heigth' => '77' ) )?></td> - </tr> + <table class="user-info"> + <tr> + <td nowrap="nowrap">Bienvenido, <a href="#" onmouseover="this.T_BGCOLOR='#d3e3f6';this.T_SHADOWWIDTH=3;this.T_FONTCOLOR='blue';this.T_BORDERWIDTH=2;this.T_BORDERCOLOR='#000000'; return escape('Organización: <?echo $sf_user->getAttribute("organizacion_nombre")?> ' )"><?php echo $sf_user->getAttribute('usuario')?></a> + <?php if (SF_DEBUG) + echo ' #'. $sf_user->getAttribute('id'); + ?> + </td> + </tr> + <tr> + <td nowrap="nowrap"><?php echo link_to($sf_user->getAttribute('establecimiento_nombre'),'establecimiento/cambiar')?> + <?php if (SF_DEBUG) + echo ' #'. $sf_user->getAttribute('fk_establecimiento_id'); + ?> + </td> + </tr> + <tr> + <td nowrap="nowrap">Ciclo: <?php echo link_to($sf_user->getAttribute('ciclolectivo_descripcion'),'ciclolectivo/cambiar')?> + <?php if (SF_DEBUG) + echo ' #'. $sf_user->getAttribute('fk_ciclolectivo_id'); + ?> + </td> + </tr> + + </table> + <?php else: ?> + Bienvenido, Anónimo + <?php endif; ?> + </td> + </tr> + </table> + </td> + + <td><?php echo image_tag("gui/index_1x2.png", array ( 'width' => '17' , 'heigth' => '77' ) )?></td> + </tr> - <tr valign="top"> - <td class="fizq-menu" width="1%"> </td> - <td colspan="1" class="fmenu"><? - if($sf_user->isAuthenticated() == true) { - include("menu.php"); - } - ?> - <div id="menu" align="right"> - <? $uri = sfRouting::getInstance()->getCurrentInternalUri(); - $vista_var = "vista=imprimir"; - $separador = (strstr($uri,'?'))?'&':'?'; - $vista_var = $separador.$vista_var; - echo link_to(image_tag(sfContext::getInstance()->getRequest()->getRelativeUrlRoot().'/images/small/print.png'),$uri.$vista_var,'popup=true'); - ?> - </div> -</td> - + <tr valign="top"> + <td class="fizq-menu" width="1%"> </td> + <td colspan="1" class="fmenu"><? + if($sf_user->isAuthenticated() == true) { + include("menu.php"); + } + ?> + <div id="menu" align="right"> + <?php $uri = sfRouting::getInstance()->getCurrentInternalUri(); + $vista_var = "vista=imprimir"; + $separador = (strstr($uri,'?'))?'&':'?'; + $vista_var = $separador.$vista_var; + echo link_to(image_tag(sfContext::getInstance()->getRequest()->getRelativeUrlRoot().'/images/small/print.png'),$uri.$vista_var,'popup=true'); + ?> + </div> + </td> + <td><?php echo image_tag("gui/index_2x2.png", array ( 'width' => '17' , 'heigth' => '35' ) )?></td> + </tr> + <tr valign="top"> + <td width="33" class="fizq"> </td> + <td width="959"> + <div id="cabecera" align="center"> + <?php + if($sf_user->isAuthenticated() != true) { + if ($sf_params->get('module') != 'seguridad' && $sf_params->get('action') !='login') { + include_partial('seguridad/login', array('sf_params' => $sf_params, 'error_inicio_sesion' => @$error_inicio_sesion)); - <td><?=image_tag("gui/index_2x2.png", array ( 'width' => '17' , 'heigth' => '35' ) )?></td> - - - </tr> - - - <tr valign="top"> - <td width="33" class="fizq"> </td> - <td width="959"> -<div id="cabecera" align="center"> -<?php - if($sf_user->isAuthenticated() != true) { - if ($sf_params->get('module') != 'seguridad' && $sf_params->get('action') !='login') { - include_partial('seguridad/login', array('sf_params' => $sf_params, 'error_inicio_sesion' => @$error_inicio_sesion)); - - } - } -?></div><br><div id="content"><?php echo $content ?></div> - </td> - <td width="17" class="fder"> </td> - </tr> - <tr valign="top"> - <td><?=image_tag("gui/index3_5x1.png", array ( 'width' => '33' , 'heigth' => '22' ) )?></td> - <td class="fdown"> </td> - <td><?=image_tag("gui/index3_5x3.png", array ( 'width' => '17' , 'heigth' => '20' ) )?></td> - </tr> - </table> - -<? } ?> -</body> -<? echo javascript_include_tag('varios/wz_tooltip.js'); ?> -</html> -<? } ?> \ No newline at end of file + } + } + ?> + </div> + <br> + <?php if ($sf_user->isAuthenticated() && $sf_user->getAttribute('fk_ciclolectivo_id') == 0):?> + <div class="form-errors">No tiene un ciclo lectivo seleccionado.<br/> + Éste valor es requerido para algunos módulos, por favor seleccione uno. + </div> + <?php endif;?> + + <div id="content"><?php echo $content ?></div> + </td> + <td width="17" class="fder"> </td> + </tr> + <tr valign="top"> + <td><?php echo image_tag("gui/index3_5x1.png", array ( 'width' => '33' , 'heigth' => '22' ) )?></td> + <td class="fdown"> </td> + <td><?php echo image_tag("gui/index3_5x3.png", array ( 'width' => '17' , 'heigth' => '20' ) )?></td> + </tr> + </table> + <?php endif; ?> + </body> + <?php echo javascript_include_tag('varios/wz_tooltip.js'); ?> + </html> +<? endif; ?> \ No newline at end of file

1 0

SVN Alba r4282 - in prosistem/alba/trunk/alba/apps/principal/modules/alumno: actions templates
by commits＠pressenter.com.ar 23 Feb '07

23 Feb '07

Author: josx Date: 2007-02-23 11:54:23 -0300 (Fri, 23 Feb 2007) New Revision: 4282 Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php Log: Arregle un error de codigo de carga de alumnos Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php 2007-02-22 22:58:15 UTC (rev 4281) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php 2007-02-23 14:54:23 UTC (rev 4282) @@ -23,8 +23,8 @@ * alumno actions. * * @package alba - * @author Jos? Luis Di Biase <josx(a)interorganic.com.ar> - * @author H?ctor Sanchez <hsanchez(a)pressenter.com.ar> + * @author José Luis Di Biase <josx(a)interorganic.com.ar> + * @author Héctor Sanchez <hsanchez(a)pressenter.com.ar> * @author Fernando Toledo <ftoledo(a)pressenter.com.ar> * @version SVN: $Id$ * @filesource Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php 2007-02-22 22:58:15 UTC (rev 4281) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php 2007-02-23 14:54:23 UTC (rev 4282) @@ -1,5 +1,5 @@ <?php - if(isset($datosCuenta)) { + if(isset($datosCuenta) and $datosCuenta) { ?> <script type="text/javascript"> function completaDatos() @@ -197,7 +197,7 @@ <h2><?php echo __('Donde vive') ?></h2> <br> <?php - if(isset($datosCuenta)) { + if(isset($datosCuenta) and $datosCuenta) { echo button_to("Cargar datos de la cuenta", "#", array("class" => "sf_admin_action_sava", "onClick" => "javascript:completaDatos()")); } ?>

1 0

[Pressenter - SVN Alba] #141: Error en la instalacion automatica
by Pressenter - SVN Alba 22 Feb '07

22 Feb '07

#141: Error en la instalacion automatica ----------------------+----------------------------------------------------- Reporter: dobetko | Owner: somebody Type: defecto | Status: new Priority: muy alta | Milestone: Component: alba | Version: Severity: critica | Keywords: ----------------------+----------------------------------------------------- luego de la instalacion automatica al entrar a principal_dev.php de una pagina en blanco y en index.php se ve la pantalla de login pero al ingresar admin admin devuelve esto... Not Found The requested URL /public_html/seguridad/login was not found on this server. -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/141> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 1

SVN Alba r4262 - prosistem/alba/trunk/alba/doc
by commits＠pressenter.com.ar 21 Feb '07

21 Feb '07

Author: verox Date: 2007-02-21 18:27:39 -0300 (Wed, 21 Feb 2007) New Revision: 4262 Modified: prosistem/alba/trunk/alba/doc/manual.odt Log: Hasta el cap. 7 completo y mejorado. Modified: prosistem/alba/trunk/alba/doc/manual.odt =================================================================== (Binary files differ)

1 0

SVN Alba r4261 - in prosistem/alba/trunk/alba/apps/principal/modules/boletin: actions templates
by commits＠pressenter.com.ar 21 Feb '07

21 Feb '07

Author: josx Date: 2007-02-21 17:12:35 -0300 (Wed, 21 Feb 2007) New Revision: 4261 Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/listConceptoSuccess.php Log: Arregle cuando grababa las notas de concepto y agrande la cantidad de caracteres que se puede entrar en texto de concepto (ticket #138) Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php 2007-02-21 19:45:58 UTC (rev 4260) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php 2007-02-21 20:12:35 UTC (rev 4261) @@ -491,9 +491,9 @@ $boletin->setFkPeriodoId($periodoid); $boletin->setFkConceptoId($concepto_id); if($nota) { - if(array_key_exists($nota[0], $aDatosTablaEscalaNota)) { - $boletin->setFkEscalanotaId($aDatosTablaEscalaNota[$nota[0]]); - } + if(array_key_exists($nota, $aDatosTablaEscalaNota)) { + $boletin->setFkEscalanotaId($aDatosTablaEscalaNota[$nota]); + } } if($aNotaObs[$alumno_id][$periodoid]) { $boletin->setObservacion($aNotaObs[$alumno_id][$periodoid]); Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/listConceptoSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/listConceptoSuccess.php 2007-02-21 19:45:58 UTC (rev 4260) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/listConceptoSuccess.php 2007-02-21 20:12:35 UTC (rev 4261) @@ -69,7 +69,7 @@ <? foreach ($aPeriodo as $periodo) {?> <td> <? echo input_tag("nota[".$alumno->getId()."][".$periodo->getId()."]", $aNotaAlumno[$alumno->getId()][$periodo->getId()], array('size' => $sizeNota, 'maxlength' => $sizeNota));?><br> - <? echo input_tag("notaObs[".$alumno->getId()."][".$periodo->getId()."]", $aNotaAlumnoObs[$alumno->getId()][$periodo->getId()], array('size' => 30, 'maxlength' => 25 ));?> + <? echo input_tag("notaObs[".$alumno->getId()."][".$periodo->getId()."]", $aNotaAlumnoObs[$alumno->getId()][$periodo->getId()], array('size' => 30, 'maxlength' => 128 ));?> </td> <? } ?> </tr>

1 0

[Pressenter - SVN Alba] #138: Boletín: ingreso de datos.
by Pressenter - SVN Alba 21 Feb '07

21 Feb '07

#138: Boletín: ingreso de datos. ------------------------------+--------------------------------------------- Reporter: verox | Owner: somebody Type: defecto horrible | Status: new Priority: normal | Milestone: Component: alba-boletin | Version: Severity: mayor | Keywords: ------------------------------+--------------------------------------------- Cuando se ingresa información de concepto (boletín->concepto) o sea del tipo “en que se destaca” o similar, es necesario más espacio para cargar la información textual. En el boletín->notas, No permite cargar notas (numéricas o de concepto) de dos dígitos. (en el sector de notas -cuadradito-, no del texto) Ejemplo: no toma el MB ni el 10 (el diez lo toma por uno). -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/138> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 1

[Pressenter - SVN Alba] #139: Ciclo Lectivo Actual. Agregar link correcto.
by Pressenter - SVN Alba 21 Feb '07

21 Feb '07

#139: Ciclo Lectivo Actual. Agregar link correcto. -------------------------------+-------------------------------------------- Reporter: verox | Owner: somebody Type: defecto | Status: new Priority: normal | Milestone: Component: alba-ciclolectivo | Version: Severity: normal | Keywords: -------------------------------+-------------------------------------------- Luego del cambio del menú, en Calendarios y Horarios -> Ir a Ciclo Lectivo Actual, debemos hacer que nos muestre el ciclo lectivo correspondiente. /ciclolectivo/agregarTurnosYPeriodos/XXXX -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/139> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 1

SVN Alba r4260 - prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions
by commits＠pressenter.com.ar 21 Feb '07

21 Feb '07

Author: josx Date: 2007-02-21 16:45:58 -0300 (Wed, 21 Feb 2007) New Revision: 4260 Modified: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php Log: Si no se envia el ciclo lectivo muestar el seleccionado por defecto (ticket #139) Modified: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php 2007-02-21 19:28:59 UTC (rev 4259) +++ prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php 2007-02-21 19:45:58 UTC (rev 4260) @@ -38,8 +38,15 @@ } public function executeAgregarTurnosYPeriodos() { - - + + $ciclolectivo_id = ""; + + if($this->getRequestParameter('id')) { + $ciclolectivo_id = $this->getRequestParameter('id'); + } else { + $ciclolectivo_id = $this->getUser()->getAttribute('fk_ciclolectivo_id'); + } + // info para completar el combo de ciclo lectivos $c = new Criteria(); //$c->add(CiclolectivoPeer::ACTIVO, 1); @@ -53,14 +60,14 @@ $this->optionsCiclolectivo = $optionsCiclolectivo; - $this->ciclolectivo = CiclolectivoPeer::retrieveByPk($this->getRequestParameter('id')); + $this->ciclolectivo = CiclolectivoPeer::retrieveByPk($ciclolectivo_id); $c = new Criteria(); - $c->add(TurnosPeer::FK_CICLOLECTIVO_ID, $this->getRequestParameter('id')); + $c->add(TurnosPeer::FK_CICLOLECTIVO_ID, $ciclolectivo_id); $this->aTurnos = TurnosPeer::doSelect($c); $c = new Criteria(); - $c->add(PeriodoPeer::FK_CICLOLECTIVO_ID, $this->getRequestParameter('id')); + $c->add(PeriodoPeer::FK_CICLOLECTIVO_ID, $ciclolectivo_id); $this->aPeriodo = PeriodoPeer::doSelect($c); }

1 0