Author: josx Date: 2007-02-07 13:35:21 -0300 (Wed, 07 Feb 2007) New Revision: 4165 Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_alumno_id.php Log: Mejora de carga de alumnos por division ( Ticket #118 ) 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-02-07 14:56:03 UTC (rev 4164) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php 2007-02-07 16:35:21 UTC (rev 4165) @@ -23,8 +23,8 @@ * relAlumnoDivision 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 Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_alumno_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_alumno_id.php 2007-02-07 14:56:03 UTC (rev 4164) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_alumno_id.php 2007-02-07 16:35:21 UTC (rev 4165) @@ -1,13 +1,39 @@ <?php $c = new Criteria(); + + $c->addAsColumn("id", AlumnoPeer::ID); + $c->addAsColumn("nombre", AlumnoPeer::NOMBRE); + $c->addAsColumn("apellido", AlumnoPeer::APELLIDO); + $c->addAsColumn("division", DivisionPeer::DESCRIPCION); + $c->addAsColumn("anio", AnioPeer::DESCRIPCION); + $c->add(AlumnoPeer::FK_ESTABLECIMIENTO_ID, $sf_user->getAttribute('fk_establecimiento_id')); + $c->addJoin(AlumnoPeer::ID, RelAlumnoDivisionPeer::FK_ALUMNO_ID, Criteria::LEFT_JOIN); + $c->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, DivisionPeer::ID, Criteria::LEFT_JOIN); + $c->addJoin(DivisionPeer::FK_ANIO_ID, AnioPeer::ID ,Criteria::LEFT_JOIN); + $c->addAscendingOrderByColumn(AlumnoPeer::APELLIDO); $c->addAscendingOrderByColumn(AlumnoPeer::NOMBRE); - $alumnos = AlumnoPeer::doSelect($c); + + +// $alumnos = AlumnoPeer::doSelect($c); + $alumnos = BasePeer::doSelect($c); + + $aDivision = array(); $optionsAlumnos = array(); $optionsAlumnos[""] = ">>Seleccione un Alumno<<"; + foreach ($alumnos as $alumno) { - $optionsAlumnos[$alumno->getId()] = $alumno->getApellido() . ", " . $alumno->getNombre(); + if($alumno[3] AND array_key_exists($alumno[0], $aDivision)) { + $separador = ", "; + } else { + $separador = ""; + } + @$aDivision["$alumno[0]"] .= ($alumno[3]) ? $separador . $alumno[4]. " / " . $alumno[3] : ""; + $divisiones = ($aDivision["$alumno[0]"]) ? "( ".$aDivision["$alumno[0]"]. " )" : ""; + $alumnoNombres = $alumno[2] . ", " . $alumno[1]; + $optionsAlumnos["$alumno[0]"] = $alumnoNombres . " " .$divisiones; } + echo select_tag('rel_alumno_division[fk_alumno_id]', options_for_select($optionsAlumnos, $rel_alumno_division->getFkAlumnoId()) ) ; -?> +?> \ No newline at end of file