- Alba-desarrollo - lists.ourproject.org

SVN Alba r5868 - prosistem/alba/trunk/alba/apps/principal/modules/organizacion/validate
by commits＠pressenter.com.ar 04 Sep '08

04 Sep '08

Author: josx Date: 2008-09-03 22:16:44 -0300 (Wed, 03 Sep 2008) New Revision: 5868 Modified: prosistem/alba/trunk/alba/apps/principal/modules/organizacion/validate/edit.yml Log: El CUIT ya no es obligatorio para la organizacion (esto no permitia usar sin cargar uno cuit valido) Modified: prosistem/alba/trunk/alba/apps/principal/modules/organizacion/validate/edit.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/organizacion/validate/edit.yml 2008-09-03 23:34:28 UTC (rev 5867) +++ prosistem/alba/trunk/alba/apps/principal/modules/organizacion/validate/edit.yml 2008-09-04 01:16:44 UTC (rev 5868) @@ -35,8 +35,7 @@ validators: caracteresMaximos128 organizacion{cuit}: - required: Yes - required_msg: El campo CUIT es obligatorio + required: No validators: caracteresMaximos13, validaCuit organizacion{ciudad}: @@ -111,4 +110,4 @@ nan_error: Seleccione un tipo iva válido min: 1 min_error: Seleccione una tipo iva válido - \ No newline at end of file +

1 0

SVN Alba r5866 - prosistem/alba/trunk/alba/data/sql
by commits＠pressenter.com.ar 03 Sep '08

03 Sep '08

Author: hsanchez Date: 2008-09-03 19:04:13 -0300 (Wed, 03 Sep 2008) New Revision: 5866 Modified: prosistem/alba/trunk/alba/data/sql/datos_desde_cero.sql prosistem/alba/trunk/alba/data/sql/datos_ejemplo.sql Log: Cambiando datos por defecto, el mail del admin no valida al grabar Modified: prosistem/alba/trunk/alba/data/sql/datos_desde_cero.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/datos_desde_cero.sql 2008-09-03 12:26:07 UTC (rev 5865) +++ prosistem/alba/trunk/alba/data/sql/datos_desde_cero.sql 2008-09-03 22:04:13 UTC (rev 5866) @@ -121,7 +121,7 @@ -- INSERT INTO usuario (id, usuario, clave, correo_publico, email, activo, fecha_creado, fecha_actualizado, seguridad_pregunta, seguridad_respuesta, fk_establecimiento_id, borrado) -VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', true, 'admin@localhost', true, '2006-12-03 00:00:00', '2006-12-03 00:00:00', 'usuario por defecto', 'adminsitrador', 1, false); +VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', true, 'admin(a)midominio.com', true, '2006-12-03 00:00:00', '2006-12-03 00:00:00', 'usuario por defecto', 'adminsitrador', 1, false); -- -- Volcar la base de datos para la tabla 'modulo' Modified: prosistem/alba/trunk/alba/data/sql/datos_ejemplo.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/datos_ejemplo.sql 2008-09-03 12:26:07 UTC (rev 5865) +++ prosistem/alba/trunk/alba/data/sql/datos_ejemplo.sql 2008-09-03 22:04:13 UTC (rev 5866) @@ -281,9 +281,9 @@ -- Volcar la base de datos para la tabla usuario -- -INSERT INTO usuario (id, usuario, clave, correo_publico, email, activo, fecha_creado, fecha_actualizado, seguridad_pregunta, seguridad_respuesta, fk_establecimiento_id, borrado) VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', true, 'admin(a)proyectoalba.com.ar', true, '2006-12-03 00:00:00', '2006-12-03 00:00:00', 'usuario por defecto', 'adminsitrador', 1, false); +INSERT INTO usuario (id, usuario, clave, correo_publico, email, activo, fecha_creado, fecha_actualizado, seguridad_pregunta, seguridad_respuesta, fk_establecimiento_id, borrado) VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', true, 'admin(a)midominio.com', true, '2006-12-03 00:00:00', '2006-12-03 00:00:00', 'usuario por defecto', 'adminsitrador', 1, false); INSERT INTO usuario (id, usuario, clave, correo_publico, email, activo, fecha_creado, fecha_actualizado, seguridad_pregunta, seguridad_respuesta, fk_establecimiento_id, borrado) VALUES (2, 'Secretaria', 'fd09accffacf03d7393c2a23a9601b43', true, 'sec(a)primarias.com', true, '2007-01-03 00:00:00', '2007-01-03 17:56:31', 'Estado civil.', 'Casada', 1, false); -INSERT INTO usuario (id, usuario, clave, correo_publico, email, activo, fecha_creado, fecha_actualizado, seguridad_pregunta, seguridad_respuesta, fk_establecimiento_id, borrado) VALUES (3, 'Directora ', '3d591289c636292b8bf34ed929e666ef', true, 'directora(a)escuela.org', true, '2007-01-29 00:00:00', '2007-01-29 14:29:13', 'Cómo se llama mi abuela? ', 'margarita', 1, false); +INSERT INTO usuario (id, usuario, clave, correo_publico, email, activo, fecha_creado, fecha_actualizado, seguridad_pregunta, seguridad_respuesta, fk_establecimiento_id, borrado) VALUES (3, 'Directora ', '3d591289c636292b8bf34ed929e666ef', true, 'directora(a)miescuela.net', true, '2007-01-29 00:00:00', '2007-01-29 14:29:13', 'Cómo se llama mi abuela? ', 'margarita', 1, false); INSERT INTO usuario (id, usuario, clave, correo_publico, email, activo, fecha_creado, fecha_actualizado, seguridad_pregunta, seguridad_respuesta, fk_establecimiento_id, borrado) VALUES (4, 'Carla Herrera', 'c893bad68927b457dbed39460e6afd62', true, 'carla.herrera(a)gmail.com', true, '2007-02-19 00:00:00', '2007-02-19 11:26:54', 'Cómo se llama mi novio?', 'Martiniano', 1, false);

