[Alba-desarrollo] SVN Alba r4917 - in prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad: actions config templates

• Mensaje anterior: [Alba-desarrollo] Re: [Pressenter - SVN Alba] #241: Error 500 .-
• Próximo mensaje: [Alba-desarrollo] [Pressenter - SVN Alba] #242: Arreglar las Validaciones
• Mensajes ordenados por: [ fecha ] [ hilo ] [ asunto ] [ autor ]

Author: josx
Date: 2007-08-06 14:52:35 -0300 (Mon, 06 Aug 2007)
New Revision: 4917

Added:
   prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/temp=
lates/_edit_form.php
   prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/temp=
lates/_list_td_actions.php
   prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/temp=
lates/_list_td_tabular.php
Modified:
   prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/acti=
ons/actions.class.php
   prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/conf=
ig/generator.yml
Log:
Arreglo de problema en edicion de a?\195?\177o y actividad (Problema del =
generator)

Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAnioActivid=
ad/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/relAnioActividad/act=
ions/actions.class.php	2007-08-06 16:02:44 UTC (rev 4916)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/act=
ions/actions.class.php	2007-08-06 17:52:35 UTC (rev 4917)
@@ -23,8 +23,8 @@
  * relAnioActividad 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
@@ -33,6 +33,31 @@
=20
 class relAnioActividadActions extends autorelAnioActividadActions
 {
+
+    protected function getRelAnioActividadOrCreate($id =3D 'id', $horas =
=3D '')  {
+        if (!$this->getRequestParameter($id)) {
+            $rel_anio_actividad =3D new RelAnioActividad();
+        } else {
+            $rel_anio_actividad =3D RelAnioActividadPeer::retrieveByPk($=
this->getRequestParameter($id));
+            $this->forward404Unless($rel_anio_actividad);
+        }
+        return $rel_anio_actividad;
+    }                                    =20
+   =20
+    protected function updateRelAnioActividadFromRequest() {
+        $rel_anio_actividad =3D $this->getRequestParameter('rel_anio_act=
ividad');
+        if (isset($rel_anio_actividad['fk_anio_id'])) {
+            $this->rel_anio_actividad->setFkAnioId($rel_anio_actividad['=
fk_anio_id'] ? $rel_anio_actividad['fk_anio_id'] : null);
+        }
+
+        if (isset($rel_anio_actividad['fk_actividad_id'])) {
+            $this->rel_anio_actividad->setFkActividadId($rel_anio_activi=
dad['fk_actividad_id'] ? $rel_anio_actividad['fk_actividad_id'] : null);
+        }
+       =20
+        if (isset($rel_anio_actividad['horas'])) {
+            $this->rel_anio_actividad->setHoras($rel_anio_actividad['hor=
as']);
+        }
+
+    }
 }
-
-?>
+?>
\ No newline at end of file

Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAnioActivid=
ad/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/relAnioActividad/con=
fig/generator.yml	2007-08-06 16:02:44 UTC (rev 4916)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/con=
fig/generator.yml	2007-08-06 17:52:35 UTC (rev 4917)
@@ -11,8 +11,8 @@
     edit:
         title: Editar Actividades del A&ntilde;o
         fields:
-            fk_anio_id:   { params: include_custom=3D--Seleccione un A=C3=
=B1--<}
-            fk_actividad_id:   { params: include_custom=3D>>Seleccione u=
na Actividad<<}
+            fk_anio_id:   { params: include_custom=3D>>Seleccione un A&n=
tilde;o<< }
+            fk_actividad_id:   { params: include_custom=3D>>Seleccione u=
na Actividad<< }
         display: [ fk_anio_id, fk_actividad_id, horas ]
     list:
         title: Listado de Actividades por A&ntilde;o
@@ -20,4 +20,5 @@
         object_actions:
             _edit:      -
             _delete:    -
-        filters: [ fk_anio_id ]                                         =
                      =20
+        filters: [ fk_anio_id ]
+

Added: prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/=
templates/_edit_form.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/relAnioActividad/tem=
plates/_edit_form.php	2007-08-06 16:02:44 UTC (rev 4916)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/tem=
plates/_edit_form.php	2007-08-06 17:52:35 UTC (rev 4917)
@@ -0,0 +1,78 @@
+<?php
+// auto-generated by sfPropelAdmin
+// date: 2007/08/06 12:32:12
+?>
+<?php echo form_tag('relAnioActividad/save', array(
+  'id'        =3D> 'sf_admin_edit_form',
+  'name'      =3D> 'sf_admin_edit_form',
+  'multipart' =3D> true,
+)) ?>
+
+<?php echo object_input_hidden_tag($rel_anio_actividad, 'getId') ?>
+<?php echo object_input_hidden_tag($rel_anio_actividad, 'getHoras') ?>
+
+<fieldset id=3D"sf_fieldset_none" class=3D"">
+
+<div class=3D"form-row">
+  <?php echo label_for('rel_anio_actividad[fk_anio_id]', __($labels['rel=
_anio_actividad{fk_anio_id}']), 'class=3D"required" ') ?>
+  <div class=3D"content<?php if ($sf_request->hasError('rel_anio_activid=
ad{fk_anio_id}')): ?> form-error<?php endif; ?>">
+  <?php if ($sf_request->hasError('rel_anio_actividad{fk_anio_id}')): ?>
+    <?php echo form_error('rel_anio_actividad{fk_anio_id}', array('class=
' =3D> 'form-error-msg')) ?>
+  <?php endif; ?>
+
+  <?php $value =3D object_select_tag($rel_anio_actividad, 'getFkAnioId',=
 array (
+  'related_class' =3D> 'Anio',
+  'control_name' =3D> 'rel_anio_actividad[fk_anio_id]',
+  'include_custom' =3D> '>>Seleccione un A&ntilde;o<<',
+)); echo $value ? $value : '&nbsp;' ?>
+    </div>
+</div>
+
+<div class=3D"form-row">
+  <?php echo label_for('rel_anio_actividad[fk_actividad_id]', __($labels=
['rel_anio_actividad{fk_actividad_id}']), 'class=3D"required" ') ?>
+  <div class=3D"content<?php if ($sf_request->hasError('rel_anio_activid=
ad{fk_actividad_id}')): ?> form-error<?php endif; ?>">
+  <?php if ($sf_request->hasError('rel_anio_actividad{fk_actividad_id}')=
): ?>
+    <?php echo form_error('rel_anio_actividad{fk_actividad_id}', array('=
class' =3D> 'form-error-msg')) ?>
+  <?php endif; ?>
+
+  <?php $value =3D object_select_tag($rel_anio_actividad, 'getFkActivida=
dId', array (
+  'related_class' =3D> 'Actividad',
+  'control_name' =3D> 'rel_anio_actividad[fk_actividad_id]',
+  'include_custom' =3D> '>>Seleccione una Actividad<<',
+)); echo $value ? $value : '&nbsp;' ?>
+    </div>
+</div>
+
+
+<div class=3D"form-row">
+  <?php echo label_for('rel_anio_actividad[horas]', __($labels['rel_anio=
_actividad{horas}']), 'class=3D"required" ') ?>
+  <div class=3D"content<?php if ($sf_request->hasError('rel_anio_activid=
ad{horas}')): ?> form-error<?php endif; ?>">
+  <?php if ($sf_request->hasError('rel_anio_actividad{horas}')): ?>
+    <?php echo form_error('rel_anio_actividad{horas}', array('class' =3D=
> 'form-error-msg')) ?>
+  <?php endif; ?>
+
+  <?php $value =3D object_input_tag($rel_anio_actividad, 'getHoras', arr=
ay (
+    'size' =3D> 16,
+      'control_name' =3D> 'rel_anio_actividad[horas]',
+      )); echo $value ? $value : '&nbsp;' ?>
+
+    </div>
+</div>
+
+
+
+</fieldset>
+
+<?php include_partial('edit_actions', array('rel_anio_actividad' =3D> $r=
el_anio_actividad)) ?>
+
+</form>
+
+<ul class=3D"sf_admin_actions">
+      <li class=3D"float-left"><?php if ($rel_anio_actividad->getId() &&=
 $rel_anio_actividad->getHoras()): ?>
+<?php echo button_to(__('delete'), 'relAnioActividad/delete?id=3D'.$rel_=
anio_actividad->getId().'&horas=3D'.$rel_anio_actividad->getHoras(), arra=
y (
+  'post' =3D> true,
+  'confirm' =3D> __('Are you sure?'),
+  'class' =3D> 'sf_admin_action_delete',
+)) ?><?php endif; ?>
+</li>
+  </ul>


Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/rel=
AnioActividad/templates/_edit_form.php
___________________________________________________________________
Name: svn:keywords
   + "Id Author URL Date Rev"

Added: prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/=
templates/_list_td_actions.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/relAnioActividad/tem=
plates/_list_td_actions.php	2007-08-06 16:02:44 UTC (rev 4916)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/tem=
plates/_list_td_actions.php	2007-08-06 17:52:35 UTC (rev 4917)
@@ -0,0 +1,13 @@
+<?php
+// auto-generated by sfPropelAdmin
+// date: 2007/08/06 12:32:12
+?>
+<td>
+<ul class=3D"sf_admin_td_actions">
+  <li><?php echo link_to(image_tag('/sf/sf_admin/images/edit_icon.png', =
array('alt' =3D> __('edit'), 'title' =3D> __('edit'))), 'relAnioActividad=
/edit?id=3D'.$rel_anio_actividad->getId()) ?></li>
+  <li><?php echo link_to(image_tag('/sf/sf_admin/images/delete_icon.png'=
, array('alt' =3D> __('delete'), 'title' =3D> __('delete'))), 'relAnioAct=
ividad/delete?id=3D'.$rel_anio_actividad->getId(), array (
+  'post' =3D> true,
+  'confirm' =3D> __('Are you sure?'),
+)) ?></li>
+</ul>
+</td>


Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/rel=
AnioActividad/templates/_list_td_actions.php
___________________________________________________________________
Name: svn:keywords
   + "Id Author URL Date Rev"

Added: prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/=
templates/_list_td_tabular.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/relAnioActividad/tem=
plates/_list_td_tabular.php	2007-08-06 16:02:44 UTC (rev 4916)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/tem=
plates/_list_td_tabular.php	2007-08-06 17:52:35 UTC (rev 4917)
@@ -0,0 +1,7 @@
+<?php
+// auto-generated by sfPropelAdmin
+// date: 2007/08/06 12:32:12
+?>
+    <td><?php echo $rel_anio_actividad->getAnio() ?></td>
+      <td><?php echo $rel_anio_actividad->getActividad() ?></td>
+      <td><?php echo $rel_anio_actividad->getHoras() ?></td>


Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/rel=
AnioActividad/templates/_list_td_tabular.php
___________________________________________________________________
Name: svn:keywords
   + "Id Author URL Date Rev"

• Mensaje anterior: [Alba-desarrollo] Re: [Pressenter - SVN Alba] #241: Error 500 .-
• Próximo mensaje: [Alba-desarrollo] [Pressenter - SVN Alba] #242: Arreglar las Validaciones
• Mensajes ordenados por: [ fecha ] [ hilo ] [ asunto ] [ autor ]