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

Re: [Pressenter - SVN Alba] #83: errores con apache
by Pressenter - SVN Alba 19 Feb '07

19 Feb '07

#83: errores con apache ----------------------------+----------------------------------------------- Reporter: vdifiore | Owner: josx Type: mejora | Status: new Priority: baja | Milestone: version 1.0 Component: alba-installer | Version: 1.0b Severity: normal | Resolution: Keywords: | ----------------------------+----------------------------------------------- Changes (by josx): * milestone: version 1.0rc => version 1.0 -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/83#comment:2> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 0

[Pressenter - SVN Alba] #134: Informar de que usuario se trata
by Pressenter - SVN Alba 19 Feb '07

19 Feb '07

#134: Informar de que usuario se trata --------------------------+------------------------------------------------- Reporter: verox | Owner: somebody Type: defecto | Status: new Priority: normal | Milestone: Component: alba-usuario | Version: Severity: normal | Keywords: --------------------------+------------------------------------------------- Al editar los permisos de los usuarios, la pantalla no informa qué usuario estamos editando y se presta a confusión. (Hay que agregarlo, como se hizo en cuenta). -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/134> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 1

SVN Alba r4247 - in prosistem/alba/trunk: . alba/apps/principal/modules/usuario/actions alba/apps/principal/modules/usuario/templates
by commits＠pressenter.com.ar 19 Feb '07

19 Feb '07

