[Alba-desarrollo] SVN Alba r4919 - in prosistem/alba/trunk/alba/apps/principal/modules: evento/templates horarioescolar/actions horarioescolar/validate

Lun Ago 6 21:43:42 CEST 2007

Author: josx
Date: 2007-08-06 16:43:40 -0300 (Mon, 06 Aug 2007)
New Revision: 4919

Modified:
   prosistem/alba/trunk/alba/apps/principal/modules/evento/templates/_carga_evento.php
   prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php
   prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/validate/edit.yml
Log:
Validacion de horas en Horario escolar. Se incorporo la grafica necesaria en el componente de evento. 

Modified: prosistem/alba/trunk/alba/apps/principal/modules/evento/templates/_carga_evento.php
===================================================================

--- prosistem/alba/trunk/alba/apps/principal/modules/evento/templates/_carga_evento.php	2007-08-06 18:33:21 UTC (rev 4918)
+++ prosistem/alba/trunk/alba/apps/principal/modules/evento/templates/_carga_evento.php	2007-08-06 19:43:40 UTC (rev 4919)
@@ -208,11 +208,17 @@
 
              <div class="form-row">
               <?php echo label_for('evento[fecha_inicio]', __('Inicio:'), 'class="required" ') ?>
-              <div class="content<?php if ($sf_request->hasError('evento{fecha_inicio}')): ?> form-error<?php endif; ?>">
+              <div class="content<?php if ($sf_request->hasError('evento{fecha_inicio}') OR $sf_request->hasError('evento{hora_inicio}') ): ?> form-error<?php endif; ?>">
               <?php if ($sf_request->hasError('evento{fecha_inicio}')): ?>
                 <?php echo form_error('evento{fecha_inicio}', array('class' => 'form-error-msg')) ?>
               <?php endif; ?>
+              
+               <?php if ($sf_request->hasError('evento{hora_inicio}')): ?>
+                <?php echo form_error('evento{hora_inicio}', array('class' => 'form-error-msg')) ?>
+              <?php endif; ?>
 
+              
+
               <?php echo object_input_date_tag($evento, 'getFechaInicio', array (
               'rich' => true,
 //              'withtime' => true,
@@ -227,11 +233,18 @@
 
              <div class="form-row">
               <?php echo label_for('evento[fecha_fin]', __('Fin:'), 'class="required" ') ?>
-              <div class="content<?php if ($sf_request->hasError('evento{fecha_fin}')): ?> form-error<?php endif; ?>">
+
+              <div class="content<?php if ($sf_request->hasError('evento{fecha_fin}') OR $sf_request->hasError('evento{hora_fin}')): ?> form-error<?php endif; ?>">
+
               <?php if ($sf_request->hasError('evento{fecha_fin}')): ?>
                 <?php echo form_error('evento{fecha_fin}', array('class' => 'form-error-msg')) ?>
               <?php endif; ?>
 
+              <?php if ($sf_request->hasError('evento{hora_fin}')): ?>
+                <?php echo form_error('evento{hora_fin}', array('class' => 'form-error-msg')) ?>
+              <?php endif; ?>
+
+
               <?php echo object_input_date_tag($evento, 'getFechaFin', array (
               'rich' => true,
 //              'withtime' => true,

Modified: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php	2007-08-06 18:33:21 UTC (rev 4918)
+++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php	2007-08-06 19:43:40 UTC (rev 4919)
@@ -144,7 +144,9 @@
         'horarioescolar{fk_evento_id}' => 'Evento:',
         'evento{fecha_inicio}' => 'Fecha inicio:',
         'evento{fecha_fin}' => 'Fecha fin:',
-        
+      
+        'evento{hora_inicio}' => 'Hora inicio:',
+        'evento{hora_fin}' => 'Hora fin:',
 
         );
     }

Modified: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/validate/edit.yml
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/validate/edit.yml	2007-08-06 18:33:21 UTC (rev 4918)
+++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/validate/edit.yml	2007-08-06 19:43:40 UTC (rev 4919)
@@ -6,7 +6,10 @@
     - "horarioescolar{fk_horarioescolartipo_id}"
     - "evento{fecha_inicio}"
     - "evento{fecha_fin}"
+    - "evento{hora_inicio}"
+    - "evento{hora_fin}"
 
+
 fillin:
     enabled:       on
       
@@ -29,15 +32,23 @@
         required_msg: El campo tipo de horario escolar es obligatorio
 
     evento{fecha_inicio}:
-        required:     no
+        required:     No
         validators: firstDay
 
     evento{fecha_fin}:
-        required:     no
+        required:     No
         validators: lastDay
 
+    evento{hora_inicio}:
+        required:     No
+        validators: horaInicio
 
+    evento{hora_fin}:
+        required:     No
+        validators: horaFin
 
+
+
         
 caracteresMaximos255:
     class:  sfStringValidator


