Author: ftoledo Date: 2007-01-31 15:57:54 -0300 (Wed, 31 Jan 2007) New Revision: 4141 Added: prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anio_id.php 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_turnos_id.php Log: filtros de division x establecimiento y ciclo 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-01-31 18:56:31 UTC (rev 4140) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php 2007-01-31 18:57:54 UTC (rev 4141) @@ -23,8 +23,8 @@ * division Acciones * * @package alba - * @author José Luis Di Biase <[email protected]> - * @author Héctor Sanchez <[email protected]> + * @author Jos� Luis Di Biase <[email protected]> + * @author H�ctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -39,9 +39,9 @@ protected function addFiltersCriteria(&$c) { - $c->addJoin(DivisionPeer::FK_TURNOS_ID, TurnosPeer::ID); - $c->addJoin(TurnosPeer::FK_CICLOLECTIVO_ID, CiclolectivoPeer::ID); - $c->add(CiclolectivoPeer::FK_ESTABLECIMIENTO_ID, $this->getUser()->getAttribute('fk_establecimiento_id')); + $c->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $this->getUser()->getAttribute('fk_establecimiento_id')); + $c->addJoin(DivisionPeer::FK_ANIO_ID,AnioPeer::ID); + } Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml 2007-01-31 18:56:31 UTC (rev 4140) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml 2007-01-31 18:57:54 UTC (rev 4141) @@ -11,9 +11,7 @@ descripcion: { name: Descripción } edit: title: Editar División - fields: - fk_anio_id: { params: include_custom=>>Seleccione un Año<<} - display: [ fk_anio_id, descripcion, _fk_turnos_id ] + display: [ _fk_anio_id, descripcion, _fk_turnos_id ] list: title: Listado de Divisiones Added: prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anio_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anio_id.php 2007-01-31 18:56:31 UTC (rev 4140) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anio_id.php 2007-01-31 18:57:54 UTC (rev 4141) @@ -0,0 +1,12 @@ +<?php + $c = new Criteria(); + $c->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $sf_user->getAttribute('fk_establecimiento_id')); + $c->addAscendingOrderByColumn(AnioPeer::DESCRIPCION); + $anios = AnioPeer::doSelect($c); + $optionsAnios = array(); + $optionsAnios[""] = ">>Seleccione un Año<<"; + foreach ($anios as $anio) { + $optionsAnios[$anio->getId()] = $anio->getDescripcion(); + } + echo select_tag('division[fk_anio_id]', options_for_select($optionsAnios, $division->getFkAnioId()) ) ; +?> Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anio_id.php ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_turnos_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_turnos_id.php 2007-01-31 18:56:31 UTC (rev 4140) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_turnos_id.php 2007-01-31 18:57:54 UTC (rev 4141) @@ -1,7 +1,6 @@ <?php $criteriaT = new Criteria(); - $criteriaT->add(CiclolectivoPeer::FK_ESTABLECIMIENTO_ID, $sf_user->getAttribute('fk_establecimiento_id')); - $criteriaT->addJoin(TurnosPeer::FK_CICLOLECTIVO_ID, CiclolectivoPeer::ID); + $criteriaT->add(TurnosPeer::FK_CICLOLECTIVO_ID, $sf_user->getAttribute('fk_ciclolectivo_id')); $turnos = TurnosPeer::doSelect($criteriaT); $optionsTurnos = array(); $optionsTurnos[""] = ">>Seleccione un Turno<<";