Author: josx Date: 2007-08-08 13:54:38 -0300 (Wed, 08 Aug 2007) New Revision: 4940 Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_filtro_fk_division_id.php prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php prosistem/alba/trunk/alba/lib/model/Division.php Log: Cambio en filtro y como muestra las divisiones en alumnos por grado Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_filtro_fk_division_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_filtro_fk_division_id.php 2007-08-08 16:03:25 UTC (rev 4939) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_filtro_fk_division_id.php 2007-08-08 16:54:38 UTC (rev 4940) @@ -11,7 +11,7 @@ $optionsDivisiones = array(); $optionsDivisiones[""] = ""; foreach ($divisiones as $division) { - $optionsDivisiones[$division->getId()] = $division->getAnio()->getDescripcion(). " / " . $division->getDescripcion(); + $optionsDivisiones[$division->getId()] = $division->__toString(); } echo select_tag('filters[fk_division_id]', options_for_select($optionsDivisiones)) ; ?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php 2007-08-08 16:03:25 UTC (rev 4939) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php 2007-08-08 16:54:38 UTC (rev 4940) @@ -11,7 +11,7 @@ $optionsDivisiones = array(); $optionsDivisiones[""] = "--Seleccione una División--"; foreach ($divisiones as $division) { - $optionsDivisiones[$division->getId()] = $division->getAnio()->getDescripcion(). " / " . $division->getDescripcion(); + $optionsDivisiones[$division->getId()] = $division->__toString(); } echo select_tag('rel_alumno_division[fk_division_id]', options_for_select($optionsDivisiones, $rel_alumno_division->getFkDivisionId()) ) ; ?> Modified: prosistem/alba/trunk/alba/lib/model/Division.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/Division.php 2007-08-08 16:03:25 UTC (rev 4939) +++ prosistem/alba/trunk/alba/lib/model/Division.php 2007-08-08 16:54:38 UTC (rev 4940) @@ -16,7 +16,7 @@ */ class Division extends BaseDivision { public function __toString() { - return $this->getAnio()->getDescripcion()." ".$this->getDescripcion().(($this->getOrientacion())?" ".$this-getOrientacion()->getNombre():""); + return $this->getAnio()->getDescripcion()." ".$this->getDescripcion().(($this->getOrientacion())?" ".$this->getOrientacion()->getNombre():""); } } // Division