[Alba-desarrollo] SVN Alba r6308 - in prosistem/alba/trunk/alba: apps/principal/modules/boletin/actions lib/filter/base lib/form/base

16 Dec 2009

Author: josx
Date: 2009-12-16 15:32:27 -0300 (Wed, 16 Dec 2009)
New Revision: 6308

Modified:
   prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php
   prosistem/alba/trunk/alba/lib/filter/base/BaseDocenteFormFilter.class.php
   prosistem/alba/trunk/alba/lib/form/base/BaseDocenteForm.class.php
Log:
Filtrando los campos de periodos calculables a la hora de dar de alta las notas

Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php
===================================================================

--- prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php	2009-12-16 18:26:28 UTC (rev 6307)
+++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php	2009-12-16 18:32:27 UTC (rev 6308)
@@ -171,7 +171,9 @@
             $aAlumno = $this->getAlumnos($division_id);
             $criteria = new Criteria();
             $criteria->add(PeriodoPeer::FK_CICLOLECTIVO_ID, $this->getUser()->getAttribute('fk_ciclolectivo_id'));
+            $criteria->add(PeriodoPeer::CALCULAR, false);
             $aPeriodo = PeriodoPeer::doSelect($criteria);
+
             $optionsPeriodo[] = "";
             foreach($aPeriodo as $periodo) {
                 $optionsPeriodo[$periodo->getId()] = $periodo->getDescripcion();
@@ -270,6 +272,7 @@
 
         $criteria = new Criteria();
         $criteria->add(PeriodoPeer::FK_CICLOLECTIVO_ID, $this->getUser()->getAttribute('fk_ciclolectivo_id'));
+        $criteria->add(PeriodoPeer::CALCULAR, false);
         $aPeriodo = PeriodoPeer::doSelect($criteria);
         $optionsPeriodo[] = "Todos";
         foreach($aPeriodo as $periodo) {

Modified: prosistem/alba/trunk/alba/lib/filter/base/BaseDocenteFormFilter.class.php
===================================================================
--- prosistem/alba/trunk/alba/lib/filter/base/BaseDocenteFormFilter.class.php	2009-12-16 18:26:28 UTC (rev 6307)
+++ prosistem/alba/trunk/alba/lib/filter/base/BaseDocenteFormFilter.class.php	2009-12-16 18:32:27 UTC (rev 6308)
@@ -37,8 +37,8 @@
       'activo'                          => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))),
       'fk_provincia_id'                 => new sfWidgetFormPropelChoice(array('model' => 'Provincia', 'add_empty' => true)),
       'fk_pais_id'                      => new sfWidgetFormPropelChoice(array('model' => 'Pais', 'add_empty' => true)),
+      'rel_anio_actividad_docente_list' => new sfWidgetFormPropelChoice(array('model' => 'RelAnioActividad', 'add_empty' => true)),
       'docente_horario_list'            => new sfWidgetFormPropelChoice(array('model' => 'Evento', 'add_empty' => true)),
-      'rel_anio_actividad_docente_list' => new sfWidgetFormPropelChoice(array('model' => 'RelAnioActividad', 'add_empty' => true)),
     ));
 
     $this->setValidators(array(
@@ -64,8 +64,8 @@
       'activo'                          => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))),
       'fk_provincia_id'                 => new sfValidatorPropelChoice(array('required' => false, 'model' => 'Provincia', 'column' => 'id')),
       'fk_pais_id'                      => new sfValidatorPropelChoice(array('required' => false, 'model' => 'Pais', 'column' => 'id')),
+      'rel_anio_actividad_docente_list' => new sfValidatorPropelChoice(array('model' => 'RelAnioActividad', 'required' => false)),
       'docente_horario_list'            => new sfValidatorPropelChoice(array('model' => 'Evento', 'required' => false)),
-      'rel_anio_actividad_docente_list' => new sfValidatorPropelChoice(array('model' => 'RelAnioActividad', 'required' => false)),
     ));
 
     $this->widgetSchema->setNameFormat('docente_filters[%s]');
@@ -75,7 +75,7 @@
     parent::setup();
   }
 
