August 2007 - Alba-desarrollo - lists.ourproject.org

SVN Alba r4894 - prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions
by commits＠pressenter.com.ar 01 Aug '07

01 Aug '07

Author: sabino Date: 2007-08-01 16:26:00 -0300 (Wed, 01 Aug 2007) New Revision: 4894 Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php Log: Resolucion de conflicto Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-08-01 19:25:34 UTC (rev 4893) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-08-01 19:26:00 UTC (rev 4894) @@ -175,11 +175,11 @@ $criteria->add(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, $establecimiento_id); } if($turnos_id) { - $criteria->add(HorarioescolarPeer::FK_TURNOS_ID, $turnos_id); + $criteria->add(HorarioescolarPeer::FK_TURNO_ID, $turnos_id); } if($orden) { - $criteria->addAscendingOrderByColumn(HorarioescolarPeer::FK_TURNOS_ID); + $criteria->addAscendingOrderByColumn(HorarioescolarPeer::FK_TURNO_ID); } $horarioescolares = HorarioescolarPeer::doSelect($criteria);

1 0

SVN Alba r4893 - prosistem/alba/trunk/alba/apps/principal/modules/ayuda/actions
by commits＠pressenter.com.ar 01 Aug '07

01 Aug '07

Author: hsanchez Date: 2007-08-01 16:25:34 -0300 (Wed, 01 Aug 2007) New Revision: 4893 Modified: prosistem/alba/trunk/alba/apps/principal/modules/ayuda/actions/actions.class.php Log: quitando preexecute Modified: prosistem/alba/trunk/alba/apps/principal/modules/ayuda/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/ayuda/actions/actions.class.php 2007-08-01 19:15:19 UTC (rev 4892) +++ prosistem/alba/trunk/alba/apps/principal/modules/ayuda/actions/actions.class.php 2007-08-01 19:25:34 UTC (rev 4893) @@ -32,11 +32,6 @@ class ayudaActions extends sfActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - - public function executeIndex() { }

1 0

SVN Alba r4892 - prosistem/alba/trunk/alba/apps/principal/templates
by commits＠pressenter.com.ar 01 Aug '07

01 Aug '07

Author: hsanchez Date: 2007-08-01 16:15:19 -0300 (Wed, 01 Aug 2007) New Revision: 4892 Removed: prosistem/alba/trunk/alba/apps/principal/templates/moderno/ Log: Quitando layout moderno

1 0

SVN Alba r4891 - prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions
by commits＠pressenter.com.ar 01 Aug '07

01 Aug '07

Author: ftoledo Date: 2007-08-01 15:54:32 -0300 (Wed, 01 Aug 2007) New Revision: 4891 Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php Log: sacando funcion que no se usa Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-08-01 18:37:40 UTC (rev 4890) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-08-01 18:54:32 UTC (rev 4891) @@ -186,16 +186,6 @@ return $horarioescolares; } - protected function getTurnos($ciclolectivo_id = 0) { - $criteriaT = new Criteria(); - if($ciclolectivo_id) { - $criteriaT->add(TurnosPeer::FK_CICLOLECTIVO_ID, $ciclolectivo_id); - } - $turnos = TurnosPeer::doSelect($criteriaT); - return $turnos; - } - - public function handleErrorIndex() { $this->redirect('calendario'); }

1 0

SVN Alba r4890 - prosistem/alba/trunk/alba/apps/principal/templates
by commits＠pressenter.com.ar 01 Aug '07

01 Aug '07

Author: hsanchez Date: 2007-08-01 15:37:40 -0300 (Wed, 01 Aug 2007) New Revision: 4890 Modified: prosistem/alba/trunk/alba/apps/principal/templates/menu.php Log: Quitando la vista imprimir del menu Modified: prosistem/alba/trunk/alba/apps/principal/templates/menu.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/menu.php 2007-08-01 17:14:51 UTC (rev 4889) +++ prosistem/alba/trunk/alba/apps/principal/templates/menu.php 2007-08-01 18:37:40 UTC (rev 4890) @@ -129,7 +129,7 @@ <li><span></span><a href="#">Informes y Consultas</a> <ul> <li><span></span><?php echo link_to("Constancia Alumno Regular","informes/constanciaAlumnoRegularFormulario",'target=_blank')?></li> - <li><span></span><?php echo link_to("Constancia Egreso 7mo","informes/certificadoPrimariaFormulario/vista/imprimir",'target=_blank')?></li> + <li><span></span><?php echo link_to("Constancia Egreso 7mo","informes/certificadoPrimariaFormulario",'target=_blank')?></li> <li><span></span><?php echo link_to("Alumnos por división","informes/alumnosPorDivisionFormulario",'target=_blank')?></li> <li><span></span><?php echo link_to("Boletines","informes/boletinFormulario","target=_blank")?></li> <li><span></span><?php echo link_to("Certificado de Estudios","informes/certificadoEstudiosBusquedaFormulario","target=_blank")?></li>