1 0

[Pressenter - SVN Alba] #283: 생활지혜
by Pressenter - SVN Alba 03 Aug '08

03 Aug '08

#283: 생활지혜 ---------------------+------------------------------------------------------ Reporter: 생활지혜 | Owner: somebody Type: defecto | Status: new Priority: normal | Milestone: Component: alba | Version: 1.0rc Severity: normal | Keywords: ---------------------+------------------------------------------------------ ● 볼펜자국은 물파스로 지운다. 볼펜자국 위에 물파스를 가볍게 두드리면 바로 지워지고, 또 알콜 적신 거즈로 얼룩진 부분을 두드리듯 닦아내도 말끔하게 지워진다. ● 커피 홍차 사이다 주스 얼룩 커피와 홍차는 당분이 포함되지 않은 탄산수를 거즈에 묻혀 두드리고, 사이다와 주스는 얼룩이 진 즉시 묽은 소금물에 거즈를 적셔 두드린다. ● 버터의 얼룩 비눗물로 닦아낸 다음, 기름기가 남아 있는 부분을 벤젠으로 두드리듯이 닦아낸다. ● 계란의 얼룩 알콜을 흠뻑 적신 거즈로 두드리듯이 닦아낸 다음 비눗물로 닦아낸다. 출처:http://cafe.daum.net/lifebean -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/283> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba - Sistema Informático Abierto de Gestión Unificada para Unidades Educacionales

1 0

SVN Alba r5798 - in prosistem/alba/trunk/alba: apps/principal/modules/relDivisionActividadDocente/actions apps/principal/modules/relDivisionActividadDocente/templates config data/sql
by commits＠pressenter.com.ar 30 Jul '08

30 Jul '08

