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

SVN Alba r4916 - prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates
by commits＠pressenter.com.ar 06 Aug '07

06 Aug '07

Author: ftoledo Date: 2007-08-06 13:02:44 -0300 (Mon, 06 Aug 2007) New Revision: 4916 Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_filtro_fk_division_id.php Log: turnos Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_filtro_fk_division_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_filtro_fk_division_id.php 2007-08-06 15:48:54 UTC (rev 4915) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_filtro_fk_division_id.php 2007-08-06 16:02:44 UTC (rev 4916) @@ -1,7 +1,7 @@ <?php $c = new Criteria(); $c->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $sf_user->getAttribute('fk_establecimiento_id')); - $c->add(TurnosPeer::FK_CICLOLECTIVO_ID, $sf_user->getAttribute('fk_ciclolectivo_id')); + $c->add(TurnoPeer::FK_CICLOLECTIVO_ID, $sf_user->getAttribute('fk_ciclolectivo_id')); $c->addJoin(AnioPeer::ID,DivisionPeer::FK_ANIO_ID); $c->addJoin(TurnoPeer::ID,DivisionPeer::FK_TURNO_ID);

1 0

SVN Alba r4915 - prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions
by commits＠pressenter.com.ar 06 Aug '07

06 Aug '07

Author: ftoledo Date: 2007-08-06 12:48:54 -0300 (Mon, 06 Aug 2007) New Revision: 4915 Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php Log: mas turnosssssssssssss Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-08-06 15:45:53 UTC (rev 4914) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-08-06 15:48:54 UTC (rev 4915) @@ -146,7 +146,7 @@ // trayendo datos necesarios $division = DivisionPeer::retrieveByPK($division_id); - $aHoras = $this->getHorarioEscolar($establecimiento_id, $division->getFkTurnosId() ,1); + $aHoras = $this->getHorarioEscolar($establecimiento_id, $division->getFkTurnoId() ,1); $criteria = new Criteria(); $criteria->add(RelDivisionActividadDocentePeer::FK_DIVISION_ID, $division_id); @@ -158,13 +158,13 @@ $this->division = $division; } - protected function getHorarioEscolar($establecimiento_id = 0, $turnos_id = 0, $orden = 0) { + protected function getHorarioEscolar($establecimiento_id = 0, $turno_id = 0, $orden = 0) { $criteria = new Criteria(); if($establecimiento_id) { $criteria->add(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, $establecimiento_id); } - if($turnos_id) { - $criteria->add(HorarioescolarPeer::FK_TURNO_ID, $turnos_id); + if($turno_id) { + $criteria->add(HorarioescolarPeer::FK_TURNO_ID, $turno_id); } if($orden) {

1 0

SVN Alba r4914 - prosistem/alba/trunk/alba/lib/model
by commits＠pressenter.com.ar 06 Aug '07

06 Aug '07

Author: ftoledo Date: 2007-08-06 12:45:53 -0300 (Mon, 06 Aug 2007) New Revision: 4914 Modified: prosistem/alba/trunk/alba/lib/model/Turno.php Log: __toStrign() Modified: prosistem/alba/trunk/alba/lib/model/Turno.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/Turno.php 2007-08-06 15:31:24 UTC (rev 4913) +++ prosistem/alba/trunk/alba/lib/model/Turno.php 2007-08-06 15:45:53 UTC (rev 4914) @@ -9,4 +9,8 @@ */ class Turno extends BaseTurno { + public function __toString() { + return $this->getDescripcion(); + } + }

1 0

SVN Alba r4913 - in prosistem/alba/trunk/alba: apps/principal/modules/relAlumnoDivision/templates lib/model/om
by commits＠pressenter.com.ar 06 Aug '07

06 Aug '07

Author: josx Date: 2007-08-06 12:31:24 -0300 (Mon, 06 Aug 2007) New Revision: 4913 Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php prosistem/alba/trunk/alba/lib/model/om/BaseTurno.php Log: Arreglos extras de la modificacion de las tablas turnos Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php 2007-08-03 21:10:17 UTC (rev 4912) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php 2007-08-06 15:31:24 UTC (rev 4913) @@ -1,7 +1,7 @@ <?php $c = new Criteria(); $c->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $sf_user->getAttribute('fk_establecimiento_id')); - $c->add(TurnosPeer::FK_CICLOLECTIVO_ID, $sf_user->getAttribute('fk_ciclolectivo_id')); + $c->add(TurnoPeer::FK_CICLOLECTIVO_ID, $sf_user->getAttribute('fk_ciclolectivo_id')); $c->addJoin(AnioPeer::ID,DivisionPeer::FK_ANIO_ID); $c->addJoin(TurnoPeer::ID,DivisionPeer::FK_TURNO_ID); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTurno.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTurno.php 2007-08-03 21:10:17 UTC (rev 4912) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTurno.php 2007-08-06 15:31:24 UTC (rev 4913) @@ -25,7 +25,7 @@ - protected $descripcion = 'null'; + protected $descripcion; protected $aCiclolectivo; @@ -187,7 +187,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = TurnoPeer::DESCRIPCION; }