1 0

SVN Alba r4889 - prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates
by commits＠pressenter.com.ar 01 Aug '07

01 Aug '07

Author: josx Date: 2007-08-01 14:14:51 -0300 (Wed, 01 Aug 2007) New Revision: 4889 Modified: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/agregarTurnosYPeriodosSuccess.php Log: Se arreglo problema que no dejaba grabar en la parte de periodos Modified: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/agregarTurnosYPeriodosSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/agregarTurnosYPeriodosSuccess.php 2007-08-01 14:23:49 UTC (rev 4888) +++ prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/agregarTurnosYPeriodosSuccess.php 2007-08-01 17:14:51 UTC (rev 4889) @@ -65,7 +65,7 @@ ?> <td> <?php echo input_date_tag('ciclolectivo[fecha_fin]', $ciclolectivo->getFechaFin() , 'rich=true calendar_button_img=/sf/sf_admin/images/date.png control_name=ciclolectivo[fecha_fin]'); ?></td> <td><?php echo ($ciclolectivo->getEstablecimiento())?$ciclolectivo->getEstablecimiento()->getNombre():"";?></td> - <?php echo input_hidden_tag('ciclolectivo[id]', $sf_params->get('id')) ?> + <?php echo input_hidden_tag('ciclolectivo[id]', $ciclolectivo->getId()) ?> </tr> </tbody> <tfoot>

1 0

SVN Alba r4888 - in prosistem/alba/trunk/alba/apps/principal/modules: actividad/actions alumno/actions anio/actions asistencia/actions asistencia/templates boletin/actions calendario/actions calendariovacunacion/actions cargobaja/actions ciclolectivo/actions concepto/actions conceptobaja/actions cuenta/actions distritoescolar/actions division/actions docente/actions docenteHorario/actions escalanota/actions espacios/actions establecimiento/actions evento/actions feriado/actions horarioesco
by commits＠pressenter.com.ar 01 Aug '07

01 Aug '07

