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

SVN Alba r4606 - in prosistem/alba/trunk/alba: apps/principal/lib apps/principal/modules/relDivisionActividadDocente/actions apps/principal/modules/relDivisionActividadDocente/templates lib/model
by commits＠pressenter.com.ar 07 May '07

07 May '07

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

1 0

SVN Alba r4605 - prosistem/alba/trunk/alba/data/sql
by commits＠pressenter.com.ar 05 May '07

05 May '07

Author: ftoledo Date: 2007-05-04 23:54:38 -0300 (Fri, 04 May 2007) New Revision: 4605 Modified: prosistem/alba/trunk/alba/data/sql/datos_ejemplo.sql Log: sacando campos que no estan en el schema [REVISAR] Modified: prosistem/alba/trunk/alba/data/sql/datos_ejemplo.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/datos_ejemplo.sql 2007-05-05 02:40:02 UTC (rev 4604) +++ prosistem/alba/trunk/alba/data/sql/datos_ejemplo.sql 2007-05-05 02:54:38 UTC (rev 4605) @@ -3065,14 +3065,14 @@ -- Volcar la base de datos para la tabla `rel_division_actividad_docente` -- -INSERT INTO `rel_division_actividad_docente` (`id`, `fk_division_id`, `fk_actividad_id`, `fk_repeticion_id`, `fecha_inicio`, `fecha_fin`, `hora_inicio`, `hora_fin`, `fk_docente_id`, `fk_cargobaja_id`, `fk_tipodocente_id`) VALUES (1, 8, 7, 1, '2006-09-11 00:00:00', '2006-09-11 00:00:00', '07:30:00', '08:10:00', 1, NULL, NULL); -INSERT INTO `rel_division_actividad_docente` (`id`, `fk_division_id`, `fk_actividad_id`, `fk_repeticion_id`, `fecha_inicio`, `fecha_fin`, `hora_inicio`, `hora_fin`, `fk_docente_id`, `fk_cargobaja_id`, `fk_tipodocente_id`) VALUES (2, 8, 7, 1, '2006-09-11 00:00:00', '2006-09-11 00:00:00', '08:10:00', '08:50:00', 1, NULL, NULL); -INSERT INTO `rel_division_actividad_docente` (`id`, `fk_division_id`, `fk_actividad_id`, `fk_repeticion_id`, `fecha_inicio`, `fecha_fin`, `hora_inicio`, `hora_fin`, `fk_docente_id`, `fk_cargobaja_id`, `fk_tipodocente_id`) VALUES (3, 8, 7, 1, '2006-09-12 00:00:00', '2006-09-12 00:00:00', '07:30:00', '08:10:00', 1, NULL, NULL); -INSERT INTO `rel_division_actividad_docente` (`id`, `fk_division_id`, `fk_actividad_id`, `fk_repeticion_id`, `fecha_inicio`, `fecha_fin`, `hora_inicio`, `hora_fin`, `fk_docente_id`, `fk_cargobaja_id`, `fk_tipodocente_id`) VALUES (4, 8, 7, 1, '2006-09-12 00:00:00', '2006-09-12 00:00:00', '08:10:00', '08:50:00', 1, NULL, NULL); -INSERT INTO `rel_division_actividad_docente` (`id`, `fk_division_id`, `fk_actividad_id`, `fk_repeticion_id`, `fecha_inicio`, `fecha_fin`, `hora_inicio`, `hora_fin`, `fk_docente_id`, `fk_cargobaja_id`, `fk_tipodocente_id`) VALUES (5, 8, 7, 1, '2006-09-13 00:00:00', '2006-09-13 00:00:00', '09:50:00', '10:30:00', 1, NULL, NULL); -INSERT INTO `rel_division_actividad_docente` (`id`, `fk_division_id`, `fk_actividad_id`, `fk_repeticion_id`, `fecha_inicio`, `fecha_fin`, `hora_inicio`, `hora_fin`, `fk_docente_id`, `fk_cargobaja_id`, `fk_tipodocente_id`) VALUES (6, 8, 7, 1, '2006-09-13 00:00:00', '2006-09-13 00:00:00', '10:40:00', '11:20:00', 1, NULL, NULL); -INSERT INTO `rel_division_actividad_docente` (`id`, `fk_division_id`, `fk_actividad_id`, `fk_repeticion_id`, `fecha_inicio`, `fecha_fin`, `hora_inicio`, `hora_fin`, `fk_docente_id`, `fk_cargobaja_id`, `fk_tipodocente_id`) VALUES (7, 8, 7, 1, '2006-09-14 00:00:00', '2006-09-14 00:00:00', '09:50:00', '10:30:00', 1, NULL, NULL); -INSERT INTO `rel_division_actividad_docente` (`id`, `fk_division_id`, `fk_actividad_id`, `fk_repeticion_id`, `fecha_inicio`, `fecha_fin`, `hora_inicio`, `hora_fin`, `fk_docente_id`, `fk_cargobaja_id`, `fk_tipodocente_id`) VALUES (8, 8, 7, 1, '2006-09-14 00:00:00', '2006-09-14 00:00:00', '10:40:00', '11:20:00', 1, NULL, NULL); +INSERT INTO `rel_division_actividad_docente` (`id`, `fk_division_id`, `fk_actividad_id`, `fk_repeticion_id`, `fecha_inicio`, `fecha_fin`, `hora_inicio`, `hora_fin`) VALUES (1, 8, 7, 1, '2006-09-11 00:00:00', '2006-09-11 00:00:00', '07:30:00', '08:10:00'); +INSERT INTO `rel_division_actividad_docente` (`id`, `fk_division_id`, `fk_actividad_id`, `fk_repeticion_id`, `fecha_inicio`, `fecha_fin`, `hora_inicio`, `hora_fin`) VALUES (2, 8, 7, 1, '2006-09-11 00:00:00', '2006-09-11 00:00:00', '08:10:00', '08:50:00'); +INSERT INTO `rel_division_actividad_docente` (`id`, `fk_division_id`, `fk_actividad_id`, `fk_repeticion_id`, `fecha_inicio`, `fecha_fin`, `hora_inicio`, `hora_fin`) VALUES (3, 8, 7, 1, '2006-09-12 00:00:00', '2006-09-12 00:00:00', '07:30:00', '08:10:00'); +INSERT INTO `rel_division_actividad_docente` (`id`, `fk_division_id`, `fk_actividad_id`, `fk_repeticion_id`, `fecha_inicio`, `fecha_fin`, `hora_inicio`, `hora_fin`) VALUES (4, 8, 7, 1, '2006-09-12 00:00:00', '2006-09-12 00:00:00', '08:10:00', '08:50:00'); +INSERT INTO `rel_division_actividad_docente` (`id`, `fk_division_id`, `fk_actividad_id`, `fk_repeticion_id`, `fecha_inicio`, `fecha_fin`, `hora_inicio`, `hora_fin`) VALUES (5, 8, 7, 1, '2006-09-13 00:00:00', '2006-09-13 00:00:00', '09:50:00', '10:30:00'); +INSERT INTO `rel_division_actividad_docente` (`id`, `fk_division_id`, `fk_actividad_id`, `fk_repeticion_id`, `fecha_inicio`, `fecha_fin`, `hora_inicio`, `hora_fin`) VALUES (6, 8, 7, 1, '2006-09-13 00:00:00', '2006-09-13 00:00:00', '10:40:00', '11:20:00'); +INSERT INTO `rel_division_actividad_docente` (`id`, `fk_division_id`, `fk_actividad_id`, `fk_repeticion_id`, `fecha_inicio`, `fecha_fin`, `hora_inicio`, `hora_fin`) VALUES (7, 8, 7, 1, '2006-09-14 00:00:00', '2006-09-14 00:00:00', '09:50:00', '10:30:00'); +INSERT INTO `rel_division_actividad_docente` (`id`, `fk_division_id`, `fk_actividad_id`, `fk_repeticion_id`, `fecha_inicio`, `fecha_fin`, `hora_inicio`, `hora_fin`) VALUES (8, 8, 7, 1, '2006-09-14 00:00:00', '2006-09-14 00:00:00', '10:40:00', '11:20:00'); -- -- Volcar la base de datos para la tabla `rel_docente_establecimiento`

1 0

SVN Alba r4604 - prosistem/alba/trunk/debian
by commits＠pressenter.com.ar 05 May '07

05 May '07

Author: ftoledo Date: 2007-05-04 23:40:02 -0300 (Fri, 04 May 2007) New Revision: 4604 Added: prosistem/alba/trunk/debian/manpage.1 Modified: prosistem/alba/trunk/debian/rules prosistem/alba/trunk/debian/templates Log: creando tenmplate del man Added: prosistem/alba/trunk/debian/manpage.1 =================================================================== --- prosistem/alba/trunk/debian/manpage.1 2007-05-02 20:40:51 UTC (rev 4603) +++ prosistem/alba/trunk/debian/manpage.1 2007-05-05 02:40:02 UTC (rev 4604) @@ -0,0 +1,59 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH ALBA SECTION "abril 30, 2007" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +alba \- program to do something +.SH SYNOPSIS +.B alba +.RI [ options ] " files" ... +.br +.B bar +.RI [ options ] " files" ... +.SH DESCRIPTION +This manual page documents briefly the +.B alba +and +.B bar +commands. +.PP +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBalba\fP is a program that... +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +For a complete description, see the Info files. +.TP +.B \-h, \-\-help +Show summary of options. +.TP +.B \-v, \-\-version +Show version of program. +.SH SEE ALSO +.BR bar (1), +.BR baz (1). +.br +The programs are documented fully by +.IR "The Rise and Fall of a Fooish Bar" , +available via the Info system. +.SH AUTHOR +alba was written by <upstream author>. +.PP +This manual page was written by ragnarok <ftoledo(a)docksud.com.ar>, +for the Debian project (but may be used by others). Modified: prosistem/alba/trunk/debian/rules =================================================================== --- prosistem/alba/trunk/debian/rules 2007-05-02 20:40:51 UTC (rev 4603) +++ prosistem/alba/trunk/debian/rules 2007-05-05 02:40:02 UTC (rev 4604) @@ -24,13 +24,13 @@ dh_clean -k dh_installdirs dh_install -# find debian/alba -name .svn | xargs -r rm -r + find debian/alba -name .svn | xargs -r rm -r # Build architecture-independent files here. binary-indep: build install dh_testdir dh_testroot - #dh_installchangelogs ChangeLog +# dh_installchangelogs ChangeLog dh_installdocs dh_installexamples dh_installdebconf Modified: prosistem/alba/trunk/debian/templates =================================================================== --- prosistem/alba/trunk/debian/templates 2007-05-02 20:40:51 UTC (rev 4603) +++ prosistem/alba/trunk/debian/templates 2007-05-05 02:40:02 UTC (rev 4604) @@ -2,7 +2,7 @@ Type: multiselect Choices: apache2, apache, apache-ssl, apache-perl Default: apache2 -_Description: Which web server would you like to reconfigure automatically? . +Description: Which web server would you like to reconfigure automatically? Alba can run on any web server that PHP5 does, but this automatic . configuration process only supports Apache.

1 0

SVN Alba r4603 - in prosistem/alba/trunk/alba: apps/principal/lib apps/principal/modules/relDivisionActividadDocente/actions lib/model
by commits＠pressenter.com.ar 02 May '07

02 May '07

