September 2007 - Alba-desarrollo - lists.ourproject.org

SVN Alba r5139 - in prosistem/alba/trunk/alba/apps/principal/modules: cal/lib calendario/templates horarioescolar/templates
by commits＠pressenter.com.ar 24 Sep '07

24 Sep '07

Author: josx Date: 2007-09-24 16:34:58 -0300 (Mon, 24 Sep 2007) New Revision: 5139 Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/default_config.php prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/horarioSegunDivisionSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/horarioSegunDocenteSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/verCalendarioSuccess.php Log: Se agrego titulo a el calendario de horario escolar. Se cambio de template por default para el phpicalendar. Se agrego el modulo cal a horarioSegunDocente. Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/default_config.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/default_config.php 2007-09-24 19:21:58 UTC (rev 5138) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/default_config.php 2007-09-24 19:34:58 UTC (rev 5139) @@ -5,7 +5,7 @@ // To set values, change the text between the single quotes // Follow instructions to the right for detailed information -$template = 'red'; // Template support +$template = 'default'; // Template support $default_view = 'day'; // Default view for calendars = 'day', 'week', 'month', 'year' $minical_view = 'current'; // Where do the mini-calendars go when clicked? = 'day', 'week', 'month', 'current' // $default_cal = "$ALL_CALENDARS_COMBINED"; // Exact filename of calendar without .ics. Or set to $ALL_CALENDARS_COMBINED to open all calenders combined into one. 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-24 19:21:58 UTC (rev 5138) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/horarioSegunDivisionSuccess.php 2007-09-24 19:34:58 UTC (rev 5139) @@ -1,7 +1,7 @@ <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('cal', $view, array( + include_component('cal', $view, array( 'archivo' => $archivo, 'date' => $date_component, 'verPorDia' => "", Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/horarioSegunDocenteSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/horarioSegunDocenteSuccess.php 2007-09-24 19:21:58 UTC (rev 5138) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/horarioSegunDocenteSuccess.php 2007-09-24 19:34:58 UTC (rev 5139) @@ -1,5 +1,13 @@ <h1>Horario para el Docente: <?php echo $docente->getApellido()." ".$docente->getNombre()?></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' => "view/verPorDia", + 'verPorSemana' => 'view/verPorSemana', + 'verPorMes' => 'view/verPorMes', + 'verPorAnio' => 'view/verPorAnio' + )); ?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/verCalendarioSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/verCalendarioSuccess.php 2007-09-24 19:21:58 UTC (rev 5138) +++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/verCalendarioSuccess.php 2007-09-24 19:34:58 UTC (rev 5139) @@ -1,3 +1,4 @@ +<h1>Calendario del Horario Escolar</h1> <?php // include_component('icalVisualizador', $view, array('archivo' => $archivo, 'date_component' => $date_component)); include_component('cal', $view, array(

1 0

SVN Alba r5138 - prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions
by commits＠pressenter.com.ar 24 Sep '07

24 Sep '07

Author: josx Date: 2007-09-24 16:21:58 -0300 (Mon, 24 Sep 2007) New Revision: 5138 Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php Log: La carga de los conceptos en el boletin estaba mal, se cargaba la nota en un concepto que no era. Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php 2007-09-24 19:17:55 UTC (rev 5137) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php 2007-09-24 19:21:58 UTC (rev 5138) @@ -234,7 +234,6 @@ foreach($conceptos as $concepto) { $optionsConcepto[$concepto->getId()] = $concepto->getNombre(); } - asort($optionsConcepto); return $optionsConcepto; } @@ -264,9 +263,8 @@ $concepto_id = $this->getRequestParameter('concepto_id'); $optionsConcepto [] = ""; - $optionsConcepto = array_merge($optionsConcepto,$this->getConcepto($establecimiento_id)); + $optionsConcepto = array_merge($optionsConcepto, $this->getConcepto($establecimiento_id)); - $aAlumno = $this->getAlumnos($division_id); $criteria = new Criteria(); @@ -401,7 +399,6 @@ $conceptoAlumno[$boletinConceptual->getFkPeriodoId()][$boletinConceptual->getFkConceptoId()] = $boletinConceptual->getObservacion()->getContents(); } } - $criteria = new Criteria(); $criteria->add(PeriodoPeer::FK_CICLOLECTIVO_ID, $this->getUser()->getAttribute('fk_ciclolectivo_id')); $aPeriodo = PeriodoPeer::doSelect($criteria);