1 0

usando svk
by Fernando Toledo 03 Aug '07

03 Aug '07

Hola estoy haciendo pruebas con el svk estoy poniendo en wiki la experiencia: http://alba.pressenter.com.ar/cgi-bin/trac.cgi/wiki/TrabajandoConSVK -- Dock Sud BBS http://www.docksud.com.ar telnet://bbs.docksud.com.ar

3 4

errata de links
by Fernando Toledo 02 Aug '07

02 Aug '07

Hola los borradores que pase (en del instalador y el del svk) están aca: http://alba.pressenter.com.ar/cgi-bin/trac.cgi/wiki/Borradores cambie los nombres de las paginas asi quedan CamelCase para josx: caso camello =) -- Dock Sud BBS http://www.docksud.com.ar telnet://bbs.docksud.com.ar

1 0

SVN Alba r4908 - prosistem/alba/trunk/alba/data/sql
by commits＠pressenter.com.ar 01 Aug '07

01 Aug '07

Author: sabino Date: 2007-08-01 18:26:26 -0300 (Wed, 01 Aug 2007) New Revision: 4908 Modified: prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0rc2.sql Log: cambios de la estructura de la base de datos como consecuencia del acambio de nombre del modulo turnos a turno Modified: prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0rc2.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0rc2.sql 2007-08-01 21:09:17 UTC (rev 4907) +++ prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0rc2.sql 2007-08-01 21:26:26 UTC (rev 4908) @@ -87,4 +87,23 @@ ALTER TABLE `docente_horario` ADD CONSTRAINT `docente_horario_FK_2` FOREIGN KEY (`fk_evento_id`) REFERENCES `evento` (`id`) ON DELETE CASCADE; SET FOREIGN_KEY_CHECKS = 1; - \ No newline at end of file + + +## modificacion del cambio de nombre de turnos a turno + +RENAME TABLE `turnos` to `turno`; +ALTER TABLE `turno` DROP FOREIGN KEY `turnos_FK_1`; +ALTER TABLE `turno` ADD CONTRAINT `turno_FK_1` FOREING KEY (`fk_ciclolectivo_id`) REFERENCES `cilolectivo` (`id`); + +ALTER TABLE DROP FOREINGN KEY `division_FK_2`; +ALTER TABLE `division` CHANGE `fk_turnos_id` `fk_turno_id` INTEGER(11) default 0 NOT NULL; +ALTER TABLE ADD CONSTRAINT `division_FK_2` + FOREIGN KEY (`fk_turno_id`) + REFERENCES `turno` (`id`); + +ALTER TABLE `horarioescolar` DROP FOREINGN KEY `horarioescolar_FK_3`; +ALTER TABLE `horarioescolar` CHANGE `fk_turnos_id` `fk_turno_id` INTEGER default 0 NOT NULL; +ALTER TABLE `horarioescolar` CONSTRAINT `horarioescolar_FK_3` + FOREIGN KEY (`fk_turnos_id`) + REFERENCES `turnos` (`id`); +

1 0

SVN Alba r4907 - prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates
by commits＠pressenter.com.ar 01 Aug '07

01 Aug '07

Author: hsanchez Date: 2007-08-01 18:09:17 -0300 (Wed, 01 Aug 2007) New Revision: 4907 Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/_buscarCuenta.php prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/_verCuenta.php prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php Log: Corriendo vistas en los alumnos Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/_buscarCuenta.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/_buscarCuenta.php 2007-08-01 20:57:43 UTC (rev 4906) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/_buscarCuenta.php 2007-08-01 21:09:17 UTC (rev 4907) @@ -1,4 +1,4 @@ <?php use_helper('Javascript') ?> <?php echo input_tag('txt_cuenta') ?> -<?php echo submit_to_remote('ajax_submit', 'Buscar cuenta', array('update' => 'item_list', 'url' => 'alumno/buscar?vista=noMuestraMenu',)) ?> -<div id="item_list"></div> \ No newline at end of file +<?php echo submit_to_remote('ajax_submit', 'Buscar cuenta', array('update' => 'item_list', 'url' => 'alumno/buscar',)) ?> +<div id="item_list"></div> Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/_verCuenta.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/_verCuenta.php 2007-08-01 20:57:43 UTC (rev 4906) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/_verCuenta.php 2007-08-01 21:09:17 UTC (rev 4907) @@ -3,6 +3,6 @@ <table cellspacing="0" width="30%"> <tr class="sf_admin_row_1"> <td><?php echo $cuenta_nombre; ?></td> - <td><?php echo link_to_remote('Cambiar', array('update' => 'cuenta', 'url' => 'alumno/cambiarCuenta?vista=noMuestraMenu' )); ?></td> + <td><?php echo link_to_remote('Cambiar', array('update' => 'cuenta', 'url' => 'alumno/cambiarCuenta' )); ?></td> </tr> -</table> \ No newline at end of file +</table> Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php 2007-08-01 20:57:43 UTC (rev 4906) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php 2007-08-01 21:09:17 UTC (rev 4907) @@ -345,7 +345,7 @@ <? } ?> </div> </div> - <br><?php echo link_to_remote('Nueva Cuenta', array('update' => 'nueva_cuenta', 'url' => 'alumno/nuevaCuenta?vista=noMuestraMenu' )); ?> + <br><?php echo link_to_remote('Nueva Cuenta', array('update' => 'nueva_cuenta', 'url' => 'alumno/nuevaCuenta' )); ?> </div> </fieldset> @@ -369,4 +369,4 @@ <?php include_partial('alumno/edit_footer', array('alumno' => $alumno)) ?> </div> <div id="nueva_cuenta"></div> -</div> \ No newline at end of file +</div>

