SVN Alba r4606 - in prosistem/alba/trunk/alba: apps/principal/lib apps/principal/modules/relDivisionActividadDocente/actions apps/principal/modules/relDivisionActividadDocente/templates lib/model - Alba-desarrollo

7 May 2007

Author: josx
Date: 2007-05-07 12:00:50 -0300 (Mon, 07 May 2007)
New Revision: 4606

Added:
   prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_filters.php
   prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list.php
   prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_actions.php
   prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_footer.php
   prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_header.php
   prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_messages.php
   prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_td_actions.php
   prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_td_stacked.php
   prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_td_tabular.php
   prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_th_stacked.php
   prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_th_tabular.php
   prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/listSuccess.php
Modified:
   prosistem/alba/trunk/alba/apps/principal/lib/miEvento.class.php
   prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php
   prosistem/alba/trunk/alba/lib/model/Evento.php
Log:
Salida en texto de evento. Ahora en el listado de relDivisionActividadDocente

Modified: prosistem/alba/trunk/alba/apps/principal/lib/miEvento.class.php
===================================================================

--- prosistem/alba/trunk/alba/apps/principal/lib/miEvento.class.php	2007-05-05 02:54:38 UTC (rev 4605)
+++ prosistem/alba/trunk/alba/apps/principal/lib/miEvento.class.php	2007-05-07 15:00:50 UTC (rev 4606)
@@ -156,10 +156,10 @@
                 }
             }
        } else {
-            $evento_obj->setFrecuenciaIntervalo(null);
-            $evento_obj->setRecurrenciaFin(null);
-            $evento_obj->setRecurrenciaDias(null);
-            $evento_obj->setFrecuencia(null); 
+            $evento_obj->setFrecuenciaIntervalo(0);
+            $evento_obj->setRecurrenciaFin("");
+            $evento_obj->setRecurrenciaDias("");
+            $evento_obj->setFrecuencia(0); 
        }
 
        return $evento_obj;

Modified: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php	2007-05-05 02:54:38 UTC (rev 4605)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php	2007-05-07 15:00:50 UTC (rev 4606)
@@ -285,5 +285,6 @@
 
 
 
+
 }
 ?>
