Author: josx Date: 2007-02-28 18:57:49 -0300 (Wed, 28 Feb 2007) New Revision: 4349 Added: prosistem/alba/trunk/alba/apps/principal/modules/espacios/templates/_fk_locacion_id.php prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/_turnos_list.php Removed: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/_turnos_select.php Modified: prosistem/alba/trunk/alba/apps/principal/modules/espacios/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/espacios/templates/_locacion.php prosistem/alba/trunk/alba/apps/principal/modules/espacios/validate/edit.yml prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/_fk_turnos_id.php prosistem/alba/trunk/alba/apps/principal/modules/tipoespacio/validate/edit.yml Log: Arreglo para validar fk_locacion_id en espacio (ticket #167) Modified: prosistem/alba/trunk/alba/apps/principal/modules/espacios/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/espacios/config/generator.yml 2007-02-28 21:32:19 UTC (rev 4348) +++ prosistem/alba/trunk/alba/apps/principal/modules/espacios/config/generator.yml 2007-02-28 21:57:49 UTC (rev 4349) @@ -28,7 +28,7 @@ title: Editar Espacio fields: fk_tipoespacio_id: { params: include_custom=>>Seleccione un Espacio<<} - display: [ nombre, m2, capacidad, descripcion, estado, fk_tipoespacio_id, _locacion ] + display: [ nombre, m2, capacidad, descripcion, estado, fk_tipoespacio_id, _fk_locacion_id ] actions: _delete: - _save: - Added: prosistem/alba/trunk/alba/apps/principal/modules/espacios/templates/_fk_locacion_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/espacios/templates/_fk_locacion_id.php 2007-02-28 21:32:19 UTC (rev 4348) +++ prosistem/alba/trunk/alba/apps/principal/modules/espacios/templates/_fk_locacion_id.php 2007-02-28 21:57:49 UTC (rev 4349) @@ -0,0 +1,13 @@ +<? + $aLocacion = Array(); + $aLocacion[""] = ">>Seleccione una Locación<<"; + $c = new Criteria(); + $c->add(RelEstablecimientoLocacionPeer::FK_ESTABLECIMIENTO_ID, $sf_user->getAttribute('fk_establecimiento_id')); + $locaciones = RelEstablecimientoLocacionPeer::doSelect($c); + foreach($locaciones as $locacion) { + $aLocacion[$locacion->getFkLocacionId()] = $locacion->getLocacion()->getNombre(); + } + +// use_helper("Object"); + echo select_tag('espacio[fk_locacion_id]', options_for_select($aLocacion, $espacio->getFkLocacionId())); +?> Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/espacios/templates/_fk_locacion_id.php ___________________________________________________________________ Name: svn:keywords + Id Date Author Rev URL Modified: prosistem/alba/trunk/alba/apps/principal/modules/espacios/templates/_locacion.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/espacios/templates/_locacion.php 2007-02-28 21:32:19 UTC (rev 4348) +++ prosistem/alba/trunk/alba/apps/principal/modules/espacios/templates/_locacion.php 2007-02-28 21:57:49 UTC (rev 4349) @@ -1,6 +1,6 @@ <? $aLocacion = Array(); - $aLocacion[] = ">>Seleccione una Locación<<"; + $aLocacion[""] = ">>Seleccione una Locación<<"; $c = new Criteria(); $c->add(RelEstablecimientoLocacionPeer::FK_ESTABLECIMIENTO_ID, $sf_user->getAttribute('fk_establecimiento_id')); $locaciones = RelEstablecimientoLocacionPeer::doSelect($c); @@ -8,6 +8,6 @@ $aLocacion[$locacion->getFkLocacionId()] = $locacion->getLocacion()->getNombre(); } - use_helper("Object"); +// use_helper("Object"); echo select_tag('espacio[fk_locacion_id]', options_for_select($aLocacion, $espacio->getFkLocacionId())); -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/espacios/validate/edit.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/espacios/validate/edit.yml 2007-02-28 21:32:19 UTC (rev 4348) +++ prosistem/alba/trunk/alba/apps/principal/modules/espacios/validate/edit.yml 2007-02-28 21:57:49 UTC (rev 4349) @@ -5,6 +5,9 @@ - "espacio{capacidad}" - "espacio{descripcion}" - "espacio{estado}" + - "espacio{fk_locacion_id}" + - "espacio{fk_tipoespacio_id}" + fillin: enabled: on @@ -31,6 +34,14 @@ espacio{estado}: required: No validators: caracteresMaximos255 + + espacio{fk_locacion_id}: + required: Yes + required_msg: El campo Locación es obligatorio + + espacio{fk_tipoespacio_id}: + required: Yes + required_msg: El campo tipo de espacio es obligatorio caracteresMaximos128: Modified: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/config/generator.yml 2007-02-28 21:32:19 UTC (rev 4348) +++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/config/generator.yml 2007-02-28 21:57:49 UTC (rev 4349) @@ -14,14 +14,14 @@ dia_mostrar: { name: Día} fk_establecimiento_id: { name: Establecimiento} fk_turnos_id: { name: Turno} - turnos_select: { name: Turno} + turnos_list: { name: Turno} edit: title: Modificar Horario Escolar - display: [nombre, descripcion, _dia, _hora_inicio, _hora_fin, fk_horarioescolartipo_id, _turnos_select ] + display: [nombre, descripcion, _dia, _hora_inicio, _hora_fin, fk_horarioescolartipo_id, _fk_turnos_id ] list: - display: [=nombre, descripcion, _dia_mostrar , hora_inicio, hora_fin, _fk_horarioescolartipo_id, _fk_establecimiento_id, _fk_turnos_id ] + display: [=nombre, descripcion, _dia_mostrar , hora_inicio, hora_fin, _fk_horarioescolartipo_id, _fk_establecimiento_id, _turnos_list ] title: Listado de Horario Escolar object_actions: _edit: - Modified: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/_fk_turnos_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/_fk_turnos_id.php 2007-02-28 21:32:19 UTC (rev 4348) +++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/_fk_turnos_id.php 2007-02-28 21:57:49 UTC (rev 4349) @@ -1 +1,11 @@ -<? echo $horarioescolar->getTurnos()->getDescripcion();?> \ No newline at end of file +<? + $aTurnos = array(); + $c = new Criteria(); + $c->add(TurnosPeer::FK_CICLOLECTIVO_ID,$sf_user->getAttribute('fk_ciclolectivo_id')); + $sqlTurnos = TurnosPeer::doSelect($c); + foreach($sqlTurnos as $turnos) { + $aTurnos[$turnos->getId()] = $turnos->getDescripcion(); + } + + echo select_tag("horarioescolar[fk_turnos_id]", options_for_select($aTurnos, $horarioescolar->getFkTurnosId())); +?> \ No newline at end of file Added: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/_turnos_list.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/_turnos_list.php 2007-02-28 21:32:19 UTC (rev 4348) +++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/_turnos_list.php 2007-02-28 21:57:49 UTC (rev 4349) @@ -0,0 +1 @@ +<? echo $horarioescolar->getTurnos()->getDescripcion();?> \ No newline at end of file Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/_turnos_list.php ___________________________________________________________________ Name: svn:keywords + Id Date Author Rev URL Deleted: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/_turnos_select.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/_turnos_select.php 2007-02-28 21:32:19 UTC (rev 4348) +++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/_turnos_select.php 2007-02-28 21:57:49 UTC (rev 4349) @@ -1,16 +0,0 @@ -<div class="content<?php if ($sf_request->hasError('horarioescolar{fk_turnos_id}')): ?> form-error<?php endif; ?>"> -<?php if ($sf_request->hasError('horarioescolar{fk_turnos_id}')): ?> - <?php echo form_error('horarioescolar{fk_turnos_id}', array('class' => 'form-error-msg')) ?> -<?php endif; ?> -</div> -<? - $aTurnos = array(); - $c = new Criteria(); - $c->add(TurnosPeer::FK_CICLOLECTIVO_ID,$sf_user->getAttribute('fk_ciclolectivo_id')); - $sqlTurnos = TurnosPeer::doSelect($c); - foreach($sqlTurnos as $turnos) { - $aTurnos[$turnos->getId()] = $turnos->getDescripcion(); - } - - echo select_tag("horarioescolar[fk_turnos_id]", options_for_select($aTurnos, $horarioescolar->getFkTurnosId())); -?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipoespacio/validate/edit.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipoespacio/validate/edit.yml 2007-02-28 21:32:19 UTC (rev 4348) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipoespacio/validate/edit.yml 2007-02-28 21:57:49 UTC (rev 4349) @@ -15,8 +15,9 @@ tipoespacio{descripcion}: required: No validators: caracteresMaximos255 + + - caracteresMaximos128: class: sfStringValidator param: