[Alba-desarrollo] SVN Alba r4141 - in prosistem/alba/trunk/alba/apps/principal/modules/division: actions config templates

[commits en pressenter.com.ar]

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/_f=
k_anio_id.php
Modified:
   prosistem/alba/trunk/alba/apps/principal/modules/division/actions/acti=
ons.class.php
   prosistem/alba/trunk/alba/apps/principal/modules/division/config/gener=
ator.yml
   prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_f=
k_turnos_id.php
Log:
filtros de division x establecimiento y ciclo


Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/actio=
ns/actions.class.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/apps/principal/modules/division/actions/act=
ions.class.php	2007-01-31 18:56:31 UTC (rev 4140)
+++ prosistem/alba/trunk/alba/apps/principal/modules/division/actions/act=
ions.class.php	2007-01-31 18:57:54 UTC (rev 4141)
@@ -23,8 +23,8 @@
  * division Acciones
  *
  * @package    alba
- * @author     Jos=C3=A9 Luis Di Biase <josx en interorganic.com.ar>
- * @author     H=C3=A9ctor Sanchez <hsanchez en pressenter.com.ar>
+ * @author     Jos=E9 Luis Di Biase <josx en interorganic.com.ar>
+ * @author     H=E9ctor Sanchez <hsanchez en pressenter.com.ar>
  * @author     Fernando Toledo <ftoledo en pressenter.com.ar>
  * @version    SVN: $Id$
  * @filesource
@@ -39,9 +39,9 @@
=20
      protected function addFiltersCriteria(&$c)
      {
-         $c->addJoin(DivisionPeer::FK_TURNOS_ID, TurnosPeer::ID);
-         $c->addJoin(TurnosPeer::FK_CICLOLECTIVO_ID, CiclolectivoPeer::I=
D);
-         $c->add(CiclolectivoPeer::FK_ESTABLECIMIENTO_ID, $this->getUser=
()->getAttribute('fk_establecimiento_id'));
+         $c->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $this->getUser()->getA=
ttribute('fk_establecimiento_id'));
+         $c->addJoin(DivisionPeer::FK_ANIO_ID,AnioPeer::ID);
+        =20
      }
=20
=20

Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/confi=
g/generator.yml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/apps/principal/modules/division/config/gene=
rator.yml	2007-01-31 18:56:31 UTC (rev 4140)
+++ prosistem/alba/trunk/alba/apps/principal/modules/division/config/gene=
rator.yml	2007-01-31 18:57:54 UTC (rev 4141)
@@ -11,9 +11,7 @@
         descripcion: { name: Descripci&oacute;n }
     edit:
         title: Editar Divisi&oacute;n
-        fields:
-            fk_anio_id:   { params: include_custom=3D>>Seleccione un A=C3=
=B1o<<}
-        display: [ fk_anio_id, descripcion, _fk_turnos_id ]
+        display: [ _fk_anio_id, descripcion, _fk_turnos_id ]
                    =20
     list:
         title: Listado de Divisiones

Added: prosistem/alba/trunk/alba/apps/principal/modules/division/template=
s/_fk_anio_id.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=20
+    $c =3D new Criteria();=20
+    $c->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $sf_user->getAttribute('fk_=
establecimiento_id'));   =20
+    $c->addAscendingOrderByColumn(AnioPeer::DESCRIPCION);
+    $anios =3D AnioPeer::doSelect($c);
+    $optionsAnios =3D array();
+    $optionsAnios[""] =3D ">>Seleccione un A&ntilde;o<<";  =20
+    foreach ($anios as $anio) {
+        $optionsAnios[$anio->getId()] =3D $anio->getDescripcion();
+    }
+    echo select_tag('division[fk_anio_id]', options_for_select($optionsA=
nios, $division->getFkAnioId()) ) ;
+?>


Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/div=
ision/templates/_fk_anio_id.php
___________________________________________________________________
Name: svn:keywords
   + "Id Author URL Date Rev"

Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/templ=
ates/_fk_turnos_id.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=20
     $criteriaT =3D new Criteria();=20
-    $criteriaT->add(CiclolectivoPeer::FK_ESTABLECIMIENTO_ID, $sf_user->g=
etAttribute('fk_establecimiento_id'));   =20
-    $criteriaT->addJoin(TurnosPeer::FK_CICLOLECTIVO_ID, CiclolectivoPeer=
::ID);
+    $criteriaT->add(TurnosPeer::FK_CICLOLECTIVO_ID, $sf_user->getAttribu=
te('fk_ciclolectivo_id'));   =20
     $turnos =3D TurnosPeer::doSelect($criteriaT);
     $optionsTurnos =3D array();
     $optionsTurnos[""] =3D ">>Seleccione un Turno<<";  =20