1 0

SVN Alba r4906 - prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates
by commits＠pressenter.com.ar 01 Aug '07

01 Aug '07

Author: hsanchez Date: 2007-08-01 17:57:43 -0300 (Wed, 01 Aug 2007) New Revision: 4906 Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/buscarSuccess.php Log: Corrigiendo Bug No Reportado al seleccionar cuenta Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/buscarSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/buscarSuccess.php 2007-08-01 20:43:17 UTC (rev 4905) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/buscarSuccess.php 2007-08-01 20:57:43 UTC (rev 4906) @@ -2,11 +2,9 @@ if(strlen($txt_cuenta) > 3) { ?> <?php use_helper('Javascript') ?> - <?php $tr_class = true; if(count($aCuentas) > 0) { - ?> <table cellspacing="0" class="sf_admin_list"> <thead> @@ -16,14 +14,14 @@ </tr> </thead> <tbody> -<? +<?php foreach($aCuentas as $cuenta) { $tr_class = ! $tr_class; $numero = ($tr_class)?1:0; ?> <tr class="sf_admin_row_<?php echo $numero;?>"> - <td><?php echo label_for('cuenta', __($cuenta->getNombre()), ''); ?></td> - <td><?php echo link_to_remote('Seleccionar', array ( 'update' => 'cuenta', 'url' => 'alumno/seleccionarCuenta?vista=noMuestraMenu&id='.$cuenta->getId()));?></td> + <td><?php echo label_for('cuenta',$cuenta->getNombre()) ?></td> + <td><?php echo link_to_remote('Seleccionar', array ( 'update' => 'cuenta', 'url' => 'alumno/seleccionarCuenta?id='.$cuenta->getId()));?></td> </tr> <?php } @@ -37,4 +35,4 @@ } else { echo "Debe buscar con mas de 3 caracteres"; } -?> \ No newline at end of file +?>

1 0

SVN Alba r4905 - prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions
by commits＠pressenter.com.ar 01 Aug '07

01 Aug '07

Author: hsanchez Date: 2007-08-01 17:43:17 -0300 (Wed, 01 Aug 2007) New Revision: 4905 Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php Log: Asignando el parametro de la funcion a la variable Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-08-01 20:32:46 UTC (rev 4904) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-08-01 20:43:17 UTC (rev 4905) @@ -32,7 +32,6 @@ class calendarioActions extends sfActions { - /** * Executes index action * @@ -69,7 +68,6 @@ if(count($aDocente) == 1) { $this->redirect( 'calendario/horarioSegunDocente?id='.$aDocente[0]->getId()); } - } // asignando variables para ser usadas en el template @@ -78,7 +76,6 @@ $this->aDocente = $aDocente; } - function getEventos($aRes, $vista) { include("miExportadorIcal.class.php"); $e = new miExportadorIcal(); @@ -96,15 +93,13 @@ default: $view = 'verPorDia'; } } else { - $view = "verPorSemana"; + $view = $vista; } return array($view, $archivo, $date_component); } - - public function executeHorarioSegunDocente() { // tomando los datos del formulario $docente_id = $this->getRequestParameter('id'); @@ -125,10 +120,6 @@ $this->docente = $docente; } - - - - public function executeBusquedaDivision() { // inicializando variables $aDivision = array(); @@ -142,12 +133,11 @@ $criteria = new Criteria(); $criteria->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $establecimiento_id); $divisiones = DivisionPeer::doSelectJoinAnio($criteria); - + // asignando variables para ser usadas en el template $this->aDivision = $divisiones; } - public function executeHorarioSegunDivision() { // tomando los datos del formulario @@ -158,7 +148,6 @@ $division = DivisionPeer::retrieveByPK($division_id); $aHoras = $this->getHorarioEscolar($establecimiento_id, $division->getFkTurnosId() ,1); - $criteria = new Criteria(); $criteria->add(RelDivisionActividadDocentePeer::FK_DIVISION_ID, $division_id); $aEvento = RelDivisionActividadDocentePeer::doSelect($criteria); @@ -189,6 +178,5 @@ public function handleErrorIndex() { $this->redirect('calendario'); } - } ?>

1 0