-  public function addDocenteHorarioListColumnCriteria(Criteria $criteria, $field, $values)
+  public function addRelAnioActividadDocenteListColumnCriteria(Criteria $criteria, $field, $values)
   {
     if (!is_array($values))
     {
@@ -87,20 +87,20 @@
       return;
     }
 
-    $criteria->addJoin(DocenteHorarioPeer::FK_DOCENTE_ID, DocentePeer::ID);
+    $criteria->addJoin(RelAnioActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID);
 
     $value = array_pop($values);
-    $criterion = $criteria->getNewCriterion(DocenteHorarioPeer::FK_EVENTO_ID, $value);
+    $criterion = $criteria->getNewCriterion(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $value);
 
     foreach ($values as $value)
     {
-      $criterion->addOr($criteria->getNewCriterion(DocenteHorarioPeer::FK_EVENTO_ID, $value));
+      $criterion->addOr($criteria->getNewCriterion(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $value));
     }
 
     $criteria->add($criterion);
   }
 
-  public function addRelAnioActividadDocenteListColumnCriteria(Criteria $criteria, $field, $values)
+  public function addDocenteHorarioListColumnCriteria(Criteria $criteria, $field, $values)
   {
     if (!is_array($values))
     {
@@ -112,14 +112,14 @@
       return;
     }
 
-    $criteria->addJoin(RelAnioActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID);
+    $criteria->addJoin(DocenteHorarioPeer::FK_DOCENTE_ID, DocentePeer::ID);
 
     $value = array_pop($values);
-    $criterion = $criteria->getNewCriterion(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $value);
+    $criterion = $criteria->getNewCriterion(DocenteHorarioPeer::FK_EVENTO_ID, $value);
 
     foreach ($values as $value)
     {
-      $criterion->addOr($criteria->getNewCriterion(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $value));
+      $criterion->addOr($criteria->getNewCriterion(DocenteHorarioPeer::FK_EVENTO_ID, $value));
     }
 
     $criteria->add($criterion);
@@ -156,8 +156,8 @@
       'activo'                          => 'Boolean',
       'fk_provincia_id'                 => 'ForeignKey',
       'fk_pais_id'                      => 'ForeignKey',
+      'rel_anio_actividad_docente_list' => 'ManyKey',
       'docente_horario_list'            => 'ManyKey',
-      'rel_anio_actividad_docente_list' => 'ManyKey',
     );
   }
 }

Modified: prosistem/alba/trunk/alba/lib/form/base/BaseDocenteForm.class.php
===================================================================
--- prosistem/alba/trunk/alba/lib/form/base/BaseDocenteForm.class.php	2009-12-16 18:26:28 UTC (rev 6307)
+++ prosistem/alba/trunk/alba/lib/form/base/BaseDocenteForm.class.php	2009-12-16 18:32:27 UTC (rev 6308)
@@ -36,8 +36,8 @@
       'activo'                          => new sfWidgetFormInputCheckbox(),
       'fk_provincia_id'                 => new sfWidgetFormPropelChoice(array('model' => 'Provincia', 'add_empty' => false)),
       'fk_pais_id'                      => new sfWidgetFormPropelChoice(array('model' => 'Pais', 'add_empty' => false)),
+      'rel_anio_actividad_docente_list' => new sfWidgetFormPropelChoiceMany(array('model' => 'RelAnioActividad')),
       'docente_horario_list'            => new sfWidgetFormPropelChoiceMany(array('model' => 'Evento')),
-      'rel_anio_actividad_docente_list' => new sfWidgetFormPropelChoiceMany(array('model' => 'RelAnioActividad')),
     ));
 
     $this->setValidators(array(
@@ -64,8 +64,8 @@
       'activo'                          => new sfValidatorBoolean(array('required' => false)),
       'fk_provincia_id'                 => new sfValidatorPropelChoice(array('model' => 'Provincia', 'column' => 'id')),
       'fk_pais_id'                      => new sfValidatorPropelChoice(array('model' => 'Pais', 'column' => 'id')),
+      'rel_anio_actividad_docente_list' => new sfValidatorPropelChoiceMany(array('model' => 'RelAnioActividad', 'required' => false)),
       'docente_horario_list'            => new sfValidatorPropelChoiceMany(array('model' => 'Evento', 'required' => false)),
-      'rel_anio_actividad_docente_list' => new sfValidatorPropelChoiceMany(array('model' => 'RelAnioActividad', 'required' => false)),
     ));
 
     $this->widgetSchema->setNameFormat('docente[%s]');
