mostrar solo los grados del ciclo lectivo actual

proyectoalba · Feb 26, 2012 · 8692535 · 8692535
1 parent e7f3ab4
commit 8692535
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/apps/principal/modules/informes/actions/actions.class.php b/apps/principal/modules/informes/actions/actions.class.php
@@ -735,8 +735,16 @@ function isNotAssocArray($arr) {
   private function _getDivisiones($establecimiento_id) {
     $optionsDivision = array();
     $criteria = new Criteria();
+    $criteria->addJoin(DivisionPeer::FK_ANIO_ID, AnioPeer::ID);
+    $criteria->addJoin(DivisionPeer::FK_TURNO_ID, TurnoPeer::ID);
+    $criteria->addJoin(TurnoPeer::FK_CICLOLECTIVO_ID, CiclolectivoPeer::ID);
+
     $criteria->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $establecimiento_id);
+    $criteria->add(TurnoPeer::FK_CICLOLECTIVO_ID, $this->getUser()->getAttribute('fk_ciclolectivo_id'));
+
+    $criteria->addAscendingOrderByColumn(AnioPeer::ORDEN);
     $criteria->addAscendingOrderByColumn(DivisionPeer::ORDEN);
+
     $divisiones = DivisionPeer::doSelectJoinAnio($criteria);
     $optionsDivision[''] = "";
     foreach ($divisiones as $division) {
@@ -917,4 +925,4 @@ public function executeAyuda() {
   }
 
 }
-?>
+?>