SVN Alba r5121 - in prosistem/alba/trunk/alba/apps/principal/modules: cal/actions cal/templates calendario/templates relDivisionActividadDocente/actions
Author: sabino Date: 2007-09-17 18:04:22 -0300 (Mon, 17 Sep 2007) New Revision: 5121 Added: prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorAnio.php prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorMes.php prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorSemana.php Removed: prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_VerPorDia.php Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorDia.php prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/horarioSegunDivisionSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php Log: Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php 2007-09-17 20:48:43 UTC (rev 5120) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php 2007-09-17 21:04:22 UTC (rev 5121) @@ -12,7 +12,7 @@ class calComponents extends sfComponents { - public function executeVerPorDia() { + public function _phpicalendar($current_view) { $default_cal_alba = $this->archivo; // print_r( file($this->archivo)); $context = sfContext::getInstance(); @@ -31,7 +31,7 @@ // } //datos para construir las urls -// $modulo = $context->getRequest()->getParameter('module'); + $modulo = $context->getRequest()->getParameter('module'); $action = $context->getRequest()->getParameter('action'); @@ -40,7 +40,7 @@ $getdate = date('Ymd', time() + $second_offset); else $getdate = $this->date; - $current_view = 'day'; +// $current_view = 'day'; // header("Content-Type: text/html; charset=$charset"); @@ -82,7 +82,7 @@ //$template = "red"; - $page = new Page(BASE.'templates/'.$template.'/day.tpl'); + $page = new Page(BASE.'templates/'.$template."/$current_view.tpl"); $page->cpath = $cpath; @@ -148,7 +148,7 @@ $page->download_filename = $download_filename; $relativeUrlRoot = sfContext::getInstance()->getRequest()->getRelativeUrlRoot(); - //echo $relativeUrlRoot; +// echo $relativeUrlRoot;die; // $page->replace_files(array( // 'header' => BASE.'templates/'.$template.'/header.tpl', @@ -165,12 +165,13 @@ 'sidebar' => '', 'search_box' => '' )); + $prefixUri = sfContext::getInstance()->getRequest()->getUriPrefix(); $globals = array( "base" => $relativeUrlRoot ."/images/cal", 'day_view_action' => $action.'/'.$this->verPorDia, 'week_view_action' => $action.'/'.$this->verPorSemana, - 'month_view_action' => $action.'/'.$this->verPorMes, - 'year_view_action' => $action.'/'.$this->verPorAnio, + 'month_view_action' => $prefixUri.$relativeUrlRoot.'/'.$action.'/'.$this->verPorMes, + 'year_view_action' => $prefixUri.$relativeUrlRoot.'/'.$action.'/'.$this->verPorAnio, 'version' => $phpicalendar_version, 'charset' => $charset, 'default_path' => '', @@ -247,15 +248,49 @@ $page->nosearch($page); } - $page->draw_day($page); + switch ($current_view) { + case 'month': + if ($this_months_events == 'yes') { + $page->monthbottom($page); + } else { + $page->nomonthbottom($page); + } + break; + case 'day': $page->draw_day($page); + break; + case 'week': $page->draw_week($page); + break; + case 'year': break; + } $page->tomorrows_events($page); $page->get_vtodo($page); +// $page->tomorrows_events($page); +// $page->get_vtodo($page); $page->draw_subscribe($page); $this->output = $page->output(); } + public function executeVerPorDia() { + + $this->_phpicalendar('day'); + } + + public function executeVerPorSemana() { + + $this->_phpicalendar('week'); + } + + public function executeVerPorMes() { + + $this->_phpicalendar('month'); + } + + public function executeVerPorAnio() { + + $this->_phpicalendar('year'); + } } Deleted: prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_VerPorDia.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_VerPorDia.php 2007-09-17 20:48:43 UTC (rev 5120) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_VerPorDia.php 2007-09-17 21:04:22 UTC (rev 5121) @@ -1,6 +0,0 @@ -<p>Here!</p> - -<?php - echo $output; - -?> \ No newline at end of file Added: prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorAnio.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorAnio.php 2007-09-17 20:48:43 UTC (rev 5120) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorAnio.php 2007-09-17 21:04:22 UTC (rev 5121) @@ -0,0 +1,3 @@ +<?php + echo $output; +?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorDia.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorDia.php 2007-09-17 20:48:43 UTC (rev 5120) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorDia.php 2007-09-17 21:04:22 UTC (rev 5121) @@ -1,4 +1,3 @@ <?php echo $output; - ?> \ No newline at end of file Added: prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorMes.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorMes.php 2007-09-17 20:48:43 UTC (rev 5120) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorMes.php 2007-09-17 21:04:22 UTC (rev 5121) @@ -0,0 +1,3 @@ +<?php + echo $output; +?> \ No newline at end of file Added: prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorSemana.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorSemana.php 2007-09-17 20:48:43 UTC (rev 5120) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorSemana.php 2007-09-17 21:04:22 UTC (rev 5121) @@ -0,0 +1,4 @@ +<?php + echo $output; + +?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/horarioSegunDivisionSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/horarioSegunDivisionSuccess.php 2007-09-17 20:48:43 UTC (rev 5120) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/horarioSegunDivisionSuccess.php 2007-09-17 21:04:22 UTC (rev 5121) @@ -1,5 +1,13 @@ <h1>Horario para la Divsión: <?php echo $division->getAnio()->getDescripcion()." ".$division->getDescripcion()?></h1> <?php - include_component('icalVisualizador', $view, array('archivo' => $archivo, 'date_component' => $date_component)); +// include_component('icalVisualizador', $view, array('archivo' => $archivo, 'date_component' => $date_component)); +include_component('cal', $view, array( + 'archivo' => $archivo, + 'date' => $date_component, + 'verPorDia' => "", + 'verPorSemana' => '', + 'verPorMes' => '', + 'verPorAnio' => '' + )); ?> 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-09-17 20:48:43 UTC (rev 5120) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php 2007-09-17 21:04:22 UTC (rev 5121) @@ -105,15 +105,16 @@ $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"; - } + $this->view = $this->getRequestParameter('view','verPorDia'); +// if($this->getRequestParameter('view')) { +// switch($this->getRequestParameter('view')) { +// case 'week': $this->view = 'verPorSemana'; break; +// case 'day': $this->view = 'verPorDia'; break; +// default: $this->view = 'verPorSemana'; +// } +// } else { +// $this->view = "verPorDia"; +// } }
Hey sabino un par de cosas. Primero por favor pone un log cuando haces commit porque no se entiende que es lo que agregas. Por otro lado probe esto y no muestra eventos ya que no llena el master_array. El Monday 17 September 2007 18:04:32 [email protected] escribió:
Author: sabino Date: 2007-09-17 18:04:22 -0300 (Mon, 17 Sep 2007) New Revision: 5121
Added:
prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorAnio. php prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorMes.p hp prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorSeman a.php Removed:
prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_VerPorDia.p hp Modified:
prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.cla ss.php prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorDia.p hp prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/horar ioSegunDivisionSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocent e/actions/actions.class.php Log:
Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.cla ss.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.cla ss.php 2007-09-17 20:48:43 UTC (rev 5120) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.cla ss.php 2007-09-17 21:04:22 UTC (rev 5121) @@ -12,7 +12,7 @@ class calComponents extends sfComponents {
- public function executeVerPorDia() { + public function _phpicalendar($current_view) { $default_cal_alba = $this->archivo; // print_r( file($this->archivo)); $context = sfContext::getInstance(); @@ -31,7 +31,7 @@ // }
//datos para construir las urls -// $modulo = $context->getRequest()->getParameter('module'); + $modulo = $context->getRequest()->getParameter('module'); $action = $context->getRequest()->getParameter('action');
@@ -40,7 +40,7 @@ $getdate = date('Ymd', time() + $second_offset); else $getdate = $this->date; - $current_view = 'day'; +// $current_view = 'day';
// header("Content-Type: text/html; charset=$charset");
@@ -82,7 +82,7 @@
//$template = "red";
- $page = new Page(BASE.'templates/'.$template.'/day.tpl'); + $page = new Page(BASE.'templates/'.$template."/$current_view.tpl");
$page->cpath = $cpath;
@@ -148,7 +148,7 @@ $page->download_filename = $download_filename;
$relativeUrlRoot = sfContext::getInstance()->getRequest()->getRelativeUrlRoot(); - //echo $relativeUrlRoot; +// echo $relativeUrlRoot;die;
// $page->replace_files(array( // 'header' => BASE.'templates/'.$template.'/header.tpl', @@ -165,12 +165,13 @@ 'sidebar' => '', 'search_box' => '' )); + $prefixUri = sfContext::getInstance()->getRequest()->getUriPrefix(); $globals = array( "base" => $relativeUrlRoot ."/images/cal", 'day_view_action' => $action.'/'.$this->verPorDia, 'week_view_action' => $action.'/'.$this->verPorSemana, - 'month_view_action' => $action.'/'.$this->verPorMes, - 'year_view_action' => $action.'/'.$this->verPorAnio, + 'month_view_action' => $prefixUri.$relativeUrlRoot.'/'.$action.'/'.$this->verPorMes, + 'year_view_action' => $prefixUri.$relativeUrlRoot.'/'.$action.'/'.$this->verPorAnio, 'version' => $phpicalendar_version, 'charset' => $charset, 'default_path' => '', @@ -247,15 +248,49 @@ $page->nosearch($page); }
- $page->draw_day($page); + switch ($current_view) { + case 'month': + if ($this_months_events == 'yes') { + $page->monthbottom($page); + } else { + $page->nomonthbottom($page); + } + break; + case 'day': $page->draw_day($page); + break; + case 'week': $page->draw_week($page); + break; + case 'year': break; + } $page->tomorrows_events($page); $page->get_vtodo($page); +// $page->tomorrows_events($page); +// $page->get_vtodo($page); $page->draw_subscribe($page);
$this->output = $page->output();
} + public function executeVerPorDia() { + + $this->_phpicalendar('day'); + } + + public function executeVerPorSemana() { + + $this->_phpicalendar('week'); + } + + public function executeVerPorMes() { + + $this->_phpicalendar('month'); + } + + public function executeVerPorAnio() { + + $this->_phpicalendar('year'); + } }
Deleted: prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_VerPorDia.p hp =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_VerPorDia.p hp 2007-09-17 20:48:43 UTC (rev 5120) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_VerPorDia.p hp 2007-09-17 21:04:22 UTC (rev 5121) @@ -1,6 +0,0 @@ -<p>Here!</p> - -<?php - echo $output; - -?> \ No newline at end of file
Added: prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorAnio. php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorAnio. php 2007-09-17 20:48:43 UTC (rev 5120) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorAnio. php 2007-09-17 21:04:22 UTC (rev 5121) @@ -0,0 +1,3 @@ +<?php + echo $output; +?> \ No newline at end of file
Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorDia.p hp =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorDia.p hp 2007-09-17 20:48:43 UTC (rev 5120) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorDia.p hp 2007-09-17 21:04:22 UTC (rev 5121) @@ -1,4 +1,3 @@ <?php echo $output; - ?> \ No newline at end of file
Added: prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorMes.p hp =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorMes.p hp 2007-09-17 20:48:43 UTC (rev 5120) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorMes.p hp 2007-09-17 21:04:22 UTC (rev 5121) @@ -0,0 +1,3 @@ +<?php + echo $output; +?> \ No newline at end of file
Added: prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorSeman a.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorSeman a.php 2007-09-17 20:48:43 UTC (rev 5120) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/templates/_verPorSeman a.php 2007-09-17 21:04:22 UTC (rev 5121) @@ -0,0 +1,4 @@ +<?php + echo $output; + +?> \ No newline at end of file
Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/horar ioSegunDivisionSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/horar ioSegunDivisionSuccess.php 2007-09-17 20:48:43 UTC (rev 5120) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/horar ioSegunDivisionSuccess.php 2007-09-17 21:04:22 UTC (rev 5121) @@ -1,5 +1,13 @@ <h1>Horario para la Divsión: <?php echo $division->getAnio()->getDescripcion()." ".$division->getDescripcion()?></h1> <?php - include_component('icalVisualizador', $view, array('archivo' => $archivo, 'date_component' => $date_component)); +// include_component('icalVisualizador', $view, array('archivo' => $archivo, 'date_component' => $date_component)); +include_component('cal', $view, array( + 'archivo' => $archivo, + 'date' => $date_component, + 'verPorDia' => "", + 'verPorSemana' => '', + 'verPorMes' => '', + 'verPorAnio' => '' + )); ?>
Modified: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocent e/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocent e/actions/actions.class.php 2007-09-17 20:48:43 UTC (rev 5120) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocent e/actions/actions.class.php 2007-09-17 21:04:22 UTC (rev 5121) @@ -105,15 +105,16 @@ $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"; - } + $this->view = $this->getRequestParameter('view','verPorDia'); +// if($this->getRequestParameter('view')) { +// switch($this->getRequestParameter('view')) { +// case 'week': $this->view = 'verPorSemana'; break; +// case 'day': $this->view = 'verPorDia'; break; +// default: $this->view = 'verPorSemana'; +// } +// } else { +// $this->view = "verPorDia"; +// } }
-- Di Biase José Luis Blog --> [http://www.joseluisdibiase.com.ar] "viaja hasta tu ideal, sembra tu flor, labra tu libertad, rega tu voz cerra tus ojos que sobra lugar en idilia para los dos"
participants (2)
-
commits＠pressenter.com.ar -
josx