Author: josx Date: 2007-02-19 12:27:30 -0300 (Mon, 19 Feb 2007) New Revision: 4247 Modified: prosistem/alba/trunk/alba/apps/principal/modules/usuario/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/usuario/templates/editPermisoSuccess.php prosistem/alba/trunk/index.php Log: Se sumo el Nombre de usuario al dar de alta permisos para el (ticket #134) Modified: prosistem/alba/trunk/alba/apps/principal/modules/usuario/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/usuario/actions/actions.class.php 2007-02-16 21:16:33 UTC (rev 4246) +++ prosistem/alba/trunk/alba/apps/principal/modules/usuario/actions/actions.class.php 2007-02-19 15:27:30 UTC (rev 4247) @@ -157,6 +157,8 @@ $optionsRol[$rol->getId()] = $rol->getNombre(); } $this->optionsRol = $optionsRol; + + $this->usuario = UsuarioPeer::retrieveByPk($this->getRequestParameter('id')); } function executeSavePermiso() { Modified: prosistem/alba/trunk/alba/apps/principal/modules/usuario/templates/editPermisoSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/usuario/templates/editPermisoSuccess.php 2007-02-16 21:16:33 UTC (rev 4246) +++ prosistem/alba/trunk/alba/apps/principal/modules/usuario/templates/editPermisoSuccess.php 2007-02-19 15:27:30 UTC (rev 4247) @@ -5,7 +5,7 @@ } </script> -<h1>Permisos por Usuario</h1> +<h1>Permisos por Usuario (<?=$usuario->getUsuario()?>) </h1> <br> <?php echo form_tag('usuario/savePermiso', 'onSubmit="selectItem()"')?> Rol: <?php echo select_tag('rolId', options_for_select($optionsRol, $sf_params->get('rolId')), 'onChange=linkTo()'); ?><br><br> Modified: prosistem/alba/trunk/index.php =================================================================== --- prosistem/alba/trunk/index.php 2007-02-16 21:16:33 UTC (rev 4246) +++ prosistem/alba/trunk/index.php 2007-02-19 15:27:30 UTC (rev 4247) @@ -22,10 +22,10 @@ * instalador * * @package alba - * @author Jos� Luis Di Biase <josx(a)interorganic.com.ar> - * @author H�ctor Sanchez <hsanchez(a)pressenter.com.ar> + * @author José Luis Di Biase <josx(a)interorganic.com.ar> + * @author Héctor Sanchez <hsanchez(a)pressenter.com.ar> * @author Fernando Toledo <ftoledo(a)pressenter.com.ar> - * @version SVN: $Id: actions.class.php 3904 2006-12-18 18:30:24Z hsanchez $ + * @version SVN: $Id$ * @filesource * @license GPL */ @@ -230,10 +230,10 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/2000/REC-xhtml1-200000126/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> + <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <meta name="title" content="Proyecto ALBA" /> <meta name="robots" content="index, follow" /> - <meta name="description" content="Proyecto de Gesti�n Educativa ALBA" /> + <meta name="description" content="Proyecto de Gestión Educativa ALBA" /> <meta name="keywords" content="alba, proyecto, software libre, educacion" /> <meta name="language" content="es" /> <title>Proyecto ALBA</title> Property changes on: prosistem/alba/trunk/index.php ___________________________________________________________________ Name: svn:keywords - "Id Author URL Date Rev" + Id Date Author Rev URL

1 0

SVN Alba r4246 - in prosistem/alba/trunk/alba/apps/principal/modules/calendario: actions templates
by commits＠pressenter.com.ar 16 Feb '07

16 Feb '07

Author: josx Date: 2007-02-16 18:16:33 -0300 (Fri, 16 Feb 2007) New Revision: 4246 Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/indexSuccess.php Log: Mejor al calendario 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-02-16 21:12:22 UTC (rev 4245) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-02-16 21:16:33 UTC (rev 4246) @@ -168,6 +168,7 @@ $actividad_id = ""; $optionsActividad = array(); $horasMateriasTodas = array(); + $anio_id = ""; /* $criteria = new Criteria(); @@ -191,13 +192,6 @@ $establecimiento_id = $this->getUser()->getAttribute('fk_establecimiento_id'); $this->establecimiento_id = $establecimiento_id; - $optionsActividad[""] = ""; - $criteria = new Criteria(); - $actividades = ActividadPeer::doSelect($criteria); - foreach($actividades as $actividad) { - $optionsActividad[$actividad->getId()] = $actividad->getNombre(); - } - $this->optionsActividad = $optionsActividad; /* $criteria = new Criteria(); $criteria->add(CiclolectivoPeer::FK_ESTABLECIMIENTO_ID, $establecimiento_id); @@ -273,8 +267,10 @@ $horarioescolares = $this->getHorarioEscolar($establecimiento_id, $turnos_id); $criteria = new Criteria(); + $criteria->add(DivisionPeer::FK_TURNOS_ID, $turnos_id); $criteria->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $establecimiento_id); - $divisiones = DivisionPeer::doSelectJoinAnio($criteria); + $criteria->addJoin(AnioPeer::ID, DivisionPeer::FK_ANIO_ID); + $divisiones = DivisionPeer::doSelect($criteria); $optionsDivision = array(); foreach($divisiones as $division) { @@ -293,6 +289,8 @@ $this->horasMaterias = $this->getHorasMaterias($aAnio[$this->division_id], $actividad_id); $this->getUser()->setAttribute('anio_id', $aAnio[$this->division_id]); $this->getUser()->setAttribute('division_id', $this->division_id); + $this->turnos_id = $turnos_id; + $anio_id = $aAnio[$this->division_id]; } else { $this->aHour = array(strtotime("8:00"), strtotime("17:00")); $this->time_interval = 15; @@ -352,7 +350,20 @@ $this->aEvent = $this->cargarItemCalendario($this->division_id, $aEvent, $horasMateriasTodas ); $this->getUser()->setAttribute('event', $aEvent); - } + } + + $optionsActividad[""] = ""; + $criteria = new Criteria(); + $criteria->add(ActividadPeer::FK_ESTABLECIMIENTO_ID, $establecimiento_id); + $criteria->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + if($anio_id) { + $criteria->add(RelAnioActividadPeer::FK_ANIO_ID, $anio_id); + } + $actividades = ActividadPeer::doSelect($criteria); + foreach($actividades as $actividad) { + $optionsActividad[$actividad->getId()] = $actividad->getNombre(); + } + $this->optionsActividad = $optionsActividad; } Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/indexSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/indexSuccess.php 2007-02-16 21:12:22 UTC (rev 4245) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/indexSuccess.php 2007-02-16 21:16:33 UTC (rev 4246) @@ -118,7 +118,7 @@ <div class="form-row"> <?php echo label_for('turnos_id', __('Turnos:'), 'class="required" ') ?> - <?php echo select_tag('turnos_id', options_for_select($optionsTurnos)) ?> + <?php echo select_tag('turnos_id', options_for_select($optionsTurnos,$turnos_id),'onChange="javascript:submitForm()"') ?> </div> <!-- @@ -134,7 +134,7 @@ <? if(count($optionsDivision)>0) { ?> <div class="form-row"> <?php echo label_for('division_id', __('Division:'), 'class="required" ') ?> - <?php echo select_tag('division_id', options_for_select($optionsDivision, $division_id),'') ?> + <?php echo select_tag('division_id', options_for_select($optionsDivision, $division_id),'onChange="javascript:submitForm()"') ?> </div> <div class="form-row">

1 0

SVN Alba r4245 - prosistem/alba/trunk/alba/doc
by commits＠pressenter.com.ar 16 Feb '07

16 Feb '07

Author: verox Date: 2007-02-16 18:12:22 -0300 (Fri, 16 Feb 2007) New Revision: 4245 Modified: prosistem/alba/trunk/alba/doc/manual.odt Log: corregido hasta cap. 6. impreso. Nuevo cap 7 Modified: prosistem/alba/trunk/alba/doc/manual.odt =================================================================== (Binary files differ)

1 0

SVN Alba r4244 - in prosistem/alba/trunk/alba/apps/principal/modules/calendario: actions templates
by commits＠pressenter.com.ar 16 Feb '07

16 Feb '07

Author: josx Date: 2007-02-16 17:48:35 -0300 (Fri, 16 Feb 2007) New Revision: 4244 Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/indexSuccess.php Log: Al calendario se le agrego la materia para filtrar (ticket #126) 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-02-16 20:01:02 UTC (rev 4243) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-02-16 20:48:35 UTC (rev 4244) @@ -37,10 +37,13 @@ $this->vista = $this->getRequestParameter('vista'); } - private function getHorasMaterias($anio_id) { + private function getHorasMaterias($anio_id, $actividad_id = 0) { // traigo todos las materias/actividades para un año determinado $criteria = new Criteria(); $criteria->add(RelAnioActividadPeer::FK_ANIO_ID, $anio_id); + if($actividad_id) { + $criteria->add(ActividadPeer::ID, $actividad_id); + } $criteria->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); $criteria->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, RelActividadDocentePeer::FK_ACTIVIDAD_ID, Criteria::LEFT_JOIN); $criteria->addJoin(RelActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID, Criteria::LEFT_JOIN); @@ -59,14 +62,14 @@ // $actividades = RelAnioActividadPeer::doSelectRS($criteria); $actividades = BasePeer::doSelect($criteria); - + $horarios_disponibles = array(); $optionsHorasMaterias = array(); foreach($actividades as $actividad) { if(!$actividad[1]) $actividad[1] = 0; $idx = $actividad[0]."_".$actividad[1]; $docente = $actividad[3]." ".$actividad[2]; - @$horarios_disponibles[$idx] .= $this->horariosATexto($actividad[6], $actividad[7], $actividad[8]); + $horarios_disponibles[$idx] .= $this->horariosATexto($actividad[6], $actividad[7], $actividad[8]); $optionsHorasMaterias[$idx] = (object) array ( 'cantidad' => $actividad[5] , 'nombre' => $actividad[4]." x ".$docente, @@ -75,8 +78,7 @@ ); } -//print_R($optionsHorasMaterias); -return $optionsHorasMaterias; + return $optionsHorasMaterias; } @@ -163,9 +165,10 @@ $this->getUser()->setAttribute('division_id', 0); $this->getUser()->setAttribute('event', array()); - - - + $actividad_id = ""; + $optionsActividad = array(); + $horasMateriasTodas = array(); + /* $criteria = new Criteria(); //$criteria->add(EstablecimientoPeer::IS_LIVE, 1); @@ -188,7 +191,13 @@ $establecimiento_id = $this->getUser()->getAttribute('fk_establecimiento_id'); $this->establecimiento_id = $establecimiento_id; - + $optionsActividad[""] = ""; + $criteria = new Criteria(); + $actividades = ActividadPeer::doSelect($criteria); + foreach($actividades as $actividad) { + $optionsActividad[$actividad->getId()] = $actividad->getNombre(); + } + $this->optionsActividad = $optionsActividad; /* $criteria = new Criteria(); $criteria->add(CiclolectivoPeer::FK_ESTABLECIMIENTO_ID, $establecimiento_id); @@ -212,8 +221,6 @@ $this->ciclolectivo_id = $ciclolectivo_id; - - /* $criteriaT = new Criteria(); $criteriaT->add(TurnosPeer::FK_CICLOLECTIVO_ID, $ciclolectivo_id); $turnos = TurnosPeer::doSelect($criteriaT);*/ @@ -240,6 +247,7 @@ if ($this->getRequest()->getMethod() == sfRequest::POST) { $this->division_id = $this->getRequestParameter('division_id'); + $this->actividad_id = $actividad_id = $this->getRequestParameter('actividad_id'); // $ciclolectivo_id = $this->getRequestParameter('ciclolectivo_id'); // $establecimiento_id = $this->getRequestParameter('establecimiento_id'); @@ -281,7 +289,8 @@ $this->division_id = $eachDivision[0]; // me quedo con el primer indice del array } - $this->horasMaterias = $this->getHorasMaterias($aAnio[$this->division_id]); + $horasMateriasTodas = $this->getHorasMaterias($aAnio[$this->division_id]); + $this->horasMaterias = $this->getHorasMaterias($aAnio[$this->division_id], $actividad_id); $this->getUser()->setAttribute('anio_id', $aAnio[$this->division_id]); $this->getUser()->setAttribute('division_id', $this->division_id); } else { @@ -340,7 +349,7 @@ } - $this->aEvent = $this->cargarItemCalendario($this->division_id, $aEvent, $this->horasMaterias ); + $this->aEvent = $this->cargarItemCalendario($this->division_id, $aEvent, $horasMateriasTodas ); $this->getUser()->setAttribute('event', $aEvent); } @@ -399,7 +408,7 @@ $docente_id = $item->getFkDocenteId(); $var = $name."_".$horarioMaterias_id."_".$docente_id; - @$nombre = "<img src='".sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/sf/images/sf_admin/tick.png' id='".$var."_1' style='position:relative' class='horarioMaterias-items' ><span class='title'>".$horasMaterias[$horarioMaterias_id."_".$docente_id]->nombre."</span> + $nombre = "<img src='".sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/sf/images/sf_admin/tick.png' id='".$var."_1' style='position:relative' class='horarioMaterias-items' ><span class='title'>".$horasMaterias[$horarioMaterias_id."_".$docente_id]->nombre."</span> <script type='text/javascript'> //<![CDATA[ new Draggable('".$var."_1', {revert:1}) Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/indexSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/indexSuccess.php 2007-02-16 20:01:02 UTC (rev 4243) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/templates/indexSuccess.php 2007-02-16 20:48:35 UTC (rev 4244) @@ -134,10 +134,20 @@ <? if(count($optionsDivision)>0) { ?> <div class="form-row"> <?php echo label_for('division_id', __('Division:'), 'class="required" ') ?> - <?php echo select_tag('division_id', options_for_select($optionsDivision, $division_id),'onChange=submitForm()') ?> + <?php echo select_tag('division_id', options_for_select($optionsDivision, $division_id),'') ?> </div> + + <div class="form-row"> + <?php echo label_for('actividad_id', __('Actividad:'), 'class="required" ') ?> + <?php echo select_tag('actividad_id', options_for_select($optionsActividad, $actividad_id),'') ?> + </div> + <?}?> + + + + </fieldset> <ul class="sf_admin_actions"> <li><?php echo submit_tag(__('Mostrar'), array (

1 0

[Pressenter - SVN Alba] #126: Generar horario por sección/división.
by Pressenter - SVN Alba 16 Feb '07

16 Feb '07

#126: Generar horario por sección/división. -----------------------------+---------------------------------------------- Reporter: verox | Owner: somebody Type: defecto | Status: new Priority: normal | Milestone: Component: alba-calendario | Version: 1.0b Severity: normal | Keywords: -----------------------------+---------------------------------------------- Al generar el horario por sección, no permite colocar las actividades. Tampoco define las "zonas" (cuadraditos, josx sic) que estarían indicados al "Definir horario de clases". -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/126> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 2

[Pressenter - SVN Alba] #132: Instalación
by Pressenter - SVN Alba 16 Feb '07

16 Feb '07

#132: Instalación ----------------------------+----------------------------------------------- Reporter: hsanchez | Owner: ftoledo Type: defecto | Status: new Priority: alta | Milestone: version 1.0rc Component: alba-installer | Version: desarollo Severity: normal | Keywords: ----------------------------+----------------------------------------------- Al probar la instalación, los pasos varian si bajamos la verioón de desarrollo por svn, ya que al descargar aparece el directorio trunk. Igual, si sigo instalando al ingresar la base de datos, falla: ERROR 1452 (23000) at line 123: Cannot add or update a child row: a foreign key constraint fails (`alba/establecimiento`, CONSTRAINT `establecimiento_FK_1` FOREIGN KEY (`fk_niveltipo_id`) REFERENCES `niveltipo` (`id`)) -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/132> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 4

SVN Alba r4243 - prosistem/alba/trunk/alba/apps/principal/lib
by commits＠pressenter.com.ar 16 Feb '07

16 Feb '07

Author: ftoledo Date: 2007-02-16 17:01:02 -0300 (Fri, 16 Feb 2007) New Revision: 4243 Removed: prosistem/alba/trunk/alba/apps/principal/lib/myUser.class.php Log: cambiando clase de usuario Deleted: prosistem/alba/trunk/alba/apps/principal/lib/myUser.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/lib/myUser.class.php 2007-02-16 20:00:22 UTC (rev 4242) +++ prosistem/alba/trunk/alba/apps/principal/lib/myUser.class.php 2007-02-16 20:01:02 UTC (rev 4243) @@ -1,31 +0,0 @@ -<?php - -class myUser extends sfBasicSecurityUser -{ - public function getEstablecimientos() { - - $establecimientos = array(); - $e = EstablecimientoPeer::retrieveByPk($this->getAttribute('fk_establecimiento_id')); - array_push($establecimientos,$e); - return $establecimientos; - - - - } - - /** - * obtiene el tema del la interfaz del usuario - */ - public function getTheme() { - return $this->getAttribute('theme'); - } - - /** - * Asigna un tema al usuario - */ - public function setTheme($theme) { - $this->setAttribute('theme',$theme); - } -} - -?> \ No newline at end of file

1 0

SVN Alba r4242 - in prosistem/alba/trunk/alba: apps/principal/config apps/principal/lib apps/principal/modules/responsable/actions data/sql
by commits＠pressenter.com.ar 16 Feb '07

16 Feb '07

Author: ftoledo Date: 2007-02-16 17:00:22 -0300 (Fri, 16 Feb 2007) New Revision: 4242 Added: prosistem/alba/trunk/alba/apps/principal/lib/albaUser.class.php prosistem/alba/trunk/alba/apps/principal/lib/albaUtf8ConnectionFilter.class.php Modified: prosistem/alba/trunk/alba/apps/principal/config/factories.yml prosistem/alba/trunk/alba/apps/principal/config/filters.yml prosistem/alba/trunk/alba/apps/principal/lib/albaUsuarioValidator.class.php prosistem/alba/trunk/alba/apps/principal/modules/responsable/actions/actions.class.php prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.sql Log: mas unicode Modified: prosistem/alba/trunk/alba/apps/principal/config/factories.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/config/factories.yml 2007-02-16 18:54:02 UTC (rev 4241) +++ prosistem/alba/trunk/alba/apps/principal/config/factories.yml 2007-02-16 20:00:22 UTC (rev 4242) @@ -16,7 +16,7 @@ # class: myWebRequest # user: - class: myUser + class: albaUser # # storage: # class: sfSessionStorage Modified: prosistem/alba/trunk/alba/apps/principal/config/filters.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/config/filters.yml 2007-02-16 18:54:02 UTC (rev 4241) +++ prosistem/alba/trunk/alba/apps/principal/config/filters.yml 2007-02-16 20:00:22 UTC (rev 4242) @@ -0,0 +1,5 @@ +# filtro par conectar en utf8 al servidor de bases de datos(mysql) + +albaUtf8ConnectionFilter: + class: albaUtf8ConnectionFilter + activate: on \ No newline at end of file Copied: prosistem/alba/trunk/alba/apps/principal/lib/albaUser.class.php (from rev 4184, prosistem/alba/trunk/alba/apps/principal/lib/myUser.class.php) =================================================================== --- prosistem/alba/trunk/alba/apps/principal/lib/myUser.class.php 2007-02-12 21:00:45 UTC (rev 4184) +++ prosistem/alba/trunk/alba/apps/principal/lib/albaUser.class.php 2007-02-16 20:00:22 UTC (rev 4242) @@ -0,0 +1,31 @@ +<?php + +class albaUser extends sfBasicSecurityUser +{ + public function getEstablecimientos() { + + $establecimientos = array(); + $e = EstablecimientoPeer::retrieveByPk($this->getAttribute('fk_establecimiento_id')); + array_push($establecimientos,$e); + return $establecimientos; + + + + } + + /** + * obtiene el tema del la interfaz del usuario + */ + public function getTheme() { + return $this->getAttribute('theme'); + } + + /** + * Asigna un tema al usuario + */ + public function setTheme($theme) { + $this->setAttribute('theme',$theme); + } +} + +?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/lib/albaUsuarioValidator.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/lib/albaUsuarioValidator.class.php 2007-02-16 18:54:02 UTC (rev 4241) +++ prosistem/alba/trunk/alba/apps/principal/lib/albaUsuarioValidator.class.php 2007-02-16 20:00:22 UTC (rev 4242) @@ -24,8 +24,8 @@ * albaUsuarioValidator valida el usuario. * * @package alba - * @author Jos� Luis Di Biase <josx(a)interorganic.com.ar> - * @author H�ctor Sanchez <hsanchez(a)pressenter.com.ar> + * @author José Luis Di Biase <josx(a)interorganic.com.ar> + * @author Héctor Sanchez <hsanchez(a)pressenter.com.ar> * @author Fernando Toledo <ftoledo(a)pressenter.com.ar> * @version SVN: $Id$ * @filesource Added: prosistem/alba/trunk/alba/apps/principal/lib/albaUtf8ConnectionFilter.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/lib/albaUtf8ConnectionFilter.class.php 2007-02-16 18:54:02 UTC (rev 4241) +++ prosistem/alba/trunk/alba/apps/principal/lib/albaUtf8ConnectionFilter.class.php 2007-02-16 20:00:22 UTC (rev 4242) @@ -0,0 +1,50 @@ +<?php + +/** + * This file is part of Alba. + * + * Alba is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Alba is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Alba; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + + +/** + * Fix para tener soporte de utf8 en symfony 0.6.3 + * + * @package alba + * @author José Luis Di Biase <josx(a)interorganic.com.ar> + * @author Héctor Sanchez <hsanchez(a)pressenter.com.ar> + * @author Fernando Toledo <ftoledo(a)pressenter.com.ar> + * @version SVN: $Id$ + * @filesource + * @license GPL + */ + + + +class albaUtf8ConnectionFilter extends sfFilter +{ + public function execute($filterChain) + { + $con = Propel::getConnection(); + if ($con){ + $con->executeQuery("set names utf8"); + } else { + throw new Exception($e); + } + $filterChain->execute(); + } +} +?> Property changes on: prosistem/alba/trunk/alba/apps/principal/lib/albaUtf8ConnectionFilter.class.php ___________________________________________________________________ Name: svn:keywords + Id Date Author Rev URL Modified: prosistem/alba/trunk/alba/apps/principal/modules/responsable/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/responsable/actions/actions.class.php 2007-02-16 18:54:02 UTC (rev 4241) +++ prosistem/alba/trunk/alba/apps/principal/modules/responsable/actions/actions.class.php 2007-02-16 20:00:22 UTC (rev 4242) @@ -146,7 +146,15 @@ $this->responsable->setAutorizacionRetiro(isset($responsable['autorizacion_retiro']) ? $responsable['autorizacion_retiro'] : 0); } - + + function executeIrCuenta() { + //Obtener el id de cuenta. + + $c = new Criteria(); + $c->add(ResponsablePeer::ID, $this->getRequestParameter('id')); + $Resp = ResponsablePeer::doSelectOne($c); + return $this->redirect('cuenta/verCompleta?id='.$Resp->getFkCuentaId()); + } } ?> Modified: prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.sql 2007-02-16 18:54:02 UTC (rev 4241) +++ prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.sql 2007-02-16 20:00:22 UTC (rev 4242) @@ -46,7 +46,7 @@ (29, '-', '#', '', 10, 50, ''), (30, 'Salir', 'seguridad/logout', '', 1, 90, ''), (31, 'Definir Escala de notas', 'escalanota', 'escalanota', 84, 30, ''), -(32, 'Definir Categorías del Bolet�iacute;n de Concepto', 'concepto', 'concepto', 84, 50, ''), +(32, 'Definir Categorías del Boletín de Concepto', 'concepto', 'concepto', 84, 50, ''), (33, 'Buscar Alumno para...', 'legajopedagogico', 'legajopedagogico', 4, 20, ''), (34, 'Tipos de entrada al legajo pedagógico', 'legajocategoria', 'legajocategoria', 84, 40, ''), (35, 'Ingresar Nuevo', 'alumno/create', 'alumno', 4, 0, ''),

1 0