\ No newline at end of file

Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_filters.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_filters.php	2007-05-05 02:54:38 UTC (rev 4605)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_filters.php	2007-05-07 15:00:50 UTC (rev 4606)
@@ -0,0 +1,6 @@
+<?php
+// auto-generated by sfPropelAdmin
+// date: 2007/05/02 17:35:40
+?>
+<?php use_helper('Object') ?>
+


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

Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list.php	2007-05-05 02:54:38 UTC (rev 4605)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list.php	2007-05-07 15:00:50 UTC (rev 4606)
@@ -0,0 +1,38 @@
+<?php
+// auto-generated by sfPropelAdmin
+// date: 2007/05/02 17:35:40
+?>
+<table cellspacing="0" class="sf_admin_list">
+<thead>
+<tr>
+<?php include_partial('list_th_tabular') ?>
+  <th id="sf_admin_list_th_sf_actions"><?php echo __('Actions') ?></th>
+</tr>
+</thead>
+<tbody>
+<?php $i = 1; foreach ($pager->getResults() as $rel_division_actividad_docente): $odd = fmod(++$i, 2) ?>
+<tr class="sf_admin_row_<?php echo $odd ?>">
+<?php include_partial('list_td_tabular', array('rel_division_actividad_docente' => $rel_division_actividad_docente)) ?>
+<?php include_partial('list_td_actions', array('rel_division_actividad_docente' => $rel_division_actividad_docente)) ?>
+</tr>
+<?php endforeach; ?>
+</tbody>
+<tfoot>
+<tr><th colspan="4">
+<div class="float-right">
+<?php if ($pager->haveToPaginate()): ?>
+  <?php echo link_to(image_tag(sfConfig::get('sf_admin_web_dir').'/images/first.png', array('align' => 'absmiddle', 'alt' => __('First'), 'title' => __('First'))), 'relDivisionActividadDocente/list?page=1') ?>
+  <?php echo link_to(image_tag(sfConfig::get('sf_admin_web_dir').'/images/previous.png', array('align' => 'absmiddle', 'alt' => __('Previous'), 'title' => __('Previous'))), 'relDivisionActividadDocente/list?page='.$pager->getPreviousPage()) ?>
+
+  <?php foreach ($pager->getLinks() as $page): ?>
+    <?php echo link_to_unless($page == $pager->getPage(), $page, 'relDivisionActividadDocente/list?page='.$page) ?>
+  <?php endforeach; ?>
+
+  <?php echo link_to(image_tag(sfConfig::get('sf_admin_web_dir').'/images/next.png', array('align' => 'absmiddle', 'alt' => __('Next'), 'title' => __('Next'))), 'relDivisionActividadDocente/list?page='.$pager->getNextPage()) ?>
+  <?php echo link_to(image_tag(sfConfig::get('sf_admin_web_dir').'/images/last.png', array('align' => 'absmiddle', 'alt' => __('Last'), 'title' => __('Last'))), 'relDivisionActividadDocente/list?page='.$pager->getLastPage()) ?>
+<?php endif; ?>
+</div>
+<?php echo format_number_choice('[0] no result|[1] 1 result|(1,+Inf] %1% results', array('%1%' => $pager->getNbResults()), $pager->getNbResults()) ?>
+</th></tr>
+</tfoot>
+</table>


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

Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_actions.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_actions.php	2007-05-05 02:54:38 UTC (rev 4605)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_actions.php	2007-05-07 15:00:50 UTC (rev 4606)
@@ -0,0 +1,9 @@
+<?php
+// auto-generated by sfPropelAdmin
+// date: 2007/05/02 17:35:40
+?>
+<ul class="sf_admin_actions">
+  <li><?php echo button_to(__('create'), 'relDivisionActividadDocente/create', array (
+  'class' => 'sf_admin_action_create',
+)) ?></li>
+</ul>


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

Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_footer.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_footer.php	2007-05-05 02:54:38 UTC (rev 4605)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_footer.php	2007-05-07 15:00:50 UTC (rev 4606)
@@ -0,0 +1,4 @@
+<?php
+// auto-generated by sfPropelAdmin
+// date: 2007/05/02 17:35:40
+?>


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

Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_header.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_header.php	2007-05-05 02:54:38 UTC (rev 4605)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_header.php	2007-05-07 15:00:50 UTC (rev 4606)
@@ -0,0 +1,4 @@
+<?php
+// auto-generated by sfPropelAdmin
+// date: 2007/05/02 17:35:40
+?>


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

Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_messages.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_messages.php	2007-05-05 02:54:38 UTC (rev 4605)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_messages.php	2007-05-07 15:00:50 UTC (rev 4606)
@@ -0,0 +1,12 @@
+<?php
+// auto-generated by sfPropelAdmin
+// date: 2007/05/02 17:35:40
+?>
+<?php if ($sf_request->getError('delete')): ?>
+<div class="form-errors">
+  <h2>Could not delete the selected Rel division actividad docente</h2>
+  <ul>
+    <li><?php echo $sf_request->getError('delete') ?></li>
+  </ul>
+</div>
+<?php endif; ?>


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

Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_td_actions.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_td_actions.php	2007-05-05 02:54:38 UTC (rev 4605)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_td_actions.php	2007-05-07 15:00:50 UTC (rev 4606)
@@ -0,0 +1,13 @@
+<?php
+// auto-generated by sfPropelAdmin
+// date: 2007/05/02 17:35:40
+?>
+<td>
+<ul class="sf_admin_td_actions">
+  <li><?php echo link_to(image_tag('/sf/sf_admin/images/edit_icon.png', array('alt' => __('edit'), 'title' => __('edit'))), 'relDivisionActividadDocente/edit?id='.$rel_division_actividad_docente->getId()) ?></li>
+  <li><?php echo link_to(image_tag('/sf/sf_admin/images/delete_icon.png', array('alt' => __('delete'), 'title' => __('delete'))), 'relDivisionActividadDocente/delete?id='.$rel_division_actividad_docente->getId(), array (
+  'post' => true,
+  'confirm' => __('Are you sure?'),
+)) ?></li>
+</ul>
+</td>


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

Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_td_stacked.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_td_stacked.php	2007-05-05 02:54:38 UTC (rev 4605)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_td_stacked.php	2007-05-07 15:00:50 UTC (rev 4606)
@@ -0,0 +1,12 @@
+<?php
+// auto-generated by sfPropelAdmin
+// date: 2007/05/02 17:35:40
+?>
+<td colspan="3">
+    <?php echo $rel_division_actividad_docente->getDivision() ?>
+     - 
+    <?php echo $rel_division_actividad_docente->getActividad() ?>
+     - 
+    <?php echo $rel_division_actividad_docente->getDocente() ?>
+     - 
+</td>
\ No newline at end of file


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

Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_td_tabular.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_td_tabular.php	2007-05-05 02:54:38 UTC (rev 4605)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_td_tabular.php	2007-05-07 15:00:50 UTC (rev 4606)
@@ -0,0 +1,5 @@
+    <td><?php echo $rel_division_actividad_docente->getDivision() ?></td>
+    <td><?php echo $rel_division_actividad_docente->getActividad() ?></td>
+    <td><?php echo $rel_division_actividad_docente->getDocente() ?></td>
+    <td><?php echo ($rel_division_actividad_docente->getEvento())?$rel_division_actividad_docente->getEvento()->getInfoEnTexto():""; ?></td>
+  
\ No newline at end of file


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

Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_th_stacked.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_th_stacked.php	2007-05-05 02:54:38 UTC (rev 4605)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_th_stacked.php	2007-05-07 15:00:50 UTC (rev 4606)
@@ -0,0 +1,5 @@
+<?php
+// auto-generated by sfPropelAdmin
+// date: 2007/05/02 17:35:40
+?>
+<?php include_partial('list_th_tabular') ?>


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

Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_th_tabular.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_th_tabular.php	2007-05-05 02:54:38 UTC (rev 4605)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_list_th_tabular.php	2007-05-07 15:00:50 UTC (rev 4606)
@@ -0,0 +1,18 @@
+<?php
+// auto-generated by sfPropelAdmin
+// date: 2007/05/02 17:35:40
+?>
+  <th id="sf_admin_list_th_division">
+        <?php echo __('Division') ?>
+          </th>
+  <th id="sf_admin_list_th_actividad">
+        <?php echo __('Actividad') ?>
+          </th>
+  <th id="sf_admin_list_th_docente">
+        <?php echo __('Docente') ?>
+          </th>
+
+  <th id="sf_admin_list_th_evento">
+        <?php echo __('Evento') ?>
+      </th>
+


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

Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/listSuccess.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/listSuccess.php	2007-05-05 02:54:38 UTC (rev 4605)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/listSuccess.php	2007-05-07 15:00:50 UTC (rev 4606)
@@ -0,0 +1,35 @@
+<?php
+// auto-generated by sfPropelAdmin
+// date: 2007/05/02 17:35:40
+?>
+<?php use_helper('I18N', 'Date') ?>
+
+<?php use_stylesheet('/sf/sf_admin/css/main') ?>
+
+<div id="sf_admin_container">
+
+<h1><?php echo __('Generación Manual de horarios por división', 
+array()) ?></h1>
+
+<div id="sf_admin_header">
+<?php include_partial('relDivisionActividadDocente/list_header', array('pager' => $pager)) ?>
+<?php include_partial('relDivisionActividadDocente/list_messages', array('pager' => $pager)) ?>
+</div>
+
+<div id="sf_admin_bar">
+</div>
+
+<div id="sf_admin_content">
+<?php if (!$pager->getNbResults()): ?>
+<?php echo __('no result') ?>
+<?php else: ?>
+<?php include_partial('relDivisionActividadDocente/list', array('pager' => $pager)) ?>
+<?php endif; ?>
+<?php include_partial('list_actions') ?>
+</div>
+
+<div id="sf_admin_footer">
+<?php include_partial('relDivisionActividadDocente/list_footer', array('pager' => $pager)) ?>
+</div>
+
+</div>


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