1 0

SVN Alba r5137 - prosistem/alba/trunk/alba/doc/manual/img
by commits＠pressenter.com.ar 24 Sep '07

24 Sep '07

Author: ftoledo Date: 2007-09-24 16:17:55 -0300 (Mon, 24 Sep 2007) New Revision: 5137 Modified: prosistem/alba/trunk/alba/doc/manual/img/figura56.png Log: eliminando datos que no derian ir Modified: prosistem/alba/trunk/alba/doc/manual/img/figura56.png =================================================================== (Binary files differ)

1 0

SVN Alba r5136 - prosistem/alba/trunk/alba/apps/principal/modules/docente/actions
by commits＠pressenter.com.ar 24 Sep '07

24 Sep '07

Author: hsanchez Date: 2007-09-24 15:59:14 -0300 (Mon, 24 Sep 2007) New Revision: 5136 Modified: prosistem/alba/trunk/alba/apps/principal/modules/docente/actions/actions.class.php Log: Corrigiendo el filtro que no funcionaba Modified: prosistem/alba/trunk/alba/apps/principal/modules/docente/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/docente/actions/actions.class.php 2007-09-24 18:25:14 UTC (rev 5135) +++ prosistem/alba/trunk/alba/apps/principal/modules/docente/actions/actions.class.php 2007-09-24 18:59:14 UTC (rev 5136) @@ -87,6 +87,14 @@ protected function addFiltersCriteria($c) { + if(isset($this->filters['apellido']) && $this->filters['apellido'] != '') { + $cton1 = $c->getNewCriterion(DocentePeer::APELLIDO, "%".$this->filters['apellido']."%", Criteria::LIKE); + $c->add($cton1); + } + if(isset($this->filters['nombre']) && $this->filters['nombre'] != '') { + $cton2 = $c->getNewCriterion(DocentePeer::NOMBRE, "%".$this->filters['nombre']."%", Criteria::LIKE); + $c->add($cton2); + } $c->addJoin(DocentePeer::ID,RelDocenteEstablecimientoPeer::FK_DOCENTE_ID, Criteria::LEFT_JOIN); $c->add(RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID, $this->getUser()->getAttribute('fk_establecimiento_id')); }

1 0

SVN Alba r5135 - in prosistem/alba/trunk/alba/apps/principal/modules: boletin/config boletin/templates cuenta/templates
by commits＠pressenter.com.ar 24 Sep '07

24 Sep '07

Author: josx Date: 2007-09-24 15:25:14 -0300 (Mon, 24 Sep 2007) New Revision: 5135 Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/config/view.yml prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/mostrarSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/cuenta/templates/verCompletaSuccess.php Log: Cada vez que se muestra el boletin se abre en nueva ventana. Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/config/view.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/boletin/config/view.yml 2007-09-24 18:14:39 UTC (rev 5134) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/config/view.yml 2007-09-24 18:25:14 UTC (rev 5135) @@ -1,3 +1,5 @@ default: stylesheets: [..%SF_ADMIN_WEB_DIR%/css/main] - \ No newline at end of file + +mostrarSuccess: + layout: layout_sinmenu \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/mostrarSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/mostrarSuccess.php 2007-09-24 18:14:39 UTC (rev 5134) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/mostrarSuccess.php 2007-09-24 18:25:14 UTC (rev 5135) @@ -95,8 +95,5 @@ </div> <br> <?php } ?> -<ul class="sf_admin_actions"> -<li><?php echo button_to('Ir a la cuenta','cuenta?action=verCompleta&id='.$alumno->getFkCuentaId(),array('class'=>'sf_admin_action_list'))?></li> -</ul> </body> </html> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/cuenta/templates/verCompletaSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cuenta/templates/verCompletaSuccess.php 2007-09-24 18:14:39 UTC (rev 5134) +++ prosistem/alba/trunk/alba/apps/principal/modules/cuenta/templates/verCompletaSuccess.php 2007-09-24 18:25:14 UTC (rev 5135) @@ -79,7 +79,7 @@ <?php echo link_to(image_tag('small/legajo.png',array("title"=>"Legajos")), 'alumno/Legajo?id='. $alumno->getID()) ?> </li> <li> - <?php echo link_to(image_tag('small/boletin.png',array("title"=>"Boletin")), 'boletin/mostrar?alumno_id='. $alumno->getID()) ?> + <?php echo link_to(image_tag('small/boletin.png',array("title"=>"Boletin")), 'boletin/mostrar?alumno_id='. $alumno->getID(),'target=_blank') ?> </li> </ul> </td>

