[Alba-desarrollo] SVN Alba r4491 - in prosistem/alba/trunk/alba/apps/principal/modules: alumno/actions legajopedagogico/actions legajopedagogico/templates

[commits en pressenter.com.ar]

Author: josx
Date: 2007-03-19 10:58:20 -0300 (Mon, 19 Mar 2007)
New Revision: 4491

Modified:
   prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php
   prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/actions/actions.class.php
   prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/templates/indexSuccess.php
Log:
Ahora la busqueda en Buscar alumno para... muestra los que no tienen division [200]

Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php	2007-03-16 23:09:57 UTC (rev 4490)
+++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php	2007-03-19 13:58:20 UTC (rev 4491)
@@ -243,5 +243,14 @@
         $this->provincias = ProvinciaPeer::getEnOrden($c);
     }
 
+
+    function executeIrCuenta(){
+        if ($this->getRequestParameter('id')) {
+            $this->redirect('cuenta/verCompleta?id='.$this->getRequestParameter('id'));
+        } else {
+            $this->redirect('alumno/list');
+        }
+    }
+
 }
 ?>
\ No newline at end of file

Modified: prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/actions/actions.class.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/actions/actions.class.php	2007-03-16 23:09:57 UTC (rev 4490)
+++ prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/actions/actions.class.php	2007-03-19 13:58:20 UTC (rev 4491)
@@ -68,9 +68,10 @@
             $criteria = new Criteria();
             if($division_id) {
                 $criteria->add(DivisionPeer::ID, $division_id);
+                $criteria->addJoin(RelAlumnoDivisionPeer::FK_ALUMNO_ID, AlumnoPeer::ID);
+                $criteria->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, DivisionPeer::ID);
             }
-            $criteria->addJoin(RelAlumnoDivisionPeer::FK_ALUMNO_ID, AlumnoPeer::ID);
-            $criteria->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, DivisionPeer::ID);
+            
         
             if($txt) {
                 $cton1 = $criteria->getNewCriterion(AlumnoPeer::NOMBRE, "%$txt%", Criteria::LIKE);
@@ -79,16 +80,16 @@
                 $criteria->add($cton1);
             }
 
-            $criteria->addAsColumn("alumno_id", AlumnoPeer::ID);
-            $criteria->addAsColumn("alumno_nombre", AlumnoPeer::NOMBRE);
-            $criteria->addAsColumn("alumno_apellido", AlumnoPeer::APELLIDO);
-            $criteria->addAsColumn("division_id", DivisionPeer::ID);
-            $criteria->addAsColumn("division_descripcion", DivisionPeer::DESCRIPCION);
+//             $criteria->addAsColumn("alumno_id", AlumnoPeer::ID);
+//             $criteria->addAsColumn("alumno_nombre", AlumnoPeer::NOMBRE);
+//             $criteria->addAsColumn("alumno_apellido", AlumnoPeer::APELLIDO);
+//             $criteria->addAsColumn("division_id", DivisionPeer::ID);
+//             $criteria->addAsColumn("division_descripcion", DivisionPeer::DESCRIPCION);
 
-            $alumnos = BasePeer::doSelect($criteria);
-            foreach($alumnos as $alumno) {
-                $aAlumno[] = (object) array( 'alumno_id' => $alumno[0],'alumno_nombre' => $alumno[1], 'alumno_apellido' => $alumno[2] );
-            }
+            $aAlumno = AlumnoPeer::doSelect($criteria);
+//             foreach($alumnos as $alumno) {
+//                 $aAlumno[] = (object) array( 'alumno_id' => $alumno[0],'alumno_nombre' => $alumno[1], 'alumno_apellido' => $alumno[2] );
+//             }
     
         }
 
@@ -337,4 +338,5 @@
     }
 
 
+
 }
\ No newline at end of file

Modified: prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/templates/indexSuccess.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/templates/indexSuccess.php	2007-03-16 23:09:57 UTC (rev 4490)
+++ prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/templates/indexSuccess.php	2007-03-19 13:58:20 UTC (rev 4491)
@@ -26,10 +26,10 @@
 </form>
 
 
-<? if (count($aAlumno) > 0) {
+<?php if (count($aAlumno) > 0) {
     if ($txt) { ?>
     Usted busco -<?=$txt?>-
-    <? } ?>
+    <?php } ?>
 <h1>Alumnos</h1>
 <table cellspacing="0" class="sf_admin_list">
   <thead>
@@ -40,23 +40,23 @@
   </thead>
 
   <tbody>
-<?
+<?php
     $i = 0;
     foreach($aAlumno as $alumno){
 ?>
   <tr class="sf_admin_row_0">
-    <td><?echo $alumno->alumno_apellido." ".$alumno->alumno_nombre; ?></td>
+    <td><?echo $alumno->getApellido()." ".$alumno->getNombre(); ?></td>
     <td>
     <ul class="sf_admin_td_actions">
-     <li><?php echo link_to(image_tag(sfConfig::get('sf_admin_web_dir').'/images/edit_icon.png', array('alt' => 'editar', 'title' => 'Editar')) , 'alumno?action=edit&id='.$alumno->alumno_id); ?></li>
+     <li><?php echo link_to(image_tag(sfConfig::get('sf_admin_web_dir').'/images/edit_icon.png', array('alt' => 'editar', 'title' => 'Editar')) , 'alumno?action=edit&id='.$alumno->getId()); ?></li>
     &nbsp;
-    <li><?php echo link_to(image_tag('small/legajo.png', array('alt' => __('verLegajo'), 'title' => 'Ver el legajo')), 'legajopedagogico?action=verLegajo&aid='.$alumno->alumno_id); ?></li>  
+    <li><?php echo link_to(image_tag('small/legajo.png', array('alt' => __('verLegajo'), 'title' => 'Ver el legajo')), 'legajopedagogico?action=verLegajo&aid='.$alumno->getId()); ?></li>  
     &nbsp;
-    <li><?php echo link_to(image_tag('small/asistencia.png', array('alt' => 'Asistencia', 'title' => 'Asistencia')) , 'asistencia?action=index&vistas=2&alumno_id='.$alumno->alumno_id); ?></li>
+    <li><?php echo link_to(image_tag('small/asistencia.png', array('alt' => 'Asistencia', 'title' => 'Asistencia')) , 'asistencia?action=index&vistas=2&alumno_id='.$alumno->getId()); ?></li>
   &nbsp;    
-    <li><?php echo link_to(image_tag('jeringa.gif', array('alt' => __('Vacunas'), 'title' => __('Vacunas'))), 'alumno?action=vacunas&id='.$alumno->alumno_id); ?></li>
+    <li><?php echo link_to(image_tag('jeringa.gif', array('alt' => __('Vacunas'), 'title' => __('Vacunas'))), 'alumno?action=vacunas&id='.$alumno->getId()); ?></li>
   &nbsp;    
-    <li><?php echo link_to(image_tag('next.png', array('alt' => 'Cuenta', 'title' => 'Cuenta')), 'alumno?action=irCuenta&id='.$alumno->alumno_id); ?></li>
+    <li><?php echo link_to(image_tag('next.png', array('alt' => 'Cuenta', 'title' => 'Cuenta')), 'alumno?action=irCuenta&id='.$alumno->getFkCuentaId()); ?></li>
     </ul>
     </td>
   </tr>
@@ -64,7 +64,7 @@
   </tbody>
 </table>
 
-<? } else {
+<?php } else {
     if ($txt) { ?>
         Su b&uacute;squeda por -<?=$txt?>- no ha encontrado alumnos.
     <? }