Author: josx Date: 2007-08-08 16:47:57 -0300 (Wed, 08 Aug 2007) New Revision: 4943 Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anioorden_id.php Log: Cambio en los filtros de Divisiones 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-08 19:37:43 UTC (rev 4942) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php 2007-08-08 19:47:57 UTC (rev 4943) @@ -33,20 +33,10 @@ class divisionActions extends autodivisionActions { - protected function addFiltersCriteria($c) - { - $c->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $this->getUser()->getAttribute('fk_establecimiento_id')); - $c->addJoin(DivisionPeer::FK_ANIO_ID,AnioPeer::ID); - $c->addAscendingOrderByColumn(AnioPeer::DESCRIPCION); - $c->addAscendingOrderByColumn(DivisionPeer::ORDEN); - $c->addAscendingOrderByColumn(DivisionPeer::DESCRIPCION); - } - public function executeAlumnosPorDivision() { $this->redirect('alumno/list?filters%5Bdivision%5D='.$this->getRequestParameter('id').'&filter=filtrar'); } - } ?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml 2007-08-08 19:37:43 UTC (rev 4942) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml 2007-08-08 19:47:57 UTC (rev 4943) @@ -25,5 +25,5 @@ _edit: - _delete: - alumnosPorDivision: { name: Alumnos por Division, action: alumnosPorDivision, icon: small/alumnos.png } - filters: [ _fk_anioorden_id ] + filters: [ fk_anio_id, fk_orientacion_id, fk_turno_id ] Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anioorden_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anioorden_id.php 2007-08-08 19:37:43 UTC (rev 4942) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anioorden_id.php 2007-08-08 19:47:57 UTC (rev 4943) @@ -8,5 +8,6 @@ foreach ($anios as $anio) { $optionsAnios[$anio->getId()] = $anio->getDescripcion(); } + echo select_tag('anios', options_for_select($optionsAnios, $anio->getId()) ) ; ?>