1 0

SVN Alba r5134 - prosistem/alba/trunk/alba/apps/principal/modules/informes/templates
by commits＠pressenter.com.ar 24 Sep '07

24 Sep '07

Author: josx Date: 2007-09-24 15:14:39 -0300 (Mon, 24 Sep 2007) New Revision: 5134 Modified: prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/boletinFormularioSuccess.php Log: Se agrega el div con el container para usar los estilos Modified: prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/boletinFormularioSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/boletinFormularioSuccess.php 2007-09-24 17:58:22 UTC (rev 5133) +++ prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/boletinFormularioSuccess.php 2007-09-24 18:14:39 UTC (rev 5134) @@ -1,4 +1,5 @@ <?php use_helper('I18N'); ?> +<div id ="sf_admin_container"> <h1>Informe: Boletines</h1> <?php echo form_tag('informes/boletinFormulario', 'id=sf_admin_edit_form name=sf_admin_edit_form multipart=true') ?> @@ -55,4 +56,5 @@ Su búsqueda por -<?php echo $txt?>- no ha encontrado alumnos. <?php } } -?> \ No newline at end of file +?> +</div> \ No newline at end of file

1 0

SVN Alba r5133 - prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates
by commits＠pressenter.com.ar 24 Sep '07

24 Sep '07

Author: josx Date: 2007-09-24 14:58:22 -0300 (Mon, 24 Sep 2007) New Revision: 5133 Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/mostrarSuccess.php Log: Saque la comparacion por la variable vista que ya no se usa en el boletin. Ademas saco un ; del titulo que estaba de mas. Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/mostrarSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/mostrarSuccess.php 2007-09-24 17:42:15 UTC (rev 5132) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/mostrarSuccess.php 2007-09-24 17:58:22 UTC (rev 5133) @@ -36,7 +36,7 @@ <br> <div align="center"> <table style="text-align: left; width: 766px; height: 143px; border-collapse: collapse; border: solid;" border="1" cellpadding="2" cellspacing="2"> -<CAPTION><em>BOLETIN DE CALIFICACIONES PERTENECIENTES A: </em>; <b><?php echo $alumno->getNombre()." ".$alumno->getApellido()?></b>    <em>GRADO:</em>  <b><?php echo ($division->getAnio())?$division->getAnio()->getDescripcion():""?></b>    <em>SECCION:</em>  <b><?php echo $division->getDescripcion()?></b>    <em>TURNO:</em> <b><?php echo ($division->getTurno())?$division->getTurno()->getDescripcion():""?></b><br></CAPTION> +<CAPTION><em>BOLETIN DE CALIFICACIONES PERTENECIENTES A: </em> <b><?php echo $alumno->getNombre()." ".$alumno->getApellido()?></b>    <em>GRADO:</em>  <b><?php echo ($division->getAnio())?$division->getAnio()->getDescripcion():""?></b>    <em>SECCION:</em>  <b><?php echo $division->getDescripcion()?></b>    <em>TURNO:</em> <b><?php echo ($division->getTurno())?$division->getTurno()->getDescripcion():""?></b><br></CAPTION> <tbody> <tr> <td colspan="1" rowspan="2"><div class="etiquetas">PERIODO</div></td> @@ -95,10 +95,8 @@ </div> <br> <?php } ?> -<?php if($vista != 'imprimir') { ?> <ul class="sf_admin_actions"> <li><?php echo button_to('Ir a la cuenta','cuenta?action=verCompleta&id='.$alumno->getFkCuentaId(),array('class'=>'sf_admin_action_list'))?></li> </ul> -<?php } ?> </body> </html> \ No newline at end of file

1 0

SVN Alba r5132 - prosistem/alba/trunk/alba/apps/principal/modules/cal/lib
by commits＠pressenter.com.ar 24 Sep '07

