Author: ftoledo Date: 2010-01-16 02:33:02 -0300 (Sat, 16 Jan 2010) New Revision: 6319 Modified: prosistem/alba/trunk/ prosistem/alba/trunk/alba/config/databases.yml.dist prosistem/alba/trunk/alba/config/propel.ini.dist prosistem/alba/trunk/alba/data/fixtures/ejemplo1/datos_ejemplo.yml prosistem/alba/trunk/alba/lib/filter/base/BaseDocenteFormFilter.class.php prosistem/alba/trunk/alba/lib/filter/base/BasePeriodoFormFilter.class.php prosistem/alba/trunk/alba/lib/form/base/BaseCuentaForm.class.php prosistem/alba/trunk/alba/lib/form/base/BaseDocenteForm.class.php prosistem/alba/trunk/alba/lib/form/base/BasePeriodoForm.class.php prosistem/alba/trunk/alba/lib/model/map/ActividadMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/AdjuntoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/AnioMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/AsistenciaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/BoletinActividadesMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/BoletinConceptualMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/CalendariovacunacionMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/CargobajaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/CarreraMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/CiclolectivoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/ConceptoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/ConceptobajaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/CuentaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/DistritoescolarMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/DivisionMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/DocenteMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/EscalanotaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/EspacioMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/EstablecimientoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/EstadosalumnosMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/EventoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/ExamenMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/FeriadoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/HorarioescolarMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/HorarioescolartipoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/InformeMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/LegajoadjuntoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/LegajocategoriaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/LegajopedagogicoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/LegajosaludMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/LocacionMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/NiveltipoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/OrganizacionMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/OrientacionMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/PaisMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/PeriodoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/PermisoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/PreferenciaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/ProvinciaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelAlumnoDivisionMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelAnioActividadMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelCalendariovacunacionAlumnoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelDivisionActividadDocenteMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelDocenteEstablecimientoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelEstablecimientoLocacionMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelRolresponsableResponsableMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelUsuarioPreferenciaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RepeticionMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/ResponsableMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RolMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RolPermisoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RolResponsableMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/TipoasistenciaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/TipodocenteMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/TipodocumentoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/TipoespacioMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/TipoinformeMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/TipoivaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/TipolocacionMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/TurnoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/UsuarioMapBuilder.php prosistem/alba/trunk/alba/lib/model/om/BaseAdjunto.php prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php prosistem/alba/trunk/alba/lib/model/om/BaseAsistencia.php prosistem/alba/trunk/alba/lib/model/om/BaseBoletinActividades.php prosistem/alba/trunk/alba/lib/model/om/BaseBoletinConceptual.php prosistem/alba/trunk/alba/lib/model/om/BaseCiclolectivo.php prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php prosistem/alba/trunk/alba/lib/model/om/BaseExamen.php prosistem/alba/trunk/alba/lib/model/om/BaseFeriado.php prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogico.php prosistem/alba/trunk/alba/lib/model/om/BaseLegajosalud.php prosistem/alba/trunk/alba/lib/model/om/BasePeriodo.php prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumno.php prosistem/alba/trunk/alba/lib/model/om/BaseUsuario.php prosistem/alba/trunk/alba/web/instalar/funciones.php prosistem/alba/trunk/alba/web/instalar/paso4.php prosistem/alba/trunk/alba/web/instalar/paso6.php Log: correcion de datos de ejemplo, instalacion y valores dist Property changes on: prosistem/alba/trunk ___________________________________________________________________ Modified: svn:ignore - build-stamp + build-stamp .project .externalToolBuilders .metadata .settings nbproject Modified: prosistem/alba/trunk/alba/config/databases.yml.dist =================================================================== --- prosistem/alba/trunk/alba/config/databases.yml.dist 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/config/databases.yml.dist 2010-01-16 05:33:02 UTC (rev 6319) @@ -1,3 +1,4 @@ +# Archivo generado por el Instalador de Alba el %TIMESTAMP% dev: propel: param: Modified: prosistem/alba/trunk/alba/config/propel.ini.dist =================================================================== --- prosistem/alba/trunk/alba/config/propel.ini.dist 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/config/propel.ini.dist 2010-01-16 05:33:02 UTC (rev 6319) @@ -1,4 +1,4 @@ -# Archivo generado por el instalador de Alba 04/04/2008 11:55:30 +# Archivo generado por el instalador de Alba %TIMESTAMP% propel.targetPackage = lib.model propel.project = alba Modified: prosistem/alba/trunk/alba/data/fixtures/ejemplo1/datos_ejemplo.yml =================================================================== --- prosistem/alba/trunk/alba/data/fixtures/ejemplo1/datos_ejemplo.yml 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/data/fixtures/ejemplo1/datos_ejemplo.yml 2010-01-16 05:33:02 UTC (rev 6319) @@ -156,6 +156,74 @@ nombre_largo: Tucumán fk_pais_id: Pais_1 orden: 0 + +Distritoescolar: + Distritoescolar_1: + nombre: Nº8 + direccion: Aguirre 3345 + telefono: 4321-2134 + ciudad: Buenos Aires + Distritoescolar_2: + nombre: Nº 4 + direccion: Suarez 1131 + telefono: 4302-2823 / 4301-355 + ciudad: Buenos Aires + Distritoescolar_3: + nombre: Nº 5 + direccion: Avda. M. A. Montes de Oca 439 - 1er Piso + telefono: 4307-4676 / 6753 / 4 + ciudad: Buenos Aires + Distritoescolar_4: + nombre: Nº 6 + direccion: Humberto Primo 3187 + telefono: 4957-1563 + ciudad: Buenos Aires + Distritoescolar_5: + nombre: Nº 9 + direccion: Güemes 4615 + telefono: 4773-7453 + ciudad: Buenos Aires + Distritoescolar_6: + nombre: Nº 11 + direccion: + telefono: + ciudad: Buenos Aires + Distritoescolar_7: + nombre: Nº 13 + direccion: Manuel Artigas 5951 + telefono: 4682-9849/0566 + ciudad: Buenos Aires + Distritoescolar_8: + nombre: Nº 14 + direccion: Bolivia 2571 + telefono: 4581-6248 + ciudad: Buenos Aires + Distritoescolar_9: + nombre: Nº 15 + direccion: Galván 3463 + telefono: 4541-0212 / 4541-26 + ciudad: Buenos Aires + Distritoescolar_10: + nombre: Nº 16 + direccion: José Cubas 3789 + telefono: 4502-0182/6664/2165 + ciudad: Buenos Aires + Distritoescolar_11: + nombre: Nº 19 + direccion: Cnel. Pagola 4181 + telefono: 4923-1276 / 6228 + ciudad: Buenos Aires + Distritoescolar_12: + nombre: Nº 20 + direccion: Fonrouge 346 + telefono: 4641-1796 / 7247 + ciudad: Buenos Aires + Distritoescolar_13: + nombre: Nº 21 + direccion: Cnel. M. Chilavert 6090 + telefono: 4605-1597 / 5860 + ciudad: Buenos Aires + Establecimiento: Establecimiento_2: nombre: Escuela N999 Gral. Stallman @@ -544,72 +612,6 @@ recurrencia_fin: 2007-12-14 00:00 recurrencia_dias: 6 estado: 1 -Distritoescolar: - Distritoescolar_1: - nombre: Nº8 - direccion: Aguirre 3345 - telefono: 4321-2134 - ciudad: Buenos Aires - Distritoescolar_2: - nombre: Nº 4 - direccion: Suarez 1131 - telefono: 4302-2823 / 4301-355 - ciudad: Buenos Aires - Distritoescolar_3: - nombre: Nº 5 - direccion: Avda. M. A. Montes de Oca 439 - 1er Piso - telefono: 4307-4676 / 6753 / 4 - ciudad: Buenos Aires - Distritoescolar_4: - nombre: Nº 6 - direccion: Humberto Primo 3187 - telefono: 4957-1563 - ciudad: Buenos Aires - Distritoescolar_5: - nombre: Nº 9 - direccion: Güemes 4615 - telefono: 4773-7453 - ciudad: Buenos Aires - Distritoescolar_6: - nombre: Nº 11 - direccion: - telefono: - ciudad: Buenos Aires - Distritoescolar_7: - nombre: Nº 13 - direccion: Manuel Artigas 5951 - telefono: 4682-9849/0566 - ciudad: Buenos Aires - Distritoescolar_8: - nombre: Nº 14 - direccion: Bolivia 2571 - telefono: 4581-6248 - ciudad: Buenos Aires - Distritoescolar_9: - nombre: Nº 15 - direccion: Galván 3463 - telefono: 4541-0212 / 4541-26 - ciudad: Buenos Aires - Distritoescolar_10: - nombre: Nº 16 - direccion: José Cubas 3789 - telefono: 4502-0182/6664/2165 - ciudad: Buenos Aires - Distritoescolar_11: - nombre: Nº 19 - direccion: Cnel. Pagola 4181 - telefono: 4923-1276 / 6228 - ciudad: Buenos Aires - Distritoescolar_12: - nombre: Nº 20 - direccion: Fonrouge 346 - telefono: 4641-1796 / 7247 - ciudad: Buenos Aires - Distritoescolar_13: - nombre: Nº 21 - direccion: Cnel. M. Chilavert 6090 - telefono: 4605-1597 / 5860 - ciudad: Buenos Aires Tipoiva: Tipoiva_1: nombre: Exento Modified: prosistem/alba/trunk/alba/lib/filter/base/BaseDocenteFormFilter.class.php =================================================================== --- prosistem/alba/trunk/alba/lib/filter/base/BaseDocenteFormFilter.class.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/filter/base/BaseDocenteFormFilter.class.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -37,8 +37,8 @@ 'activo' => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))), 'fk_provincia_id' => new sfWidgetFormPropelChoice(array('model' => 'Provincia', 'add_empty' => true)), 'fk_pais_id' => new sfWidgetFormPropelChoice(array('model' => 'Pais', 'add_empty' => true)), + 'docente_horario_list' => new sfWidgetFormPropelChoice(array('model' => 'Evento', 'add_empty' => true)), 'rel_anio_actividad_docente_list' => new sfWidgetFormPropelChoice(array('model' => 'RelAnioActividad', 'add_empty' => true)), - 'docente_horario_list' => new sfWidgetFormPropelChoice(array('model' => 'Evento', 'add_empty' => true)), )); $this->setValidators(array( @@ -64,8 +64,8 @@ 'activo' => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))), 'fk_provincia_id' => new sfValidatorPropelChoice(array('required' => false, 'model' => 'Provincia', 'column' => 'id')), 'fk_pais_id' => new sfValidatorPropelChoice(array('required' => false, 'model' => 'Pais', 'column' => 'id')), + 'docente_horario_list' => new sfValidatorPropelChoice(array('model' => 'Evento', 'required' => false)), 'rel_anio_actividad_docente_list' => new sfValidatorPropelChoice(array('model' => 'RelAnioActividad', 'required' => false)), - 'docente_horario_list' => new sfValidatorPropelChoice(array('model' => 'Evento', 'required' => false)), )); $this->widgetSchema->setNameFormat('docente_filters[%s]'); @@ -75,7 +75,7 @@ parent::setup(); } - public function addRelAnioActividadDocenteListColumnCriteria(Criteria $criteria, $field, $values) + public function addDocenteHorarioListColumnCriteria(Criteria $criteria, $field, $values) { if (!is_array($values)) { @@ -87,20 +87,20 @@ return; } - $criteria->addJoin(RelAnioActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + $criteria->addJoin(DocenteHorarioPeer::FK_DOCENTE_ID, DocentePeer::ID); $value = array_pop($values); - $criterion = $criteria->getNewCriterion(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $value); + $criterion = $criteria->getNewCriterion(DocenteHorarioPeer::FK_EVENTO_ID, $value); foreach ($values as $value) { - $criterion->addOr($criteria->getNewCriterion(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $value)); + $criterion->addOr($criteria->getNewCriterion(DocenteHorarioPeer::FK_EVENTO_ID, $value)); } $criteria->add($criterion); } - public function addDocenteHorarioListColumnCriteria(Criteria $criteria, $field, $values) + public function addRelAnioActividadDocenteListColumnCriteria(Criteria $criteria, $field, $values) { if (!is_array($values)) { @@ -112,14 +112,14 @@ return; } - $criteria->addJoin(DocenteHorarioPeer::FK_DOCENTE_ID, DocentePeer::ID); + $criteria->addJoin(RelAnioActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); $value = array_pop($values); - $criterion = $criteria->getNewCriterion(DocenteHorarioPeer::FK_EVENTO_ID, $value); + $criterion = $criteria->getNewCriterion(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $value); foreach ($values as $value) { - $criterion->addOr($criteria->getNewCriterion(DocenteHorarioPeer::FK_EVENTO_ID, $value)); + $criterion->addOr($criteria->getNewCriterion(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $value)); } $criteria->add($criterion); @@ -156,8 +156,8 @@ 'activo' => 'Boolean', 'fk_provincia_id' => 'ForeignKey', 'fk_pais_id' => 'ForeignKey', + 'docente_horario_list' => 'ManyKey', 'rel_anio_actividad_docente_list' => 'ManyKey', - 'docente_horario_list' => 'ManyKey', ); } } Modified: prosistem/alba/trunk/alba/lib/filter/base/BasePeriodoFormFilter.class.php =================================================================== --- prosistem/alba/trunk/alba/lib/filter/base/BasePeriodoFormFilter.class.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/filter/base/BasePeriodoFormFilter.class.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -19,6 +19,8 @@ 'fecha_inicio' => new sfWidgetFormFilterDate(array('from_date' => new sfWidgetFormDate(), 'to_date' => new sfWidgetFormDate(), 'with_empty' => false)), 'fecha_fin' => new sfWidgetFormFilterDate(array('from_date' => new sfWidgetFormDate(), 'to_date' => new sfWidgetFormDate(), 'with_empty' => false)), 'descripcion' => new sfWidgetFormFilterInput(), + 'calcular' => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))), + 'formula' => new sfWidgetFormFilterInput(), )); $this->setValidators(array( @@ -26,6 +28,8 @@ 'fecha_inicio' => new sfValidatorDateRange(array('required' => false, 'from_date' => new sfValidatorDate(array('required' => false)), 'to_date' => new sfValidatorDate(array('required' => false)))), 'fecha_fin' => new sfValidatorDateRange(array('required' => false, 'from_date' => new sfValidatorDate(array('required' => false)), 'to_date' => new sfValidatorDate(array('required' => false)))), 'descripcion' => new sfValidatorPass(array('required' => false)), + 'calcular' => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))), + 'formula' => new sfValidatorPass(array('required' => false)), )); $this->widgetSchema->setNameFormat('periodo_filters[%s]'); @@ -48,6 +52,8 @@ 'fecha_inicio' => 'Date', 'fecha_fin' => 'Date', 'descripcion' => 'Text', + 'calcular' => 'Boolean', + 'formula' => 'Text', ); } } Modified: prosistem/alba/trunk/alba/lib/form/base/BaseCuentaForm.class.php =================================================================== --- prosistem/alba/trunk/alba/lib/form/base/BaseCuentaForm.class.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/form/base/BaseCuentaForm.class.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -29,7 +29,7 @@ 'id' => new sfValidatorPropelChoice(array('model' => 'Cuenta', 'column' => 'id', 'required' => false)), 'nombre' => new sfValidatorString(array('max_length' => 128)), 'razon_social' => new sfValidatorString(array('max_length' => 128)), - 'cuit' => new sfValidatorString(array('max_length' => 20)), + 'cuit' => new sfValidatorString(array('max_length' => 20, 'required' => false)), 'direccion' => new sfValidatorString(array('max_length' => 128)), 'ciudad' => new sfValidatorString(array('max_length' => 128)), 'codigo_postal' => new sfValidatorString(array('max_length' => 20)), Modified: prosistem/alba/trunk/alba/lib/form/base/BaseDocenteForm.class.php =================================================================== --- prosistem/alba/trunk/alba/lib/form/base/BaseDocenteForm.class.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/form/base/BaseDocenteForm.class.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -36,8 +36,8 @@ 'activo' => new sfWidgetFormInputCheckbox(), 'fk_provincia_id' => new sfWidgetFormPropelChoice(array('model' => 'Provincia', 'add_empty' => false)), 'fk_pais_id' => new sfWidgetFormPropelChoice(array('model' => 'Pais', 'add_empty' => false)), + 'docente_horario_list' => new sfWidgetFormPropelChoiceMany(array('model' => 'Evento')), 'rel_anio_actividad_docente_list' => new sfWidgetFormPropelChoiceMany(array('model' => 'RelAnioActividad')), - 'docente_horario_list' => new sfWidgetFormPropelChoiceMany(array('model' => 'Evento')), )); $this->setValidators(array( @@ -64,8 +64,8 @@ 'activo' => new sfValidatorBoolean(array('required' => false)), 'fk_provincia_id' => new sfValidatorPropelChoice(array('model' => 'Provincia', 'column' => 'id')), 'fk_pais_id' => new sfValidatorPropelChoice(array('model' => 'Pais', 'column' => 'id')), + 'docente_horario_list' => new sfValidatorPropelChoiceMany(array('model' => 'Evento', 'required' => false)), 'rel_anio_actividad_docente_list' => new sfValidatorPropelChoiceMany(array('model' => 'RelAnioActividad', 'required' => false)), - 'docente_horario_list' => new sfValidatorPropelChoiceMany(array('model' => 'Evento', 'required' => false)), )); $this->widgetSchema->setNameFormat('docente[%s]'); @@ -85,26 +85,26 @@ { parent::updateDefaultsFromObject(); - if (isset($this->widgetSchema['rel_anio_actividad_docente_list'])) + if (isset($this->widgetSchema['docente_horario_list'])) { $values = array(); - foreach ($this->object->getRelAnioActividadDocentes() as $obj) + foreach ($this->object->getDocenteHorarios() as $obj) { - $values[] = $obj->getFkAnioActividadId(); + $values[] = $obj->getFkEventoId(); } - $this->setDefault('rel_anio_actividad_docente_list', $values); + $this->setDefault('docente_horario_list', $values); } - if (isset($this->widgetSchema['docente_horario_list'])) + if (isset($this->widgetSchema['rel_anio_actividad_docente_list'])) { $values = array(); - foreach ($this->object->getDocenteHorarios() as $obj) + foreach ($this->object->getRelAnioActividadDocentes() as $obj) { - $values[] = $obj->getFkEventoId(); + $values[] = $obj->getFkAnioActividadId(); } - $this->setDefault('docente_horario_list', $values); + $this->setDefault('rel_anio_actividad_docente_list', $values); } } @@ -113,18 +113,18 @@ { parent::doSave($con); + $this->saveDocenteHorarioList($con); $this->saveRelAnioActividadDocenteList($con); - $this->saveDocenteHorarioList($con); } - public function saveRelAnioActividadDocenteList($con = null) + public function saveDocenteHorarioList($con = null) { if (!$this->isValid()) { throw $this->getErrorSchema(); } - if (!isset($this->widgetSchema['rel_anio_actividad_docente_list'])) + if (!isset($this->widgetSchema['docente_horario_list'])) { // somebody has unset this widget return; @@ -136,30 +136,30 @@ } $c = new Criteria(); - $c->add(RelAnioActividadDocentePeer::FK_DOCENTE_ID, $this->object->getPrimaryKey()); - RelAnioActividadDocentePeer::doDelete($c, $con); + $c->add(DocenteHorarioPeer::FK_DOCENTE_ID, $this->object->getPrimaryKey()); + DocenteHorarioPeer::doDelete($c, $con); - $values = $this->getValue('rel_anio_actividad_docente_list'); + $values = $this->getValue('docente_horario_list'); if (is_array($values)) { foreach ($values as $value) { - $obj = new RelAnioActividadDocente(); + $obj = new DocenteHorario(); $obj->setFkDocenteId($this->object->getPrimaryKey()); - $obj->setFkAnioActividadId($value); + $obj->setFkEventoId($value); $obj->save(); } } } - public function saveDocenteHorarioList($con = null) + public function saveRelAnioActividadDocenteList($con = null) { if (!$this->isValid()) { throw $this->getErrorSchema(); } - if (!isset($this->widgetSchema['docente_horario_list'])) + if (!isset($this->widgetSchema['rel_anio_actividad_docente_list'])) { // somebody has unset this widget return; @@ -171,17 +171,17 @@ } $c = new Criteria(); - $c->add(DocenteHorarioPeer::FK_DOCENTE_ID, $this->object->getPrimaryKey()); - DocenteHorarioPeer::doDelete($c, $con); + $c->add(RelAnioActividadDocentePeer::FK_DOCENTE_ID, $this->object->getPrimaryKey()); + RelAnioActividadDocentePeer::doDelete($c, $con); - $values = $this->getValue('docente_horario_list'); + $values = $this->getValue('rel_anio_actividad_docente_list'); if (is_array($values)) { foreach ($values as $value) { - $obj = new DocenteHorario(); + $obj = new RelAnioActividadDocente(); $obj->setFkDocenteId($this->object->getPrimaryKey()); - $obj->setFkEventoId($value); + $obj->setFkAnioActividadId($value); $obj->save(); } } Modified: prosistem/alba/trunk/alba/lib/form/base/BasePeriodoForm.class.php =================================================================== --- prosistem/alba/trunk/alba/lib/form/base/BasePeriodoForm.class.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/form/base/BasePeriodoForm.class.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -18,6 +18,8 @@ 'fecha_inicio' => new sfWidgetFormDateTime(), 'fecha_fin' => new sfWidgetFormDateTime(), 'descripcion' => new sfWidgetFormInput(), + 'calcular' => new sfWidgetFormInputCheckbox(), + 'formula' => new sfWidgetFormInput(), )); $this->setValidators(array( @@ -26,6 +28,8 @@ 'fecha_inicio' => new sfValidatorDateTime(), 'fecha_fin' => new sfValidatorDateTime(), 'descripcion' => new sfValidatorString(array('max_length' => 255)), + 'calcular' => new sfValidatorBoolean(), + 'formula' => new sfValidatorString(array('max_length' => 1000, 'required' => false)), )); $this->widgetSchema->setNameFormat('periodo[%s]'); Modified: prosistem/alba/trunk/alba/lib/model/map/ActividadMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/ActividadMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/ActividadMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('actividad_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ESTABLECIMIENTO_ID', 'FkEstablecimientoId', 'INTEGER', 'establecimiento', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/AdjuntoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/AdjuntoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/AdjuntoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('adjunto_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'VARCHAR', false, 255); Modified: prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('alumno_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('LEGAJO_PREFIJO', 'LegajoPrefijo', 'VARCHAR', true, 10); Modified: prosistem/alba/trunk/alba/lib/model/map/AnioMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/AnioMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/AnioMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('anio_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ESTABLECIMIENTO_ID', 'FkEstablecimientoId', 'INTEGER', 'establecimiento', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/AsistenciaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/AsistenciaMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/AsistenciaMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('asistencia_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ALUMNO_ID', 'FkAlumnoId', 'INTEGER', 'alumno', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/BoletinActividadesMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/BoletinActividadesMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/BoletinActividadesMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('boletin_actividades_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ESCALANOTA_ID', 'FkEscalanotaId', 'INTEGER', 'escalanota', 'ID', false, null); Modified: prosistem/alba/trunk/alba/lib/model/map/BoletinConceptualMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/BoletinConceptualMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/BoletinConceptualMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('boletin_conceptual_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ESCALANOTA_ID', 'FkEscalanotaId', 'INTEGER', 'escalanota', 'ID', false, null); Modified: prosistem/alba/trunk/alba/lib/model/map/CalendariovacunacionMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/CalendariovacunacionMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/CalendariovacunacionMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('calendariovacunacion_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/CargobajaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/CargobajaMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/CargobajaMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('cargobaja_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/CarreraMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/CarreraMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/CarreraMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('carrera_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ESTABLECIMIENTO_ID', 'FkEstablecimientoId', 'INTEGER', 'establecimiento', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/CiclolectivoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/CiclolectivoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/CiclolectivoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('ciclolectivo_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ESTABLECIMIENTO_ID', 'FkEstablecimientoId', 'INTEGER', 'establecimiento', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/ConceptoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/ConceptoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/ConceptoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('concepto_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ESTABLECIMIENTO_ID', 'FkEstablecimientoId', 'INTEGER', 'establecimiento', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/ConceptobajaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/ConceptobajaMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/ConceptobajaMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('conceptobaja_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/CuentaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/CuentaMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/CuentaMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,13 +33,15 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('cuenta_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); $tMap->addColumn('RAZON_SOCIAL', 'RazonSocial', 'VARCHAR', true, 128); - $tMap->addColumn('CUIT', 'Cuit', 'VARCHAR', true, 20); + $tMap->addColumn('CUIT', 'Cuit', 'VARCHAR', false, 20); $tMap->addColumn('DIRECCION', 'Direccion', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/DistritoescolarMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/DistritoescolarMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/DistritoescolarMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('distritoescolar_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/DivisionMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/DivisionMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/DivisionMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('division_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ANIO_ID', 'FkAnioId', 'INTEGER', 'anio', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/DocenteMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/DocenteMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/DocenteMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('docente_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('APELLIDO', 'Apellido', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/EscalanotaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/EscalanotaMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/EscalanotaMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('escalanota_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ESTABLECIMIENTO_ID', 'FkEstablecimientoId', 'INTEGER', 'establecimiento', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/EspacioMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/EspacioMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/EspacioMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('espacio_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/EstablecimientoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/EstablecimientoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/EstablecimientoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('establecimiento_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/EstadosalumnosMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/EstadosalumnosMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/EstadosalumnosMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('estadosalumnos_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/EventoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/EventoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/EventoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('evento_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('TITULO', 'Titulo', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/ExamenMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/ExamenMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/ExamenMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('examen_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ESCALANOTA_ID', 'FkEscalanotaId', 'INTEGER', 'escalanota', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/FeriadoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/FeriadoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/FeriadoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('feriado_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/HorarioescolarMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/HorarioescolarMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/HorarioescolarMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('horarioescolar_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/HorarioescolartipoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/HorarioescolartipoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/HorarioescolartipoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('horarioescolartipo_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/InformeMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/InformeMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/InformeMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('informe_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/LegajoadjuntoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/LegajoadjuntoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/LegajoadjuntoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('legajoadjunto_id_seq'); + $tMap->addForeignKey('FK_LEGAJOPEDAGOGICO_ID', 'FkLegajopedagogicoId', 'INTEGER', 'legajopedagogico', 'ID', true, null); $tMap->addForeignKey('FK_ADJUNTO_ID', 'FkAdjuntoId', 'INTEGER', 'adjunto', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/LegajocategoriaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/LegajocategoriaMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/LegajocategoriaMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('legajocategoria_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'VARCHAR', true, 255); Modified: prosistem/alba/trunk/alba/lib/model/map/LegajopedagogicoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/LegajopedagogicoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/LegajopedagogicoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('legajopedagogico_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ALUMNO_ID', 'FkAlumnoId', 'INTEGER', 'alumno', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/LegajosaludMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/LegajosaludMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/LegajosaludMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('legajosalud_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ALUMNO_ID', 'FkAlumnoId', 'INTEGER', 'alumno', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/LocacionMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/LocacionMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/LocacionMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('locacion_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/NiveltipoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/NiveltipoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/NiveltipoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('niveltipo_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/OrganizacionMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/OrganizacionMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/OrganizacionMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('organizacion_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/OrientacionMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/OrientacionMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/OrientacionMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('orientacion_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/PaisMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/PaisMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/PaisMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('pais_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE_LARGO', 'NombreLargo', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/PeriodoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/PeriodoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/PeriodoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('periodo_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_CICLOLECTIVO_ID', 'FkCiclolectivoId', 'INTEGER', 'ciclolectivo', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/PermisoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/PermisoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/PermisoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('permiso_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/PreferenciaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/PreferenciaMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/PreferenciaMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('preferencia_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/ProvinciaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/ProvinciaMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/ProvinciaMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('provincia_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE_CORTO', 'NombreCorto', 'VARCHAR', true, 32); Modified: prosistem/alba/trunk/alba/lib/model/map/RelAlumnoDivisionMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelAlumnoDivisionMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/RelAlumnoDivisionMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('rel_alumno_division_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_DIVISION_ID', 'FkDivisionId', 'INTEGER', 'division', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/RelAnioActividadMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelAnioActividadMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/RelAnioActividadMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('rel_anio_actividad_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ANIO_ID', 'FkAnioId', 'INTEGER', 'anio', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/RelCalendariovacunacionAlumnoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelCalendariovacunacionAlumnoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/RelCalendariovacunacionAlumnoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('rel_calendariovacunacion_alumno_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ALUMNO_ID', 'FkAlumnoId', 'INTEGER', 'alumno', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/RelDivisionActividadDocenteMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelDivisionActividadDocenteMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/RelDivisionActividadDocenteMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('rel_division_actividad_docente_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_DIVISION_ID', 'FkDivisionId', 'INTEGER', 'division', 'ID', false, null); Modified: prosistem/alba/trunk/alba/lib/model/map/RelDocenteEstablecimientoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelDocenteEstablecimientoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/RelDocenteEstablecimientoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('rel_docente_establecimiento_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ESTABLECIMIENTO_ID', 'FkEstablecimientoId', 'INTEGER', 'establecimiento', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/RelEstablecimientoLocacionMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelEstablecimientoLocacionMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/RelEstablecimientoLocacionMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('rel_establecimiento_locacion_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ESTABLECIMIENTO_ID', 'FkEstablecimientoId', 'INTEGER', 'establecimiento', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/RelRolresponsableResponsableMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelRolresponsableResponsableMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/RelRolresponsableResponsableMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('rel_rolresponsable_responsable_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ROLRESPONSABLE_ID', 'FkRolresponsableId', 'INTEGER', 'rol_responsable', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/RelUsuarioPreferenciaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelUsuarioPreferenciaMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/RelUsuarioPreferenciaMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('rel_usuario_preferencia_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('FK_USUARIO_ID', 'FkUsuarioId', 'INTEGER', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/RepeticionMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RepeticionMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/RepeticionMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('repeticion_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'VARCHAR', true, 255); Modified: prosistem/alba/trunk/alba/lib/model/map/ResponsableMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/ResponsableMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/ResponsableMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('responsable_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/RolMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RolMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/RolMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('rol_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/RolPermisoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RolPermisoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/RolPermisoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('rol_permiso_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_ROL_ID', 'FkRolId', 'INTEGER', 'rol', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/RolResponsableMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RolResponsableMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/RolResponsableMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('rol_responsable_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/TipoasistenciaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/TipoasistenciaMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/TipoasistenciaMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('tipoasistencia_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 10); Modified: prosistem/alba/trunk/alba/lib/model/map/TipodocenteMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/TipodocenteMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/TipodocenteMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('tipodocente_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/TipodocumentoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/TipodocumentoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/TipodocumentoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('tipodocumento_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/TipoespacioMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/TipoespacioMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/TipoespacioMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('tipoespacio_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/TipoinformeMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/TipoinformeMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/TipoinformeMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('tipoinforme_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/TipoivaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/TipoivaMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/TipoivaMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('tipoiva_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/TipolocacionMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/TipolocacionMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/TipolocacionMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('tipolocacion_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'VARCHAR', true, 128); Modified: prosistem/alba/trunk/alba/lib/model/map/TurnoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/TurnoMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/TurnoMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('turno_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addForeignKey('FK_CICLOLECTIVO_ID', 'FkCiclolectivoId', 'INTEGER', 'ciclolectivo', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/map/UsuarioMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/UsuarioMapBuilder.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/map/UsuarioMapBuilder.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -33,6 +33,8 @@ $tMap->setUseIdGenerator(true); + $tMap->setPrimaryKeyMethodInfo('usuario_id_seq'); + $tMap->addPrimaryKey('ID', 'Id', 'INTEGER', true, null); $tMap->addColumn('USUARIO', 'Usuario', 'VARCHAR', true, 32); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAdjunto.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAdjunto.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAdjunto.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -104,14 +104,11 @@ } - if ($this->fecha === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); - } + + try { + $dt = new DateTime($this->fecha); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); } if ($format === null) { @@ -228,12 +225,12 @@ if ( $this->fecha !== null || $dt !== null ) { - $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = AdjuntoPeer::FECHA; } } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -244,14 +244,11 @@ } - if ($this->fecha_nacimiento === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha_nacimiento); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_nacimiento, true), $x); - } + + try { + $dt = new DateTime($this->fecha_nacimiento); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_nacimiento, true), $x); } if ($format === null) { @@ -500,12 +497,12 @@ if ( $this->fecha_nacimiento !== null || $dt !== null ) { - $currNorm = ($this->fecha_nacimiento !== null && $tmpDt = new DateTime($this->fecha_nacimiento)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha_nacimiento !== null && $tmpDt = new DateTime($this->fecha_nacimiento)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha_nacimiento = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha_nacimiento = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = AlumnoPeer::FECHA_NACIMIENTO; } } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAsistencia.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAsistencia.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAsistencia.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -71,14 +71,11 @@ } - if ($this->fecha === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); - } + + try { + $dt = new DateTime($this->fecha); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); } if ($format === null) { @@ -161,12 +158,12 @@ if ( $this->fecha !== null || $dt !== null ) { - $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = AsistenciaPeer::FECHA; } } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseBoletinActividades.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseBoletinActividades.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/om/BaseBoletinActividades.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -107,14 +107,11 @@ } - if ($this->fecha === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); - } + + try { + $dt = new DateTime($this->fecha); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); } if ($format === null) { @@ -246,12 +243,12 @@ if ( $this->fecha !== null || $dt !== null ) { - $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = BoletinActividadesPeer::FECHA; } } @@ -288,13 +285,7 @@ $this->fk_alumno_id = ($row[$startcol + 2] !== null) ? (int) $row[$startcol + 2] : null; $this->fk_actividad_id = ($row[$startcol + 3] !== null) ? (int) $row[$startcol + 3] : null; $this->fk_periodo_id = ($row[$startcol + 4] !== null) ? (int) $row[$startcol + 4] : null; - if ($row[$startcol + 5] !== null) { - $this->observacion = fopen('php://memory', 'r+'); - fwrite($this->observacion, $row[$startcol + 5]); - rewind($this->observacion); - } else { - $this->observacion = null; - } + $this->observacion = $row[$startcol + 5]; $this->fecha = ($row[$startcol + 6] !== null) ? (string) $row[$startcol + 6] : null; $this->resetModified(); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseBoletinConceptual.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseBoletinConceptual.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/om/BaseBoletinConceptual.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -107,14 +107,11 @@ } - if ($this->fecha === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); - } + + try { + $dt = new DateTime($this->fecha); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); } if ($format === null) { @@ -246,12 +243,12 @@ if ( $this->fecha !== null || $dt !== null ) { - $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = BoletinConceptualPeer::FECHA; } } @@ -288,13 +285,7 @@ $this->fk_alumno_id = ($row[$startcol + 2] !== null) ? (int) $row[$startcol + 2] : null; $this->fk_concepto_id = ($row[$startcol + 3] !== null) ? (int) $row[$startcol + 3] : null; $this->fk_periodo_id = ($row[$startcol + 4] !== null) ? (int) $row[$startcol + 4] : null; - if ($row[$startcol + 5] !== null) { - $this->observacion = fopen('php://memory', 'r+'); - fwrite($this->observacion, $row[$startcol + 5]); - rewind($this->observacion); - } else { - $this->observacion = null; - } + $this->observacion = $row[$startcol + 5]; $this->fecha = ($row[$startcol + 6] !== null) ? (string) $row[$startcol + 6] : null; $this->resetModified(); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseCiclolectivo.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseCiclolectivo.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/om/BaseCiclolectivo.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -87,14 +87,11 @@ } - if ($this->fecha_inicio === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha_inicio); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_inicio, true), $x); - } + + try { + $dt = new DateTime($this->fecha_inicio); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_inicio, true), $x); } if ($format === null) { @@ -114,14 +111,11 @@ } - if ($this->fecha_fin === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha_fin); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_fin, true), $x); - } + + try { + $dt = new DateTime($this->fecha_fin); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_fin, true), $x); } if ($format === null) { @@ -198,12 +192,12 @@ if ( $this->fecha_inicio !== null || $dt !== null ) { - $currNorm = ($this->fecha_inicio !== null && $tmpDt = new DateTime($this->fecha_inicio)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha_inicio !== null && $tmpDt = new DateTime($this->fecha_inicio)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha_inicio = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha_inicio = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = CiclolectivoPeer::FECHA_INICIO; } } @@ -230,12 +224,12 @@ if ( $this->fecha_fin !== null || $dt !== null ) { - $currNorm = ($this->fecha_fin !== null && $tmpDt = new DateTime($this->fecha_fin)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha_fin !== null && $tmpDt = new DateTime($this->fecha_fin)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha_fin = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha_fin = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = CiclolectivoPeer::FECHA_FIN; } } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -179,14 +179,11 @@ } - if ($this->fecha_nacimiento === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha_nacimiento); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_nacimiento, true), $x); - } + + try { + $dt = new DateTime($this->fecha_nacimiento); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_nacimiento, true), $x); } if ($format === null) { @@ -399,12 +396,12 @@ if ( $this->fecha_nacimiento !== null || $dt !== null ) { - $currNorm = ($this->fecha_nacimiento !== null && $tmpDt = new DateTime($this->fecha_nacimiento)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha_nacimiento !== null && $tmpDt = new DateTime($this->fecha_nacimiento)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha_nacimiento = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha_nacimiento = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = DocentePeer::FECHA_NACIMIENTO; } } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -100,14 +100,11 @@ } - if ($this->fecha_inicio === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha_inicio); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_inicio, true), $x); - } + + try { + $dt = new DateTime($this->fecha_inicio); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_inicio, true), $x); } if ($format === null) { @@ -127,14 +124,11 @@ } - if ($this->fecha_fin === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha_fin); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_fin, true), $x); - } + + try { + $dt = new DateTime($this->fecha_fin); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_fin, true), $x); } if ($format === null) { @@ -231,12 +225,12 @@ if ( $this->fecha_inicio !== null || $dt !== null ) { - $currNorm = ($this->fecha_inicio !== null && $tmpDt = new DateTime($this->fecha_inicio)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha_inicio !== null && $tmpDt = new DateTime($this->fecha_inicio)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha_inicio = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha_inicio = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = EventoPeer::FECHA_INICIO; } } @@ -263,12 +257,12 @@ if ( $this->fecha_fin !== null || $dt !== null ) { - $currNorm = ($this->fecha_fin !== null && $tmpDt = new DateTime($this->fecha_fin)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha_fin !== null && $tmpDt = new DateTime($this->fecha_fin)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha_fin = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha_fin = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = EventoPeer::FECHA_FIN; } } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseExamen.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseExamen.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/om/BaseExamen.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -117,14 +117,11 @@ } - if ($this->fecha === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); - } + + try { + $dt = new DateTime($this->fecha); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); } if ($format === null) { @@ -270,12 +267,12 @@ if ( $this->fecha !== null || $dt !== null ) { - $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = ExamenPeer::FECHA; } } @@ -317,13 +314,7 @@ $this->fk_actividad_id = ($row[$startcol + 3] !== null) ? (int) $row[$startcol + 3] : null; $this->fk_periodo_id = ($row[$startcol + 4] !== null) ? (int) $row[$startcol + 4] : null; $this->nombre = ($row[$startcol + 5] !== null) ? (string) $row[$startcol + 5] : null; - if ($row[$startcol + 6] !== null) { - $this->observacion = fopen('php://memory', 'r+'); - fwrite($this->observacion, $row[$startcol + 6]); - rewind($this->observacion); - } else { - $this->observacion = null; - } + $this->observacion = $row[$startcol + 6]; $this->fecha = ($row[$startcol + 7] !== null) ? (string) $row[$startcol + 7] : null; $this->resetModified(); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseFeriado.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseFeriado.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/om/BaseFeriado.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -71,14 +71,11 @@ } - if ($this->fecha === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); - } + + try { + $dt = new DateTime($this->fecha); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); } if ($format === null) { @@ -157,12 +154,12 @@ if ( $this->fecha !== null || $dt !== null ) { - $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = FeriadoPeer::FECHA; } } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogico.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogico.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogico.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -104,14 +104,11 @@ } - if ($this->fecha === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); - } + + try { + $dt = new DateTime($this->fecha); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); } if ($format === null) { @@ -228,12 +225,12 @@ if ( $this->fecha !== null || $dt !== null ) { - $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = LegajopedagogicoPeer::FECHA; } } @@ -292,20 +289,8 @@ $this->id = ($row[$startcol + 0] !== null) ? (int) $row[$startcol + 0] : null; $this->fk_alumno_id = ($row[$startcol + 1] !== null) ? (int) $row[$startcol + 1] : null; $this->titulo = ($row[$startcol + 2] !== null) ? (string) $row[$startcol + 2] : null; - if ($row[$startcol + 3] !== null) { - $this->resumen = fopen('php://memory', 'r+'); - fwrite($this->resumen, $row[$startcol + 3]); - rewind($this->resumen); - } else { - $this->resumen = null; - } - if ($row[$startcol + 4] !== null) { - $this->texto = fopen('php://memory', 'r+'); - fwrite($this->texto, $row[$startcol + 4]); - rewind($this->texto); - } else { - $this->texto = null; - } + $this->resumen = $row[$startcol + 3]; + $this->texto = $row[$startcol + 4]; $this->fecha = ($row[$startcol + 5] !== null) ? (string) $row[$startcol + 5] : null; $this->fk_usuario_id = ($row[$startcol + 6] !== null) ? (int) $row[$startcol + 6] : null; $this->fk_legajocategoria_id = ($row[$startcol + 7] !== null) ? (int) $row[$startcol + 7] : null; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseLegajosalud.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseLegajosalud.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/om/BaseLegajosalud.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -83,14 +83,11 @@ } - if ($this->fecha === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); - } + + try { + $dt = new DateTime($this->fecha); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); } if ($format === null) { @@ -188,12 +185,12 @@ if ( $this->fecha !== null || $dt !== null ) { - $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = LegajosaludPeer::FECHA; } } @@ -234,13 +231,7 @@ $this->id = ($row[$startcol + 0] !== null) ? (int) $row[$startcol + 0] : null; $this->fk_alumno_id = ($row[$startcol + 1] !== null) ? (int) $row[$startcol + 1] : null; $this->titulo = ($row[$startcol + 2] !== null) ? (string) $row[$startcol + 2] : null; - if ($row[$startcol + 3] !== null) { - $this->descripcion = fopen('php://memory', 'r+'); - fwrite($this->descripcion, $row[$startcol + 3]); - rewind($this->descripcion); - } else { - $this->descripcion = null; - } + $this->descripcion = $row[$startcol + 3]; $this->fecha = ($row[$startcol + 4] !== null) ? (string) $row[$startcol + 4] : null; $this->fk_usuario_id = ($row[$startcol + 5] !== null) ? (int) $row[$startcol + 5] : null; $this->resetModified(); Modified: prosistem/alba/trunk/alba/lib/model/om/BasePeriodo.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BasePeriodo.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/om/BasePeriodo.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -90,14 +90,11 @@ } - if ($this->fecha_inicio === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha_inicio); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_inicio, true), $x); - } + + try { + $dt = new DateTime($this->fecha_inicio); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_inicio, true), $x); } if ($format === null) { @@ -117,14 +114,11 @@ } - if ($this->fecha_fin === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha_fin); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_fin, true), $x); - } + + try { + $dt = new DateTime($this->fecha_fin); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_fin, true), $x); } if ($format === null) { @@ -207,12 +201,12 @@ if ( $this->fecha_inicio !== null || $dt !== null ) { - $currNorm = ($this->fecha_inicio !== null && $tmpDt = new DateTime($this->fecha_inicio)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha_inicio !== null && $tmpDt = new DateTime($this->fecha_inicio)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha_inicio = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha_inicio = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = PeriodoPeer::FECHA_INICIO; } } @@ -239,12 +233,12 @@ if ( $this->fecha_fin !== null || $dt !== null ) { - $currNorm = ($this->fecha_fin !== null && $tmpDt = new DateTime($this->fecha_fin)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha_fin !== null && $tmpDt = new DateTime($this->fecha_fin)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha_fin = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha_fin = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = PeriodoPeer::FECHA_FIN; } } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumno.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumno.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumno.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -90,14 +90,11 @@ } - if ($this->fecha === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); - } + + try { + $dt = new DateTime($this->fecha); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha, true), $x); } if ($format === null) { @@ -208,12 +205,12 @@ if ( $this->fecha !== null || $dt !== null ) { - $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha !== null && $tmpDt = new DateTime($this->fecha)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = RelCalendariovacunacionAlumnoPeer::FECHA; } } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseUsuario.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseUsuario.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/lib/model/om/BaseUsuario.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -132,14 +132,11 @@ } - if ($this->fecha_creado === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha_creado); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_creado, true), $x); - } + + try { + $dt = new DateTime($this->fecha_creado); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_creado, true), $x); } if ($format === null) { @@ -159,14 +156,11 @@ } - if ($this->fecha_actualizado === '0000-00-00 00:00:00') { - return null; - } else { - try { - $dt = new DateTime($this->fecha_actualizado); - } catch (Exception $x) { - throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_actualizado, true), $x); - } + + try { + $dt = new DateTime($this->fecha_actualizado); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->fecha_actualizado, true), $x); } if ($format === null) { @@ -299,12 +293,12 @@ if ( $this->fecha_creado !== null || $dt !== null ) { - $currNorm = ($this->fecha_creado !== null && $tmpDt = new DateTime($this->fecha_creado)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha_creado !== null && $tmpDt = new DateTime($this->fecha_creado)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha_creado = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha_creado = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = UsuarioPeer::FECHA_CREADO; } } @@ -331,12 +325,12 @@ if ( $this->fecha_actualizado !== null || $dt !== null ) { - $currNorm = ($this->fecha_actualizado !== null && $tmpDt = new DateTime($this->fecha_actualizado)) ? $tmpDt->format('Y-m-d H:i:s') : null; - $newNorm = ($dt !== null) ? $dt->format('Y-m-d H:i:s') : null; + $currNorm = ($this->fecha_actualizado !== null && $tmpDt = new DateTime($this->fecha_actualizado)) ? $tmpDt->format('Y-m-d\\TH:i:sO') : null; + $newNorm = ($dt !== null) ? $dt->format('Y-m-d\\TH:i:sO') : null; if ( ($currNorm !== $newNorm) ) { - $this->fecha_actualizado = ($dt ? $dt->format('Y-m-d H:i:s') : null); + $this->fecha_actualizado = ($dt ? $dt->format('Y-m-d\\TH:i:sO') : null); $this->modifiedColumns[] = UsuarioPeer::FECHA_ACTUALIZADO; } } Modified: prosistem/alba/trunk/alba/web/instalar/funciones.php =================================================================== --- prosistem/alba/trunk/alba/web/instalar/funciones.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/web/instalar/funciones.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -1,7 +1,7 @@ <?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 @@ -47,120 +47,55 @@ } } -function dump2Array($file) { - $aSql = array(); - $res_sql = ""; - DebugLog ("dump2Array(): Comprobando si existe el archivo"); - if(file_exists($file)) { - $sql = file($file); - DebugLog("dump2Array(): Leyendo archivo .SQL"); - foreach($sql as $sql_line) { - $sql_line = trim($sql_line); - if (($sql_line != "") && (substr($sql_line, 0, 2) != "--") && (substr($sql_line, 0, 1) != "#") ) { - $res_sql .= $sql_line."\n"; - } - } - $aSql= array_slice(explode(";\n", $res_sql),0,-1); - DebugLog ("dump2Array(): Total de lineas :" . count($aSql)); - } - else { - DebugLog ("dump2Array(): El archivo no existe: $file"); - return array(); - } - - return $aSql; -} - -function executeDump($file, $protocol, $host, $user, $pass, $db) { - DebugLog("executeDump(): file: $file"); - DebugLog("executeDump(): user: $user"); - DebugLog("executeDump(): db: $db"); - $aSql = dump2Array($file); - $error = false; - if(count($aSql) > 0 && file_exists($file)) { - if($protocol == 'mysql' OR $protocol == 'pgsql') { - $dsn = "$protocol:host=$host;dbname=$db"; // necesito saber como hacer conexion utf8 - - try { - $dbh = new PDO($dsn, $user, $pass); - $dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); - } - catch (PDOException $e) { - DebugLog("excuteDump(): No se puede conectar ala base de datos. " . $e->getMessage()); - return false; - } - - try { - DebugLog("executeDump(): ejecutando BEGIN" ); - $dbh->beginTransaction(); - - if($protocol == 'pgsql') { - DebugLog("executeDump(): ejecutando SET CONSTRAINTS ALL DEFERRED" ); - $dbh->exec("SET CONSTRAINTS ALL DEFERRED"); - } - - foreach($aSql as $sql_line) { - // esto es lamentable: saco los drop que genera el propel -// if($protocol == 'pgsql' AND ( strstr($sql_line,'DROP') !== false)) { - // continue; - if($protocol == 'pgsql') { - $sql_line = str_replace('DROP TABLE', 'DROP TABLE IF EXISTS', $sql_line); - $sql_line = str_replace('DROP SEQUENCE', 'DROP SEQUENCE IF EXISTS', $sql_line); - } - $dbh->exec(trim($sql_line)); - } - - DebugLog("executeDump(): Sin errores ejecutando COMMIT y saliendo"); - $dbh->commit(); - } - catch (PDOException $e) { - DebugLog("executeDump(): Error en". $e->getMessage()); - DebugLog("executeDump(): Se encontraron errores ejecutando ROLLBACK y saliendo"); - $dbh->rollBack(); - return false; - } - - return true; - - } else { - DebugLog("executeDump(): El protocolo no es ni mysql ni pgsql"); - return false; - } - } else { - DebugLog("executeDump(): No hay instrucciones SQL en el archivo"); - return false; - } - -} /** * genera el archivo de conexion a la base de datos */ function generate_databases_yml($protocol,$host,$user,$pass,$db) { - $yml = AlbaPath() . DIRECTORY_SEPARATOR . "config" . DIRECTORY_SEPARATOR . "databases.yml"; - DebugLog ("generate_databases_yml(): generando archivo de conexion $yml"); - if ($fp = @fopen ($yml,'w')) { - fwrite ($fp,"# Archivo generado por el instalador de Alba " . date('m/d/Y H:i:s') . "\n"); - fwrite ($fp,"all:\n"); - fwrite ($fp," propel:\n"); - fwrite ($fp," class: sfPropelDatabase\n"); - fwrite ($fp," param:\n"); - if ($pass != "") { - fwrite ($fp," dsn: $protocol://$user:$pass@$host/$db\n"); - } else { - fwrite ($fp," dsn: $protocol://$user@$host/$db\n"); - } - fwrite ($fp," datasource: alba\n"); - fwrite ($fp," encoding: utf8\n"); - fwrite ($fp, "\n"); + $dist = AlbaPath() . DIRECTORY_SEPARATOR . "config" . DIRECTORY_SEPARATOR . "databases.yml.dist"; + $out = AlbaPath() . DIRECTORY_SEPARATOR . "config" . DIRECTORY_SEPARATOR . "databases.yml"; + $vars = array( + 'PROTOCOL'=> $protocol, + 'USERDB'=> $user, + 'PASSDB'=> $pass, + 'DBNAME'=> $db, + 'SERVER'=> $host + ); + DebugLog ("generate_databases_yml(): generando archivo de conexion " . $dist); + if (template_file($dist,$out, $vars)) { DebugLog("generate_databases_yml(): archivo yml generado"); return true; } else { - DebugLog("generate_databases_yml(): no se puede abrir el archivo. "); + DebugLog("generate_databases_yml(): no se puede generar el archivo. "); return false; } } +/** + * abre el archivo de texto, y remplaza %VARIABLE% por la del array + * y lo guarda en el archivo destino + * el path de los archivos debe ser absoluto + */ +function template_file($origen = '', $destino = '', $variables = array()) +{ + //cargamos algunas variables propias + $variables['TIMESTAMP'] = date('d/m/Y H:i:s'); + DebugLog('template_file: comprobando si existe el archivo de origen ' .$origen); + if (file_exists($origen)) { + DebugLog('template_file: cargando contenidos de '. $origen); + $contenido = file_get_contents($origen); + foreach ($variables as $variable => $valor) { + DebugLog('template_file: reemplazando var: ' . $variable. '=' . $valor); + $contenido = str_replace('%'.strtoupper($variable).'%', $valor, $contenido); + } + DebugLog('template_file: guardando contenido en ' . $destino); + return file_put_contents($destino, $contenido); + } + else { + DebugLog('template_file: no se puede abrir el archivo de origen: ' . $origen); + return false; + } +} /** * genera el archivo autoload.yml para que no se autocarguen todos los modelos de DB @@ -189,86 +124,72 @@ * genera el archivo propel.ini para configurar el acceso a la base de datos para tareas */ function generate_propel_ini($protocol,$host,$user,$pass,$db) { - $ini = AlbaPath() . DIRECTORY_SEPARATOR . "config" . DIRECTORY_SEPARATOR . "propel.ini"; - DebugLog ("generate_propel_ini(): generando archivo de propel $ini"); - if ($fp = @fopen ($ini,'w')) { - fwrite ($fp,"# Archivo generado por el instalador de Alba " . date('m/d/Y H:i:s') . "\n\n"); - fwrite ($fp,"propel.targetPackage = alba\n"); - fwrite ($fp,"propel.project = alba\n"); - fwrite ($fp,"propel.database = $protocol\n"); - fwrite ($fp,"propel.database.createUrl = $protocol://$user:$pass@$host/\n"); - fwrite ($fp,"propel.database.url = $protocol://$user:$pass@$host/$db\n"); - fwrite ($fp,"propel.addGenericAccessors = true\n"); - fwrite ($fp,"propel.addGenericMutators = true\n"); - fwrite ($fp,"propel.addTimeStamp = false\n"); - fwrite ($fp,"propel.schema.validate = false\n\n"); - fwrite ($fp,"; directories\n"); - fwrite ($fp,"propel.home = .\n"); - fwrite ($fp,'propel.output.dir = ${propel.home}'."\n"); - fwrite ($fp,'propel.schema.dir = ${propel.output.dir}/config'."\n"); - fwrite ($fp,'propel.conf.dir = ${propel.output.dir}/config'."\n"); - fwrite ($fp,'propel.phpconf.dir = ${propel.output.dir}/config'."\n"); - fwrite ($fp,'propel.sql.dir = ${propel.output.dir}/data/sql'."\n"); - fwrite ($fp,"propel.runtime.conf.file = runtime-conf.xml\n"); - fwrite ($fp,'propel.php.dir = ${propel.output.dir}'."\n"); - fwrite ($fp,"propel.default.schema.basename = schema\n"); - fwrite ($fp,"propel.datadump.mapper.from = *schema.xml\n"); - fwrite ($fp,"propel.datadump.mapper.to = *data.xml\n\n"); - fwrite ($fp,"; builder settings\n"); - fwrite ($fp,"propel.builder.peer.class = addon.propel.builder.SfPeerBuilder\n"); - fwrite ($fp,"propel.builder.object.class = addon.propel.builder.SfObjectBuilder\n"); - fwrite ($fp,"propel.builder.objectstub.class = addon.propel.builder.SfExtensionObjectBuilder\n"); - fwrite ($fp,"propel.builder.peerstub.class = addon.propel.builder.SfExtensionPeerBuilder\n"); - fwrite ($fp,"propel.builder.objectmultiextend.class = addon.propel.builder.SfMultiExtendObjectBuilder\n"); - fwrite ($fp,"propel.builder.mapbuilder.class = addon.propel.builder.SfMapBuilderBuilder\n"); - fwrite ($fp,"propel.builder.interface.class = propel.engine.builder.om.php5.PHP5InterfaceBuilder\n"); - fwrite ($fp,"propel.builder.node.class = propel.engine.builder.om.php5.PHP5NodeBuilder\n"); - fwrite ($fp,"propel.builder.nodepeer.class = propel.engine.builder.om.php5.PHP5NodePeerBuilder\n"); - fwrite ($fp,"propel.builder.nodestub.class = propel.engine.builder.om.php5.PHP5ExtensionNodeBuilder\n"); - fwrite ($fp,"propel.builder.nodepeerstub.class = propel.engine.builder.om.php5.PHP5ExtensionNodePeerBuilder\n\n"); - fwrite ($fp,"propel.mysql.tableType = InnoDB\n"); - fwrite ($fp,"propel.mysql.encoding = utf8\n"); - fwrite ($fp,"propel.packageObjectModel = true\n\n"); - fwrite ($fp,"propel.builder.addIncludes = false\n"); - fwrite ($fp,"propel.builder.addComments = false\n"); - fwrite ($fp,"propel.builder.addBehaviors = false\n"); + $dist = AlbaPath() . DIRECTORY_SEPARATOR . "config" . DIRECTORY_SEPARATOR . "propel.ini.dist"; + $out = AlbaPath() . DIRECTORY_SEPARATOR . "config" . DIRECTORY_SEPARATOR . "propel.ini"; + $vars = array( + 'PROTOCOL' => $protocol, + 'SERVER' => $host, + 'DBNAME' => $db, + 'USERDB' => $user, + 'PASSDB' => $pass + ); + DebugLog ("generate_propel_ini(): generando archivo de propel ". $out); + + if (template_file($dist,$out,$vars)) { DebugLog("generate_propel_ini(): archivo ini generado"); return true; } else { - DebugLog("generate_propel_ini(): no se puede abrir el archivo. "); + DebugLog("generate_propel_ini(): no se pudo generar " . $out); return false; } } - - /** * carga el schema a l abase de datos +* hace el build-sql y el insert-sql */ -function crear_schema ($filesql, $protocol, $host, $user, $pass, $db) { - DebugLog ("crear_schema(): Agregando $filesql"); - if ($filesql == "") - return false; - else - return executeDump(AlbaPath() . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR .$filesql, $protocol, $host, $user, $pass, $db); +function crear_schema () { + DebugLog('crear_schema: lanzando tarea propel-build-sql'); + if (run_sf_task('sfPropelBuildSqlTask')) { + DebugLog('crear_schema: lanzando tarea propel-insert-sql'); + if (run_sf_task('sfPropelInsertSqlTask')) { + return true; + } + else { + DebugLog('crear_schema: Error al ejecutar insert-sql' , 'E'); + return false; + } + } + else { + DebugLog ('crear_schema: error al ejecutar build-sql', 'E'); + return false; + } } /** -* carga los datos ejemplo/minima +* carga los datos base y si se selecciono algun ejemplo +* lo agrega. */ -function crear_base_modelo($filesql, $protocol, $host, $user, $pass, $db) { - DebugLog("crear_base_modelo(): Creado base de datos modelo: $filesql"); - if ($filesql == "") - return false; - else - return executeDump(AlbaPath() . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR .$filesql, $protocol, $host, $user, $pass, $db); +function cargar_base_modelo($modelo) { + + DebugLog('cargar_base_modelo: lanzando LoadData con fixture base'); + if (!run_sf_task('sfPropelLoadDataTask',array(),'--dir=data'.DIRECTORY_SEPARATOR.'base')) { + return false; + } + if ($modelo != '') { + DebugLog('cargar_base_modelo: lanazando LoadData con Base seleccionada: '. $modelo); + if (!run_sf_task('sfPropelLoadDataTask',array(),'--append --dir=data'.DIRECTORY_SEPARATOR. $modelo)) { + return false; + } + } + return true; } /** * helpers para comprobaciones -*/ +*/ function check_php() { DebugLog ("Comprobando version de php"); return version_compare(phpversion(),'5.0.0','>='); @@ -293,8 +214,8 @@ function check_apache2() { DebugLog("Comprobando version de apache"); if (extension_loaded('apache')) { - $version = 0; - preg_match('!Apache/(.*) !U', apache_get_version(), $version); + $version = 0; + preg_match('!Apache/(.*) !U', apache_get_version(), $version); return version_compare($version[1],'2.0.0','>='); } else @@ -319,59 +240,41 @@ return false; } - -function build_model_sql() { - - define ('STDOUT',''); +function run_sf_task($tarea ='', $args = array(), $options = array()) { + if (!defined('STDOUT')) { + define ('STDOUT',''); + } $pconfig = dirname(__FILE__).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'ProjectConfiguration.class.php'; - DebugLog('pconfig: ' . $pconfig); - require($pconfig); + DebugLog('run_sf_task: pconfig: ' . $pconfig); + require_once($pconfig); $configuration = ProjectConfiguration::getApplicationConfiguration('principal', 'dev', true); sfContext::createInstance($configuration); $dispatcher = sfContext::getInstance()->getEventDispatcher(); $formatter = new sfFormatter(); - $args = array(); - $options = array(); - - $task = new sfPropelBuildModelTask($dispatcher,$formatter); + $old_cwd = getcwd(); + DebugLog('run_sf_task: cambiado a: ' . sfConfig::get('sf_root_dir')); chdir(sfConfig::get('sf_root_dir')); - $task->run($args, $options); - - $task = new sfPropelBuildSqlTask($dispatcher, $formatter); - chdir(sfConfig::get('sf_root_dir')); - $task->run($args, $options); - - /* - try - { - $ret = $pake->run(sfConfig::get('sf_symfony_data_dir').DIRECTORY_SEPARATOR.'tasks'.DIRECTORY_SEPARATOR.'sfPakePropel.php', array('propel-build-model','--quiet') , true); + DebugLog('run_sf_task: creando instancia de ' . $tarea); + $task = new $tarea($dispatcher,$formatter); + try { + DebugLog('run_sf_task: ejecutando tarea ' . $tarea); + $task->run($args, $options); + DebugLog('run_sf_task: fin de tarea, volviendo a ' . $old_cwd); + chdir($old_cwd); + return true; } - catch (pakeException $e) - { - print "<strong>ERROR</strong>: ".$e->getMessage(); + catch (Exception $e) { + DebugLog('run_sf_task: volviendo a ' . $old_cwd ,"E"); + chdir($old_cwd); + DebugLog('run_sf_task: error al ejecutar tarea: ' . $e->getMessage() ,"E"); + return $e->getMessage(); } - try - { - $ret = $pake->run(sfConfig::get('sf_symfony_data_dir').DIRECTORY_SEPARATOR.'tasks'.DIRECTORY_SEPARATOR.'sfPakePropel.php', array('propel-build-sql','--quiet') , true); - } - catch (pakeException $e) - { - print "<strong>ERROR</strong>: ".$e->getMessage(); - } -*/ } +function build_model_sql() { + DebugLog('build_model_sql: lanzando tarea'); + return run_sf_task('sfPropelBuildModelTask'); - - -/* -<?php -##IP_CHECK## -require_once(dirname(__FILE__).'/../config/ProjectConfiguration.class.php'); - -$configuration = ProjectConfiguration::getApplicationConfiguration('principal', 'dev', true); -sfContext::createInstance($configuration)->dispatch(); - -*/ +} Modified: prosistem/alba/trunk/alba/web/instalar/paso4.php =================================================================== --- prosistem/alba/trunk/alba/web/instalar/paso4.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/web/instalar/paso4.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -1,7 +1,7 @@ <?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 @@ -37,24 +37,24 @@ $user = $_SESSION['albainstall']['user']; $pass = $_SESSION['albainstall']['pass']; $db = $_SESSION['albainstall']['db']; - - + + if (isset($_POST['set_tipo_base']) && $_POST['set_tipo_base'] == 1) { if(!isset($_POST['tipo_base'])) { $error_flag= true; $error_msg = "Por favor seleccione un tipo de base de datos"; } - else { + else { $_SESSION['albainstall']['tipo_base'] = $_POST['tipo_base']; $completo = false; } } else - $completo = true; + $completo = true; ?> <div id="detalle"> <p>Selección de base de datos inicial:</p> -<p>Ahora ud. podrá elegir si desea comenzar +<p>Ahora ud. podrá elegir si desea comenzar a utilizar el sistema con una base vacía (datos mínimos)<br/> ó con una base de datos de Ejemplo (datos de prueba).</p> </div> @@ -73,12 +73,13 @@ <table> <tr> <td>Datos mínimos:</td> - <td><input type="radio" name="tipo_base" value="minima" <?php echo isset($_POST['tipo_base']) && $_POST['tipo_base'] == 'minima' ? 'checked' : ''?> ></td> + <td> + <select name="tipo_base"> + <option value="" <?php echo $_SESSION['albainstall']['tipo_base'] == '' ? 'selected' : ''?>>MINIMA - Datos basicos para comenzar a operar</option> + <option value="ejemplo1" <?php echo $_SESSION['albainstall']['tipo_base'] == 'ejemplo1' ? 'selected' : ''?>>EJEMPLO1 - Datos de ejemplo</option> + </select> + </td> </tr> - <tr> - <td>Datos ejemplo:</td> - <td><input type="radio" name="tipo_base" value="ejemplo1" <?php echo isset($_POST['tipo_base']) && $_POST['tipo_base'] == 'ejemplo1' ? 'checked' : ''?>></td> - </tr> </table> <br/> <input type="submit" name="btEnviar" value="Seleccionar base de datos" class="boton"> @@ -92,8 +93,8 @@ <?php endif;?> <?php endif;?> -<?php +<?php // ir al siguiente paso $paso = 5; - -?> \ No newline at end of file + +?> Modified: prosistem/alba/trunk/alba/web/instalar/paso6.php =================================================================== --- prosistem/alba/trunk/alba/web/instalar/paso6.php 2010-01-14 15:46:10 UTC (rev 6318) +++ prosistem/alba/trunk/alba/web/instalar/paso6.php 2010-01-16 05:33:02 UTC (rev 6319) @@ -1,7 +1,7 @@ <?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 @@ -37,9 +37,9 @@ $user = $_SESSION['albainstall']['user']; $pass = $_SESSION['albainstall']['pass']; $db = $_SESSION['albainstall']['db']; -$tipo_base = $_SESSION ['albainstall']['tipo_base']; - -$error_flag = false; +$tipo_base = $_SESSION ['albainstall']['tipo_base']; + +$error_flag = false; ?> <div id="detalle"> <p>Resultado de la instalación:</p> @@ -48,7 +48,7 @@ <tr> <td>Generando archivo de configuración de acceso a base de datos:</td> <td> - <?php + <?php $ret = generate_databases_yml($tipo_motor_base,$host,$user,$pass,$db); echo $ret ? IMG_OK : IMG_ERROR; if (!$ret) { @@ -63,7 +63,7 @@ <tr> <td>Generando archivo de configuración para las tareas:</td> <td> - <?php + <?php $ret = generate_propel_ini($tipo_motor_base,$host,$user,$pass,$db); echo $ret ? IMG_OK : IMG_ERROR; if (!$ret) { @@ -74,21 +74,18 @@ </td> </tr> <tr> - <td>Generando modelo de la base de datos:</td> + <td>Generando modelo de datos:</td> <td> - <div style="display: none;"> - <?php - $ret = build_model_sql(); - ?> + <div style="display: none"> + <?php $ret = build_model_sql();?> </div> - <?php - $ret = file_exists(AlbaPath() . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR .'lib.model.schema.sql'); + <?php echo $ret ? IMG_OK : IMG_ERROR; if (!$ret) { $error_flag = true; - DebugLog("Error al generar archivo lib.model.schema.sql","E"); + DebugLog("Error al generar el modelo de datos","E"); } ?> </td> @@ -96,8 +93,8 @@ <tr> <td>Creando esquema de base de datos:</td> <td> - <?php - $ret = crear_schema('lib.model.schema.sql', $tipo_motor_base, $host, $user, $pass, $db); + <?php + $ret = crear_schema(); echo $ret ? IMG_OK : IMG_ERROR; if (!$ret) { $error_flag = true; @@ -107,34 +104,17 @@ </td> </tr> <tr> - <td>Cargando modelo de base de datos <?php echo $_SESSION['albainstall']['tipo_base']?>:</td> + <td>Inicializar base de datos <?php echo $_SESSION['albainstall']['tipo_base']?>:</td> <td> - <?php - if ($_SESSION['albainstall']['tipo_base'] == 'minima') - $archivo = "datos_desde_cero.sql"; - elseif ($_SESSION['albainstall']['tipo_base'] == 'ejemplo1') - $archivo = "datos_ejemplo.sql"; - else - $archivo = ""; + <?php ?> - <?php - $ret = crear_base_modelo($archivo, $tipo_motor_base, $host, $user, $pass, $db); + <?php + $ret = cargar_base_modelo($_SESSION['albainstall']['tipo_base']); echo $ret ? IMG_OK : IMG_ERROR; if (!$ret) { $error_flag = true; - DebugLog("Error al cargar modelo de base de datos: $archivo","E"); + DebugLog("Error al cargar modelo de datos: $archivo","E"); } - - //Esto se agrego para hacer update a las secuencias de postgresql - if($tipo_motor_base == 'pgsql') { - $archivo = substr($archivo,0,-4)."_update_seq.sql"; - $ret = crear_base_modelo($archivo, $tipo_motor_base, $host, $user, $pass, $db); - echo $ret ? IMG_OK : IMG_ERROR; - if (!$ret) { - $error_flag = true; - DebugLog("Error al cargar modelo de base de datos: $archivo","E"); - } - } ?> </td> </tr> @@ -155,8 +135,8 @@ <p><a href="../">Ingresar al Sistema de Gestión Educactiva Alba</a></p> <p><i>* Recuerde que para ingresar al sistema el nombre de usuario por defecto es <b>admin</b> y la clave es <b>admin</b>.</i></p> <?php - -// finaliznado los pasos + +// finaliznado los pasos DebugLog ("============================ FIN INSTALACION ALBA - " .date('d-m-Y H:i:s'). "======================="); $completo = true; ?>