Author: hsanchez Date: 2007-08-01 11:23:49 -0300 (Wed, 01 Aug 2007) New Revision: 4888 Modified: prosistem/alba/trunk/alba/apps/principal/modules/actividad/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/anio/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/calendariovacunacion/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/cargobaja/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/concepto/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/conceptobaja/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/cuenta/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/distritoescolar/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/docente/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/docenteHorario/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/escalanota/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/espacios/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/establecimiento/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/evento/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/horarioescolartipo/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/icalVisualizador/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/informes/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/legajocategoria/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/locacion/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/modulo/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/organizacion/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/pais/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/permiso/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/preferencia/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/provincia/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/relCalendariovacunacionAlumno/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/responsable/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/rol/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/tipoasistencia/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/tipodocente/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/tipoespacio/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/tipoiva/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/tipolocacion/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/usuario/actions/actions.class.php Log: Quitando los preExecute de las acciones Modified: prosistem/alba/trunk/alba/apps/principal/modules/actividad/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/actividad/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/actividad/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -32,9 +32,6 @@ class actividadActions extends autoactividadActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } protected function addFiltersCriteria ($c) { $c->add(ActividadPeer::FK_ESTABLECIMIENTO_ID,$this->getUser()->getAttribute('fk_establecimiento_id')); @@ -58,4 +55,4 @@ } } -?> \ No newline at end of file +?> 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-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -34,10 +34,6 @@ class alumnoActions extends autoalumnoActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - /** * Ver las Asistencias del alumno */ @@ -255,4 +251,4 @@ } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/anio/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/anio/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/anio/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,10 +33,6 @@ class anioActions extends autoanioActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - protected function addFiltersCriteria ($c) { $c->add(AnioPeer::FK_ESTABLECIMIENTO_ID,$this->getUser()->getAttribute('fk_establecimiento_id')); Modified: prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,12 +33,6 @@ class asistenciaActions extends sfActions { - public function preExecute() { - $fecha = $this->getRequestParameter('fecha'); - - - } - /** * Executes index action * @@ -296,11 +290,8 @@ $this->anio_hasta = $anio_hasta; //Verifico si muestro versión para imprimir - if ($this->getRequestParameter('vista')) { - $this->vista = $this->getRequestParameter('vista'); - } else { - $this->vista = ""; - } + if ($this->getRequestParameter('vista')) + $this->setLayout($this->getRequestParameter('vista')); } /** @@ -312,7 +303,7 @@ $d = $this->getRequestParameter('dia'); $m = $this->getRequestParameter('mes'); $y = $this->getRequestParameter('ano'); - return $this->forward('asistencia','index',"vista_id=$vista_id&dia=$d&mes=$m&ano=$y"); + return $this->forward('asistencia','index',"vista_id=$vista_id&dia=$d&mes=$m&ano=$y"); } public function handleErrorMostrar(){ Modified: prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -1,8 +1,4 @@ -<?php use_helper('DateForm'); - use_helper("I18N"); - ?> - -<? +<?php /** * This file is part of Alba. * @@ -34,9 +30,11 @@ * @license GPL */ ?> +<?php use_helper('DateForm'); + use_helper("I18N"); +?> <div id="sf_admin_container"> <h1>Asistencias</h1> - <?php if ($sf_request->hasErrors()): ?> <div class="form-errors"> <h2><?php echo __('There are some errors that prevent the form to validate') ?></h2> @@ -53,15 +51,12 @@ <div class="form-row"> <table cellspacing="1"> <tr> - <td> <?php echo label_for('division_id', __('Año/División:'), 'class="required" '); ?> </td> <td> <?php echo select_tag('division_id', options_for_select($optionsDivision, $division_id)); ?> </td> - - <td style='padding-left:50px'> <?php echo label_for('fecha', __('Fecha Inicio:'), 'class="required" '); ?> </td> @@ -72,17 +67,14 @@ <?php echo select_month_tag('mes', $m, 'include_custom=Elija un mes use_short_month=true') ?> <?php echo select_year_tag('ano', $y, 'include_custom=Elija un año year_end='.$anio_hasta.' year_start='.$anio_desde) ?> </td> - <td style='padding-left:50px'> <?php echo label_for('vista', __('Vista:'), 'class="required"'); ?> </td> <td> <?php echo select_tag('vistas', options_for_select($aVistas, $vista_id)); ?> </td> - </tr> <table> - <ul class="sf_admin_actions"> <li> <?php echo submit_tag(__('Mostrar'), array ('name' => 'Mostrar','class' => 'sf_admin_action_save')) ?> @@ -94,11 +86,8 @@ <?php echo input_hidden_tag('alumno_id', $alumno_id) ?> <? }?> </form> - - <br> <br> - <?php echo form_tag('asistencia/grabar', 'id=sf_admin_edit_form name=sf_admin_edit_form multipart=true'); echo input_hidden_tag('division_id', $division_id); echo input_hidden_tag('dia', $d); @@ -122,7 +111,6 @@ <?}?> <th id="sf_admin_list_th_sf_actions">            </th> - <?php foreach ($aTipoasistencias as $idx => $Tipoasistencia){ ?> <th id="sf_admin_list_th_sf_actions" title="<?php echo $Tipoasistencia[1]?>"><?php echo $idx ?></th> <?}?> @@ -162,10 +150,9 @@ } ?> </td> - <?php } ?> <td></td> -<? +<?php foreach ($aTipoasistencias as $idx => $Tipoasistencia){ ?> <td><?php echo isset($totalesAlumnos[$idx])?$totalesAlumnos[$idx]:0; ?></td> <?php }?> @@ -173,8 +160,6 @@ <?php } ?> </tbody> </table> - - <?php if ( count($aAlumnos) >0 ) {?> <div class="form-row"> <ul class="sf_admin_actions"><li> @@ -187,7 +172,7 @@ echo input_hidden_tag('mes', "$m"); echo input_hidden_tag('ano', "$y"); echo input_hidden_tag('vistas', $vista_id); - echo input_hidden_tag('vista', "noMuestraMenu"); + echo input_hidden_tag('vista', "layout_sinmenu"); if($alumno_id >= 0) echo input_hidden_tag('alumno_id', $alumno_id); echo submit_tag(__('Imprimir'), array ('name' => 'Imprimir','class' => 'sf_admin_action_print')); @@ -196,7 +181,6 @@ </li></ul> </div> <?php }?> - <table cellspacing="1"> <tr> <?php foreach ($aTipoasistencias as $idx => $Tipoasistencia){ @@ -207,8 +191,6 @@ } ?> </tr> - - <?php // Comienza Feriados if(count($aFeriadoEfectivo)>0) { ?> @@ -226,17 +208,11 @@ // Finaliza Feriados ?> </tr> - <? } else { ?> <h2>NO HAY ALUMNOS</h2> <? } ?> - - - - </table> </div> - <div class="float-right"> <ul class="sf_admin_actions"> <li><?php echo button_to('Listado de alumnos','alumno/list',array('class' => 'sf_admin_action_list'))?></li> @@ -246,8 +222,6 @@ </ul> </div> </fieldset> - - <?php if($bool_gd) { ?> <?php if($bool_tmp) { ?> <?php if($nombre_completo_archivo) { ?> 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-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,11 +33,6 @@ class boletinActions extends sfActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - - public function executeGrabarNotas() { // inicializando variables Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,10 +33,6 @@ class calendarioActions extends sfActions { - public function preExecute() { - } - - /** * Executes index action * @@ -205,4 +201,4 @@ } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendariovacunacion/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/calendariovacunacion/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendariovacunacion/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -32,9 +32,4 @@ class calendariovacunacionActions extends autocalendariovacunacionActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - - } Modified: prosistem/alba/trunk/alba/apps/principal/modules/cargobaja/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cargobaja/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/cargobaja/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -32,9 +32,4 @@ class cargobajaActions extends autocargobajaActions { - - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - } 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-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,10 +33,6 @@ class ciclolectivoActions extends autociclolectivoActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - public function executeAgregarTurnosYPeriodos() { $ciclolectivo_id = ""; @@ -315,4 +311,4 @@ } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/concepto/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/concepto/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/concepto/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,11 +33,6 @@ class conceptoActions extends autoconceptoActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - - } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/conceptobaja/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/conceptobaja/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/conceptobaja/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,9 +33,4 @@ class conceptobajaActions extends autoconceptobajaActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - - } Modified: prosistem/alba/trunk/alba/apps/principal/modules/cuenta/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cuenta/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/cuenta/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,11 +33,7 @@ class cuentaActions extends autocuentaActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - /** * Muestra la cuenta, los alumnos y los responsables **/ Modified: prosistem/alba/trunk/alba/apps/principal/modules/distritoescolar/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/distritoescolar/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/distritoescolar/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,8 +33,4 @@ class distritoescolarActions extends autodistritoescolarActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - } Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,10 +33,6 @@ class divisionActions extends autodivisionActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - protected function addFiltersCriteria($c) { $c->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $this->getUser()->getAttribute('fk_establecimiento_id')); Modified: prosistem/alba/trunk/alba/apps/principal/modules/docente/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/docente/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/docente/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,10 +33,6 @@ class docenteActions extends autodocenteActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - function executeActividadesPorDocente() { $this->id_docente = $this->getRequestParameter('id'); $this->docente = DocentePeer::RetrieveByPK($this->id_docente); Modified: prosistem/alba/trunk/alba/apps/principal/modules/docenteHorario/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/docenteHorario/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/docenteHorario/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,11 +33,6 @@ class DocenteHorarioActions extends sfActions { - public function preExecute () - { -// $this->getResponse()->addStylesheet(sfConfig::get('sf_admin_web_dir').'/css/main', 'first'); -// $this->vista = $this->getRequestParameter('vista'); - } public function executeIndex () { @@ -195,4 +190,4 @@ } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/escalanota/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/escalanota/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/escalanota/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -36,9 +36,6 @@ $c->add(EscalanotaPeer::FK_ESTABLECIMIENTO_ID, $this->getUser()->getAttribute('fk_establecimiento_id')); } - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/espacios/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/espacios/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/espacios/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,10 +33,7 @@ class espaciosActions extends autoespaciosActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/establecimiento/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/establecimiento/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/establecimiento/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,9 +33,6 @@ class establecimientoActions extends autoestablecimientoActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } function executeEditLocacion() { @@ -132,4 +129,4 @@ } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/evento/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/evento/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/evento/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,11 +33,6 @@ class eventoActions extends sfActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - - public function executeIndex() { return $this->forward('evento', 'edit'); // $this->evento = new Evento(); @@ -245,4 +240,4 @@ } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -34,10 +34,6 @@ class feriadoActions extends autoferiadoActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - public function executeLinkMinisterio() { return $this->redirect("http://www.mininterior.gov.ar/servicios/feriados.asp"); } @@ -104,4 +100,4 @@ } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -34,10 +34,6 @@ class horarioescolarActions extends autohorarioescolarActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - public function executeEdit() { $evento_generico = new miEvento(); @@ -149,4 +145,4 @@ ); } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolartipo/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolartipo/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolartipo/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,8 +33,5 @@ class horarioescolartipoActions extends autohorarioescolartipoActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/icalVisualizador/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/icalVisualizador/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/icalVisualizador/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -39,13 +39,11 @@ } // Falta ver porque genera una columna mas y cuando no empieza en punto no grafica las filas hacia la derecha - - $this->archivo = "/tmp/pepe.ics"; } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/informes/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/informes/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/informes/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,11 +33,6 @@ class InformesActions extends sfActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - - /** * Informe: Alumnos por Division * @@ -474,4 +469,4 @@ } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/legajocategoria/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/legajocategoria/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/legajocategoria/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,9 +33,6 @@ class legajocategoriaActions extends autolegajocategoriaActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,10 +33,6 @@ class legajopedagogicoActions extends sfActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - /** * Executes index action * @@ -339,4 +335,4 @@ -} \ No newline at end of file +} Modified: prosistem/alba/trunk/alba/apps/principal/modules/locacion/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/locacion/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/locacion/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,11 +33,6 @@ class locacionActions extends autolocacionActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - - // Automaticamente al guardar por primera vez una locacion, además guarda una relación con el establecimeinto actual public function saveLocacion($locacion) { @@ -108,4 +103,4 @@ } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/modulo/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/modulo/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/modulo/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,8 +33,5 @@ class moduloActions extends automoduloActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/organizacion/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/organizacion/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/organizacion/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,11 +33,6 @@ class organizacionActions extends autoorganizacionActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - - public function executeCambiarPais() { $this->pais_id = $this->getRequestParameter('pais_id'); $this->provincia_id = $this->getRequestParameter('provincia_id'); @@ -52,4 +47,4 @@ } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/pais/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/pais/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/pais/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,9 +33,6 @@ class paisActions extends autopaisActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/permiso/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/permiso/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/permiso/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,9 +33,6 @@ class permisoActions extends autopermisoActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/preferencia/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/preferencia/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/preferencia/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,9 +33,6 @@ class preferenciaActions extends autopreferenciaActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/provincia/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/provincia/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/provincia/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -32,10 +32,6 @@ */ class provinciaActions extends autoprovinciaActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - protected function addSortCriteria ($c) { if ($sort_column = $this->getUser()->getAttribute('sort', 'nombre_corto', 'sf_admin/provincia/sort')) { $sort_column = Propel::getDB($c->getDbName())->quoteIdentifier($sort_column); @@ -49,4 +45,4 @@ } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,9 +33,6 @@ class relAlumnoDivisionActions extends autorelAlumnoDivisionActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } protected function addFiltersCriteria ($c) { $c->add(AlumnoPeer::FK_ESTABLECIMIENTO_ID,$this->getUser()->getAttribute('fk_establecimiento_id')); @@ -87,4 +84,4 @@ } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,9 +33,6 @@ class relAnioActividadActions extends autorelAnioActividadActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/relCalendariovacunacionAlumno/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relCalendariovacunacionAlumno/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/relCalendariovacunacionAlumno/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -34,10 +34,6 @@ class relCalendariovacunacionAlumnoActions extends autorelCalendariovacunacionAlumnoActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } - /** * Ir a la cuenta del alumno */ Modified: prosistem/alba/trunk/alba/apps/principal/modules/responsable/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/responsable/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/responsable/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -31,9 +31,6 @@ */ class responsableActions extends autoresponsableActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } protected function addSortCriteria ($c) { if ($sort_column = $this->getUser()->getAttribute('sort', 'apellido', 'sf_admin/responsable/sort')) { @@ -168,4 +165,4 @@ } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/rol/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/rol/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/rol/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,9 +33,6 @@ class rolActions extends autorolActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } function executeEditPermiso() { // estos son los permisos que tiene el rol 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-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -32,9 +32,6 @@ class seguridadActions extends sfActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } public function executeLogin() { $this->error_inicio_sesion = false; @@ -203,4 +200,4 @@ } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipoasistencia/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipoasistencia/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipoasistencia/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,7 +33,4 @@ class tipoasistenciaActions extends autotipoasistenciaActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } } Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipodocente/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipodocente/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipodocente/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,7 +33,4 @@ class tipodocenteActions extends autotipodocenteActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } } Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -32,9 +32,6 @@ */ class tipodocumentoActions extends autotipodocumentoActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } protected function addSortCriteria ($c) { if ($sort_column = $this->getUser()->getAttribute('sort', 'nombre', 'sf_admin/tipodocumento/sort')) { Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipoespacio/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipoespacio/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipoespacio/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -32,7 +32,4 @@ class tipoespacioActions extends autotipoespacioActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } } Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipoiva/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipoiva/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipoiva/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,9 +33,6 @@ class tipoivaActions extends autotipoivaActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipolocacion/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipolocacion/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipolocacion/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,7 +33,4 @@ class tipolocacionActions extends autotipolocacionActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } } 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-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -30,9 +30,6 @@ * @license GPL */ class turnosActions extends autoturnosActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } function addFiltersCriteria($c) { $c->add(TurnosPeer::FK_CICLOLECTIVO_ID,$this->getUser()->getAttribute('fk_ciclolectivo_id')); @@ -71,4 +68,4 @@ return $string; } } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/usuario/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/usuario/actions/actions.class.php 2007-08-01 14:23:30 UTC (rev 4887) +++ prosistem/alba/trunk/alba/apps/principal/modules/usuario/actions/actions.class.php 2007-08-01 14:23:49 UTC (rev 4888) @@ -33,9 +33,6 @@ class usuarioActions extends autousuarioActions { - public function preExecute() { - $this->vista = $this->getRequestParameter('vista'); - } function updateUsuarioFromRequest() { $usuario = $this->getRequestParameter('usuario');