24 Sep '07

Author: josx Date: 2007-09-24 14:42:15 -0300 (Mon, 24 Sep 2007) New Revision: 5132 Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/draw_functions.php prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/ical_parser.php prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/overlapping_events.php prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/template.php Log: Se arreglo el problema de visualizacion de los calendarios. Existia una variable gridlength que estaba como global en varias funciones y no se habia modificado Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/draw_functions.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/draw_functions.php 2007-09-24 13:42:08 UTC (rev 5131) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/draw_functions.php 2007-09-24 17:42:15 UTC (rev 5132) @@ -1,8 +1,8 @@ <?php // function returns starttime and endtime and event length for drawing into a grid -function drawEventTimes ($start, $end) { - global $gridLength; +function drawEventTimes ($start, $end, $gridLength) { +// global $gridLength; preg_match ('/([0-9]{2})([0-9]{2})/', $start, $time); $sta_h = $time[1]; Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/ical_parser.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/ical_parser.php 2007-09-24 13:42:08 UTC (rev 5131) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/ical_parser.php 2007-09-24 17:42:15 UTC (rev 5132) @@ -227,7 +227,7 @@ unset($master_array[$start_date_tmp][$old_start_time]); } } - +// print_R($overlap_array); $write_processed = false; } else { $write_processed = true; @@ -265,7 +265,7 @@ $length = ($time2[1]*60+$time2[2]) - ($time[1]*60+$time[2]); } - $drawKey = drawEventTimes($start_time, $end_time); + $drawKey = drawEventTimes($start_time, $end_time, $gridLength); preg_match ('/([0-9]{2})([0-9]{2})/', $drawKey['draw_start'], $time3); $hour = $time3[1]; $minute = $time3[2]; @@ -360,7 +360,7 @@ if (isset($display_end_tmp)){ $master_array[$start_date_tmp][$time_tmp][$uid]['display_end'] = $display_end_tmp; } - checkOverlap($start_date_tmp, $time_tmp, $uid, $master_array, $overlap_array); + checkOverlap($start_date_tmp, $time_tmp, $uid, $master_array, $overlap_array, $gridLength); $start_tmp = strtotime('+1 day',$start_tmp); } if (!$write_processed) $master_array[$start_date][($hour.$minute)][$uid]['exception'] = true; @@ -395,7 +395,7 @@ if (isset($display_end_tmp)){ $master_array[($start_date)][($hour.$minute)][$uid]['display_end'] = $display_end_tmp; } - checkOverlap($start_date, ($hour.$minute), $uid, $master_array, $overlap_array); + checkOverlap($start_date, ($hour.$minute), $uid, $master_array, $overlap_array, $gridLength); if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true; } } @@ -857,7 +857,7 @@ if (isset($display_end_tmp)){ $master_array[$start_date_tmp][$time_tmp][$uid]['display_end'] = $display_end_tmp; } - checkOverlap($start_date_tmp, $time_tmp, $uid, $master_array, $overlap_array); + checkOverlap($start_date_tmp, $time_tmp, $uid, $master_array, $overlap_array, $gridLength); } $start_tmp = strtotime('+1 day',$start_tmp); } @@ -894,7 +894,7 @@ if (isset($display_end_tmp)){ $master_array[($recur_data_date)][($hour.$minute)][$uid]['display_end'] = $display_end_tmp; } - checkOverlap($recur_data_date, ($hour.$minute), $uid, $master_array, $overlap_array); + checkOverlap($recur_data_date, ($hour.$minute), $uid, $master_array, $overlap_array, $gridLength); } } } @@ -1213,12 +1213,12 @@ //If you want to see the values in the arrays, uncomment below. // print '<pre>'; -// print_r($master_array); +// print_r($master_array); // print_r($overlap_array); // print_r($day_array); -// print_r($rrule_array); -// print_r($recurrence_delete); -// print_r($cal_displaynames); -// print_r($cal_filelist); -// print '</pre>'; +// print_r($rrule_array); +// print_r($recurrence_delete); +// print_r($cal_displaynames); +// print_r($cal_filelist); + // print '</pre>';die; ?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/overlapping_events.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/overlapping_events.php 2007-09-24 13:42:08 UTC (rev 5131) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/overlapping_events.php 2007-09-24 17:42:15 UTC (rev 5132) @@ -1,12 +1,4 @@ <?php - -// Josx en este archivo esta el comienzo de los problemas. -// Yo ya hice algunas modficaciones, en las funciones que reciben "ahora" $master y $overlap_array -// fijate que estan comentadas la variables globales -// Las invocaciones a estas funciones estan en el archivo ical_parser.php y creo que en ningun otro archivo -// Hay que probar como llegan, es decir con que valores, llegan las variables a la invocacion - - // function to determine maximum necessary columns per day // actually an algorithm to get the smallest multiple for two numbers function kgv($a, $b) { @@ -79,7 +71,7 @@ } // Merges overlapping blocks -function flatten_ol_blocks($event_date, $ol_blocks, $new_block_key, $master_array) { +function flatten_ol_blocks($event_date, $ol_blocks, $new_block_key, &$master_array) { // global $master_array; @@ -117,14 +109,14 @@ } // Builds $overlap_array structure, and updates event_overlap in $master_array for the given events. -function checkOverlap($event_date, $event_time, $uid, $master_array, $overlap_array) { +function checkOverlap($event_date, $event_time, $uid, &$master_array, &$overlap_array, $gridLength) { // global $master_array, $overlap_array; //@annotation las globales se reemplazaron por parametros en las invocaciones de iacl_parser y aca if (!isset($event_date)) return; $event = $master_array[$event_date][$event_time][$uid]; // Copy out the array - we replace this at the end. $ol_day_array = $overlap_array[$event_date]; - $drawTimes = drawEventTimes($event['event_start'], $event['event_end']); + $drawTimes = drawEventTimes($event['event_start'], $event['event_end'], $gridLength); // For a given date, // - check to see if the event's already in a block, and if so, add it. @@ -189,7 +181,7 @@ foreach ($time as $loop_event_key => $loop_event) { // Make sure we haven't already dealt with the event, and we're not checking against ourself. if ($loop_event['event_overlap'] == 0 && $loop_event_key != $uid) { - $loopDrawTimes = drawEventTimes($loop_event['event_start'], $loop_event['event_end']); + $loopDrawTimes = drawEventTimes($loop_event['event_start'], $loop_event['event_end'], $gridLength); if ($loopDrawTimes['draw_start'] < $drawTimes['draw_end'] && $loopDrawTimes['draw_end'] > $drawTimes['draw_start']) { if ($loopDrawTimes['draw_start'] < $drawTimes['draw_start']) { $block_start = $loopDrawTimes['draw_start']; @@ -239,7 +231,7 @@ // Remove an event from the overlap data. // This could be completely bogus, since overlap array is empty when this gets called in my tests, but I'm leaving it in anyways. -function removeOverlap($ol_start_date, $ol_start_time, $ol_key, $master_array, $overlap_array) { +function removeOverlap($ol_start_date, $ol_start_time, $ol_key, &$master_array, &$overlap_array) { // global $master_array, $overlap_array; //@annotation las globales se reemplazaron por parametros en las invocaciones de iacl_parser y aca if (isset($overlap_array[$ol_start_date])) { Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/template.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/template.php 2007-09-24 13:42:08 UTC (rev 5131) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/template.php 2007-09-24 17:42:15 UTC (rev 5132) @@ -471,7 +471,7 @@ #print "</pre>"; foreach ($this_time_arr as $eventKey => $loopevent) { - $drawEvent = drawEventTimes ($cal_time, $loopevent["event_end"]); + $drawEvent = drawEventTimes ($cal_time, $loopevent["event_end"], $this->gridLength); $j = 0; while (isset($event_length[$thisday][$j])) { if ($event_length[$thisday][$j]["state"] == "ended") { @@ -681,7 +681,7 @@ // check for eventstart if (isset($this_time_arr) && sizeof($this_time_arr) > 0) { foreach ($this_time_arr as $eventKey => $loopevent) { - $drawEvent = drawEventTimes ($cal_time, $loopevent['event_end']); + $drawEvent = drawEventTimes ($cal_time, $loopevent['event_end'], $this->gridLength); $j = 0; while (isset($event_length[$j])) { if ($event_length[$j]['state'] == 'ended') {