Author: josx Date: 2008-07-30 14:42:54 -0300 (Wed, 30 Jul 2008) New Revision: 5798 Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/components.class.php prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_porDivision.php prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/cambiarDivisionSuccess.php Modified: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_form.php prosistem/alba/trunk/alba/config/schema.yml prosistem/alba/trunk/alba/data/sql/actualizacion_1.0_luego.sql Log: Se agrega ajax para modificar actividad en funci?\195?\179n de divisi?\195?\179n en la generaci?\195?\179n de eventos. Adem?\195?\161s se cambia el tama?\195?\177o de 16 a 32 del campo recurrencia_fin de la tabla evento 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 2008-07-30 06:15:05 UTC (rev 5797) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php 2008-07-30 17:42:54 UTC (rev 5798) @@ -76,6 +76,14 @@ ); } + public function executeCambiarDivision() { + $this->fk_division_id = $this->getRequestParameter('rel_division_actividad_docente[fk_division_id]'); + $division = DivisionPeer::retrieveByPk($this->fk_division_id); + $c = new Criteria(); + $c->add(RelAnioActividadPeer::FK_ANIO_ID, $division->getFkAnioId()); + $c->addJoin(ActividadPeer::ID, RelAnioActividadPeer::FK_ACTIVIDAD_ID); + $this->actividades = ActividadPeer::doSelect($c); + } public function handleErrorEdit() { @@ -107,7 +115,7 @@ $this->date_component = ""; } - $this->view = $this->getRequestParameter('view','verPorDia'); + $this->view = $this->getRequestParameter('view','verPorDia'); // if($this->getRequestParameter('view')) { // switch($this->getRequestParameter('view')) { // case 'week': $this->view = 'verPorSemana'; break; @@ -142,4 +150,4 @@ } -?> \ No newline at end of file +?> Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/components.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/components.class.php (rev 0) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/components.class.php 2008-07-30 17:42:54 UTC (rev 5798) @@ -0,0 +1,46 @@ +<?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 + */ + + +/** + * relDivisionActividadDocente components + * + * @package alba + * @subpackage relDivisionActividadDocente + * @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 4492 2007-03-19 14:59:17Z josx $ + * @filesource + * @license GPL + */ +class relDivisionActividadDocenteComponents extends sfComponents +{ + public function executePorDivision() { + $c = new Criteria(); + if($this->id_division) { + $division = DivisionPeer::retrieveByPk($this->id_division); + $c->add(RelAnioActividadPeer::FK_ANIO_ID, $division->getFkAnioId()); + $c->addJoin(ActividadPeer::ID, RelAnioActividadPeer::FK_ACTIVIDAD_ID); + } + $actividades = ActividadPeer::doSelect($c); + $this->actividades = $actividades; + } +} +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_form.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_form.php 2008-07-30 06:15:05 UTC (rev 5797) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_edit_form.php 2008-07-30 17:42:54 UTC (rev 5798) @@ -2,6 +2,8 @@ // auto-generated by sfPropelAdmin // date: 2007/05/02 13:04:37 ?> +<?php use_helper('Javascript') ?> + <?php echo form_tag('relDivisionActividadDocente/edit', array( 'id' => 'sf_admin_edit_form', 'name' => 'sf_admin_edit_form', @@ -23,7 +25,14 @@ 'related_class' => 'Division', 'control_name' => 'rel_division_actividad_docente[fk_division_id]', 'include_blank' => true, -)); echo $value ? $value : ' ' ?> +)); echo $value ? $value : ' '; + + echo observe_field('rel_division_actividad_docente_fk_division_id', + array( 'update' => 'item_actividad', + 'url' => 'relDivisionActividadDocente/cambiarDivision', + 'with' => "'rel_division_actividad_docente[fk_division_id]=' + value")); + +?> </div> </div> @@ -34,11 +43,16 @@ <?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 id="item_actividad"> +<?php include_component('relDivisionActividadDocente','porDivision',array( + 'id_division' => $rel_division_actividad_docente->getFkDivisionId(), + 'nombre' => 'rel_division_actividad_docente[fk_actividad_id]', + 'id_actividad' => $rel_division_actividad_docente->getFkActividadId(), +)); +?> </div> + + </div> </div> <div class="form-row"> Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_porDivision.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_porDivision.php (rev 0) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/_porDivision.php 2008-07-30 17:42:54 UTC (rev 5798) @@ -0,0 +1,5 @@ +<?php +echo select_tag($nombre, options_for_select(array(''=>'Seleccione')+ + _get_options_from_objects($actividades), + isset($id_actividad)?$id_actividad:''),array()); +?> Added: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/cambiarDivisionSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/cambiarDivisionSuccess.php (rev 0) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/templates/cambiarDivisionSuccess.php 2008-07-30 17:42:54 UTC (rev 5798) @@ -0,0 +1,7 @@ +<?php use_helper('Object') ?> +<?php include_partial('porDivision',array( + 'actividades'=>$actividades, + 'id_actividad'=>$sf_request->getParameter('rel_division_actividad_docente[fk_division_id]'), + 'nombre'=>'rel_division_actividad_docente[fk_division_id]' +)); +?> Modified: prosistem/alba/trunk/alba/config/schema.yml =================================================================== --- prosistem/alba/trunk/alba/config/schema.yml 2008-07-30 06:15:05 UTC (rev 5797) +++ prosistem/alba/trunk/alba/config/schema.yml 2008-07-30 17:42:54 UTC (rev 5798) @@ -1620,7 +1620,7 @@ default: 0 recurrencia_fin: type: VARCHAR - size: 16 + size: 32 required: false recurrencia_dias: type: INTEGER Modified: prosistem/alba/trunk/alba/data/sql/actualizacion_1.0_luego.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/actualizacion_1.0_luego.sql 2008-07-30 06:15:05 UTC (rev 5797) +++ prosistem/alba/trunk/alba/data/sql/actualizacion_1.0_luego.sql 2008-07-30 17:42:54 UTC (rev 5798) @@ -66,5 +66,7 @@ ALTER TABLE "boletin_conceptual" ALTER observacion DROP NOT NULL; ALTER TABLE "boletin_actividades" ALTER observacion DROP NOT NULL; +ALTER TABLE evento ALTER COLUMN recurrencia_fin TYPE VARCHAR (32); + # This restores the fkey checks, after having unset them earlier SET FOREIGN_KEY_CHECKS = 1;

