Author: hsanchez Date: 2007-06-06 15:48:41 -0300 (Wed, 06 Jun 2007) New Revision: 4711 Modified: prosistem/alba/trunk/alba/apps/principal/modules/anio/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml Log: Cambiando Ordenes y agrupaciones de diviones y anio Modified: prosistem/alba/trunk/alba/apps/principal/modules/anio/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/anio/config/generator.yml 2007-06-06 17:17:40 UTC (rev 4710) +++ prosistem/alba/trunk/alba/apps/principal/modules/anio/config/generator.yml 2007-06-06 18:48:41 UTC (rev 4711) @@ -18,6 +18,7 @@ list: title: Listado de Años display: [ =descripcion ] + sort: descripcion object_actions: _edit: - - _delete: - \ No newline at end of file + _delete: - 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-06-06 17:17:40 UTC (rev 4710) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php 2007-06-06 18:48:41 UTC (rev 4711) @@ -41,7 +41,9 @@ { $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() { @@ -51,4 +53,4 @@ } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml 2007-06-06 17:17:40 UTC (rev 4710) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml 2007-06-06 18:48:41 UTC (rev 4711) @@ -10,6 +10,7 @@ fk_turnos_id: { name: Turnos } descripcion: { name: Descripción } orden: { name: Orden } + edit: title: Editar División display: [ _fk_anio_id, descripcion, _fk_turnos_id, orden ] @@ -20,4 +21,6 @@ object_actions: _edit: - _delete: - - alumnosPorDivision: { name: Alumnos por Division, action: alumnosPorDivision, icon: small/alumnos.png } + alumnosPorDivision: { name: Alumnos por Division, action: alumnosPorDivision, icon: small/alumnos.png } + filters: [ fk_anio_id ] +