[Alba-desarrollo] SVN Alba r4778 - in prosistem/alba/trunk/alba/apps/principal/modules: icalVisualizador/actions relDivisionActividadDocente/actions relDivisionActividadDocente/templates

Lun Jun 25 22:54:39 CEST 2007

Author: josx
Date: 2007-06-25 17:54:34 -0300 (Mon, 25 Jun 2007)
New Revision: 4778

Modified:
   prosistem/alba/trunk/alba/apps/principal/modules/icalVisualizador/actions/components.class.php
   prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php
   prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/verCalendarioPorDiaSuccess.php
Log:
cambio a la llamada al componente del calendario

Modified: prosistem/alba/trunk/alba/apps/principal/modules/icalVisualizador/actions/components.class.php
===================================================================

--- prosistem/alba/trunk/alba/apps/principal/modules/icalVisualizador/actions/components.class.php	2007-06-25 20:04:58 UTC (rev 4777)
+++ prosistem/alba/trunk/alba/apps/principal/modules/icalVisualizador/actions/components.class.php	2007-06-25 20:54:34 UTC (rev 4778)
@@ -39,7 +39,7 @@
         $this->aEvent = $aEvent;
         $this->aAllDay = $aAllDay;
         $this->l_calendar = "";
-        $this->calendar_name = "XXXX";
+        $this->calendar_name = "";
         $this->date = strtotime($date);
     }
 
@@ -54,7 +54,7 @@
         $aWeek = $this->getWeekRange($date);
         $this->aTime = $this->getTimeRange();
         $this->l_calendar = "";
-        $this->calendar_name = "XXXX";
+        $this->calendar_name = "";
         $this->date = strtotime($date);
         $this->day_end_of_week = $aWeek[6]['day'];
         $this->day_start_of_week =  $aWeek[0]['day'];

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-06-25 20:04:58 UTC (rev 4777)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php	2007-06-25 20:54:34 UTC (rev 4778)
@@ -99,7 +99,24 @@
         include("miExportadorIcal.class.php");
         $e  = new miExportadorIcal();
         $this->archivo = sfConfig::get('app_alba_tmpdir')."/".$e->exportar($this->pager->getResults(), 0);
-        $this->date_component = "";
+        
+        if($this->getRequestParameter('date')) {
+            $this->date_component = $this->getRequestParameter('date');
+        } else {
+            $this->date_component = "";
+        }
+
+        if($this->getRequestParameter('view')) {
+            switch($this->getRequestParameter('view')) {
+                case 'week': $this->view = 'verPorSemana'; break;
+                case 'day': $this->view = 'verPorDia'; break;
+                default: $this->view = 'verPorDia';
+            }
+        } else {
+            $this->view = "verPorDia";
+        }
+
+
     }
 
 

Modified: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/verCalendarioPorDiaSuccess.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/verCalendarioPorDiaSuccess.php	2007-06-25 20:04:58 UTC (rev 4777)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/verCalendarioPorDiaSuccess.php	2007-06-25 20:54:34 UTC (rev 4778)
@@ -1,3 +1,3 @@
 <?php
-    include_component('icalVisualizador', 'verPorDia', array('archivo' => $archivo, 'date_component' => $date_component));
+    include_component('icalVisualizador', $view, array('archivo' => $archivo, 'date_component' => $date_component));
 ?>
\ No newline at end of file