Author: josx Date: 2007-05-02 17:40:51 -0300 (Wed, 02 May 2007) New Revision: 4603 Added: prosistem/alba/trunk/alba/apps/principal/lib/miEvento.class.php Modified: prosistem/alba/trunk/alba/apps/principal/lib/myAction.class.php prosistem/alba/trunk/alba/apps/principal/lib/myWebRequest.class.php prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php prosistem/alba/trunk/alba/lib/model/Evento.php Log: Se hizo independiente con la clase miEvento para poder ser usada de cualquier modulo Added: prosistem/alba/trunk/alba/apps/principal/lib/miEvento.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/lib/miEvento.class.php 2007-05-02 19:54:06 UTC (rev 4602) +++ prosistem/alba/trunk/alba/apps/principal/lib/miEvento.class.php 2007-05-02 20:40:51 UTC (rev 4603) @@ -0,0 +1,182 @@ +<?php + +class miEvento extends sfWebRequest +{ + + public function updateEventoFromRequest($evento_obj, $evento, $cultura) { +// $evento = $this->getRequestParameter('evento'); + + if (isset($evento['fecha_inicio'])) { + if ($evento['fecha_inicio']) { + try { + $dateFormat = new sfDateFormat($cultura); + if(!is_array($evento['fecha_inicio'])) { + + if(isset($evento['hora_asociada']) AND $evento['hora_asociada'] == 1) { + if($evento['hora_inicio']) { + $evento['hora_inicio']['hour'] = ($evento['hora_inicio']['hour'] != "12" AND $evento['hora_inicio']['ampm'] == "PM")?$evento['hora_inicio']['hour'] + 12:$evento['hora_inicio']['hour']; + $evento['hora_inicio']['hour'] = ($evento['hora_inicio']['hour'] == "12" AND $evento['hora_inicio']['ampm'] == "AM")?"00":$evento['hora_inicio']['hour']; + $evento['fecha_inicio'] .= " ".$evento['hora_inicio']['hour'].":".$evento['hora_inicio']['minute']; + } else { + $evento['fecha_inicio'] .= " 00:00:00"; + } + } else { + $evento['fecha_inicio'] .= " 00:00:00"; + } + + $value = $dateFormat->format($evento['fecha_inicio'], 'I', $dateFormat->getInputPattern('g')); + + } else { + $value_array = $evento['fecha_inicio']; + + $value_array['hour']['hour'] = "00"; + $value_array['hour']['minute'] = "00"; + $value_array['hour']['second'] = "00"; + if($evento['hora_asociada'] == 1) { + if($evento['hora_inicio']) { + $value_array['hour'] = $evento['hora_inicio']['hour']; + $value_array['minute'] = $evento['hora_inicio']['minute']; + $value_array['ampm'] = $evento['hora_inicio']['ampm']; + } + } + + $value = $value_array['year'].'-'.$value_array['month'].'-'.$value_array['day'].(isset($value_array['hour']) ? ' '.$value_array['hour'].':'.$value_array['minute'].(isset($value_array['second']) ? ':'.$value_array['second'] : '') : ''); + } + + $evento_obj->setFechaInicio($value); + } + catch (sfException $e) { + // not a date + } + } else { + $evento_obj->setFechaInicio(null); + } + } + + if (isset($evento['fecha_fin'])) { + if ($evento['fecha_fin']) { + try { + $dateFormat = new sfDateFormat($cultura); + if (!is_array($evento['fecha_fin'])) { + + if(isset($evento['hora_asociada']) AND $evento['hora_asociada'] == 1) { + if($evento['hora_fin']) { + $evento['hora_fin']['hour'] = ($evento['hora_fin']['hour'] != "12" AND $evento['hora_fin']['ampm'] == "PM")?$evento['hora_fin']['hour'] + 12:$evento['hora_fin']['hour']; + $evento['hora_fin']['hour'] = ($evento['hora_fin']['hour'] == "12" AND $evento['hora_fin']['ampm'] == "AM")?"00":$evento['hora_fin']['hour']; + + $evento['fecha_fin'] .= " ".$evento['hora_fin']['hour'].":".$evento['hora_fin']['minute']; + } else { + $evento['fecha_fin'] .= " 00:00:00"; + } + } else { + $evento['fecha_fin'] .= " 00:00:00"; + } + + $value = $dateFormat->format($evento['fecha_fin'], 'I', $dateFormat->getInputPattern('g')); + + } else { + $value_array = $evento['fecha_fin']; + + $value_array['hour']['hour'] = "00"; + $value_array['hour']['minute'] = "00"; + $value_array['hour']['second'] = "00"; + if($evento['hora_asociada'] == 1) { + if($evento['hora_fin']) { + $value_array['hour'] = $evento['hora_fin']['hour']; + $value_array['minute'] = $evento['hora_fin']['minute']; + $value_array['ampm'] = $evento['hora_inicio']['ampm']; + } + } + + $value = $value_array['year'].'-'.$value_array['month'].'-'.$value_array['day'].(isset($value_array['hour']) ? ' '.$value_array['hour'].':'.$value_array['minute'].(isset($value_array['second']) ? ':'.$value_array['second'] : '') : ''); + } + $evento_obj->setFechaFin($value); + } + catch (sfException $e) { + // not a date + } + } else { + $evento_obj->setFechaFin(null); + } + } + + + if(isset($evento['titulo'])) { + $evento_obj->setTitulo($evento['titulo']); + } + + + if(isset($evento['tipo'])) { + $evento_obj->setTipo($evento['titulo']); + } else { + $evento_obj->setTipo(1); // (0 = PRIVATE | 1 = PUBLIC | 2 = CONFIDENTIAL) + } + + if(isset($evento['estado'])) { + $evento_obj->setEstado($evento['estado']); + } else { + $evento_obj->setEstado(1); // (0 = TENTATIVE, 1 = CONFIRMED, 2 = CANCELLED) + } + + + + + if(isset($evento['activar_repeticion']) AND $evento['activar_repeticion'] == 1) { + if(isset($evento['frecuencia']) AND is_array($evento['frecuencia']) ) { + $evento_obj->setFrecuencia($evento['frecuencia'][0]); + + switch($evento['frecuencia'][0]) { // dia: 4, semana: 5, mes: 6, año: 7 + case '4': $evento_obj->setFrecuenciaIntervalo($evento['frecuencia_intervalo_diaria']); + break; + case '5': $evento_obj->setFrecuenciaIntervalo($evento['frecuencia_intervalo_semana']); + $aSemanaBinario = array ( 1, 2, 4, 8, 16, 32, 64 ); + $suma_total = 0; + foreach($evento['recurrencia_dias'] as $dia) { + $suma_total += $aSemanaBinario[$dia]; + } + // guardamos en binario para saber todos los dias de la semana seleccionados + $evento_obj->setRecurrenciaDias($suma_total); + break; + case '6': break; + case '7': break; + } + } + + if(isset($evento['recurrencia_fin_tipo']) AND is_array($evento['recurrencia_fin_tipo'])) { + + switch($evento['recurrencia_fin_tipo'][0]) { + case '0': $evento_obj->setRecurrenciaFin(''); + break; + case '1': $evento_obj->setRecurrenciaFin($evento['recurrencia_fin_repeticion']); + break; + case '2': $dateFormat = new sfDateFormat($this->getUser()->getCulture()); + $value = $dateFormat->format($evento['recurrencia_fin_fecha']." 00:00:00", 'I', $dateFormat->getInputPattern('g')); + $evento_obj->setRecurrenciaFin($value); + break; + } + } + } else { + $evento_obj->setFrecuenciaIntervalo(null); + $evento_obj->setRecurrenciaFin(null); + $evento_obj->setRecurrenciaDias(null); + $evento_obj->setFrecuencia(null); + } + + return $evento_obj; + } + + + public function getEventoOrCreate($id = 0) { + if (!$id) { + $evento = new Evento(); + } else { + $evento = EventoPeer::retrieveByPk($id); +// $this->forward404Unless($evento); + } + return $evento; + } + + +} + +?> \ No newline at end of file Property changes on: prosistem/alba/trunk/alba/apps/principal/lib/miEvento.class.php ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Modified: prosistem/alba/trunk/alba/apps/principal/lib/myAction.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/lib/myAction.class.php 2007-05-02 19:54:06 UTC (rev 4602) +++ prosistem/alba/trunk/alba/apps/principal/lib/myAction.class.php 2007-05-02 20:40:51 UTC (rev 4603) @@ -2,6 +2,182 @@ class myAction extends sfAction { + + protected function updateEventoFromRequest($evento_obj) { + $evento = $this->getRequestParameter('evento'); + + if (isset($evento['fecha_inicio'])) { + if ($evento['fecha_inicio']) { + try { + $dateFormat = new sfDateFormat($this->getUser()->getCulture()); + if(!is_array($evento['fecha_inicio'])) { + + if(isset($evento['hora_asociada']) AND $evento['hora_asociada'] == 1) { + if($evento['hora_inicio']) { + $evento['hora_inicio']['hour'] = ($evento['hora_inicio']['hour'] != "12" AND $evento['hora_inicio']['ampm'] == "PM")?$evento['hora_inicio']['hour'] + 12:$evento['hora_inicio']['hour']; + $evento['hora_inicio']['hour'] = ($evento['hora_inicio']['hour'] == "12" AND $evento['hora_inicio']['ampm'] == "AM")?"00":$evento['hora_inicio']['hour']; + $evento['fecha_inicio'] .= " ".$evento['hora_inicio']['hour'].":".$evento['hora_inicio']['minute']; + } else { + $evento['fecha_inicio'] .= " 00:00:00"; + } + } else { + $evento['fecha_inicio'] .= " 00:00:00"; + } + + $value = $dateFormat->format($evento['fecha_inicio'], 'I', $dateFormat->getInputPattern('g')); + + } else { + $value_array = $evento['fecha_inicio']; + + $value_array['hour']['hour'] = "00"; + $value_array['hour']['minute'] = "00"; + $value_array['hour']['second'] = "00"; + if($evento['hora_asociada'] == 1) { + if($evento['hora_inicio']) { + $value_array['hour'] = $evento['hora_inicio']['hour']; + $value_array['minute'] = $evento['hora_inicio']['minute']; + $value_array['ampm'] = $evento['hora_inicio']['ampm']; + } + } + + $value = $value_array['year'].'-'.$value_array['month'].'-'.$value_array['day'].(isset($value_array['hour']) ? ' '.$value_array['hour'].':'.$value_array['minute'].(isset($value_array['second']) ? ':'.$value_array['second'] : '') : ''); + } + + $evento_obj->setFechaInicio($value); + } + catch (sfException $e) { + // not a date + } + } else { + $evento_obj->setFechaInicio(null); + } + } + + if (isset($evento['fecha_fin'])) { + if ($evento['fecha_fin']) { + try { + $dateFormat = new sfDateFormat($this->getUser()->getCulture()); + if (!is_array($evento['fecha_fin'])) { + + if(isset($evento['hora_asociada']) AND $evento['hora_asociada'] == 1) { + if($evento['hora_fin']) { + $evento['hora_fin']['hour'] = ($evento['hora_fin']['hour'] != "12" AND $evento['hora_fin']['ampm'] == "PM")?$evento['hora_fin']['hour'] + 12:$evento['hora_fin']['hour']; + $evento['hora_fin']['hour'] = ($evento['hora_fin']['hour'] == "12" AND $evento['hora_fin']['ampm'] == "AM")?"00":$evento['hora_fin']['hour']; + + $evento['fecha_fin'] .= " ".$evento['hora_fin']['hour'].":".$evento['hora_fin']['minute']; + } else { + $evento['fecha_fin'] .= " 00:00:00"; + } + } else { + $evento['fecha_fin'] .= " 00:00:00"; + } + + $value = $dateFormat->format($evento['fecha_fin'], 'I', $dateFormat->getInputPattern('g')); + + } else { + $value_array = $evento['fecha_fin']; + + $value_array['hour']['hour'] = "00"; + $value_array['hour']['minute'] = "00"; + $value_array['hour']['second'] = "00"; + if($evento['hora_asociada'] == 1) { + if($evento['hora_fin']) { + $value_array['hour'] = $evento['hora_fin']['hour']; + $value_array['minute'] = $evento['hora_fin']['minute']; + $value_array['ampm'] = $evento['hora_inicio']['ampm']; + } + } + + $value = $value_array['year'].'-'.$value_array['month'].'-'.$value_array['day'].(isset($value_array['hour']) ? ' '.$value_array['hour'].':'.$value_array['minute'].(isset($value_array['second']) ? ':'.$value_array['second'] : '') : ''); + } + $evento_obj->setFechaFin($value); + } + catch (sfException $e) { + // not a date + } + } else { + $evento_obj->setFechaFin(null); + } + } + + + if(isset($evento['titulo'])) { + $evento_obj->setTitulo($evento['titulo']); + } + + + if(isset($evento['tipo'])) { + $evento_obj->setTipo($evento['titulo']); + } else { + $evento_obj->setTipo(1); // (0 = PRIVATE | 1 = PUBLIC | 2 = CONFIDENTIAL) + } + + if(isset($evento['estado'])) { + $evento_obj->setEstado($evento['estado']); + } else { + $evento_obj->setEstado(1); // (0 = TENTATIVE, 1 = CONFIRMED, 2 = CANCELLED) + } + + + + + if(isset($evento['activar_repeticion']) AND $evento['activar_repeticion'] == 1) { + if(isset($evento['frecuencia']) AND is_array($evento['frecuencia']) ) { + $evento_obj->setFrecuencia($evento['frecuencia'][0]); + + switch($evento['frecuencia'][0]) { // dia: 4, semana: 5, mes: 6, año: 7 + case '4': $evento_obj->setFrecuenciaIntervalo($evento['frecuencia_intervalo_diaria']); + break; + case '5': $evento_obj->setFrecuenciaIntervalo($evento['frecuencia_intervalo_semana']); + $aSemanaBinario = array ( 1, 2, 4, 8, 16, 32, 64 ); + $suma_total = 0; + foreach($evento['recurrencia_dias'] as $dia) { + $suma_total += $aSemanaBinario[$dia]; + } + // guardamos en binario para saber todos los dias de la semana seleccionados + $evento_obj->setRecurrenciaDias($suma_total); + break; + case '6': break; + case '7': break; + } + } + + if(isset($evento['recurrencia_fin_tipo']) AND is_array($evento['recurrencia_fin_tipo'])) { + + switch($evento['recurrencia_fin_tipo'][0]) { + case '0': $evento_obj->setRecurrenciaFin(''); + break; + case '1': $evento_obj->setRecurrenciaFin($evento['recurrencia_fin_repeticion']); + break; + case '2': $dateFormat = new sfDateFormat($this->getUser()->getCulture()); + $value = $dateFormat->format($evento['recurrencia_fin_fecha']." 00:00:00", 'I', $dateFormat->getInputPattern('g')); + $evento_obj->setRecurrenciaFin($value); + break; + } + } + } else { + $evento_obj->setFrecuenciaIntervalo(null); + $evento_obj->setRecurrenciaFin(null); + $evento_obj->setRecurrenciaDias(null); + $evento_obj->setFrecuencia(null); + } + + return $evento_obj; + } + + + protected function getEventoOrCreate($id = 0) { + if (!$id) { + $evento = new Evento(); + } else { + $evento = EventoPeer::retrieveByPk($id); + $this->forward404Unless($evento); + } + return $evento; + } + + + } ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/lib/myWebRequest.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/lib/myWebRequest.class.php 2007-05-02 19:54:06 UTC (rev 4602) +++ prosistem/alba/trunk/alba/apps/principal/lib/myWebRequest.class.php 2007-05-02 20:40:51 UTC (rev 4603) @@ -2,6 +2,8 @@ class myWebRequest extends sfWebRequest { + + } ?> \ No newline at end of file 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-02 19:54:06 UTC (rev 4602) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php 2007-05-02 20:40:51 UTC (rev 4603) @@ -32,7 +32,7 @@ */ class relDivisionActividadDocenteActions extends autorelDivisionActividadDocenteActions { - +/* protected function updateEventoFromRequest($evento_obj) { $evento = $this->getRequestParameter('evento'); @@ -205,16 +205,20 @@ } return $evento; } +*/ - public function executeEdit() { + + $evento_generico = new miEvento(); + $this->rel_division_actividad_docente = $this->getRelDivisionActividadDocenteOrCreate(); - $this->evento = $this->getEventoOrCreate($this->rel_division_actividad_docente->getFkEventoId()); + $this->evento = $evento_generico->getEventoOrCreate($this->rel_division_actividad_docente->getFkEventoId()); if ($this->getRequest()->getMethod() == sfRequest::POST) { - $this->evento = $this->updateEventoFromRequest($this->evento); + + $this->evento = $evento_generico->updateEventoFromRequest($this->evento, $this->getRequestParameter('evento'), $this->getUser()->getCulture()); $this->evento->save(); $this->forward404Unless($this->evento); Modified: prosistem/alba/trunk/alba/lib/model/Evento.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/Evento.php 2007-05-02 19:54:06 UTC (rev 4602) +++ prosistem/alba/trunk/alba/lib/model/Evento.php 2007-05-02 20:40:51 UTC (rev 4603) @@ -19,168 +19,6 @@ // si la hora de ambos es diferente de 00:00:00 entonces si tiene hora } -/* - protected function getEventoOrCreate($id = 'id') { - if (!$this->getRequestParameter($id)) { - $evento = new Evento(); - } else { - $evento = EventoPeer::retrieveByPk($this->getRequestParameter($id)); - $this->forward404Unless($evento); - } - return $evento; - } - - - - - protected function updateEventoFromRequest($request, $culture) { - $evento = $request->getRequestParameter('evento'); - - if (isset($evento['fecha_inicio'])) { - if ($evento['fecha_inicio']) { - try { - $dateFormat = new sfDateFormat($culture); - if(!is_array($evento['fecha_inicio'])) { - - if(isset($evento['hora_asociada']) AND $evento['hora_asociada'] == 1) { - if($evento['hora_inicio']) { - $evento['fecha_inicio'] .= " ".$evento['hora_inicio']['hour'].":".$evento['hora_inicio']['minute']; - } else { - $evento['fecha_inicio'] .= " 00:00:00"; - } - } else { - $evento['fecha_inicio'] .= " 00:00:00"; - } - - $value = $dateFormat->format($evento['fecha_inicio'], 'I', $dateFormat->getInputPattern('g')); - } else { - $value_array = $evento['fecha_inicio']; - - $value_array['hour']['hour'] = "00"; - $value_array['hour']['minute'] = "00"; - $value_array['hour']['second'] = "00"; - if($evento['hora_asociada'] == 1) { - if($evento['hora_inicio']) { - $value_array['hour'] = $evento['hora_inicio']['hour']; - $value_array['minute'] = $evento['hora_inicio']['minute']; - } - } - - $value = $value_array['year'].'-'.$value_array['month'].'-'.$value_array['day'].(isset($value_array['hour']) ? ' '.$value_array['hour'].':'.$value_array['minute'].(isset($value_array['second']) ? ':'.$value_array['second'] : '') : ''); - } - - $this->evento->setFechaInicio($value); - } - catch (sfException $e) { - // not a date - } - } else { - $this->evento->setFechaInicio(null); - } - } - - if (isset($evento['fecha_fin'])) { - if ($evento['fecha_fin']) { - try { - $dateFormat = new sfDateFormat($this->getUser()->getCulture()); - if (!is_array($evento['fecha_fin'])) { - - if(isset($evento['hora_asociada']) AND $evento['hora_asociada'] == 1) { - if($evento['hora_fin']) { - $evento['fecha_fin'] .= " ".$evento['hora_fin']['hour'].":".$evento['hora_fin']['minute']; - } else { - $evento['fecha_fin'] .= " 00:00:00"; - } - } else { - $evento['fecha_fin'] .= " 00:00:00"; - } - - $value = $dateFormat->format($evento['fecha_fin'], 'I', $dateFormat->getInputPattern('g')); - } else { - $value_array = $evento['fecha_fin']; - - $value_array['hour']['hour'] = "00"; - $value_array['hour']['minute'] = "00"; - $value_array['hour']['second'] = "00"; - if($evento['hora_asociada'] == 1) { - if($evento['hora_fin']) { - $value_array['hour'] = $evento['hora_fin']['hour']; - $value_array['minute'] = $evento['hora_fin']['minute']; - } - } - - $value = $value_array['year'].'-'.$value_array['month'].'-'.$value_array['day'].(isset($value_array['hour']) ? ' '.$value_array['hour'].':'.$value_array['minute'].(isset($value_array['second']) ? ':'.$value_array['second'] : '') : ''); - } - $this->evento->setFechaFin($value); - } - catch (sfException $e) { - // not a date - } - } else { - $this->evento->setFechaFin(null); - } - } - - - if(isset($evento['titulo'])) { - $this->evento->setTitulo($evento['titulo']); - } - - - if(isset($evento['tipo'])) { - $this->evento->setTipo($evento['titulo']); - } else { - $this->evento->setTipo(1); // (0 = PRIVATE | 1 = PUBLIC | 2 = CONFIDENTIAL) - } - - if(isset($evento['estado'])) { - $this->evento->setEstado($evento['estado']); - } else { - $this->evento->setEstado(1); // (0 = TENTATIVE, 1 = CONFIRMED, 2 = CANCELLED) - } - - - - - if(isset($evento['activar_repeticion']) AND $evento['activar_repeticion'] == 1) { - if(isset($evento['frecuencia']) AND is_array($evento['frecuencia']) ) { - $this->evento->setFrecuencia($evento['frecuencia'][0]); - - switch($evento['frecuencia'][0]) { // dia: 4, semana: 5, mes: 6, año: 7 - case '4': $this->evento->setFrecuenciaIntervalo($evento['frecuencia_intervalo_diaria']); - break; - case '5': $this->evento->setFrecuenciaIntervalo($evento['frecuencia_intervalo_semana']); - $aSemanaBinario = array ( 1, 2, 4, 8, 16, 32, 64 ); - $suma_total = 0; - foreach($evento['recurrencia_dias'] as $dia) { - $suma_total += $aSemanaBinario[$dia]; - } - // guardamos en binario para saber todos los dias de la semana seleccionados - $this->evento->setRecurrenciaDias($suma_total); - break; - case '6': break; - case '7': break; - } - } - - switch($evento['recurrencia_fin_tipo'][0]) { - case '0': $this->evento->setRecurrenciaFin(''); - break; - case '1': $this->evento->setRecurrenciaFin($evento['recurrencia_fin_repeticion']); - break; - case '2': $dateFormat = new sfDateFormat($this->getUser()->getCulture()); - $value = $dateFormat->format($evento['recurrencia_fin_fecha']." 00:00:00", 'I', $dateFormat->getInputPattern('g')); - $this->evento->setRecurrenciaFin($value); - break; - } - } - - } - - - -*/ - } ?> \ No newline at end of file

1 0

SVN Alba r4602 - prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions
by commits＠pressenter.com.ar 02 May '07

02 May '07

Author: josx Date: 2007-05-02 16:54:06 -0300 (Wed, 02 May 2007) New Revision: 4602 Modified: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php Log: Sumamos a la carga manual la carga de eventos en relDivisionActividadDocente 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-02 19:44:12 UTC (rev 4601) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php 2007-05-02 19:54:06 UTC (rev 4602) @@ -185,6 +185,11 @@ break; } } + } else { + $evento_obj->setFrecuenciaIntervalo(null); + $evento_obj->setRecurrenciaFin(null); + $evento_obj->setRecurrenciaDias(null); + $evento_obj->setFrecuencia(null); } return $evento_obj; @@ -211,10 +216,10 @@ $this->evento = $this->updateEventoFromRequest($this->evento); $this->evento->save(); + $this->forward404Unless($this->evento); $this->updateRelDivisionActividadDocenteFromRequest($this->evento->getId()); $this->saveRelDivisionActividadDocente($this->rel_division_actividad_docente); - $this->setFlash('notice', 'Your modifications have been saved'); if ($this->getRequestParameter('save_and_add')) {

1 0

02 May '07

Author: josx Date: 2007-05-02 16:44:12 -0300 (Wed, 02 May 2007) New Revision: 4601 Added: prosistem/alba/trunk/alba/apps/principal/modules/evento/templates/_carga_evento.php prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_actions.php prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_footer.php prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_form.php prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_header.php prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_messages.php prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/editSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/validate/ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/validate/edit.yml Removed: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_hora_fin.php prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_hora_inicio.php Modified: prosistem/alba/trunk/alba/apps/principal/modules/evento/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/certificadoEstudiosBusquedaFormularioSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/config/generator.yml prosistem/alba/trunk/alba/config/schema.xml prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0.sql prosistem/alba/trunk/alba/data/sql/schema.sql prosistem/alba/trunk/alba/lib/model/Evento.php prosistem/alba/trunk/alba/lib/model/map/RelDivisionActividadDocenteMapBuilder.php prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php prosistem/alba/trunk/alba/lib/model/om/BaseDivision.php prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocente.php prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocentePeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRepeticion.php Log: Sumamos a la carga manual la carga de eventos en relDivisionActividadDocente Modified: prosistem/alba/trunk/alba/apps/principal/modules/evento/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/evento/actions/actions.class.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/apps/principal/modules/evento/actions/actions.class.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -33,6 +33,11 @@ class eventoActions extends sfActions { + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } + + public function executeIndex() { return $this->forward('evento', 'edit'); // $this->evento = new Evento(); @@ -56,6 +61,8 @@ $this->updateEventoFromRequest(); $this->saveEvento($this->evento); $this->setFlash('notice', 'Your modifications have been saved'); + return $this->redirect('evento/'); + /* if ($this->getRequestParameter('save_and_add')) { return $this->redirect('evento/create'); } else if ($this->getRequestParameter('save_and_list')) { @@ -63,6 +70,8 @@ } else { return $this->redirect('evento/edit?id='.$this->evento->getId()); } + */ + } else { // $this->labels = $this->getLabels(); } Added: prosistem/alba/trunk/alba/apps/principal/modules/evento/templates/_carga_evento.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/evento/templates/_carga_evento.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/apps/principal/modules/evento/templates/_carga_evento.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -0,0 +1,320 @@ +<?php + + use_helper('I18N','Object','Validation'); + $hora_fin = ""; + $hora_inicio = ""; + $seleccion_4 = true; + $seleccion_5 = $seleccion_6 = $seleccion_7 = $hora_asociada = $activar_repeticion = false; + $mostrar_div_anual = $mostrar_div_mensual = $mostrar_div_semana = $mostrar_div_diaria = "display:none"; + $recurrencia_fin_fecha = ''; + $recurrencia_fin_repeticion = ''; + $recurrencia_fin_0 = true; + $recurrencia_fin_1 = false; + $recurrencia_fin_2 = false; + $numero_binario = "0000000"; + + if($evento->getId()) { + $hora_inicio = date( "H:i" , strtotime($evento->getFechaInicio())); + $hora_fin = date( "H:i" , strtotime($evento->getFechaFin())); + + if($hora_inicio == "00:00" AND $hora_fin == "00:00") { + $hora_asociada = false; + } else { + $hora_asociada = true; + } + + switch($evento->getFrecuencia()) { + case '0': $activar_repeticion = false; break; + case '4': $activar_repeticion = true; $seleccion_4 = true; $seleccion_5 = $seleccion_6 = $seleccion_7 = false; $mostrar_div_diaria = ""; break; + case '5': $activar_repeticion = true; $seleccion_5 = true; $seleccion_4 = $seleccion_6 = $seleccion_7 = false; $mostrar_div_semana = ""; break; + case '6': $activar_repeticion = true; $seleccion_6 = true; $seleccion_5 = $seleccion_4 = $seleccion_7 = false; $mostrar_div_mensual = ""; break; + case '7': $activar_repeticion = true; $seleccion_7 = true; $seleccion_5 = $seleccion_6 = $seleccion_4 = false; $mostrar_div_anual = ""; break; + } + + + if($evento->getRecurrenciaFin() != "") { + if(is_numeric($evento->getRecurrenciaFin())) { + $recurrencia_fin_fecha = ''; + $recurrencia_fin_repeticion = $evento->getRecurrenciaFin(); + $recurrencia_fin_2 = $recurrencia_fin_0 = false; + $recurrencia_fin_1 = true; + } else { + $dateFormat = new sfDateFormat($sf_user->getCulture()); + $value = $dateFormat->format($evento->getRecurrenciaFin()." 00:00:00", 'I', $dateFormat->getInputPattern('g')); + + $recurrencia_fin_fecha = $value; + $recurrencia_fin_repeticion = ''; + $recurrencia_fin_2 = true; + $recurrencia_fin_0 = $recurrencia_fin_1 = false; + } + } + + + $numero_binario = str_pad(decbin($evento->getRecurrenciaDias()), 7, "0", STR_PAD_LEFT); + + + + } +?> + +<script type="text/javascript"> + function cambiarDeEstado(element) { + if (document.getElementById(element).disabled == true) + document.getElementById(element).disabled=false; + else + document.getElementById(element).disabled=true; + } + + + function HabilitaDeshabilitaHora() { + cambiarDeEstado('evento_hora_inicio_hour'); + cambiarDeEstado('evento_hora_inicio_minute'); + cambiarDeEstado('evento_hora_inicio_ampm'); + cambiarDeEstado('evento_hora_fin_hour'); + cambiarDeEstado('evento_hora_fin_minute'); + cambiarDeEstado('evento_hora_fin_ampm'); + } + + + function HabilitaDeshabilitaRepeticion() { + cambiarDeEstado('evento_frecuencia_7'); + cambiarDeEstado('evento_frecuencia_6'); + cambiarDeEstado('evento_frecuencia_5'); + cambiarDeEstado('evento_frecuencia_4'); + cambiarDeEstado('evento_recurrencia_fin_tipo_0'); + cambiarDeEstado('evento_recurrencia_fin_tipo_1'); + cambiarDeEstado('evento_recurrencia_fin_tipo_2'); + deshabilitaRangoFrecuencia(); + deshabilitaReglas(); + + if(document.getElementById('evento_frecuencia_7').disabled == false && document.getElementById('evento_frecuencia_7').checked == true) { + mostrarRegla('anual'); + } + + if(document.getElementById('evento_frecuencia_6').disabled == false && document.getElementById('evento_frecuencia_6').checked == true) { + mostrarRegla('mensual'); + } + + if(document.getElementById('evento_frecuencia_5').disabled == false && document.getElementById('evento_frecuencia_5').checked == true) { + mostrarRegla('semana'); + } + + if(document.getElementById('evento_frecuencia_4').disabled == false && document.getElementById('evento_frecuencia_4').checked == true) { + mostrarRegla('diaria'); + } + + if(document.getElementById('evento_recurrencia_fin_tipo_1').disabled == false && document.getElementById('evento_recurrencia_fin_tipo_1').checked == true) { + HabilitaDeshabilitaRangoFrecuencia('evento_recurrencia_fin_repeticion'); + } + + if(document.getElementById('evento_recurrencia_fin_tipo_2').disabled == false && document.getElementById('evento_recurrencia_fin_tipo_2').checked == true) { + HabilitaDeshabilitaRangoFrecuencia('evento_recurrencia_fin_fecha'); + } + + } + + + function HabilitaDeshabilitaRangoFrecuencia(element) { + deshabilitaRangoFrecuencia(); + document.getElementById(element).disabled=false; + } + + function deshabilitaRangoFrecuencia() { + document.getElementById('evento_recurrencia_fin_repeticion').disabled=true; + document.getElementById('evento_recurrencia_fin_fecha').disabled=true; + } + + function mostrarRegla(element) { + deshabilitaReglas(); + document.getElementById(element).style.display = ''; + document.getElementById('evento_recurrencia_dias_0').disabled = false; + document.getElementById('evento_recurrencia_dias_1').disabled = false; + document.getElementById('evento_recurrencia_dias_2').disabled = false; + document.getElementById('evento_recurrencia_dias_3').disabled = false; + document.getElementById('evento_recurrencia_dias_4').disabled = false; + document.getElementById('evento_recurrencia_dias_5').disabled = false; + document.getElementById('evento_recurrencia_dias_6').disabled = false; + + if(element == 'diaria') { + document.getElementById('evento_frecuencia_intervalo_diaria').disabled = false; + document.getElementById('evento_frecuencia_intervalo_semana').disabled = true; + } + + if(element == 'semana') { + document.getElementById('evento_frecuencia_intervalo_diaria').disabled = true; + document.getElementById('evento_frecuencia_intervalo_semana').disabled = false; + } + + } + + function deshabilitaReglas() { + document.getElementById('anual').style.display = 'none'; + document.getElementById('mensual').style.display = 'none'; + document.getElementById('semana').style.display = 'none'; + document.getElementById('diaria').style.display = 'none'; + + document.getElementById('evento_recurrencia_dias_0').disabled = true; + document.getElementById('evento_recurrencia_dias_1').disabled = true; + document.getElementById('evento_recurrencia_dias_2').disabled = true; + document.getElementById('evento_recurrencia_dias_3').disabled = true; + document.getElementById('evento_recurrencia_dias_4').disabled = true; + document.getElementById('evento_recurrencia_dias_5').disabled = true; + document.getElementById('evento_recurrencia_dias_6').disabled = true; + document.getElementById('evento_frecuencia_intervalo_diaria').disabled = true; + document.getElementById('evento_frecuencia_intervalo_semana').disabled = true; + } + + +</script> + +<div id="sf_admin_container"> + + +<fieldset id="sf_fieldset_index" class=""> + + <h2><?php echo __('Fecha y Hora') ?></h2> + + <div class="form-row"> + <?php echo label_for('evento[fecha_inicio]', __('Inicio:'), 'class="required" ') ?> + <div class="content<?php if ($sf_request->hasError('evento{fecha_inicio}')): ?> form-error<?php endif; ?>"> + <?php if ($sf_request->hasError('evento{fecha_inicio}')): ?> + <?php echo form_error('evento{fecha_inicio}', array('class' => 'form-error-msg')) ?> + <?php endif; ?> + + <?php echo object_input_date_tag($evento, 'getFechaInicio', array ( + 'rich' => true, +// 'withtime' => true, + 'calendar_button_img' => sfConfig::get('sf_admin_web_dir').'/images/date.png', + 'control_name' => 'evento[fecha_inicio]', + )) ?> +     + <?php include_partial('evento/hora_inicio', array ('evento' => $evento, 'hora_inicio' => $hora_inicio, 'hora_asociada' => $hora_asociada ));?> + </div> + </div> + + + <div class="form-row"> + <?php echo label_for('evento[fecha_fin]', __('Fin:'), 'class="required" ') ?> + <div class="content<?php if ($sf_request->hasError('evento{fecha_fin}')): ?> form-error<?php endif; ?>"> + <?php if ($sf_request->hasError('evento{fecha_fin}')): ?> + <?php echo form_error('evento{fecha_fin}', array('class' => 'form-error-msg')) ?> + <?php endif; ?> + + <?php echo object_input_date_tag($evento, 'getFechaFin', array ( + 'rich' => true, +// 'withtime' => true, + 'calendar_button_img' => sfConfig::get('sf_admin_web_dir').'/images/date.png', + 'control_name' => 'evento[fecha_fin]', + )) ?> +     + <?php include_partial('evento/hora_fin', array ('evento' => $evento, 'hora_fin' => $hora_fin, 'hora_asociada' => $hora_asociada ));?> + </div> + </div> + + <div class="form-row"> + <?php echo label_for('hora_asociada', __('Hora asociada:')) ?> + <div class="content"> + <?php echo checkbox_tag('evento[hora_asociada]', 1, $hora_asociada , array('onChange'=>'javascrip:HabilitaDeshabilitaHora();')) ?> + </div> + </div> + + + + <br> + + <h2> + <?php echo __('Activar Repetición') ?> + <?php echo checkbox_tag('evento[activar_repeticion]', 1, $activar_repeticion, array('onChange'=>'javascrip:HabilitaDeshabilitaRepeticion();')) ?> + </h2> + + <h4>Regla de recurrencia</h4> + + <div class="form-row"> + <?php echo radiobutton_tag('evento[frecuencia][]', '4', $seleccion_4, array('disabled' => !$activar_repeticion, 'onChange' => 'javascript:mostrarRegla(\'diaria\')') ) ?>Diaria   + <?php echo radiobutton_tag('evento[frecuencia][]', '5', $seleccion_5, array('disabled' => !$activar_repeticion, 'onChange' => 'javascript:mostrarRegla(\'semana\')')) ?>Semanal   + <?php echo radiobutton_tag('evento[frecuencia][]', '6', $seleccion_6, array('disabled' => !$activar_repeticion, 'onChange' => 'javascript:mostrarRegla(\'mensual\')')) ?>Mensual   + <?php echo radiobutton_tag('evento[frecuencia][]', '7', $seleccion_7, array('disabled' => !$activar_repeticion, 'onChange' => 'javascript:mostrarRegla(\'anual\')')) ?>Anual   + </div> + + <div class="form-row" id="diaria" style="<?php echo $mostrar_div_diaria; ?>"> + Repetir cada <?php echo object_input_tag($evento, 'getFrecuenciaIntervalo', array('disabled' => !$seleccion_4, 'maxlength' => 3, 'size' => 3, 'control_name' => 'evento[frecuencia_intervalo_diaria]' )); ?> día(s) + </div> + + <div class="form-row" id="semana" style="<?php echo $mostrar_div_semana?>"> + Repetir cada <?php echo object_input_tag($evento, 'getFrecuenciaIntervalo', array('disabled' => !$seleccion_5, 'maxlength' => 3, 'size' => 3, 'control_name' => 'evento[frecuencia_intervalo_semana]')); ?> semana(s)<br><br> + + <?php echo checkbox_tag('evento[recurrencia_dias][]', '0', ($numero_binario[6])?true:false, array('disabled' => !$seleccion_5) ) ?>Domingo   + <?php echo checkbox_tag('evento[recurrencia_dias][]', '1', ($numero_binario[5])?true:false, array('disabled' => !$seleccion_5) ) ?>Lunes   + <?php echo checkbox_tag('evento[recurrencia_dias][]', '2', ($numero_binario[4])?true:false, array('disabled' => !$seleccion_5) ) ?>Martes   + <?php echo checkbox_tag('evento[recurrencia_dias][]', '3', ($numero_binario[3])?true:false, array('disabled' => !$seleccion_5) ) ?>Miercoles   + <?php echo checkbox_tag('evento[recurrencia_dias][]', '4', ($numero_binario[2])?true:false, array('disabled' => !$seleccion_5) ) ?>Jueves   + <?php echo checkbox_tag('evento[recurrencia_dias][]', '5', ($numero_binario[1])?true:false, array('disabled' => !$seleccion_5) ) ?>Viernes   + <?php echo checkbox_tag('evento[recurrencia_dias][]', '6', ($numero_binario[0])?true:false, array('disabled' => !$seleccion_5) ) ?>Sabado   + </div> + + <div class="form-row" id="mensual" style="<?php echo $mostrar_div_mensual?>"> + </div> + + <div class="form-row" id="anual" style="<?php echo $mostrar_div_anual?>"> + </div> + + + <h4>Rango de frecuencia</h4> + <div class="form-row"> + <?php echo radiobutton_tag('evento[recurrencia_fin_tipo][]', '0', $recurrencia_fin_0, array('disabled' => !$activar_repeticion, 'onClick' => 'javascript:deshabilitaRangoFrecuencia()') ) ?>Sin fecha de Finalización  <br> + + <?php echo radiobutton_tag('evento[recurrencia_fin_tipo][]', '1', $recurrencia_fin_1, array('disabled' => !$activar_repeticion, 'onClick' => 'javascript:HabilitaDeshabilitaRangoFrecuencia(\'evento_recurrencia_fin_repeticion\')') ) ?>Terminar despues:    + <?php echo input_tag('evento[recurrencia_fin_repeticion]', $recurrencia_fin_repeticion, array('disabled' => !$activar_repeticion, 'maxlength' => 4, 'size' => 4 )) ?> <br> + + <?php echo radiobutton_tag('evento[recurrencia_fin_tipo][]', '2', $recurrencia_fin_2, array('disabled' => !$activar_repeticion, 'onClick' => 'javascript:HabilitaDeshabilitaRangoFrecuencia(\'evento_recurrencia_fin_fecha\')') ) ?>Terminar el:   + <?php echo input_date_tag('evento[recurrencia_fin_fecha]', $recurrencia_fin_fecha, array ( 'rich' => true, 'calendar_button_img' => sfConfig::get('sf_admin_web_dir').'/images/date.png', + 'control_name' => 'evento[recurrencia_fin_fecha]', 'disabled' => !$activar_repeticion + )) ?><br> + + </div> + + <?php echo object_input_hidden_tag($evento, 'getId', array ('control_name' => 'id_evento') ) ?> +</fieldset> + + +</div> \ No newline at end of file Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/evento/templates/_carga_evento.php ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Modified: prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/certificadoEstudiosBusquedaFormularioSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/certificadoEstudiosBusquedaFormularioSuccess.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/certificadoEstudiosBusquedaFormularioSuccess.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -1,3 +1,4 @@ +<?php use_helper('I18N'); ?> <h1>Informe: Certificado de Estudios</h1> <?php echo form_tag('informes/certificadoEstudiosBusquedaFormulario', 'id=sf_admin_edit_form name=sf_admin_edit_form multipart=true') ?> 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-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -32,4 +32,249 @@ */ class relDivisionActividadDocenteActions extends autorelDivisionActividadDocenteActions { + + protected function updateEventoFromRequest($evento_obj) { + $evento = $this->getRequestParameter('evento'); + + if (isset($evento['fecha_inicio'])) { + if ($evento['fecha_inicio']) { + try { + $dateFormat = new sfDateFormat($this->getUser()->getCulture()); + if(!is_array($evento['fecha_inicio'])) { + + if(isset($evento['hora_asociada']) AND $evento['hora_asociada'] == 1) { + if($evento['hora_inicio']) { + $evento['hora_inicio']['hour'] = ($evento['hora_inicio']['hour'] != "12" AND $evento['hora_inicio']['ampm'] == "PM")?$evento['hora_inicio']['hour'] + 12:$evento['hora_inicio']['hour']; + $evento['hora_inicio']['hour'] = ($evento['hora_inicio']['hour'] == "12" AND $evento['hora_inicio']['ampm'] == "AM")?"00":$evento['hora_inicio']['hour']; + $evento['fecha_inicio'] .= " ".$evento['hora_inicio']['hour'].":".$evento['hora_inicio']['minute']; + } else { + $evento['fecha_inicio'] .= " 00:00:00"; + } + } else { + $evento['fecha_inicio'] .= " 00:00:00"; + } + + $value = $dateFormat->format($evento['fecha_inicio'], 'I', $dateFormat->getInputPattern('g')); + + } else { + $value_array = $evento['fecha_inicio']; + + $value_array['hour']['hour'] = "00"; + $value_array['hour']['minute'] = "00"; + $value_array['hour']['second'] = "00"; + if($evento['hora_asociada'] == 1) { + if($evento['hora_inicio']) { + $value_array['hour'] = $evento['hora_inicio']['hour']; + $value_array['minute'] = $evento['hora_inicio']['minute']; + $value_array['ampm'] = $evento['hora_inicio']['ampm']; + } + } + + $value = $value_array['year'].'-'.$value_array['month'].'-'.$value_array['day'].(isset($value_array['hour']) ? ' '.$value_array['hour'].':'.$value_array['minute'].(isset($value_array['second']) ? ':'.$value_array['second'] : '') : ''); + } + + $evento_obj->setFechaInicio($value); + } + catch (sfException $e) { + // not a date + } + } else { + $evento_obj->setFechaInicio(null); + } + } + + if (isset($evento['fecha_fin'])) { + if ($evento['fecha_fin']) { + try { + $dateFormat = new sfDateFormat($this->getUser()->getCulture()); + if (!is_array($evento['fecha_fin'])) { + + if(isset($evento['hora_asociada']) AND $evento['hora_asociada'] == 1) { + if($evento['hora_fin']) { + $evento['hora_fin']['hour'] = ($evento['hora_fin']['hour'] != "12" AND $evento['hora_fin']['ampm'] == "PM")?$evento['hora_fin']['hour'] + 12:$evento['hora_fin']['hour']; + $evento['hora_fin']['hour'] = ($evento['hora_fin']['hour'] == "12" AND $evento['hora_fin']['ampm'] == "AM")?"00":$evento['hora_fin']['hour']; + + $evento['fecha_fin'] .= " ".$evento['hora_fin']['hour'].":".$evento['hora_fin']['minute']; + } else { + $evento['fecha_fin'] .= " 00:00:00"; + } + } else { + $evento['fecha_fin'] .= " 00:00:00"; + } + + $value = $dateFormat->format($evento['fecha_fin'], 'I', $dateFormat->getInputPattern('g')); + + } else { + $value_array = $evento['fecha_fin']; + + $value_array['hour']['hour'] = "00"; + $value_array['hour']['minute'] = "00"; + $value_array['hour']['second'] = "00"; + if($evento['hora_asociada'] == 1) { + if($evento['hora_fin']) { + $value_array['hour'] = $evento['hora_fin']['hour']; + $value_array['minute'] = $evento['hora_fin']['minute']; + $value_array['ampm'] = $evento['hora_inicio']['ampm']; + } + } + + $value = $value_array['year'].'-'.$value_array['month'].'-'.$value_array['day'].(isset($value_array['hour']) ? ' '.$value_array['hour'].':'.$value_array['minute'].(isset($value_array['second']) ? ':'.$value_array['second'] : '') : ''); + } + $evento_obj->setFechaFin($value); + } + catch (sfException $e) { + // not a date + } + } else { + $evento_obj->setFechaFin(null); + } + } + + + if(isset($evento['titulo'])) { + $evento_obj->setTitulo($evento['titulo']); + } + + + if(isset($evento['tipo'])) { + $evento_obj->setTipo($evento['titulo']); + } else { + $evento_obj->setTipo(1); // (0 = PRIVATE | 1 = PUBLIC | 2 = CONFIDENTIAL) + } + + if(isset($evento['estado'])) { + $evento_obj->setEstado($evento['estado']); + } else { + $evento_obj->setEstado(1); // (0 = TENTATIVE, 1 = CONFIRMED, 2 = CANCELLED) + } + + + + + if(isset($evento['activar_repeticion']) AND $evento['activar_repeticion'] == 1) { + if(isset($evento['frecuencia']) AND is_array($evento['frecuencia']) ) { + $evento_obj->setFrecuencia($evento['frecuencia'][0]); + + switch($evento['frecuencia'][0]) { // dia: 4, semana: 5, mes: 6, año: 7 + case '4': $evento_obj->setFrecuenciaIntervalo($evento['frecuencia_intervalo_diaria']); + break; + case '5': $evento_obj->setFrecuenciaIntervalo($evento['frecuencia_intervalo_semana']); + $aSemanaBinario = array ( 1, 2, 4, 8, 16, 32, 64 ); + $suma_total = 0; + foreach($evento['recurrencia_dias'] as $dia) { + $suma_total += $aSemanaBinario[$dia]; + } + // guardamos en binario para saber todos los dias de la semana seleccionados + $evento_obj->setRecurrenciaDias($suma_total); + break; + case '6': break; + case '7': break; + } + } + + if(isset($evento['recurrencia_fin_tipo']) AND is_array($evento['recurrencia_fin_tipo'])) { + + switch($evento['recurrencia_fin_tipo'][0]) { + case '0': $evento_obj->setRecurrenciaFin(''); + break; + case '1': $evento_obj->setRecurrenciaFin($evento['recurrencia_fin_repeticion']); + break; + case '2': $dateFormat = new sfDateFormat($this->getUser()->getCulture()); + $value = $dateFormat->format($evento['recurrencia_fin_fecha']." 00:00:00", 'I', $dateFormat->getInputPattern('g')); + $evento_obj->setRecurrenciaFin($value); + break; + } + } + } + + return $evento_obj; + } + + + protected function getEventoOrCreate($id = 0) { + if (!$id) { + $evento = new Evento(); + } else { + $evento = EventoPeer::retrieveByPk($id); + $this->forward404Unless($evento); + } + return $evento; + } + + + public function executeEdit() + { + $this->rel_division_actividad_docente = $this->getRelDivisionActividadDocenteOrCreate(); + $this->evento = $this->getEventoOrCreate($this->rel_division_actividad_docente->getFkEventoId()); + + if ($this->getRequest()->getMethod() == sfRequest::POST) { + + $this->evento = $this->updateEventoFromRequest($this->evento); + $this->evento->save(); + + $this->updateRelDivisionActividadDocenteFromRequest($this->evento->getId()); + $this->saveRelDivisionActividadDocente($this->rel_division_actividad_docente); + + + $this->setFlash('notice', 'Your modifications have been saved'); + if ($this->getRequestParameter('save_and_add')) { + return $this->redirect('relDivisionActividadDocente/create'); + } + else if ($this->getRequestParameter('save_and_list')) { + return $this->redirect('relDivisionActividadDocente/list'); + } else { + return $this->redirect('relDivisionActividadDocente/edit?id='.$this->rel_division_actividad_docente->getId()); + } + } else { + $this->labels = $this->getLabels(); + } + } + + protected function getLabels() + { + return array( + 'rel_division_actividad_docente{fk_division_id}' => 'División:', + 'rel_division_actividad_docente{fk_actividad_id}' => 'Actividad:', + 'rel_division_actividad_docente{fk_docente_id}' => 'Docente:', + 'evento{fecha_inicio}' => 'Fecha inicio:', + 'evento{fecha_fin}' => 'Fecha fin:', + ); + } + + + public function handleErrorEdit() + { + $this->preExecute(); + $this->rel_division_actividad_docente = $this->getRelDivisionActividadDocenteOrCreate(); + $this->updateRelDivisionActividadDocenteFromRequest(); + $this->labels = $this->getLabels(); + $this->evento = new Evento(); + return sfView::SUCCESS; + } + + + + protected function updateRelDivisionActividadDocenteFromRequest($fk_evento_id = '') { + $rel_division_actividad_docente = $this->getRequestParameter('rel_division_actividad_docente'); + if (isset($rel_division_actividad_docente['fk_division_id'])) { + $this->rel_division_actividad_docente->setFkDivisionId($rel_division_actividad_docente['fk_division_id'] ? $rel_division_actividad_docente['fk_division_id'] : null); + } + if (isset($rel_division_actividad_docente['fk_actividad_id'])) { + $this->rel_division_actividad_docente->setFkActividadId($rel_division_actividad_docente['fk_actividad_id'] ? $rel_division_actividad_docente['fk_actividad_id'] : null); + } + if (isset($rel_division_actividad_docente['fk_docente_id'])) { + $this->rel_division_actividad_docente->setFkDocenteId($rel_division_actividad_docente['fk_docente_id'] ? $rel_division_actividad_docente['fk_docente_id'] : null); + } + if ($fk_evento_id) { + $this->rel_division_actividad_docente->setFkEventoId($fk_evento_id); + } else { + $this->rel_division_actividad_docente->setFkEventoId(null); + } + + + } + + + } +?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/config/generator.yml 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/config/generator.yml 2007-05-02 19:44:12 UTC (rev 4601) @@ -9,18 +9,20 @@ fk_division_id: { name: División } fk_actividad_id: { name: Actividad } fk_repeticion_id: { name: Repetición } - fecha_inicio: {vname: Fecha Inicio, params: date_format='dd/MM/yy' } + carga_evento: { name: Cargar Evento } + + fecha_inicio: { name: Fecha Inicio, params: date_format='dd/MM/yy' } fecha_fin: { name: Fecha fin , params: date_format='dd/MM/yy' } hora_inicio: { name: Hora Inicio } hora_fin: { name: Hora fin } list: title: Generación Manual de horarios por división - display: [ division, actividad , docente, fecha_inicio, fecha_fin, hora_inicio, hora_fin ] + display: [ division, actividad , docente ] object_actions: _edit: - _delete: - edit: title: Editar horarios - display: [ fk_division_id, fk_actividad_id , fk_docente_id, fecha_inicio, fecha_fin, hora_inicio, hora_fin ] \ No newline at end of file + display: [ fk_division_id, fk_actividad_id , fk_docente_id ] \ No newline at end of file Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_actions.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_actions.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_actions.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -0,0 +1,17 @@ +<?php +// auto-generated by sfPropelAdmin +// date: 2007/05/02 13:04:37 +?> +<ul class="sf_admin_actions"> + <li><?php echo button_to(__('list'), 'relDivisionActividadDocente/list?id='.$rel_division_actividad_docente->getId(), array ( + 'class' => 'sf_admin_action_list', +)) ?></li> + <li><?php echo submit_tag(__('save'), array ( + 'name' => 'save', + 'class' => 'sf_admin_action_save', +)) ?></li> + <li><?php echo submit_tag(__('save and add'), array ( + 'name' => 'save_and_add', + 'class' => 'sf_admin_action_save_and_add', +)) ?></li> +</ul> Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_actions.php ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_footer.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_footer.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_footer.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -0,0 +1,4 @@ +<?php +// auto-generated by sfPropelAdmin +// date: 2007/05/02 13:04:37 +?> Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_footer.php ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_form.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_form.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_form.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -0,0 +1,78 @@ +<?php +// auto-generated by sfPropelAdmin +// date: 2007/05/02 13:04:37 +?> +<?php echo form_tag('relDivisionActividadDocente/edit', array( + 'id' => 'sf_admin_edit_form', + 'name' => 'sf_admin_edit_form', + 'multipart' => true, +)) ?> + +<?php echo object_input_hidden_tag($rel_division_actividad_docente, 'getId') ?> + +<fieldset id="sf_fieldset_none" class=""> + +<div class="form-row"> + <?php echo label_for('rel_division_actividad_docente[fk_division_id]', __($labels['rel_division_actividad_docente{fk_division_id}']), '') ?> + <div class="content<?php if ($sf_request->hasError('rel_division_actividad_docente{fk_division_id}')): ?> form-error<?php endif; ?>"> + <?php if ($sf_request->hasError('rel_division_actividad_docente{fk_division_id}')): ?> + <?php echo form_error('rel_division_actividad_docente{fk_division_id}', array('class' => 'form-error-msg')) ?> + <?php endif; ?> + + <?php $value = object_select_tag($rel_division_actividad_docente, 'getFkDivisionId', array ( + 'related_class' => 'Division', + 'control_name' => 'rel_division_actividad_docente[fk_division_id]', + 'include_blank' => true, +)); echo $value ? $value : ' ' ?> + </div> +</div> + +<div class="form-row"> + <?php echo label_for('rel_division_actividad_docente[fk_actividad_id]', __($labels['rel_division_actividad_docente{fk_actividad_id}']), 'class="required" ') ?> + <div class="content<?php if ($sf_request->hasError('rel_division_actividad_docente{fk_actividad_id}')): ?> form-error<?php endif; ?>"> + <?php if ($sf_request->hasError('rel_division_actividad_docente{fk_actividad_id}')): ?> + <?php echo form_error('rel_division_actividad_docente{fk_actividad_id}', array('class' => 'form-error-msg')) ?> + <?php endif; ?> + + <?php $value = object_select_tag($rel_division_actividad_docente, 'getFkActividadId', array ( + 'related_class' => 'Actividad', + 'control_name' => 'rel_division_actividad_docente[fk_actividad_id]', +)); echo $value ? $value : ' ' ?> + </div> +</div> + +<div class="form-row"> + <?php echo label_for('rel_division_actividad_docente[fk_docente_id]', __($labels['rel_division_actividad_docente{fk_docente_id}']), '') ?> + <div class="content<?php if ($sf_request->hasError('rel_division_actividad_docente{fk_docente_id}')): ?> form-error<?php endif; ?>"> + <?php if ($sf_request->hasError('rel_division_actividad_docente{fk_docente_id}')): ?> + <?php echo form_error('rel_division_actividad_docente{fk_docente_id}', array('class' => 'form-error-msg')) ?> + <?php endif; ?> + + <?php $value = object_select_tag($rel_division_actividad_docente, 'getFkDocenteId', array ( + 'related_class' => 'Docente', + 'control_name' => 'rel_division_actividad_docente[fk_docente_id]', + 'include_blank' => true, +)); echo $value ? $value : ' ' ?> + </div> +</div> + + + +<?php include_partial('evento/carga_evento', array('rel_division_actividad_docente' => $rel_division_actividad_docente, 'evento' => $evento)) ?> + + +</fieldset> + +<?php include_partial('edit_actions', array('rel_division_actividad_docente' => $rel_division_actividad_docente)) ?> + +</form> + +<ul class="sf_admin_actions"> + <li class="float-left"><?php if ($rel_division_actividad_docente->getId()): ?> +<?php echo button_to(__('delete'), 'relDivisionActividadDocente/delete?id='.$rel_division_actividad_docente->getId(), array ( + 'post' => true, + 'confirm' => __('Are you sure?'), + 'class' => 'sf_admin_action_delete', +)) ?><?php endif; ?> +</li> + </ul> Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_form.php ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_header.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_header.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_header.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -0,0 +1,4 @@ +<?php +// auto-generated by sfPropelAdmin +// date: 2007/05/02 13:04:37 +?> Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_header.php ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_messages.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_messages.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_messages.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -0,0 +1,19 @@ +<?php +// auto-generated by sfPropelAdmin +// date: 2007/05/02 13:04:37 +?> +<?php if ($sf_request->hasErrors()): ?> +<div class="form-errors"> +<h2><?php echo __('There are some errors that prevent the form to validate') ?></h2> +<dl> +<?php foreach ($sf_request->getErrorNames() as $name): ?> + <dt><?php echo __($labels[$name]) ?></dt> + <dd><?php echo $sf_request->getError($name) ?></dd> +<?php endforeach; ?> +</dl> +</div> +<?php elseif ($sf_flash->has('notice')): ?> +<div class="save-ok"> +<h2><?php echo __($sf_flash->get('notice')) ?></h2> +</div> +<?php endif; ?> Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_messages.php ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Deleted: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_hora_fin.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_hora_fin.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_hora_fin.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -1,3 +0,0 @@ -<?php use_helper('DateForm') ?> - -<?php echo select_time_tag("rel_division_actividad_docente[[hora_fin]", $rel_division_actividad_docente->getHoraFin(), array('include_second' => false, '12hour_time' => true));?> \ No newline at end of file Deleted: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_hora_inicio.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_hora_inicio.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_hora_inicio.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -1,3 +0,0 @@ -<?php use_helper('DateForm') ?> - -<?php echo select_time_tag("rel_division_actividad_docente[hora_inicio]", $rel_division_actividad_docente->getHoraInicio(), array('include_second' => false, '12hour_time' => true));?> \ No newline at end of file Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/editSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/editSuccess.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/editSuccess.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -0,0 +1,27 @@ +<?php +// auto-generated by sfPropelAdmin +// date: 2007/05/02 13:04:37 +?> +<?php use_helper('Object', 'Validation', 'ObjectAdmin', 'I18N', 'Date') ?> + +<?php use_stylesheet('/sf/sf_admin/css/main') ?> + +<div id="sf_admin_container"> + +<h1><?php echo __('Editar horarios', +array()) ?></h1> + +<div id="sf_admin_header"> +<?php include_partial('relDivisionActividadDocente/edit_header', array('rel_division_actividad_docente' => $rel_division_actividad_docente)) ?> +</div> + +<div id="sf_admin_content"> +<?php include_partial('relDivisionActividadDocente/edit_messages', array('rel_division_actividad_docente' => $rel_division_actividad_docente, 'labels' => $labels)) ?> +<?php include_partial('relDivisionActividadDocente/edit_form', array('rel_division_actividad_docente' => $rel_division_actividad_docente, 'labels' => $labels, 'evento' => $evento)) ?> +</div> + +<div id="sf_admin_footer"> +<?php include_partial('relDivisionActividadDocente/edit_footer', array('rel_division_actividad_docente' => $rel_division_actividad_docente)) ?> +</div> + +</div> Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/editSuccess.php ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/validate/edit.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/validate/edit.yml 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/validate/edit.yml 2007-05-02 19:44:12 UTC (rev 4601) @@ -0,0 +1,65 @@ +methods: + post: + - "evento{fecha_inicio}" + - "evento{fecha_fin}" + - "rel_division_actividad_docente{fk_docente_id}" + - "rel_division_actividad_docente{fk_actividad_id}" + - "rel_division_actividad_docente{fk_division_id}" + + +fillin: + enabled: on + +names: + + evento{fecha_inicio}: + required: Yes + required_msg: El campo fecha inicio es obligatorio + + evento{fecha_fin}: + required: Yes + required_msg: El campo fecha inicio es obligatorio + + rel_division_actividad_docente{fk_actividad_id}: + required: Yes + required_msg: El campo actividad es obligatorio + validators: validarActividad + + rel_division_actividad_docente{fk_docente_id}: + required: Yes + required_msg: El campo docente es obligatorio + validators: validarDocente + + rel_division_actividad_docente{fk_division_id}: + required: Yes + required_msg: El campo division es obligatorio + validators: validarDivision + + +caracteresMaximos255: + class: sfStringValidator + param: + max: 255 + max_error: La maxima cantidad de caracteres permitida es de 255 + +validarDocente: + class: sfNumberValidator + param: + nan_error: Seleccione una docente válida + min: 1 + min_error: Seleccione una docente válida + +validarDivision: + class: sfNumberValidator + param: + nan_error: Seleccione una división válida + min: 1 + min_error: Seleccione una división válida + +validarActividad: + class: sfNumberValidator + param: + nan_error: Seleccione una actividad válida + min: 1 + min_error: Seleccione una actividad válida + \ No newline at end of file Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/validate/edit.yml ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Modified: prosistem/alba/trunk/alba/config/schema.xml =================================================================== --- prosistem/alba/trunk/alba/config/schema.xml 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/config/schema.xml 2007-05-02 19:44:12 UTC (rev 4601) @@ -568,6 +568,7 @@ <column name="fk_division_id" type="integer" size="11" required="false" default="0"/> <column name="fk_actividad_id" type="integer" size="11" required="true" default="0"/> <column name="fk_docente_id" type="integer" size="11" required="false" default="0"/> + <column name="fk_evento_id" type="integer" size="11" required="false" default="0"/>   <column name="fk_repeticion_id" type="integer" size="11" required="false" default="0"/> @@ -595,6 +596,9 @@ <foreign-key foreignTable="repeticion"> <reference local="fk_repeticion_id" foreign="id"/> </foreign-key> + <foreign-key foreignTable="evento"> + <reference local="fk_evento_id" foreign="id"/> + </foreign-key> </table> <table name="docente" idMethod="native"> <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> Modified: prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0.sql 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0.sql 2007-05-02 19:44:12 UTC (rev 4601) @@ -21,8 +21,8 @@ PRIMARY KEY (`id`) )Type=InnoDB; -INSERT INTO modulo (id,nombre,titulo,descripcion) VALUES (48,'rolResponsable','Rol Responsables','Roles de los Resposables de Alumos'); -INSERT INTO permiso (nombre,descripcion,fk_modulo_id,credencial) VALUES ('rolResponsable','Rol de Responsables',48,'rolResponsable'); +INSERT INTO modulo (id,nombre,titulo,descripcion) VALUES ( 48, 'rolResponsable', 'Rol Responsables', 'Roles de los Resposables de Alumos'); +INSERT INTO permiso (nombre,descripcion,fk_modulo_id,credencial) VALUES ( 'rolResponsable', 'Rol de Responsables', 48, 'rolResponsable'); CREATE TABLE `evento` ( @@ -62,5 +62,7 @@ )Type=InnoDB; ALTER TABLE responsable ADD COLUMN fk_rolresponsable_id INT NOT NULL DEFAULT 1; -SET FOREIGN_KEY_CHECKS = 1; +ALTER TABLE `rel_division_actividad_docente` ADD `fk_evento_id` INT NULL ; + +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file Modified: prosistem/alba/trunk/alba/data/sql/schema.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/schema.sql 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/data/sql/schema.sql 2007-05-02 19:44:12 UTC (rev 4601) @@ -1106,6 +1106,7 @@ `fk_division_id` INTEGER(11) default 0, `fk_actividad_id` INTEGER(11) default 0 NOT NULL, `fk_docente_id` INTEGER(11) default 0, + `fk_evento_id` INTEGER(11) default 0, `fk_repeticion_id` INTEGER(11) default 0, `fecha_inicio` DATETIME NOT NULL, `fecha_fin` DATETIME NOT NULL, @@ -1127,7 +1128,11 @@ INDEX `rel_division_actividad_docente_FI_4` (`fk_repeticion_id`), CONSTRAINT `rel_division_actividad_docente_FK_4` FOREIGN KEY (`fk_repeticion_id`) - REFERENCES `repeticion` (`id`) + REFERENCES `repeticion` (`id`), + INDEX `rel_division_actividad_docente_FI_5` (`fk_evento_id`), + CONSTRAINT `rel_division_actividad_docente_FK_5` + FOREIGN KEY (`fk_evento_id`) + REFERENCES `evento` (`id`) )Type=InnoDB; #----------------------------------------------------------------------------- Modified: prosistem/alba/trunk/alba/lib/model/Evento.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/Evento.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/lib/model/Evento.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -19,6 +19,168 @@ // si la hora de ambos es diferente de 00:00:00 entonces si tiene hora } +/* + protected function getEventoOrCreate($id = 'id') { + if (!$this->getRequestParameter($id)) { + $evento = new Evento(); + } else { + $evento = EventoPeer::retrieveByPk($this->getRequestParameter($id)); + $this->forward404Unless($evento); + } + return $evento; + } + + + + protected function updateEventoFromRequest($request, $culture) { + $evento = $request->getRequestParameter('evento'); + + if (isset($evento['fecha_inicio'])) { + if ($evento['fecha_inicio']) { + try { + $dateFormat = new sfDateFormat($culture); + if(!is_array($evento['fecha_inicio'])) { + + if(isset($evento['hora_asociada']) AND $evento['hora_asociada'] == 1) { + if($evento['hora_inicio']) { + $evento['fecha_inicio'] .= " ".$evento['hora_inicio']['hour'].":".$evento['hora_inicio']['minute']; + } else { + $evento['fecha_inicio'] .= " 00:00:00"; + } + } else { + $evento['fecha_inicio'] .= " 00:00:00"; + } + + $value = $dateFormat->format($evento['fecha_inicio'], 'I', $dateFormat->getInputPattern('g')); + } else { + $value_array = $evento['fecha_inicio']; + + $value_array['hour']['hour'] = "00"; + $value_array['hour']['minute'] = "00"; + $value_array['hour']['second'] = "00"; + if($evento['hora_asociada'] == 1) { + if($evento['hora_inicio']) { + $value_array['hour'] = $evento['hora_inicio']['hour']; + $value_array['minute'] = $evento['hora_inicio']['minute']; + } + } + + $value = $value_array['year'].'-'.$value_array['month'].'-'.$value_array['day'].(isset($value_array['hour']) ? ' '.$value_array['hour'].':'.$value_array['minute'].(isset($value_array['second']) ? ':'.$value_array['second'] : '') : ''); + } + + $this->evento->setFechaInicio($value); + } + catch (sfException $e) { + // not a date + } + } else { + $this->evento->setFechaInicio(null); + } + } + + if (isset($evento['fecha_fin'])) { + if ($evento['fecha_fin']) { + try { + $dateFormat = new sfDateFormat($this->getUser()->getCulture()); + if (!is_array($evento['fecha_fin'])) { + + if(isset($evento['hora_asociada']) AND $evento['hora_asociada'] == 1) { + if($evento['hora_fin']) { + $evento['fecha_fin'] .= " ".$evento['hora_fin']['hour'].":".$evento['hora_fin']['minute']; + } else { + $evento['fecha_fin'] .= " 00:00:00"; + } + } else { + $evento['fecha_fin'] .= " 00:00:00"; + } + + $value = $dateFormat->format($evento['fecha_fin'], 'I', $dateFormat->getInputPattern('g')); + } else { + $value_array = $evento['fecha_fin']; + + $value_array['hour']['hour'] = "00"; + $value_array['hour']['minute'] = "00"; + $value_array['hour']['second'] = "00"; + if($evento['hora_asociada'] == 1) { + if($evento['hora_fin']) { + $value_array['hour'] = $evento['hora_fin']['hour']; + $value_array['minute'] = $evento['hora_fin']['minute']; + } + } + + $value = $value_array['year'].'-'.$value_array['month'].'-'.$value_array['day'].(isset($value_array['hour']) ? ' '.$value_array['hour'].':'.$value_array['minute'].(isset($value_array['second']) ? ':'.$value_array['second'] : '') : ''); + } + $this->evento->setFechaFin($value); + } + catch (sfException $e) { + // not a date + } + } else { + $this->evento->setFechaFin(null); + } + } + + + if(isset($evento['titulo'])) { + $this->evento->setTitulo($evento['titulo']); + } + + + if(isset($evento['tipo'])) { + $this->evento->setTipo($evento['titulo']); + } else { + $this->evento->setTipo(1); // (0 = PRIVATE | 1 = PUBLIC | 2 = CONFIDENTIAL) + } + + if(isset($evento['estado'])) { + $this->evento->setEstado($evento['estado']); + } else { + $this->evento->setEstado(1); // (0 = TENTATIVE, 1 = CONFIRMED, 2 = CANCELLED) + } + + + + + if(isset($evento['activar_repeticion']) AND $evento['activar_repeticion'] == 1) { + if(isset($evento['frecuencia']) AND is_array($evento['frecuencia']) ) { + $this->evento->setFrecuencia($evento['frecuencia'][0]); + + switch($evento['frecuencia'][0]) { // dia: 4, semana: 5, mes: 6, año: 7 + case '4': $this->evento->setFrecuenciaIntervalo($evento['frecuencia_intervalo_diaria']); + break; + case '5': $this->evento->setFrecuenciaIntervalo($evento['frecuencia_intervalo_semana']); + $aSemanaBinario = array ( 1, 2, 4, 8, 16, 32, 64 ); + $suma_total = 0; + foreach($evento['recurrencia_dias'] as $dia) { + $suma_total += $aSemanaBinario[$dia]; + } + // guardamos en binario para saber todos los dias de la semana seleccionados + $this->evento->setRecurrenciaDias($suma_total); + break; + case '6': break; + case '7': break; + } + } + + switch($evento['recurrencia_fin_tipo'][0]) { + case '0': $this->evento->setRecurrenciaFin(''); + break; + case '1': $this->evento->setRecurrenciaFin($evento['recurrencia_fin_repeticion']); + break; + case '2': $dateFormat = new sfDateFormat($this->getUser()->getCulture()); + $value = $dateFormat->format($evento['recurrencia_fin_fecha']." 00:00:00", 'I', $dateFormat->getInputPattern('g')); + $this->evento->setRecurrenciaFin($value); + break; + } + } + + } + + + +*/ + } +?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/RelDivisionActividadDocenteMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelDivisionActividadDocenteMapBuilder.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/lib/model/map/RelDivisionActividadDocenteMapBuilder.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -40,6 +40,8 @@ $tMap->addForeignKey('FK_DOCENTE_ID', 'FkDocenteId', 'int', CreoleTypes::INTEGER, 'docente', 'ID', false, 11); + $tMap->addForeignKey('FK_EVENTO_ID', 'FkEventoId', 'int', CreoleTypes::INTEGER, 'evento', 'ID', false, 11); + $tMap->addForeignKey('FK_REPETICION_ID', 'FkRepeticionId', 'int', CreoleTypes::INTEGER, 'repeticion', 'ID', false, 11); $tMap->addColumn('FECHA_INICIO', 'FechaInicio', 'int', CreoleTypes::TIMESTAMP, true); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -1195,7 +1195,42 @@ return $this->collRelDivisionActividadDocentes; } + + public function getRelDivisionActividadDocentesJoinEvento($criteria = null, $con = null) + { + include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + if ($this->collRelDivisionActividadDocentes === null) { + if ($this->isNew()) { + $this->collRelDivisionActividadDocentes = array(); + } else { + + $criteria->add(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, $this->getId()); + + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); + } + } else { + + $criteria->add(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, $this->getId()); + + if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); + } + } + $this->lastRelDivisionActividadDocenteCriteria = $criteria; + + return $this->collRelDivisionActividadDocentes; + } + + public function initRelActividadDocentes() { if ($this->collRelActividadDocentes === null) { Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDivision.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDivision.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDivision.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -851,4 +851,39 @@ return $this->collRelDivisionActividadDocentes; } + + + public function getRelDivisionActividadDocentesJoinEvento($criteria = null, $con = null) + { + include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + if ($this->collRelDivisionActividadDocentes === null) { + if ($this->isNew()) { + $this->collRelDivisionActividadDocentes = array(); + } else { + + $criteria->add(RelDivisionActividadDocentePeer::FK_DIVISION_ID, $this->getId()); + + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); + } + } else { + + $criteria->add(RelDivisionActividadDocentePeer::FK_DIVISION_ID, $this->getId()); + + if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); + } + } + $this->lastRelDivisionActividadDocenteCriteria = $criteria; + + return $this->collRelDivisionActividadDocentes; + } + } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -1262,7 +1262,42 @@ return $this->collRelDivisionActividadDocentes; } + + public function getRelDivisionActividadDocentesJoinEvento($criteria = null, $con = null) + { + include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + if ($this->collRelDivisionActividadDocentes === null) { + if ($this->isNew()) { + $this->collRelDivisionActividadDocentes = array(); + } else { + + $criteria->add(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, $this->getId()); + + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); + } + } else { + + $criteria->add(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, $this->getId()); + + if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); + } + } + $this->lastRelDivisionActividadDocenteCriteria = $criteria; + + return $this->collRelDivisionActividadDocentes; + } + + public function initRelDocenteEstablecimientos() { if ($this->collRelDocenteEstablecimientos === null) { Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -48,6 +48,12 @@ protected $estado = 0; + protected $collRelDivisionActividadDocentes; + + + protected $lastRelDivisionActividadDocenteCriteria = null; + + protected $alreadyInSave = false; @@ -364,6 +370,14 @@ } $this->resetModified(); } + if ($this->collRelDivisionActividadDocentes !== null) { + foreach($this->collRelDivisionActividadDocentes as $referrerFK) { + if (!$referrerFK->isDeleted()) { + $affectedRows += $referrerFK->save($con); + } + } + } + $this->alreadyInSave = false; } return $affectedRows; @@ -405,7 +419,15 @@ } + if ($this->collRelDivisionActividadDocentes !== null) { + foreach($this->collRelDivisionActividadDocentes as $referrerFK) { + if (!$referrerFK->validate($columns)) { + $failureMap = array_merge($failureMap, $referrerFK->getValidationFailures()); + } + } + } + $this->alreadyInValidation = false; } @@ -601,6 +623,15 @@ $copyObj->setEstado($this->estado); + if ($deepCopy) { + $copyObj->setNew(false); + + foreach($this->getRelDivisionActividadDocentes() as $relObj) { + $copyObj->addRelDivisionActividadDocente($relObj->copy($deepCopy)); + } + + } + $copyObj->setNew(true); $copyObj->setId(NULL); @@ -624,4 +655,214 @@ return self::$peer; } + + public function initRelDivisionActividadDocentes() + { + if ($this->collRelDivisionActividadDocentes === null) { + $this->collRelDivisionActividadDocentes = array(); + } + } + + + public function getRelDivisionActividadDocentes($criteria = null, $con = null) + { + include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + if ($this->collRelDivisionActividadDocentes === null) { + if ($this->isNew()) { + $this->collRelDivisionActividadDocentes = array(); + } else { + + $criteria->add(RelDivisionActividadDocentePeer::FK_EVENTO_ID, $this->getId()); + + RelDivisionActividadDocentePeer::addSelectColumns($criteria); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelect($criteria, $con); + } + } else { + if (!$this->isNew()) { + + + $criteria->add(RelDivisionActividadDocentePeer::FK_EVENTO_ID, $this->getId()); + + RelDivisionActividadDocentePeer::addSelectColumns($criteria); + if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelect($criteria, $con); + } + } + } + $this->lastRelDivisionActividadDocenteCriteria = $criteria; + return $this->collRelDivisionActividadDocentes; + } + + + public function countRelDivisionActividadDocentes($criteria = null, $distinct = false, $con = null) + { + include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + $criteria->add(RelDivisionActividadDocentePeer::FK_EVENTO_ID, $this->getId()); + + return RelDivisionActividadDocentePeer::doCount($criteria, $distinct, $con); + } + + + public function addRelDivisionActividadDocente(RelDivisionActividadDocente $l) + { + $this->collRelDivisionActividadDocentes[] = $l; + $l->setEvento($this); + } + + + + public function getRelDivisionActividadDocentesJoinDivision($criteria = null, $con = null) + { + include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + if ($this->collRelDivisionActividadDocentes === null) { + if ($this->isNew()) { + $this->collRelDivisionActividadDocentes = array(); + } else { + + $criteria->add(RelDivisionActividadDocentePeer::FK_EVENTO_ID, $this->getId()); + + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinDivision($criteria, $con); + } + } else { + + $criteria->add(RelDivisionActividadDocentePeer::FK_EVENTO_ID, $this->getId()); + + if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinDivision($criteria, $con); + } + } + $this->lastRelDivisionActividadDocenteCriteria = $criteria; + + return $this->collRelDivisionActividadDocentes; + } + + + + public function getRelDivisionActividadDocentesJoinDocente($criteria = null, $con = null) + { + include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + if ($this->collRelDivisionActividadDocentes === null) { + if ($this->isNew()) { + $this->collRelDivisionActividadDocentes = array(); + } else { + + $criteria->add(RelDivisionActividadDocentePeer::FK_EVENTO_ID, $this->getId()); + + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinDocente($criteria, $con); + } + } else { + + $criteria->add(RelDivisionActividadDocentePeer::FK_EVENTO_ID, $this->getId()); + + if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinDocente($criteria, $con); + } + } + $this->lastRelDivisionActividadDocenteCriteria = $criteria; + + return $this->collRelDivisionActividadDocentes; + } + + + + public function getRelDivisionActividadDocentesJoinActividad($criteria = null, $con = null) + { + include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + if ($this->collRelDivisionActividadDocentes === null) { + if ($this->isNew()) { + $this->collRelDivisionActividadDocentes = array(); + } else { + + $criteria->add(RelDivisionActividadDocentePeer::FK_EVENTO_ID, $this->getId()); + + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinActividad($criteria, $con); + } + } else { + + $criteria->add(RelDivisionActividadDocentePeer::FK_EVENTO_ID, $this->getId()); + + if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinActividad($criteria, $con); + } + } + $this->lastRelDivisionActividadDocenteCriteria = $criteria; + + return $this->collRelDivisionActividadDocentes; + } + + + + public function getRelDivisionActividadDocentesJoinRepeticion($criteria = null, $con = null) + { + include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + if ($this->collRelDivisionActividadDocentes === null) { + if ($this->isNew()) { + $this->collRelDivisionActividadDocentes = array(); + } else { + + $criteria->add(RelDivisionActividadDocentePeer::FK_EVENTO_ID, $this->getId()); + + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinRepeticion($criteria, $con); + } + } else { + + $criteria->add(RelDivisionActividadDocentePeer::FK_EVENTO_ID, $this->getId()); + + if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinRepeticion($criteria, $con); + } + } + $this->lastRelDivisionActividadDocenteCriteria = $criteria; + + return $this->collRelDivisionActividadDocentes; + } + } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocente.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocente.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocente.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -25,6 +25,10 @@ + protected $fk_evento_id = 0; + + + protected $fk_repeticion_id = 0; @@ -56,6 +60,9 @@ protected $aRepeticion; + protected $aEvento; + + protected $alreadyInSave = false; @@ -90,6 +97,13 @@ } + public function getFkEventoId() + { + + return $this->fk_evento_id; + } + + public function getFkRepeticionId() { @@ -237,6 +251,20 @@ } + public function setFkEventoId($v) + { + + if ($this->fk_evento_id !== $v || $v === 0) { + $this->fk_evento_id = $v; + $this->modifiedColumns[] = RelDivisionActividadDocentePeer::FK_EVENTO_ID; + } + + if ($this->aEvento !== null && $this->aEvento->getId() !== $v) { + $this->aEvento = null; + } + + } + public function setFkRepeticionId($v) { @@ -331,21 +359,23 @@ $this->fk_docente_id = $rs->getInt($startcol + 3); - $this->fk_repeticion_id = $rs->getInt($startcol + 4); + $this->fk_evento_id = $rs->getInt($startcol + 4); - $this->fecha_inicio = $rs->getTimestamp($startcol + 5, null); + $this->fk_repeticion_id = $rs->getInt($startcol + 5); - $this->fecha_fin = $rs->getTimestamp($startcol + 6, null); + $this->fecha_inicio = $rs->getTimestamp($startcol + 6, null); - $this->hora_inicio = $rs->getTime($startcol + 7, null); + $this->fecha_fin = $rs->getTimestamp($startcol + 7, null); - $this->hora_fin = $rs->getTime($startcol + 8, null); + $this->hora_inicio = $rs->getTime($startcol + 8, null); + $this->hora_fin = $rs->getTime($startcol + 9, null); + $this->resetModified(); $this->setNew(false); - return $startcol + 9; + return $startcol + 10; } catch (Exception $e) { throw new PropelException("Error populating RelDivisionActividadDocente object", $e); } @@ -431,7 +461,14 @@ $this->setRepeticion($this->aRepeticion); } + if ($this->aEvento !== null) { + if ($this->aEvento->isModified()) { + $affectedRows += $this->aEvento->save($con); + } + $this->setEvento($this->aEvento); + } + if ($this->isModified()) { if ($this->isNew()) { $pk = RelDivisionActividadDocentePeer::doInsert($this, $con); @@ -504,7 +541,13 @@ } } + if ($this->aEvento !== null) { + if (!$this->aEvento->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aEvento->getValidationFailures()); + } + } + if (($retval = RelDivisionActividadDocentePeer::doValidate($this, $columns)) !== true) { $failureMap = array_merge($failureMap, $retval); } @@ -541,18 +584,21 @@ return $this->getFkDocenteId(); break; case 4: + return $this->getFkEventoId(); + break; + case 5: return $this->getFkRepeticionId(); break; - case 5: + case 6: return $this->getFechaInicio(); break; - case 6: + case 7: return $this->getFechaFin(); break; - case 7: + case 8: return $this->getHoraInicio(); break; - case 8: + case 9: return $this->getHoraFin(); break; default: @@ -569,11 +615,12 @@ $keys[1] => $this->getFkDivisionId(), $keys[2] => $this->getFkActividadId(), $keys[3] => $this->getFkDocenteId(), - $keys[4] => $this->getFkRepeticionId(), - $keys[5] => $this->getFechaInicio(), - $keys[6] => $this->getFechaFin(), - $keys[7] => $this->getHoraInicio(), - $keys[8] => $this->getHoraFin(), + $keys[4] => $this->getFkEventoId(), + $keys[5] => $this->getFkRepeticionId(), + $keys[6] => $this->getFechaInicio(), + $keys[7] => $this->getFechaFin(), + $keys[8] => $this->getHoraInicio(), + $keys[9] => $this->getHoraFin(), ); return $result; } @@ -602,18 +649,21 @@ $this->setFkDocenteId($value); break; case 4: + $this->setFkEventoId($value); + break; + case 5: $this->setFkRepeticionId($value); break; - case 5: + case 6: $this->setFechaInicio($value); break; - case 6: + case 7: $this->setFechaFin($value); break; - case 7: + case 8: $this->setHoraInicio($value); break; - case 8: + case 9: $this->setHoraFin($value); break; } } @@ -627,11 +677,12 @@ if (array_key_exists($keys[1], $arr)) $this->setFkDivisionId($arr[$keys[1]]); if (array_key_exists($keys[2], $arr)) $this->setFkActividadId($arr[$keys[2]]); if (array_key_exists($keys[3], $arr)) $this->setFkDocenteId($arr[$keys[3]]); - if (array_key_exists($keys[4], $arr)) $this->setFkRepeticionId($arr[$keys[4]]); - if (array_key_exists($keys[5], $arr)) $this->setFechaInicio($arr[$keys[5]]); - if (array_key_exists($keys[6], $arr)) $this->setFechaFin($arr[$keys[6]]); - if (array_key_exists($keys[7], $arr)) $this->setHoraInicio($arr[$keys[7]]); - if (array_key_exists($keys[8], $arr)) $this->setHoraFin($arr[$keys[8]]); + if (array_key_exists($keys[4], $arr)) $this->setFkEventoId($arr[$keys[4]]); + if (array_key_exists($keys[5], $arr)) $this->setFkRepeticionId($arr[$keys[5]]); + if (array_key_exists($keys[6], $arr)) $this->setFechaInicio($arr[$keys[6]]); + if (array_key_exists($keys[7], $arr)) $this->setFechaFin($arr[$keys[7]]); + if (array_key_exists($keys[8], $arr)) $this->setHoraInicio($arr[$keys[8]]); + if (array_key_exists($keys[9], $arr)) $this->setHoraFin($arr[$keys[9]]); } @@ -643,6 +694,7 @@ if ($this->isColumnModified(RelDivisionActividadDocentePeer::FK_DIVISION_ID)) $criteria->add(RelDivisionActividadDocentePeer::FK_DIVISION_ID, $this->fk_division_id); if ($this->isColumnModified(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID)) $criteria->add(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, $this->fk_actividad_id); if ($this->isColumnModified(RelDivisionActividadDocentePeer::FK_DOCENTE_ID)) $criteria->add(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, $this->fk_docente_id); + if ($this->isColumnModified(RelDivisionActividadDocentePeer::FK_EVENTO_ID)) $criteria->add(RelDivisionActividadDocentePeer::FK_EVENTO_ID, $this->fk_evento_id); if ($this->isColumnModified(RelDivisionActividadDocentePeer::FK_REPETICION_ID)) $criteria->add(RelDivisionActividadDocentePeer::FK_REPETICION_ID, $this->fk_repeticion_id); if ($this->isColumnModified(RelDivisionActividadDocentePeer::FECHA_INICIO)) $criteria->add(RelDivisionActividadDocentePeer::FECHA_INICIO, $this->fecha_inicio); if ($this->isColumnModified(RelDivisionActividadDocentePeer::FECHA_FIN)) $criteria->add(RelDivisionActividadDocentePeer::FECHA_FIN, $this->fecha_fin); @@ -684,6 +736,8 @@ $copyObj->setFkDocenteId($this->fk_docente_id); + $copyObj->setFkEventoId($this->fk_evento_id); + $copyObj->setFkRepeticionId($this->fk_repeticion_id); $copyObj->setFechaInicio($this->fecha_inicio); @@ -838,4 +892,34 @@ return $this->aRepeticion; } + + public function setEvento($v) + { + + + if ($v === null) { + $this->setFkEventoId('0'); + } else { + $this->setFkEventoId($v->getId()); + } + + + $this->aEvento = $v; + } + + + + public function getEvento($con = null) + { + include_once 'lib/model/om/BaseEventoPeer.php'; + + if ($this->aEvento === null && ($this->fk_evento_id !== null)) { + + $this->aEvento = EventoPeer::retrieveByPK($this->fk_evento_id, $con); + + + } + return $this->aEvento; + } + } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocentePeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocentePeer.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocentePeer.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -13,7 +13,7 @@ const CLASS_DEFAULT = 'lib.model.RelDivisionActividadDocente'; - const NUM_COLUMNS = 9; + const NUM_COLUMNS = 10; const NUM_LAZY_LOAD_COLUMNS = 0; @@ -32,6 +32,9 @@ const FK_DOCENTE_ID = 'rel_division_actividad_docente.FK_DOCENTE_ID'; + const FK_EVENTO_ID = 'rel_division_actividad_docente.FK_EVENTO_ID'; + + const FK_REPETICION_ID = 'rel_division_actividad_docente.FK_REPETICION_ID'; @@ -52,18 +55,18 @@ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('Id', 'FkDivisionId', 'FkActividadId', 'FkDocenteId', 'FkRepeticionId', 'FechaInicio', 'FechaFin', 'HoraInicio', 'HoraFin', ), - BasePeer::TYPE_COLNAME => array (RelDivisionActividadDocentePeer::ID, RelDivisionActividadDocentePeer::FK_DIVISION_ID, RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, RelDivisionActividadDocentePeer::FK_DOCENTE_ID, RelDivisionActividadDocentePeer::FK_REPETICION_ID, RelDivisionActividadDocentePeer::FECHA_INICIO, RelDivisionActividadDocentePeer::FECHA_FIN, RelDivisionActividadDocentePeer::HORA_INICIO, RelDivisionActividadDocentePeer::HORA_FIN, ), - BasePeer::TYPE_FIELDNAME => array ('id', 'fk_division_id', 'fk_actividad_id', 'fk_docente_id', 'fk_repeticion_id', 'fecha_inicio', 'fecha_fin', 'hora_inicio', 'hora_fin', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, ) + BasePeer::TYPE_PHPNAME => array ('Id', 'FkDivisionId', 'FkActividadId', 'FkDocenteId', 'FkEventoId', 'FkRepeticionId', 'FechaInicio', 'FechaFin', 'HoraInicio', 'HoraFin', ), + BasePeer::TYPE_COLNAME => array (RelDivisionActividadDocentePeer::ID, RelDivisionActividadDocentePeer::FK_DIVISION_ID, RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, RelDivisionActividadDocentePeer::FK_DOCENTE_ID, RelDivisionActividadDocentePeer::FK_EVENTO_ID, RelDivisionActividadDocentePeer::FK_REPETICION_ID, RelDivisionActividadDocentePeer::FECHA_INICIO, RelDivisionActividadDocentePeer::FECHA_FIN, RelDivisionActividadDocentePeer::HORA_INICIO, RelDivisionActividadDocentePeer::HORA_FIN, ), + BasePeer::TYPE_FIELDNAME => array ('id', 'fk_division_id', 'fk_actividad_id', 'fk_docente_id', 'fk_evento_id', 'fk_repeticion_id', 'fecha_inicio', 'fecha_fin', 'hora_inicio', 'hora_fin', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ) ); private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'FkDivisionId' => 1, 'FkActividadId' => 2, 'FkDocenteId' => 3, 'FkRepeticionId' => 4, 'FechaInicio' => 5, 'FechaFin' => 6, 'HoraInicio' => 7, 'HoraFin' => 8, ), - BasePeer::TYPE_COLNAME => array (RelDivisionActividadDocentePeer::ID => 0, RelDivisionActividadDocentePeer::FK_DIVISION_ID => 1, RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID => 2, RelDivisionActividadDocentePeer::FK_DOCENTE_ID => 3, RelDivisionActividadDocentePeer::FK_REPETICION_ID => 4, RelDivisionActividadDocentePeer::FECHA_INICIO => 5, RelDivisionActividadDocentePeer::FECHA_FIN => 6, RelDivisionActividadDocentePeer::HORA_INICIO => 7, RelDivisionActividadDocentePeer::HORA_FIN => 8, ), - BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'fk_division_id' => 1, 'fk_actividad_id' => 2, 'fk_docente_id' => 3, 'fk_repeticion_id' => 4, 'fecha_inicio' => 5, 'fecha_fin' => 6, 'hora_inicio' => 7, 'hora_fin' => 8, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, ) + BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'FkDivisionId' => 1, 'FkActividadId' => 2, 'FkDocenteId' => 3, 'FkEventoId' => 4, 'FkRepeticionId' => 5, 'FechaInicio' => 6, 'FechaFin' => 7, 'HoraInicio' => 8, 'HoraFin' => 9, ), + BasePeer::TYPE_COLNAME => array (RelDivisionActividadDocentePeer::ID => 0, RelDivisionActividadDocentePeer::FK_DIVISION_ID => 1, RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID => 2, RelDivisionActividadDocentePeer::FK_DOCENTE_ID => 3, RelDivisionActividadDocentePeer::FK_EVENTO_ID => 4, RelDivisionActividadDocentePeer::FK_REPETICION_ID => 5, RelDivisionActividadDocentePeer::FECHA_INICIO => 6, RelDivisionActividadDocentePeer::FECHA_FIN => 7, RelDivisionActividadDocentePeer::HORA_INICIO => 8, RelDivisionActividadDocentePeer::HORA_FIN => 9, ), + BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'fk_division_id' => 1, 'fk_actividad_id' => 2, 'fk_docente_id' => 3, 'fk_evento_id' => 4, 'fk_repeticion_id' => 5, 'fecha_inicio' => 6, 'fecha_fin' => 7, 'hora_inicio' => 8, 'hora_fin' => 9, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ) ); @@ -125,6 +128,8 @@ $criteria->addSelectColumn(RelDivisionActividadDocentePeer::FK_DOCENTE_ID); + $criteria->addSelectColumn(RelDivisionActividadDocentePeer::FK_EVENTO_ID); + $criteria->addSelectColumn(RelDivisionActividadDocentePeer::FK_REPETICION_ID); $criteria->addSelectColumn(RelDivisionActividadDocentePeer::FECHA_INICIO); @@ -326,6 +331,34 @@ + public static function doCountJoinEvento(Criteria $criteria, $distinct = false, $con = null) + { + $criteria = clone $criteria; + + $criteria->clearSelectColumns()->clearOrderByColumns(); + if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { + $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT_DISTINCT); + } else { + $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT); + } + + foreach($criteria->getGroupByColumns() as $column) + { + $criteria->addSelectColumn($column); + } + + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + + $rs = RelDivisionActividadDocentePeer::doSelectRS($criteria, $con); + if ($rs->next()) { + return $rs->getInt(1); + } else { + return 0; + } + } + + + public static function doSelectJoinDivision(Criteria $c, $con = null) { $c = clone $c; @@ -514,6 +547,53 @@ + public static function doSelectJoinEvento(Criteria $c, $con = null) + { + $c = clone $c; + + if ($c->getDbName() == Propel::getDefaultDB()) { + $c->setDbName(self::DATABASE_NAME); + } + + RelDivisionActividadDocentePeer::addSelectColumns($c); + $startcol = (RelDivisionActividadDocentePeer::NUM_COLUMNS - RelDivisionActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; + EventoPeer::addSelectColumns($c); + + $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + $rs = BasePeer::doSelect($c, $con); + $results = array(); + + while($rs->next()) { + + $omClass = RelDivisionActividadDocentePeer::getOMClass(); + + $cls = Propel::import($omClass); + $obj1 = new $cls(); + $obj1->hydrate($rs); + + $omClass = EventoPeer::getOMClass(); + + $cls = Propel::import($omClass); + $obj2 = new $cls(); + $obj2->hydrate($rs, $startcol); + + $newObject = true; + foreach($results as $temp_obj1) { + $temp_obj2 = $temp_obj1->getEvento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $newObject = false; + $temp_obj2->addRelDivisionActividadDocente($obj1); break; + } + } + if ($newObject) { + $obj2->initRelDivisionActividadDocentes(); + $obj2->addRelDivisionActividadDocente($obj1); } + $results[] = $obj1; + } + return $results; + } + + + public static function doCountJoinAll(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -538,6 +618,8 @@ $criteria->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + $rs = RelDivisionActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -571,6 +653,9 @@ RepeticionPeer::addSelectColumns($c); $startcol6 = $startcol5 + RepeticionPeer::NUM_COLUMNS; + EventoPeer::addSelectColumns($c); + $startcol7 = $startcol6 + EventoPeer::NUM_COLUMNS; + $c->addJoin(RelDivisionActividadDocentePeer::FK_DIVISION_ID, DivisionPeer::ID); $c->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); @@ -579,6 +664,8 @@ $c->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -683,6 +770,29 @@ $obj5->addRelDivisionActividadDocente($obj1); } + + + $omClass = EventoPeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj6 = new $cls(); + $obj6->hydrate($rs, $startcol6); + + $newObject = true; + for ($j=0, $resCount=count($results); $j < $resCount; $j++) { + $temp_obj1 = $results[$j]; + $temp_obj6 = $temp_obj1->getEvento(); if ($temp_obj6->getPrimaryKey() === $obj6->getPrimaryKey()) { + $newObject = false; + $temp_obj6->addRelDivisionActividadDocente($obj1); break; + } + } + + if ($newObject) { + $obj6->initRelDivisionActividadDocentes(); + $obj6->addRelDivisionActividadDocente($obj1); + } + $results[] = $obj1; } return $results; @@ -712,6 +822,8 @@ $criteria->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + $rs = RelDivisionActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -744,6 +856,8 @@ $criteria->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + $rs = RelDivisionActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -776,6 +890,8 @@ $criteria->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + $rs = RelDivisionActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -808,6 +924,8 @@ $criteria->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + $rs = RelDivisionActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -818,6 +936,40 @@ + public static function doCountJoinAllExceptEvento(Criteria $criteria, $distinct = false, $con = null) + { + $criteria = clone $criteria; + + $criteria->clearSelectColumns()->clearOrderByColumns(); + if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { + $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT_DISTINCT); + } else { + $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT); + } + + foreach($criteria->getGroupByColumns() as $column) + { + $criteria->addSelectColumn($column); + } + + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_DIVISION_ID, DivisionPeer::ID); + + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); + + $rs = RelDivisionActividadDocentePeer::doSelectRS($criteria, $con); + if ($rs->next()) { + return $rs->getInt(1); + } else { + return 0; + } + } + + + public static function doSelectJoinAllExceptDivision(Criteria $c, $con = null) { $c = clone $c; @@ -838,13 +990,18 @@ RepeticionPeer::addSelectColumns($c); $startcol5 = $startcol4 + RepeticionPeer::NUM_COLUMNS; + EventoPeer::addSelectColumns($c); + $startcol6 = $startcol5 + EventoPeer::NUM_COLUMNS; + $c->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); $c->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); $c->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -922,6 +1079,28 @@ $obj4->addRelDivisionActividadDocente($obj1); } + $omClass = EventoPeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj5 = new $cls(); + $obj5->hydrate($rs, $startcol5); + + $newObject = true; + for ($j=0, $resCount=count($results); $j < $resCount; $j++) { + $temp_obj1 = $results[$j]; + $temp_obj5 = $temp_obj1->getEvento(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { + $newObject = false; + $temp_obj5->addRelDivisionActividadDocente($obj1); + break; + } + } + + if ($newObject) { + $obj5->initRelDivisionActividadDocentes(); + $obj5->addRelDivisionActividadDocente($obj1); + } + $results[] = $obj1; } return $results; @@ -949,13 +1128,18 @@ RepeticionPeer::addSelectColumns($c); $startcol5 = $startcol4 + RepeticionPeer::NUM_COLUMNS; + EventoPeer::addSelectColumns($c); + $startcol6 = $startcol5 + EventoPeer::NUM_COLUMNS; + $c->addJoin(RelDivisionActividadDocentePeer::FK_DIVISION_ID, DivisionPeer::ID); $c->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); $c->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -1033,6 +1217,28 @@ $obj4->addRelDivisionActividadDocente($obj1); } + $omClass = EventoPeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj5 = new $cls(); + $obj5->hydrate($rs, $startcol5); + + $newObject = true; + for ($j=0, $resCount=count($results); $j < $resCount; $j++) { + $temp_obj1 = $results[$j]; + $temp_obj5 = $temp_obj1->getEvento(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { + $newObject = false; + $temp_obj5->addRelDivisionActividadDocente($obj1); + break; + } + } + + if ($newObject) { + $obj5->initRelDivisionActividadDocentes(); + $obj5->addRelDivisionActividadDocente($obj1); + } + $results[] = $obj1; } return $results; @@ -1060,13 +1266,18 @@ RepeticionPeer::addSelectColumns($c); $startcol5 = $startcol4 + RepeticionPeer::NUM_COLUMNS; + EventoPeer::addSelectColumns($c); + $startcol6 = $startcol5 + EventoPeer::NUM_COLUMNS; + $c->addJoin(RelDivisionActividadDocentePeer::FK_DIVISION_ID, DivisionPeer::ID); $c->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); $c->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -1144,6 +1355,28 @@ $obj4->addRelDivisionActividadDocente($obj1); } + $omClass = EventoPeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj5 = new $cls(); + $obj5->hydrate($rs, $startcol5); + + $newObject = true; + for ($j=0, $resCount=count($results); $j < $resCount; $j++) { + $temp_obj1 = $results[$j]; + $temp_obj5 = $temp_obj1->getEvento(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { + $newObject = false; + $temp_obj5->addRelDivisionActividadDocente($obj1); + break; + } + } + + if ($newObject) { + $obj5->initRelDivisionActividadDocentes(); + $obj5->addRelDivisionActividadDocente($obj1); + } + $results[] = $obj1; } return $results; @@ -1171,13 +1404,18 @@ ActividadPeer::addSelectColumns($c); $startcol5 = $startcol4 + ActividadPeer::NUM_COLUMNS; + EventoPeer::addSelectColumns($c); + $startcol6 = $startcol5 + EventoPeer::NUM_COLUMNS; + $c->addJoin(RelDivisionActividadDocentePeer::FK_DIVISION_ID, DivisionPeer::ID); $c->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); $c->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -1255,12 +1493,172 @@ $obj4->addRelDivisionActividadDocente($obj1); } + $omClass = EventoPeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj5 = new $cls(); + $obj5->hydrate($rs, $startcol5); + + $newObject = true; + for ($j=0, $resCount=count($results); $j < $resCount; $j++) { + $temp_obj1 = $results[$j]; + $temp_obj5 = $temp_obj1->getEvento(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { + $newObject = false; + $temp_obj5->addRelDivisionActividadDocente($obj1); + break; + } + } + + if ($newObject) { + $obj5->initRelDivisionActividadDocentes(); + $obj5->addRelDivisionActividadDocente($obj1); + } + $results[] = $obj1; } return $results; } + + public static function doSelectJoinAllExceptEvento(Criteria $c, $con = null) + { + $c = clone $c; + + if ($c->getDbName() == Propel::getDefaultDB()) { + $c->setDbName(self::DATABASE_NAME); + } + + RelDivisionActividadDocentePeer::addSelectColumns($c); + $startcol2 = (RelDivisionActividadDocentePeer::NUM_COLUMNS - RelDivisionActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; + + DivisionPeer::addSelectColumns($c); + $startcol3 = $startcol2 + DivisionPeer::NUM_COLUMNS; + + DocentePeer::addSelectColumns($c); + $startcol4 = $startcol3 + DocentePeer::NUM_COLUMNS; + + ActividadPeer::addSelectColumns($c); + $startcol5 = $startcol4 + ActividadPeer::NUM_COLUMNS; + + RepeticionPeer::addSelectColumns($c); + $startcol6 = $startcol5 + RepeticionPeer::NUM_COLUMNS; + + $c->addJoin(RelDivisionActividadDocentePeer::FK_DIVISION_ID, DivisionPeer::ID); + + $c->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + + $c->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + + $c->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); + + + $rs = BasePeer::doSelect($c, $con); + $results = array(); + + while($rs->next()) { + + $omClass = RelDivisionActividadDocentePeer::getOMClass(); + + $cls = Propel::import($omClass); + $obj1 = new $cls(); + $obj1->hydrate($rs); + + $omClass = DivisionPeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj2 = new $cls(); + $obj2->hydrate($rs, $startcol2); + + $newObject = true; + for ($j=0, $resCount=count($results); $j < $resCount; $j++) { + $temp_obj1 = $results[$j]; + $temp_obj2 = $temp_obj1->getDivision(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $newObject = false; + $temp_obj2->addRelDivisionActividadDocente($obj1); + break; + } + } + + if ($newObject) { + $obj2->initRelDivisionActividadDocentes(); + $obj2->addRelDivisionActividadDocente($obj1); + } + + $omClass = DocentePeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj3 = new $cls(); + $obj3->hydrate($rs, $startcol3); + + $newObject = true; + for ($j=0, $resCount=count($results); $j < $resCount; $j++) { + $temp_obj1 = $results[$j]; + $temp_obj3 = $temp_obj1->getDocente(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $newObject = false; + $temp_obj3->addRelDivisionActividadDocente($obj1); + break; + } + } + + if ($newObject) { + $obj3->initRelDivisionActividadDocentes(); + $obj3->addRelDivisionActividadDocente($obj1); + } + + $omClass = ActividadPeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj4 = new $cls(); + $obj4->hydrate($rs, $startcol4); + + $newObject = true; + for ($j=0, $resCount=count($results); $j < $resCount; $j++) { + $temp_obj1 = $results[$j]; + $temp_obj4 = $temp_obj1->getActividad(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { + $newObject = false; + $temp_obj4->addRelDivisionActividadDocente($obj1); + break; + } + } + + if ($newObject) { + $obj4->initRelDivisionActividadDocentes(); + $obj4->addRelDivisionActividadDocente($obj1); + } + + $omClass = RepeticionPeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj5 = new $cls(); + $obj5->hydrate($rs, $startcol5); + + $newObject = true; + for ($j=0, $resCount=count($results); $j < $resCount; $j++) { + $temp_obj1 = $results[$j]; + $temp_obj5 = $temp_obj1->getRepeticion(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { + $newObject = false; + $temp_obj5->addRelDivisionActividadDocente($obj1); + break; + } + } + + if ($newObject) { + $obj5->initRelDivisionActividadDocentes(); + $obj5->addRelDivisionActividadDocente($obj1); + } + + $results[] = $obj1; + } + return $results; + } + + public static function getTableMap() { return Propel::getDatabaseMap(self::DATABASE_NAME)->getTable(self::TABLE_NAME); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRepeticion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRepeticion.php 2007-05-02 18:37:35 UTC (rev 4600) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRepeticion.php 2007-05-02 19:44:12 UTC (rev 4601) @@ -574,7 +574,42 @@ return $this->collRelDivisionActividadDocentes; } + + public function getRelDivisionActividadDocentesJoinEvento($criteria = null, $con = null) + { + include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + if ($this->collRelDivisionActividadDocentes === null) { + if ($this->isNew()) { + $this->collRelDivisionActividadDocentes = array(); + } else { + + $criteria->add(RelDivisionActividadDocentePeer::FK_REPETICION_ID, $this->getId()); + + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); + } + } else { + + $criteria->add(RelDivisionActividadDocentePeer::FK_REPETICION_ID, $this->getId()); + + if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); + } + } + $this->lastRelDivisionActividadDocenteCriteria = $criteria; + + return $this->collRelDivisionActividadDocentes; + } + + public function initDocenteHorarios() { if ($this->collDocenteHorarios === null) {

1 0

SVN Alba r4600 - prosistem/alba/trunk/debian
by commits＠pressenter.com.ar 02 May '07

02 May '07

Author: ftoledo Date: 2007-05-02 15:37:35 -0300 (Wed, 02 May 2007) New Revision: 4600 Removed: prosistem/alba/trunk/debian/alba-default.ex prosistem/alba/trunk/debian/cron.d.ex prosistem/alba/trunk/debian/emacsen-install.ex prosistem/alba/trunk/debian/emacsen-remove.ex prosistem/alba/trunk/debian/emacsen-startup.ex prosistem/alba/trunk/debian/init.d.ex prosistem/alba/trunk/debian/manpage.sgml.ex prosistem/alba/trunk/debian/manpage.xml.ex prosistem/alba/trunk/debian/menu.ex prosistem/alba/trunk/debian/postinst.ex prosistem/alba/trunk/debian/postrm.ex prosistem/alba/trunk/debian/preinst.ex prosistem/alba/trunk/debian/prerm.ex prosistem/alba/trunk/debian/watch.ex Modified: prosistem/alba/trunk/debian/README.Debian prosistem/alba/trunk/debian/changelog prosistem/alba/trunk/debian/copyright prosistem/alba/trunk/debian/postinst prosistem/alba/trunk/debian/templates Log: sacando archivos de ejamplo Modified: prosistem/alba/trunk/debian/README.Debian =================================================================== --- prosistem/alba/trunk/debian/README.Debian 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/README.Debian 2007-05-02 18:37:35 UTC (rev 4600) @@ -1,6 +1,7 @@ alba for Debian --------------- -Paquete experimental para debian +Paquete experimental para debian generar con + dpkg-buildpackage -uc -us -rfakeroot - -- Ragnarok <ftoledo(a)docksud.com.ar> Mon, 30 Apr 2007 11:29:51 -0300 + -- Fernando Toledo <ftoledo(a)docksud.com.ar> Mon, 30 Apr 2007 11:29:51 -0300 Deleted: prosistem/alba/trunk/debian/alba-default.ex =================================================================== --- prosistem/alba/trunk/debian/alba-default.ex 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/alba-default.ex 2007-05-02 18:37:35 UTC (rev 4600) @@ -1,10 +0,0 @@ -# Defaults for alba initscript -# sourced by /etc/init.d/alba -# installed at /etc/default/alba by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -# Additional options that are passed to the Daemon. -DAEMON_OPTS="" Modified: prosistem/alba/trunk/debian/changelog =================================================================== --- prosistem/alba/trunk/debian/changelog 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/changelog 2007-05-02 18:37:35 UTC (rev 4600) @@ -2,5 +2,5 @@ * Initial release - -- Ragnarok <ftoledo(a)docksud.com.ar> Mon, 30 Apr 2007 11:29:51 -0300 + -- Fernando Toledo <ftoledo(a)docksud.com.ar> Mon, 30 Apr 2007 11:29:51 -0300 Modified: prosistem/alba/trunk/debian/copyright =================================================================== --- prosistem/alba/trunk/debian/copyright 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/copyright 2007-05-02 18:37:35 UTC (rev 4600) @@ -11,7 +11,7 @@ This Package is licensed under the GPL. -The Debian packaging is (C) 2007, ragnarok <ftoledo(a)docksud.com.ar> and +The Debian packaging is (C) 2007, Fernando Toledo <ftoledo(a)docksud.com.ar> and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. Deleted: prosistem/alba/trunk/debian/cron.d.ex =================================================================== --- prosistem/alba/trunk/debian/cron.d.ex 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/cron.d.ex 2007-05-02 18:37:35 UTC (rev 4600) @@ -1,4 +0,0 @@ -# -# Regular cron jobs for the alba package -# -0 4 * * * root alba_maintenance Deleted: prosistem/alba/trunk/debian/emacsen-install.ex =================================================================== --- prosistem/alba/trunk/debian/emacsen-install.ex 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/emacsen-install.ex 2007-05-02 18:37:35 UTC (rev 4600) @@ -1,45 +0,0 @@ -#! /bin/sh -e -# /usr/lib/emacsen-common/packages/install/alba - -# Written by Jim Van Zandt <jrv(a)debian.org>, borrowing heavily -# from the install scripts for gettext by Santiago Vila -# <sanvila(a)ctv.es> and octave by Dirk Eddelbuettel <edd(a)debian.org>. - -FLAVOR=$1 -PACKAGE=alba - -if [ ${FLAVOR} = emacs ]; then exit 0; fi - -echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} - -#FLAVORTEST=`echo $FLAVOR | cut -c-6` -#if [ ${FLAVORTEST} = xemacs ] ; then -# SITEFLAG="-no-site-file" -#else -# SITEFLAG="--no-site-file" -#fi -FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" - -ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} -ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} - -# Install-info-altdir does not actually exist. -# Maybe somebody will write it. -if test -x /usr/sbin/install-info-altdir; then - echo install/${PACKAGE}: install Info links for ${FLAVOR} - install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz -fi - -install -m 755 -d ${ELCDIR} -cd ${ELDIR} -FILES=`echo *.el` -cp ${FILES} ${ELCDIR} -cd ${ELCDIR} - -cat << EOF > path.el -(setq load-path (cons "." load-path) byte-compile-warnings nil) -EOF -${FLAVOR} ${FLAGS} ${FILES} -rm -f *.el path.el - -exit 0 Deleted: prosistem/alba/trunk/debian/emacsen-remove.ex =================================================================== --- prosistem/alba/trunk/debian/emacsen-remove.ex 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/emacsen-remove.ex 2007-05-02 18:37:35 UTC (rev 4600) @@ -1,15 +0,0 @@ -#!/bin/sh -e -# /usr/lib/emacsen-common/packages/remove/alba - -FLAVOR=$1 -PACKAGE=alba - -if [ ${FLAVOR} != emacs ]; then - if test -x /usr/sbin/install-info-altdir; then - echo remove/${PACKAGE}: removing Info links for ${FLAVOR} - install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/alba.info.gz - fi - - echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} - rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} -fi Deleted: prosistem/alba/trunk/debian/emacsen-startup.ex =================================================================== --- prosistem/alba/trunk/debian/emacsen-startup.ex 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/emacsen-startup.ex 2007-05-02 18:37:35 UTC (rev 4600) @@ -1,25 +0,0 @@ -;; -*-emacs-lisp-*- -;; -;; Emacs startup file, e.g. /etc/emacs/site-start.d/50alba.el -;; for the Debian alba package -;; -;; Originally contributed by Nils Naumann <naumann(a)unileoben.ac.at> -;; Modified by Dirk Eddelbuettel <edd(a)debian.org> -;; Adapted for dh-make by Jim Van Zandt <jrv(a)debian.org> - -;; The alba package follows the Debian/GNU Linux 'emacsen' policy and -;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, -;; xemacs19, emacs20, xemacs20...). The compiled code is then -;; installed in a subdirectory of the respective site-lisp directory. -;; We have to add this to the load-path: -(let ((package-dir (concat "/usr/share/" - (symbol-name flavor) - "/site-lisp/alba"))) -;; If package-dir does not exist, the alba package must have -;; removed but not purged, and we should skip the setup. - (when (file-directory-p package-dir) - (setq load-path (cons package-dir load-path)) - (autoload 'alba-mode "alba-mode" - "Major mode for editing alba files." t) - (add-to-list 'auto-mode-alist '("\\.alba$" . alba-mode)))) - Deleted: prosistem/alba/trunk/debian/init.d.ex =================================================================== --- prosistem/alba/trunk/debian/init.d.ex 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/init.d.ex 2007-05-02 18:37:35 UTC (rev 4600) @@ -1,81 +0,0 @@ -#! /bin/sh -# -# skeleton example file to build /etc/init.d/ scripts. -# This file should be used to construct scripts for /etc/init.d. -# -# Written by Miquel van Smoorenburg <miquels(a)cistron.nl>. -# Modified for Debian -# by Ian Murdock <imurdock(a)gnu.ai.mit.edu>. -# -# Version: @(#)skeleton 1.9 26-Feb-2001 miquels(a)cistron.nl -# - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/alba -NAME=alba -DESC=alba - -test -x $DAEMON || exit 0 - -# Include alba defaults if available -if [ -f /etc/default/alba ] ; then - . /etc/default/alba -fi - -set -e - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ - --exec $DAEMON -- $DAEMON_OPTS - echo "$NAME." - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \ - --exec $DAEMON - echo "$NAME." - ;; - #reload) - # - # If the daemon can reload its config files on the fly - # for example by sending it SIGHUP, do it here. - # - # If the daemon responds to changes in its config file - # directly anyway, make this a do-nothing entry. - # - # echo "Reloading $DESC configuration files." - # start-stop-daemon --stop --signal 1 --quiet --pidfile \ - # /var/run/$NAME.pid --exec $DAEMON - #;; - force-reload) - # - # If the "reload" option is implemented, move the "force-reload" - # option to the "reload" entry above. If not, "force-reload" is - # just the same as "restart" except that it does nothing if the - # daemon isn't already running. - # check wether $DAEMON is running. If so, restart - start-stop-daemon --stop --test --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON \ - && $0 restart \ - || exit 0 - ;; - restart) - echo -n "Restarting $DESC: " - start-stop-daemon --stop --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON - sleep 1 - start-stop-daemon --start --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS - echo "$NAME." - ;; - *) - N=/etc/init.d/$NAME - # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $N {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 Deleted: prosistem/alba/trunk/debian/manpage.sgml.ex =================================================================== --- prosistem/alba/trunk/debian/manpage.sgml.ex 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/manpage.sgml.ex 2007-05-02 18:37:35 UTC (rev 4600) @@ -1,156 +0,0 @@ -<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ - - - -  - <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>"> - <!ENTITY dhsurname "<surname>SURNAME</surname>"> -  - <!ENTITY dhdate "<date>abril 30, 2007</date>"> -  - <!ENTITY dhsection "<manvolnum>SECTION</manvolnum>"> - <!ENTITY dhemail "<email>ftoledo(a)docksud.com.ar</email>"> - <!ENTITY dhusername "ragnarok"> - <!ENTITY dhucpackage "<refentrytitle>ALBA</refentrytitle>"> - <!ENTITY dhpackage "alba"> - - <!ENTITY debian "<productname>Debian</productname>"> - <!ENTITY gnu "<acronym>GNU</acronym>"> - <!ENTITY gpl "&gnu; <acronym>GPL</acronym>"> -]> - -<refentry> - <refentryinfo> - <address> - &dhemail; - </address> - <author> - &dhfirstname; - &dhsurname; - </author> - <copyright> - <year>2003</year> - <holder>&dhusername;</holder> - </copyright> - &dhdate; - </refentryinfo> - <refmeta> - &dhucpackage; - - &dhsection; - </refmeta> - <refnamediv> - <refname>&dhpackage;</refname> - - <refpurpose>program to do something</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>&dhpackage;</command> - - <arg><option>-e <replaceable>this</replaceable></option></arg> - - <arg><option>--example <replaceable>that</replaceable></option></arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - - <para>This manual page documents briefly the - <command>&dhpackage;</command> and <command>bar</command> - commands.</para> - - <para>This manual page was written for the &debian; distribution - because the original program does not have a manual page. - Instead, it has documentation in the &gnu; - <application>Info</application> format; see below.</para> - - <para><command>&dhpackage;</command> is a program that...</para> - - </refsect1> - <refsect1> - <title>OPTIONS</title> - - <para>These programs follow the usual &gnu; command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. For a complete description, see the - <application>Info</application> files.</para> - - <variablelist> - <varlistentry> - <term><option>-h</option> - <option>--help</option> - </term> - <listitem> - <para>Show summary of options.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>-v</option> - <option>--version</option> - </term> - <listitem> - <para>Show version of program.</para> - </listitem> - </varlistentry> - </variablelist> - </refsect1> - <refsect1> - <title>SEE ALSO</title> - - <para>bar (1), baz (1).</para> - - <para>The programs are documented fully by <citetitle>The Rise and - Fall of a Fooish Bar</citetitle> available via the - <application>Info</application> system.</para> - </refsect1> - <refsect1> - <title>AUTHOR</title> - - <para>This manual page was written by &dhusername; &dhemail; for - the &debian; system (but may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the &gnu; General Public License, Version 2 any - later version published by the Free Software Foundation. - </para> - <para> - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - </para> - - </refsect1> -</refentry> - - - - Deleted: prosistem/alba/trunk/debian/manpage.xml.ex =================================================================== --- prosistem/alba/trunk/debian/manpage.xml.ex 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/manpage.xml.ex 2007-05-02 18:37:35 UTC (rev 4600) @@ -1,148 +0,0 @@ -<?xml version='1.0' encoding='ISO-8859-1'?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" -"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ - - - -  - <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>"> - <!ENTITY dhsurname "<surname>SURNAME</surname>"> -  - <!ENTITY dhdate "<date>abril 30, 2007</date>"> -  - <!ENTITY dhsection "<manvolnum>SECTION</manvolnum>"> - <!ENTITY dhemail "<email>ftoledo(a)docksud.com.ar</email>"> - <!ENTITY dhusername "ragnarok"> - <!ENTITY dhucpackage "<refentrytitle>ALBA</refentrytitle>"> - <!ENTITY dhpackage "alba"> - - <!ENTITY debian "<productname>Debian</productname>"> - <!ENTITY gnu "<acronym>GNU</acronym>"> - <!ENTITY gpl "&gnu; <acronym>GPL</acronym>"> -]> - -<refentry> - <refentryinfo> - <address> - &dhemail; - </address> - <author> - &dhfirstname; - &dhsurname; - </author> - <copyright> - <year>2003</year> - <holder>&dhusername;</holder> - </copyright> - &dhdate; - </refentryinfo> - <refmeta> - &dhucpackage; - - &dhsection; - </refmeta> - <refnamediv> - <refname>&dhpackage;</refname> - - <refpurpose>program to do something</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>&dhpackage;</command> - - <arg><option>-e <replaceable>this</replaceable></option></arg> - - <arg><option>--example <replaceable>that</replaceable></option></arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - - <para>This manual page documents briefly the - <command>&dhpackage;</command> and <command>bar</command> - commands.</para> - - <para>This manual page was written for the &debian; distribution - because the original program does not have a manual page. - Instead, it has documentation in the &gnu; - <application>Info</application> format; see below.</para> - - <para><command>&dhpackage;</command> is a program that...</para> - - </refsect1> - <refsect1> - <title>OPTIONS</title> - - <para>These programs follow the usual &gnu; command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. For a complete description, see the - <application>Info</application> files.</para> - - <variablelist> - <varlistentry> - <term><option>-h</option> - <option>--help</option> - </term> - <listitem> - <para>Show summary of options.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>-v</option> - <option>--version</option> - </term> - <listitem> - <para>Show version of program.</para> - </listitem> - </varlistentry> - </variablelist> - </refsect1> - <refsect1> - <title>SEE ALSO</title> - - <para>bar (1), baz (1).</para> - - <para>The programs are documented fully by <citetitle>The Rise and - Fall of a Fooish Bar</citetitle> available via the - <application>Info</application> system.</para> - </refsect1> - <refsect1> - <title>AUTHOR</title> - - <para>This manual page was written by &dhusername; &dhemail; for - the &debian; system (but may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the &gnu; General Public License, Version 2 any - later version published by the Free Software Foundation. - </para> - <para> - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - </para> - - </refsect1> -</refentry> - Deleted: prosistem/alba/trunk/debian/menu.ex =================================================================== --- prosistem/alba/trunk/debian/menu.ex 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/menu.ex 2007-05-02 18:37:35 UTC (rev 4600) @@ -1,2 +0,0 @@ -?package(alba):needs="X11|text|vc|wm" section="Apps/see-menu-manual"\ - title="alba" command="/usr/bin/alba" Modified: prosistem/alba/trunk/debian/postinst =================================================================== --- prosistem/alba/trunk/debian/postinst 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/postinst 2007-05-02 18:37:35 UTC (rev 4600) @@ -31,6 +31,8 @@ fi +#DEBHELPER# + exit 0 Deleted: prosistem/alba/trunk/debian/postinst.ex =================================================================== --- prosistem/alba/trunk/debian/postinst.ex 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/postinst.ex 2007-05-02 18:37:35 UTC (rev 4600) @@ -1,41 +0,0 @@ -#!/bin/sh -# postinst script for alba -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postinst> `configure' <most-recently-configured-version> -# * <old-postinst> `abort-upgrade' <new version> -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -# <new-version> -# * <postinst> `abort-remove' -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -# <failed-install-package> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - Deleted: prosistem/alba/trunk/debian/postrm.ex =================================================================== --- prosistem/alba/trunk/debian/postrm.ex 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/postrm.ex 2007-05-02 18:37:35 UTC (rev 4600) @@ -1,39 +0,0 @@ -#!/bin/sh -# postrm script for alba -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postrm> `remove' -# * <postrm> `purge' -# * <old-postrm> `upgrade' <new-version> -# * <new-postrm> `failed-upgrade' <old-version> -# * <new-postrm> `abort-install' -# * <new-postrm> `abort-install' <old-version> -# * <new-postrm> `abort-upgrade' <old-version> -# * <disappearer's-postrm> `disappear' <overwriter> -# <overwriter-version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - Deleted: prosistem/alba/trunk/debian/preinst.ex =================================================================== --- prosistem/alba/trunk/debian/preinst.ex 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/preinst.ex 2007-05-02 18:37:35 UTC (rev 4600) @@ -1,37 +0,0 @@ -#!/bin/sh -# preinst script for alba -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <new-preinst> `install' -# * <new-preinst> `install' <old-version> -# * <new-preinst> `upgrade' <old-version> -# * <old-preinst> `abort-upgrade' <new-version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - install|upgrade) - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - Deleted: prosistem/alba/trunk/debian/prerm.ex =================================================================== --- prosistem/alba/trunk/debian/prerm.ex 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/prerm.ex 2007-05-02 18:37:35 UTC (rev 4600) @@ -1,40 +0,0 @@ -#!/bin/sh -# prerm script for alba -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <prerm> `remove' -# * <old-prerm> `upgrade' <new-version> -# * <new-prerm> `failed-upgrade' <old-version> -# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> -# * <deconfigured's-prerm> `deconfigure' `in-favour' -# <package-being-installed> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove|upgrade|deconfigure) - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - Modified: prosistem/alba/trunk/debian/templates =================================================================== --- prosistem/alba/trunk/debian/templates 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/templates 2007-05-02 18:37:35 UTC (rev 4600) @@ -2,11 +2,7 @@ Type: multiselect Choices: apache2, apache, apache-ssl, apache-perl Default: apache2 -_Description: Which web server would you like to reconfigure automatically? - Alba can run on any web server that PHP5 does, but this automatic +_Description: Which web server would you like to reconfigure automatically? . + Alba can run on any web server that PHP5 does, but this automatic . configuration process only supports Apache. -Template: alba/test -Type: string -Default: root -_Description: This is a test! :) Deleted: prosistem/alba/trunk/debian/watch.ex =================================================================== --- prosistem/alba/trunk/debian/watch.ex 2007-05-02 16:43:59 UTC (rev 4599) +++ prosistem/alba/trunk/debian/watch.ex 2007-05-02 18:37:35 UTC (rev 4600) @@ -1,22 +0,0 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 3 file -version=3 - -# Uncomment to examine a Webpage -# <Webpage URL> <string match> -#http://www.example.com/downloads.php alba-(.*)\.tar\.gz - -# Uncomment to examine a Webserver directory -#http://www.example.com/pub/alba-(.*)\.tar\.gz - -# Uncommment to examine a FTP server -#ftp://ftp.example.com/pub/alba-(.*)\.tar\.gz debian uupdate - -# Uncomment to find new files on sourceforge, for debscripts >= 2.9 -# http://sf.net/alba/alba-(.*)\.tar\.gz - -

1 0

SVN Alba r4599 - prosistem/alba/trunk
by commits＠pressenter.com.ar 02 May '07

02 May '07

Author: ftoledo Date: 2007-05-02 13:43:59 -0300 (Wed, 02 May 2007) New Revision: 4599 Modified: prosistem/alba/trunk/ Log: ignorando build-stamp Property changes on: prosistem/alba/trunk ___________________________________________________________________ Name: svn:ignore + build-stamp

1 0

SVN Alba r4598 - in prosistem/alba/trunk: . debian debian/conf
by commits＠pressenter.com.ar 02 May '07

02 May '07

Author: ftoledo Date: 2007-05-02 12:43:06 -0300 (Wed, 02 May 2007) New Revision: 4598 Added: prosistem/alba/trunk/debian/ prosistem/alba/trunk/debian/README.Debian prosistem/alba/trunk/debian/alba-default.ex prosistem/alba/trunk/debian/alba.doc-base.EX prosistem/alba/trunk/debian/alba.postrm.debhelper prosistem/alba/trunk/debian/alba.substvars prosistem/alba/trunk/debian/changelog prosistem/alba/trunk/debian/compat prosistem/alba/trunk/debian/conf/ prosistem/alba/trunk/debian/conf/alba-apache.conf prosistem/alba/trunk/debian/control prosistem/alba/trunk/debian/copyright prosistem/alba/trunk/debian/cron.d.ex prosistem/alba/trunk/debian/dirs prosistem/alba/trunk/debian/docs prosistem/alba/trunk/debian/emacsen-install.ex prosistem/alba/trunk/debian/emacsen-remove.ex prosistem/alba/trunk/debian/emacsen-startup.ex prosistem/alba/trunk/debian/files prosistem/alba/trunk/debian/init.d.ex prosistem/alba/trunk/debian/install prosistem/alba/trunk/debian/manpage.1.ex prosistem/alba/trunk/debian/manpage.sgml.ex prosistem/alba/trunk/debian/manpage.xml.ex prosistem/alba/trunk/debian/menu.ex prosistem/alba/trunk/debian/postinst prosistem/alba/trunk/debian/postinst.ex prosistem/alba/trunk/debian/postrm.ex prosistem/alba/trunk/debian/preinst.ex prosistem/alba/trunk/debian/prerm.ex prosistem/alba/trunk/debian/rules prosistem/alba/trunk/debian/rules.old prosistem/alba/trunk/debian/templates prosistem/alba/trunk/debian/watch.ex Log: agregando soporte para generar paquete de debian Property changes on: prosistem/alba/trunk/debian ___________________________________________________________________ Name: svn:ignore + alba Added: prosistem/alba/trunk/debian/README.Debian =================================================================== --- prosistem/alba/trunk/debian/README.Debian 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/README.Debian 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,6 @@ +alba for Debian +--------------- + +Paquete experimental para debian + + -- Ragnarok <ftoledo(a)docksud.com.ar> Mon, 30 Apr 2007 11:29:51 -0300 Added: prosistem/alba/trunk/debian/alba-default.ex =================================================================== --- prosistem/alba/trunk/debian/alba-default.ex 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/alba-default.ex 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,10 @@ +# Defaults for alba initscript +# sourced by /etc/init.d/alba +# installed at /etc/default/alba by the maintainer scripts + +# +# This is a POSIX shell fragment +# + +# Additional options that are passed to the Daemon. +DAEMON_OPTS="" Added: prosistem/alba/trunk/debian/alba.doc-base.EX =================================================================== --- prosistem/alba/trunk/debian/alba.doc-base.EX 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/alba.doc-base.EX 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,22 @@ +Document: alba +Title: Debian alba Manual +Author: <insert document author here> +Abstract: This manual describes what alba is + and how it can be used to + manage online manuals on Debian systems. +Section: unknown + +Format: debiandoc-sgml +Files: /usr/share/doc/alba/alba.sgml.gz + +Format: postscript +Files: /usr/share/doc/alba/alba.ps.gz + +Format: text +Files: /usr/share/doc/alba/alba.text.gz + +Format: HTML +Index: /usr/share/doc/alba/html/index.html +Files: /usr/share/doc/alba/html/*.html + + Added: prosistem/alba/trunk/debian/alba.postrm.debhelper =================================================================== --- prosistem/alba/trunk/debian/alba.postrm.debhelper 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/alba.postrm.debhelper 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,6 @@ +# Automatically added by dh_installdebconf +if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_purge +fi +# End automatically added section Added: prosistem/alba/trunk/debian/alba.substvars =================================================================== --- prosistem/alba/trunk/debian/alba.substvars 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/alba.substvars 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1 @@ +misc:Depends=debconf (>= 0.5) | debconf-2.0 Added: prosistem/alba/trunk/debian/changelog =================================================================== --- prosistem/alba/trunk/debian/changelog 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/changelog 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,6 @@ +alba (1.0rc-1) unstable; urgency=low + + * Initial release + + -- Ragnarok <ftoledo(a)docksud.com.ar> Mon, 30 Apr 2007 11:29:51 -0300 + Added: prosistem/alba/trunk/debian/compat =================================================================== --- prosistem/alba/trunk/debian/compat 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/compat 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1 @@ +5 Added: prosistem/alba/trunk/debian/conf/alba-apache.conf =================================================================== --- prosistem/alba/trunk/debian/conf/alba-apache.conf 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/conf/alba-apache.conf 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,9 @@ +# alba default Apache configuration + +Alias /alba /usr/share/alba/alba/web + +<Directory /usr/share/alba/alba/web> + Options Indexes FollowSymLinks + DirectoryIndex index.php +</Directory> + Added: prosistem/alba/trunk/debian/control =================================================================== --- prosistem/alba/trunk/debian/control 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/control 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,25 @@ +Source: alba +Section: web +Priority: extra +Maintainer: Fernando Toledo <ftoledo(a)docksud.com.ar> +Build-Depends: debhelper (>= 5) +Standards-Version: 3.7.2 +Xs-Vcs-Browse: http://alba.pressenter.com.ar/cgi-bin/trac.cgi/browser +Xs-Vcs-Svn: http://alba.pressenter.com.ar/cgi-bin/trac.cgi/browser/trunk + +Package: alba +Architecture: any +Depends: libapache2-mod-php5, apache2 | httpd, ${misc:Depends} +Recommends: apache2 | httpd, php5-gd +Suggests: mysql-server +Description: Sistema Inform�tico Abierto de Gesti�n Unificada para Unidades Educacionales + Sistema Inform�tico Abierto de Gesti�n Unificada para Unidades Educacionales + . + El Proyecto Alba, es un proyecto de desarrollo de Software para la realizaci�n + de un "Sistema Inform�tico Abierto de Gesti�n Unificada para Unidades Educacionales", + que brindar� una herramienta realizada en software libre, para el trabajo + cotidiano en estas unidades. Por su tipo de licenciamiento bajo la GNU/GPL, + el sistema permitir� una reutilizaci�n y actualizaci�n constante, como as� + tambi�n la posibilidad de aprovechamiento de m�dulos ya realizados por otros + emprendedores (siempre que sean compatibles con esta licencia). + Added: prosistem/alba/trunk/debian/copyright =================================================================== --- prosistem/alba/trunk/debian/copyright 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/copyright 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,20 @@ +This package was debianized by ragnarok <ftoledo(a)docksud.com.ar> on +Mon, 30 Apr 2007 11:29:51 -0300. + +It was downloaded from http://www.proyectoalba.com.ar + +Upstream Author: Fernando Toledo, H�ctor Sanchez, Jos� Luis DiBiase + +Copyright: 2006 Proyecto Alba + +License: + +This Package is licensed under the GPL. + +The Debian packaging is (C) 2007, ragnarok <ftoledo(a)docksud.com.ar> and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. + + +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. + Added: prosistem/alba/trunk/debian/cron.d.ex =================================================================== --- prosistem/alba/trunk/debian/cron.d.ex 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/cron.d.ex 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,4 @@ +# +# Regular cron jobs for the alba package +# +0 4 * * * root alba_maintenance Added: prosistem/alba/trunk/debian/dirs =================================================================== --- prosistem/alba/trunk/debian/dirs 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/dirs 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,2 @@ +etc/alba +usr/share/alba Added: prosistem/alba/trunk/debian/docs =================================================================== Added: prosistem/alba/trunk/debian/emacsen-install.ex =================================================================== --- prosistem/alba/trunk/debian/emacsen-install.ex 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/emacsen-install.ex 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,45 @@ +#! /bin/sh -e +# /usr/lib/emacsen-common/packages/install/alba + +# Written by Jim Van Zandt <jrv(a)debian.org>, borrowing heavily +# from the install scripts for gettext by Santiago Vila +# <sanvila(a)ctv.es> and octave by Dirk Eddelbuettel <edd(a)debian.org>. + +FLAVOR=$1 +PACKAGE=alba + +if [ ${FLAVOR} = emacs ]; then exit 0; fi + +echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} + +#FLAVORTEST=`echo $FLAVOR | cut -c-6` +#if [ ${FLAVORTEST} = xemacs ] ; then +# SITEFLAG="-no-site-file" +#else +# SITEFLAG="--no-site-file" +#fi +FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" + +ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} +ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} + +# Install-info-altdir does not actually exist. +# Maybe somebody will write it. +if test -x /usr/sbin/install-info-altdir; then + echo install/${PACKAGE}: install Info links for ${FLAVOR} + install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz +fi + +install -m 755 -d ${ELCDIR} +cd ${ELDIR} +FILES=`echo *.el` +cp ${FILES} ${ELCDIR} +cd ${ELCDIR} + +cat << EOF > path.el +(setq load-path (cons "." load-path) byte-compile-warnings nil) +EOF +${FLAVOR} ${FLAGS} ${FILES} +rm -f *.el path.el + +exit 0 Added: prosistem/alba/trunk/debian/emacsen-remove.ex =================================================================== --- prosistem/alba/trunk/debian/emacsen-remove.ex 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/emacsen-remove.ex 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,15 @@ +#!/bin/sh -e +# /usr/lib/emacsen-common/packages/remove/alba + +FLAVOR=$1 +PACKAGE=alba + +if [ ${FLAVOR} != emacs ]; then + if test -x /usr/sbin/install-info-altdir; then + echo remove/${PACKAGE}: removing Info links for ${FLAVOR} + install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/alba.info.gz + fi + + echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} + rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} +fi Added: prosistem/alba/trunk/debian/emacsen-startup.ex =================================================================== --- prosistem/alba/trunk/debian/emacsen-startup.ex 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/emacsen-startup.ex 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,25 @@ +;; -*-emacs-lisp-*- +;; +;; Emacs startup file, e.g. /etc/emacs/site-start.d/50alba.el +;; for the Debian alba package +;; +;; Originally contributed by Nils Naumann <naumann(a)unileoben.ac.at> +;; Modified by Dirk Eddelbuettel <edd(a)debian.org> +;; Adapted for dh-make by Jim Van Zandt <jrv(a)debian.org> + +;; The alba package follows the Debian/GNU Linux 'emacsen' policy and +;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, +;; xemacs19, emacs20, xemacs20...). The compiled code is then +;; installed in a subdirectory of the respective site-lisp directory. +;; We have to add this to the load-path: +(let ((package-dir (concat "/usr/share/" + (symbol-name flavor) + "/site-lisp/alba"))) +;; If package-dir does not exist, the alba package must have +;; removed but not purged, and we should skip the setup. + (when (file-directory-p package-dir) + (setq load-path (cons package-dir load-path)) + (autoload 'alba-mode "alba-mode" + "Major mode for editing alba files." t) + (add-to-list 'auto-mode-alist '("\\.alba$" . alba-mode)))) + Added: prosistem/alba/trunk/debian/files =================================================================== --- prosistem/alba/trunk/debian/files 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/files 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1 @@ +alba_1.0rc-1_i386.deb web extra Added: prosistem/alba/trunk/debian/init.d.ex =================================================================== --- prosistem/alba/trunk/debian/init.d.ex 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/init.d.ex 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,81 @@ +#! /bin/sh +# +# skeleton example file to build /etc/init.d/ scripts. +# This file should be used to construct scripts for /etc/init.d. +# +# Written by Miquel van Smoorenburg <miquels(a)cistron.nl>. +# Modified for Debian +# by Ian Murdock <imurdock(a)gnu.ai.mit.edu>. +# +# Version: @(#)skeleton 1.9 26-Feb-2001 miquels(a)cistron.nl +# + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/alba +NAME=alba +DESC=alba + +test -x $DAEMON || exit 0 + +# Include alba defaults if available +if [ -f /etc/default/alba ] ; then + . /etc/default/alba +fi + +set -e + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ + --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \ + --exec $DAEMON + echo "$NAME." + ;; + #reload) + # + # If the daemon can reload its config files on the fly + # for example by sending it SIGHUP, do it here. + # + # If the daemon responds to changes in its config file + # directly anyway, make this a do-nothing entry. + # + # echo "Reloading $DESC configuration files." + # start-stop-daemon --stop --signal 1 --quiet --pidfile \ + # /var/run/$NAME.pid --exec $DAEMON + #;; + force-reload) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart" except that it does nothing if the + # daemon isn't already running. + # check wether $DAEMON is running. If so, restart + start-stop-daemon --stop --test --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON \ + && $0 restart \ + || exit 0 + ;; + restart) + echo -n "Restarting $DESC: " + start-stop-daemon --stop --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON + sleep 1 + start-stop-daemon --start --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 Added: prosistem/alba/trunk/debian/install =================================================================== --- prosistem/alba/trunk/debian/install 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/install 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,6 @@ +*.php usr/share/alba +alba usr/share/alba +dist usr/share/alba +installer usr/share/alba + +debian/conf/* /etc/alba/ Added: prosistem/alba/trunk/debian/manpage.1.ex =================================================================== --- prosistem/alba/trunk/debian/manpage.1.ex 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/manpage.1.ex 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,59 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH ALBA SECTION "abril 30, 2007" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +alba \- program to do something +.SH SYNOPSIS +.B alba +.RI [ options ] " files" ... +.br +.B bar +.RI [ options ] " files" ... +.SH DESCRIPTION +This manual page documents briefly the +.B alba +and +.B bar +commands. +.PP +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBalba\fP is a program that... +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +For a complete description, see the Info files. +.TP +.B \-h, \-\-help +Show summary of options. +.TP +.B \-v, \-\-version +Show version of program. +.SH SEE ALSO +.BR bar (1), +.BR baz (1). +.br +The programs are documented fully by +.IR "The Rise and Fall of a Fooish Bar" , +available via the Info system. +.SH AUTHOR +alba was written by <upstream author>. +.PP +This manual page was written by ragnarok <ftoledo(a)docksud.com.ar>, +for the Debian project (but may be used by others). Added: prosistem/alba/trunk/debian/manpage.sgml.ex =================================================================== --- prosistem/alba/trunk/debian/manpage.sgml.ex 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/manpage.sgml.ex 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,156 @@ +<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ + + + +  + <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>"> + <!ENTITY dhsurname "<surname>SURNAME</surname>"> +  + <!ENTITY dhdate "<date>abril 30, 2007</date>"> +  + <!ENTITY dhsection "<manvolnum>SECTION</manvolnum>"> + <!ENTITY dhemail "<email>ftoledo(a)docksud.com.ar</email>"> + <!ENTITY dhusername "ragnarok"> + <!ENTITY dhucpackage "<refentrytitle>ALBA</refentrytitle>"> + <!ENTITY dhpackage "alba"> + + <!ENTITY debian "<productname>Debian</productname>"> + <!ENTITY gnu "<acronym>GNU</acronym>"> + <!ENTITY gpl "&gnu; <acronym>GPL</acronym>"> +]> + +<refentry> + <refentryinfo> + <address> + &dhemail; + </address> + <author> + &dhfirstname; + &dhsurname; + </author> + <copyright> + <year>2003</year> + <holder>&dhusername;</holder> + </copyright> + &dhdate; + </refentryinfo> + <refmeta> + &dhucpackage; + + &dhsection; + </refmeta> + <refnamediv> + <refname>&dhpackage;</refname> + + <refpurpose>program to do something</refpurpose> + </refnamediv> + <refsynopsisdiv> + <cmdsynopsis> + <command>&dhpackage;</command> + + <arg><option>-e <replaceable>this</replaceable></option></arg> + + <arg><option>--example <replaceable>that</replaceable></option></arg> + </cmdsynopsis> + </refsynopsisdiv> + <refsect1> + <title>DESCRIPTION</title> + + <para>This manual page documents briefly the + <command>&dhpackage;</command> and <command>bar</command> + commands.</para> + + <para>This manual page was written for the &debian; distribution + because the original program does not have a manual page. + Instead, it has documentation in the &gnu; + <application>Info</application> format; see below.</para> + + <para><command>&dhpackage;</command> is a program that...</para> + + </refsect1> + <refsect1> + <title>OPTIONS</title> + + <para>These programs follow the usual &gnu; command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. For a complete description, see the + <application>Info</application> files.</para> + + <variablelist> + <varlistentry> + <term><option>-h</option> + <option>--help</option> + </term> + <listitem> + <para>Show summary of options.</para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>-v</option> + <option>--version</option> + </term> + <listitem> + <para>Show version of program.</para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + <refsect1> + <title>SEE ALSO</title> + + <para>bar (1), baz (1).</para> + + <para>The programs are documented fully by <citetitle>The Rise and + Fall of a Fooish Bar</citetitle> available via the + <application>Info</application> system.</para> + </refsect1> + <refsect1> + <title>AUTHOR</title> + + <para>This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). Permission is + granted to copy, distribute and/or modify this document under + the terms of the &gnu; General Public License, Version 2 any + later version published by the Free Software Foundation. + </para> + <para> + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL. + </para> + + </refsect1> +</refentry> + + + + Added: prosistem/alba/trunk/debian/manpage.xml.ex =================================================================== --- prosistem/alba/trunk/debian/manpage.xml.ex 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/manpage.xml.ex 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,148 @@ +<?xml version='1.0' encoding='ISO-8859-1'?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" +"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + + + +  + <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>"> + <!ENTITY dhsurname "<surname>SURNAME</surname>"> +  + <!ENTITY dhdate "<date>abril 30, 2007</date>"> +  + <!ENTITY dhsection "<manvolnum>SECTION</manvolnum>"> + <!ENTITY dhemail "<email>ftoledo(a)docksud.com.ar</email>"> + <!ENTITY dhusername "ragnarok"> + <!ENTITY dhucpackage "<refentrytitle>ALBA</refentrytitle>"> + <!ENTITY dhpackage "alba"> + + <!ENTITY debian "<productname>Debian</productname>"> + <!ENTITY gnu "<acronym>GNU</acronym>"> + <!ENTITY gpl "&gnu; <acronym>GPL</acronym>"> +]> + +<refentry> + <refentryinfo> + <address> + &dhemail; + </address> + <author> + &dhfirstname; + &dhsurname; + </author> + <copyright> + <year>2003</year> + <holder>&dhusername;</holder> + </copyright> + &dhdate; + </refentryinfo> + <refmeta> + &dhucpackage; + + &dhsection; + </refmeta> + <refnamediv> + <refname>&dhpackage;</refname> + + <refpurpose>program to do something</refpurpose> + </refnamediv> + <refsynopsisdiv> + <cmdsynopsis> + <command>&dhpackage;</command> + + <arg><option>-e <replaceable>this</replaceable></option></arg> + + <arg><option>--example <replaceable>that</replaceable></option></arg> + </cmdsynopsis> + </refsynopsisdiv> + <refsect1> + <title>DESCRIPTION</title> + + <para>This manual page documents briefly the + <command>&dhpackage;</command> and <command>bar</command> + commands.</para> + + <para>This manual page was written for the &debian; distribution + because the original program does not have a manual page. + Instead, it has documentation in the &gnu; + <application>Info</application> format; see below.</para> + + <para><command>&dhpackage;</command> is a program that...</para> + + </refsect1> + <refsect1> + <title>OPTIONS</title> + + <para>These programs follow the usual &gnu; command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. For a complete description, see the + <application>Info</application> files.</para> + + <variablelist> + <varlistentry> + <term><option>-h</option> + <option>--help</option> + </term> + <listitem> + <para>Show summary of options.</para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>-v</option> + <option>--version</option> + </term> + <listitem> + <para>Show version of program.</para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + <refsect1> + <title>SEE ALSO</title> + + <para>bar (1), baz (1).</para> + + <para>The programs are documented fully by <citetitle>The Rise and + Fall of a Fooish Bar</citetitle> available via the + <application>Info</application> system.</para> + </refsect1> + <refsect1> + <title>AUTHOR</title> + + <para>This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). Permission is + granted to copy, distribute and/or modify this document under + the terms of the &gnu; General Public License, Version 2 any + later version published by the Free Software Foundation. + </para> + <para> + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL. + </para> + + </refsect1> +</refentry> + Added: prosistem/alba/trunk/debian/menu.ex =================================================================== --- prosistem/alba/trunk/debian/menu.ex 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/menu.ex 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,2 @@ +?package(alba):needs="X11|text|vc|wm" section="Apps/see-menu-manual"\ + title="alba" command="/usr/bin/alba" Added: prosistem/alba/trunk/debian/postinst =================================================================== --- prosistem/alba/trunk/debian/postinst 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/postinst 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,36 @@ +#!/bin/sh +# postinst script for alba + +set -e + +if [ "$1" = "configure" ]; then + + . /usr/share/debconf/confmodule + db_version 2.0 +fi + +# The following only on a new install +if [ "$1" = "configure" ] && [ "$2" = "" ]; then + + # Configure Apache + db_get alba/reconfigure-webserver + + webservers="$RET" + + for webserver in $webservers; do + webserver=${webserver%,} + if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/alba-apache.conf ]; then + ln -s ../../alba/alba-apache.conf /etc/$webserver/conf.d/alba-apache.conf + fi + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver reload || true + else + /etc/init.d/$webserver reload || true + fi + done + +fi + +exit 0 + + Added: prosistem/alba/trunk/debian/postinst.ex =================================================================== --- prosistem/alba/trunk/debian/postinst.ex 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/postinst.ex 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,41 @@ +#!/bin/sh +# postinst script for alba +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + Added: prosistem/alba/trunk/debian/postrm.ex =================================================================== --- prosistem/alba/trunk/debian/postrm.ex 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/postrm.ex 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,39 @@ +#!/bin/sh +# postrm script for alba +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + Added: prosistem/alba/trunk/debian/preinst.ex =================================================================== --- prosistem/alba/trunk/debian/preinst.ex 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/preinst.ex 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,37 @@ +#!/bin/sh +# preinst script for alba +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <new-preinst> `install' +# * <new-preinst> `install' <old-version> +# * <new-preinst> `upgrade' <old-version> +# * <old-preinst> `abort-upgrade' <new-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + install|upgrade) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + Added: prosistem/alba/trunk/debian/prerm.ex =================================================================== --- prosistem/alba/trunk/debian/prerm.ex 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/prerm.ex 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,40 @@ +#!/bin/sh +# prerm script for alba +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <prerm> `remove' +# * <old-prerm> `upgrade' <new-version> +# * <new-prerm> `failed-upgrade' <old-version> +# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> +# * <deconfigured's-prerm> `deconfigure' `in-favour' +# <package-being-installed> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove|upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + Added: prosistem/alba/trunk/debian/rules =================================================================== --- prosistem/alba/trunk/debian/rules 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/rules 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,49 @@ +#!/usr/bin/make -f +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +REVISION := $(shell head -1 debian/changelog | sed 's/.*(//;s/).*//;s/.*-//') + +build: build-stamp +build-stamp: + dh_testdir + touch build-stamp + +clean: clean-patched + +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp + dh_clean +# debconf-updatepo + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + dh_install +# find debian/alba -name .svn | xargs -r rm -r + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + #dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_installdebconf + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-dependent files here. +binary-arch: + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install Property changes on: prosistem/alba/trunk/debian/rules ___________________________________________________________________ Name: svn:executable + * Added: prosistem/alba/trunk/debian/rules.old =================================================================== --- prosistem/alba/trunk/debian/rules.old 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/rules.old 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,98 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + #docbook-to-man debian/alba.sgml > alba.1 + + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/alba. + # $(MAKE) DESTDIR=$(CURDIR)/debian/alba install + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_python +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure Property changes on: prosistem/alba/trunk/debian/rules.old ___________________________________________________________________ Name: svn:executable + * Added: prosistem/alba/trunk/debian/templates =================================================================== --- prosistem/alba/trunk/debian/templates 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/templates 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,12 @@ +Template: alba/reconfigure-webserver +Type: multiselect +Choices: apache2, apache, apache-ssl, apache-perl +Default: apache2 +_Description: Which web server would you like to reconfigure automatically? + Alba can run on any web server that PHP5 does, but this automatic + configuration process only supports Apache. + +Template: alba/test +Type: string +Default: root +_Description: This is a test! :) Added: prosistem/alba/trunk/debian/watch.ex =================================================================== --- prosistem/alba/trunk/debian/watch.ex 2007-04-30 20:29:21 UTC (rev 4597) +++ prosistem/alba/trunk/debian/watch.ex 2007-05-02 15:43:06 UTC (rev 4598) @@ -0,0 +1,22 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +# Uncomment to examine a Webpage +# <Webpage URL> <string match> +#http://www.example.com/downloads.php alba-(.*)\.tar\.gz + +# Uncomment to examine a Webserver directory +#http://www.example.com/pub/alba-(.*)\.tar\.gz + +# Uncommment to examine a FTP server +#ftp://ftp.example.com/pub/alba-(.*)\.tar\.gz debian uupdate + +# Uncomment to find new files on sourceforge, for debscripts >= 2.9 +# http://sf.net/alba/alba-(.*)\.tar\.gz + +

1 0

tabla nueva...
by josx 02 May '07

02 May '07

Estoy tratando de dar de alta una tabla nueva (rel_rolresponsable_responsable) que me encontre en alba/data/sql/actualizacion_1.0rc_a_1.0.sql. Y me tira un error, alguna idea: #1005 - Can't create table './alba/rel_rolresponsable_responsable.frm' (errno: 150) create en cuestión: CREATE TABLE `rel_rolresponsable_responsable` ( `id` INTEGER NOT NULL AUTO_INCREMENT, `fk_rolresponsable_id` INTEGER default 0 NOT NULL, `fk_responsable_id` INTEGER default 0 NOT NULL, `fk_alumno_id` INTEGER default 0 NOT NULL, `descripcion` VARCHAR(255) default "" NOT NULL, PRIMARY KEY (`id`), INDEX `rel_rolresponsable_responsable_FI_1` (`fk_rolresponsable_id`), CONSTRAINT `rel_rolresponsable_responsable_FK_1` FOREIGN KEY (`fk_rolresponsable_id`) REFERENCES `rol_responsable` (`id`), INDEX `rel_rolresponsable_responsable_FI_2` (`fk_responsable_id`), CONSTRAINT `rel_rolresponsable_responsable_FK_2` FOREIGN KEY (`fk_responsable_id`) REFERENCES `responsable` (`id`), INDEX `rel_rolresponsable_responsable_FI_3` (`fk_alumno_id`), CONSTRAINT `rel_rolresponsable_responsable_FK_3` FOREIGN KEY (`fk_alumno_id`) REFERENCES `alumno` (`id`) )Type=InnoDB; -- Di Biase José Luis Contactos -->[ <http://www.joseluisdibiase.com.ar> - Blog] Contactos -->[ <http://www.interorganic.com.ar/josx/> - Info Personal] "viaja hasta tu ideal, sembra tu flor, labra tu libertad, rega tu voz cerra tus ojos que sobra lugar en idilia para los dos"

1 0