Author: josx Date: 2007-01-31 16:12:30 -0300 (Wed, 31 Jan 2007) New Revision: 4143 Removed: prosistem/alba/trunk/alba/apps/principal/modules/feriado/templates/editSuccess.php Modified: prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/feriado/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php Log: En feriado saque el combo de ciclo lectivo y ahora lo toma automaticamente Modified: prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php 2007-01-31 19:01:23 UTC (rev 4142) +++ prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php 2007-01-31 19:12:30 UTC (rev 4143) @@ -94,6 +94,13 @@ $c->add(FeriadoPeer::FK_CICLOLECTIVO_ID,$this->getUser()->getAttribute('fk_ciclolectivo_id')); } + + function saveFeriado($feriado) { + $feriado->setFkCiclolectivoId($this->getUser()->getAttribute('fk_ciclolectivo_id')); + $feriado->save(); + } + + } ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/feriado/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/feriado/config/generator.yml 2007-01-31 19:01:23 UTC (rev 4142) +++ prosistem/alba/trunk/alba/apps/principal/modules/feriado/config/generator.yml 2007-01-31 19:12:30 UTC (rev 4143) @@ -9,6 +9,11 @@ repeticion_anual: { name: Anual, type: checkbox_tag } inamovible: { name: Inamovible, type: checkbox_tag } + edit: + title: Modificar Feriado + display: [ nombre, fecha, repeticion_anual, inamovible ] + + list: title: Listado de Feriados y días no laborales display: [ =nombre, fecha, repeticion_anual, inamovible] @@ -19,6 +24,5 @@ actions: _create : - link_ministerio: { name: Listado oficial, action: LinkMinisterio, icon: small/url.png } - edit: - title: Modificar Feriado + Deleted: prosistem/alba/trunk/alba/apps/principal/modules/feriado/templates/editSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/feriado/templates/editSuccess.php 2007-01-31 19:01:23 UTC (rev 4142) +++ prosistem/alba/trunk/alba/apps/principal/modules/feriado/templates/editSuccess.php 2007-01-31 19:12:30 UTC (rev 4143) @@ -1,128 +0,0 @@ -<?php -// Necesito el template para que el combo de -// los Cliclos lectivos dependa del esteablecimiento donde estoy -// date: 2006/10/09 16:36:25 -?> -<?php use_helpers('Object', 'Validation', 'ObjectAdmin', 'I18N', 'Date') ?> - -<h1><?php echo __('Modificar Feriado', -array()) ?></h1> - -<div id="sf_admin_header"> -<?php include_partial('feriado/edit_header', array('feriado' => $feriado)) ?> -</div> - -<div id="sf_admin_content"> - -<?php if ($sf_request->hasErrors()): ?> -<div class="form-errors"> -<h2><?php echo __('There are some errors that prevent the form to validate') ?></h2> -<ul> -<?php foreach ($sf_request->getErrorNames() as $name): ?> - <li><?php echo $sf_request->getError($name) ?></li> -<?php endforeach; ?> -</ul> -</div> -<?php elseif ($sf_flash->has('notice')): ?> -<div class="save-ok"> -<h2><?php echo __($sf_flash->get('notice')) ?></h2> -</div> -<?php endif; ?> - -<?php echo form_tag('feriado/edit', 'id=sf_admin_edit_form name=sf_admin_edit_form multipart=true') ?> - -<?php echo object_input_hidden_tag($feriado, 'getId') ?> - -<fieldset id="sf_fieldset_none" class=""> -<div class="form-row"> - <?php echo label_for('feriado[nombre]', __('Nombre:'), 'class="required" ') ?> - <div class="content<?php if ($sf_request->hasError('feriado{nombre}')): ?> form-error<?php endif; ?>"> - <?php if ($sf_request->hasError('feriado{nombre}')): ?> - <?php echo form_error('feriado{nombre}', array('class' => 'form-error-msg')) ?> - <?php endif; ?> - - <?php echo object_input_tag($feriado, 'getNombre', array ( - 'size' => 20, - 'control_name' => 'feriado[nombre]', -)) ?> - </div> -</div> - -<div class="form-row"> - <?php echo label_for('feriado[fecha]', __('Fecha:'), 'class="required" ') ?> - <div class="content<?php if ($sf_request->hasError('feriado{fecha}')): ?> form-error<?php endif; ?>"> - <?php if ($sf_request->hasError('feriado{fecha}')): ?> - <?php echo form_error('feriado{fecha}', array('class' => 'form-error-msg')) ?> - <?php endif; ?> - - <?php echo object_input_date_tag($feriado, 'getFecha', array ( - 'rich' => true, - 'withtime' => true, - 'calendar_button_img' => '/sf/images/sf_admin/date.png', - 'control_name' => 'feriado[fecha]', - 'date_format' => 'dd/MM/yy', -)) ?> - </div> -</div> - -<div class="form-row"> - <?php echo label_for('feriado[repeticion_anual]', __('Anual:'), 'class="required" ') ?> - <div class="content<?php if ($sf_request->hasError('feriado{repeticion_anual}')): ?> form-error<?php endif; ?>"> - <?php if ($sf_request->hasError('feriado{repeticion_anual}')): ?> - <?php echo form_error('feriado{repeticion_anual}', array('class' => 'form-error-msg')) ?> - <?php endif; ?> - - <?php echo object_checkbox_tag($feriado, 'getRepeticionAnual', array ( - 'control_name' => 'feriado[repeticion_anual]', -)) ?> - </div> -</div> - -<div class="form-row"> - <?php echo label_for('feriado[inamovible]', __('Inamovible:'), 'class="required" ') ?> - <div class="content<?php if ($sf_request->hasError('feriado{inamovible}')): ?> form-error<?php endif; ?>"> - <?php if ($sf_request->hasError('feriado{inamovible}')): ?> - <?php echo form_error('feriado{inamovible}', array('class' => 'form-error-msg')) ?> - <?php endif; ?> - - <?php echo object_checkbox_tag($feriado, 'getInamovible', array ( - 'control_name' => 'feriado[inamovible]', -)) ?> - </div> -</div> - -<div class="form-row"> - <?php echo label_for('feriado[fk_ciclolectivo_id]', __('Ciclo Lectivo:'), 'class="required" ') ?> - <div class="content<?php if ($sf_request->hasError('feriado{fk_ciclolectivo_id}')): ?> form-error<?php endif; ?>"> - <?php if ($sf_request->hasError('feriado{fk_ciclolectivo_id}')): ?> - <?php echo form_error('feriado{fk_ciclolectivo_id}', array('class' => 'form-error-msg')) ?> - <?php endif; ?> - - <?php echo object_select_tag($feriado, 'getFkCiclolectivoId', array ( - 'related_class' => 'Ciclolectivo', - 'control_name' => 'feriado[fk_ciclolectivo_id]', -)) ?> - </div> -</div> - -</fieldset> - -<?php echo include_partial('edit_actions', array('feriado' => $feriado)) ?> - -</form> - -<ul class="sf_admin_actions"> - <li class="float-left"><?php if ($feriado->getId()): ?> -<?php echo button_to(__('delete'), 'feriado/delete?id='.$feriado->getId(), array ( - 'post' => true, - 'confirm' => __('Are you sure?'), - 'class' => 'sf_admin_action_delete', -)) ?><?php endif; ?> -</li> - </ul> - -</div> - -<div id="sf_admin_footer"> -<?php include_partial('feriado/edit_footer', array('feriado' => $feriado)) ?> -</div> Modified: prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php 2007-01-31 19:01:23 UTC (rev 4142) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php 2007-01-31 19:12:30 UTC (rev 4143) @@ -22,8 +22,8 @@ * Turnos Acciones * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author José Luis Di Biase <[email protected]> + * @author Héctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource