- Alba-desarrollo - lists.ourproject.org

SVN Alba r4340 - prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions
by commits＠pressenter.com.ar 28 Feb '07

28 Feb '07

Author: ftoledo Date: 2007-02-28 12:30:28 -0300 (Wed, 28 Feb 2007) New Revision: 4340 Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php Log: en guardar y agregar sigue manteniendo la cuenta Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php 2007-02-28 15:19:55 UTC (rev 4339) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php 2007-02-28 15:30:28 UTC (rev 4340) @@ -122,7 +122,7 @@ if ($this->getRequestParameter('save_and_add')) { - return $this->redirect('alumno/create'); + return $this->redirect('alumno/create?fk_cuenta_id=' . $this->alumno->getFkCuentaId()); } else {

1 0

SVN Alba r4339 - in prosistem/alba/trunk/alba: config data/sql lib/model/map lib/model/om
by commits＠pressenter.com.ar 28 Feb '07

28 Feb '07

Author: josx Date: 2007-02-28 12:19:55 -0300 (Wed, 28 Feb 2007) New Revision: 4339 Modified: prosistem/alba/trunk/alba/config/schema.xml prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.sql prosistem/alba/trunk/alba/data/sql/schema.sql prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php Log: Cambie en la base el campo fk_conceptobaja_id de la tabla alumno ( de obligatorio a no obligatorio ) Modified: prosistem/alba/trunk/alba/config/schema.xml =================================================================== --- prosistem/alba/trunk/alba/config/schema.xml 2007-02-28 15:03:54 UTC (rev 4338) +++ prosistem/alba/trunk/alba/config/schema.xml 2007-02-28 15:19:55 UTC (rev 4339) @@ -246,7 +246,7 @@ <column name="fk_cuenta_id" type="INTEGER" required="true" default="0"/> <column name="certificado_medico" type="boolean" required="true" default="0"/> <column name="activo" type="boolean" required="true" default="true"/> - <column name="fk_conceptobaja_id" type="INTEGER" required="true" default="0"/> + <column name="fk_conceptobaja_id" type="INTEGER" required="false"/> <column name="fk_pais_id" type="INTEGER" required="true" default="0"/> <foreign-key foreignTable="tipodocumento"> <reference local="fk_tipodocumento_id" foreign="id"/> 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-28 15:03:54 UTC (rev 4338) +++ prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.sql 2007-02-28 15:19:55 UTC (rev 4339) @@ -107,4 +107,6 @@ ALTER TABLE `alumno` ADD `lugar_nacimiento` VARCHAR( 128 ) NOT NULL AFTER `id` , ADD `fk_pais_id` INT NOT NULL AFTER `lugar_nacimiento` ; -SET FOREIGN_KEY_CHECKS = 1; +ALTER TABLE `alumno` CHANGE `fk_cuenta_id` `fk_cuenta_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-02-28 15:03:54 UTC (rev 4338) +++ prosistem/alba/trunk/alba/data/sql/schema.sql 2007-02-28 15:19:55 UTC (rev 4339) @@ -482,7 +482,7 @@ `fk_cuenta_id` INTEGER default 0 NOT NULL, `certificado_medico` INTEGER default 0 NOT NULL, `activo` INTEGER default 1 NOT NULL, - `fk_conceptobaja_id` INTEGER default 0 NOT NULL, + `fk_conceptobaja_id` INTEGER, `fk_pais_id` INTEGER default 0 NOT NULL, PRIMARY KEY (`id`), INDEX `alumno_FI_1` (`fk_tipodocumento_id`), Modified: prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php 2007-02-28 15:03:54 UTC (rev 4338) +++ prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php 2007-02-28 15:19:55 UTC (rev 4339) @@ -106,7 +106,7 @@ $tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, true); - $tMap->addForeignKey('FK_CONCEPTOBAJA_ID', 'FkConceptobajaId', 'int', CreoleTypes::INTEGER, 'conceptobaja', 'ID', true, null); + $tMap->addForeignKey('FK_CONCEPTOBAJA_ID', 'FkConceptobajaId', 'int', CreoleTypes::INTEGER, 'conceptobaja', 'ID', false, null); $tMap->addForeignKey('FK_PAIS_ID', 'FkPaisId', 'int', CreoleTypes::INTEGER, 'pais', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php 2007-02-28 15:03:54 UTC (rev 4338) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php 2007-02-28 15:19:55 UTC (rev 4339) @@ -179,7 +179,7 @@ * The value for the fk_conceptobaja_id field. * @var int */ - protected $fk_conceptobaja_id = 0; + protected $fk_conceptobaja_id; /** @@ -958,7 +958,7 @@ public function setFkConceptobajaId($v) { - if ($this->fk_conceptobaja_id !== $v || $v === 0) { + if ($this->fk_conceptobaja_id !== $v) { $this->fk_conceptobaja_id = $v; $this->modifiedColumns[] = AlumnoPeer::FK_CONCEPTOBAJA_ID; } @@ -2151,7 +2151,7 @@ if ($v === null) { - $this->setFkConceptobajaId('0'); + $this->setFkConceptobajaId(NULL); } else { $this->setFkConceptobajaId($v->getId()); }

1 0

SVN Alba r4338 - prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions
by commits＠pressenter.com.ar 28 Feb '07

28 Feb '07

Author: josx Date: 2007-02-28 12:03:54 -0300 (Wed, 28 Feb 2007) New Revision: 4338 Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php Log: Saque varios notice de variables como indices de array del 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-28 14:43:41 UTC (rev 4337) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-02-28 15:03:54 UTC (rev 4338) @@ -65,18 +65,25 @@ $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]); + + $actividad_horario_disponible = $this->horariosATexto($actividad[6], $actividad[7], $actividad[8]); + if(array_key_exists($idx, $horarios_disponibles)) { + $horarios_disponibles[$idx] .= $actividad_horario_disponible; + } else { + $horarios_disponibles[$idx] = $actividad_horario_disponible; + } + $optionsHorasMaterias[$idx] = (object) array ( 'cantidad' => $actividad[5] , 'nombre' => $actividad[4]." x ".$docente, 'docente' => $docente, 'horarios_disponibles' => $horarios_disponibles[$idx] ); - } return $optionsHorasMaterias; } @@ -281,11 +288,12 @@ asort($optionsDivision); $this->optionsDivision = $optionsDivision; - if(!$this->division_id) { + if(!$this->division_id OR !array_key_exists($this->division_id, $aAnio) ) { $eachDivision = each($optionsDivision); $this->division_id = $eachDivision[0]; // me quedo con el primer indice del array } + $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]); @@ -306,7 +314,6 @@ $criteria->add(RelDivisionActividadDocentePeer::FK_DIVISION_ID, $this->division_id); $items = RelDivisionActividadDocentePeer::doSelect($criteria); - $aColor = array ("silver", "gray"); $aColorSet = array(); $aEvent = array(); @@ -347,7 +354,6 @@ } } - $this->aEvent = $this->cargarItemCalendario($this->division_id, $aEvent, $horasMateriasTodas ); $this->getUser()->setAttribute('event', $aEvent); @@ -365,7 +371,6 @@ $optionsActividad[$actividad->getId()] = $actividad->getNombre(); } $this->optionsActividad = $optionsActividad; - $this->turnos_id = $turnos_id; }

1 0

SVN Alba r4337 - prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions
by commits＠pressenter.com.ar 28 Feb '07

28 Feb '07

Author: josx Date: 2007-02-28 11:43:41 -0300 (Wed, 28 Feb 2007) New Revision: 4337 Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php Log: Solucione el notice de la variable turnos_id que no llegaba al template (ticket #155) 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-28 14:22:26 UTC (rev 4336) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-02-28 14:43:41 UTC (rev 4337) @@ -164,7 +164,8 @@ $this->getUser()->setAttribute('anio_id', 0); $this->getUser()->setAttribute('division_id', 0); $this->getUser()->setAttribute('event', array()); - + + $turnos_id = ""; $actividad_id = ""; $optionsActividad = array(); $horasMateriasTodas = array(); @@ -289,7 +290,7 @@ $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; +// $this->turnos_id = $turnos_id; $anio_id = $aAnio[$this->division_id]; } else { $this->aHour = array(strtotime("8:00"), strtotime("17:00")); @@ -364,6 +365,8 @@ $optionsActividad[$actividad->getId()] = $actividad->getNombre(); } $this->optionsActividad = $optionsActividad; + + $this->turnos_id = $turnos_id; }

1 0

[Pressenter - SVN Alba] #155: Calendario error al ingreso
by Pressenter - SVN Alba 28 Feb '07

28 Feb '07

#155: Calendario error al ingreso -----------------------------+---------------------------------------------- Reporter: hsanchez | Owner: somebody Type: defecto | Status: new Priority: normal | Milestone: version 1.0rc Component: alba-calendario | Version: desarollo Severity: normal | Keywords: -----------------------------+---------------------------------------------- En el modulo de calendario: http://alba.local/alba/public_html/principal_dev.php/calendario Al ingresar aparece el siguiente error: Notice: Undefined variable: turnos_id in /var/vhosts/educacion/alba/alba/apps/principal/modules/calendario/templates/indexSuccess.php on line 121 -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/155> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 1

SVN Alba r4336 - in prosistem/alba/trunk/alba/apps/principal/modules/cuenta: config validate
by commits＠pressenter.com.ar 28 Feb '07

28 Feb '07

Author: josx Date: 2007-02-28 11:22:26 -0300 (Wed, 28 Feb 2007) New Revision: 4336 Modified: prosistem/alba/trunk/alba/apps/principal/modules/cuenta/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/cuenta/validate/edit.yml Log: Se agrego validacion de cuit para cuenta, se saco la obligatoriedad (ticket #150) Modified: prosistem/alba/trunk/alba/apps/principal/modules/cuenta/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cuenta/config/generator.yml 2007-02-28 14:02:07 UTC (rev 4335) +++ prosistem/alba/trunk/alba/apps/principal/modules/cuenta/config/generator.yml 2007-02-28 14:22:26 UTC (rev 4336) @@ -6,7 +6,7 @@ fields: nombre: { name: Nombre, params: size=64 } razon_social: { name: Razón Social , params: size=64 } - cuit: { name: CUIT, params: size=20 } + cuit: { name: CUIT, params: size=11 } direccion: { name: Dirección , params: size=64 } ciudad: { name: Ciudad, params: size=64 } codigo_postal: { name: CP, params: size=20 } Modified: prosistem/alba/trunk/alba/apps/principal/modules/cuenta/validate/edit.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cuenta/validate/edit.yml 2007-02-28 14:02:07 UTC (rev 4335) +++ prosistem/alba/trunk/alba/apps/principal/modules/cuenta/validate/edit.yml 2007-02-28 14:22:26 UTC (rev 4336) @@ -24,9 +24,9 @@ validators: caracteresMaximos128 cuenta{cuit}: - required: Yes - required_msg: El campo CUIT es obligatorio - validators: caracteresMaximos20 + required: No + required_msg: El campo CUIT es obligatorio + validators: validaCuit cuenta{direccion}: required: Yes @@ -73,4 +73,10 @@ nan_error: Seleccione una provincia válida min: 1 min_error: Seleccione una provincia válida + +validaCuit: + class: albaCUITValidator + param: + cuit_error: El CUIT ingresado es invalido + \ No newline at end of file

1 0

[Pressenter - SVN Alba] #150: Alta de Cuenta
by Pressenter - SVN Alba 28 Feb '07

28 Feb '07

#150: Alta de Cuenta -------------------------+-------------------------------------------------- Reporter: hsanchez | Owner: somebody Type: defecto | Status: new Priority: normal | Milestone: version 1.0rc Component: alba-cuenta | Version: desarollo Severity: normal | Keywords: -------------------------+-------------------------------------------------- En el alta de la cuenta no tiene validado el CUIT. Po lo tanto es posible cargar un CUIT inválido. Hay que agregar la validación correspondiente. -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/150> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 1

[Pressenter - SVN Alba] #107: Completar manual con "orden".
by Pressenter - SVN Alba 28 Feb '07

28 Feb '07

#107: Completar manual con "orden". --------------------+------------------------------------------------------- Reporter: verox | Owner: Verox. Type: tarea | Status: new Priority: normal | Milestone: Component: alba | Version: 1.0b Severity: normal | Keywords: --------------------+------------------------------------------------------- Completar en el manual, la definición de "orden". Cuando usarlo, su utilidad. Ejemplos. (Ingresarlo en capítulo de interfaz). -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/107> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 2

[Pressenter - SVN Alba] #158: Actividad Docente
by Pressenter - SVN Alba 28 Feb '07

28 Feb '07

#158: Actividad Docente ----------------------+----------------------------------------------------- Reporter: hsanchez | Owner: somebody Type: defecto | Status: new Priority: normal | Milestone: version 1.0rc Component: alba | Version: desarollo Severity: normal | Keywords: ----------------------+----------------------------------------------------- En el modulo relActividadDocente: http://alba.local/alba/public_html/principal_dev.php/relActividadDocente/ed… Al cargar un regitro '''NOTA: No tengo cargados docentes''' [PropelException] Unable to execute INSERT statement. [wrapped: Could not execute update [Native Error: Cannot add or update a child row: a foreign key constraint fails (`alba/rel_actividad_docente`, CONSTRAINT `rel_actividad_docente_FK_1` FOREIGN KEY (`fk_docente_id`) REFERENCES `docente` (`id`))] [User Info: INSERT INTO rel_actividad_docente (FK_ACTIVIDAD_ID,FK_DOCENTE_ID) VALUES (1,0)]] stack trace * at () in SF_SYMFONY_LIB_DIR/vendor/propel/util/BasePeer.php line 308 ... 305. 306. } catch (Exception $e) { 307. Propel::log($e->getMessage(), Propel::LOG_ERR); 308. throw new PropelException("Unable to execute INSERT statement.", $e); 309. } 310. 311. // If the primary key column is auto- incremented, get the id * at BasePeer::doInsert(object('Criteria'), object('sfDebugConnection')) in SF_ROOT_DIR/lib/model/om/BaseRelActividadDocentePeer.php line 906 ... -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/158> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 1

SVN Alba r4335 - in prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente: . actions validate
by commits＠pressenter.com.ar 28 Feb '07

28 Feb '07

Author: josx Date: 2007-02-28 11:02:07 -0300 (Wed, 28 Feb 2007) New Revision: 4335 Added: prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente/validate/ prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente/validate/edit.yml Modified: prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente/actions/actions.class.php Log: Agregue la validacion para relActividadDocente que faltaba (ticket #158) Modified: prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente/actions/actions.class.php 2007-02-27 20:41:31 UTC (rev 4334) +++ prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente/actions/actions.class.php 2007-02-28 14:02:07 UTC (rev 4335) @@ -23,8 +23,8 @@ * relActividadDocente Acciones * * @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/modules/relActividadDocente/validate/edit.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente/validate/edit.yml 2007-02-27 20:41:31 UTC (rev 4334) +++ prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente/validate/edit.yml 2007-02-28 14:02:07 UTC (rev 4335) @@ -0,0 +1,27 @@ +methods: + post: + - "rel_actividad_docente{fk_docente_id}" + - "rel_actividad_docente{fk_actividad_id}" + +fillin: + enabled: on + +names: + rel_actividad_docente{fk_docente_id}: + required: Yes + required_msg: "El campo Docente es obligatorio" + validators: validarNumero + + rel_actividad_docente{fk_actividad_id}: + required: Yes + required_msg: "El campo Actividad es obligatorio" + validators: validarNumero + +validarNumero: + class: sfNumberValidator + param: + nan_error: Por favor ingrese un valor númerico + min: 1 + min_error: El valor de las horas deber ser mayor a 0 + + \ No newline at end of file Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente/validate/edit.yml ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev"

1 0