1 0

SVN Alba r5131 - prosistem/alba/trunk/alba/apps/principal/modules/cal/lib
by commits＠pressenter.com.ar 24 Sep '07

24 Sep '07

Author: sabino Date: 2007-09-24 10:42:08 -0300 (Mon, 24 Sep 2007) New Revision: 5131 Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/overlapping_events.php Log: Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/overlapping_events.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/overlapping_events.php 2007-09-24 13:36:06 UTC (rev 5130) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/overlapping_events.php 2007-09-24 13:42:08 UTC (rev 5131) @@ -3,6 +3,8 @@ // Josx en este archivo esta el comienzo de los problemas. // Yo ya hice algunas modficaciones, en las funciones que reciben "ahora" $master y $overlap_array // fijate que estan comentadas la variables globales +// Las invocaciones a estas funciones estan en el archivo ical_parser.php y creo que en ningun otro archivo +// Hay que probar como llegan, es decir con que valores, llegan las variables a la invocacion // function to determine maximum necessary columns per day

1 0

SVN Alba r5130 - in prosistem/alba/trunk/alba/apps/principal/modules/cal: actions lib
by commits＠pressenter.com.ar 24 Sep '07

24 Sep '07

Author: sabino Date: 2007-09-24 10:36:06 -0300 (Mon, 24 Sep 2007) New Revision: 5130 Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/default_config.php prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/ical_parser.php prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/overlapping_events.php Log: Modificaciones parciales al moulo cal 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-19 21:52:24 UTC (rev 5129) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php 2007-09-24 13:36:06 UTC (rev 5130) @@ -218,6 +218,11 @@ $page->subscribe_path = $subscribe_path; $page->download_filename = $download_filename; +// foreach ($page as $key => &$var) { +// echo $key .'=> ' .$var; +// echo "<br/>"; +// } +// die; $relativeUrlRoot = sfContext::getInstance()->getRequest()->getRelativeUrlRoot(); // echo $relativeUrlRoot;die; Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/default_config.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/default_config.php 2007-09-19 21:52:24 UTC (rev 5129) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/default_config.php 2007-09-24 13:36:06 UTC (rev 5130) @@ -14,7 +14,7 @@ $language = 'Spanish'; // Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto', 'Korean' $week_start_day = 'Sunday'; // Day of the week your week starts on $week_length = '7'; // Number of days to display in the week view -$day_start = '0600'; // Start time for day grid +$day_start = '0700'; // Start time for day grid $day_end = '2000'; // End time for day grid $gridLength = '15'; // Grid distance in minutes for day view, multiples of 15 preferred $num_years = '1'; // Number of years (up and back) to display in 'Jump to' Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/ical_parser.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/ical_parser.php 2007-09-19 21:52:24 UTC (rev 5129) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/ical_parser.php 2007-09-24 13:36:06 UTC (rev 5130) @@ -219,7 +219,8 @@ if (!isset($status)) $status = $master_array[$old_start_date][$old_start_time][$uid]['status']; if (!isset($attendee)) $attendee = $master_array[$old_start_date][$old_start_time][$uid]['attendee']; if (!isset($url)) $url = $master_array[$old_start_date][$old_start_time][$uid]['url']; - removeOverlap($start_date_tmp, $old_start_time, $uid); + //reemplazo + removeOverlap($start_date_tmp, $old_start_time, $uid, $master_array, $overlap_array); if (isset($master_array[$start_date_tmp][$old_start_time][$uid])) { unset($master_array[$start_date_tmp][$old_start_time][$uid]); // SJBO added $uid twice here if (sizeof($master_array[$start_date_tmp][$old_start_time]) == 0) { @@ -359,7 +360,7 @@ if (isset($display_end_tmp)){ $master_array[$start_date_tmp][$time_tmp][$uid]['display_end'] = $display_end_tmp; } - checkOverlap($start_date_tmp, $time_tmp, $uid); + checkOverlap($start_date_tmp, $time_tmp, $uid, $master_array, $overlap_array); $start_tmp = strtotime('+1 day',$start_tmp); } if (!$write_processed) $master_array[$start_date][($hour.$minute)][$uid]['exception'] = true; @@ -394,7 +395,7 @@ if (isset($display_end_tmp)){ $master_array[($start_date)][($hour.$minute)][$uid]['display_end'] = $display_end_tmp; } - checkOverlap($start_date, ($hour.$minute), $uid); + checkOverlap($start_date, ($hour.$minute), $uid, $master_array, $overlap_array); if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true; } } @@ -856,7 +857,7 @@ if (isset($display_end_tmp)){ $master_array[$start_date_tmp][$time_tmp][$uid]['display_end'] = $display_end_tmp; } - checkOverlap($start_date_tmp, $time_tmp, $uid); + checkOverlap($start_date_tmp, $time_tmp, $uid, $master_array, $overlap_array); } $start_tmp = strtotime('+1 day',$start_tmp); } @@ -893,7 +894,7 @@ if (isset($display_end_tmp)){ $master_array[($recur_data_date)][($hour.$minute)][$uid]['display_end'] = $display_end_tmp; } - checkOverlap($recur_data_date, ($hour.$minute), $uid); + checkOverlap($recur_data_date, ($hour.$minute), $uid, $master_array, $overlap_array); } } } Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/overlapping_events.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/overlapping_events.php 2007-09-19 21:52:24 UTC (rev 5129) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/overlapping_events.php 2007-09-24 13:36:06 UTC (rev 5130) @@ -1,4 +1,10 @@ <?php + +// Josx en este archivo esta el comienzo de los problemas. +// Yo ya hice algunas modficaciones, en las funciones que reciben "ahora" $master y $overlap_array +// fijate que estan comentadas la variables globales + + // function to determine maximum necessary columns per day // actually an algorithm to get the smallest multiple for two numbers function kgv($a, $b) { @@ -71,9 +77,9 @@ } // Merges overlapping blocks -function flatten_ol_blocks($event_date, $ol_blocks, $new_block_key) { +function flatten_ol_blocks($event_date, $ol_blocks, $new_block_key, $master_array) { - global $master_array; +// global $master_array; // Loop block = each other block in the array, the ones we're merging into new block. // New block = the changed block that caused the flatten_ol_blocks call. Everything gets merged into this. @@ -109,8 +115,9 @@ } // Builds $overlap_array structure, and updates event_overlap in $master_array for the given events. -function checkOverlap($event_date, $event_time, $uid) { - global $master_array, $overlap_array; +function checkOverlap($event_date, $event_time, $uid, $master_array, $overlap_array) { +// global $master_array, $overlap_array; + //@annotation las globales se reemplazaron por parametros en las invocaciones de iacl_parser y aca if (!isset($event_date)) return; $event = $master_array[$event_date][$event_time][$uid]; // Copy out the array - we replace this at the end. @@ -162,7 +169,7 @@ $master_array[$event_date][$max_overlap_event['time']][$max_overlap_event['key']]['event_overlap'] = $loop_ol_block['maxOverlaps']; } $ol_day_array[$loop_block_key] = $loop_ol_block; - $ol_day_array = flatten_ol_blocks($event_date, $ol_day_array, $loop_block_key); + $ol_day_array = flatten_ol_blocks($event_date, $ol_day_array, $loop_block_key, $master_array); $already_merged_once = true; break; // Handle repeat calls to checkOverlap - semi-bogus since the event shouldn't be created more than once, but this makes sure we don't get an invalid event_overlap. @@ -208,7 +215,7 @@ // Make sure we pass in the key of the newly added item above. end($ol_day_array); $last_day_key = key($ol_day_array); - $ol_day_array = flatten_ol_blocks($event_date, $ol_day_array, $last_day_key); + $ol_day_array = flatten_ol_blocks($event_date, $ol_day_array, $last_day_key, $master_array); } } } @@ -230,8 +237,9 @@ // Remove an event from the overlap data. // This could be completely bogus, since overlap array is empty when this gets called in my tests, but I'm leaving it in anyways. -function removeOverlap($ol_start_date, $ol_start_time, $ol_key) { - global $master_array, $overlap_array; +function removeOverlap($ol_start_date, $ol_start_time, $ol_key, $master_array, $overlap_array) { +// global $master_array, $overlap_array; + //@annotation las globales se reemplazaron por parametros en las invocaciones de iacl_parser y aca if (isset($overlap_array[$ol_start_date])) { if (sizeof($overlap_array[$ol_start_date]) > 0) { $ol_end_time = $master_array[$ol_start_date][$ol_start_time][$ol_key]['event_end'];

1 0