[Alba-desarrollo] SVN Alba r4710 - in prosistem/alba/trunk/alba/apps/principal/modules/asistencia: actions templates

Mie Jun 6 19:17:41 CEST 2007

Author: hsanchez
Date: 2007-06-06 14:17:40 -0300 (Wed, 06 Jun 2007)
New Revision: 4710

Modified:
   prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php
   prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php
Log:
Corrigiendo orden de las divisiones y anos , y el template Ticket:#223

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

--- prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php	2007-06-06 04:03:48 UTC (rev 4709)
+++ prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php	2007-06-06 17:17:40 UTC (rev 4710)
@@ -115,7 +115,9 @@
 
         $criteria = new Criteria();
         $criteria->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $establecimiento_id);
+        $criteria->addAscendingOrderByColumn(AnioPeer::DESCRIPCION);           
         $criteria->addAscendingOrderByColumn(DivisionPeer::ORDEN);           
+        $criteria->addAscendingOrderByColumn(DivisionPeer::DESCRIPCION);           
         $divisiones = DivisionPeer::doSelectJoinAnio($criteria);        // divisiones a mostrar
 
         foreach ($divisiones as $division) {

Modified: prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php	2007-06-06 04:03:48 UTC (rev 4709)
+++ prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php	2007-06-06 17:17:40 UTC (rev 4710)
@@ -55,7 +55,7 @@
             <tr>
 
                 <td>
-                    <?php echo label_for('division_id', __('Divisi&oacute;n:'), 'class="required" '); ?>
+                    <?php echo label_for('division_id', __('A&ntilde;o/Divisi&oacute;n:'), 'class="required" '); ?>
                 </td>
                 <td>
                     <?php echo select_tag('division_id', options_for_select($optionsDivision, $division_id)); ?>
@@ -271,4 +271,4 @@
         </ul>
         </div>
 <?php } ?>
-</div>
\ No newline at end of file
+</div>


