[Alba-desarrollo] SVN Alba r4143 - in
prosistem/alba/trunk/alba/apps/principal/modules:
feriado/actions feriado/config feriado/templates turnos/actions
commits en pressenter.com.ar
commits en pressenter.com.ar
Mie Ene 31 20:12:33 CET 2007
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/edi=
tSuccess.php
Modified:
prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actio=
ns.class.php
prosistem/alba/trunk/alba/apps/principal/modules/feriado/config/genera=
tor.yml
prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/action=
s.class.php
Log:
En feriado saque el combo de ciclo lectivo y ahora lo toma automaticament=
e
Modified: prosistem/alba/trunk/alba/apps/principal/modules/feriado/action=
s/actions.class.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/acti=
ons.class.php 2007-01-31 19:01:23 UTC (rev 4142)
+++ prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/acti=
ons.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'));
} =
=20
=20
+
+ function saveFeriado($feriado) {
+ $feriado->setFkCiclolectivoId($this->getUser()->getAttribute('fk=
_ciclolectivo_id'));
+ $feriado->save();
+ }
+
+
}
=20
?>
\ No newline at end of file
Modified: prosistem/alba/trunk/alba/apps/principal/modules/feriado/config=
/generator.yml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/apps/principal/modules/feriado/config/gener=
ator.yml 2007-01-31 19:01:23 UTC (rev 4142)
+++ prosistem/alba/trunk/alba/apps/principal/modules/feriado/config/gener=
ator.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 }
=20
+ edit:
+ title: Modificar Feriado
+ display: [ nombre, fecha, repeticion_anual, inamovible ]
+ =20
+
list:
title: Listado de Feriados y días no laborales
display: [ =3Dnombre, fecha, repeticion_anual, inamovible]
@@ -19,6 +24,5 @@
actions:
_create : -
link_ministerio: { name: Listado oficial, action: LinkMinist=
erio, icon: small/url.png }
- edit:
- title: Modificar Feriado
+ =20
=20
Deleted: prosistem/alba/trunk/alba/apps/principal/modules/feriado/templat=
es/editSuccess.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/apps/principal/modules/feriado/templates/ed=
itSuccess.php 2007-01-31 19:01:23 UTC (rev 4142)
+++ prosistem/alba/trunk/alba/apps/principal/modules/feriado/templates/ed=
itSuccess.php 2007-01-31 19:12:30 UTC (rev 4143)
@@ -1,128 +0,0 @@
-<?php
-// Necesito el template para que el combo de=20
-// 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',=20
-array()) ?></h1>
-
-<div id=3D"sf_admin_header">
-<?php include_partial('feriado/edit_header', array('feriado' =3D> $feria=
do)) ?>
-</div>
-
-<div id=3D"sf_admin_content">
-
-<?php if ($sf_request->hasErrors()): ?>
-<div class=3D"form-errors">
-<h2><?php echo __('There are some errors that prevent the form to valida=
te') ?></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=3D"save-ok">
-<h2><?php echo __($sf_flash->get('notice')) ?></h2>
-</div>
-<?php endif; ?>
-
-<?php echo form_tag('feriado/edit', 'id=3Dsf_admin_edit_form name=3Dsf_a=
dmin_edit_form multipart=3Dtrue') ?>
-
-<?php echo object_input_hidden_tag($feriado, 'getId') ?>
-
-<fieldset id=3D"sf_fieldset_none" class=3D"">
-<div class=3D"form-row">
- <?php echo label_for('feriado[nombre]', __('Nombre:'), 'class=3D"requi=
red" ') ?>
- <div class=3D"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' =3D> 'form-er=
ror-msg')) ?>
- <?php endif; ?>
-
- <?php echo object_input_tag($feriado, 'getNombre', array (
- 'size' =3D> 20,
- 'control_name' =3D> 'feriado[nombre]',
-)) ?>
- </div>
-</div>
-
-<div class=3D"form-row">
- <?php echo label_for('feriado[fecha]', __('Fecha:'), 'class=3D"require=
d" ') ?>
- <div class=3D"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' =3D> 'form-err=
or-msg')) ?>
- <?php endif; ?>
-
- <?php echo object_input_date_tag($feriado, 'getFecha', array (
- 'rich' =3D> true,
- 'withtime' =3D> true,
- 'calendar_button_img' =3D> '/sf/images/sf_admin/date.png',
- 'control_name' =3D> 'feriado[fecha]',
- 'date_format' =3D> 'dd/MM/yy',
-)) ?>
- </div>
-</div>
-
-<div class=3D"form-row">
- <?php echo label_for('feriado[repeticion_anual]', __('Anual:'), 'class=
=3D"required" ') ?>
- <div class=3D"content<?php if ($sf_request->hasError('feriado{repetici=
on_anual}')): ?> form-error<?php endif; ?>">
- <?php if ($sf_request->hasError('feriado{repeticion_anual}')): ?>
- <?php echo form_error('feriado{repeticion_anual}', array('class' =3D=
> 'form-error-msg')) ?>
- <?php endif; ?>
-
- <?php echo object_checkbox_tag($feriado, 'getRepeticionAnual', array (
- 'control_name' =3D> 'feriado[repeticion_anual]',
-)) ?>
- </div>
-</div>
-
-<div class=3D"form-row">
- <?php echo label_for('feriado[inamovible]', __('Inamovible:'), 'class=3D=
"required" ') ?>
- <div class=3D"content<?php if ($sf_request->hasError('feriado{inamovib=
le}')): ?> form-error<?php endif; ?>">
- <?php if ($sf_request->hasError('feriado{inamovible}')): ?>
- <?php echo form_error('feriado{inamovible}', array('class' =3D> 'for=
m-error-msg')) ?>
- <?php endif; ?>
-
- <?php echo object_checkbox_tag($feriado, 'getInamovible', array (
- 'control_name' =3D> 'feriado[inamovible]',
-)) ?>
- </div>
-</div>
-
-<div class=3D"form-row">
- <?php echo label_for('feriado[fk_ciclolectivo_id]', __('Ciclo Lectivo:=
'), 'class=3D"required" ') ?>
- <div class=3D"content<?php if ($sf_request->hasError('feriado{fk_ciclo=
lectivo_id}')): ?> form-error<?php endif; ?>">
- <?php if ($sf_request->hasError('feriado{fk_ciclolectivo_id}')): ?>
- <?php echo form_error('feriado{fk_ciclolectivo_id}', array('class' =3D=
> 'form-error-msg')) ?>
- <?php endif; ?>
-
- <?php echo object_select_tag($feriado, 'getFkCiclolectivoId', array (
- 'related_class' =3D> 'Ciclolectivo',
- 'control_name' =3D> 'feriado[fk_ciclolectivo_id]',
-)) ?>
- </div>
-</div>
-
-</fieldset>
-
-<?php echo include_partial('edit_actions', array('feriado' =3D> $feriado=
)) ?>
-
-</form>
-
-<ul class=3D"sf_admin_actions">
- <li class=3D"float-left"><?php if ($feriado->getId()): ?>
-<?php echo button_to(__('delete'), 'feriado/delete?id=3D'.$feriado->getI=
d(), array (
- 'post' =3D> true,
- 'confirm' =3D> __('Are you sure?'),
- 'class' =3D> 'sf_admin_action_delete',
-)) ?><?php endif; ?>
-</li>
- </ul>
-
-</div>
-
-<div id=3D"sf_admin_footer">
-<?php include_partial('feriado/edit_footer', array('feriado' =3D> $feria=
do)) ?>
-</div>
Modified: prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions=
/actions.class.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actio=
ns.class.php 2007-01-31 19:01:23 UTC (rev 4142)
+++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actio=
ns.class.php 2007-01-31 19:12:30 UTC (rev 4143)
@@ -22,8 +22,8 @@
* Turnos Acciones
*
* @package alba
- * @author Jos=E9 Luis Di Biase <josx en interorganic.com.ar>
- * @author H=E9ctor Sanchez <hsanchez en pressenter.com.ar>
+ * @author Jos=C3=A9 Luis Di Biase <josx en interorganic.com.ar>
+ * @author H=C3=A9ctor Sanchez <hsanchez en pressenter.com.ar>
* @author Fernando Toledo <ftoledo en pressenter.com.ar>
* @version SVN: $Id$
* @filesource
Más información sobre la lista de distribución Alba-desarrollo