@@ -85,26 +85,26 @@
   {
     parent::updateDefaultsFromObject();
 
-    if (isset($this->widgetSchema['docente_horario_list']))
+    if (isset($this->widgetSchema['rel_anio_actividad_docente_list']))
     {
       $values = array();
-      foreach ($this->object->getDocenteHorarios() as $obj)
+      foreach ($this->object->getRelAnioActividadDocentes() as $obj)
       {
-        $values[] = $obj->getFkEventoId();
+        $values[] = $obj->getFkAnioActividadId();
       }
 
-      $this->setDefault('docente_horario_list', $values);
+      $this->setDefault('rel_anio_actividad_docente_list', $values);
     }
 
-    if (isset($this->widgetSchema['rel_anio_actividad_docente_list']))
+    if (isset($this->widgetSchema['docente_horario_list']))
     {
       $values = array();
-      foreach ($this->object->getRelAnioActividadDocentes() as $obj)
+      foreach ($this->object->getDocenteHorarios() as $obj)
       {
-        $values[] = $obj->getFkAnioActividadId();
+        $values[] = $obj->getFkEventoId();
       }
 
-      $this->setDefault('rel_anio_actividad_docente_list', $values);
+      $this->setDefault('docente_horario_list', $values);
     }
 
   }
@@ -113,18 +113,18 @@
   {
     parent::doSave($con);
 
+    $this->saveRelAnioActividadDocenteList($con);
     $this->saveDocenteHorarioList($con);
-    $this->saveRelAnioActividadDocenteList($con);
   }
 
-  public function saveDocenteHorarioList($con = null)
+  public function saveRelAnioActividadDocenteList($con = null)
   {
     if (!$this->isValid())
     {
       throw $this->getErrorSchema();
     }
 
-    if (!isset($this->widgetSchema['docente_horario_list']))
+    if (!isset($this->widgetSchema['rel_anio_actividad_docente_list']))
     {
       // somebody has unset this widget
       return;
@@ -136,30 +136,30 @@
     }
 
     $c = new Criteria();
-    $c->add(DocenteHorarioPeer::FK_DOCENTE_ID, $this->object->getPrimaryKey());
-    DocenteHorarioPeer::doDelete($c, $con);
+    $c->add(RelAnioActividadDocentePeer::FK_DOCENTE_ID, $this->object->getPrimaryKey());
+    RelAnioActividadDocentePeer::doDelete($c, $con);
 
-    $values = $this->getValue('docente_horario_list');
+    $values = $this->getValue('rel_anio_actividad_docente_list');
     if (is_array($values))
     {
       foreach ($values as $value)
       {
-        $obj = new DocenteHorario();
+        $obj = new RelAnioActividadDocente();
         $obj->setFkDocenteId($this->object->getPrimaryKey());
-        $obj->setFkEventoId($value);
+        $obj->setFkAnioActividadId($value);
         $obj->save();
       }
     }
   }
 
-  public function saveRelAnioActividadDocenteList($con = null)
+  public function saveDocenteHorarioList($con = null)
   {
     if (!$this->isValid())
     {
       throw $this->getErrorSchema();
     }
 
-    if (!isset($this->widgetSchema['rel_anio_actividad_docente_list']))
+    if (!isset($this->widgetSchema['docente_horario_list']))
     {
       // somebody has unset this widget
       return;
@@ -171,17 +171,17 @@
     }
 
     $c = new Criteria();
-    $c->add(RelAnioActividadDocentePeer::FK_DOCENTE_ID, $this->object->getPrimaryKey());
-    RelAnioActividadDocentePeer::doDelete($c, $con);
+    $c->add(DocenteHorarioPeer::FK_DOCENTE_ID, $this->object->getPrimaryKey());
+    DocenteHorarioPeer::doDelete($c, $con);
 
-    $values = $this->getValue('rel_anio_actividad_docente_list');
+    $values = $this->getValue('docente_horario_list');
     if (is_array($values))
     {
       foreach ($values as $value)
       {
-        $obj = new RelAnioActividadDocente();
+        $obj = new DocenteHorario();
         $obj->setFkDocenteId($this->object->getPrimaryKey());
-        $obj->setFkAnioActividadId($value);
+        $obj->setFkEventoId($value);
         $obj->save();
       }
     }

    

[Alba-desarrollo] SVN Alba r6308 - in prosistem/alba/trunk/alba: apps/principal/modules/boletin/actions lib/filter/base lib/form/base

commits＠pressenter.com.ar