1 0

SVN Alba r5778 - in prosistem/alba/trunk/alba: apps/principal/modules/boletin/actions apps/principal/modules/boletin/templates config data/sql
by commits＠pressenter.com.ar 29 Jul '08

29 Jul '08

Author: josx Date: 2008-07-29 14:48:51 -0300 (Tue, 29 Jul 2008) New Revision: 5778 Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/listConceptoSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/listSuccess.php prosistem/alba/trunk/alba/config/schema.yml prosistem/alba/trunk/alba/data/sql/actualizacion_1.0_luego.sql Log: Agregando filtros de carrera en boletin (notas y concepto). Adem?\195?\161s se quita la obligatoriedad de cargar la observacion. Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php 2008-07-29 15:28:25 UTC (rev 5777) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php 2008-07-29 17:48:51 UTC (rev 5778) @@ -92,12 +92,26 @@ return $this->redirect("boletin?action=list&division_id=$division_id&actividad_id=$actividad_id&periodo_id=$periodo_id"); } + protected function getCarreras($establecimiento_id) { + $optionsCarrera = array(); + $criteria = new Criteria(); + $criteria->add(CarreraPeer::FK_ESTABLECIMIENTO_ID, $establecimiento_id); + $carreras = CarreraPeer::doSelect($criteria); + $optionsCarrera[] = ""; + foreach($carreras as $carrera) { + $optionsCarrera[$carrera->getId()] = $carrera->__toString(); + } + asort($optionsCarrera); + return $optionsCarrera; + } - - protected function getDivisiones($establecimiento_id) { + protected function getDivisiones($establecimiento_id, $carrera_id = '') { $optionsDivision = array(); $criteria = new Criteria(); $criteria->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $establecimiento_id); + if($carrera_id != '') { + $criteria->add(AnioPeer::FK_CARRERA_ID, $carrera_id); + } $divisiones = DivisionPeer::doSelectJoinAnio($criteria); $optionsDivision[] = ""; foreach($divisiones as $division) { @@ -139,26 +153,29 @@ // inicializando variables $optionsActividad = array(); $optionsDivision = array(); + $optionsCarrera = array(); $aAlumno = array(); $division_id = ""; $actividad_id = ""; $periodo_id = ""; + $carrera_id = ""; $aPeriodo = array(); $aPosiblesNotas = array(); $optionsPeriodo = array(); $aNotaAlumno = array(); $sizeNota = 0; - $establecimiento_id = $this->getUser()->getAttribute('fk_establecimiento_id'); - - // llenando el combo de division segun establecimiento - $optionsDivision = $this->getDivisiones($establecimiento_id); // tomando los datos del formulario $division_id = $this->getRequestParameter('division_id'); $periodo_id = $this->getRequestParameter('periodo_id'); + $carrera_id = $this->getRequestParameter('carrera_id'); + // llenando el combo de division segun establecimiento + $optionsDivision = $this->getDivisiones($establecimiento_id, $carrera_id); + $optionsCarrera = $this->getCarreras($establecimiento_id); + if($division_id) { $actividad_id = $this->getRequestParameter('actividad_id'); $optionsActividad = $this->getActividades($division_id); @@ -218,6 +235,8 @@ $this->aAlumno = $aAlumno; $this->division_id = $division_id; $this->actividad_id = $actividad_id; + $this->carrera_id = $carrera_id; + $this->optionsCarrera = $optionsCarrera; $this->periodo_id = $periodo_id; $this->aPeriodo = $aPeriodo; $this->aPosiblesNotas = $aPosiblesNotas; @@ -242,10 +261,12 @@ // inicializando variables $optionsConcepto = array(); $optionsDivision = array(); + $optionsCarrera = array(); $aAlumno = array(); $division_id = ""; $concepto_id = ""; $periodo_id = ""; + $carrera_id = ""; $aPeriodo = array(); $aPosiblesNotas = array(); $optionsPeriodo = array(); @@ -255,14 +276,17 @@ $establecimiento_id = $this->getUser()->getAttribute('fk_establecimiento_id'); - // llenando el combo de division segun establecimiento - $optionsDivision = $this->getDivisiones($establecimiento_id); - // tomando los datos del formulario $division_id = $this->getRequestParameter('division_id'); $periodo_id = $this->getRequestParameter('periodo_id'); $concepto_id = $this->getRequestParameter('concepto_id'); - + $carrera_id = $this->getRequestParameter('carrera_id'); + + // llenando el combo de division segun establecimiento + $optionsDivision = $this->getDivisiones($establecimiento_id, $carrera_id); + + $optionsCarrera = $this->getCarreras($establecimiento_id); + $optionsConcepto [] = ""; $optionsConcepto = array_merge($optionsConcepto, $this->getConcepto($establecimiento_id)); @@ -297,8 +321,10 @@ if($boletinConceptual->getFkEscalanotaId()) { $aNotaAlumno[$alumno->getId()][$periodo->getId()] = $boletinConceptual->getEscalanota()->getNombre(); } - if($boletinConceptual->getObservacion()->getContents()) { - $aNotaAlumnoObs[$alumno->getId()][$periodo->getId()] = $boletinConceptual->getObservacion()->getContents(); + if($boletinConceptual->getObservacion()) { + if($boletinConceptual->getObservacion()->getContents()) { + $aNotaAlumnoObs[$alumno->getId()][$periodo->getId()] = $boletinConceptual->getObservacion()->getContents(); + } } } } @@ -323,6 +349,8 @@ $this->division_id = $division_id; $this->concepto_id = $concepto_id; $this->periodo_id = $periodo_id; + $this->carrera_id = $carrera_id; + $this->optionsCarrera = $optionsCarrera; $this->aPeriodo = $aPeriodo; $this->aPosiblesNotas = $aPosiblesNotas; $this->optionsPeriodo = $optionsPeriodo; @@ -449,6 +477,7 @@ $division_id = $this->getRequestParameter('division_id'); $concepto_id = $this->getRequestParameter('concepto_id'); $periodo_id = $this->getRequestParameter('periodo_id'); + $carrera_id = $this->getRequestParameter('carrera_id'); $aNota = $this->getRequestParameter('nota'); $aNotaObs = $this->getRequestParameter('notaObs'); @@ -502,7 +531,7 @@ throw $e; } } - return $this->redirect("boletin?action=listConcepto&division_id=$division_id&concepto_id=$concepto_id&periodo_id=$periodo_id"); + return $this->redirect("boletin?action=listConcepto&division_id=$division_id&concepto_id=$concepto_id&periodo_id=$periodo_id&carrera_id=$carrera_id"); } Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/listConceptoSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/listConceptoSuccess.php 2008-07-29 15:28:25 UTC (rev 5777) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/listConceptoSuccess.php 2008-07-29 17:48:51 UTC (rev 5778) @@ -1,14 +1,26 @@ <?php use_helper("I18N")?> <script> function linkTo(flag) { - var objd = document.getElementById('division_id'); var objp = document.getElementById('periodo_id'); - var url = "<?php echo url_for('boletin/', false);?>/listConcepto/division_id/"+objd.options[objd.selectedIndex].value; + var objc = document.getElementById('carrera_id'); + + var url = "<?php echo url_for('boletin/', false);?>/listConcepto/"; + if(flag == 2) { + url = url + "carrera_id/"+objc.options[objc.selectedIndex].value; + } + + if(flag == 0) { + url = url + "division_id/"+objd.options[objd.selectedIndex].value; + url = url + "/carrera_id/"+objc.options[objc.selectedIndex].value; + } + if(flag == 1) { + url = url + "division_id/"+objd.options[objd.selectedIndex].value; + url = url + "/carrera_id/"+objc.options[objc.selectedIndex].value; url = url + "/periodo_id/"+objp.options[objp.selectedIndex].value; } - + var obja = document.getElementById('concepto_id'); url = url + "/concepto_id/"+obja.options[obja.selectedIndex].value; location.href = url; @@ -22,6 +34,10 @@ <fieldset id="sf_fieldset_none" class=""> <div class="form-row"> + <?php echo label_for('carrera', __('Carrera:')) ?> + <?php echo select_tag('carrera_id', options_for_select($optionsCarrera, $carrera_id), "onChange='linkTo(2)'") ?> + </div> + <div class="form-row"> <?php echo label_for('division', __('Division:')) ?> <?php echo select_tag('division_id', options_for_select($optionsDivision, $division_id), "onChange='linkTo(0)'") ?> </div> Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/listSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/listSuccess.php 2008-07-29 15:28:25 UTC (rev 5777) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/templates/listSuccess.php 2008-07-29 17:48:51 UTC (rev 5778) @@ -3,12 +3,24 @@ <script> function linkTo(flag) { var objd = document.getElementById('division_id'); - var url = "<?php echo url_for('boletin/', false);?>/list/division_id/"+objd.options[objd.selectedIndex].value; - if(flag == 1){ - var objp = document.getElementById('periodo_id'); + var objp = document.getElementById('periodo_id'); + var objc = document.getElementById('carrera_id'); + var obja = document.getElementById('actividad_id'); + var url = "<?php echo url_for('boletin/', false);?>/list/"; + + if(flag == 2) { + url = url + "carrera_id/"+objc.options[objc.selectedIndex].value; + } + + if(flag == 0) { + url = url + "division_id/"+objd.options[objd.selectedIndex].value; + url = url + "/carrera_id/"+objc.options[objc.selectedIndex].value; + } + + if(flag == 1) { + url = url + "division_id/"+objd.options[objd.selectedIndex].value; + url = url + "/carrera_id/"+objc.options[objc.selectedIndex].value; url = url + "/periodo_id/"+objp.options[objp.selectedIndex].value; - - var obja = document.getElementById('actividad_id'); url = url + "/actividad_id/"+obja.options[obja.selectedIndex].value; } @@ -23,6 +35,10 @@ <fieldset id="sf_fieldset_none" class=""> <div class="form-row"> + <?php echo label_for('carrera', __('Carrera:')) ?> + <?php echo select_tag('carrera_id', options_for_select($optionsCarrera, $carrera_id), "onChange='linkTo(2)'") ?> + </div> + <div class="form-row"> <?php echo label_for('division', __('División:')) ?> <?php echo select_tag('division_id', options_for_select($optionsDivision, $division_id), "onChange='linkTo(0)'") ?> </div> Modified: prosistem/alba/trunk/alba/config/schema.yml =================================================================== --- prosistem/alba/trunk/alba/config/schema.yml 2008-07-29 15:28:25 UTC (rev 5777) +++ prosistem/alba/trunk/alba/config/schema.yml 2008-07-29 17:48:51 UTC (rev 5778) @@ -1215,7 +1215,7 @@ foreignReference: id observacion: type: blob - required: true + required: false fecha: type: timestamp required: true @@ -1274,7 +1274,7 @@ foreignReference: id observacion: type: blob - required: true + required: false fecha: type: timestamp required: true Modified: prosistem/alba/trunk/alba/data/sql/actualizacion_1.0_luego.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/actualizacion_1.0_luego.sql 2008-07-29 15:28:25 UTC (rev 5777) +++ prosistem/alba/trunk/alba/data/sql/actualizacion_1.0_luego.sql 2008-07-29 17:48:51 UTC (rev 5778) @@ -63,5 +63,8 @@ ALTER TABLE "anio" ADD CONSTRAINT "anio_FK_2" FOREIGN KEY ("fk_carrera_id") REFERENCES "carrera" ("id") +ALTER TABLE "boletin_conceptual" ALTER observacion DROP NOT NULL; +ALTER TABLE "boletin_actividades" ALTER observacion DROP NOT NULL; + # This restores the fkey checks, after having unset them earlier SET FOREIGN_KEY_CHECKS = 1;

1 0

SVN Alba r5777 - prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions
by commits＠pressenter.com.ar 29 Jul '08

29 Jul '08

Author: josx Date: 2008-07-29 12:28:25 -0300 (Tue, 29 Jul 2008) New Revision: 5777 Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php Log: Cambiando metodo para ver descripcion de division (ahora incluyendo la orientaci?\195?\179n) Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php 2008-07-29 15:25:21 UTC (rev 5776) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php 2008-07-29 15:28:25 UTC (rev 5777) @@ -101,7 +101,7 @@ $divisiones = DivisionPeer::doSelectJoinAnio($criteria); $optionsDivision[] = ""; foreach($divisiones as $division) { - $optionsDivision[$division->getId()] = $division->getAnio()->getDescripcion()." ".$division->getDescripcion(); + $optionsDivision[$division->getId()] = $division->__toString(); } asort($optionsDivision); return $optionsDivision;

1 0

SVN Alba r5776 - prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions
by commits＠pressenter.com.ar 29 Jul '08

29 Jul '08

Author: josx Date: 2008-07-29 12:25:21 -0300 (Tue, 29 Jul 2008) New Revision: 5776 Modified: prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php Log: Cambiando metodo para ver descripcion de division (ahora incluyendo la orientaci?\195?\179n) Modified: prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php 2008-07-29 15:24:43 UTC (rev 5775) +++ prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php 2008-07-29 15:25:21 UTC (rev 5776) @@ -153,7 +153,7 @@ $divisiones = DivisionPeer::doSelectJoinAnio($criteria); // divisiones a mostrar foreach ($divisiones as $division) - $optionsDivision[$division->getId()] = $division->getAnio()->getDescripcion()." ".$division->getDescripcion(); + $optionsDivision[$division->getId()] = $division->__toString(); if ($this->getRequestParameter('division_id')) { $division_id = $this->getRequestParameter('division_id');

1 0

SVN Alba r5775 - prosistem/alba/trunk/alba/lib/model
by commits＠pressenter.com.ar 29 Jul '08

29 Jul '08

Author: josx Date: 2008-07-29 12:24:43 -0300 (Tue, 29 Jul 2008) New Revision: 5775 Modified: prosistem/alba/trunk/alba/lib/model/Division.php Log: Arreglando c?\195?\179digo Modified: prosistem/alba/trunk/alba/lib/model/Division.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/Division.php 2008-07-29 15:20:16 UTC (rev 5774) +++ prosistem/alba/trunk/alba/lib/model/Division.php 2008-07-29 15:24:43 UTC (rev 5775) @@ -13,9 +13,11 @@ * long as it does not already exist in the output directory. * * @package model - */ + */ + class Division extends BaseDivision { - public function __toString() { + + public function __toString() { return $this->getAnio()->getDescripcion()." ".$this->getDescripcion().(($this->getOrientacion())?" ".$this->getOrientacion()->getNombre():""); } @@ -33,5 +35,5 @@ ); return $result; } - + } // Division

1 0

SVN Alba r5774 - in prosistem/alba/trunk/alba/apps/principal/modules/asistencia: actions templates
by commits＠pressenter.com.ar 29 Jul '08

29 Jul '08

Author: josx Date: 2008-07-29 12:20:16 -0300 (Tue, 29 Jul 2008) New Revision: 5774 Modified: prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php Log: Agregnado filtro de carrera en Asistencias Modified: prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php 2008-07-29 14:29:48 UTC (rev 5773) +++ prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php 2008-07-29 15:20:16 UTC (rev 5774) @@ -70,11 +70,13 @@ $cuenta_id = -1; $vista_id = 1; // default para vista DIARIO $division_id =0; + $carrera_id = 0; $datos = array(); $idxAlumno= array(); $aFeriado = array(); $aIntervalo = array(); $optionsDivision = array(); + $optionsCarrera = array(); $aTemp = array(); $aFechaTemp = array(); $aTipoasistencias = array(); @@ -122,6 +124,10 @@ $cuenta_id = $a->getFkCuentaId(); } + if($this->getRequestParameter('carrera_id')) { + $carrera_id = $this->getRequestParameter('carrera_id'); + } + if ($this->getRequestParameter('vistas')) { $vista_id = $this->getRequestParameter('vistas'); } @@ -131,11 +137,16 @@ $criteria = new Criteria(); $criteria->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $establecimiento_id); - if ($this->getRequestParameter('alumno_id')){ + if ($this->getRequestParameter('alumno_id')) { $criteria->add(RelAlumnoDivisionPeer::FK_ALUMNO_ID, $alumno_id); $criteria->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, DivisionPeer::ID ); } + if($this->getRequestParameter('carrera_id')) { + $criteria->add(AnioPeer::FK_CARRERA_ID, $carrera_id); + } + + $criteria->addAscendingOrderByColumn(AnioPeer::DESCRIPCION); $criteria->addAscendingOrderByColumn(DivisionPeer::ORDEN); $criteria->addAscendingOrderByColumn(DivisionPeer::DESCRIPCION); @@ -157,6 +168,14 @@ } } + $cCarrera = new Criteria(); + $cCarrera->add(CarreraPeer::FK_ESTABLECIMIENTO_ID, $establecimiento_id); + $carreras = CarreraPeer::doSelect($cCarrera); + foreach($carreras as $carrera) { + $optionsCarrera[$carrera->getId()] = $carrera->getDescripcion(); + } + + if(!checkdate($m,$d,$y)) { // Ver si se puede hacer desde el validate $this->getRequest()->setError('Fecha', 'La fecha ingresada es erronea'); @@ -312,7 +331,8 @@ $this->aTipoasistencias = $aTipoasistencias; $this->aAlumnos = $idxAlumno; $this->aDatos = $datos; - $this->optionsDivision = $optionsDivision; + $this->optionsDivision = $optionsDivision; + $this->optionsCarrera = $optionsCarrera; $this->aVistas = repeticiones(); $this->aMeses = Meses(); $this->aIntervalo = $aIntervalo; @@ -322,6 +342,7 @@ $this->cuenta_id = $cuenta_id; $this->vista_id = $vista_id; $this->division_id = $division_id; + $this->carrera_id = $carrera_id; $this->anio_desde = $anio_desde; $this->anio_hasta = $anio_hasta; } Modified: prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php 2008-07-29 14:29:48 UTC (rev 5773) +++ prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php 2008-07-29 15:20:16 UTC (rev 5774) @@ -33,6 +33,15 @@ <?php use_helper('DateForm'); use_helper("I18N"); ?> +<script> + function linkTo() { + var objd = document.getElementById('carrera_id'); + var url = "<?php echo url_for('asistencia/', false);?>/index/carrera_id/"+objd.options[objd.selectedIndex].value; + location.href = url; + } +</script> + + <div id="sf_admin_container"> <h1>Asistencias</h1> <?php if ($sf_request->hasErrors()): ?> @@ -48,13 +57,16 @@ <?php echo form_tag('asistencia/index', 'id=sf_admin_edit_form name=sf_admin_edit_form multipart=true') ?> <fieldset id="sf_fieldset_none" class=""> + <div class="form-row"> <table cellspacing="1"> <tr> <td> + <?php echo label_for('carrera_id', __('Carrera:'), 'class="required" '); ?> <?php echo label_for('division_id', __('Año/División:'), 'class="required" '); ?> </td> <td> + <?php echo select_tag('carrera_id', options_for_select($optionsCarrera, $carrera_id, 'include_custom=--Todas--'),array('onChange' => 'javascript:linkTo()')); ?> <?php echo select_tag('division_id', options_for_select($optionsDivision, $division_id)); ?> </td> <td style='padding-left:50px'> @@ -74,14 +86,15 @@ <?php echo select_tag('vistas', options_for_select($aVistas, $vista_id)); ?> </td> </tr> + <table> <ul class="sf_admin_actions"> <li> <?php echo submit_tag(__('Mostrar'), array ('name' => 'Mostrar','class' => 'sf_admin_action_save')) ?> </li> </ul> - </div> - </fieldset> + </div> + </fieldset> <?php if($alumno_id >= 0) {?> <?php echo input_hidden_tag('alumno_id', $alumno_id) ?> <?php }?>

1 0

SVN Alba r5773 - prosistem/alba/trunk/alba/apps/principal/modules/carrera/actions
by commits＠pressenter.com.ar 29 Jul '08

29 Jul '08

Author: josx Date: 2008-07-29 11:29:48 -0300 (Tue, 29 Jul 2008) New Revision: 5773 Modified: prosistem/alba/trunk/alba/apps/principal/modules/carrera/actions/actions.class.php Log: Agregando autores Modified: prosistem/alba/trunk/alba/apps/principal/modules/carrera/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/carrera/actions/actions.class.php 2008-07-28 22:03:31 UTC (rev 5772) +++ prosistem/alba/trunk/alba/apps/principal/modules/carrera/actions/actions.class.php 2008-07-29 14:29:48 UTC (rev 5773) @@ -22,10 +22,14 @@ * carrera actions. * * @package alba - * @subpackage carrera - * @author Your name here - * @version SVN: $Id: actions.class.php 2288 2006-10-02 15:22:13Z josx $ + * @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 5520 2008-04-09 19:35:08Z josx $ + * @filesource + * @license GPL */ + class carreraActions extends autocarreraActions { protected function addFiltersCriteria ($c) {

1 0