1 0

SVN Alba r4887 - prosistem/alba/trunk/alba/apps/principal/templates
by commits＠pressenter.com.ar 01 Aug '07

01 Aug '07

Author: hsanchez Date: 2007-08-01 11:23:30 -0300 (Wed, 01 Aug 2007) New Revision: 4887 Added: prosistem/alba/trunk/alba/apps/principal/templates/layout_impresion.php prosistem/alba/trunk/alba/apps/principal/templates/layout_sinmenu.php prosistem/alba/trunk/alba/apps/principal/templates/layout_vacio.php Modified: prosistem/alba/trunk/alba/apps/principal/templates/layout.php Log: Creando nuevos templates Modified: prosistem/alba/trunk/alba/apps/principal/templates/layout.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-08-01 00:40:43 UTC (rev 4886) +++ prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-08-01 14:23:30 UTC (rev 4887) @@ -1,19 +1,9 @@ -<?php - -if(!isset($vista)){ - $vista=""; -} -?><?php 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() ?> - <link rel="stylesheet" type="text/css" href="<?php echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot() . '/js/jsmenu/themes/'.sfConfig::get("app_alba_menutheme").'/theme.css' ?>"/> <link rel="shortcut icon" href="/favicon.ico" /> @@ -47,19 +37,11 @@ background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fder.png"?>); } </style> - - <?php if($vista == "imprimir") :?> - <link rel="stylesheet" type="text/css" href="<?php echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot()?>/css/impresion.css" /> - <? endif;?> <?php if (!$sf_user->isAuthenticated()):?> <link rel="stylesheet" type="text/css" href="<?php echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot()?>/css/login.css"> <?php endif;?> </head> <body> - -<?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"> @@ -68,7 +50,6 @@ <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> @@ -91,7 +72,6 @@ ?> </td> </tr> - </table> <?php else: ?> Bienvenido, Anónimo @@ -100,24 +80,17 @@ </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"><? + <td colspan="1" class="fmenu"><?php 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'); - ?> + <a href ="javascript:window.print()"><?php echo image_tag('small/print.png',array('title'=>'Imprimir','alt'=>'print.png','border'=>0))?></a> </div> </td> <td><?php echo image_tag("gui/index_2x2.png", array ( 'width' => '17' , 'heigth' => '35' ) )?></td> @@ -130,7 +103,6 @@ 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)); - } } ?> @@ -161,8 +133,6 @@ <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 Added: prosistem/alba/trunk/alba/apps/principal/templates/layout_impresion.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/layout_impresion.php 2007-08-01 00:40:43 UTC (rev 4886) +++ prosistem/alba/trunk/alba/apps/principal/templates/layout_impresion.php 2007-08-01 14:23:30 UTC (rev 4887) @@ -0,0 +1,49 @@ + <!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() ?> + <link rel="stylesheet" type="text/css" href="<?php echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot() . '/js/jsmenu/themes/'.sfConfig::get("app_alba_menutheme").'/theme.css' ?>"/> + <link rel="shortcut icon" href="/favicon.ico" /> + + <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="<?php echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot()?>/css/impresion.css" /> + <?php if (!$sf_user->isAuthenticated()):?> + <link rel="stylesheet" type="text/css" href="<?php echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot()?>/css/login.css"> + <?php endif;?> + </head> + <body> +<?php echo $content; ?> + </body> +<?php echo javascript_include_tag('varios/wz_tooltip.js'); ?> + </html> Property changes on: prosistem/alba/trunk/alba/apps/principal/templates/layout_impresion.php ___________________________________________________________________ Name: svn:keywords + "Id Author Rev Date URL" Added: prosistem/alba/trunk/alba/apps/principal/templates/layout_sinmenu.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/layout_sinmenu.php 2007-08-01 00:40:43 UTC (rev 4886) +++ prosistem/alba/trunk/alba/apps/principal/templates/layout_sinmenu.php 2007-08-01 14:23:30 UTC (rev 4887) @@ -0,0 +1,49 @@ + <!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() ?> + <link rel="stylesheet" type="text/css" href="<?php echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot() . '/js/jsmenu/themes/'.sfConfig::get("app_alba_menutheme").'/theme.css' ?>"/> + <link rel="shortcut icon" href="/favicon.ico" /> + + <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="<?php echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot()?>/css/impresion.css" /> + <?php if (!$sf_user->isAuthenticated()):?> + <link rel="stylesheet" type="text/css" href="<?php echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot()?>/css/login.css"> + <?php endif;?> + </head> + <body> +<?php echo $content; ?> + </body> +<?php echo javascript_include_tag('varios/wz_tooltip.js'); ?> + </html> Property changes on: prosistem/alba/trunk/alba/apps/principal/templates/layout_sinmenu.php ___________________________________________________________________ Name: svn:keywords + "Id Author Rev Date URL" Added: prosistem/alba/trunk/alba/apps/principal/templates/layout_vacio.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/layout_vacio.php 2007-08-01 00:40:43 UTC (rev 4886) +++ prosistem/alba/trunk/alba/apps/principal/templates/layout_vacio.php 2007-08-01 14:23:30 UTC (rev 4887) @@ -0,0 +1,11 @@ + <!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() ?> + </head> + <body> + <?php echo $content ?> + </body> + </html> Property changes on: prosistem/alba/trunk/alba/apps/principal/templates/layout_vacio.php ___________________________________________________________________ Name: svn:keywords + "Id Author Rev Date URL"

1 0