Modified: prosistem/alba/trunk/alba/lib/model/Evento.php
===================================================================
--- prosistem/alba/trunk/alba/lib/model/Evento.php	2007-05-05 02:54:38 UTC (rev 4605)
+++ prosistem/alba/trunk/alba/lib/model/Evento.php	2007-05-07 15:00:50 UTC (rev 4606)
@@ -20,5 +20,68 @@
     }
 
 
+    function getInfoEnTexto() {
+        $txt_salida = "";
+        $frecuencia = " con una frecuencia ";
+        $recurrencia_fin = "Termina ";
+        $frecuencia_intervalo = "";
+        $dias_semana = "";
+
+        switch($this->getFrecuencia()) {
+            case '0' : $frecuencia = ""; break;
+            case '4' : $frecuencia .= "diaria"; 
+                       $frecuencia_intervalo = " cada " . $this->getFrecuenciaIntervalo() . "días";;
+                       break;
+            case '5' : $frecuencia .= "semanal"; 
+                       $numero_binario = str_pad(decbin($this->getRecurrenciaDias()), 7, "0", STR_PAD_LEFT); 
+                       $dias_semana .= ($numero_binario[6] == 1)?" Dom":"";
+                       $dias_semana .= ($numero_binario[5] == 1)?" Lun":"";
+                       $dias_semana .= ($numero_binario[4] == 1)?" Mar":"";
+                       $dias_semana .= ($numero_binario[3] == 1)?" Mie":"";
+                       $dias_semana .= ($numero_binario[2] == 1)?" Jue":"";
+                       $dias_semana .= ($numero_binario[1] == 1)?" Vie":"";
+                       $dias_semana .= ($numero_binario[0] == 1)?" Sab" :"";
+                       $frecuencia_intervalo = " de todos los "  . $dias_semana . " cada " .$this->getFrecuenciaIntervalo(). " semanas";
+                       break;
+            case '6' : $frecuencia .= "mensual"; break;
+            case '7' : $frecuencia .= "anual"; break;
+        }
+
+
+        if($this->getRecurrenciaFin() != "") {
+            if(is_numeric($this->getRecurrenciaFin())) {
+                $recurrencia_fin = " luego de " .$this->getRecurrenciaFin(). " veces";
+            } else {
+                $recurrencia_fin = " el " .$this->getRecurrenciaFin();
+            }
+        } else {
+            $recurrencia_fin = "";
+        }
+
+        $hora_inicio = date( "H:i" , strtotime($this->getFechaInicio()));;
+        $hora_fin = date( "H:i" , strtotime($this->getFechaFin()));;
+        $dia_inicio = date( "d-m-Y" , strtotime($this->getFechaInicio()));
+        $dia_fin = date( "d-m-Y" , strtotime($this->getFechaFin()));
+        
+        if($dia_inicio == $dia_fin) {
+            if($hora_inicio == "00:00" AND $hora_fin == "00:00") {
+                $dia = $dia_inicio;
+            } else {
+                $dia = $dia_inicio . " ". $hora_inicio . "hs a " .$hora_fin . "hs";
+            }
+        } else {
+            if($hora_inicio == "00:00" AND $hora_fin == "00:00") {
+                $dia = $dia_inicio . " a ". $dia_fin;
+            } else {
+                $dia = $dia_inicio . " ". $hora_inicio . "hs a " .$dia_fin ." ". $hora_fin. "hs";
+            }            
+        }
+
+     
+        $txt_salida = $dia . $frecuencia . $frecuencia_intervalo .$recurrencia_fin;
+
+        return $txt_salida;
+    }
+
 }
 ?>
\ No newline at end of file

    

SVN Alba r4606 - in prosistem/alba/trunk/alba: apps/principal/lib apps/principal/modules/relDivisionActividadDocente/actions apps/principal/modules/relDivisionActividadDocente/templates lib/model

commits＠pressenter.com.ar

tags

participants (1)