SVN Alba r4828 - in prosistem/alba/trunk/alba: config lib/model/map lib/model/om
Author: ftoledo Date: 2007-07-18 17:23:56 -0300 (Wed, 18 Jul 2007) New Revision: 4828 Added: prosistem/alba/trunk/alba/config/schema.yml Removed: prosistem/alba/trunk/alba/config/schema.xml Modified: prosistem/alba/trunk/alba/lib/model/map/LegajoadjuntoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelDocenteEstablecimientoMapBuilder.php prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php prosistem/alba/trunk/alba/lib/model/om/BaseAlumnoPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php prosistem/alba/trunk/alba/lib/model/om/BaseCalendariovacunacion.php prosistem/alba/trunk/alba/lib/model/om/BaseCargobaja.php prosistem/alba/trunk/alba/lib/model/om/BaseCiclolectivo.php prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.php prosistem/alba/trunk/alba/lib/model/om/BaseCuentaPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseDistritoescolar.php prosistem/alba/trunk/alba/lib/model/om/BaseDivision.php prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php prosistem/alba/trunk/alba/lib/model/om/BaseDocenteHorario.php prosistem/alba/trunk/alba/lib/model/om/BaseDocenteHorarioPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseEscalanota.php prosistem/alba/trunk/alba/lib/model/om/BaseEspacio.php prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimientoPeer.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/BaseHorarioescolar.php prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolarPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolartipo.php prosistem/alba/trunk/alba/lib/model/om/BaseLegajoadjunto.php prosistem/alba/trunk/alba/lib/model/om/BaseLegajoadjuntoPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogico.php prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogicoPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseLocacion.php prosistem/alba/trunk/alba/lib/model/om/BaseModulo.php prosistem/alba/trunk/alba/lib/model/om/BaseNiveltipo.php prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacion.php prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacionPeer.php prosistem/alba/trunk/alba/lib/model/om/BasePais.php prosistem/alba/trunk/alba/lib/model/om/BasePeriodo.php prosistem/alba/trunk/alba/lib/model/om/BasePermiso.php prosistem/alba/trunk/alba/lib/model/om/BasePreferencia.php prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocente.php prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocentePeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRelAlumnoDivision.php prosistem/alba/trunk/alba/lib/model/om/BaseRelAlumnoDivisionPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividad.php prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumno.php prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumnoPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocente.php prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocentePeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRelDocenteEstablecimiento.php prosistem/alba/trunk/alba/lib/model/om/BaseRelDocenteEstablecimientoPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRelRolresponsableResponsable.php prosistem/alba/trunk/alba/lib/model/om/BaseRepeticion.php prosistem/alba/trunk/alba/lib/model/om/BaseResponsable.php prosistem/alba/trunk/alba/lib/model/om/BaseResponsablePeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRol.php prosistem/alba/trunk/alba/lib/model/om/BaseRolResponsable.php prosistem/alba/trunk/alba/lib/model/om/BaseTipoasistencia.php prosistem/alba/trunk/alba/lib/model/om/BaseTipodocente.php prosistem/alba/trunk/alba/lib/model/om/BaseTipodocumento.php prosistem/alba/trunk/alba/lib/model/om/BaseTipoespacio.php prosistem/alba/trunk/alba/lib/model/om/BaseTipoiva.php prosistem/alba/trunk/alba/lib/model/om/BaseTipolocacion.php prosistem/alba/trunk/alba/lib/model/om/BaseTurnos.php prosistem/alba/trunk/alba/lib/model/om/BaseUsuario.php Log: convertido el schema xml => yml Deleted: prosistem/alba/trunk/alba/config/schema.xml =================================================================== --- prosistem/alba/trunk/alba/config/schema.xml 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/config/schema.xml 2007-07-18 20:23:56 UTC (rev 4828) @@ -1,743 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!--Autogenerated by CreoleToXMLSchema!--> -<!-- $Id$ --> -<database package="lib.model" name="alba"> - <table name="locacion" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="descripcion" type="VARCHAR" size="255"/> - <column name="direccion" type="VARCHAR" size="128" required="true" default=""/> - <column name="ciudad" type="VARCHAR" size="128" required="true" default=""/> - <column name="codigo_postal" type="VARCHAR" size="20" required="false" default=""/> - <column name="fk_provincia_id" type="INTEGER" required="true" default="0"/> - <column name="fk_tipolocacion_id" type="INTEGER" required="true" default="0"/> - <column name="telefono" type="VARCHAR" size="20"/> - <column name="fax" type="VARCHAR" size="20"/> - <column name="encargado" type="VARCHAR" size="128"/> - <column name="encargado_telefono" type="VARCHAR" size="20"/> - <column name="principal" type="BOOLEAN" required="true" default="false"/> - <foreign-key foreignTable="provincia"> - <reference local="fk_provincia_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="tipolocacion"> - <reference local="fk_tipolocacion_id" foreign="id"/> - </foreign-key> - </table> - <table name="modulo" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="titulo" type="VARCHAR" size="128"/> - <column name="descripcion" type="VARCHAR" size="255"/> - <column name="activo" type="BOOLEAN" required="true" default="true"/> - </table> - <table name="espacio" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="m2" type="FLOAT"/> - <column name="capacidad" type="VARCHAR" size="255"/> - <column name="descripcion" type="VARCHAR" size="255"/> - <column name="estado" type="VARCHAR" size="255"/> - <column name="fk_tipoespacio_id" type="INTEGER" size="11"/> - <column name="fk_locacion_id" type="INTEGER" required="true" default="0"/> - <foreign-key foreignTable="tipoespacio"> - <reference local="fk_tipoespacio_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="locacion"> - <reference local="fk_locacion_id" foreign="id"/> - </foreign-key> - </table> - <table name="tipoespacio" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="descripcion" type="VARCHAR" size="255" required="false" default=""/> - </table> - <table name="tipolocacion" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="descripcion" type="VARCHAR" size="255" required="false" default=""/> - </table> - <table name="distritoescolar" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="direccion" type="VARCHAR" size="128"/> - <column name="telefono" type="VARCHAR" size="20"/> - <column name="ciudad" type="VARCHAR" size="128"/> - </table> - <table name="establecimiento" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="descripcion" type="VARCHAR" size="255"/> - <column name="fk_distritoescolar_id" type="INTEGER" required="true" default="0"/> - <column name="fk_organizacion_id" type="INTEGER" required="true" default="0"/> - <column name="fk_niveltipo_id" type="INTEGER" required="true" default="0"/> - <foreign-key foreignTable="niveltipo"> - <reference local="fk_niveltipo_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="organizacion"> - <reference local="fk_organizacion_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="distritoescolar"> - <reference local="fk_distritoescolar_id" foreign="id"/> - </foreign-key> - </table> - <table name="niveltipo" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="descripcion" type="VARCHAR" size="255"/> - </table> - - <table name="organizacion" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="descripcion" type="VARCHAR" size="255"/> - <column name="razon_social" type="VARCHAR" size="128" required="true" default=""/> - <column name="cuit" type="VARCHAR" size="20" required="true" default=""/> - <column name="direccion" type="VARCHAR" size="128" required="true" default=""/> - <column name="ciudad" type="VARCHAR" size="128" required="true" default=""/> - <column name="codigo_postal" type="VARCHAR" size="20" required="true" default=""/> - <column name="telefono" type="VARCHAR" size="20" required="false" default=""/> - <column name="fk_provincia_id" type="INTEGER" required="true" default="0"/> - <column name="fk_tipoiva_id" type="INTEGER" required="true" default="0"/> - <foreign-key foreignTable="tipoiva"> - <reference local="fk_tipoiva_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="provincia"> - <reference local="fk_provincia_id" foreign="id"/> - </foreign-key> - </table> - - <table name="pais" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre_largo" type="VARCHAR" size="128" required="true" default=""/> - <column name="nombre_corto" type="VARCHAR" size="32" required="true" default=""/> - <column name="orden" type="INTEGER" required="false" default="0"/> - </table> - <table name="permiso" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="descripcion" type="VARCHAR" size="255"/> - <column name="fk_modulo_id" type="INTEGER" required="true" default="0"/> - <column name="credencial" type="VARCHAR" size="32"/> - <foreign-key foreignTable="modulo"> - <reference local="fk_modulo_id" foreign="id"/> - </foreign-key> - </table> - <table name="preferencia" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="valor_por_defecto" type="VARCHAR" size="128"/> - <column name="activo" type="BOOLEAN" required="true" default="true"/> - </table> - <table name="rel_establecimiento_locacion" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_establecimiento_id" type="INTEGER" required="true" default="0"/> - <column name="fk_locacion_id" type="INTEGER" required="true" default="0"/> - <foreign-key foreignTable="establecimiento"> - <reference local="fk_establecimiento_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="locacion"> - <reference local="fk_locacion_id" foreign="id"/> - </foreign-key> - </table> - <table name="rel_rol_permiso" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_rol_id" type="INTEGER" required="true" default="0"/> - <column name="fk_permiso_id" type="INTEGER" required="true" default="0"/> - <foreign-key foreignTable="rol"> - <reference local="fk_rol_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="permiso"> - <reference local="fk_permiso_id" foreign="id"/> - </foreign-key> - </table> - <table name="rel_usuario_permiso" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_usuario_id" type="INTEGER" required="true" default="0"/> - <column name="fk_permiso_id" type="INTEGER" required="true" default="0"/> - <foreign-key foreignTable="usuario"> - <reference local="fk_usuario_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="permiso" onDelete="CASCADE"> - <reference local="fk_permiso_id" foreign="id"/> - </foreign-key> - </table> - <table name="rel_usuario_preferencia" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_usuario_id" type="INTEGER" required="true" default="0"/> - <column name="fk_preferencia_id" type="INTEGER" required="true" default="0"/> - </table> - <table name="rol" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="descripcion" type="VARCHAR" size="255" default=""/> - <column name="activo" type="BOOLEAN" required="true" default="true"/> - </table> - <table name="usuario" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="usuario" type="VARCHAR" size="32" required="true" default=""/> - <column name="clave" type="VARCHAR" size="48" required="true" default=""/> - <column name="correo_publico" type="BOOLEAN" required="false" default="true"/> - <column name="activo" type="BOOLEAN" required="true" default="true"/> - <column name="fecha_creado" type="TIMESTAMP" required="true"/> - <column name="fecha_actualizado" type="TIMESTAMP" required="true"/> - <column name="seguridad_pregunta" type="VARCHAR" size="128"/> - <column name="seguridad_respuesta" type="VARCHAR" size="128"/> - <column name="email" type="VARCHAR" size="128"/> - <column name="fk_establecimiento_id" type="INTEGER" required="true" default="0"/> - <column name="borrado" type="BOOLEAN" required="true" default="false"/> - <foreign-key foreignTable="establecimiento"> - <reference local="fk_establecimiento_id" foreign="id"/> - </foreign-key> - </table> - <table name="tipoiva" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="false" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="descripcion" type="VARCHAR" size="255" required="false" default=""/> - <column name="orden" type="INTEGER" required="false" default="0"/> - </table> - <table name="provincia" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre_corto" type="VARCHAR" size="32" required="true" default=""/> - <column name="nombre_largo" type="VARCHAR" size="128" required="true" default=""/> - <column name="fk_pais_id" type="INTEGER" required="true" default="0"/> - <column name="orden" type="INTEGER" required="false" default="0"/> - <foreign-key foreignTable="pais"> - <reference local="fk_pais_id" foreign="id"/> - </foreign-key> - </table> - <table name="cuenta" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="razon_social" type="VARCHAR" size="128" required="true" default=""/> - <column name="cuit" type="VARCHAR" size="20" required="true" default=""/> - <column name="direccion" type="VARCHAR" size="128" required="true" default=""/> - <column name="ciudad" type="VARCHAR" size="128" required="true" default=""/> - <column name="codigo_postal" type="VARCHAR" size="20" required="true" default=""/> - <column name="telefono" type="VARCHAR" size="20" required="false" default=""/> - <column name="fk_provincia_id" type="INTEGER" required="true" default="0"/> - <column name="fk_tipoiva_id" type="INTEGER" required="true" default="0"/> - <foreign-key foreignTable="tipoiva"> - <reference local="fk_tipoiva_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="provincia"> - <reference local="fk_provincia_id" foreign="id"/> - </foreign-key> - </table> - - <table name="alumno" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="apellido" type="VARCHAR" size="128" required="true" default=""/> - <column name="fecha_nacimiento" type="TIMESTAMP" required="true"/> - <column name="direccion" type="VARCHAR" size="128" required="true" default=""/> - <column name="ciudad" type="VARCHAR" size="128" required="true" default=""/> - <column name="codigo_postal" type="VARCHAR" size="20" required="true" default=""/> - <column name="fk_provincia_id" type="INTEGER" required="true" default="0"/> - <column name="telefono" type="VARCHAR" size="20" required="false" default=""/> - <column name="lugar_nacimiento" type="VARCHAR" size="128" required="false" default=""/> - <column name="fk_tipodocumento_id" type="integer" size="11" required="true" default="0"/> - <column name="nro_documento" type="varchar" size="16" required="true" default=""/> - <column name="sexo" type="CHAR" size="1" required="true" default=""/> - <column name="email" type="VARCHAR" size="128" required="true" default=""/> - <column name="distancia_escuela" type="INTEGER" required="false" default="0"/> - <column name="hermanos_escuela" type="boolean" required="true" default="0"/> - <column name="hijo_maestro_escuela" type="boolean" required="true" default="0"/> - <column name="fk_establecimiento_id" type="INTEGER" required="true" default="0"/> - <column name="fk_cuenta_id" type="INTEGER" required="true" default="0"/> - <column name="certificado_medico" type="boolean" required="true" default="0"/> - <column name="activo" type="boolean" required="true" default="true"/> - <column name="fk_conceptobaja_id" type="INTEGER" required="false"/> - <column name="fk_pais_id" type="INTEGER" required="true" default="0"/> - <foreign-key foreignTable="tipodocumento"> - <reference local="fk_tipodocumento_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="cuenta"> - <reference local="fk_cuenta_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="establecimiento"> - <reference local="fk_establecimiento_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="provincia"> - <reference local="fk_provincia_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="conceptobaja"> - <reference local="fk_conceptobaja_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="pais"> - <reference local="fk_pais_id" foreign="id"/> - </foreign-key> - </table> - <table name="responsable" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="apellido" type="VARCHAR" size="128" required="true" default=""/> - <column name="direccion" type="VARCHAR" size="128" required="false" default=""/> - <column name="ciudad" type="VARCHAR" size="128" required="false" default=""/> - <column name="codigo_postal" type="VARCHAR" size="20" required="false" default=""/> - <column name="fk_provincia_id" type="INTEGER" required="true" default="0"/> - <column name="telefono" type="VARCHAR" size="20" required="false" default=""/> - <column name="telefono_movil" type="VARCHAR" size="20" required="false" default=""/> - <column name="nro_documento" type="VARCHAR" size="20" required="true" default=""/> - <column name="fk_tipodocumento_id" type="INTEGER" required="true" default="0"/> - <column name="sexo" type="CHAR" size="1" required="true" default=""/> - <column name="email" type="VARCHAR" size="128" required="false" default=""/> - <column name="observacion" type="VARCHAR" size="255" required="false" default=""/> - <column name="autorizacion_retiro" type="boolean" required="true" default="false"/> - <column name="fk_cuenta_id" type="INTEGER" required="true" default="0"/> - <column name="fk_rolresponsable_id" type="INTEGER" required="true" default="1"/> - <foreign-key foreignTable="cuenta"> - <reference local="fk_cuenta_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="provincia"> - <reference local="fk_provincia_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="tipodocumento"> - <reference local="fk_tipodocumento_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="rol_responsable"> - <reference local="fk_rolresponsable_id" foreign="id"/> - </foreign-key> - </table> - <table name="ciclolectivo" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_establecimiento_id" type="integer" size="11" required="true"/> - <column name="fecha_inicio" type="TIMESTAMP" required="true"/> - <column name="fecha_fin" type="TIMESTAMP" required="true"/> - <column name="descripcion" type="varchar" size="255" required="true" default=""/> - <column name="actual" type="boolean" required="true" default="false"/> - <foreign-key foreignTable="establecimiento"> - <reference local="fk_establecimiento_id" foreign="id"/> - </foreign-key> - </table> - <table name="turnos" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_ciclolectivo_id" type="integer" size="11" required="true"/> - <column name="hora_inicio" type="time" required="true"/> - <column name="hora_fin" type="time" required="true"/> - <column name="descripcion" type="varchar" size="255" required="true" default=""/> - <foreign-key foreignTable="ciclolectivo"> - <reference local="fk_ciclolectivo_id" foreign="id"/> - </foreign-key> - </table> - <table name="periodo" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_ciclolectivo_id" type="integer" size="11" required="true"/> - <column name="fecha_inicio" type="TIMESTAMP" required="true"/> - <column name="fecha_fin" type="TIMESTAMP" required="true" /> - <column name="descripcion" type="varchar" size="255" required="true" default=""/> - <foreign-key foreignTable="ciclolectivo"> - <reference local="fk_ciclolectivo_id" foreign="id"/> - </foreign-key> - </table> - <table name="conceptobaja" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="varchar" size="128" required="true"/> - <column name="descripcion" type="varchar" size="255" required="false" default=""/> - </table> - <table name="tipodocente" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="varchar" size="128" required="true"/> - <column name="descripcion" type="varchar" size="255" required="false" default=""/> - </table> - <table name="cargobaja" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="varchar" size="128" required="true"/> - <column name="descripcion" type="varchar" size="255" required="false" default=""/> - </table> - <table name="calendariovacunacion" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="varchar" size="128" required="true"/> - <column name="descripcion" type="varchar" size="255" required="false"/> - <column name="periodo" type="varchar" size="128" required="false"/> - <column name="observacion" type="varchar" size="255" required="false" default=""/> - </table> - <table name="rel_calendariovacunacion_alumno" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_alumno_id" type="integer" size="11" required="true"/> - <column name="fk_calendariovacunacion_id" type="integer" size="11" required="true"/> - <column name="observacion" type="varchar" size="255" required="false"/> - <column name="comprobante" type="boolean" required="true" default="false"/> - <column name="fecha" type="TIMESTAMP" required="false"/> - <foreign-key foreignTable="calendariovacunacion"> - <reference local="fk_calendariovacunacion_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="alumno"> - <reference local="fk_alumno_id" foreign="id"/> - </foreign-key> - </table> - <table name="legajopedagogico" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_alumno_id" type="integer" size="11" required="true"/> - <column name="titulo" type="varchar" size="255" required="true"/> - <column name="resumen" type="blob" required="true"/> - <column name="texto" type="blob" required="true"/> - <column name="fecha" type="timestamp" required="true"/> - <column name="fk_usuario_id" type="integer" size="11" required="true"/> - <column name="fk_legajocategoria_id" type="integer" size="11" required="true"/> - <foreign-key foreignTable="legajocategoria"> - <reference local="fk_legajocategoria_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="alumno"> - <reference local="fk_alumno_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="usuario"> - <reference local="fk_usuario_id" foreign="id"/> - </foreign-key> - </table> - <table name="legajocategoria" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="descripcion" type="varchar" size="255" required="true"/> - </table> - <table name="legajoadjunto" idMethod="native"> - <column name="fk_legajopedagogico_id" type="integer" size="11" required="true"/> - <column name="fk_adjunto_id" type="integer" size="11" required="true"/> - <foreign-key foreignTable="adjunto"> - <reference local="fk_adjunto_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="legajopedagogico"> - <reference local="fk_legajopedagogico_id" foreign="id"/> - </foreign-key> - </table> - <table name="adjunto" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="descripcion" type="varchar" size="255" required="false"/> - <column name="titulo" type="varchar" size="255" required="false"/> - <column name="nombre_archivo" type="varchar" size="255" required="true"/> - <column name="tipo_archivo" type="varchar" size="64" required="true"/> - <column name="ruta" type="varchar" size="255" required="true" /> - <column name="fecha" type="timestamp" required="true"/> - </table> - <table name="asistencia" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_alumno_id" type="integer" size="11" required="true"/> - <column name="fk_tipoasistencia_id" type="integer" size="11" required="true"/> - <column name="fecha" type="timestamp" required="true"/> - <foreign-key foreignTable="alumno"> - <reference local="fk_alumno_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="tipoasistencia"> - <reference local="fk_tipoasistencia_id" foreign="id"/> - </foreign-key> - </table> - <table name="concepto" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_establecimiento_id" type="integer" size="11" required="true" default="0"/> - <column name="nombre" type="varchar" size="128" required="true"/> - <column name="descripcion" type="varchar" size="255" required="false"/> - <foreign-key foreignTable="establecimiento"> - <reference local="fk_establecimiento_id" foreign="id"/> - </foreign-key> - </table> - - <table name="escalanota" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_establecimiento_id" type="integer" size="11" required="true" default="0"/> - <column name="nombre" type="varchar" size="128" required="true"/> - <column name="descripcion" type="varchar" size="255" required="false"/> - <column name="orden" type="integer" size="11" required="true"/> - <column name="aprobado" type="boolean" required="true" default="false"/> - <foreign-key foreignTable="establecimiento"> - <reference local="fk_establecimiento_id" foreign="id"/> - </foreign-key> - </table> - <table name="boletin_conceptual" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_escalanota_id" type="integer" size="11" required="true" default="0"/> - <column name="fk_alumno_id" type="integer" size="11" required="true" default="0"/> - <column name="fk_concepto_id" type="integer" size="11" required="true" default="0"/> - <column name="fk_periodo_id" type="integer" size="11" required="true" default="0"/> - <column name="observacion" type="blob" required="true"/> - <column name="fecha" type="timestamp" required="true"/> - <foreign-key foreignTable="escalanota"> - <reference local="fk_escalanota_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="alumno"> - <reference local="fk_alumno_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="concepto"> - <reference local="fk_concepto_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="periodo"> - <reference local="fk_periodo_id" foreign="id"/> - </foreign-key> - </table> - <table name="boletin_actividades" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_escalanota_id" type="integer" size="11" required="true" default="0"/> - <column name="fk_alumno_id" type="integer" size="11" required="true" default="0"/> - <column name="fk_actividad_id" type="integer" size="11" required="true" default="0"/> - <column name="fk_periodo_id" type="integer" size="11" required="true" default="0"/> - <column name="observacion" type="blob" required="true"/> - <column name="fecha" type="timestamp" required="true"/> - <foreign-key foreignTable="escalanota"> - <reference local="fk_escalanota_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="alumno"> - <reference local="fk_alumno_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="actividad"> - <reference local="fk_actividad_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="periodo"> - <reference local="fk_periodo_id" foreign="id"/> - </foreign-key> - </table> - <table name="examen" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_escalanota_id" type="integer" size="11" required="true" default="0"/> - <column name="fk_alumno_id" type="integer" size="11" required="true" default="0"/> - <column name="fk_actividad_id" type="integer" size="11" required="true" default="0"/> - <column name="fk_periodo_id" type="integer" size="11" required="true" default="0"/> - <column name="nombre" type="varchar" size="255" default="" required="true"/> - <column name="observacion" type="blob" required="true"/> - <column name="fecha" type="timestamp" required="true"/> - <foreign-key foreignTable="escalanota"> - <reference local="fk_escalanota_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="alumno"> - <reference local="fk_alumno_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="actividad"> - <reference local="fk_actividad_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="periodo"> - <reference local="fk_periodo_id" foreign="id"/> - </foreign-key> - </table> - <table name="anio" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_establecimiento_id" type="integer" size="11" required="true" default="0"/> - <column name="descripcion" type="varchar" size="255" required="true" default=""/> - <foreign-key foreignTable="establecimiento"> - <reference local="fk_establecimiento_id" foreign="id"/> - </foreign-key> - </table> - <table name="division" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_anio_id" type="integer" size="11" required="true" default="0"/> - <column name="descripcion" type="varchar" size="255" required="true" default=""/> - <column name="fk_turnos_id" type="integer" size="11" required="true" default="0"/> - <column name="orden" type="INTEGER" required="false" default="0"/> - <foreign-key foreignTable="anio"> - <reference local="fk_anio_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="turnos"> - <reference local="fk_turnos_id" foreign="id"/> - </foreign-key> - </table> - <table name="repeticion" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="descripcion" type="varchar" size="255" required="true" default=""/> - <column name="orden" type="integer" size="11" required="true" default="0"/> - </table> - <table name="actividad" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_establecimiento_id" type="integer" size="11" required="true" default="0"/> - <column name="nombre" type="varchar" size="128" required="true" default=""/> - <column name="descripcion" type="varchar" size="255" required="false"/> - <foreign-key foreignTable="establecimiento"> - <reference local="fk_establecimiento_id" foreign="id"/> - </foreign-key> - </table> - <table name="rel_anio_actividad" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_anio_id" type="integer" size="11" required="true" default="0"/> - <column name="fk_actividad_id" type="integer" size="11" required="true" default="0"/> - <column name="horas" type="decimal" size="10,2" required="true" default="0"/> - <foreign-key foreignTable="actividad"> - <reference local="fk_actividad_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="anio"> - <reference local="fk_anio_id" foreign="id"/> - </foreign-key> - </table> - <table name="rel_alumno_division" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_division_id" type="integer" size="11" required="true" default="0"/> - <column name="fk_alumno_id" type="integer" size="11" required="true" default="0"/> - <foreign-key foreignTable="alumno"> - <reference local="fk_alumno_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="division"> - <reference local="fk_division_id" foreign="id"/> - </foreign-key> - </table> - <table name="rel_division_actividad_docente" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_division_id" type="integer" size="11" required="false" default="0"/> - <column name="fk_actividad_id" type="integer" size="11" required="true" default="0"/> - <column name="fk_docente_id" type="integer" size="11" required="false" default="0"/> - <column name="fk_evento_id" type="integer" size="11" required="false" default="0"/> - <!-- column name="fk_tipodocente_id" type="integer" size="11" required="false" default="0"/ --> - <!-- column name="fk_cargobaja_id" type="integer" size="11" required="false" default="0"/ --> - <column name="fk_repeticion_id" type="integer" size="11" required="false" default="0"/> - <column name="fecha_inicio" type="timestamp" required="true"/> - <column name="fecha_fin" type="timestamp" required="true"/> - <column name="hora_inicio" type="time" required="true"/> - <column name="hora_fin" type="time" required="true"/> - <foreign-key foreignTable="division"> - <reference local="fk_division_id" foreign="id"/> - </foreign-key> - <!-- - <foreign-key foreignTable="tipodocente"> - <reference local="fk_tipodocente_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="cargobaja"> - <reference local="fk_cargobaja_id" foreign="id"/> - </foreign-key> - --> - <foreign-key foreignTable="docente"> - <reference local="fk_docente_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="actividad"> - <reference local="fk_actividad_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="repeticion"> - <reference local="fk_repeticion_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="evento"> - <reference local="fk_evento_id" foreign="id"/> - </foreign-key> - </table> - <table name="docente" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="apellido" type="VARCHAR" size="128" required="true" default=""/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="sexo" type="CHAR" size="1" required="false" default="U"/> - <column name="fecha_nacimiento" type="TIMESTAMP" required="true"/> - <column name="fk_tipodocumento_id" type="integer" size="11" required="true" default="0"/> - <column name="nro_documento" type="varchar" size="16" required="true" default=""/> - <column name="direccion" type="varchar" size="128" required="false" default=""/> - <column name="ciudad" type="varchar" size="128" required="false" default=""/> - <column name="codigo_postal" type="varchar" size="20" required="false" default=""/> - <column name="email" type="varchar" size="255" required="false" default=""/> - <column name="telefono" type="varchar" size="20" required="false" default=""/> - <column name="telefono_movil" type="varchar" size="20" required="false" default=""/> - <column name="titulo" type="varchar" size="128" required="true" default=""/> - <column name="libreta_sanitaria" type="boolean" required="false" default="false"/> - <column name="psicofisico" type="boolean" required="false" default="false"/> - <column name="activo" type="boolean" required="false" default="true"/> - <column name="fk_provincia_id" type="integer" size="11" required="true" default="0"/> - <foreign-key foreignTable="tipodocumento"> - <reference local="fk_tipodocumento_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="provincia"> - <reference local="fk_provincia_id" foreign="id"/> - </foreign-key> - </table> - <table name="rel_docente_establecimiento" idMethod="native"> - <column name="fk_establecimiento_id" type="integer" size="11" required="true" default="0"/> - <column name="fk_docente_id" type="integer" size="11" required="true" default="0"/> - <foreign-key foreignTable="docente"> - <reference local="fk_docente_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="establecimiento"> - <reference local="fk_establecimiento_id" foreign="id"/> - </foreign-key> - </table> - <table name="tipodocumento" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="descripcion" type="VARCHAR" size="255" required="false" default=""/> - <column name="orden" type="integer" size="11" required="false" default="0"/> - </table> - <table name="rel_actividad_docente" idMethod="native"> - <column name="fk_actividad_id" type="integer" size="11" required="true" primaryKey="true"/> - <column name="fk_docente_id" type="integer" size="11" required="true" primaryKey="true"/> - <foreign-key foreignTable="docente"> - <reference local="fk_docente_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="actividad"> - <reference local="fk_actividad_id" foreign="id"/> - </foreign-key> - </table> - <table name="docente_horario" idMethod="native"> - <column name="fk_docente_id" type="integer" size="11" required="true" primaryKey="true"/> - <column name="fk_evento_id" type="integer" size="11" required="true" primaryKey="true"/> - <foreign-key foreignTable="evento"> - <reference local="fk_evento_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="docente"> - <reference local="fk_docente_id" foreign="id"/> - </foreign-key> - </table> - <table name="feriado" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="varchar" size="128" required="true"/> - <column name="fecha" type="timestamp" required="true"/> - <column name="repeticion_anual" type="BOOLEAN" default="false" required="false"/> - <column name="inamovible" type="BOOLEAN" default="false" required="false"/> - <column name="fk_ciclolectivo_id" type="integer" size="11" required="true" default="0"/> - <foreign-key foreignTable="ciclolectivo"> - <reference local="fk_ciclolectivo_id" foreign="id"/> - </foreign-key> - </table> - <table name="horarioescolar" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="dia" type="integer" size="11" required="true" default="0"/> - <column name="hora_inicio" type="TIME" required="true"/> - <column name="hora_fin" type="TIME" required="true"/> - <column name="nombre" type="varchar" size="128" required="true"/> - <column name="descripcion" type="varchar" size="255" required="false"/> - <column name="fk_establecimiento_id" type="INTEGER" required="true" default="0"/> - <column name="fk_turnos_id" type="INTEGER" required="true" default="0"/> - <column name="fk_horarioescolartipo_id" type="INTEGER" required="true" default="0"/> - <foreign-key foreignTable="horarioescolartipo"> - <reference local="fk_horarioescolartipo_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="establecimiento"> - <reference local="fk_establecimiento_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="turnos"> - <reference local="fk_turnos_id" foreign="id"/> - </foreign-key> - </table> - <table name="horarioescolartipo" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="descripcion" type="VARCHAR" size="255" required="false"/> - </table> - - <table name="tipoasistencia" idMethod="native"> - <column name="id" type="INTEGER" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="10" required="true"/> - <column name="descripcion" type="VARCHAR" size="255" required="false" default=""/> - <column name="valor" type="DECIMAL" size="4,2" required="true" default="1"/> - <column name="grupo" type="VARCHAR" size="30" required="false" default=""/> - <column name="defecto" type="BOOLEAN" required="true" default="0"/> - </table> - <table name="rol_responsable" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="nombre" type="VARCHAR" size="128" required="true" default=""/> - <column name="descripcion" type="VARCHAR" size="255" default=""/> - <column name="activo" type="BOOLEAN" required="true" default="true"/> - </table> - <table name="evento" idMethod="native"> - <column name="id" type="INTEGER" required="true" autoIncrement="true" primaryKey="true"/> - <column name="titulo" type="VARCHAR" size="128" required="true"/> - <column name="fecha_inicio" type="TIMESTAMP" required="true"/> - <column name="fecha_fin" type="TIMESTAMP" required="true"/> - <column name="tipo" type="INTEGER" required="true" default="0"/> - <column name="frecuencia" type="INTEGER" required="true" default="0"/> - <column name="frecuencia_intervalo" type="INTEGER" required="true" default="0"/> - <column name="recurrencia_fin" type="VARCHAR" size="16" required="false" default=""/> - <column name="recurrencia_dias" type="INTEGER" required="true" default="0"/> - <column name="estado" type="INTEGER" required="true" default="0"/> - </table> - <table name="rel_rolresponsable_responsable" idMethod="native"> - <column name="id" type="INTEGER" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_rolresponsable_id" type="INTEGER" size="11" required="true" default="0"/> - <column name="fk_responsable_id" type="INTEGER" size="11" required="true" default="0"/> - <column name="fk_alumno_id" type="INTEGER" size="11" required="true" default="0"/> - <column name="descripcion" type="VARCHAR" size="255" default=""/> - <foreign-key foreignTable="rol_responsable"> - <reference local="fk_rolresponsable_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="responsable"> - <reference local="fk_responsable_id" foreign="id"/> - </foreign-key> - <foreign-key foreignTable="alumno"> - <reference local="fk_alumno_id" foreign="id"/> - </foreign-key> - </table> -</database> Added: prosistem/alba/trunk/alba/config/schema.yml =================================================================== --- prosistem/alba/trunk/alba/config/schema.yml 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/config/schema.yml 2007-07-18 20:23:56 UTC (rev 4828) @@ -0,0 +1,1918 @@ +--- +alba: + _attributes: + package: lib.model + locacion: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + descripcion: + type: VARCHAR + size: 255 + direccion: + type: VARCHAR + size: 128 + required: true + default: + ciudad: + type: VARCHAR + size: 128 + required: true + default: + codigo_postal: + type: VARCHAR + size: 20 + required: false + default: + fk_provincia_id: + type: INTEGER + required: true + default: 0 + foreignTable: provincia + foreignReference: id + fk_tipolocacion_id: + type: INTEGER + required: true + default: 0 + foreignTable: tipolocacion + foreignReference: id + telefono: + type: VARCHAR + size: 20 + fax: + type: VARCHAR + size: 20 + encargado: + type: VARCHAR + size: 128 + encargado_telefono: + type: VARCHAR + size: 20 + principal: + type: BOOLEAN + required: true + default: false + modulo: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + titulo: + type: VARCHAR + size: 128 + descripcion: + type: VARCHAR + size: 255 + activo: + type: BOOLEAN + required: true + default: true + espacio: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + m2: + type: FLOAT + capacidad: + type: VARCHAR + size: 255 + descripcion: + type: VARCHAR + size: 255 + estado: + type: VARCHAR + size: 255 + fk_tipoespacio_id: + type: INTEGER + size: 11 + foreignTable: tipoespacio + foreignReference: id + fk_locacion_id: + type: INTEGER + required: true + default: 0 + foreignTable: locacion + foreignReference: id + tipoespacio: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + descripcion: + type: VARCHAR + size: 255 + required: false + default: + tipolocacion: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + descripcion: + type: VARCHAR + size: 255 + required: false + default: + distritoescolar: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + direccion: + type: VARCHAR + size: 128 + telefono: + type: VARCHAR + size: 20 + ciudad: + type: VARCHAR + size: 128 + establecimiento: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + descripcion: + type: VARCHAR + size: 255 + fk_distritoescolar_id: + type: INTEGER + required: true + default: 0 + foreignTable: distritoescolar + foreignReference: id + fk_organizacion_id: + type: INTEGER + required: true + default: 0 + foreignTable: organizacion + foreignReference: id + fk_niveltipo_id: + type: INTEGER + required: true + default: 0 + foreignTable: niveltipo + foreignReference: id + niveltipo: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + descripcion: + type: VARCHAR + size: 255 + organizacion: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + descripcion: + type: VARCHAR + size: 255 + razon_social: + type: VARCHAR + size: 128 + required: true + default: + cuit: + type: VARCHAR + size: 20 + required: true + default: + direccion: + type: VARCHAR + size: 128 + required: true + default: + ciudad: + type: VARCHAR + size: 128 + required: true + default: + codigo_postal: + type: VARCHAR + size: 20 + required: true + default: + telefono: + type: VARCHAR + size: 20 + required: false + default: + fk_provincia_id: + type: INTEGER + required: true + default: 0 + foreignTable: provincia + foreignReference: id + fk_tipoiva_id: + type: INTEGER + required: true + default: 0 + foreignTable: tipoiva + foreignReference: id + pais: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre_largo: + type: VARCHAR + size: 128 + required: true + default: + nombre_corto: + type: VARCHAR + size: 32 + required: true + default: + orden: + type: INTEGER + required: false + default: 0 + permiso: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + descripcion: + type: VARCHAR + size: 255 + fk_modulo_id: + type: INTEGER + required: true + default: 0 + foreignTable: modulo + foreignReference: id + credencial: + type: VARCHAR + size: 32 + preferencia: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + valor_por_defecto: + type: VARCHAR + size: 128 + activo: + type: BOOLEAN + required: true + default: true + rel_establecimiento_locacion: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + fk_establecimiento_id: + type: INTEGER + required: true + default: 0 + foreignTable: establecimiento + foreignReference: id + fk_locacion_id: + type: INTEGER + required: true + default: 0 + foreignTable: locacion + foreignReference: id + rel_rol_permiso: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + fk_rol_id: + type: INTEGER + required: true + default: 0 + foreignTable: rol + foreignReference: id + fk_permiso_id: + type: INTEGER + required: true + default: 0 + foreignTable: permiso + foreignReference: id + rel_usuario_permiso: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + fk_usuario_id: + type: INTEGER + required: true + default: 0 + foreignTable: usuario + foreignReference: id + fk_permiso_id: + type: INTEGER + required: true + default: 0 + foreignTable: permiso + foreignReference: id + onDelete: CASCADE + rel_usuario_preferencia: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + fk_usuario_id: + type: INTEGER + required: true + default: 0 + fk_preferencia_id: + type: INTEGER + required: true + default: 0 + rol: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + descripcion: + type: VARCHAR + size: 255 + default: + activo: + type: BOOLEAN + required: true + default: true + usuario: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + usuario: + type: VARCHAR + size: 32 + required: true + default: + clave: + type: VARCHAR + size: 48 + required: true + default: + correo_publico: + type: BOOLEAN + required: false + default: true + activo: + type: BOOLEAN + required: true + default: true + fecha_creado: + type: TIMESTAMP + required: true + fecha_actualizado: + type: TIMESTAMP + required: true + seguridad_pregunta: + type: VARCHAR + size: 128 + seguridad_respuesta: + type: VARCHAR + size: 128 + email: + type: VARCHAR + size: 128 + fk_establecimiento_id: + type: INTEGER + required: true + default: 0 + foreignTable: establecimiento + foreignReference: id + borrado: + type: BOOLEAN + required: true + default: false + tipoiva: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: false + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + descripcion: + type: VARCHAR + size: 255 + required: false + default: + orden: + type: INTEGER + required: false + default: 0 + provincia: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre_corto: + type: VARCHAR + size: 32 + required: true + default: + nombre_largo: + type: VARCHAR + size: 128 + required: true + default: + fk_pais_id: + type: INTEGER + required: true + default: 0 + foreignTable: pais + foreignReference: id + orden: + type: INTEGER + required: false + default: 0 + cuenta: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + razon_social: + type: VARCHAR + size: 128 + required: true + default: + cuit: + type: VARCHAR + size: 20 + required: true + default: + direccion: + type: VARCHAR + size: 128 + required: true + default: + ciudad: + type: VARCHAR + size: 128 + required: true + default: + codigo_postal: + type: VARCHAR + size: 20 + required: true + default: + telefono: + type: VARCHAR + size: 20 + required: false + default: + fk_provincia_id: + type: INTEGER + required: true + default: 0 + foreignTable: provincia + foreignReference: id + fk_tipoiva_id: + type: INTEGER + required: true + default: 0 + foreignTable: tipoiva + foreignReference: id + alumno: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + apellido: + type: VARCHAR + size: 128 + required: true + default: + fecha_nacimiento: + type: TIMESTAMP + required: true + direccion: + type: VARCHAR + size: 128 + required: true + default: + ciudad: + type: VARCHAR + size: 128 + required: true + default: + codigo_postal: + type: VARCHAR + size: 20 + required: true + default: + fk_provincia_id: + type: INTEGER + required: true + default: 0 + foreignTable: provincia + foreignReference: id + telefono: + type: VARCHAR + size: 20 + required: false + default: + lugar_nacimiento: + type: VARCHAR + size: 128 + required: false + default: + fk_tipodocumento_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: tipodocumento + foreignReference: id + nro_documento: + type: varchar + size: 16 + required: true + default: + sexo: + type: CHAR + size: 1 + required: true + default: + email: + type: VARCHAR + size: 128 + required: true + default: + distancia_escuela: + type: INTEGER + required: false + default: 0 + hermanos_escuela: + type: boolean + required: true + default: 0 + hijo_maestro_escuela: + type: boolean + required: true + default: 0 + fk_establecimiento_id: + type: INTEGER + required: true + default: 0 + foreignTable: establecimiento + foreignReference: id + fk_cuenta_id: + type: INTEGER + required: true + default: 0 + foreignTable: cuenta + foreignReference: id + certificado_medico: + type: boolean + required: true + default: 0 + activo: + type: boolean + required: true + default: true + fk_conceptobaja_id: + type: INTEGER + required: false + foreignTable: conceptobaja + foreignReference: id + fk_pais_id: + type: INTEGER + required: true + default: 0 + foreignTable: pais + foreignReference: id + responsable: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + apellido: + type: VARCHAR + size: 128 + required: true + default: + direccion: + type: VARCHAR + size: 128 + required: false + default: + ciudad: + type: VARCHAR + size: 128 + required: false + default: + codigo_postal: + type: VARCHAR + size: 20 + required: false + default: + fk_provincia_id: + type: INTEGER + required: true + default: 0 + foreignTable: provincia + foreignReference: id + telefono: + type: VARCHAR + size: 20 + required: false + default: + telefono_movil: + type: VARCHAR + size: 20 + required: false + default: + nro_documento: + type: VARCHAR + size: 20 + required: true + default: + fk_tipodocumento_id: + type: INTEGER + required: true + default: 0 + foreignTable: tipodocumento + foreignReference: id + sexo: + type: CHAR + size: 1 + required: true + default: + email: + type: VARCHAR + size: 128 + required: false + default: + observacion: + type: VARCHAR + size: 255 + required: false + default: + autorizacion_retiro: + type: boolean + required: true + default: false + fk_cuenta_id: + type: INTEGER + required: true + default: 0 + foreignTable: cuenta + foreignReference: id + fk_rolresponsable_id: + type: INTEGER + required: true + default: 1 + foreignTable: rol_responsable + foreignReference: id + ciclolectivo: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_establecimiento_id: + type: integer + size: 11 + required: true + foreignTable: establecimiento + foreignReference: id + fecha_inicio: + type: TIMESTAMP + required: true + fecha_fin: + type: TIMESTAMP + required: true + descripcion: + type: varchar + size: 255 + required: true + default: + actual: + type: boolean + required: true + default: false + turnos: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_ciclolectivo_id: + type: integer + size: 11 + required: true + foreignTable: ciclolectivo + foreignReference: id + hora_inicio: + type: time + required: true + hora_fin: + type: time + required: true + descripcion: + type: varchar + size: 255 + required: true + default: + periodo: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_ciclolectivo_id: + type: integer + size: 11 + required: true + foreignTable: ciclolectivo + foreignReference: id + fecha_inicio: + type: TIMESTAMP + required: true + fecha_fin: + type: TIMESTAMP + required: true + descripcion: + type: varchar + size: 255 + required: true + default: + conceptobaja: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + nombre: + type: varchar + size: 128 + required: true + descripcion: + type: varchar + size: 255 + required: false + default: + tipodocente: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + nombre: + type: varchar + size: 128 + required: true + descripcion: + type: varchar + size: 255 + required: false + default: + cargobaja: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + nombre: + type: varchar + size: 128 + required: true + descripcion: + type: varchar + size: 255 + required: false + default: + calendariovacunacion: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + nombre: + type: varchar + size: 128 + required: true + descripcion: + type: varchar + size: 255 + required: false + periodo: + type: varchar + size: 128 + required: false + observacion: + type: varchar + size: 255 + required: false + default: + rel_calendariovacunacion_alumno: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_alumno_id: + type: integer + size: 11 + required: true + foreignTable: alumno + foreignReference: id + fk_calendariovacunacion_id: + type: integer + size: 11 + required: true + foreignTable: calendariovacunacion + foreignReference: id + observacion: + type: varchar + size: 255 + required: false + comprobante: + type: boolean + required: true + default: false + fecha: + type: TIMESTAMP + required: false + legajopedagogico: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_alumno_id: + type: integer + size: 11 + required: true + foreignTable: alumno + foreignReference: id + titulo: + type: varchar + size: 255 + required: true + resumen: + type: blob + required: true + texto: + type: blob + required: true + fecha: + type: timestamp + required: true + fk_usuario_id: + type: integer + size: 11 + required: true + foreignTable: usuario + foreignReference: id + fk_legajocategoria_id: + type: integer + size: 11 + required: true + foreignTable: legajocategoria + foreignReference: id + legajocategoria: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + descripcion: + type: varchar + size: 255 + required: true + legajoadjunto: + _attributes: + idMethod: native + fk_legajopedagogico_id: + type: integer + size: 11 + required: true + foreignTable: legajopedagogico + foreignReference: id + fk_adjunto_id: + type: integer + size: 11 + required: true + foreignTable: adjunto + foreignReference: id + adjunto: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + descripcion: + type: varchar + size: 255 + required: false + titulo: + type: varchar + size: 255 + required: false + nombre_archivo: + type: varchar + size: 255 + required: true + tipo_archivo: + type: varchar + size: 64 + required: true + ruta: + type: varchar + size: 255 + required: true + fecha: + type: timestamp + required: true + asistencia: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_alumno_id: + type: integer + size: 11 + required: true + foreignTable: alumno + foreignReference: id + fk_tipoasistencia_id: + type: integer + size: 11 + required: true + foreignTable: tipoasistencia + foreignReference: id + fecha: + type: timestamp + required: true + concepto: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_establecimiento_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: establecimiento + foreignReference: id + nombre: + type: varchar + size: 128 + required: true + descripcion: + type: varchar + size: 255 + required: false + escalanota: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_establecimiento_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: establecimiento + foreignReference: id + nombre: + type: varchar + size: 128 + required: true + descripcion: + type: varchar + size: 255 + required: false + orden: + type: integer + size: 11 + required: true + aprobado: + type: boolean + required: true + default: false + boletin_conceptual: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_escalanota_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: escalanota + foreignReference: id + fk_alumno_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: alumno + foreignReference: id + fk_concepto_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: concepto + foreignReference: id + fk_periodo_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: periodo + foreignReference: id + observacion: + type: blob + required: true + fecha: + type: timestamp + required: true + boletin_actividades: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_escalanota_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: escalanota + foreignReference: id + fk_alumno_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: alumno + foreignReference: id + fk_actividad_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: actividad + foreignReference: id + fk_periodo_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: periodo + foreignReference: id + observacion: + type: blob + required: true + fecha: + type: timestamp + required: true + examen: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_escalanota_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: escalanota + foreignReference: id + fk_alumno_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: alumno + foreignReference: id + fk_actividad_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: actividad + foreignReference: id + fk_periodo_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: periodo + foreignReference: id + nombre: + type: varchar + size: 255 + default: + required: true + observacion: + type: blob + required: true + fecha: + type: timestamp + required: true + anio: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_establecimiento_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: establecimiento + foreignReference: id + descripcion: + type: varchar + size: 255 + required: true + default: + division: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_anio_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: anio + foreignReference: id + descripcion: + type: varchar + size: 255 + required: true + default: + fk_turnos_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: turnos + foreignReference: id + orden: + type: INTEGER + required: false + default: 0 + repeticion: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + descripcion: + type: varchar + size: 255 + required: true + default: + orden: + type: integer + size: 11 + required: true + default: 0 + actividad: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_establecimiento_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: establecimiento + foreignReference: id + nombre: + type: varchar + size: 128 + required: true + default: + descripcion: + type: varchar + size: 255 + required: false + rel_anio_actividad: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_anio_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: anio + foreignReference: id + fk_actividad_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: actividad + foreignReference: id + horas: + type: decimal + size: 10,2 + required: true + default: 0 + rel_alumno_division: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_division_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: division + foreignReference: id + fk_alumno_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: alumno + foreignReference: id + rel_division_actividad_docente: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_division_id: + type: integer + size: 11 + required: false + default: 0 + foreignTable: division + foreignReference: id + fk_actividad_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: actividad + foreignReference: id + fk_docente_id: + type: integer + size: 11 + required: false + default: 0 + foreignTable: docente + foreignReference: id + fk_evento_id: + type: integer + size: 11 + required: false + default: 0 + foreignTable: evento + foreignReference: id + fk_repeticion_id: + type: integer + size: 11 + required: false + default: 0 + foreignTable: repeticion + foreignReference: id + fecha_inicio: + type: timestamp + required: true + fecha_fin: + type: timestamp + required: true + hora_inicio: + type: time + required: true + hora_fin: + type: time + required: true + docente: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + apellido: + type: VARCHAR + size: 128 + required: true + default: + nombre: + type: VARCHAR + size: 128 + required: true + default: + sexo: + type: CHAR + size: 1 + required: false + default: U + fecha_nacimiento: + type: TIMESTAMP + required: true + fk_tipodocumento_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: tipodocumento + foreignReference: id + nro_documento: + type: varchar + size: 16 + required: true + default: + direccion: + type: varchar + size: 128 + required: false + default: + ciudad: + type: varchar + size: 128 + required: false + default: + codigo_postal: + type: varchar + size: 20 + required: false + default: + email: + type: varchar + size: 255 + required: false + default: + telefono: + type: varchar + size: 20 + required: false + default: + telefono_movil: + type: varchar + size: 20 + required: false + default: + titulo: + type: varchar + size: 128 + required: true + default: + libreta_sanitaria: + type: boolean + required: false + default: false + psicofisico: + type: boolean + required: false + default: false + activo: + type: boolean + required: false + default: true + fk_provincia_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: provincia + foreignReference: id + rel_docente_establecimiento: + _attributes: + idMethod: native + fk_establecimiento_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: establecimiento + foreignReference: id + fk_docente_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: docente + foreignReference: id + tipodocumento: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + descripcion: + type: VARCHAR + size: 255 + required: false + default: + orden: + type: integer + size: 11 + required: false + default: 0 + rel_actividad_docente: + _attributes: + idMethod: native + fk_actividad_id: + type: integer + size: 11 + required: true + primaryKey: true + foreignTable: actividad + foreignReference: id + fk_docente_id: + type: integer + size: 11 + required: true + primaryKey: true + foreignTable: docente + foreignReference: id + docente_horario: + _attributes: + idMethod: native + fk_docente_id: + type: integer + size: 11 + required: true + primaryKey: true + foreignTable: docente + foreignReference: id + fk_evento_id: + type: integer + size: 11 + required: true + primaryKey: true + foreignTable: evento + foreignReference: id + feriado: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + nombre: + type: varchar + size: 128 + required: true + fecha: + type: timestamp + required: true + repeticion_anual: + type: BOOLEAN + default: false + required: false + inamovible: + type: BOOLEAN + default: false + required: false + fk_ciclolectivo_id: + type: integer + size: 11 + required: true + default: 0 + foreignTable: ciclolectivo + foreignReference: id + horarioescolar: + _attributes: + idMethod: native + id: + type: integer + size: 11 + required: true + autoIncrement: true + primaryKey: true + dia: + type: integer + size: 11 + required: true + default: 0 + hora_inicio: + type: TIME + required: true + hora_fin: + type: TIME + required: true + nombre: + type: varchar + size: 128 + required: true + descripcion: + type: varchar + size: 255 + required: false + fk_establecimiento_id: + type: INTEGER + required: true + default: 0 + foreignTable: establecimiento + foreignReference: id + fk_turnos_id: + type: INTEGER + required: true + default: 0 + foreignTable: turnos + foreignReference: id + fk_horarioescolartipo_id: + type: INTEGER + required: true + default: 0 + foreignTable: horarioescolartipo + foreignReference: id + horarioescolartipo: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + descripcion: + type: VARCHAR + size: 255 + required: false + tipoasistencia: + _attributes: + idMethod: native + id: + type: INTEGER + size: 11 + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 10 + required: true + descripcion: + type: VARCHAR + size: 255 + required: false + default: + valor: + type: DECIMAL + size: 4,2 + required: true + default: 1 + grupo: + type: VARCHAR + size: 30 + required: false + default: + defecto: + type: BOOLEAN + required: true + default: 0 + rol_responsable: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + nombre: + type: VARCHAR + size: 128 + required: true + default: + descripcion: + type: VARCHAR + size: 255 + default: + activo: + type: BOOLEAN + required: true + default: true + evento: + _attributes: + idMethod: native + id: + type: INTEGER + required: true + autoIncrement: true + primaryKey: true + titulo: + type: VARCHAR + size: 128 + required: true + fecha_inicio: + type: TIMESTAMP + required: true + fecha_fin: + type: TIMESTAMP + required: true + tipo: + type: INTEGER + required: true + default: 0 + frecuencia: + type: INTEGER + required: true + default: 0 + frecuencia_intervalo: + type: INTEGER + required: true + default: 0 + recurrencia_fin: + type: VARCHAR + size: 16 + required: false + default: + recurrencia_dias: + type: INTEGER + required: true + default: 0 + estado: + type: INTEGER + required: true + default: 0 + rel_rolresponsable_responsable: + _attributes: + idMethod: native + id: + type: INTEGER + size: 11 + required: true + autoIncrement: true + primaryKey: true + fk_rolresponsable_id: + type: INTEGER + size: 11 + required: true + default: 0 + foreignTable: rol_responsable + foreignReference: id + fk_responsable_id: + type: INTEGER + size: 11 + required: true + default: 0 + foreignTable: responsable + foreignReference: id + fk_alumno_id: + type: INTEGER + size: 11 + required: true + default: 0 + foreignTable: alumno + foreignReference: id + descripcion: + type: VARCHAR + size: 255 + default: Property changes on: prosistem/alba/trunk/alba/config/schema.yml ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Modified: prosistem/alba/trunk/alba/lib/model/map/LegajoadjuntoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/LegajoadjuntoMapBuilder.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/map/LegajoadjuntoMapBuilder.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -30,11 +30,13 @@ $tMap = $this->dbMap->addTable('legajoadjunto'); $tMap->setPhpName('Legajoadjunto'); - $tMap->setUseIdGenerator(false); + $tMap->setUseIdGenerator(true); $tMap->addForeignKey('FK_LEGAJOPEDAGOGICO_ID', 'FkLegajopedagogicoId', 'int', CreoleTypes::INTEGER, 'legajopedagogico', 'ID', true, 11); $tMap->addForeignKey('FK_ADJUNTO_ID', 'FkAdjuntoId', 'int', CreoleTypes::INTEGER, 'adjunto', 'ID', true, 11); + $tMap->addPrimaryKey('ID', 'Id', 'int', CreoleTypes::INTEGER, true, null); + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/RelDocenteEstablecimientoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelDocenteEstablecimientoMapBuilder.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/map/RelDocenteEstablecimientoMapBuilder.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -30,11 +30,13 @@ $tMap = $this->dbMap->addTable('rel_docente_establecimiento'); $tMap->setPhpName('RelDocenteEstablecimiento'); - $tMap->setUseIdGenerator(false); + $tMap->setUseIdGenerator(true); $tMap->addForeignKey('FK_ESTABLECIMIENTO_ID', 'FkEstablecimientoId', 'int', CreoleTypes::INTEGER, 'establecimiento', 'ID', true, 11); $tMap->addForeignKey('FK_DOCENTE_ID', 'FkDocenteId', 'int', CreoleTypes::INTEGER, 'docente', 'ID', true, 11); + $tMap->addPrimaryKey('ID', 'Id', 'int', CreoleTypes::INTEGER, true, null); + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -17,7 +17,7 @@ - protected $nombre = ''; + protected $nombre = 'null'; @@ -130,7 +130,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = ActividadPeer::NOMBRE; } @@ -1178,7 +1178,7 @@ - public function getRelDivisionActividadDocentesJoinRepeticion($criteria = null, $con = null) + public function getRelDivisionActividadDocentesJoinEvento($criteria = null, $con = null) { include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; if ($criteria === null) { @@ -1196,14 +1196,14 @@ $criteria->add(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, $this->getId()); - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinRepeticion($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); } } else { $criteria->add(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, $this->getId()); if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinRepeticion($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); } } $this->lastRelDivisionActividadDocenteCriteria = $criteria; @@ -1213,7 +1213,7 @@ - public function getRelDivisionActividadDocentesJoinEvento($criteria = null, $con = null) + public function getRelDivisionActividadDocentesJoinRepeticion($criteria = null, $con = null) { include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; if ($criteria === null) { @@ -1231,14 +1231,14 @@ $criteria->add(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, $this->getId()); - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinRepeticion($criteria, $con); } } else { $criteria->add(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, $this->getId()); if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinRepeticion($criteria, $con); } } $this->lastRelDivisionActividadDocenteCriteria = $criteria; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,11 +13,11 @@ - protected $nombre = ''; + protected $nombre = 'null'; - protected $apellido = ''; + protected $apellido = 'null'; @@ -25,15 +25,15 @@ - protected $direccion = ''; + protected $direccion = 'null'; - protected $ciudad = ''; + protected $ciudad = 'null'; - protected $codigo_postal = ''; + protected $codigo_postal = 'null'; @@ -41,11 +41,11 @@ - protected $telefono = ''; + protected $telefono = 'null'; - protected $lugar_nacimiento = ''; + protected $lugar_nacimiento = 'null'; @@ -53,15 +53,15 @@ - protected $nro_documento = ''; + protected $nro_documento = 'null'; - protected $sexo = ''; + protected $sexo = 'null'; - protected $email = ''; + protected $email = 'null'; @@ -100,16 +100,16 @@ protected $fk_pais_id = 0; - protected $aTipodocumento; + protected $aProvincia; - protected $aCuenta; + protected $aTipodocumento; protected $aEstablecimiento; - protected $aProvincia; + protected $aCuenta; protected $aConceptobaja; @@ -369,7 +369,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = AlumnoPeer::NOMBRE; } @@ -383,7 +383,7 @@ $v = (string) $v; } - if ($this->apellido !== $v || $v === '') { + if ($this->apellido !== $v || $v === 'null') { $this->apellido = $v; $this->modifiedColumns[] = AlumnoPeer::APELLIDO; } @@ -414,7 +414,7 @@ $v = (string) $v; } - if ($this->direccion !== $v || $v === '') { + if ($this->direccion !== $v || $v === 'null') { $this->direccion = $v; $this->modifiedColumns[] = AlumnoPeer::DIRECCION; } @@ -428,7 +428,7 @@ $v = (string) $v; } - if ($this->ciudad !== $v || $v === '') { + if ($this->ciudad !== $v || $v === 'null') { $this->ciudad = $v; $this->modifiedColumns[] = AlumnoPeer::CIUDAD; } @@ -442,7 +442,7 @@ $v = (string) $v; } - if ($this->codigo_postal !== $v || $v === '') { + if ($this->codigo_postal !== $v || $v === 'null') { $this->codigo_postal = $v; $this->modifiedColumns[] = AlumnoPeer::CODIGO_POSTAL; } @@ -474,7 +474,7 @@ $v = (string) $v; } - if ($this->telefono !== $v || $v === '') { + if ($this->telefono !== $v || $v === 'null') { $this->telefono = $v; $this->modifiedColumns[] = AlumnoPeer::TELEFONO; } @@ -488,7 +488,7 @@ $v = (string) $v; } - if ($this->lugar_nacimiento !== $v || $v === '') { + if ($this->lugar_nacimiento !== $v || $v === 'null') { $this->lugar_nacimiento = $v; $this->modifiedColumns[] = AlumnoPeer::LUGAR_NACIMIENTO; } @@ -520,7 +520,7 @@ $v = (string) $v; } - if ($this->nro_documento !== $v || $v === '') { + if ($this->nro_documento !== $v || $v === 'null') { $this->nro_documento = $v; $this->modifiedColumns[] = AlumnoPeer::NRO_DOCUMENTO; } @@ -534,7 +534,7 @@ $v = (string) $v; } - if ($this->sexo !== $v || $v === '') { + if ($this->sexo !== $v || $v === 'null') { $this->sexo = $v; $this->modifiedColumns[] = AlumnoPeer::SEXO; } @@ -548,7 +548,7 @@ $v = (string) $v; } - if ($this->email !== $v || $v === '') { + if ($this->email !== $v || $v === 'null') { $this->email = $v; $this->modifiedColumns[] = AlumnoPeer::EMAIL; } @@ -793,6 +793,13 @@ + if ($this->aProvincia !== null) { + if ($this->aProvincia->isModified()) { + $affectedRows += $this->aProvincia->save($con); + } + $this->setProvincia($this->aProvincia); + } + if ($this->aTipodocumento !== null) { if ($this->aTipodocumento->isModified()) { $affectedRows += $this->aTipodocumento->save($con); @@ -800,13 +807,6 @@ $this->setTipodocumento($this->aTipodocumento); } - if ($this->aCuenta !== null) { - if ($this->aCuenta->isModified()) { - $affectedRows += $this->aCuenta->save($con); - } - $this->setCuenta($this->aCuenta); - } - if ($this->aEstablecimiento !== null) { if ($this->aEstablecimiento->isModified()) { $affectedRows += $this->aEstablecimiento->save($con); @@ -814,11 +814,11 @@ $this->setEstablecimiento($this->aEstablecimiento); } - if ($this->aProvincia !== null) { - if ($this->aProvincia->isModified()) { - $affectedRows += $this->aProvincia->save($con); + if ($this->aCuenta !== null) { + if ($this->aCuenta->isModified()) { + $affectedRows += $this->aCuenta->save($con); } - $this->setProvincia($this->aProvincia); + $this->setCuenta($this->aCuenta); } if ($this->aConceptobaja !== null) { @@ -948,27 +948,27 @@ + if ($this->aProvincia !== null) { + if (!$this->aProvincia->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aProvincia->getValidationFailures()); + } + } + if ($this->aTipodocumento !== null) { if (!$this->aTipodocumento->validate($columns)) { $failureMap = array_merge($failureMap, $this->aTipodocumento->getValidationFailures()); } } - if ($this->aCuenta !== null) { - if (!$this->aCuenta->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aCuenta->getValidationFailures()); - } - } - if ($this->aEstablecimiento !== null) { if (!$this->aEstablecimiento->validate($columns)) { $failureMap = array_merge($failureMap, $this->aEstablecimiento->getValidationFailures()); } } - if ($this->aProvincia !== null) { - if (!$this->aProvincia->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aProvincia->getValidationFailures()); + if ($this->aCuenta !== null) { + if (!$this->aCuenta->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aCuenta->getValidationFailures()); } } @@ -1454,63 +1454,63 @@ } - public function setTipodocumento($v) + public function setProvincia($v) { if ($v === null) { - $this->setFkTipodocumentoId('0'); + $this->setFkProvinciaId('0'); } else { - $this->setFkTipodocumentoId($v->getId()); + $this->setFkProvinciaId($v->getId()); } - $this->aTipodocumento = $v; + $this->aProvincia = $v; } - public function getTipodocumento($con = null) + public function getProvincia($con = null) { - include_once 'lib/model/om/BaseTipodocumentoPeer.php'; + include_once 'lib/model/om/BaseProvinciaPeer.php'; - if ($this->aTipodocumento === null && ($this->fk_tipodocumento_id !== null)) { + if ($this->aProvincia === null && ($this->fk_provincia_id !== null)) { - $this->aTipodocumento = TipodocumentoPeer::retrieveByPK($this->fk_tipodocumento_id, $con); + $this->aProvincia = ProvinciaPeer::retrieveByPK($this->fk_provincia_id, $con); } - return $this->aTipodocumento; + return $this->aProvincia; } - public function setCuenta($v) + public function setTipodocumento($v) { if ($v === null) { - $this->setFkCuentaId('0'); + $this->setFkTipodocumentoId('0'); } else { - $this->setFkCuentaId($v->getId()); + $this->setFkTipodocumentoId($v->getId()); } - $this->aCuenta = $v; + $this->aTipodocumento = $v; } - public function getCuenta($con = null) + public function getTipodocumento($con = null) { - include_once 'lib/model/om/BaseCuentaPeer.php'; + include_once 'lib/model/om/BaseTipodocumentoPeer.php'; - if ($this->aCuenta === null && ($this->fk_cuenta_id !== null)) { + if ($this->aTipodocumento === null && ($this->fk_tipodocumento_id !== null)) { - $this->aCuenta = CuentaPeer::retrieveByPK($this->fk_cuenta_id, $con); + $this->aTipodocumento = TipodocumentoPeer::retrieveByPK($this->fk_tipodocumento_id, $con); } - return $this->aCuenta; + return $this->aTipodocumento; } @@ -1544,33 +1544,33 @@ } - public function setProvincia($v) + public function setCuenta($v) { if ($v === null) { - $this->setFkProvinciaId('0'); + $this->setFkCuentaId('0'); } else { - $this->setFkProvinciaId($v->getId()); + $this->setFkCuentaId($v->getId()); } - $this->aProvincia = $v; + $this->aCuenta = $v; } - public function getProvincia($con = null) + public function getCuenta($con = null) { - include_once 'lib/model/om/BaseProvinciaPeer.php'; + include_once 'lib/model/om/BaseCuentaPeer.php'; - if ($this->aProvincia === null && ($this->fk_provincia_id !== null)) { + if ($this->aCuenta === null && ($this->fk_cuenta_id !== null)) { - $this->aProvincia = ProvinciaPeer::retrieveByPK($this->fk_provincia_id, $con); + $this->aCuenta = CuentaPeer::retrieveByPK($this->fk_cuenta_id, $con); } - return $this->aProvincia; + return $this->aCuenta; } @@ -1810,7 +1810,7 @@ - public function getLegajopedagogicosJoinLegajocategoria($criteria = null, $con = null) + public function getLegajopedagogicosJoinUsuario($criteria = null, $con = null) { include_once 'lib/model/om/BaseLegajopedagogicoPeer.php'; if ($criteria === null) { @@ -1828,14 +1828,14 @@ $criteria->add(LegajopedagogicoPeer::FK_ALUMNO_ID, $this->getId()); - $this->collLegajopedagogicos = LegajopedagogicoPeer::doSelectJoinLegajocategoria($criteria, $con); + $this->collLegajopedagogicos = LegajopedagogicoPeer::doSelectJoinUsuario($criteria, $con); } } else { $criteria->add(LegajopedagogicoPeer::FK_ALUMNO_ID, $this->getId()); if (!isset($this->lastLegajopedagogicoCriteria) || !$this->lastLegajopedagogicoCriteria->equals($criteria)) { - $this->collLegajopedagogicos = LegajopedagogicoPeer::doSelectJoinLegajocategoria($criteria, $con); + $this->collLegajopedagogicos = LegajopedagogicoPeer::doSelectJoinUsuario($criteria, $con); } } $this->lastLegajopedagogicoCriteria = $criteria; @@ -1845,7 +1845,7 @@ - public function getLegajopedagogicosJoinUsuario($criteria = null, $con = null) + public function getLegajopedagogicosJoinLegajocategoria($criteria = null, $con = null) { include_once 'lib/model/om/BaseLegajopedagogicoPeer.php'; if ($criteria === null) { @@ -1863,14 +1863,14 @@ $criteria->add(LegajopedagogicoPeer::FK_ALUMNO_ID, $this->getId()); - $this->collLegajopedagogicos = LegajopedagogicoPeer::doSelectJoinUsuario($criteria, $con); + $this->collLegajopedagogicos = LegajopedagogicoPeer::doSelectJoinLegajocategoria($criteria, $con); } } else { $criteria->add(LegajopedagogicoPeer::FK_ALUMNO_ID, $this->getId()); if (!isset($this->lastLegajopedagogicoCriteria) || !$this->lastLegajopedagogicoCriteria->equals($criteria)) { - $this->collLegajopedagogicos = LegajopedagogicoPeer::doSelectJoinUsuario($criteria, $con); + $this->collLegajopedagogicos = LegajopedagogicoPeer::doSelectJoinLegajocategoria($criteria, $con); } } $this->lastLegajopedagogicoCriteria = $criteria; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAlumnoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAlumnoPeer.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAlumnoPeer.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -284,7 +284,7 @@ } - public static function doCountJoinTipodocumento(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -300,7 +300,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); + $criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $rs = AlumnoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -312,7 +312,7 @@ - public static function doCountJoinCuenta(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinTipodocumento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -328,7 +328,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); + $criteria->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); $rs = AlumnoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -368,7 +368,7 @@ - public static function doCountJoinProvincia(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinCuenta(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -384,7 +384,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); $rs = AlumnoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -452,7 +452,7 @@ - public static function doSelectJoinTipodocumento(Criteria $c, $con = null) + public static function doSelectJoinProvincia(Criteria $c, $con = null) { $c = clone $c; @@ -462,9 +462,9 @@ AlumnoPeer::addSelectColumns($c); $startcol = (AlumnoPeer::NUM_COLUMNS - AlumnoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - TipodocumentoPeer::addSelectColumns($c); + ProvinciaPeer::addSelectColumns($c); - $c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); + $c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -476,7 +476,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = TipodocumentoPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -484,7 +484,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getTipodocumento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addAlumno($obj1); break; } @@ -499,7 +499,7 @@ - public static function doSelectJoinCuenta(Criteria $c, $con = null) + public static function doSelectJoinTipodocumento(Criteria $c, $con = null) { $c = clone $c; @@ -509,9 +509,9 @@ AlumnoPeer::addSelectColumns($c); $startcol = (AlumnoPeer::NUM_COLUMNS - AlumnoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - CuentaPeer::addSelectColumns($c); + TipodocumentoPeer::addSelectColumns($c); - $c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); + $c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -523,7 +523,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = CuentaPeer::getOMClass(); + $omClass = TipodocumentoPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -531,7 +531,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getCuenta(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getTipodocumento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addAlumno($obj1); break; } @@ -593,7 +593,7 @@ - public static function doSelectJoinProvincia(Criteria $c, $con = null) + public static function doSelectJoinCuenta(Criteria $c, $con = null) { $c = clone $c; @@ -603,9 +603,9 @@ AlumnoPeer::addSelectColumns($c); $startcol = (AlumnoPeer::NUM_COLUMNS - AlumnoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - ProvinciaPeer::addSelectColumns($c); + CuentaPeer::addSelectColumns($c); - $c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -617,7 +617,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = ProvinciaPeer::getOMClass(); + $omClass = CuentaPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -625,7 +625,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getCuenta(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addAlumno($obj1); break; } @@ -750,13 +750,13 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); - $criteria->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); - $criteria->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); - $criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); $criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID); @@ -783,17 +783,17 @@ AlumnoPeer::addSelectColumns($c); $startcol2 = (AlumnoPeer::NUM_COLUMNS - AlumnoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + ProvinciaPeer::addSelectColumns($c); + $startcol3 = $startcol2 + ProvinciaPeer::NUM_COLUMNS; + TipodocumentoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + TipodocumentoPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + TipodocumentoPeer::NUM_COLUMNS; - CuentaPeer::addSelectColumns($c); - $startcol4 = $startcol3 + CuentaPeer::NUM_COLUMNS; - EstablecimientoPeer::addSelectColumns($c); $startcol5 = $startcol4 + EstablecimientoPeer::NUM_COLUMNS; - ProvinciaPeer::addSelectColumns($c); - $startcol6 = $startcol5 + ProvinciaPeer::NUM_COLUMNS; + CuentaPeer::addSelectColumns($c); + $startcol6 = $startcol5 + CuentaPeer::NUM_COLUMNS; ConceptobajaPeer::addSelectColumns($c); $startcol7 = $startcol6 + ConceptobajaPeer::NUM_COLUMNS; @@ -801,13 +801,13 @@ PaisPeer::addSelectColumns($c); $startcol8 = $startcol7 + PaisPeer::NUM_COLUMNS; + $c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); - $c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); - $c->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); - $c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); $c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID); @@ -827,7 +827,7 @@ - $omClass = TipodocumentoPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -837,7 +837,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getTipodocumento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addAlumno($obj1); break; } @@ -850,7 +850,7 @@ - $omClass = CuentaPeer::getOMClass(); + $omClass = TipodocumentoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -860,7 +860,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getCuenta(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getTipodocumento(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addAlumno($obj1); break; } @@ -896,7 +896,7 @@ - $omClass = ProvinciaPeer::getOMClass(); + $omClass = CuentaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -906,7 +906,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj5 = $temp_obj1->getProvincia(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { + $temp_obj5 = $temp_obj1->getCuenta(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { $newObject = false; $temp_obj5->addAlumno($obj1); break; } @@ -970,7 +970,7 @@ - public static function doCountJoinAllExceptTipodocumento(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -986,11 +986,11 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); + $criteria->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); $criteria->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); - $criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); $criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID); @@ -1006,7 +1006,7 @@ - public static function doCountJoinAllExceptCuenta(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptTipodocumento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -1022,11 +1022,11 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); + $criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $criteria->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); - $criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); $criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID); @@ -1058,12 +1058,12 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); $criteria->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); - $criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); - $criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID); $criteria->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID); @@ -1078,7 +1078,7 @@ - public static function doCountJoinAllExceptProvincia(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptCuenta(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -1094,10 +1094,10 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); - $criteria->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); - $criteria->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); $criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID); @@ -1130,13 +1130,13 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); - $criteria->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); - $criteria->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); - $criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); $criteria->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID); @@ -1166,13 +1166,13 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); - $criteria->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); - $criteria->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); - $criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); $criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID); @@ -1186,7 +1186,7 @@ - public static function doSelectJoinAllExceptTipodocumento(Criteria $c, $con = null) + public static function doSelectJoinAllExceptProvincia(Criteria $c, $con = null) { $c = clone $c; @@ -1197,14 +1197,14 @@ AlumnoPeer::addSelectColumns($c); $startcol2 = (AlumnoPeer::NUM_COLUMNS - AlumnoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - CuentaPeer::addSelectColumns($c); - $startcol3 = $startcol2 + CuentaPeer::NUM_COLUMNS; + TipodocumentoPeer::addSelectColumns($c); + $startcol3 = $startcol2 + TipodocumentoPeer::NUM_COLUMNS; EstablecimientoPeer::addSelectColumns($c); $startcol4 = $startcol3 + EstablecimientoPeer::NUM_COLUMNS; - ProvinciaPeer::addSelectColumns($c); - $startcol5 = $startcol4 + ProvinciaPeer::NUM_COLUMNS; + CuentaPeer::addSelectColumns($c); + $startcol5 = $startcol4 + CuentaPeer::NUM_COLUMNS; ConceptobajaPeer::addSelectColumns($c); $startcol6 = $startcol5 + ConceptobajaPeer::NUM_COLUMNS; @@ -1212,11 +1212,11 @@ PaisPeer::addSelectColumns($c); $startcol7 = $startcol6 + PaisPeer::NUM_COLUMNS; - $c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); + $c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); $c->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); - $c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); $c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID); @@ -1234,7 +1234,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = CuentaPeer::getOMClass(); + $omClass = TipodocumentoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1244,7 +1244,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getCuenta(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getTipodocumento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addAlumno($obj1); break; @@ -1278,7 +1278,7 @@ $obj3->addAlumno($obj1); } - $omClass = ProvinciaPeer::getOMClass(); + $omClass = CuentaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1288,7 +1288,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj4 = $temp_obj1->getProvincia(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { + $temp_obj4 = $temp_obj1->getCuenta(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { $newObject = false; $temp_obj4->addAlumno($obj1); break; @@ -1351,7 +1351,7 @@ - public static function doSelectJoinAllExceptCuenta(Criteria $c, $con = null) + public static function doSelectJoinAllExceptTipodocumento(Criteria $c, $con = null) { $c = clone $c; @@ -1362,14 +1362,14 @@ AlumnoPeer::addSelectColumns($c); $startcol2 = (AlumnoPeer::NUM_COLUMNS - AlumnoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - TipodocumentoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + TipodocumentoPeer::NUM_COLUMNS; + ProvinciaPeer::addSelectColumns($c); + $startcol3 = $startcol2 + ProvinciaPeer::NUM_COLUMNS; EstablecimientoPeer::addSelectColumns($c); $startcol4 = $startcol3 + EstablecimientoPeer::NUM_COLUMNS; - ProvinciaPeer::addSelectColumns($c); - $startcol5 = $startcol4 + ProvinciaPeer::NUM_COLUMNS; + CuentaPeer::addSelectColumns($c); + $startcol5 = $startcol4 + CuentaPeer::NUM_COLUMNS; ConceptobajaPeer::addSelectColumns($c); $startcol6 = $startcol5 + ConceptobajaPeer::NUM_COLUMNS; @@ -1377,11 +1377,11 @@ PaisPeer::addSelectColumns($c); $startcol7 = $startcol6 + PaisPeer::NUM_COLUMNS; - $c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); + $c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $c->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); - $c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); $c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID); @@ -1399,7 +1399,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = TipodocumentoPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1409,7 +1409,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getTipodocumento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addAlumno($obj1); break; @@ -1443,7 +1443,7 @@ $obj3->addAlumno($obj1); } - $omClass = ProvinciaPeer::getOMClass(); + $omClass = CuentaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1453,7 +1453,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj4 = $temp_obj1->getProvincia(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { + $temp_obj4 = $temp_obj1->getCuenta(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { $newObject = false; $temp_obj4->addAlumno($obj1); break; @@ -1527,27 +1527,27 @@ AlumnoPeer::addSelectColumns($c); $startcol2 = (AlumnoPeer::NUM_COLUMNS - AlumnoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + ProvinciaPeer::addSelectColumns($c); + $startcol3 = $startcol2 + ProvinciaPeer::NUM_COLUMNS; + TipodocumentoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + TipodocumentoPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + TipodocumentoPeer::NUM_COLUMNS; CuentaPeer::addSelectColumns($c); - $startcol4 = $startcol3 + CuentaPeer::NUM_COLUMNS; + $startcol5 = $startcol4 + CuentaPeer::NUM_COLUMNS; - ProvinciaPeer::addSelectColumns($c); - $startcol5 = $startcol4 + ProvinciaPeer::NUM_COLUMNS; - ConceptobajaPeer::addSelectColumns($c); $startcol6 = $startcol5 + ConceptobajaPeer::NUM_COLUMNS; PaisPeer::addSelectColumns($c); $startcol7 = $startcol6 + PaisPeer::NUM_COLUMNS; + $c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); $c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); - $c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); - $c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID); $c->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID); @@ -1564,7 +1564,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = TipodocumentoPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1574,7 +1574,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getTipodocumento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addAlumno($obj1); break; @@ -1586,7 +1586,7 @@ $obj2->addAlumno($obj1); } - $omClass = CuentaPeer::getOMClass(); + $omClass = TipodocumentoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1596,7 +1596,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getCuenta(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getTipodocumento(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addAlumno($obj1); break; @@ -1608,7 +1608,7 @@ $obj3->addAlumno($obj1); } - $omClass = ProvinciaPeer::getOMClass(); + $omClass = CuentaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1618,7 +1618,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj4 = $temp_obj1->getProvincia(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { + $temp_obj4 = $temp_obj1->getCuenta(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { $newObject = false; $temp_obj4->addAlumno($obj1); break; @@ -1681,7 +1681,7 @@ - public static function doSelectJoinAllExceptProvincia(Criteria $c, $con = null) + public static function doSelectJoinAllExceptCuenta(Criteria $c, $con = null) { $c = clone $c; @@ -1692,12 +1692,12 @@ AlumnoPeer::addSelectColumns($c); $startcol2 = (AlumnoPeer::NUM_COLUMNS - AlumnoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + ProvinciaPeer::addSelectColumns($c); + $startcol3 = $startcol2 + ProvinciaPeer::NUM_COLUMNS; + TipodocumentoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + TipodocumentoPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + TipodocumentoPeer::NUM_COLUMNS; - CuentaPeer::addSelectColumns($c); - $startcol4 = $startcol3 + CuentaPeer::NUM_COLUMNS; - EstablecimientoPeer::addSelectColumns($c); $startcol5 = $startcol4 + EstablecimientoPeer::NUM_COLUMNS; @@ -1707,10 +1707,10 @@ PaisPeer::addSelectColumns($c); $startcol7 = $startcol6 + PaisPeer::NUM_COLUMNS; + $c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); - $c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); - $c->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); $c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID); @@ -1729,7 +1729,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = TipodocumentoPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1739,7 +1739,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getTipodocumento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addAlumno($obj1); break; @@ -1751,7 +1751,7 @@ $obj2->addAlumno($obj1); } - $omClass = CuentaPeer::getOMClass(); + $omClass = TipodocumentoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1761,7 +1761,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getCuenta(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getTipodocumento(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addAlumno($obj1); break; @@ -1857,28 +1857,28 @@ AlumnoPeer::addSelectColumns($c); $startcol2 = (AlumnoPeer::NUM_COLUMNS - AlumnoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + ProvinciaPeer::addSelectColumns($c); + $startcol3 = $startcol2 + ProvinciaPeer::NUM_COLUMNS; + TipodocumentoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + TipodocumentoPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + TipodocumentoPeer::NUM_COLUMNS; - CuentaPeer::addSelectColumns($c); - $startcol4 = $startcol3 + CuentaPeer::NUM_COLUMNS; - EstablecimientoPeer::addSelectColumns($c); $startcol5 = $startcol4 + EstablecimientoPeer::NUM_COLUMNS; - ProvinciaPeer::addSelectColumns($c); - $startcol6 = $startcol5 + ProvinciaPeer::NUM_COLUMNS; + CuentaPeer::addSelectColumns($c); + $startcol6 = $startcol5 + CuentaPeer::NUM_COLUMNS; PaisPeer::addSelectColumns($c); $startcol7 = $startcol6 + PaisPeer::NUM_COLUMNS; + $c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); - $c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); - $c->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); - $c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); $c->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID); @@ -1894,7 +1894,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = TipodocumentoPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1904,7 +1904,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getTipodocumento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addAlumno($obj1); break; @@ -1916,7 +1916,7 @@ $obj2->addAlumno($obj1); } - $omClass = CuentaPeer::getOMClass(); + $omClass = TipodocumentoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1926,7 +1926,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getCuenta(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getTipodocumento(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addAlumno($obj1); break; @@ -1960,7 +1960,7 @@ $obj4->addAlumno($obj1); } - $omClass = ProvinciaPeer::getOMClass(); + $omClass = CuentaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1970,7 +1970,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj5 = $temp_obj1->getProvincia(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { + $temp_obj5 = $temp_obj1->getCuenta(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { $newObject = false; $temp_obj5->addAlumno($obj1); break; @@ -2022,28 +2022,28 @@ AlumnoPeer::addSelectColumns($c); $startcol2 = (AlumnoPeer::NUM_COLUMNS - AlumnoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + ProvinciaPeer::addSelectColumns($c); + $startcol3 = $startcol2 + ProvinciaPeer::NUM_COLUMNS; + TipodocumentoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + TipodocumentoPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + TipodocumentoPeer::NUM_COLUMNS; - CuentaPeer::addSelectColumns($c); - $startcol4 = $startcol3 + CuentaPeer::NUM_COLUMNS; - EstablecimientoPeer::addSelectColumns($c); $startcol5 = $startcol4 + EstablecimientoPeer::NUM_COLUMNS; - ProvinciaPeer::addSelectColumns($c); - $startcol6 = $startcol5 + ProvinciaPeer::NUM_COLUMNS; + CuentaPeer::addSelectColumns($c); + $startcol6 = $startcol5 + CuentaPeer::NUM_COLUMNS; ConceptobajaPeer::addSelectColumns($c); $startcol7 = $startcol6 + ConceptobajaPeer::NUM_COLUMNS; + $c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); - $c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); - $c->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); - $c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID); $c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID); @@ -2059,7 +2059,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = TipodocumentoPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -2069,7 +2069,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getTipodocumento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addAlumno($obj1); break; @@ -2081,7 +2081,7 @@ $obj2->addAlumno($obj1); } - $omClass = CuentaPeer::getOMClass(); + $omClass = TipodocumentoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -2091,7 +2091,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getCuenta(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getTipodocumento(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addAlumno($obj1); break; @@ -2125,7 +2125,7 @@ $obj4->addAlumno($obj1); } - $omClass = ProvinciaPeer::getOMClass(); + $omClass = CuentaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -2135,7 +2135,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj5 = $temp_obj1->getProvincia(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { + $temp_obj5 = $temp_obj1->getCuenta(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { $newObject = false; $temp_obj5->addAlumno($obj1); break; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -17,7 +17,7 @@ - protected $descripcion = ''; + protected $descripcion = 'null'; protected $aEstablecimiento; @@ -101,7 +101,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === '') { + if ($this->descripcion !== $v || $v === 'null') { $this->descripcion = $v; $this->modifiedColumns[] = AnioPeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseCalendariovacunacion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseCalendariovacunacion.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseCalendariovacunacion.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -25,7 +25,7 @@ - protected $observacion = ''; + protected $observacion = 'null'; protected $collRelCalendariovacunacionAlumnos; @@ -138,7 +138,7 @@ $v = (string) $v; } - if ($this->observacion !== $v || $v === '') { + if ($this->observacion !== $v || $v === 'null') { $this->observacion = $v; $this->modifiedColumns[] = CalendariovacunacionPeer::OBSERVACION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseCargobaja.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseCargobaja.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseCargobaja.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -17,7 +17,7 @@ - protected $descripcion = ''; + protected $descripcion = 'null'; protected $alreadyInSave = false; @@ -82,7 +82,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === '') { + if ($this->descripcion !== $v || $v === 'null') { $this->descripcion = $v; $this->modifiedColumns[] = CargobajaPeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseCiclolectivo.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseCiclolectivo.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseCiclolectivo.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -25,11 +25,11 @@ - protected $descripcion = ''; + protected $descripcion = 'null'; - protected $actual = true; + protected $actual = false; protected $aEstablecimiento; @@ -204,7 +204,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === '') { + if ($this->descripcion !== $v || $v === 'null') { $this->descripcion = $v; $this->modifiedColumns[] = CiclolectivoPeer::DESCRIPCION; } @@ -214,7 +214,7 @@ public function setActual($v) { - if ($this->actual !== $v || $v === true) { + if ($this->actual !== $v || $v === false) { $this->actual = $v; $this->modifiedColumns[] = CiclolectivoPeer::ACTUAL; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -17,7 +17,7 @@ - protected $descripcion = ''; + protected $descripcion = 'null'; protected $collAlumnos; @@ -88,7 +88,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === '') { + if ($this->descripcion !== $v || $v === 'null') { $this->descripcion = $v; $this->modifiedColumns[] = ConceptobajaPeer::DESCRIPCION; } @@ -457,7 +457,7 @@ - public function getAlumnosJoinTipodocumento($criteria = null, $con = null) + public function getAlumnosJoinProvincia($criteria = null, $con = null) { include_once 'lib/model/om/BaseAlumnoPeer.php'; if ($criteria === null) { @@ -475,14 +475,14 @@ $criteria->add(AlumnoPeer::FK_CONCEPTOBAJA_ID, $this->getId()); - $this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); } } else { $criteria->add(AlumnoPeer::FK_CONCEPTOBAJA_ID, $this->getId()); if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) { - $this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); } } $this->lastAlumnoCriteria = $criteria; @@ -492,7 +492,7 @@ - public function getAlumnosJoinCuenta($criteria = null, $con = null) + public function getAlumnosJoinTipodocumento($criteria = null, $con = null) { include_once 'lib/model/om/BaseAlumnoPeer.php'; if ($criteria === null) { @@ -510,14 +510,14 @@ $criteria->add(AlumnoPeer::FK_CONCEPTOBAJA_ID, $this->getId()); - $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con); } } else { $criteria->add(AlumnoPeer::FK_CONCEPTOBAJA_ID, $this->getId()); if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) { - $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con); } } $this->lastAlumnoCriteria = $criteria; @@ -562,7 +562,7 @@ - public function getAlumnosJoinProvincia($criteria = null, $con = null) + public function getAlumnosJoinCuenta($criteria = null, $con = null) { include_once 'lib/model/om/BaseAlumnoPeer.php'; if ($criteria === null) { @@ -580,14 +580,14 @@ $criteria->add(AlumnoPeer::FK_CONCEPTOBAJA_ID, $this->getId()); - $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); } } else { $criteria->add(AlumnoPeer::FK_CONCEPTOBAJA_ID, $this->getId()); if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) { - $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); } } $this->lastAlumnoCriteria = $criteria; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,31 +13,31 @@ - protected $nombre = ''; + protected $nombre = 'null'; - protected $razon_social = ''; + protected $razon_social = 'null'; - protected $cuit = ''; + protected $cuit = 'null'; - protected $direccion = ''; + protected $direccion = 'null'; - protected $ciudad = ''; + protected $ciudad = 'null'; - protected $codigo_postal = ''; + protected $codigo_postal = 'null'; - protected $telefono = ''; + protected $telefono = 'null'; @@ -48,10 +48,10 @@ protected $fk_tipoiva_id = 0; - protected $aTipoiva; + protected $aProvincia; - protected $aProvincia; + protected $aTipoiva; protected $collAlumnos; @@ -163,7 +163,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = CuentaPeer::NOMBRE; } @@ -177,7 +177,7 @@ $v = (string) $v; } - if ($this->razon_social !== $v || $v === '') { + if ($this->razon_social !== $v || $v === 'null') { $this->razon_social = $v; $this->modifiedColumns[] = CuentaPeer::RAZON_SOCIAL; } @@ -191,7 +191,7 @@ $v = (string) $v; } - if ($this->cuit !== $v || $v === '') { + if ($this->cuit !== $v || $v === 'null') { $this->cuit = $v; $this->modifiedColumns[] = CuentaPeer::CUIT; } @@ -205,7 +205,7 @@ $v = (string) $v; } - if ($this->direccion !== $v || $v === '') { + if ($this->direccion !== $v || $v === 'null') { $this->direccion = $v; $this->modifiedColumns[] = CuentaPeer::DIRECCION; } @@ -219,7 +219,7 @@ $v = (string) $v; } - if ($this->ciudad !== $v || $v === '') { + if ($this->ciudad !== $v || $v === 'null') { $this->ciudad = $v; $this->modifiedColumns[] = CuentaPeer::CIUDAD; } @@ -233,7 +233,7 @@ $v = (string) $v; } - if ($this->codigo_postal !== $v || $v === '') { + if ($this->codigo_postal !== $v || $v === 'null') { $this->codigo_postal = $v; $this->modifiedColumns[] = CuentaPeer::CODIGO_POSTAL; } @@ -247,7 +247,7 @@ $v = (string) $v; } - if ($this->telefono !== $v || $v === '') { + if ($this->telefono !== $v || $v === 'null') { $this->telefono = $v; $this->modifiedColumns[] = CuentaPeer::TELEFONO; } @@ -376,6 +376,13 @@ + if ($this->aProvincia !== null) { + if ($this->aProvincia->isModified()) { + $affectedRows += $this->aProvincia->save($con); + } + $this->setProvincia($this->aProvincia); + } + if ($this->aTipoiva !== null) { if ($this->aTipoiva->isModified()) { $affectedRows += $this->aTipoiva->save($con); @@ -383,14 +390,7 @@ $this->setTipoiva($this->aTipoiva); } - if ($this->aProvincia !== null) { - if ($this->aProvincia->isModified()) { - $affectedRows += $this->aProvincia->save($con); - } - $this->setProvincia($this->aProvincia); - } - if ($this->isModified()) { if ($this->isNew()) { $pk = CuentaPeer::doInsert($this, $con); @@ -455,19 +455,19 @@ + if ($this->aProvincia !== null) { + if (!$this->aProvincia->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aProvincia->getValidationFailures()); + } + } + if ($this->aTipoiva !== null) { if (!$this->aTipoiva->validate($columns)) { $failureMap = array_merge($failureMap, $this->aTipoiva->getValidationFailures()); } } - if ($this->aProvincia !== null) { - if (!$this->aProvincia->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aProvincia->getValidationFailures()); - } - } - if (($retval = CuentaPeer::doValidate($this, $columns)) !== true) { $failureMap = array_merge($failureMap, $retval); } @@ -722,63 +722,63 @@ } - public function setTipoiva($v) + public function setProvincia($v) { if ($v === null) { - $this->setFkTipoivaId('0'); + $this->setFkProvinciaId('0'); } else { - $this->setFkTipoivaId($v->getId()); + $this->setFkProvinciaId($v->getId()); } - $this->aTipoiva = $v; + $this->aProvincia = $v; } - public function getTipoiva($con = null) + public function getProvincia($con = null) { - include_once 'lib/model/om/BaseTipoivaPeer.php'; + include_once 'lib/model/om/BaseProvinciaPeer.php'; - if ($this->aTipoiva === null && ($this->fk_tipoiva_id !== null)) { + if ($this->aProvincia === null && ($this->fk_provincia_id !== null)) { - $this->aTipoiva = TipoivaPeer::retrieveByPK($this->fk_tipoiva_id, $con); + $this->aProvincia = ProvinciaPeer::retrieveByPK($this->fk_provincia_id, $con); } - return $this->aTipoiva; + return $this->aProvincia; } - public function setProvincia($v) + public function setTipoiva($v) { if ($v === null) { - $this->setFkProvinciaId('0'); + $this->setFkTipoivaId('0'); } else { - $this->setFkProvinciaId($v->getId()); + $this->setFkTipoivaId($v->getId()); } - $this->aProvincia = $v; + $this->aTipoiva = $v; } - public function getProvincia($con = null) + public function getTipoiva($con = null) { - include_once 'lib/model/om/BaseProvinciaPeer.php'; + include_once 'lib/model/om/BaseTipoivaPeer.php'; - if ($this->aProvincia === null && ($this->fk_provincia_id !== null)) { + if ($this->aTipoiva === null && ($this->fk_tipoiva_id !== null)) { - $this->aProvincia = ProvinciaPeer::retrieveByPK($this->fk_provincia_id, $con); + $this->aTipoiva = TipoivaPeer::retrieveByPK($this->fk_tipoiva_id, $con); } - return $this->aProvincia; + return $this->aTipoiva; } @@ -853,7 +853,7 @@ - public function getAlumnosJoinTipodocumento($criteria = null, $con = null) + public function getAlumnosJoinProvincia($criteria = null, $con = null) { include_once 'lib/model/om/BaseAlumnoPeer.php'; if ($criteria === null) { @@ -871,14 +871,14 @@ $criteria->add(AlumnoPeer::FK_CUENTA_ID, $this->getId()); - $this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); } } else { $criteria->add(AlumnoPeer::FK_CUENTA_ID, $this->getId()); if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) { - $this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); } } $this->lastAlumnoCriteria = $criteria; @@ -888,7 +888,7 @@ - public function getAlumnosJoinEstablecimiento($criteria = null, $con = null) + public function getAlumnosJoinTipodocumento($criteria = null, $con = null) { include_once 'lib/model/om/BaseAlumnoPeer.php'; if ($criteria === null) { @@ -906,14 +906,14 @@ $criteria->add(AlumnoPeer::FK_CUENTA_ID, $this->getId()); - $this->collAlumnos = AlumnoPeer::doSelectJoinEstablecimiento($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con); } } else { $criteria->add(AlumnoPeer::FK_CUENTA_ID, $this->getId()); if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) { - $this->collAlumnos = AlumnoPeer::doSelectJoinEstablecimiento($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con); } } $this->lastAlumnoCriteria = $criteria; @@ -923,7 +923,7 @@ - public function getAlumnosJoinProvincia($criteria = null, $con = null) + public function getAlumnosJoinEstablecimiento($criteria = null, $con = null) { include_once 'lib/model/om/BaseAlumnoPeer.php'; if ($criteria === null) { @@ -941,14 +941,14 @@ $criteria->add(AlumnoPeer::FK_CUENTA_ID, $this->getId()); - $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinEstablecimiento($criteria, $con); } } else { $criteria->add(AlumnoPeer::FK_CUENTA_ID, $this->getId()); if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) { - $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinEstablecimiento($criteria, $con); } } $this->lastAlumnoCriteria = $criteria; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseCuentaPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseCuentaPeer.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseCuentaPeer.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -219,7 +219,7 @@ } - public static function doCountJoinTipoiva(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -235,7 +235,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(CuentaPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); + $criteria->addJoin(CuentaPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $rs = CuentaPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -247,7 +247,7 @@ - public static function doCountJoinProvincia(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinTipoiva(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -263,7 +263,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(CuentaPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(CuentaPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); $rs = CuentaPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -275,7 +275,7 @@ - public static function doSelectJoinTipoiva(Criteria $c, $con = null) + public static function doSelectJoinProvincia(Criteria $c, $con = null) { $c = clone $c; @@ -285,9 +285,9 @@ CuentaPeer::addSelectColumns($c); $startcol = (CuentaPeer::NUM_COLUMNS - CuentaPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - TipoivaPeer::addSelectColumns($c); + ProvinciaPeer::addSelectColumns($c); - $c->addJoin(CuentaPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); + $c->addJoin(CuentaPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -299,7 +299,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = TipoivaPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -307,7 +307,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getTipoiva(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addCuenta($obj1); break; } @@ -322,7 +322,7 @@ - public static function doSelectJoinProvincia(Criteria $c, $con = null) + public static function doSelectJoinTipoiva(Criteria $c, $con = null) { $c = clone $c; @@ -332,9 +332,9 @@ CuentaPeer::addSelectColumns($c); $startcol = (CuentaPeer::NUM_COLUMNS - CuentaPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - ProvinciaPeer::addSelectColumns($c); + TipoivaPeer::addSelectColumns($c); - $c->addJoin(CuentaPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(CuentaPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -346,7 +346,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = ProvinciaPeer::getOMClass(); + $omClass = TipoivaPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -354,7 +354,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getTipoiva(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addCuenta($obj1); break; } @@ -385,10 +385,10 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(CuentaPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(CuentaPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); - $criteria->addJoin(CuentaPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); - $rs = CuentaPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -410,16 +410,16 @@ CuentaPeer::addSelectColumns($c); $startcol2 = (CuentaPeer::NUM_COLUMNS - CuentaPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + ProvinciaPeer::addSelectColumns($c); + $startcol3 = $startcol2 + ProvinciaPeer::NUM_COLUMNS; + TipoivaPeer::addSelectColumns($c); - $startcol3 = $startcol2 + TipoivaPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + TipoivaPeer::NUM_COLUMNS; - ProvinciaPeer::addSelectColumns($c); - $startcol4 = $startcol3 + ProvinciaPeer::NUM_COLUMNS; + $c->addJoin(CuentaPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $c->addJoin(CuentaPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); - $c->addJoin(CuentaPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -434,7 +434,7 @@ - $omClass = TipoivaPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -444,7 +444,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getTipoiva(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addCuenta($obj1); break; } @@ -457,7 +457,7 @@ - $omClass = ProvinciaPeer::getOMClass(); + $omClass = TipoivaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -467,7 +467,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getProvincia(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getTipoiva(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addCuenta($obj1); break; } @@ -485,7 +485,7 @@ - public static function doCountJoinAllExceptTipoiva(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -501,7 +501,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(CuentaPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(CuentaPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); $rs = CuentaPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -513,7 +513,7 @@ - public static function doCountJoinAllExceptProvincia(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptTipoiva(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -529,7 +529,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(CuentaPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); + $criteria->addJoin(CuentaPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $rs = CuentaPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -541,7 +541,7 @@ - public static function doSelectJoinAllExceptTipoiva(Criteria $c, $con = null) + public static function doSelectJoinAllExceptProvincia(Criteria $c, $con = null) { $c = clone $c; @@ -552,10 +552,10 @@ CuentaPeer::addSelectColumns($c); $startcol2 = (CuentaPeer::NUM_COLUMNS - CuentaPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - ProvinciaPeer::addSelectColumns($c); - $startcol3 = $startcol2 + ProvinciaPeer::NUM_COLUMNS; + TipoivaPeer::addSelectColumns($c); + $startcol3 = $startcol2 + TipoivaPeer::NUM_COLUMNS; - $c->addJoin(CuentaPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(CuentaPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -569,7 +569,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = ProvinciaPeer::getOMClass(); + $omClass = TipoivaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -579,7 +579,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getTipoiva(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addCuenta($obj1); break; @@ -598,7 +598,7 @@ - public static function doSelectJoinAllExceptProvincia(Criteria $c, $con = null) + public static function doSelectJoinAllExceptTipoiva(Criteria $c, $con = null) { $c = clone $c; @@ -609,10 +609,10 @@ CuentaPeer::addSelectColumns($c); $startcol2 = (CuentaPeer::NUM_COLUMNS - CuentaPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - TipoivaPeer::addSelectColumns($c); - $startcol3 = $startcol2 + TipoivaPeer::NUM_COLUMNS; + ProvinciaPeer::addSelectColumns($c); + $startcol3 = $startcol2 + ProvinciaPeer::NUM_COLUMNS; - $c->addJoin(CuentaPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); + $c->addJoin(CuentaPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -626,7 +626,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = TipoivaPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -636,7 +636,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getTipoiva(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addCuenta($obj1); break; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDistritoescolar.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDistritoescolar.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDistritoescolar.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,7 +13,7 @@ - protected $nombre = ''; + protected $nombre = 'null'; @@ -96,7 +96,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = DistritoescolarPeer::NOMBRE; } @@ -533,7 +533,7 @@ - public function getEstablecimientosJoinNiveltipo($criteria = null, $con = null) + public function getEstablecimientosJoinOrganizacion($criteria = null, $con = null) { include_once 'lib/model/om/BaseEstablecimientoPeer.php'; if ($criteria === null) { @@ -551,14 +551,14 @@ $criteria->add(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, $this->getId()); - $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinNiveltipo($criteria, $con); + $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinOrganizacion($criteria, $con); } } else { $criteria->add(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, $this->getId()); if (!isset($this->lastEstablecimientoCriteria) || !$this->lastEstablecimientoCriteria->equals($criteria)) { - $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinNiveltipo($criteria, $con); + $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinOrganizacion($criteria, $con); } } $this->lastEstablecimientoCriteria = $criteria; @@ -568,7 +568,7 @@ - public function getEstablecimientosJoinOrganizacion($criteria = null, $con = null) + public function getEstablecimientosJoinNiveltipo($criteria = null, $con = null) { include_once 'lib/model/om/BaseEstablecimientoPeer.php'; if ($criteria === null) { @@ -586,14 +586,14 @@ $criteria->add(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, $this->getId()); - $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinOrganizacion($criteria, $con); + $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinNiveltipo($criteria, $con); } } else { $criteria->add(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, $this->getId()); if (!isset($this->lastEstablecimientoCriteria) || !$this->lastEstablecimientoCriteria->equals($criteria)) { - $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinOrganizacion($criteria, $con); + $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinNiveltipo($criteria, $con); } } $this->lastEstablecimientoCriteria = $criteria; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDivision.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDivision.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDivision.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -17,7 +17,7 @@ - protected $descripcion = ''; + protected $descripcion = 'null'; @@ -126,7 +126,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === '') { + if ($this->descripcion !== $v || $v === 'null') { $this->descripcion = $v; $this->modifiedColumns[] = DivisionPeer::DESCRIPCION; } @@ -768,7 +768,7 @@ - public function getRelDivisionActividadDocentesJoinDocente($criteria = null, $con = null) + public function getRelDivisionActividadDocentesJoinActividad($criteria = null, $con = null) { include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; if ($criteria === null) { @@ -786,14 +786,14 @@ $criteria->add(RelDivisionActividadDocentePeer::FK_DIVISION_ID, $this->getId()); - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinDocente($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinActividad($criteria, $con); } } else { $criteria->add(RelDivisionActividadDocentePeer::FK_DIVISION_ID, $this->getId()); if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinDocente($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinActividad($criteria, $con); } } $this->lastRelDivisionActividadDocenteCriteria = $criteria; @@ -803,7 +803,7 @@ - public function getRelDivisionActividadDocentesJoinActividad($criteria = null, $con = null) + public function getRelDivisionActividadDocentesJoinDocente($criteria = null, $con = null) { include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; if ($criteria === null) { @@ -821,14 +821,14 @@ $criteria->add(RelDivisionActividadDocentePeer::FK_DIVISION_ID, $this->getId()); - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinActividad($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinDocente($criteria, $con); } } else { $criteria->add(RelDivisionActividadDocentePeer::FK_DIVISION_ID, $this->getId()); if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinActividad($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinDocente($criteria, $con); } } $this->lastRelDivisionActividadDocenteCriteria = $criteria; @@ -838,7 +838,7 @@ - public function getRelDivisionActividadDocentesJoinRepeticion($criteria = null, $con = null) + public function getRelDivisionActividadDocentesJoinEvento($criteria = null, $con = null) { include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; if ($criteria === null) { @@ -856,14 +856,14 @@ $criteria->add(RelDivisionActividadDocentePeer::FK_DIVISION_ID, $this->getId()); - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinRepeticion($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); } } else { $criteria->add(RelDivisionActividadDocentePeer::FK_DIVISION_ID, $this->getId()); if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinRepeticion($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); } } $this->lastRelDivisionActividadDocenteCriteria = $criteria; @@ -873,7 +873,7 @@ - public function getRelDivisionActividadDocentesJoinEvento($criteria = null, $con = null) + public function getRelDivisionActividadDocentesJoinRepeticion($criteria = null, $con = null) { include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; if ($criteria === null) { @@ -891,14 +891,14 @@ $criteria->add(RelDivisionActividadDocentePeer::FK_DIVISION_ID, $this->getId()); - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinRepeticion($criteria, $con); } } else { $criteria->add(RelDivisionActividadDocentePeer::FK_DIVISION_ID, $this->getId()); if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinRepeticion($criteria, $con); } } $this->lastRelDivisionActividadDocenteCriteria = $criteria; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,11 +13,11 @@ - protected $apellido = ''; + protected $apellido = 'null'; - protected $nombre = ''; + protected $nombre = 'null'; @@ -33,43 +33,43 @@ - protected $nro_documento = ''; + protected $nro_documento = 'null'; - protected $direccion = ''; + protected $direccion = 'null'; - protected $ciudad = ''; + protected $ciudad = 'null'; - protected $codigo_postal = ''; + protected $codigo_postal = 'null'; - protected $email = ''; + protected $email = 'null'; - protected $telefono = ''; + protected $telefono = 'null'; - protected $telefono_movil = ''; + protected $telefono_movil = 'null'; - protected $titulo = ''; + protected $titulo = 'null'; - protected $libreta_sanitaria = true; + protected $libreta_sanitaria = false; - protected $psicofisico = true; + protected $psicofisico = false; @@ -278,7 +278,7 @@ $v = (string) $v; } - if ($this->apellido !== $v || $v === '') { + if ($this->apellido !== $v || $v === 'null') { $this->apellido = $v; $this->modifiedColumns[] = DocentePeer::APELLIDO; } @@ -292,7 +292,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = DocentePeer::NOMBRE; } @@ -355,7 +355,7 @@ $v = (string) $v; } - if ($this->nro_documento !== $v || $v === '') { + if ($this->nro_documento !== $v || $v === 'null') { $this->nro_documento = $v; $this->modifiedColumns[] = DocentePeer::NRO_DOCUMENTO; } @@ -369,7 +369,7 @@ $v = (string) $v; } - if ($this->direccion !== $v || $v === '') { + if ($this->direccion !== $v || $v === 'null') { $this->direccion = $v; $this->modifiedColumns[] = DocentePeer::DIRECCION; } @@ -383,7 +383,7 @@ $v = (string) $v; } - if ($this->ciudad !== $v || $v === '') { + if ($this->ciudad !== $v || $v === 'null') { $this->ciudad = $v; $this->modifiedColumns[] = DocentePeer::CIUDAD; } @@ -397,7 +397,7 @@ $v = (string) $v; } - if ($this->codigo_postal !== $v || $v === '') { + if ($this->codigo_postal !== $v || $v === 'null') { $this->codigo_postal = $v; $this->modifiedColumns[] = DocentePeer::CODIGO_POSTAL; } @@ -411,7 +411,7 @@ $v = (string) $v; } - if ($this->email !== $v || $v === '') { + if ($this->email !== $v || $v === 'null') { $this->email = $v; $this->modifiedColumns[] = DocentePeer::EMAIL; } @@ -425,7 +425,7 @@ $v = (string) $v; } - if ($this->telefono !== $v || $v === '') { + if ($this->telefono !== $v || $v === 'null') { $this->telefono = $v; $this->modifiedColumns[] = DocentePeer::TELEFONO; } @@ -439,7 +439,7 @@ $v = (string) $v; } - if ($this->telefono_movil !== $v || $v === '') { + if ($this->telefono_movil !== $v || $v === 'null') { $this->telefono_movil = $v; $this->modifiedColumns[] = DocentePeer::TELEFONO_MOVIL; } @@ -453,7 +453,7 @@ $v = (string) $v; } - if ($this->titulo !== $v || $v === '') { + if ($this->titulo !== $v || $v === 'null') { $this->titulo = $v; $this->modifiedColumns[] = DocentePeer::TITULO; } @@ -463,7 +463,7 @@ public function setLibretaSanitaria($v) { - if ($this->libreta_sanitaria !== $v || $v === true) { + if ($this->libreta_sanitaria !== $v || $v === false) { $this->libreta_sanitaria = $v; $this->modifiedColumns[] = DocentePeer::LIBRETA_SANITARIA; } @@ -473,7 +473,7 @@ public function setPsicofisico($v) { - if ($this->psicofisico !== $v || $v === true) { + if ($this->psicofisico !== $v || $v === false) { $this->psicofisico = $v; $this->modifiedColumns[] = DocentePeer::PSICOFISICO; } @@ -1285,7 +1285,7 @@ - public function getRelDivisionActividadDocentesJoinRepeticion($criteria = null, $con = null) + public function getRelDivisionActividadDocentesJoinEvento($criteria = null, $con = null) { include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; if ($criteria === null) { @@ -1303,14 +1303,14 @@ $criteria->add(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, $this->getId()); - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinRepeticion($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); } } else { $criteria->add(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, $this->getId()); if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinRepeticion($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); } } $this->lastRelDivisionActividadDocenteCriteria = $criteria; @@ -1320,7 +1320,7 @@ - public function getRelDivisionActividadDocentesJoinEvento($criteria = null, $con = null) + public function getRelDivisionActividadDocentesJoinRepeticion($criteria = null, $con = null) { include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; if ($criteria === null) { @@ -1338,14 +1338,14 @@ $criteria->add(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, $this->getId()); - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinRepeticion($criteria, $con); } } else { $criteria->add(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, $this->getId()); if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinEvento($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinRepeticion($criteria, $con); } } $this->lastRelDivisionActividadDocenteCriteria = $criteria; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDocenteHorario.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDocenteHorario.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDocenteHorario.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -16,10 +16,10 @@ protected $fk_evento_id; - protected $aEvento; + protected $aDocente; - protected $aDocente; + protected $aEvento; protected $alreadyInSave = false; @@ -148,6 +148,13 @@ + if ($this->aDocente !== null) { + if ($this->aDocente->isModified()) { + $affectedRows += $this->aDocente->save($con); + } + $this->setDocente($this->aDocente); + } + if ($this->aEvento !== null) { if ($this->aEvento->isModified()) { $affectedRows += $this->aEvento->save($con); @@ -155,14 +162,7 @@ $this->setEvento($this->aEvento); } - if ($this->aDocente !== null) { - if ($this->aDocente->isModified()) { - $affectedRows += $this->aDocente->save($con); - } - $this->setDocente($this->aDocente); - } - if ($this->isModified()) { if ($this->isNew()) { $pk = DocenteHorarioPeer::doInsert($this, $con); @@ -210,19 +210,19 @@ + if ($this->aDocente !== null) { + if (!$this->aDocente->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aDocente->getValidationFailures()); + } + } + if ($this->aEvento !== null) { if (!$this->aEvento->validate($columns)) { $failureMap = array_merge($failureMap, $this->aEvento->getValidationFailures()); } } - if ($this->aDocente !== null) { - if (!$this->aDocente->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aDocente->getValidationFailures()); - } - } - if (($retval = DocenteHorarioPeer::doValidate($this, $columns)) !== true) { $failureMap = array_merge($failureMap, $retval); } @@ -370,63 +370,63 @@ } - public function setEvento($v) + public function setDocente($v) { if ($v === null) { - $this->setFkEventoId(NULL); + $this->setFkDocenteId(NULL); } else { - $this->setFkEventoId($v->getId()); + $this->setFkDocenteId($v->getId()); } - $this->aEvento = $v; + $this->aDocente = $v; } - public function getEvento($con = null) + public function getDocente($con = null) { - include_once 'lib/model/om/BaseEventoPeer.php'; + include_once 'lib/model/om/BaseDocentePeer.php'; - if ($this->aEvento === null && ($this->fk_evento_id !== null)) { + if ($this->aDocente === null && ($this->fk_docente_id !== null)) { - $this->aEvento = EventoPeer::retrieveByPK($this->fk_evento_id, $con); + $this->aDocente = DocentePeer::retrieveByPK($this->fk_docente_id, $con); } - return $this->aEvento; + return $this->aDocente; } - public function setDocente($v) + public function setEvento($v) { if ($v === null) { - $this->setFkDocenteId(NULL); + $this->setFkEventoId(NULL); } else { - $this->setFkDocenteId($v->getId()); + $this->setFkEventoId($v->getId()); } - $this->aDocente = $v; + $this->aEvento = $v; } - public function getDocente($con = null) + public function getEvento($con = null) { - include_once 'lib/model/om/BaseDocentePeer.php'; + include_once 'lib/model/om/BaseEventoPeer.php'; - if ($this->aDocente === null && ($this->fk_docente_id !== null)) { + if ($this->aEvento === null && ($this->fk_evento_id !== null)) { - $this->aDocente = DocentePeer::retrieveByPK($this->fk_docente_id, $con); + $this->aEvento = EventoPeer::retrieveByPK($this->fk_evento_id, $con); } - return $this->aDocente; + return $this->aEvento; } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDocenteHorarioPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDocenteHorarioPeer.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDocenteHorarioPeer.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -179,7 +179,7 @@ } - public static function doCountJoinEvento(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinDocente(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -195,7 +195,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(DocenteHorarioPeer::FK_EVENTO_ID, EventoPeer::ID); + $criteria->addJoin(DocenteHorarioPeer::FK_DOCENTE_ID, DocentePeer::ID); $rs = DocenteHorarioPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -207,7 +207,7 @@ - public static function doCountJoinDocente(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinEvento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -223,7 +223,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(DocenteHorarioPeer::FK_DOCENTE_ID, DocentePeer::ID); + $criteria->addJoin(DocenteHorarioPeer::FK_EVENTO_ID, EventoPeer::ID); $rs = DocenteHorarioPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -235,7 +235,7 @@ - public static function doSelectJoinEvento(Criteria $c, $con = null) + public static function doSelectJoinDocente(Criteria $c, $con = null) { $c = clone $c; @@ -245,9 +245,9 @@ DocenteHorarioPeer::addSelectColumns($c); $startcol = (DocenteHorarioPeer::NUM_COLUMNS - DocenteHorarioPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - EventoPeer::addSelectColumns($c); + DocentePeer::addSelectColumns($c); - $c->addJoin(DocenteHorarioPeer::FK_EVENTO_ID, EventoPeer::ID); + $c->addJoin(DocenteHorarioPeer::FK_DOCENTE_ID, DocentePeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -259,7 +259,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = EventoPeer::getOMClass(); + $omClass = DocentePeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -267,7 +267,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getEvento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addDocenteHorario($obj1); break; } @@ -282,7 +282,7 @@ - public static function doSelectJoinDocente(Criteria $c, $con = null) + public static function doSelectJoinEvento(Criteria $c, $con = null) { $c = clone $c; @@ -292,9 +292,9 @@ DocenteHorarioPeer::addSelectColumns($c); $startcol = (DocenteHorarioPeer::NUM_COLUMNS - DocenteHorarioPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - DocentePeer::addSelectColumns($c); + EventoPeer::addSelectColumns($c); - $c->addJoin(DocenteHorarioPeer::FK_DOCENTE_ID, DocentePeer::ID); + $c->addJoin(DocenteHorarioPeer::FK_EVENTO_ID, EventoPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -306,7 +306,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = DocentePeer::getOMClass(); + $omClass = EventoPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -314,7 +314,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getEvento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addDocenteHorario($obj1); break; } @@ -345,10 +345,10 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(DocenteHorarioPeer::FK_DOCENTE_ID, DocentePeer::ID); + $criteria->addJoin(DocenteHorarioPeer::FK_EVENTO_ID, EventoPeer::ID); - $criteria->addJoin(DocenteHorarioPeer::FK_DOCENTE_ID, DocentePeer::ID); - $rs = DocenteHorarioPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -370,16 +370,16 @@ DocenteHorarioPeer::addSelectColumns($c); $startcol2 = (DocenteHorarioPeer::NUM_COLUMNS - DocenteHorarioPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + DocentePeer::addSelectColumns($c); + $startcol3 = $startcol2 + DocentePeer::NUM_COLUMNS; + EventoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + EventoPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + EventoPeer::NUM_COLUMNS; - DocentePeer::addSelectColumns($c); - $startcol4 = $startcol3 + DocentePeer::NUM_COLUMNS; + $c->addJoin(DocenteHorarioPeer::FK_DOCENTE_ID, DocentePeer::ID); $c->addJoin(DocenteHorarioPeer::FK_EVENTO_ID, EventoPeer::ID); - $c->addJoin(DocenteHorarioPeer::FK_DOCENTE_ID, DocentePeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -394,7 +394,7 @@ - $omClass = EventoPeer::getOMClass(); + $omClass = DocentePeer::getOMClass(); $cls = Propel::import($omClass); @@ -404,7 +404,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getEvento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addDocenteHorario($obj1); break; } @@ -417,7 +417,7 @@ - $omClass = DocentePeer::getOMClass(); + $omClass = EventoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -427,7 +427,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getDocente(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getEvento(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addDocenteHorario($obj1); break; } @@ -445,7 +445,7 @@ - public static function doCountJoinAllExceptEvento(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptDocente(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -461,7 +461,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(DocenteHorarioPeer::FK_DOCENTE_ID, DocentePeer::ID); + $criteria->addJoin(DocenteHorarioPeer::FK_EVENTO_ID, EventoPeer::ID); $rs = DocenteHorarioPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -473,7 +473,7 @@ - public static function doCountJoinAllExceptDocente(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptEvento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -489,7 +489,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(DocenteHorarioPeer::FK_EVENTO_ID, EventoPeer::ID); + $criteria->addJoin(DocenteHorarioPeer::FK_DOCENTE_ID, DocentePeer::ID); $rs = DocenteHorarioPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -501,7 +501,7 @@ - public static function doSelectJoinAllExceptEvento(Criteria $c, $con = null) + public static function doSelectJoinAllExceptDocente(Criteria $c, $con = null) { $c = clone $c; @@ -512,10 +512,10 @@ DocenteHorarioPeer::addSelectColumns($c); $startcol2 = (DocenteHorarioPeer::NUM_COLUMNS - DocenteHorarioPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - DocentePeer::addSelectColumns($c); - $startcol3 = $startcol2 + DocentePeer::NUM_COLUMNS; + EventoPeer::addSelectColumns($c); + $startcol3 = $startcol2 + EventoPeer::NUM_COLUMNS; - $c->addJoin(DocenteHorarioPeer::FK_DOCENTE_ID, DocentePeer::ID); + $c->addJoin(DocenteHorarioPeer::FK_EVENTO_ID, EventoPeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -529,7 +529,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = DocentePeer::getOMClass(); + $omClass = EventoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -539,7 +539,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getEvento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addDocenteHorario($obj1); break; @@ -558,7 +558,7 @@ - public static function doSelectJoinAllExceptDocente(Criteria $c, $con = null) + public static function doSelectJoinAllExceptEvento(Criteria $c, $con = null) { $c = clone $c; @@ -569,10 +569,10 @@ DocenteHorarioPeer::addSelectColumns($c); $startcol2 = (DocenteHorarioPeer::NUM_COLUMNS - DocenteHorarioPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - EventoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + EventoPeer::NUM_COLUMNS; + DocentePeer::addSelectColumns($c); + $startcol3 = $startcol2 + DocentePeer::NUM_COLUMNS; - $c->addJoin(DocenteHorarioPeer::FK_EVENTO_ID, EventoPeer::ID); + $c->addJoin(DocenteHorarioPeer::FK_DOCENTE_ID, DocentePeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -586,7 +586,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = EventoPeer::getOMClass(); + $omClass = DocentePeer::getOMClass(); $cls = Propel::import($omClass); @@ -596,7 +596,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getEvento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addDocenteHorario($obj1); break; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEscalanota.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseEscalanota.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseEscalanota.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -29,7 +29,7 @@ - protected $aprobado = true; + protected $aprobado = false; protected $aEstablecimiento; @@ -178,7 +178,7 @@ public function setAprobado($v) { - if ($this->aprobado !== $v || $v === true) { + if ($this->aprobado !== $v || $v === false) { $this->aprobado = $v; $this->modifiedColumns[] = EscalanotaPeer::APROBADO; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEspacio.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseEspacio.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseEspacio.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,7 +13,7 @@ - protected $nombre = ''; + protected $nombre = 'null'; @@ -129,7 +129,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = EspacioPeer::NOMBRE; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,7 +13,7 @@ - protected $nombre = ''; + protected $nombre = 'null'; @@ -32,13 +32,13 @@ protected $fk_niveltipo_id = 0; - protected $aNiveltipo; + protected $aDistritoescolar; protected $aOrganizacion; - protected $aDistritoescolar; + protected $aNiveltipo; protected $collRelEstablecimientoLocacions; @@ -170,7 +170,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = EstablecimientoPeer::NOMBRE; } @@ -323,11 +323,11 @@ - if ($this->aNiveltipo !== null) { - if ($this->aNiveltipo->isModified()) { - $affectedRows += $this->aNiveltipo->save($con); + if ($this->aDistritoescolar !== null) { + if ($this->aDistritoescolar->isModified()) { + $affectedRows += $this->aDistritoescolar->save($con); } - $this->setNiveltipo($this->aNiveltipo); + $this->setDistritoescolar($this->aDistritoescolar); } if ($this->aOrganizacion !== null) { @@ -337,11 +337,11 @@ $this->setOrganizacion($this->aOrganizacion); } - if ($this->aDistritoescolar !== null) { - if ($this->aDistritoescolar->isModified()) { - $affectedRows += $this->aDistritoescolar->save($con); + if ($this->aNiveltipo !== null) { + if ($this->aNiveltipo->isModified()) { + $affectedRows += $this->aNiveltipo->save($con); } - $this->setDistritoescolar($this->aDistritoescolar); + $this->setNiveltipo($this->aNiveltipo); } @@ -473,9 +473,9 @@ - if ($this->aNiveltipo !== null) { - if (!$this->aNiveltipo->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aNiveltipo->getValidationFailures()); + if ($this->aDistritoescolar !== null) { + if (!$this->aDistritoescolar->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aDistritoescolar->getValidationFailures()); } } @@ -485,9 +485,9 @@ } } - if ($this->aDistritoescolar !== null) { - if (!$this->aDistritoescolar->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aDistritoescolar->getValidationFailures()); + if ($this->aNiveltipo !== null) { + if (!$this->aNiveltipo->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aNiveltipo->getValidationFailures()); } } @@ -798,33 +798,33 @@ } - public function setNiveltipo($v) + public function setDistritoescolar($v) { if ($v === null) { - $this->setFkNiveltipoId('0'); + $this->setFkDistritoescolarId('0'); } else { - $this->setFkNiveltipoId($v->getId()); + $this->setFkDistritoescolarId($v->getId()); } - $this->aNiveltipo = $v; + $this->aDistritoescolar = $v; } - public function getNiveltipo($con = null) + public function getDistritoescolar($con = null) { - include_once 'lib/model/om/BaseNiveltipoPeer.php'; + include_once 'lib/model/om/BaseDistritoescolarPeer.php'; - if ($this->aNiveltipo === null && ($this->fk_niveltipo_id !== null)) { + if ($this->aDistritoescolar === null && ($this->fk_distritoescolar_id !== null)) { - $this->aNiveltipo = NiveltipoPeer::retrieveByPK($this->fk_niveltipo_id, $con); + $this->aDistritoescolar = DistritoescolarPeer::retrieveByPK($this->fk_distritoescolar_id, $con); } - return $this->aNiveltipo; + return $this->aDistritoescolar; } @@ -858,33 +858,33 @@ } - public function setDistritoescolar($v) + public function setNiveltipo($v) { if ($v === null) { - $this->setFkDistritoescolarId('0'); + $this->setFkNiveltipoId('0'); } else { - $this->setFkDistritoescolarId($v->getId()); + $this->setFkNiveltipoId($v->getId()); } - $this->aDistritoescolar = $v; + $this->aNiveltipo = $v; } - public function getDistritoescolar($con = null) + public function getNiveltipo($con = null) { - include_once 'lib/model/om/BaseDistritoescolarPeer.php'; + include_once 'lib/model/om/BaseNiveltipoPeer.php'; - if ($this->aDistritoescolar === null && ($this->fk_distritoescolar_id !== null)) { + if ($this->aNiveltipo === null && ($this->fk_niveltipo_id !== null)) { - $this->aDistritoescolar = DistritoescolarPeer::retrieveByPK($this->fk_distritoescolar_id, $con); + $this->aNiveltipo = NiveltipoPeer::retrieveByPK($this->fk_niveltipo_id, $con); } - return $this->aDistritoescolar; + return $this->aNiveltipo; } @@ -1134,7 +1134,7 @@ - public function getAlumnosJoinTipodocumento($criteria = null, $con = null) + public function getAlumnosJoinProvincia($criteria = null, $con = null) { include_once 'lib/model/om/BaseAlumnoPeer.php'; if ($criteria === null) { @@ -1152,14 +1152,14 @@ $criteria->add(AlumnoPeer::FK_ESTABLECIMIENTO_ID, $this->getId()); - $this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); } } else { $criteria->add(AlumnoPeer::FK_ESTABLECIMIENTO_ID, $this->getId()); if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) { - $this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); } } $this->lastAlumnoCriteria = $criteria; @@ -1169,7 +1169,7 @@ - public function getAlumnosJoinCuenta($criteria = null, $con = null) + public function getAlumnosJoinTipodocumento($criteria = null, $con = null) { include_once 'lib/model/om/BaseAlumnoPeer.php'; if ($criteria === null) { @@ -1187,14 +1187,14 @@ $criteria->add(AlumnoPeer::FK_ESTABLECIMIENTO_ID, $this->getId()); - $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con); } } else { $criteria->add(AlumnoPeer::FK_ESTABLECIMIENTO_ID, $this->getId()); if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) { - $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con); } } $this->lastAlumnoCriteria = $criteria; @@ -1204,7 +1204,7 @@ - public function getAlumnosJoinProvincia($criteria = null, $con = null) + public function getAlumnosJoinCuenta($criteria = null, $con = null) { include_once 'lib/model/om/BaseAlumnoPeer.php'; if ($criteria === null) { @@ -1222,14 +1222,14 @@ $criteria->add(AlumnoPeer::FK_ESTABLECIMIENTO_ID, $this->getId()); - $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); } } else { $criteria->add(AlumnoPeer::FK_ESTABLECIMIENTO_ID, $this->getId()); if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) { - $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); } } $this->lastAlumnoCriteria = $criteria; @@ -1834,7 +1834,7 @@ - public function getHorarioescolarsJoinHorarioescolartipo($criteria = null, $con = null) + public function getHorarioescolarsJoinTurnos($criteria = null, $con = null) { include_once 'lib/model/om/BaseHorarioescolarPeer.php'; if ($criteria === null) { @@ -1852,14 +1852,14 @@ $criteria->add(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, $this->getId()); - $this->collHorarioescolars = HorarioescolarPeer::doSelectJoinHorarioescolartipo($criteria, $con); + $this->collHorarioescolars = HorarioescolarPeer::doSelectJoinTurnos($criteria, $con); } } else { $criteria->add(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, $this->getId()); if (!isset($this->lastHorarioescolarCriteria) || !$this->lastHorarioescolarCriteria->equals($criteria)) { - $this->collHorarioescolars = HorarioescolarPeer::doSelectJoinHorarioescolartipo($criteria, $con); + $this->collHorarioescolars = HorarioescolarPeer::doSelectJoinTurnos($criteria, $con); } } $this->lastHorarioescolarCriteria = $criteria; @@ -1869,7 +1869,7 @@ - public function getHorarioescolarsJoinTurnos($criteria = null, $con = null) + public function getHorarioescolarsJoinHorarioescolartipo($criteria = null, $con = null) { include_once 'lib/model/om/BaseHorarioescolarPeer.php'; if ($criteria === null) { @@ -1887,14 +1887,14 @@ $criteria->add(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, $this->getId()); - $this->collHorarioescolars = HorarioescolarPeer::doSelectJoinTurnos($criteria, $con); + $this->collHorarioescolars = HorarioescolarPeer::doSelectJoinHorarioescolartipo($criteria, $con); } } else { $criteria->add(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, $this->getId()); if (!isset($this->lastHorarioescolarCriteria) || !$this->lastHorarioescolarCriteria->equals($criteria)) { - $this->collHorarioescolars = HorarioescolarPeer::doSelectJoinTurnos($criteria, $con); + $this->collHorarioescolars = HorarioescolarPeer::doSelectJoinHorarioescolartipo($criteria, $con); } } $this->lastHorarioescolarCriteria = $criteria; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimientoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimientoPeer.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimientoPeer.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -199,7 +199,7 @@ } - public static function doCountJoinNiveltipo(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinDistritoescolar(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -215,7 +215,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(EstablecimientoPeer::FK_NIVELTIPO_ID, NiveltipoPeer::ID); + $criteria->addJoin(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, DistritoescolarPeer::ID); $rs = EstablecimientoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -255,7 +255,7 @@ - public static function doCountJoinDistritoescolar(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinNiveltipo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -271,7 +271,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, DistritoescolarPeer::ID); + $criteria->addJoin(EstablecimientoPeer::FK_NIVELTIPO_ID, NiveltipoPeer::ID); $rs = EstablecimientoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -283,7 +283,7 @@ - public static function doSelectJoinNiveltipo(Criteria $c, $con = null) + public static function doSelectJoinDistritoescolar(Criteria $c, $con = null) { $c = clone $c; @@ -293,9 +293,9 @@ EstablecimientoPeer::addSelectColumns($c); $startcol = (EstablecimientoPeer::NUM_COLUMNS - EstablecimientoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - NiveltipoPeer::addSelectColumns($c); + DistritoescolarPeer::addSelectColumns($c); - $c->addJoin(EstablecimientoPeer::FK_NIVELTIPO_ID, NiveltipoPeer::ID); + $c->addJoin(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, DistritoescolarPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -307,7 +307,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = NiveltipoPeer::getOMClass(); + $omClass = DistritoescolarPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -315,7 +315,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getNiveltipo(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getDistritoescolar(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addEstablecimiento($obj1); break; } @@ -377,7 +377,7 @@ - public static function doSelectJoinDistritoescolar(Criteria $c, $con = null) + public static function doSelectJoinNiveltipo(Criteria $c, $con = null) { $c = clone $c; @@ -387,9 +387,9 @@ EstablecimientoPeer::addSelectColumns($c); $startcol = (EstablecimientoPeer::NUM_COLUMNS - EstablecimientoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - DistritoescolarPeer::addSelectColumns($c); + NiveltipoPeer::addSelectColumns($c); - $c->addJoin(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, DistritoescolarPeer::ID); + $c->addJoin(EstablecimientoPeer::FK_NIVELTIPO_ID, NiveltipoPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -401,7 +401,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = DistritoescolarPeer::getOMClass(); + $omClass = NiveltipoPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -409,7 +409,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getDistritoescolar(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getNiveltipo(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addEstablecimiento($obj1); break; } @@ -440,11 +440,11 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(EstablecimientoPeer::FK_NIVELTIPO_ID, NiveltipoPeer::ID); + $criteria->addJoin(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, DistritoescolarPeer::ID); $criteria->addJoin(EstablecimientoPeer::FK_ORGANIZACION_ID, OrganizacionPeer::ID); - $criteria->addJoin(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, DistritoescolarPeer::ID); + $criteria->addJoin(EstablecimientoPeer::FK_NIVELTIPO_ID, NiveltipoPeer::ID); $rs = EstablecimientoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -467,20 +467,20 @@ EstablecimientoPeer::addSelectColumns($c); $startcol2 = (EstablecimientoPeer::NUM_COLUMNS - EstablecimientoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - NiveltipoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + NiveltipoPeer::NUM_COLUMNS; + DistritoescolarPeer::addSelectColumns($c); + $startcol3 = $startcol2 + DistritoescolarPeer::NUM_COLUMNS; OrganizacionPeer::addSelectColumns($c); $startcol4 = $startcol3 + OrganizacionPeer::NUM_COLUMNS; - DistritoescolarPeer::addSelectColumns($c); - $startcol5 = $startcol4 + DistritoescolarPeer::NUM_COLUMNS; + NiveltipoPeer::addSelectColumns($c); + $startcol5 = $startcol4 + NiveltipoPeer::NUM_COLUMNS; - $c->addJoin(EstablecimientoPeer::FK_NIVELTIPO_ID, NiveltipoPeer::ID); + $c->addJoin(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, DistritoescolarPeer::ID); $c->addJoin(EstablecimientoPeer::FK_ORGANIZACION_ID, OrganizacionPeer::ID); - $c->addJoin(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, DistritoescolarPeer::ID); + $c->addJoin(EstablecimientoPeer::FK_NIVELTIPO_ID, NiveltipoPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -496,7 +496,7 @@ - $omClass = NiveltipoPeer::getOMClass(); + $omClass = DistritoescolarPeer::getOMClass(); $cls = Propel::import($omClass); @@ -506,7 +506,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getNiveltipo(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getDistritoescolar(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addEstablecimiento($obj1); break; } @@ -542,7 +542,7 @@ - $omClass = DistritoescolarPeer::getOMClass(); + $omClass = NiveltipoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -552,7 +552,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj4 = $temp_obj1->getDistritoescolar(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { + $temp_obj4 = $temp_obj1->getNiveltipo(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { $newObject = false; $temp_obj4->addEstablecimiento($obj1); break; } @@ -570,7 +570,7 @@ - public static function doCountJoinAllExceptNiveltipo(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptDistritoescolar(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -588,7 +588,7 @@ $criteria->addJoin(EstablecimientoPeer::FK_ORGANIZACION_ID, OrganizacionPeer::ID); - $criteria->addJoin(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, DistritoescolarPeer::ID); + $criteria->addJoin(EstablecimientoPeer::FK_NIVELTIPO_ID, NiveltipoPeer::ID); $rs = EstablecimientoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -616,10 +616,10 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, DistritoescolarPeer::ID); + $criteria->addJoin(EstablecimientoPeer::FK_NIVELTIPO_ID, NiveltipoPeer::ID); - $criteria->addJoin(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, DistritoescolarPeer::ID); - $rs = EstablecimientoPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -630,7 +630,7 @@ - public static function doCountJoinAllExceptDistritoescolar(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptNiveltipo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -646,7 +646,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(EstablecimientoPeer::FK_NIVELTIPO_ID, NiveltipoPeer::ID); + $criteria->addJoin(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, DistritoescolarPeer::ID); $criteria->addJoin(EstablecimientoPeer::FK_ORGANIZACION_ID, OrganizacionPeer::ID); @@ -660,7 +660,7 @@ - public static function doSelectJoinAllExceptNiveltipo(Criteria $c, $con = null) + public static function doSelectJoinAllExceptDistritoescolar(Criteria $c, $con = null) { $c = clone $c; @@ -674,12 +674,12 @@ OrganizacionPeer::addSelectColumns($c); $startcol3 = $startcol2 + OrganizacionPeer::NUM_COLUMNS; - DistritoescolarPeer::addSelectColumns($c); - $startcol4 = $startcol3 + DistritoescolarPeer::NUM_COLUMNS; + NiveltipoPeer::addSelectColumns($c); + $startcol4 = $startcol3 + NiveltipoPeer::NUM_COLUMNS; $c->addJoin(EstablecimientoPeer::FK_ORGANIZACION_ID, OrganizacionPeer::ID); - $c->addJoin(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, DistritoescolarPeer::ID); + $c->addJoin(EstablecimientoPeer::FK_NIVELTIPO_ID, NiveltipoPeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -715,7 +715,7 @@ $obj2->addEstablecimiento($obj1); } - $omClass = DistritoescolarPeer::getOMClass(); + $omClass = NiveltipoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -725,7 +725,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getDistritoescolar(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getNiveltipo(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addEstablecimiento($obj1); break; @@ -755,17 +755,17 @@ EstablecimientoPeer::addSelectColumns($c); $startcol2 = (EstablecimientoPeer::NUM_COLUMNS - EstablecimientoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + DistritoescolarPeer::addSelectColumns($c); + $startcol3 = $startcol2 + DistritoescolarPeer::NUM_COLUMNS; + NiveltipoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + NiveltipoPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + NiveltipoPeer::NUM_COLUMNS; - DistritoescolarPeer::addSelectColumns($c); - $startcol4 = $startcol3 + DistritoescolarPeer::NUM_COLUMNS; + $c->addJoin(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, DistritoescolarPeer::ID); $c->addJoin(EstablecimientoPeer::FK_NIVELTIPO_ID, NiveltipoPeer::ID); - $c->addJoin(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, DistritoescolarPeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -777,7 +777,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = NiveltipoPeer::getOMClass(); + $omClass = DistritoescolarPeer::getOMClass(); $cls = Propel::import($omClass); @@ -787,7 +787,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getNiveltipo(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getDistritoescolar(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addEstablecimiento($obj1); break; @@ -799,7 +799,7 @@ $obj2->addEstablecimiento($obj1); } - $omClass = DistritoescolarPeer::getOMClass(); + $omClass = NiveltipoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -809,7 +809,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getDistritoescolar(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getNiveltipo(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addEstablecimiento($obj1); break; @@ -828,7 +828,7 @@ - public static function doSelectJoinAllExceptDistritoescolar(Criteria $c, $con = null) + public static function doSelectJoinAllExceptNiveltipo(Criteria $c, $con = null) { $c = clone $c; @@ -839,13 +839,13 @@ EstablecimientoPeer::addSelectColumns($c); $startcol2 = (EstablecimientoPeer::NUM_COLUMNS - EstablecimientoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - NiveltipoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + NiveltipoPeer::NUM_COLUMNS; + DistritoescolarPeer::addSelectColumns($c); + $startcol3 = $startcol2 + DistritoescolarPeer::NUM_COLUMNS; OrganizacionPeer::addSelectColumns($c); $startcol4 = $startcol3 + OrganizacionPeer::NUM_COLUMNS; - $c->addJoin(EstablecimientoPeer::FK_NIVELTIPO_ID, NiveltipoPeer::ID); + $c->addJoin(EstablecimientoPeer::FK_DISTRITOESCOLAR_ID, DistritoescolarPeer::ID); $c->addJoin(EstablecimientoPeer::FK_ORGANIZACION_ID, OrganizacionPeer::ID); @@ -861,7 +861,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = NiveltipoPeer::getOMClass(); + $omClass = DistritoescolarPeer::getOMClass(); $cls = Propel::import($omClass); @@ -871,7 +871,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getNiveltipo(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getDistritoescolar(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addEstablecimiento($obj1); break; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -37,7 +37,7 @@ - protected $recurrencia_fin = ''; + protected $recurrencia_fin = 'null'; @@ -277,7 +277,7 @@ $v = (string) $v; } - if ($this->recurrencia_fin !== $v || $v === '') { + if ($this->recurrencia_fin !== $v || $v === 'null') { $this->recurrencia_fin = $v; $this->modifiedColumns[] = EventoPeer::RECURRENCIA_FIN; } @@ -820,7 +820,7 @@ - public function getRelDivisionActividadDocentesJoinDocente($criteria = null, $con = null) + public function getRelDivisionActividadDocentesJoinActividad($criteria = null, $con = null) { include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; if ($criteria === null) { @@ -838,14 +838,14 @@ $criteria->add(RelDivisionActividadDocentePeer::FK_EVENTO_ID, $this->getId()); - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinDocente($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinActividad($criteria, $con); } } else { $criteria->add(RelDivisionActividadDocentePeer::FK_EVENTO_ID, $this->getId()); if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinDocente($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinActividad($criteria, $con); } } $this->lastRelDivisionActividadDocenteCriteria = $criteria; @@ -855,7 +855,7 @@ - public function getRelDivisionActividadDocentesJoinActividad($criteria = null, $con = null) + public function getRelDivisionActividadDocentesJoinDocente($criteria = null, $con = null) { include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; if ($criteria === null) { @@ -873,14 +873,14 @@ $criteria->add(RelDivisionActividadDocentePeer::FK_EVENTO_ID, $this->getId()); - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinActividad($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinDocente($criteria, $con); } } else { $criteria->add(RelDivisionActividadDocentePeer::FK_EVENTO_ID, $this->getId()); if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinActividad($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinDocente($criteria, $con); } } $this->lastRelDivisionActividadDocenteCriteria = $criteria; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseExamen.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseExamen.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseExamen.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -29,7 +29,7 @@ - protected $nombre = ''; + protected $nombre = 'null'; @@ -222,7 +222,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = ExamenPeer::NOMBRE; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseFeriado.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseFeriado.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseFeriado.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -21,11 +21,11 @@ - protected $repeticion_anual = true; + protected $repeticion_anual = false; - protected $inamovible = true; + protected $inamovible = false; @@ -146,7 +146,7 @@ public function setRepeticionAnual($v) { - if ($this->repeticion_anual !== $v || $v === true) { + if ($this->repeticion_anual !== $v || $v === false) { $this->repeticion_anual = $v; $this->modifiedColumns[] = FeriadoPeer::REPETICION_ANUAL; } @@ -156,7 +156,7 @@ public function setInamovible($v) { - if ($this->inamovible !== $v || $v === true) { + if ($this->inamovible !== $v || $v === false) { $this->inamovible = $v; $this->modifiedColumns[] = FeriadoPeer::INAMOVIBLE; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolar.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolar.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolar.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -44,15 +44,15 @@ protected $fk_horarioescolartipo_id = 0; - protected $aHorarioescolartipo; - - protected $aEstablecimiento; protected $aTurnos; + protected $aHorarioescolartipo; + + protected $alreadyInSave = false; @@ -380,13 +380,6 @@ - if ($this->aHorarioescolartipo !== null) { - if ($this->aHorarioescolartipo->isModified()) { - $affectedRows += $this->aHorarioescolartipo->save($con); - } - $this->setHorarioescolartipo($this->aHorarioescolartipo); - } - if ($this->aEstablecimiento !== null) { if ($this->aEstablecimiento->isModified()) { $affectedRows += $this->aEstablecimiento->save($con); @@ -401,7 +394,14 @@ $this->setTurnos($this->aTurnos); } + if ($this->aHorarioescolartipo !== null) { + if ($this->aHorarioescolartipo->isModified()) { + $affectedRows += $this->aHorarioescolartipo->save($con); + } + $this->setHorarioescolartipo($this->aHorarioescolartipo); + } + if ($this->isModified()) { if ($this->isNew()) { $pk = HorarioescolarPeer::doInsert($this, $con); @@ -450,12 +450,6 @@ - if ($this->aHorarioescolartipo !== null) { - if (!$this->aHorarioescolartipo->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aHorarioescolartipo->getValidationFailures()); - } - } - if ($this->aEstablecimiento !== null) { if (!$this->aEstablecimiento->validate($columns)) { $failureMap = array_merge($failureMap, $this->aEstablecimiento->getValidationFailures()); @@ -468,7 +462,13 @@ } } + if ($this->aHorarioescolartipo !== null) { + if (!$this->aHorarioescolartipo->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aHorarioescolartipo->getValidationFailures()); + } + } + if (($retval = HorarioescolarPeer::doValidate($this, $columns)) !== true) { $failureMap = array_merge($failureMap, $retval); } @@ -683,93 +683,93 @@ } - public function setHorarioescolartipo($v) + public function setEstablecimiento($v) { if ($v === null) { - $this->setFkHorarioescolartipoId('0'); + $this->setFkEstablecimientoId('0'); } else { - $this->setFkHorarioescolartipoId($v->getId()); + $this->setFkEstablecimientoId($v->getId()); } - $this->aHorarioescolartipo = $v; + $this->aEstablecimiento = $v; } - public function getHorarioescolartipo($con = null) + public function getEstablecimiento($con = null) { - include_once 'lib/model/om/BaseHorarioescolartipoPeer.php'; + include_once 'lib/model/om/BaseEstablecimientoPeer.php'; - if ($this->aHorarioescolartipo === null && ($this->fk_horarioescolartipo_id !== null)) { + if ($this->aEstablecimiento === null && ($this->fk_establecimiento_id !== null)) { - $this->aHorarioescolartipo = HorarioescolartipoPeer::retrieveByPK($this->fk_horarioescolartipo_id, $con); + $this->aEstablecimiento = EstablecimientoPeer::retrieveByPK($this->fk_establecimiento_id, $con); } - return $this->aHorarioescolartipo; + return $this->aEstablecimiento; } - public function setEstablecimiento($v) + public function setTurnos($v) { if ($v === null) { - $this->setFkEstablecimientoId('0'); + $this->setFkTurnosId('0'); } else { - $this->setFkEstablecimientoId($v->getId()); + $this->setFkTurnosId($v->getId()); } - $this->aEstablecimiento = $v; + $this->aTurnos = $v; } - public function getEstablecimiento($con = null) + public function getTurnos($con = null) { - include_once 'lib/model/om/BaseEstablecimientoPeer.php'; + include_once 'lib/model/om/BaseTurnosPeer.php'; - if ($this->aEstablecimiento === null && ($this->fk_establecimiento_id !== null)) { + if ($this->aTurnos === null && ($this->fk_turnos_id !== null)) { - $this->aEstablecimiento = EstablecimientoPeer::retrieveByPK($this->fk_establecimiento_id, $con); + $this->aTurnos = TurnosPeer::retrieveByPK($this->fk_turnos_id, $con); } - return $this->aEstablecimiento; + return $this->aTurnos; } - public function setTurnos($v) + public function setHorarioescolartipo($v) { if ($v === null) { - $this->setFkTurnosId('0'); + $this->setFkHorarioescolartipoId('0'); } else { - $this->setFkTurnosId($v->getId()); + $this->setFkHorarioescolartipoId($v->getId()); } - $this->aTurnos = $v; + $this->aHorarioescolartipo = $v; } - public function getTurnos($con = null) + public function getHorarioescolartipo($con = null) { - include_once 'lib/model/om/BaseTurnosPeer.php'; + include_once 'lib/model/om/BaseHorarioescolartipoPeer.php'; - if ($this->aTurnos === null && ($this->fk_turnos_id !== null)) { + if ($this->aHorarioescolartipo === null && ($this->fk_horarioescolartipo_id !== null)) { - $this->aTurnos = TurnosPeer::retrieveByPK($this->fk_turnos_id, $con); + $this->aHorarioescolartipo = HorarioescolartipoPeer::retrieveByPK($this->fk_horarioescolartipo_id, $con); } - return $this->aTurnos; + return $this->aHorarioescolartipo; } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolarPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolarPeer.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolarPeer.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -214,7 +214,7 @@ } - public static function doCountJoinHorarioescolartipo(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -230,7 +230,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(HorarioescolarPeer::FK_HORARIOESCOLARTIPO_ID, HorarioescolartipoPeer::ID); + $criteria->addJoin(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); $rs = HorarioescolarPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -242,7 +242,7 @@ - public static function doCountJoinEstablecimiento(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinTurnos(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -258,7 +258,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); + $criteria->addJoin(HorarioescolarPeer::FK_TURNOS_ID, TurnosPeer::ID); $rs = HorarioescolarPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -270,7 +270,7 @@ - public static function doCountJoinTurnos(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinHorarioescolartipo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -286,7 +286,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(HorarioescolarPeer::FK_TURNOS_ID, TurnosPeer::ID); + $criteria->addJoin(HorarioescolarPeer::FK_HORARIOESCOLARTIPO_ID, HorarioescolartipoPeer::ID); $rs = HorarioescolarPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -298,7 +298,7 @@ - public static function doSelectJoinHorarioescolartipo(Criteria $c, $con = null) + public static function doSelectJoinEstablecimiento(Criteria $c, $con = null) { $c = clone $c; @@ -308,9 +308,9 @@ HorarioescolarPeer::addSelectColumns($c); $startcol = (HorarioescolarPeer::NUM_COLUMNS - HorarioescolarPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - HorarioescolartipoPeer::addSelectColumns($c); + EstablecimientoPeer::addSelectColumns($c); - $c->addJoin(HorarioescolarPeer::FK_HORARIOESCOLARTIPO_ID, HorarioescolartipoPeer::ID); + $c->addJoin(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -322,7 +322,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = HorarioescolartipoPeer::getOMClass(); + $omClass = EstablecimientoPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -330,7 +330,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getHorarioescolartipo(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getEstablecimiento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addHorarioescolar($obj1); break; } @@ -345,7 +345,7 @@ - public static function doSelectJoinEstablecimiento(Criteria $c, $con = null) + public static function doSelectJoinTurnos(Criteria $c, $con = null) { $c = clone $c; @@ -355,9 +355,9 @@ HorarioescolarPeer::addSelectColumns($c); $startcol = (HorarioescolarPeer::NUM_COLUMNS - HorarioescolarPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - EstablecimientoPeer::addSelectColumns($c); + TurnosPeer::addSelectColumns($c); - $c->addJoin(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); + $c->addJoin(HorarioescolarPeer::FK_TURNOS_ID, TurnosPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -369,7 +369,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = EstablecimientoPeer::getOMClass(); + $omClass = TurnosPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -377,7 +377,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getEstablecimiento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getTurnos(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addHorarioescolar($obj1); break; } @@ -392,7 +392,7 @@ - public static function doSelectJoinTurnos(Criteria $c, $con = null) + public static function doSelectJoinHorarioescolartipo(Criteria $c, $con = null) { $c = clone $c; @@ -402,9 +402,9 @@ HorarioescolarPeer::addSelectColumns($c); $startcol = (HorarioescolarPeer::NUM_COLUMNS - HorarioescolarPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - TurnosPeer::addSelectColumns($c); + HorarioescolartipoPeer::addSelectColumns($c); - $c->addJoin(HorarioescolarPeer::FK_TURNOS_ID, TurnosPeer::ID); + $c->addJoin(HorarioescolarPeer::FK_HORARIOESCOLARTIPO_ID, HorarioescolartipoPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -416,7 +416,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = TurnosPeer::getOMClass(); + $omClass = HorarioescolartipoPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -424,7 +424,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getTurnos(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getHorarioescolartipo(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addHorarioescolar($obj1); break; } @@ -455,12 +455,12 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(HorarioescolarPeer::FK_HORARIOESCOLARTIPO_ID, HorarioescolartipoPeer::ID); - $criteria->addJoin(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); $criteria->addJoin(HorarioescolarPeer::FK_TURNOS_ID, TurnosPeer::ID); + $criteria->addJoin(HorarioescolarPeer::FK_HORARIOESCOLARTIPO_ID, HorarioescolartipoPeer::ID); + $rs = HorarioescolarPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -482,21 +482,21 @@ HorarioescolarPeer::addSelectColumns($c); $startcol2 = (HorarioescolarPeer::NUM_COLUMNS - HorarioescolarPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - HorarioescolartipoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + HorarioescolartipoPeer::NUM_COLUMNS; - EstablecimientoPeer::addSelectColumns($c); - $startcol4 = $startcol3 + EstablecimientoPeer::NUM_COLUMNS; + $startcol3 = $startcol2 + EstablecimientoPeer::NUM_COLUMNS; TurnosPeer::addSelectColumns($c); - $startcol5 = $startcol4 + TurnosPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + TurnosPeer::NUM_COLUMNS; - $c->addJoin(HorarioescolarPeer::FK_HORARIOESCOLARTIPO_ID, HorarioescolartipoPeer::ID); + HorarioescolartipoPeer::addSelectColumns($c); + $startcol5 = $startcol4 + HorarioescolartipoPeer::NUM_COLUMNS; $c->addJoin(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); $c->addJoin(HorarioescolarPeer::FK_TURNOS_ID, TurnosPeer::ID); + $c->addJoin(HorarioescolarPeer::FK_HORARIOESCOLARTIPO_ID, HorarioescolartipoPeer::ID); + $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -511,7 +511,7 @@ - $omClass = HorarioescolartipoPeer::getOMClass(); + $omClass = EstablecimientoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -521,7 +521,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getHorarioescolartipo(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getEstablecimiento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addHorarioescolar($obj1); break; } @@ -534,7 +534,7 @@ - $omClass = EstablecimientoPeer::getOMClass(); + $omClass = TurnosPeer::getOMClass(); $cls = Propel::import($omClass); @@ -544,7 +544,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getEstablecimiento(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getTurnos(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addHorarioescolar($obj1); break; } @@ -557,7 +557,7 @@ - $omClass = TurnosPeer::getOMClass(); + $omClass = HorarioescolartipoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -567,7 +567,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj4 = $temp_obj1->getTurnos(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { + $temp_obj4 = $temp_obj1->getHorarioescolartipo(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { $newObject = false; $temp_obj4->addHorarioescolar($obj1); break; } @@ -585,7 +585,7 @@ - public static function doCountJoinAllExceptHorarioescolartipo(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -601,10 +601,10 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); - $criteria->addJoin(HorarioescolarPeer::FK_TURNOS_ID, TurnosPeer::ID); + $criteria->addJoin(HorarioescolarPeer::FK_HORARIOESCOLARTIPO_ID, HorarioescolartipoPeer::ID); + $rs = HorarioescolarPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -615,7 +615,7 @@ - public static function doCountJoinAllExceptEstablecimiento(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptTurnos(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -631,10 +631,10 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); + $criteria->addJoin(HorarioescolarPeer::FK_HORARIOESCOLARTIPO_ID, HorarioescolartipoPeer::ID); - $criteria->addJoin(HorarioescolarPeer::FK_TURNOS_ID, TurnosPeer::ID); - $rs = HorarioescolarPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -645,7 +645,7 @@ - public static function doCountJoinAllExceptTurnos(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptHorarioescolartipo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -661,10 +661,10 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(HorarioescolarPeer::FK_HORARIOESCOLARTIPO_ID, HorarioescolartipoPeer::ID); - $criteria->addJoin(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); + $criteria->addJoin(HorarioescolarPeer::FK_TURNOS_ID, TurnosPeer::ID); + $rs = HorarioescolarPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -675,7 +675,7 @@ - public static function doSelectJoinAllExceptHorarioescolartipo(Criteria $c, $con = null) + public static function doSelectJoinAllExceptEstablecimiento(Criteria $c, $con = null) { $c = clone $c; @@ -686,17 +686,17 @@ HorarioescolarPeer::addSelectColumns($c); $startcol2 = (HorarioescolarPeer::NUM_COLUMNS - HorarioescolarPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - EstablecimientoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + EstablecimientoPeer::NUM_COLUMNS; - TurnosPeer::addSelectColumns($c); - $startcol4 = $startcol3 + TurnosPeer::NUM_COLUMNS; + $startcol3 = $startcol2 + TurnosPeer::NUM_COLUMNS; - $c->addJoin(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); + HorarioescolartipoPeer::addSelectColumns($c); + $startcol4 = $startcol3 + HorarioescolartipoPeer::NUM_COLUMNS; $c->addJoin(HorarioescolarPeer::FK_TURNOS_ID, TurnosPeer::ID); + $c->addJoin(HorarioescolarPeer::FK_HORARIOESCOLARTIPO_ID, HorarioescolartipoPeer::ID); + $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -708,7 +708,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = EstablecimientoPeer::getOMClass(); + $omClass = TurnosPeer::getOMClass(); $cls = Propel::import($omClass); @@ -718,7 +718,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getEstablecimiento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getTurnos(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addHorarioescolar($obj1); break; @@ -730,7 +730,7 @@ $obj2->addHorarioescolar($obj1); } - $omClass = TurnosPeer::getOMClass(); + $omClass = HorarioescolartipoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -740,7 +740,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getTurnos(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getHorarioescolartipo(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addHorarioescolar($obj1); break; @@ -759,7 +759,7 @@ - public static function doSelectJoinAllExceptEstablecimiento(Criteria $c, $con = null) + public static function doSelectJoinAllExceptTurnos(Criteria $c, $con = null) { $c = clone $c; @@ -770,17 +770,17 @@ HorarioescolarPeer::addSelectColumns($c); $startcol2 = (HorarioescolarPeer::NUM_COLUMNS - HorarioescolarPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + EstablecimientoPeer::addSelectColumns($c); + $startcol3 = $startcol2 + EstablecimientoPeer::NUM_COLUMNS; + HorarioescolartipoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + HorarioescolartipoPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + HorarioescolartipoPeer::NUM_COLUMNS; - TurnosPeer::addSelectColumns($c); - $startcol4 = $startcol3 + TurnosPeer::NUM_COLUMNS; + $c->addJoin(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); $c->addJoin(HorarioescolarPeer::FK_HORARIOESCOLARTIPO_ID, HorarioescolartipoPeer::ID); - $c->addJoin(HorarioescolarPeer::FK_TURNOS_ID, TurnosPeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -792,7 +792,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = HorarioescolartipoPeer::getOMClass(); + $omClass = EstablecimientoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -802,7 +802,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getHorarioescolartipo(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getEstablecimiento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addHorarioescolar($obj1); break; @@ -814,7 +814,7 @@ $obj2->addHorarioescolar($obj1); } - $omClass = TurnosPeer::getOMClass(); + $omClass = HorarioescolartipoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -824,7 +824,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getTurnos(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getHorarioescolartipo(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addHorarioescolar($obj1); break; @@ -843,7 +843,7 @@ - public static function doSelectJoinAllExceptTurnos(Criteria $c, $con = null) + public static function doSelectJoinAllExceptHorarioescolartipo(Criteria $c, $con = null) { $c = clone $c; @@ -854,17 +854,17 @@ HorarioescolarPeer::addSelectColumns($c); $startcol2 = (HorarioescolarPeer::NUM_COLUMNS - HorarioescolarPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - HorarioescolartipoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + HorarioescolartipoPeer::NUM_COLUMNS; - EstablecimientoPeer::addSelectColumns($c); - $startcol4 = $startcol3 + EstablecimientoPeer::NUM_COLUMNS; + $startcol3 = $startcol2 + EstablecimientoPeer::NUM_COLUMNS; - $c->addJoin(HorarioescolarPeer::FK_HORARIOESCOLARTIPO_ID, HorarioescolartipoPeer::ID); + TurnosPeer::addSelectColumns($c); + $startcol4 = $startcol3 + TurnosPeer::NUM_COLUMNS; $c->addJoin(HorarioescolarPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); + $c->addJoin(HorarioescolarPeer::FK_TURNOS_ID, TurnosPeer::ID); + $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -876,7 +876,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = HorarioescolartipoPeer::getOMClass(); + $omClass = EstablecimientoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -886,7 +886,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getHorarioescolartipo(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getEstablecimiento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addHorarioescolar($obj1); break; @@ -898,7 +898,7 @@ $obj2->addHorarioescolar($obj1); } - $omClass = EstablecimientoPeer::getOMClass(); + $omClass = TurnosPeer::getOMClass(); $cls = Propel::import($omClass); @@ -908,7 +908,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getEstablecimiento(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getTurnos(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addHorarioescolar($obj1); break; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolartipo.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolartipo.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolartipo.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,7 +13,7 @@ - protected $nombre = ''; + protected $nombre = 'null'; @@ -74,7 +74,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = HorarioescolartipoPeer::NOMBRE; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseLegajoadjunto.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseLegajoadjunto.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseLegajoadjunto.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -15,13 +15,17 @@ protected $fk_adjunto_id; + - protected $aAdjunto; + protected $id; protected $aLegajopedagogico; + protected $aAdjunto; + + protected $alreadyInSave = false; @@ -42,6 +46,13 @@ } + public function getId() + { + + return $this->id; + } + + public function setFkLegajopedagogicoId($v) { @@ -78,6 +89,20 @@ } + public function setId($v) + { + + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->id !== $v) { + $this->id = $v; + $this->modifiedColumns[] = LegajoadjuntoPeer::ID; + } + + } + public function hydrate(ResultSet $rs, $startcol = 1) { try { @@ -86,11 +111,13 @@ $this->fk_adjunto_id = $rs->getInt($startcol + 1); + $this->id = $rs->getInt($startcol + 2); + $this->resetModified(); $this->setNew(false); - return $startcol + 2; + return $startcol + 3; } catch (Exception $e) { throw new PropelException("Error populating Legajoadjunto object", $e); } @@ -148,6 +175,13 @@ + if ($this->aLegajopedagogico !== null) { + if ($this->aLegajopedagogico->isModified()) { + $affectedRows += $this->aLegajopedagogico->save($con); + } + $this->setLegajopedagogico($this->aLegajopedagogico); + } + if ($this->aAdjunto !== null) { if ($this->aAdjunto->isModified()) { $affectedRows += $this->aAdjunto->save($con); @@ -155,18 +189,12 @@ $this->setAdjunto($this->aAdjunto); } - if ($this->aLegajopedagogico !== null) { - if ($this->aLegajopedagogico->isModified()) { - $affectedRows += $this->aLegajopedagogico->save($con); - } - $this->setLegajopedagogico($this->aLegajopedagogico); - } - if ($this->isModified()) { if ($this->isNew()) { $pk = LegajoadjuntoPeer::doInsert($this, $con); $affectedRows += 1; + $this->setId($pk); $this->setNew(false); } else { $affectedRows += LegajoadjuntoPeer::doUpdate($this, $con); @@ -210,19 +238,19 @@ + if ($this->aLegajopedagogico !== null) { + if (!$this->aLegajopedagogico->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aLegajopedagogico->getValidationFailures()); + } + } + if ($this->aAdjunto !== null) { if (!$this->aAdjunto->validate($columns)) { $failureMap = array_merge($failureMap, $this->aAdjunto->getValidationFailures()); } } - if ($this->aLegajopedagogico !== null) { - if (!$this->aLegajopedagogico->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aLegajopedagogico->getValidationFailures()); - } - } - if (($retval = LegajoadjuntoPeer::doValidate($this, $columns)) !== true) { $failureMap = array_merge($failureMap, $retval); } @@ -252,6 +280,9 @@ case 1: return $this->getFkAdjuntoId(); break; + case 2: + return $this->getId(); + break; default: return null; break; @@ -264,6 +295,7 @@ $result = array( $keys[0] => $this->getFkLegajopedagogicoId(), $keys[1] => $this->getFkAdjuntoId(), + $keys[2] => $this->getId(), ); return $result; } @@ -285,6 +317,9 @@ case 1: $this->setFkAdjuntoId($value); break; + case 2: + $this->setId($value); + break; } } @@ -294,6 +329,7 @@ if (array_key_exists($keys[0], $arr)) $this->setFkLegajopedagogicoId($arr[$keys[0]]); if (array_key_exists($keys[1], $arr)) $this->setFkAdjuntoId($arr[$keys[1]]); + if (array_key_exists($keys[2], $arr)) $this->setId($arr[$keys[2]]); } @@ -303,6 +339,7 @@ if ($this->isColumnModified(LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID)) $criteria->add(LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID, $this->fk_legajopedagogico_id); if ($this->isColumnModified(LegajoadjuntoPeer::FK_ADJUNTO_ID)) $criteria->add(LegajoadjuntoPeer::FK_ADJUNTO_ID, $this->fk_adjunto_id); + if ($this->isColumnModified(LegajoadjuntoPeer::ID)) $criteria->add(LegajoadjuntoPeer::ID, $this->id); return $criteria; } @@ -312,6 +349,7 @@ { $criteria = new Criteria(LegajoadjuntoPeer::DATABASE_NAME); + $criteria->add(LegajoadjuntoPeer::ID, $this->id); return $criteria; } @@ -319,13 +357,14 @@ public function getPrimaryKey() { - return null; + return $this->getId(); } - public function setPrimaryKey($pk) - { - } + public function setPrimaryKey($key) + { + $this->setId($key); + } public function copyInto($copyObj, $deepCopy = false) @@ -338,6 +377,7 @@ $copyObj->setNew(true); + $copyObj->setId(NULL); } @@ -359,63 +399,63 @@ } - public function setAdjunto($v) + public function setLegajopedagogico($v) { if ($v === null) { - $this->setFkAdjuntoId(NULL); + $this->setFkLegajopedagogicoId(NULL); } else { - $this->setFkAdjuntoId($v->getId()); + $this->setFkLegajopedagogicoId($v->getId()); } - $this->aAdjunto = $v; + $this->aLegajopedagogico = $v; } - public function getAdjunto($con = null) + public function getLegajopedagogico($con = null) { - include_once 'lib/model/om/BaseAdjuntoPeer.php'; + include_once 'lib/model/om/BaseLegajopedagogicoPeer.php'; - if ($this->aAdjunto === null && ($this->fk_adjunto_id !== null)) { + if ($this->aLegajopedagogico === null && ($this->fk_legajopedagogico_id !== null)) { - $this->aAdjunto = AdjuntoPeer::retrieveByPK($this->fk_adjunto_id, $con); + $this->aLegajopedagogico = LegajopedagogicoPeer::retrieveByPK($this->fk_legajopedagogico_id, $con); } - return $this->aAdjunto; + return $this->aLegajopedagogico; } - public function setLegajopedagogico($v) + public function setAdjunto($v) { if ($v === null) { - $this->setFkLegajopedagogicoId(NULL); + $this->setFkAdjuntoId(NULL); } else { - $this->setFkLegajopedagogicoId($v->getId()); + $this->setFkAdjuntoId($v->getId()); } - $this->aLegajopedagogico = $v; + $this->aAdjunto = $v; } - public function getLegajopedagogico($con = null) + public function getAdjunto($con = null) { - include_once 'lib/model/om/BaseLegajopedagogicoPeer.php'; + include_once 'lib/model/om/BaseAdjuntoPeer.php'; - if ($this->aLegajopedagogico === null && ($this->fk_legajopedagogico_id !== null)) { + if ($this->aAdjunto === null && ($this->fk_adjunto_id !== null)) { - $this->aLegajopedagogico = LegajopedagogicoPeer::retrieveByPK($this->fk_legajopedagogico_id, $con); + $this->aAdjunto = AdjuntoPeer::retrieveByPK($this->fk_adjunto_id, $con); } - return $this->aLegajopedagogico; + return $this->aAdjunto; } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseLegajoadjuntoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseLegajoadjuntoPeer.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseLegajoadjuntoPeer.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,7 +13,7 @@ const CLASS_DEFAULT = 'lib.model.Legajoadjunto'; - const NUM_COLUMNS = 2; + const NUM_COLUMNS = 3; const NUM_LAZY_LOAD_COLUMNS = 0; @@ -26,23 +26,26 @@ const FK_ADJUNTO_ID = 'legajoadjunto.FK_ADJUNTO_ID'; + const ID = 'legajoadjunto.ID'; + + private static $phpNameMap = null; private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('FkLegajopedagogicoId', 'FkAdjuntoId', ), - BasePeer::TYPE_COLNAME => array (LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID, LegajoadjuntoPeer::FK_ADJUNTO_ID, ), - BasePeer::TYPE_FIELDNAME => array ('fk_legajopedagogico_id', 'fk_adjunto_id', ), - BasePeer::TYPE_NUM => array (0, 1, ) + BasePeer::TYPE_PHPNAME => array ('FkLegajopedagogicoId', 'FkAdjuntoId', 'Id', ), + BasePeer::TYPE_COLNAME => array (LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID, LegajoadjuntoPeer::FK_ADJUNTO_ID, LegajoadjuntoPeer::ID, ), + BasePeer::TYPE_FIELDNAME => array ('fk_legajopedagogico_id', 'fk_adjunto_id', 'id', ), + BasePeer::TYPE_NUM => array (0, 1, 2, ) ); private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('FkLegajopedagogicoId' => 0, 'FkAdjuntoId' => 1, ), - BasePeer::TYPE_COLNAME => array (LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID => 0, LegajoadjuntoPeer::FK_ADJUNTO_ID => 1, ), - BasePeer::TYPE_FIELDNAME => array ('fk_legajopedagogico_id' => 0, 'fk_adjunto_id' => 1, ), - BasePeer::TYPE_NUM => array (0, 1, ) + BasePeer::TYPE_PHPNAME => array ('FkLegajopedagogicoId' => 0, 'FkAdjuntoId' => 1, 'Id' => 2, ), + BasePeer::TYPE_COLNAME => array (LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID => 0, LegajoadjuntoPeer::FK_ADJUNTO_ID => 1, LegajoadjuntoPeer::ID => 2, ), + BasePeer::TYPE_FIELDNAME => array ('fk_legajopedagogico_id' => 0, 'fk_adjunto_id' => 1, 'id' => 2, ), + BasePeer::TYPE_NUM => array (0, 1, 2, ) ); @@ -100,10 +103,12 @@ $criteria->addSelectColumn(LegajoadjuntoPeer::FK_ADJUNTO_ID); + $criteria->addSelectColumn(LegajoadjuntoPeer::ID); + } - const COUNT = 'COUNT(*)'; - const COUNT_DISTINCT = 'COUNT(DISTINCT *)'; + const COUNT = 'COUNT(legajoadjunto.ID)'; + const COUNT_DISTINCT = 'COUNT(DISTINCT legajoadjunto.ID)'; public static function doCount(Criteria $criteria, $distinct = false, $con = null) @@ -179,7 +184,7 @@ } - public static function doCountJoinAdjunto(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinLegajopedagogico(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -195,7 +200,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(LegajoadjuntoPeer::FK_ADJUNTO_ID, AdjuntoPeer::ID); + $criteria->addJoin(LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID, LegajopedagogicoPeer::ID); $rs = LegajoadjuntoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -207,7 +212,7 @@ - public static function doCountJoinLegajopedagogico(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAdjunto(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -223,7 +228,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID, LegajopedagogicoPeer::ID); + $criteria->addJoin(LegajoadjuntoPeer::FK_ADJUNTO_ID, AdjuntoPeer::ID); $rs = LegajoadjuntoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -235,7 +240,7 @@ - public static function doSelectJoinAdjunto(Criteria $c, $con = null) + public static function doSelectJoinLegajopedagogico(Criteria $c, $con = null) { $c = clone $c; @@ -245,9 +250,9 @@ LegajoadjuntoPeer::addSelectColumns($c); $startcol = (LegajoadjuntoPeer::NUM_COLUMNS - LegajoadjuntoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - AdjuntoPeer::addSelectColumns($c); + LegajopedagogicoPeer::addSelectColumns($c); - $c->addJoin(LegajoadjuntoPeer::FK_ADJUNTO_ID, AdjuntoPeer::ID); + $c->addJoin(LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID, LegajopedagogicoPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -259,7 +264,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = AdjuntoPeer::getOMClass(); + $omClass = LegajopedagogicoPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -267,7 +272,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getAdjunto(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getLegajopedagogico(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addLegajoadjunto($obj1); break; } @@ -282,7 +287,7 @@ - public static function doSelectJoinLegajopedagogico(Criteria $c, $con = null) + public static function doSelectJoinAdjunto(Criteria $c, $con = null) { $c = clone $c; @@ -292,9 +297,9 @@ LegajoadjuntoPeer::addSelectColumns($c); $startcol = (LegajoadjuntoPeer::NUM_COLUMNS - LegajoadjuntoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - LegajopedagogicoPeer::addSelectColumns($c); + AdjuntoPeer::addSelectColumns($c); - $c->addJoin(LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID, LegajopedagogicoPeer::ID); + $c->addJoin(LegajoadjuntoPeer::FK_ADJUNTO_ID, AdjuntoPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -306,7 +311,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = LegajopedagogicoPeer::getOMClass(); + $omClass = AdjuntoPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -314,7 +319,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getLegajopedagogico(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getAdjunto(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addLegajoadjunto($obj1); break; } @@ -345,10 +350,10 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID, LegajopedagogicoPeer::ID); + $criteria->addJoin(LegajoadjuntoPeer::FK_ADJUNTO_ID, AdjuntoPeer::ID); - $criteria->addJoin(LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID, LegajopedagogicoPeer::ID); - $rs = LegajoadjuntoPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -370,16 +375,16 @@ LegajoadjuntoPeer::addSelectColumns($c); $startcol2 = (LegajoadjuntoPeer::NUM_COLUMNS - LegajoadjuntoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + LegajopedagogicoPeer::addSelectColumns($c); + $startcol3 = $startcol2 + LegajopedagogicoPeer::NUM_COLUMNS; + AdjuntoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + AdjuntoPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + AdjuntoPeer::NUM_COLUMNS; - LegajopedagogicoPeer::addSelectColumns($c); - $startcol4 = $startcol3 + LegajopedagogicoPeer::NUM_COLUMNS; + $c->addJoin(LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID, LegajopedagogicoPeer::ID); $c->addJoin(LegajoadjuntoPeer::FK_ADJUNTO_ID, AdjuntoPeer::ID); - $c->addJoin(LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID, LegajopedagogicoPeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -394,7 +399,7 @@ - $omClass = AdjuntoPeer::getOMClass(); + $omClass = LegajopedagogicoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -404,7 +409,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getAdjunto(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getLegajopedagogico(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addLegajoadjunto($obj1); break; } @@ -417,7 +422,7 @@ - $omClass = LegajopedagogicoPeer::getOMClass(); + $omClass = AdjuntoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -427,7 +432,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getLegajopedagogico(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getAdjunto(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addLegajoadjunto($obj1); break; } @@ -445,7 +450,7 @@ - public static function doCountJoinAllExceptAdjunto(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptLegajopedagogico(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -461,7 +466,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID, LegajopedagogicoPeer::ID); + $criteria->addJoin(LegajoadjuntoPeer::FK_ADJUNTO_ID, AdjuntoPeer::ID); $rs = LegajoadjuntoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -473,7 +478,7 @@ - public static function doCountJoinAllExceptLegajopedagogico(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptAdjunto(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -489,7 +494,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(LegajoadjuntoPeer::FK_ADJUNTO_ID, AdjuntoPeer::ID); + $criteria->addJoin(LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID, LegajopedagogicoPeer::ID); $rs = LegajoadjuntoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -501,7 +506,7 @@ - public static function doSelectJoinAllExceptAdjunto(Criteria $c, $con = null) + public static function doSelectJoinAllExceptLegajopedagogico(Criteria $c, $con = null) { $c = clone $c; @@ -512,10 +517,10 @@ LegajoadjuntoPeer::addSelectColumns($c); $startcol2 = (LegajoadjuntoPeer::NUM_COLUMNS - LegajoadjuntoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - LegajopedagogicoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + LegajopedagogicoPeer::NUM_COLUMNS; + AdjuntoPeer::addSelectColumns($c); + $startcol3 = $startcol2 + AdjuntoPeer::NUM_COLUMNS; - $c->addJoin(LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID, LegajopedagogicoPeer::ID); + $c->addJoin(LegajoadjuntoPeer::FK_ADJUNTO_ID, AdjuntoPeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -529,7 +534,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = LegajopedagogicoPeer::getOMClass(); + $omClass = AdjuntoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -539,7 +544,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getLegajopedagogico(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getAdjunto(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addLegajoadjunto($obj1); break; @@ -558,7 +563,7 @@ - public static function doSelectJoinAllExceptLegajopedagogico(Criteria $c, $con = null) + public static function doSelectJoinAllExceptAdjunto(Criteria $c, $con = null) { $c = clone $c; @@ -569,10 +574,10 @@ LegajoadjuntoPeer::addSelectColumns($c); $startcol2 = (LegajoadjuntoPeer::NUM_COLUMNS - LegajoadjuntoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - AdjuntoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + AdjuntoPeer::NUM_COLUMNS; + LegajopedagogicoPeer::addSelectColumns($c); + $startcol3 = $startcol2 + LegajopedagogicoPeer::NUM_COLUMNS; - $c->addJoin(LegajoadjuntoPeer::FK_ADJUNTO_ID, AdjuntoPeer::ID); + $c->addJoin(LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID, LegajopedagogicoPeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -586,7 +591,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = AdjuntoPeer::getOMClass(); + $omClass = LegajopedagogicoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -596,7 +601,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getAdjunto(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getLegajopedagogico(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addLegajoadjunto($obj1); break; @@ -636,6 +641,7 @@ $criteria = clone $values; } else { $criteria = $values->buildCriteria(); } + $criteria->remove(LegajoadjuntoPeer::ID); $criteria->setDbName(self::DATABASE_NAME); @@ -662,6 +668,9 @@ if ($values instanceof Criteria) { $criteria = clone $values; + $comparison = $criteria->getComparison(LegajoadjuntoPeer::ID); + $selectCriteria->add(LegajoadjuntoPeer::ID, $criteria->remove(LegajoadjuntoPeer::ID), $comparison); + } else { $criteria = $values->buildCriteria(); $selectCriteria = $values->buildPkeyCriteria(); } $criteria->setDbName(self::DATABASE_NAME); @@ -696,19 +705,10 @@ if ($values instanceof Criteria) { $criteria = clone $values; } elseif ($values instanceof Legajoadjunto) { - $criteria = $values->buildCriteria(); + $criteria = $values->buildPkeyCriteria(); } else { $criteria = new Criteria(self::DATABASE_NAME); - if(count($values) == count($values, COUNT_RECURSIVE)) - { - $values = array($values); - } - $vals = array(); - foreach($values as $value) - { - - } - + $criteria->add(LegajoadjuntoPeer::ID, (array) $values, Criteria::IN); } $criteria->setDbName(self::DATABASE_NAME); @@ -761,6 +761,41 @@ return $res; } + + public static function retrieveByPK($pk, $con = null) + { + if ($con === null) { + $con = Propel::getConnection(self::DATABASE_NAME); + } + + $criteria = new Criteria(LegajoadjuntoPeer::DATABASE_NAME); + + $criteria->add(LegajoadjuntoPeer::ID, $pk); + + + $v = LegajoadjuntoPeer::doSelect($criteria, $con); + + return !empty($v) > 0 ? $v[0] : null; + } + + + public static function retrieveByPKs($pks, $con = null) + { + if ($con === null) { + $con = Propel::getConnection(self::DATABASE_NAME); + } + + $objs = null; + if (empty($pks)) { + $objs = array(); + } else { + $criteria = new Criteria(); + $criteria->add(LegajoadjuntoPeer::ID, $pks, Criteria::IN); + $objs = LegajoadjuntoPeer::doSelect($criteria, $con); + } + return $objs; + } + } if (Propel::isInit()) { try { Modified: prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogico.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogico.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogico.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -40,15 +40,15 @@ protected $fk_legajocategoria_id; - protected $aLegajocategoria; - - protected $aAlumno; protected $aUsuario; + protected $aLegajocategoria; + + protected $collLegajoadjuntos; @@ -355,13 +355,6 @@ - if ($this->aLegajocategoria !== null) { - if ($this->aLegajocategoria->isModified()) { - $affectedRows += $this->aLegajocategoria->save($con); - } - $this->setLegajocategoria($this->aLegajocategoria); - } - if ($this->aAlumno !== null) { if ($this->aAlumno->isModified()) { $affectedRows += $this->aAlumno->save($con); @@ -376,7 +369,14 @@ $this->setUsuario($this->aUsuario); } + if ($this->aLegajocategoria !== null) { + if ($this->aLegajocategoria->isModified()) { + $affectedRows += $this->aLegajocategoria->save($con); + } + $this->setLegajocategoria($this->aLegajocategoria); + } + if ($this->isModified()) { if ($this->isNew()) { $pk = LegajopedagogicoPeer::doInsert($this, $con); @@ -433,12 +433,6 @@ - if ($this->aLegajocategoria !== null) { - if (!$this->aLegajocategoria->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aLegajocategoria->getValidationFailures()); - } - } - if ($this->aAlumno !== null) { if (!$this->aAlumno->validate($columns)) { $failureMap = array_merge($failureMap, $this->aAlumno->getValidationFailures()); @@ -451,7 +445,13 @@ } } + if ($this->aLegajocategoria !== null) { + if (!$this->aLegajocategoria->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aLegajocategoria->getValidationFailures()); + } + } + if (($retval = LegajopedagogicoPeer::doValidate($this, $columns)) !== true) { $failureMap = array_merge($failureMap, $retval); } @@ -672,93 +672,93 @@ } - public function setLegajocategoria($v) + public function setAlumno($v) { if ($v === null) { - $this->setFkLegajocategoriaId(NULL); + $this->setFkAlumnoId(NULL); } else { - $this->setFkLegajocategoriaId($v->getId()); + $this->setFkAlumnoId($v->getId()); } - $this->aLegajocategoria = $v; + $this->aAlumno = $v; } - public function getLegajocategoria($con = null) + public function getAlumno($con = null) { - include_once 'lib/model/om/BaseLegajocategoriaPeer.php'; + include_once 'lib/model/om/BaseAlumnoPeer.php'; - if ($this->aLegajocategoria === null && ($this->fk_legajocategoria_id !== null)) { + if ($this->aAlumno === null && ($this->fk_alumno_id !== null)) { - $this->aLegajocategoria = LegajocategoriaPeer::retrieveByPK($this->fk_legajocategoria_id, $con); + $this->aAlumno = AlumnoPeer::retrieveByPK($this->fk_alumno_id, $con); } - return $this->aLegajocategoria; + return $this->aAlumno; } - public function setAlumno($v) + public function setUsuario($v) { if ($v === null) { - $this->setFkAlumnoId(NULL); + $this->setFkUsuarioId(NULL); } else { - $this->setFkAlumnoId($v->getId()); + $this->setFkUsuarioId($v->getId()); } - $this->aAlumno = $v; + $this->aUsuario = $v; } - public function getAlumno($con = null) + public function getUsuario($con = null) { - include_once 'lib/model/om/BaseAlumnoPeer.php'; + include_once 'lib/model/om/BaseUsuarioPeer.php'; - if ($this->aAlumno === null && ($this->fk_alumno_id !== null)) { + if ($this->aUsuario === null && ($this->fk_usuario_id !== null)) { - $this->aAlumno = AlumnoPeer::retrieveByPK($this->fk_alumno_id, $con); + $this->aUsuario = UsuarioPeer::retrieveByPK($this->fk_usuario_id, $con); } - return $this->aAlumno; + return $this->aUsuario; } - public function setUsuario($v) + public function setLegajocategoria($v) { if ($v === null) { - $this->setFkUsuarioId(NULL); + $this->setFkLegajocategoriaId(NULL); } else { - $this->setFkUsuarioId($v->getId()); + $this->setFkLegajocategoriaId($v->getId()); } - $this->aUsuario = $v; + $this->aLegajocategoria = $v; } - public function getUsuario($con = null) + public function getLegajocategoria($con = null) { - include_once 'lib/model/om/BaseUsuarioPeer.php'; + include_once 'lib/model/om/BaseLegajocategoriaPeer.php'; - if ($this->aUsuario === null && ($this->fk_usuario_id !== null)) { + if ($this->aLegajocategoria === null && ($this->fk_legajocategoria_id !== null)) { - $this->aUsuario = UsuarioPeer::retrieveByPK($this->fk_usuario_id, $con); + $this->aLegajocategoria = LegajocategoriaPeer::retrieveByPK($this->fk_legajocategoria_id, $con); } - return $this->aUsuario; + return $this->aLegajocategoria; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogicoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogicoPeer.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogicoPeer.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -209,7 +209,7 @@ } - public static function doCountJoinLegajocategoria(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -225,7 +225,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(LegajopedagogicoPeer::FK_LEGAJOCATEGORIA_ID, LegajocategoriaPeer::ID); + $criteria->addJoin(LegajopedagogicoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); $rs = LegajopedagogicoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -237,7 +237,7 @@ - public static function doCountJoinAlumno(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinUsuario(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -253,7 +253,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(LegajopedagogicoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); + $criteria->addJoin(LegajopedagogicoPeer::FK_USUARIO_ID, UsuarioPeer::ID); $rs = LegajopedagogicoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -265,7 +265,7 @@ - public static function doCountJoinUsuario(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinLegajocategoria(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -281,7 +281,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(LegajopedagogicoPeer::FK_USUARIO_ID, UsuarioPeer::ID); + $criteria->addJoin(LegajopedagogicoPeer::FK_LEGAJOCATEGORIA_ID, LegajocategoriaPeer::ID); $rs = LegajopedagogicoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -293,7 +293,7 @@ - public static function doSelectJoinLegajocategoria(Criteria $c, $con = null) + public static function doSelectJoinAlumno(Criteria $c, $con = null) { $c = clone $c; @@ -303,9 +303,9 @@ LegajopedagogicoPeer::addSelectColumns($c); $startcol = (LegajopedagogicoPeer::NUM_COLUMNS - LegajopedagogicoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - LegajocategoriaPeer::addSelectColumns($c); + AlumnoPeer::addSelectColumns($c); - $c->addJoin(LegajopedagogicoPeer::FK_LEGAJOCATEGORIA_ID, LegajocategoriaPeer::ID); + $c->addJoin(LegajopedagogicoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -317,7 +317,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = LegajocategoriaPeer::getOMClass(); + $omClass = AlumnoPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -325,7 +325,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getLegajocategoria(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getAlumno(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addLegajopedagogico($obj1); break; } @@ -340,7 +340,7 @@ - public static function doSelectJoinAlumno(Criteria $c, $con = null) + public static function doSelectJoinUsuario(Criteria $c, $con = null) { $c = clone $c; @@ -350,9 +350,9 @@ LegajopedagogicoPeer::addSelectColumns($c); $startcol = (LegajopedagogicoPeer::NUM_COLUMNS - LegajopedagogicoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - AlumnoPeer::addSelectColumns($c); + UsuarioPeer::addSelectColumns($c); - $c->addJoin(LegajopedagogicoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); + $c->addJoin(LegajopedagogicoPeer::FK_USUARIO_ID, UsuarioPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -364,7 +364,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = AlumnoPeer::getOMClass(); + $omClass = UsuarioPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -372,7 +372,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getAlumno(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getUsuario(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addLegajopedagogico($obj1); break; } @@ -387,7 +387,7 @@ - public static function doSelectJoinUsuario(Criteria $c, $con = null) + public static function doSelectJoinLegajocategoria(Criteria $c, $con = null) { $c = clone $c; @@ -397,9 +397,9 @@ LegajopedagogicoPeer::addSelectColumns($c); $startcol = (LegajopedagogicoPeer::NUM_COLUMNS - LegajopedagogicoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - UsuarioPeer::addSelectColumns($c); + LegajocategoriaPeer::addSelectColumns($c); - $c->addJoin(LegajopedagogicoPeer::FK_USUARIO_ID, UsuarioPeer::ID); + $c->addJoin(LegajopedagogicoPeer::FK_LEGAJOCATEGORIA_ID, LegajocategoriaPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -411,7 +411,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = UsuarioPeer::getOMClass(); + $omClass = LegajocategoriaPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -419,7 +419,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getUsuario(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getLegajocategoria(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addLegajopedagogico($obj1); break; } @@ -450,12 +450,12 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(LegajopedagogicoPeer::FK_LEGAJOCATEGORIA_ID, LegajocategoriaPeer::ID); - $criteria->addJoin(LegajopedagogicoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); $criteria->addJoin(LegajopedagogicoPeer::FK_USUARIO_ID, UsuarioPeer::ID); + $criteria->addJoin(LegajopedagogicoPeer::FK_LEGAJOCATEGORIA_ID, LegajocategoriaPeer::ID); + $rs = LegajopedagogicoPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -477,21 +477,21 @@ LegajopedagogicoPeer::addSelectColumns($c); $startcol2 = (LegajopedagogicoPeer::NUM_COLUMNS - LegajopedagogicoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - LegajocategoriaPeer::addSelectColumns($c); - $startcol3 = $startcol2 + LegajocategoriaPeer::NUM_COLUMNS; - AlumnoPeer::addSelectColumns($c); - $startcol4 = $startcol3 + AlumnoPeer::NUM_COLUMNS; + $startcol3 = $startcol2 + AlumnoPeer::NUM_COLUMNS; UsuarioPeer::addSelectColumns($c); - $startcol5 = $startcol4 + UsuarioPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + UsuarioPeer::NUM_COLUMNS; - $c->addJoin(LegajopedagogicoPeer::FK_LEGAJOCATEGORIA_ID, LegajocategoriaPeer::ID); + LegajocategoriaPeer::addSelectColumns($c); + $startcol5 = $startcol4 + LegajocategoriaPeer::NUM_COLUMNS; $c->addJoin(LegajopedagogicoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); $c->addJoin(LegajopedagogicoPeer::FK_USUARIO_ID, UsuarioPeer::ID); + $c->addJoin(LegajopedagogicoPeer::FK_LEGAJOCATEGORIA_ID, LegajocategoriaPeer::ID); + $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -506,7 +506,7 @@ - $omClass = LegajocategoriaPeer::getOMClass(); + $omClass = AlumnoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -516,7 +516,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getLegajocategoria(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getAlumno(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addLegajopedagogico($obj1); break; } @@ -529,7 +529,7 @@ - $omClass = AlumnoPeer::getOMClass(); + $omClass = UsuarioPeer::getOMClass(); $cls = Propel::import($omClass); @@ -539,7 +539,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getAlumno(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getUsuario(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addLegajopedagogico($obj1); break; } @@ -552,7 +552,7 @@ - $omClass = UsuarioPeer::getOMClass(); + $omClass = LegajocategoriaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -562,7 +562,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj4 = $temp_obj1->getUsuario(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { + $temp_obj4 = $temp_obj1->getLegajocategoria(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { $newObject = false; $temp_obj4->addLegajopedagogico($obj1); break; } @@ -580,7 +580,7 @@ - public static function doCountJoinAllExceptLegajocategoria(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -596,10 +596,10 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(LegajopedagogicoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); - $criteria->addJoin(LegajopedagogicoPeer::FK_USUARIO_ID, UsuarioPeer::ID); + $criteria->addJoin(LegajopedagogicoPeer::FK_LEGAJOCATEGORIA_ID, LegajocategoriaPeer::ID); + $rs = LegajopedagogicoPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -610,7 +610,7 @@ - public static function doCountJoinAllExceptAlumno(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptUsuario(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -626,10 +626,10 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(LegajopedagogicoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); + $criteria->addJoin(LegajopedagogicoPeer::FK_LEGAJOCATEGORIA_ID, LegajocategoriaPeer::ID); - $criteria->addJoin(LegajopedagogicoPeer::FK_USUARIO_ID, UsuarioPeer::ID); - $rs = LegajopedagogicoPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -640,7 +640,7 @@ - public static function doCountJoinAllExceptUsuario(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptLegajocategoria(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -656,10 +656,10 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(LegajopedagogicoPeer::FK_LEGAJOCATEGORIA_ID, LegajocategoriaPeer::ID); - $criteria->addJoin(LegajopedagogicoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); + $criteria->addJoin(LegajopedagogicoPeer::FK_USUARIO_ID, UsuarioPeer::ID); + $rs = LegajopedagogicoPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -670,7 +670,7 @@ - public static function doSelectJoinAllExceptLegajocategoria(Criteria $c, $con = null) + public static function doSelectJoinAllExceptAlumno(Criteria $c, $con = null) { $c = clone $c; @@ -681,17 +681,17 @@ LegajopedagogicoPeer::addSelectColumns($c); $startcol2 = (LegajopedagogicoPeer::NUM_COLUMNS - LegajopedagogicoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - AlumnoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + AlumnoPeer::NUM_COLUMNS; - UsuarioPeer::addSelectColumns($c); - $startcol4 = $startcol3 + UsuarioPeer::NUM_COLUMNS; + $startcol3 = $startcol2 + UsuarioPeer::NUM_COLUMNS; - $c->addJoin(LegajopedagogicoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); + LegajocategoriaPeer::addSelectColumns($c); + $startcol4 = $startcol3 + LegajocategoriaPeer::NUM_COLUMNS; $c->addJoin(LegajopedagogicoPeer::FK_USUARIO_ID, UsuarioPeer::ID); + $c->addJoin(LegajopedagogicoPeer::FK_LEGAJOCATEGORIA_ID, LegajocategoriaPeer::ID); + $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -703,7 +703,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = AlumnoPeer::getOMClass(); + $omClass = UsuarioPeer::getOMClass(); $cls = Propel::import($omClass); @@ -713,7 +713,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getAlumno(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getUsuario(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addLegajopedagogico($obj1); break; @@ -725,7 +725,7 @@ $obj2->addLegajopedagogico($obj1); } - $omClass = UsuarioPeer::getOMClass(); + $omClass = LegajocategoriaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -735,7 +735,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getUsuario(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getLegajocategoria(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addLegajopedagogico($obj1); break; @@ -754,7 +754,7 @@ - public static function doSelectJoinAllExceptAlumno(Criteria $c, $con = null) + public static function doSelectJoinAllExceptUsuario(Criteria $c, $con = null) { $c = clone $c; @@ -765,17 +765,17 @@ LegajopedagogicoPeer::addSelectColumns($c); $startcol2 = (LegajopedagogicoPeer::NUM_COLUMNS - LegajopedagogicoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + AlumnoPeer::addSelectColumns($c); + $startcol3 = $startcol2 + AlumnoPeer::NUM_COLUMNS; + LegajocategoriaPeer::addSelectColumns($c); - $startcol3 = $startcol2 + LegajocategoriaPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + LegajocategoriaPeer::NUM_COLUMNS; - UsuarioPeer::addSelectColumns($c); - $startcol4 = $startcol3 + UsuarioPeer::NUM_COLUMNS; + $c->addJoin(LegajopedagogicoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); $c->addJoin(LegajopedagogicoPeer::FK_LEGAJOCATEGORIA_ID, LegajocategoriaPeer::ID); - $c->addJoin(LegajopedagogicoPeer::FK_USUARIO_ID, UsuarioPeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -787,7 +787,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = LegajocategoriaPeer::getOMClass(); + $omClass = AlumnoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -797,7 +797,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getLegajocategoria(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getAlumno(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addLegajopedagogico($obj1); break; @@ -809,7 +809,7 @@ $obj2->addLegajopedagogico($obj1); } - $omClass = UsuarioPeer::getOMClass(); + $omClass = LegajocategoriaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -819,7 +819,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getUsuario(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getLegajocategoria(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addLegajopedagogico($obj1); break; @@ -838,7 +838,7 @@ - public static function doSelectJoinAllExceptUsuario(Criteria $c, $con = null) + public static function doSelectJoinAllExceptLegajocategoria(Criteria $c, $con = null) { $c = clone $c; @@ -849,17 +849,17 @@ LegajopedagogicoPeer::addSelectColumns($c); $startcol2 = (LegajopedagogicoPeer::NUM_COLUMNS - LegajopedagogicoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - LegajocategoriaPeer::addSelectColumns($c); - $startcol3 = $startcol2 + LegajocategoriaPeer::NUM_COLUMNS; - AlumnoPeer::addSelectColumns($c); - $startcol4 = $startcol3 + AlumnoPeer::NUM_COLUMNS; + $startcol3 = $startcol2 + AlumnoPeer::NUM_COLUMNS; - $c->addJoin(LegajopedagogicoPeer::FK_LEGAJOCATEGORIA_ID, LegajocategoriaPeer::ID); + UsuarioPeer::addSelectColumns($c); + $startcol4 = $startcol3 + UsuarioPeer::NUM_COLUMNS; $c->addJoin(LegajopedagogicoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); + $c->addJoin(LegajopedagogicoPeer::FK_USUARIO_ID, UsuarioPeer::ID); + $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -871,7 +871,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = LegajocategoriaPeer::getOMClass(); + $omClass = AlumnoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -881,7 +881,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getLegajocategoria(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getAlumno(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addLegajopedagogico($obj1); break; @@ -893,7 +893,7 @@ $obj2->addLegajopedagogico($obj1); } - $omClass = AlumnoPeer::getOMClass(); + $omClass = UsuarioPeer::getOMClass(); $cls = Propel::import($omClass); @@ -903,7 +903,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getAlumno(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getUsuario(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addLegajopedagogico($obj1); break; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseLocacion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseLocacion.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseLocacion.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,7 +13,7 @@ - protected $nombre = ''; + protected $nombre = 'null'; @@ -21,15 +21,15 @@ - protected $direccion = ''; + protected $direccion = 'null'; - protected $ciudad = ''; + protected $ciudad = 'null'; - protected $codigo_postal = ''; + protected $codigo_postal = 'null'; @@ -57,7 +57,7 @@ - protected $principal = true; + protected $principal = false; protected $aProvincia; @@ -196,7 +196,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = LocacionPeer::NOMBRE; } @@ -224,7 +224,7 @@ $v = (string) $v; } - if ($this->direccion !== $v || $v === '') { + if ($this->direccion !== $v || $v === 'null') { $this->direccion = $v; $this->modifiedColumns[] = LocacionPeer::DIRECCION; } @@ -238,7 +238,7 @@ $v = (string) $v; } - if ($this->ciudad !== $v || $v === '') { + if ($this->ciudad !== $v || $v === 'null') { $this->ciudad = $v; $this->modifiedColumns[] = LocacionPeer::CIUDAD; } @@ -252,7 +252,7 @@ $v = (string) $v; } - if ($this->codigo_postal !== $v || $v === '') { + if ($this->codigo_postal !== $v || $v === 'null') { $this->codigo_postal = $v; $this->modifiedColumns[] = LocacionPeer::CODIGO_POSTAL; } @@ -354,7 +354,7 @@ public function setPrincipal($v) { - if ($this->principal !== $v || $v === true) { + if ($this->principal !== $v || $v === false) { $this->principal = $v; $this->modifiedColumns[] = LocacionPeer::PRINCIPAL; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseModulo.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseModulo.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseModulo.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,7 +13,7 @@ - protected $nombre = ''; + protected $nombre = 'null'; @@ -96,7 +96,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = ModuloPeer::NOMBRE; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseNiveltipo.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseNiveltipo.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseNiveltipo.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,7 +13,7 @@ - protected $nombre = ''; + protected $nombre = 'null'; @@ -74,7 +74,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = NiveltipoPeer::NOMBRE; } @@ -457,7 +457,7 @@ - public function getEstablecimientosJoinOrganizacion($criteria = null, $con = null) + public function getEstablecimientosJoinDistritoescolar($criteria = null, $con = null) { include_once 'lib/model/om/BaseEstablecimientoPeer.php'; if ($criteria === null) { @@ -475,14 +475,14 @@ $criteria->add(EstablecimientoPeer::FK_NIVELTIPO_ID, $this->getId()); - $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinOrganizacion($criteria, $con); + $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinDistritoescolar($criteria, $con); } } else { $criteria->add(EstablecimientoPeer::FK_NIVELTIPO_ID, $this->getId()); if (!isset($this->lastEstablecimientoCriteria) || !$this->lastEstablecimientoCriteria->equals($criteria)) { - $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinOrganizacion($criteria, $con); + $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinDistritoescolar($criteria, $con); } } $this->lastEstablecimientoCriteria = $criteria; @@ -492,7 +492,7 @@ - public function getEstablecimientosJoinDistritoescolar($criteria = null, $con = null) + public function getEstablecimientosJoinOrganizacion($criteria = null, $con = null) { include_once 'lib/model/om/BaseEstablecimientoPeer.php'; if ($criteria === null) { @@ -510,14 +510,14 @@ $criteria->add(EstablecimientoPeer::FK_NIVELTIPO_ID, $this->getId()); - $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinDistritoescolar($criteria, $con); + $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinOrganizacion($criteria, $con); } } else { $criteria->add(EstablecimientoPeer::FK_NIVELTIPO_ID, $this->getId()); if (!isset($this->lastEstablecimientoCriteria) || !$this->lastEstablecimientoCriteria->equals($criteria)) { - $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinDistritoescolar($criteria, $con); + $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinOrganizacion($criteria, $con); } } $this->lastEstablecimientoCriteria = $criteria; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacion.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacion.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,7 +13,7 @@ - protected $nombre = ''; + protected $nombre = 'null'; @@ -21,27 +21,27 @@ - protected $razon_social = ''; + protected $razon_social = 'null'; - protected $cuit = ''; + protected $cuit = 'null'; - protected $direccion = ''; + protected $direccion = 'null'; - protected $ciudad = ''; + protected $ciudad = 'null'; - protected $codigo_postal = ''; + protected $codigo_postal = 'null'; - protected $telefono = ''; + protected $telefono = 'null'; @@ -52,10 +52,10 @@ protected $fk_tipoiva_id = 0; - protected $aTipoiva; + protected $aProvincia; - protected $aProvincia; + protected $aTipoiva; protected $collEstablecimientos; @@ -168,7 +168,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = OrganizacionPeer::NOMBRE; } @@ -196,7 +196,7 @@ $v = (string) $v; } - if ($this->razon_social !== $v || $v === '') { + if ($this->razon_social !== $v || $v === 'null') { $this->razon_social = $v; $this->modifiedColumns[] = OrganizacionPeer::RAZON_SOCIAL; } @@ -210,7 +210,7 @@ $v = (string) $v; } - if ($this->cuit !== $v || $v === '') { + if ($this->cuit !== $v || $v === 'null') { $this->cuit = $v; $this->modifiedColumns[] = OrganizacionPeer::CUIT; } @@ -224,7 +224,7 @@ $v = (string) $v; } - if ($this->direccion !== $v || $v === '') { + if ($this->direccion !== $v || $v === 'null') { $this->direccion = $v; $this->modifiedColumns[] = OrganizacionPeer::DIRECCION; } @@ -238,7 +238,7 @@ $v = (string) $v; } - if ($this->ciudad !== $v || $v === '') { + if ($this->ciudad !== $v || $v === 'null') { $this->ciudad = $v; $this->modifiedColumns[] = OrganizacionPeer::CIUDAD; } @@ -252,7 +252,7 @@ $v = (string) $v; } - if ($this->codigo_postal !== $v || $v === '') { + if ($this->codigo_postal !== $v || $v === 'null') { $this->codigo_postal = $v; $this->modifiedColumns[] = OrganizacionPeer::CODIGO_POSTAL; } @@ -266,7 +266,7 @@ $v = (string) $v; } - if ($this->telefono !== $v || $v === '') { + if ($this->telefono !== $v || $v === 'null') { $this->telefono = $v; $this->modifiedColumns[] = OrganizacionPeer::TELEFONO; } @@ -397,6 +397,13 @@ + if ($this->aProvincia !== null) { + if ($this->aProvincia->isModified()) { + $affectedRows += $this->aProvincia->save($con); + } + $this->setProvincia($this->aProvincia); + } + if ($this->aTipoiva !== null) { if ($this->aTipoiva->isModified()) { $affectedRows += $this->aTipoiva->save($con); @@ -404,14 +411,7 @@ $this->setTipoiva($this->aTipoiva); } - if ($this->aProvincia !== null) { - if ($this->aProvincia->isModified()) { - $affectedRows += $this->aProvincia->save($con); - } - $this->setProvincia($this->aProvincia); - } - if ($this->isModified()) { if ($this->isNew()) { $pk = OrganizacionPeer::doInsert($this, $con); @@ -468,19 +468,19 @@ + if ($this->aProvincia !== null) { + if (!$this->aProvincia->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aProvincia->getValidationFailures()); + } + } + if ($this->aTipoiva !== null) { if (!$this->aTipoiva->validate($columns)) { $failureMap = array_merge($failureMap, $this->aTipoiva->getValidationFailures()); } } - if ($this->aProvincia !== null) { - if (!$this->aProvincia->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aProvincia->getValidationFailures()); - } - } - if (($retval = OrganizacionPeer::doValidate($this, $columns)) !== true) { $failureMap = array_merge($failureMap, $retval); } @@ -734,63 +734,63 @@ } - public function setTipoiva($v) + public function setProvincia($v) { if ($v === null) { - $this->setFkTipoivaId('0'); + $this->setFkProvinciaId('0'); } else { - $this->setFkTipoivaId($v->getId()); + $this->setFkProvinciaId($v->getId()); } - $this->aTipoiva = $v; + $this->aProvincia = $v; } - public function getTipoiva($con = null) + public function getProvincia($con = null) { - include_once 'lib/model/om/BaseTipoivaPeer.php'; + include_once 'lib/model/om/BaseProvinciaPeer.php'; - if ($this->aTipoiva === null && ($this->fk_tipoiva_id !== null)) { + if ($this->aProvincia === null && ($this->fk_provincia_id !== null)) { - $this->aTipoiva = TipoivaPeer::retrieveByPK($this->fk_tipoiva_id, $con); + $this->aProvincia = ProvinciaPeer::retrieveByPK($this->fk_provincia_id, $con); } - return $this->aTipoiva; + return $this->aProvincia; } - public function setProvincia($v) + public function setTipoiva($v) { if ($v === null) { - $this->setFkProvinciaId('0'); + $this->setFkTipoivaId('0'); } else { - $this->setFkProvinciaId($v->getId()); + $this->setFkTipoivaId($v->getId()); } - $this->aProvincia = $v; + $this->aTipoiva = $v; } - public function getProvincia($con = null) + public function getTipoiva($con = null) { - include_once 'lib/model/om/BaseProvinciaPeer.php'; + include_once 'lib/model/om/BaseTipoivaPeer.php'; - if ($this->aProvincia === null && ($this->fk_provincia_id !== null)) { + if ($this->aTipoiva === null && ($this->fk_tipoiva_id !== null)) { - $this->aProvincia = ProvinciaPeer::retrieveByPK($this->fk_provincia_id, $con); + $this->aTipoiva = TipoivaPeer::retrieveByPK($this->fk_tipoiva_id, $con); } - return $this->aProvincia; + return $this->aTipoiva; } @@ -865,7 +865,7 @@ - public function getEstablecimientosJoinNiveltipo($criteria = null, $con = null) + public function getEstablecimientosJoinDistritoescolar($criteria = null, $con = null) { include_once 'lib/model/om/BaseEstablecimientoPeer.php'; if ($criteria === null) { @@ -883,14 +883,14 @@ $criteria->add(EstablecimientoPeer::FK_ORGANIZACION_ID, $this->getId()); - $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinNiveltipo($criteria, $con); + $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinDistritoescolar($criteria, $con); } } else { $criteria->add(EstablecimientoPeer::FK_ORGANIZACION_ID, $this->getId()); if (!isset($this->lastEstablecimientoCriteria) || !$this->lastEstablecimientoCriteria->equals($criteria)) { - $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinNiveltipo($criteria, $con); + $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinDistritoescolar($criteria, $con); } } $this->lastEstablecimientoCriteria = $criteria; @@ -900,7 +900,7 @@ - public function getEstablecimientosJoinDistritoescolar($criteria = null, $con = null) + public function getEstablecimientosJoinNiveltipo($criteria = null, $con = null) { include_once 'lib/model/om/BaseEstablecimientoPeer.php'; if ($criteria === null) { @@ -918,14 +918,14 @@ $criteria->add(EstablecimientoPeer::FK_ORGANIZACION_ID, $this->getId()); - $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinDistritoescolar($criteria, $con); + $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinNiveltipo($criteria, $con); } } else { $criteria->add(EstablecimientoPeer::FK_ORGANIZACION_ID, $this->getId()); if (!isset($this->lastEstablecimientoCriteria) || !$this->lastEstablecimientoCriteria->equals($criteria)) { - $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinDistritoescolar($criteria, $con); + $this->collEstablecimientos = EstablecimientoPeer::doSelectJoinNiveltipo($criteria, $con); } } $this->lastEstablecimientoCriteria = $criteria; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacionPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacionPeer.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacionPeer.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -224,7 +224,7 @@ } - public static function doCountJoinTipoiva(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -240,7 +240,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(OrganizacionPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); + $criteria->addJoin(OrganizacionPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $rs = OrganizacionPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -252,7 +252,7 @@ - public static function doCountJoinProvincia(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinTipoiva(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -268,7 +268,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(OrganizacionPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(OrganizacionPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); $rs = OrganizacionPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -280,7 +280,7 @@ - public static function doSelectJoinTipoiva(Criteria $c, $con = null) + public static function doSelectJoinProvincia(Criteria $c, $con = null) { $c = clone $c; @@ -290,9 +290,9 @@ OrganizacionPeer::addSelectColumns($c); $startcol = (OrganizacionPeer::NUM_COLUMNS - OrganizacionPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - TipoivaPeer::addSelectColumns($c); + ProvinciaPeer::addSelectColumns($c); - $c->addJoin(OrganizacionPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); + $c->addJoin(OrganizacionPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -304,7 +304,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = TipoivaPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -312,7 +312,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getTipoiva(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addOrganizacion($obj1); break; } @@ -327,7 +327,7 @@ - public static function doSelectJoinProvincia(Criteria $c, $con = null) + public static function doSelectJoinTipoiva(Criteria $c, $con = null) { $c = clone $c; @@ -337,9 +337,9 @@ OrganizacionPeer::addSelectColumns($c); $startcol = (OrganizacionPeer::NUM_COLUMNS - OrganizacionPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - ProvinciaPeer::addSelectColumns($c); + TipoivaPeer::addSelectColumns($c); - $c->addJoin(OrganizacionPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(OrganizacionPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -351,7 +351,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = ProvinciaPeer::getOMClass(); + $omClass = TipoivaPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -359,7 +359,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getTipoiva(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addOrganizacion($obj1); break; } @@ -390,10 +390,10 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(OrganizacionPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(OrganizacionPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); - $criteria->addJoin(OrganizacionPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); - $rs = OrganizacionPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -415,16 +415,16 @@ OrganizacionPeer::addSelectColumns($c); $startcol2 = (OrganizacionPeer::NUM_COLUMNS - OrganizacionPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + ProvinciaPeer::addSelectColumns($c); + $startcol3 = $startcol2 + ProvinciaPeer::NUM_COLUMNS; + TipoivaPeer::addSelectColumns($c); - $startcol3 = $startcol2 + TipoivaPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + TipoivaPeer::NUM_COLUMNS; - ProvinciaPeer::addSelectColumns($c); - $startcol4 = $startcol3 + ProvinciaPeer::NUM_COLUMNS; + $c->addJoin(OrganizacionPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $c->addJoin(OrganizacionPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); - $c->addJoin(OrganizacionPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -439,7 +439,7 @@ - $omClass = TipoivaPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -449,7 +449,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getTipoiva(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addOrganizacion($obj1); break; } @@ -462,7 +462,7 @@ - $omClass = ProvinciaPeer::getOMClass(); + $omClass = TipoivaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -472,7 +472,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getProvincia(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getTipoiva(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addOrganizacion($obj1); break; } @@ -490,7 +490,7 @@ - public static function doCountJoinAllExceptTipoiva(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -506,7 +506,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(OrganizacionPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(OrganizacionPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); $rs = OrganizacionPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -518,7 +518,7 @@ - public static function doCountJoinAllExceptProvincia(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptTipoiva(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -534,7 +534,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(OrganizacionPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); + $criteria->addJoin(OrganizacionPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $rs = OrganizacionPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -546,7 +546,7 @@ - public static function doSelectJoinAllExceptTipoiva(Criteria $c, $con = null) + public static function doSelectJoinAllExceptProvincia(Criteria $c, $con = null) { $c = clone $c; @@ -557,10 +557,10 @@ OrganizacionPeer::addSelectColumns($c); $startcol2 = (OrganizacionPeer::NUM_COLUMNS - OrganizacionPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - ProvinciaPeer::addSelectColumns($c); - $startcol3 = $startcol2 + ProvinciaPeer::NUM_COLUMNS; + TipoivaPeer::addSelectColumns($c); + $startcol3 = $startcol2 + TipoivaPeer::NUM_COLUMNS; - $c->addJoin(OrganizacionPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(OrganizacionPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -574,7 +574,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = ProvinciaPeer::getOMClass(); + $omClass = TipoivaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -584,7 +584,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getTipoiva(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addOrganizacion($obj1); break; @@ -603,7 +603,7 @@ - public static function doSelectJoinAllExceptProvincia(Criteria $c, $con = null) + public static function doSelectJoinAllExceptTipoiva(Criteria $c, $con = null) { $c = clone $c; @@ -614,10 +614,10 @@ OrganizacionPeer::addSelectColumns($c); $startcol2 = (OrganizacionPeer::NUM_COLUMNS - OrganizacionPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - TipoivaPeer::addSelectColumns($c); - $startcol3 = $startcol2 + TipoivaPeer::NUM_COLUMNS; + ProvinciaPeer::addSelectColumns($c); + $startcol3 = $startcol2 + ProvinciaPeer::NUM_COLUMNS; - $c->addJoin(OrganizacionPeer::FK_TIPOIVA_ID, TipoivaPeer::ID); + $c->addJoin(OrganizacionPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -631,7 +631,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = TipoivaPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -641,7 +641,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getTipoiva(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addOrganizacion($obj1); break; Modified: prosistem/alba/trunk/alba/lib/model/om/BasePais.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BasePais.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BasePais.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,11 +13,11 @@ - protected $nombre_largo = ''; + protected $nombre_largo = 'null'; - protected $nombre_corto = ''; + protected $nombre_corto = 'null'; @@ -91,7 +91,7 @@ $v = (string) $v; } - if ($this->nombre_largo !== $v || $v === '') { + if ($this->nombre_largo !== $v || $v === 'null') { $this->nombre_largo = $v; $this->modifiedColumns[] = PaisPeer::NOMBRE_LARGO; } @@ -105,7 +105,7 @@ $v = (string) $v; } - if ($this->nombre_corto !== $v || $v === '') { + if ($this->nombre_corto !== $v || $v === 'null') { $this->nombre_corto = $v; $this->modifiedColumns[] = PaisPeer::NOMBRE_CORTO; } @@ -591,7 +591,7 @@ - public function getAlumnosJoinTipodocumento($criteria = null, $con = null) + public function getAlumnosJoinProvincia($criteria = null, $con = null) { include_once 'lib/model/om/BaseAlumnoPeer.php'; if ($criteria === null) { @@ -609,14 +609,14 @@ $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId()); - $this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); } } else { $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId()); if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) { - $this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); } } $this->lastAlumnoCriteria = $criteria; @@ -626,7 +626,7 @@ - public function getAlumnosJoinCuenta($criteria = null, $con = null) + public function getAlumnosJoinTipodocumento($criteria = null, $con = null) { include_once 'lib/model/om/BaseAlumnoPeer.php'; if ($criteria === null) { @@ -644,14 +644,14 @@ $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId()); - $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con); } } else { $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId()); if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) { - $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinTipodocumento($criteria, $con); } } $this->lastAlumnoCriteria = $criteria; @@ -696,7 +696,7 @@ - public function getAlumnosJoinProvincia($criteria = null, $con = null) + public function getAlumnosJoinCuenta($criteria = null, $con = null) { include_once 'lib/model/om/BaseAlumnoPeer.php'; if ($criteria === null) { @@ -714,14 +714,14 @@ $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId()); - $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); } } else { $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId()); if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) { - $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); } } $this->lastAlumnoCriteria = $criteria; Modified: prosistem/alba/trunk/alba/lib/model/om/BasePeriodo.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BasePeriodo.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BasePeriodo.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -25,7 +25,7 @@ - protected $descripcion = ''; + protected $descripcion = 'null'; protected $aCiclolectivo; @@ -193,7 +193,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === '') { + if ($this->descripcion !== $v || $v === 'null') { $this->descripcion = $v; $this->modifiedColumns[] = PeriodoPeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BasePermiso.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BasePermiso.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BasePermiso.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,7 +13,7 @@ - protected $nombre = ''; + protected $nombre = 'null'; @@ -105,7 +105,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = PermisoPeer::NOMBRE; } Modified: prosistem/alba/trunk/alba/lib/model/om/BasePreferencia.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BasePreferencia.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BasePreferencia.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,7 +13,7 @@ - protected $nombre = ''; + protected $nombre = 'null'; @@ -79,7 +79,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = PreferenciaPeer::NOMBRE; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,11 +13,11 @@ - protected $nombre_corto = ''; + protected $nombre_corto = 'null'; - protected $nombre_largo = ''; + protected $nombre_largo = 'null'; @@ -129,7 +129,7 @@ $v = (string) $v; } - if ($this->nombre_corto !== $v || $v === '') { + if ($this->nombre_corto !== $v || $v === 'null') { $this->nombre_corto = $v; $this->modifiedColumns[] = ProvinciaPeer::NOMBRE_CORTO; } @@ -143,7 +143,7 @@ $v = (string) $v; } - if ($this->nombre_largo !== $v || $v === '') { + if ($this->nombre_largo !== $v || $v === 'null') { $this->nombre_largo = $v; $this->modifiedColumns[] = ProvinciaPeer::NOMBRE_LARGO; } @@ -1067,7 +1067,7 @@ - public function getAlumnosJoinCuenta($criteria = null, $con = null) + public function getAlumnosJoinEstablecimiento($criteria = null, $con = null) { include_once 'lib/model/om/BaseAlumnoPeer.php'; if ($criteria === null) { @@ -1085,14 +1085,14 @@ $criteria->add(AlumnoPeer::FK_PROVINCIA_ID, $this->getId()); - $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinEstablecimiento($criteria, $con); } } else { $criteria->add(AlumnoPeer::FK_PROVINCIA_ID, $this->getId()); if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) { - $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinEstablecimiento($criteria, $con); } } $this->lastAlumnoCriteria = $criteria; @@ -1102,7 +1102,7 @@ - public function getAlumnosJoinEstablecimiento($criteria = null, $con = null) + public function getAlumnosJoinCuenta($criteria = null, $con = null) { include_once 'lib/model/om/BaseAlumnoPeer.php'; if ($criteria === null) { @@ -1120,14 +1120,14 @@ $criteria->add(AlumnoPeer::FK_PROVINCIA_ID, $this->getId()); - $this->collAlumnos = AlumnoPeer::doSelectJoinEstablecimiento($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); } } else { $criteria->add(AlumnoPeer::FK_PROVINCIA_ID, $this->getId()); if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) { - $this->collAlumnos = AlumnoPeer::doSelectJoinEstablecimiento($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); } } $this->lastAlumnoCriteria = $criteria; @@ -1277,7 +1277,7 @@ - public function getResponsablesJoinCuenta($criteria = null, $con = null) + public function getResponsablesJoinTipodocumento($criteria = null, $con = null) { include_once 'lib/model/om/BaseResponsablePeer.php'; if ($criteria === null) { @@ -1295,14 +1295,14 @@ $criteria->add(ResponsablePeer::FK_PROVINCIA_ID, $this->getId()); - $this->collResponsables = ResponsablePeer::doSelectJoinCuenta($criteria, $con); + $this->collResponsables = ResponsablePeer::doSelectJoinTipodocumento($criteria, $con); } } else { $criteria->add(ResponsablePeer::FK_PROVINCIA_ID, $this->getId()); if (!isset($this->lastResponsableCriteria) || !$this->lastResponsableCriteria->equals($criteria)) { - $this->collResponsables = ResponsablePeer::doSelectJoinCuenta($criteria, $con); + $this->collResponsables = ResponsablePeer::doSelectJoinTipodocumento($criteria, $con); } } $this->lastResponsableCriteria = $criteria; @@ -1312,7 +1312,7 @@ - public function getResponsablesJoinTipodocumento($criteria = null, $con = null) + public function getResponsablesJoinCuenta($criteria = null, $con = null) { include_once 'lib/model/om/BaseResponsablePeer.php'; if ($criteria === null) { @@ -1330,14 +1330,14 @@ $criteria->add(ResponsablePeer::FK_PROVINCIA_ID, $this->getId()); - $this->collResponsables = ResponsablePeer::doSelectJoinTipodocumento($criteria, $con); + $this->collResponsables = ResponsablePeer::doSelectJoinCuenta($criteria, $con); } } else { $criteria->add(ResponsablePeer::FK_PROVINCIA_ID, $this->getId()); if (!isset($this->lastResponsableCriteria) || !$this->lastResponsableCriteria->equals($criteria)) { - $this->collResponsables = ResponsablePeer::doSelectJoinTipodocumento($criteria, $con); + $this->collResponsables = ResponsablePeer::doSelectJoinCuenta($criteria, $con); } } $this->lastResponsableCriteria = $criteria; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocente.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocente.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocente.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -16,10 +16,10 @@ protected $fk_docente_id; - protected $aDocente; + protected $aActividad; - protected $aActividad; + protected $aDocente; protected $alreadyInSave = false; @@ -148,6 +148,13 @@ + if ($this->aActividad !== null) { + if ($this->aActividad->isModified()) { + $affectedRows += $this->aActividad->save($con); + } + $this->setActividad($this->aActividad); + } + if ($this->aDocente !== null) { if ($this->aDocente->isModified()) { $affectedRows += $this->aDocente->save($con); @@ -155,14 +162,7 @@ $this->setDocente($this->aDocente); } - if ($this->aActividad !== null) { - if ($this->aActividad->isModified()) { - $affectedRows += $this->aActividad->save($con); - } - $this->setActividad($this->aActividad); - } - if ($this->isModified()) { if ($this->isNew()) { $pk = RelActividadDocentePeer::doInsert($this, $con); @@ -210,19 +210,19 @@ + if ($this->aActividad !== null) { + if (!$this->aActividad->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aActividad->getValidationFailures()); + } + } + if ($this->aDocente !== null) { if (!$this->aDocente->validate($columns)) { $failureMap = array_merge($failureMap, $this->aDocente->getValidationFailures()); } } - if ($this->aActividad !== null) { - if (!$this->aActividad->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aActividad->getValidationFailures()); - } - } - if (($retval = RelActividadDocentePeer::doValidate($this, $columns)) !== true) { $failureMap = array_merge($failureMap, $retval); } @@ -370,63 +370,63 @@ } - public function setDocente($v) + public function setActividad($v) { if ($v === null) { - $this->setFkDocenteId(NULL); + $this->setFkActividadId(NULL); } else { - $this->setFkDocenteId($v->getId()); + $this->setFkActividadId($v->getId()); } - $this->aDocente = $v; + $this->aActividad = $v; } - public function getDocente($con = null) + public function getActividad($con = null) { - include_once 'lib/model/om/BaseDocentePeer.php'; + include_once 'lib/model/om/BaseActividadPeer.php'; - if ($this->aDocente === null && ($this->fk_docente_id !== null)) { + if ($this->aActividad === null && ($this->fk_actividad_id !== null)) { - $this->aDocente = DocentePeer::retrieveByPK($this->fk_docente_id, $con); + $this->aActividad = ActividadPeer::retrieveByPK($this->fk_actividad_id, $con); } - return $this->aDocente; + return $this->aActividad; } - public function setActividad($v) + public function setDocente($v) { if ($v === null) { - $this->setFkActividadId(NULL); + $this->setFkDocenteId(NULL); } else { - $this->setFkActividadId($v->getId()); + $this->setFkDocenteId($v->getId()); } - $this->aActividad = $v; + $this->aDocente = $v; } - public function getActividad($con = null) + public function getDocente($con = null) { - include_once 'lib/model/om/BaseActividadPeer.php'; + include_once 'lib/model/om/BaseDocentePeer.php'; - if ($this->aActividad === null && ($this->fk_actividad_id !== null)) { + if ($this->aDocente === null && ($this->fk_docente_id !== null)) { - $this->aActividad = ActividadPeer::retrieveByPK($this->fk_actividad_id, $con); + $this->aDocente = DocentePeer::retrieveByPK($this->fk_docente_id, $con); } - return $this->aActividad; + return $this->aDocente; } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocentePeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocentePeer.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocentePeer.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -179,7 +179,7 @@ } - public static function doCountJoinDocente(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinActividad(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -195,7 +195,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + $criteria->addJoin(RelActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); $rs = RelActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -207,7 +207,7 @@ - public static function doCountJoinActividad(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinDocente(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -223,7 +223,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); $rs = RelActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -235,7 +235,7 @@ - public static function doSelectJoinDocente(Criteria $c, $con = null) + public static function doSelectJoinActividad(Criteria $c, $con = null) { $c = clone $c; @@ -245,9 +245,9 @@ RelActividadDocentePeer::addSelectColumns($c); $startcol = (RelActividadDocentePeer::NUM_COLUMNS - RelActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - DocentePeer::addSelectColumns($c); + ActividadPeer::addSelectColumns($c); - $c->addJoin(RelActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + $c->addJoin(RelActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -259,7 +259,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = DocentePeer::getOMClass(); + $omClass = ActividadPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -267,7 +267,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getActividad(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelActividadDocente($obj1); break; } @@ -282,7 +282,7 @@ - public static function doSelectJoinActividad(Criteria $c, $con = null) + public static function doSelectJoinDocente(Criteria $c, $con = null) { $c = clone $c; @@ -292,9 +292,9 @@ RelActividadDocentePeer::addSelectColumns($c); $startcol = (RelActividadDocentePeer::NUM_COLUMNS - RelActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - ActividadPeer::addSelectColumns($c); + DocentePeer::addSelectColumns($c); - $c->addJoin(RelActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $c->addJoin(RelActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -306,7 +306,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = ActividadPeer::getOMClass(); + $omClass = DocentePeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -314,7 +314,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getActividad(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelActividadDocente($obj1); break; } @@ -345,10 +345,10 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(RelActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); - $criteria->addJoin(RelActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); - $rs = RelActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -370,16 +370,16 @@ RelActividadDocentePeer::addSelectColumns($c); $startcol2 = (RelActividadDocentePeer::NUM_COLUMNS - RelActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; + ActividadPeer::addSelectColumns($c); + $startcol3 = $startcol2 + ActividadPeer::NUM_COLUMNS; + DocentePeer::addSelectColumns($c); - $startcol3 = $startcol2 + DocentePeer::NUM_COLUMNS; + $startcol4 = $startcol3 + DocentePeer::NUM_COLUMNS; - ActividadPeer::addSelectColumns($c); - $startcol4 = $startcol3 + ActividadPeer::NUM_COLUMNS; + $c->addJoin(RelActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); $c->addJoin(RelActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); - $c->addJoin(RelActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -394,7 +394,7 @@ - $omClass = DocentePeer::getOMClass(); + $omClass = ActividadPeer::getOMClass(); $cls = Propel::import($omClass); @@ -404,7 +404,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getActividad(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelActividadDocente($obj1); break; } @@ -417,7 +417,7 @@ - $omClass = ActividadPeer::getOMClass(); + $omClass = DocentePeer::getOMClass(); $cls = Propel::import($omClass); @@ -427,7 +427,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getActividad(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getDocente(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addRelActividadDocente($obj1); break; } @@ -445,7 +445,7 @@ - public static function doCountJoinAllExceptDocente(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptActividad(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -461,7 +461,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); $rs = RelActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -473,7 +473,7 @@ - public static function doCountJoinAllExceptActividad(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptDocente(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -489,7 +489,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + $criteria->addJoin(RelActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); $rs = RelActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -501,7 +501,7 @@ - public static function doSelectJoinAllExceptDocente(Criteria $c, $con = null) + public static function doSelectJoinAllExceptActividad(Criteria $c, $con = null) { $c = clone $c; @@ -512,10 +512,10 @@ RelActividadDocentePeer::addSelectColumns($c); $startcol2 = (RelActividadDocentePeer::NUM_COLUMNS - RelActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - ActividadPeer::addSelectColumns($c); - $startcol3 = $startcol2 + ActividadPeer::NUM_COLUMNS; + DocentePeer::addSelectColumns($c); + $startcol3 = $startcol2 + DocentePeer::NUM_COLUMNS; - $c->addJoin(RelActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $c->addJoin(RelActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -529,7 +529,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = ActividadPeer::getOMClass(); + $omClass = DocentePeer::getOMClass(); $cls = Propel::import($omClass); @@ -539,7 +539,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getActividad(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelActividadDocente($obj1); break; @@ -558,7 +558,7 @@ - public static function doSelectJoinAllExceptActividad(Criteria $c, $con = null) + public static function doSelectJoinAllExceptDocente(Criteria $c, $con = null) { $c = clone $c; @@ -569,10 +569,10 @@ RelActividadDocentePeer::addSelectColumns($c); $startcol2 = (RelActividadDocentePeer::NUM_COLUMNS - RelActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - DocentePeer::addSelectColumns($c); - $startcol3 = $startcol2 + DocentePeer::NUM_COLUMNS; + ActividadPeer::addSelectColumns($c); + $startcol3 = $startcol2 + ActividadPeer::NUM_COLUMNS; - $c->addJoin(RelActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + $c->addJoin(RelActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -586,7 +586,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = DocentePeer::getOMClass(); + $omClass = ActividadPeer::getOMClass(); $cls = Propel::import($omClass); @@ -596,7 +596,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getActividad(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelActividadDocente($obj1); break; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelAlumnoDivision.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelAlumnoDivision.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelAlumnoDivision.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -20,10 +20,10 @@ protected $fk_alumno_id = 0; - protected $aAlumno; + protected $aDivision; - protected $aDivision; + protected $aAlumno; protected $alreadyInSave = false; @@ -175,6 +175,13 @@ + if ($this->aDivision !== null) { + if ($this->aDivision->isModified()) { + $affectedRows += $this->aDivision->save($con); + } + $this->setDivision($this->aDivision); + } + if ($this->aAlumno !== null) { if ($this->aAlumno->isModified()) { $affectedRows += $this->aAlumno->save($con); @@ -182,14 +189,7 @@ $this->setAlumno($this->aAlumno); } - if ($this->aDivision !== null) { - if ($this->aDivision->isModified()) { - $affectedRows += $this->aDivision->save($con); - } - $this->setDivision($this->aDivision); - } - if ($this->isModified()) { if ($this->isNew()) { $pk = RelAlumnoDivisionPeer::doInsert($this, $con); @@ -238,19 +238,19 @@ + if ($this->aDivision !== null) { + if (!$this->aDivision->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aDivision->getValidationFailures()); + } + } + if ($this->aAlumno !== null) { if (!$this->aAlumno->validate($columns)) { $failureMap = array_merge($failureMap, $this->aAlumno->getValidationFailures()); } } - if ($this->aDivision !== null) { - if (!$this->aDivision->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aDivision->getValidationFailures()); - } - } - if (($retval = RelAlumnoDivisionPeer::doValidate($this, $columns)) !== true) { $failureMap = array_merge($failureMap, $retval); } @@ -399,63 +399,63 @@ } - public function setAlumno($v) + public function setDivision($v) { if ($v === null) { - $this->setFkAlumnoId('0'); + $this->setFkDivisionId('0'); } else { - $this->setFkAlumnoId($v->getId()); + $this->setFkDivisionId($v->getId()); } - $this->aAlumno = $v; + $this->aDivision = $v; } - public function getAlumno($con = null) + public function getDivision($con = null) { - include_once 'lib/model/om/BaseAlumnoPeer.php'; + include_once 'lib/model/om/BaseDivisionPeer.php'; - if ($this->aAlumno === null && ($this->fk_alumno_id !== null)) { + if ($this->aDivision === null && ($this->fk_division_id !== null)) { - $this->aAlumno = AlumnoPeer::retrieveByPK($this->fk_alumno_id, $con); + $this->aDivision = DivisionPeer::retrieveByPK($this->fk_division_id, $con); } - return $this->aAlumno; + return $this->aDivision; } - public function setDivision($v) + public function setAlumno($v) { if ($v === null) { - $this->setFkDivisionId('0'); + $this->setFkAlumnoId('0'); } else { - $this->setFkDivisionId($v->getId()); + $this->setFkAlumnoId($v->getId()); } - $this->aDivision = $v; + $this->aAlumno = $v; } - public function getDivision($con = null) + public function getAlumno($con = null) { - include_once 'lib/model/om/BaseDivisionPeer.php'; + include_once 'lib/model/om/BaseAlumnoPeer.php'; - if ($this->aDivision === null && ($this->fk_division_id !== null)) { + if ($this->aAlumno === null && ($this->fk_alumno_id !== null)) { - $this->aDivision = DivisionPeer::retrieveByPK($this->fk_division_id, $con); + $this->aAlumno = AlumnoPeer::retrieveByPK($this->fk_alumno_id, $con); } - return $this->aDivision; + return $this->aAlumno; } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelAlumnoDivisionPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelAlumnoDivisionPeer.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelAlumnoDivisionPeer.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -184,7 +184,7 @@ } - public static function doCountJoinAlumno(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinDivision(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -200,7 +200,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelAlumnoDivisionPeer::FK_ALUMNO_ID, AlumnoPeer::ID); + $criteria->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, DivisionPeer::ID); $rs = RelAlumnoDivisionPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -212,7 +212,7 @@ - public static function doCountJoinDivision(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -228,7 +228,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, DivisionPeer::ID); + $criteria->addJoin(RelAlumnoDivisionPeer::FK_ALUMNO_ID, AlumnoPeer::ID); $rs = RelAlumnoDivisionPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -240,7 +240,7 @@ - public static function doSelectJoinAlumno(Criteria $c, $con = null) + public static function doSelectJoinDivision(Criteria $c, $con = null) { $c = clone $c; @@ -250,9 +250,9 @@ RelAlumnoDivisionPeer::addSelectColumns($c); $startcol = (RelAlumnoDivisionPeer::NUM_COLUMNS - RelAlumnoDivisionPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - AlumnoPeer::addSelectColumns($c); + DivisionPeer::addSelectColumns($c); - $c->addJoin(RelAlumnoDivisionPeer::FK_ALUMNO_ID, AlumnoPeer::ID); + $c->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, DivisionPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -264,7 +264,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = AlumnoPeer::getOMClass(); + $omClass = DivisionPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -272,7 +272,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getAlumno(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getDivision(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelAlumnoDivision($obj1); break; } @@ -287,7 +287,7 @@ - public static function doSelectJoinDivision(Criteria $c, $con = null) + public static function doSelectJoinAlumno(Criteria $c, $con = null) { $c = clone $c; @@ -297,9 +297,9 @@ RelAlumnoDivisionPeer::addSelectColumns($c); $startcol = (RelAlumnoDivisionPeer::NUM_COLUMNS - RelAlumnoDivisionPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - DivisionPeer::addSelectColumns($c); + AlumnoPeer::addSelectColumns($c); - $c->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, DivisionPeer::ID); + $c->addJoin(RelAlumnoDivisionPeer::FK_ALUMNO_ID, AlumnoPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -311,7 +311,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = DivisionPeer::getOMClass(); + $omClass = AlumnoPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -319,7 +319,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getDivision(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getAlumno(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelAlumnoDivision($obj1); break; } @@ -350,10 +350,10 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, DivisionPeer::ID); + $criteria->addJoin(RelAlumnoDivisionPeer::FK_ALUMNO_ID, AlumnoPeer::ID); - $criteria->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, DivisionPeer::ID); - $rs = RelAlumnoDivisionPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -375,16 +375,16 @@ RelAlumnoDivisionPeer::addSelectColumns($c); $startcol2 = (RelAlumnoDivisionPeer::NUM_COLUMNS - RelAlumnoDivisionPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + DivisionPeer::addSelectColumns($c); + $startcol3 = $startcol2 + DivisionPeer::NUM_COLUMNS; + AlumnoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + AlumnoPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + AlumnoPeer::NUM_COLUMNS; - DivisionPeer::addSelectColumns($c); - $startcol4 = $startcol3 + DivisionPeer::NUM_COLUMNS; + $c->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, DivisionPeer::ID); $c->addJoin(RelAlumnoDivisionPeer::FK_ALUMNO_ID, AlumnoPeer::ID); - $c->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, DivisionPeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -399,7 +399,7 @@ - $omClass = AlumnoPeer::getOMClass(); + $omClass = DivisionPeer::getOMClass(); $cls = Propel::import($omClass); @@ -409,7 +409,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getAlumno(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getDivision(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelAlumnoDivision($obj1); break; } @@ -422,7 +422,7 @@ - $omClass = DivisionPeer::getOMClass(); + $omClass = AlumnoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -432,7 +432,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getDivision(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getAlumno(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addRelAlumnoDivision($obj1); break; } @@ -450,7 +450,7 @@ - public static function doCountJoinAllExceptAlumno(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptDivision(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -466,7 +466,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, DivisionPeer::ID); + $criteria->addJoin(RelAlumnoDivisionPeer::FK_ALUMNO_ID, AlumnoPeer::ID); $rs = RelAlumnoDivisionPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -478,7 +478,7 @@ - public static function doCountJoinAllExceptDivision(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -494,7 +494,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelAlumnoDivisionPeer::FK_ALUMNO_ID, AlumnoPeer::ID); + $criteria->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, DivisionPeer::ID); $rs = RelAlumnoDivisionPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -506,7 +506,7 @@ - public static function doSelectJoinAllExceptAlumno(Criteria $c, $con = null) + public static function doSelectJoinAllExceptDivision(Criteria $c, $con = null) { $c = clone $c; @@ -517,10 +517,10 @@ RelAlumnoDivisionPeer::addSelectColumns($c); $startcol2 = (RelAlumnoDivisionPeer::NUM_COLUMNS - RelAlumnoDivisionPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - DivisionPeer::addSelectColumns($c); - $startcol3 = $startcol2 + DivisionPeer::NUM_COLUMNS; + AlumnoPeer::addSelectColumns($c); + $startcol3 = $startcol2 + AlumnoPeer::NUM_COLUMNS; - $c->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, DivisionPeer::ID); + $c->addJoin(RelAlumnoDivisionPeer::FK_ALUMNO_ID, AlumnoPeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -534,7 +534,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = DivisionPeer::getOMClass(); + $omClass = AlumnoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -544,7 +544,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getDivision(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getAlumno(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelAlumnoDivision($obj1); break; @@ -563,7 +563,7 @@ - public static function doSelectJoinAllExceptDivision(Criteria $c, $con = null) + public static function doSelectJoinAllExceptAlumno(Criteria $c, $con = null) { $c = clone $c; @@ -574,10 +574,10 @@ RelAlumnoDivisionPeer::addSelectColumns($c); $startcol2 = (RelAlumnoDivisionPeer::NUM_COLUMNS - RelAlumnoDivisionPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - AlumnoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + AlumnoPeer::NUM_COLUMNS; + DivisionPeer::addSelectColumns($c); + $startcol3 = $startcol2 + DivisionPeer::NUM_COLUMNS; - $c->addJoin(RelAlumnoDivisionPeer::FK_ALUMNO_ID, AlumnoPeer::ID); + $c->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, DivisionPeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -591,7 +591,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = AlumnoPeer::getOMClass(); + $omClass = DivisionPeer::getOMClass(); $cls = Propel::import($omClass); @@ -601,7 +601,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getAlumno(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getDivision(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelAlumnoDivision($obj1); break; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividad.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividad.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividad.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -24,10 +24,10 @@ protected $horas = 0; - protected $aActividad; + protected $aAnio; - protected $aAnio; + protected $aActividad; protected $alreadyInSave = false; @@ -198,6 +198,13 @@ + if ($this->aAnio !== null) { + if ($this->aAnio->isModified()) { + $affectedRows += $this->aAnio->save($con); + } + $this->setAnio($this->aAnio); + } + if ($this->aActividad !== null) { if ($this->aActividad->isModified()) { $affectedRows += $this->aActividad->save($con); @@ -205,14 +212,7 @@ $this->setActividad($this->aActividad); } - if ($this->aAnio !== null) { - if ($this->aAnio->isModified()) { - $affectedRows += $this->aAnio->save($con); - } - $this->setAnio($this->aAnio); - } - if ($this->isModified()) { if ($this->isNew()) { $pk = RelAnioActividadPeer::doInsert($this, $con); @@ -261,19 +261,19 @@ + if ($this->aAnio !== null) { + if (!$this->aAnio->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aAnio->getValidationFailures()); + } + } + if ($this->aActividad !== null) { if (!$this->aActividad->validate($columns)) { $failureMap = array_merge($failureMap, $this->aActividad->getValidationFailures()); } } - if ($this->aAnio !== null) { - if (!$this->aAnio->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aAnio->getValidationFailures()); - } - } - if (($retval = RelAnioActividadPeer::doValidate($this, $columns)) !== true) { $failureMap = array_merge($failureMap, $retval); } @@ -433,63 +433,63 @@ } - public function setActividad($v) + public function setAnio($v) { if ($v === null) { - $this->setFkActividadId('0'); + $this->setFkAnioId('0'); } else { - $this->setFkActividadId($v->getId()); + $this->setFkAnioId($v->getId()); } - $this->aActividad = $v; + $this->aAnio = $v; } - public function getActividad($con = null) + public function getAnio($con = null) { - include_once 'lib/model/om/BaseActividadPeer.php'; + include_once 'lib/model/om/BaseAnioPeer.php'; - if ($this->aActividad === null && ($this->fk_actividad_id !== null)) { + if ($this->aAnio === null && ($this->fk_anio_id !== null)) { - $this->aActividad = ActividadPeer::retrieveByPK($this->fk_actividad_id, $con); + $this->aAnio = AnioPeer::retrieveByPK($this->fk_anio_id, $con); } - return $this->aActividad; + return $this->aAnio; } - public function setAnio($v) + public function setActividad($v) { if ($v === null) { - $this->setFkAnioId('0'); + $this->setFkActividadId('0'); } else { - $this->setFkAnioId($v->getId()); + $this->setFkActividadId($v->getId()); } - $this->aAnio = $v; + $this->aActividad = $v; } - public function getAnio($con = null) + public function getActividad($con = null) { - include_once 'lib/model/om/BaseAnioPeer.php'; + include_once 'lib/model/om/BaseActividadPeer.php'; - if ($this->aAnio === null && ($this->fk_anio_id !== null)) { + if ($this->aActividad === null && ($this->fk_actividad_id !== null)) { - $this->aAnio = AnioPeer::retrieveByPK($this->fk_anio_id, $con); + $this->aActividad = ActividadPeer::retrieveByPK($this->fk_actividad_id, $con); } - return $this->aAnio; + return $this->aActividad; } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadPeer.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadPeer.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -189,7 +189,7 @@ } - public static function doCountJoinActividad(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAnio(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -205,7 +205,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelAnioActividadPeer::FK_ANIO_ID, AnioPeer::ID); $rs = RelAnioActividadPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -217,7 +217,7 @@ - public static function doCountJoinAnio(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinActividad(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -233,7 +233,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelAnioActividadPeer::FK_ANIO_ID, AnioPeer::ID); + $criteria->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); $rs = RelAnioActividadPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -245,7 +245,7 @@ - public static function doSelectJoinActividad(Criteria $c, $con = null) + public static function doSelectJoinAnio(Criteria $c, $con = null) { $c = clone $c; @@ -255,9 +255,9 @@ RelAnioActividadPeer::addSelectColumns($c); $startcol = (RelAnioActividadPeer::NUM_COLUMNS - RelAnioActividadPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - ActividadPeer::addSelectColumns($c); + AnioPeer::addSelectColumns($c); - $c->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $c->addJoin(RelAnioActividadPeer::FK_ANIO_ID, AnioPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -269,7 +269,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = ActividadPeer::getOMClass(); + $omClass = AnioPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -277,7 +277,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getActividad(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getAnio(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelAnioActividad($obj1); break; } @@ -292,7 +292,7 @@ - public static function doSelectJoinAnio(Criteria $c, $con = null) + public static function doSelectJoinActividad(Criteria $c, $con = null) { $c = clone $c; @@ -302,9 +302,9 @@ RelAnioActividadPeer::addSelectColumns($c); $startcol = (RelAnioActividadPeer::NUM_COLUMNS - RelAnioActividadPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - AnioPeer::addSelectColumns($c); + ActividadPeer::addSelectColumns($c); - $c->addJoin(RelAnioActividadPeer::FK_ANIO_ID, AnioPeer::ID); + $c->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -316,7 +316,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = AnioPeer::getOMClass(); + $omClass = ActividadPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -324,7 +324,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getAnio(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getActividad(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelAnioActividad($obj1); break; } @@ -355,10 +355,10 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(RelAnioActividadPeer::FK_ANIO_ID, AnioPeer::ID); + $criteria->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); - $criteria->addJoin(RelAnioActividadPeer::FK_ANIO_ID, AnioPeer::ID); - $rs = RelAnioActividadPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -380,16 +380,16 @@ RelAnioActividadPeer::addSelectColumns($c); $startcol2 = (RelAnioActividadPeer::NUM_COLUMNS - RelAnioActividadPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + AnioPeer::addSelectColumns($c); + $startcol3 = $startcol2 + AnioPeer::NUM_COLUMNS; + ActividadPeer::addSelectColumns($c); - $startcol3 = $startcol2 + ActividadPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + ActividadPeer::NUM_COLUMNS; - AnioPeer::addSelectColumns($c); - $startcol4 = $startcol3 + AnioPeer::NUM_COLUMNS; + $c->addJoin(RelAnioActividadPeer::FK_ANIO_ID, AnioPeer::ID); $c->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); - $c->addJoin(RelAnioActividadPeer::FK_ANIO_ID, AnioPeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -404,7 +404,7 @@ - $omClass = ActividadPeer::getOMClass(); + $omClass = AnioPeer::getOMClass(); $cls = Propel::import($omClass); @@ -414,7 +414,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getActividad(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getAnio(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelAnioActividad($obj1); break; } @@ -427,7 +427,7 @@ - $omClass = AnioPeer::getOMClass(); + $omClass = ActividadPeer::getOMClass(); $cls = Propel::import($omClass); @@ -437,7 +437,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getAnio(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getActividad(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addRelAnioActividad($obj1); break; } @@ -455,7 +455,7 @@ - public static function doCountJoinAllExceptActividad(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptAnio(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -471,7 +471,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelAnioActividadPeer::FK_ANIO_ID, AnioPeer::ID); + $criteria->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); $rs = RelAnioActividadPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -483,7 +483,7 @@ - public static function doCountJoinAllExceptAnio(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptActividad(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -499,7 +499,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelAnioActividadPeer::FK_ANIO_ID, AnioPeer::ID); $rs = RelAnioActividadPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -511,7 +511,7 @@ - public static function doSelectJoinAllExceptActividad(Criteria $c, $con = null) + public static function doSelectJoinAllExceptAnio(Criteria $c, $con = null) { $c = clone $c; @@ -522,10 +522,10 @@ RelAnioActividadPeer::addSelectColumns($c); $startcol2 = (RelAnioActividadPeer::NUM_COLUMNS - RelAnioActividadPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - AnioPeer::addSelectColumns($c); - $startcol3 = $startcol2 + AnioPeer::NUM_COLUMNS; + ActividadPeer::addSelectColumns($c); + $startcol3 = $startcol2 + ActividadPeer::NUM_COLUMNS; - $c->addJoin(RelAnioActividadPeer::FK_ANIO_ID, AnioPeer::ID); + $c->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -539,7 +539,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = AnioPeer::getOMClass(); + $omClass = ActividadPeer::getOMClass(); $cls = Propel::import($omClass); @@ -549,7 +549,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getAnio(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getActividad(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelAnioActividad($obj1); break; @@ -568,7 +568,7 @@ - public static function doSelectJoinAllExceptAnio(Criteria $c, $con = null) + public static function doSelectJoinAllExceptActividad(Criteria $c, $con = null) { $c = clone $c; @@ -579,10 +579,10 @@ RelAnioActividadPeer::addSelectColumns($c); $startcol2 = (RelAnioActividadPeer::NUM_COLUMNS - RelAnioActividadPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - ActividadPeer::addSelectColumns($c); - $startcol3 = $startcol2 + ActividadPeer::NUM_COLUMNS; + AnioPeer::addSelectColumns($c); + $startcol3 = $startcol2 + AnioPeer::NUM_COLUMNS; - $c->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $c->addJoin(RelAnioActividadPeer::FK_ANIO_ID, AnioPeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -596,7 +596,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = ActividadPeer::getOMClass(); + $omClass = AnioPeer::getOMClass(); $cls = Propel::import($omClass); @@ -606,7 +606,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getActividad(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getAnio(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelAnioActividad($obj1); break; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumno.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumno.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumno.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -25,17 +25,17 @@ - protected $comprobante = true; + protected $comprobante = false; protected $fecha; - protected $aCalendariovacunacion; + protected $aAlumno; - protected $aAlumno; + protected $aCalendariovacunacion; protected $alreadyInSave = false; @@ -168,7 +168,7 @@ public function setComprobante($v) { - if ($this->comprobante !== $v || $v === true) { + if ($this->comprobante !== $v || $v === false) { $this->comprobante = $v; $this->modifiedColumns[] = RelCalendariovacunacionAlumnoPeer::COMPROBANTE; } @@ -270,6 +270,13 @@ + if ($this->aAlumno !== null) { + if ($this->aAlumno->isModified()) { + $affectedRows += $this->aAlumno->save($con); + } + $this->setAlumno($this->aAlumno); + } + if ($this->aCalendariovacunacion !== null) { if ($this->aCalendariovacunacion->isModified()) { $affectedRows += $this->aCalendariovacunacion->save($con); @@ -277,14 +284,7 @@ $this->setCalendariovacunacion($this->aCalendariovacunacion); } - if ($this->aAlumno !== null) { - if ($this->aAlumno->isModified()) { - $affectedRows += $this->aAlumno->save($con); - } - $this->setAlumno($this->aAlumno); - } - if ($this->isModified()) { if ($this->isNew()) { $pk = RelCalendariovacunacionAlumnoPeer::doInsert($this, $con); @@ -333,19 +333,19 @@ + if ($this->aAlumno !== null) { + if (!$this->aAlumno->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aAlumno->getValidationFailures()); + } + } + if ($this->aCalendariovacunacion !== null) { if (!$this->aCalendariovacunacion->validate($columns)) { $failureMap = array_merge($failureMap, $this->aCalendariovacunacion->getValidationFailures()); } } - if ($this->aAlumno !== null) { - if (!$this->aAlumno->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aAlumno->getValidationFailures()); - } - } - if (($retval = RelCalendariovacunacionAlumnoPeer::doValidate($this, $columns)) !== true) { $failureMap = array_merge($failureMap, $retval); } @@ -527,63 +527,63 @@ } - public function setCalendariovacunacion($v) + public function setAlumno($v) { if ($v === null) { - $this->setFkCalendariovacunacionId(NULL); + $this->setFkAlumnoId(NULL); } else { - $this->setFkCalendariovacunacionId($v->getId()); + $this->setFkAlumnoId($v->getId()); } - $this->aCalendariovacunacion = $v; + $this->aAlumno = $v; } - public function getCalendariovacunacion($con = null) + public function getAlumno($con = null) { - include_once 'lib/model/om/BaseCalendariovacunacionPeer.php'; + include_once 'lib/model/om/BaseAlumnoPeer.php'; - if ($this->aCalendariovacunacion === null && ($this->fk_calendariovacunacion_id !== null)) { + if ($this->aAlumno === null && ($this->fk_alumno_id !== null)) { - $this->aCalendariovacunacion = CalendariovacunacionPeer::retrieveByPK($this->fk_calendariovacunacion_id, $con); + $this->aAlumno = AlumnoPeer::retrieveByPK($this->fk_alumno_id, $con); } - return $this->aCalendariovacunacion; + return $this->aAlumno; } - public function setAlumno($v) + public function setCalendariovacunacion($v) { if ($v === null) { - $this->setFkAlumnoId(NULL); + $this->setFkCalendariovacunacionId(NULL); } else { - $this->setFkAlumnoId($v->getId()); + $this->setFkCalendariovacunacionId($v->getId()); } - $this->aAlumno = $v; + $this->aCalendariovacunacion = $v; } - public function getAlumno($con = null) + public function getCalendariovacunacion($con = null) { - include_once 'lib/model/om/BaseAlumnoPeer.php'; + include_once 'lib/model/om/BaseCalendariovacunacionPeer.php'; - if ($this->aAlumno === null && ($this->fk_alumno_id !== null)) { + if ($this->aCalendariovacunacion === null && ($this->fk_calendariovacunacion_id !== null)) { - $this->aAlumno = AlumnoPeer::retrieveByPK($this->fk_alumno_id, $con); + $this->aCalendariovacunacion = CalendariovacunacionPeer::retrieveByPK($this->fk_calendariovacunacion_id, $con); } - return $this->aAlumno; + return $this->aCalendariovacunacion; } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumnoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumnoPeer.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumnoPeer.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -199,7 +199,7 @@ } - public static function doCountJoinCalendariovacunacion(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -215,7 +215,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelCalendariovacunacionAlumnoPeer::FK_CALENDARIOVACUNACION_ID, CalendariovacunacionPeer::ID); + $criteria->addJoin(RelCalendariovacunacionAlumnoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); $rs = RelCalendariovacunacionAlumnoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -227,7 +227,7 @@ - public static function doCountJoinAlumno(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinCalendariovacunacion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -243,7 +243,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelCalendariovacunacionAlumnoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); + $criteria->addJoin(RelCalendariovacunacionAlumnoPeer::FK_CALENDARIOVACUNACION_ID, CalendariovacunacionPeer::ID); $rs = RelCalendariovacunacionAlumnoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -255,7 +255,7 @@ - public static function doSelectJoinCalendariovacunacion(Criteria $c, $con = null) + public static function doSelectJoinAlumno(Criteria $c, $con = null) { $c = clone $c; @@ -265,9 +265,9 @@ RelCalendariovacunacionAlumnoPeer::addSelectColumns($c); $startcol = (RelCalendariovacunacionAlumnoPeer::NUM_COLUMNS - RelCalendariovacunacionAlumnoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - CalendariovacunacionPeer::addSelectColumns($c); + AlumnoPeer::addSelectColumns($c); - $c->addJoin(RelCalendariovacunacionAlumnoPeer::FK_CALENDARIOVACUNACION_ID, CalendariovacunacionPeer::ID); + $c->addJoin(RelCalendariovacunacionAlumnoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -279,7 +279,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = CalendariovacunacionPeer::getOMClass(); + $omClass = AlumnoPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -287,7 +287,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getCalendariovacunacion(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getAlumno(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelCalendariovacunacionAlumno($obj1); break; } @@ -302,7 +302,7 @@ - public static function doSelectJoinAlumno(Criteria $c, $con = null) + public static function doSelectJoinCalendariovacunacion(Criteria $c, $con = null) { $c = clone $c; @@ -312,9 +312,9 @@ RelCalendariovacunacionAlumnoPeer::addSelectColumns($c); $startcol = (RelCalendariovacunacionAlumnoPeer::NUM_COLUMNS - RelCalendariovacunacionAlumnoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - AlumnoPeer::addSelectColumns($c); + CalendariovacunacionPeer::addSelectColumns($c); - $c->addJoin(RelCalendariovacunacionAlumnoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); + $c->addJoin(RelCalendariovacunacionAlumnoPeer::FK_CALENDARIOVACUNACION_ID, CalendariovacunacionPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -326,7 +326,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = AlumnoPeer::getOMClass(); + $omClass = CalendariovacunacionPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -334,7 +334,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getAlumno(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getCalendariovacunacion(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelCalendariovacunacionAlumno($obj1); break; } @@ -365,10 +365,10 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(RelCalendariovacunacionAlumnoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); + $criteria->addJoin(RelCalendariovacunacionAlumnoPeer::FK_CALENDARIOVACUNACION_ID, CalendariovacunacionPeer::ID); - $criteria->addJoin(RelCalendariovacunacionAlumnoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); - $rs = RelCalendariovacunacionAlumnoPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -390,16 +390,16 @@ RelCalendariovacunacionAlumnoPeer::addSelectColumns($c); $startcol2 = (RelCalendariovacunacionAlumnoPeer::NUM_COLUMNS - RelCalendariovacunacionAlumnoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + AlumnoPeer::addSelectColumns($c); + $startcol3 = $startcol2 + AlumnoPeer::NUM_COLUMNS; + CalendariovacunacionPeer::addSelectColumns($c); - $startcol3 = $startcol2 + CalendariovacunacionPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + CalendariovacunacionPeer::NUM_COLUMNS; - AlumnoPeer::addSelectColumns($c); - $startcol4 = $startcol3 + AlumnoPeer::NUM_COLUMNS; + $c->addJoin(RelCalendariovacunacionAlumnoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); $c->addJoin(RelCalendariovacunacionAlumnoPeer::FK_CALENDARIOVACUNACION_ID, CalendariovacunacionPeer::ID); - $c->addJoin(RelCalendariovacunacionAlumnoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -414,7 +414,7 @@ - $omClass = CalendariovacunacionPeer::getOMClass(); + $omClass = AlumnoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -424,7 +424,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getCalendariovacunacion(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getAlumno(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelCalendariovacunacionAlumno($obj1); break; } @@ -437,7 +437,7 @@ - $omClass = AlumnoPeer::getOMClass(); + $omClass = CalendariovacunacionPeer::getOMClass(); $cls = Propel::import($omClass); @@ -447,7 +447,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getAlumno(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getCalendariovacunacion(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addRelCalendariovacunacionAlumno($obj1); break; } @@ -465,7 +465,7 @@ - public static function doCountJoinAllExceptCalendariovacunacion(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -481,7 +481,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelCalendariovacunacionAlumnoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); + $criteria->addJoin(RelCalendariovacunacionAlumnoPeer::FK_CALENDARIOVACUNACION_ID, CalendariovacunacionPeer::ID); $rs = RelCalendariovacunacionAlumnoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -493,7 +493,7 @@ - public static function doCountJoinAllExceptAlumno(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptCalendariovacunacion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -509,7 +509,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelCalendariovacunacionAlumnoPeer::FK_CALENDARIOVACUNACION_ID, CalendariovacunacionPeer::ID); + $criteria->addJoin(RelCalendariovacunacionAlumnoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); $rs = RelCalendariovacunacionAlumnoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -521,7 +521,7 @@ - public static function doSelectJoinAllExceptCalendariovacunacion(Criteria $c, $con = null) + public static function doSelectJoinAllExceptAlumno(Criteria $c, $con = null) { $c = clone $c; @@ -532,10 +532,10 @@ RelCalendariovacunacionAlumnoPeer::addSelectColumns($c); $startcol2 = (RelCalendariovacunacionAlumnoPeer::NUM_COLUMNS - RelCalendariovacunacionAlumnoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - AlumnoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + AlumnoPeer::NUM_COLUMNS; + CalendariovacunacionPeer::addSelectColumns($c); + $startcol3 = $startcol2 + CalendariovacunacionPeer::NUM_COLUMNS; - $c->addJoin(RelCalendariovacunacionAlumnoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); + $c->addJoin(RelCalendariovacunacionAlumnoPeer::FK_CALENDARIOVACUNACION_ID, CalendariovacunacionPeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -549,7 +549,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = AlumnoPeer::getOMClass(); + $omClass = CalendariovacunacionPeer::getOMClass(); $cls = Propel::import($omClass); @@ -559,7 +559,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getAlumno(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getCalendariovacunacion(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelCalendariovacunacionAlumno($obj1); break; @@ -578,7 +578,7 @@ - public static function doSelectJoinAllExceptAlumno(Criteria $c, $con = null) + public static function doSelectJoinAllExceptCalendariovacunacion(Criteria $c, $con = null) { $c = clone $c; @@ -589,10 +589,10 @@ RelCalendariovacunacionAlumnoPeer::addSelectColumns($c); $startcol2 = (RelCalendariovacunacionAlumnoPeer::NUM_COLUMNS - RelCalendariovacunacionAlumnoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - CalendariovacunacionPeer::addSelectColumns($c); - $startcol3 = $startcol2 + CalendariovacunacionPeer::NUM_COLUMNS; + AlumnoPeer::addSelectColumns($c); + $startcol3 = $startcol2 + AlumnoPeer::NUM_COLUMNS; - $c->addJoin(RelCalendariovacunacionAlumnoPeer::FK_CALENDARIOVACUNACION_ID, CalendariovacunacionPeer::ID); + $c->addJoin(RelCalendariovacunacionAlumnoPeer::FK_ALUMNO_ID, AlumnoPeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -606,7 +606,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = CalendariovacunacionPeer::getOMClass(); + $omClass = AlumnoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -616,7 +616,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getCalendariovacunacion(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getAlumno(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelCalendariovacunacionAlumno($obj1); break; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocente.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocente.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocente.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -51,18 +51,18 @@ protected $aDivision; + protected $aActividad; + + protected $aDocente; - protected $aActividad; + protected $aEvento; protected $aRepeticion; - protected $aEvento; - - protected $alreadyInSave = false; @@ -464,6 +464,13 @@ $this->setDivision($this->aDivision); } + if ($this->aActividad !== null) { + if ($this->aActividad->isModified()) { + $affectedRows += $this->aActividad->save($con); + } + $this->setActividad($this->aActividad); + } + if ($this->aDocente !== null) { if ($this->aDocente->isModified()) { $affectedRows += $this->aDocente->save($con); @@ -471,11 +478,11 @@ $this->setDocente($this->aDocente); } - if ($this->aActividad !== null) { - if ($this->aActividad->isModified()) { - $affectedRows += $this->aActividad->save($con); + if ($this->aEvento !== null) { + if ($this->aEvento->isModified()) { + $affectedRows += $this->aEvento->save($con); } - $this->setActividad($this->aActividad); + $this->setEvento($this->aEvento); } if ($this->aRepeticion !== null) { @@ -485,14 +492,7 @@ $this->setRepeticion($this->aRepeticion); } - if ($this->aEvento !== null) { - if ($this->aEvento->isModified()) { - $affectedRows += $this->aEvento->save($con); - } - $this->setEvento($this->aEvento); - } - if ($this->isModified()) { if ($this->isNew()) { $pk = RelDivisionActividadDocentePeer::doInsert($this, $con); @@ -547,15 +547,21 @@ } } + if ($this->aActividad !== null) { + if (!$this->aActividad->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aActividad->getValidationFailures()); + } + } + if ($this->aDocente !== null) { if (!$this->aDocente->validate($columns)) { $failureMap = array_merge($failureMap, $this->aDocente->getValidationFailures()); } } - if ($this->aActividad !== null) { - if (!$this->aActividad->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aActividad->getValidationFailures()); + if ($this->aEvento !== null) { + if (!$this->aEvento->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aEvento->getValidationFailures()); } } @@ -565,13 +571,7 @@ } } - if ($this->aEvento !== null) { - if (!$this->aEvento->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aEvento->getValidationFailures()); - } - } - if (($retval = RelDivisionActividadDocentePeer::doValidate($this, $columns)) !== true) { $failureMap = array_merge($failureMap, $retval); } @@ -827,123 +827,123 @@ } - public function setDocente($v) + public function setActividad($v) { if ($v === null) { - $this->setFkDocenteId('0'); + $this->setFkActividadId('0'); } else { - $this->setFkDocenteId($v->getId()); + $this->setFkActividadId($v->getId()); } - $this->aDocente = $v; + $this->aActividad = $v; } - public function getDocente($con = null) + public function getActividad($con = null) { - include_once 'lib/model/om/BaseDocentePeer.php'; + include_once 'lib/model/om/BaseActividadPeer.php'; - if ($this->aDocente === null && ($this->fk_docente_id !== null)) { + if ($this->aActividad === null && ($this->fk_actividad_id !== null)) { - $this->aDocente = DocentePeer::retrieveByPK($this->fk_docente_id, $con); + $this->aActividad = ActividadPeer::retrieveByPK($this->fk_actividad_id, $con); } - return $this->aDocente; + return $this->aActividad; } - public function setActividad($v) + public function setDocente($v) { if ($v === null) { - $this->setFkActividadId('0'); + $this->setFkDocenteId('0'); } else { - $this->setFkActividadId($v->getId()); + $this->setFkDocenteId($v->getId()); } - $this->aActividad = $v; + $this->aDocente = $v; } - public function getActividad($con = null) + public function getDocente($con = null) { - include_once 'lib/model/om/BaseActividadPeer.php'; + include_once 'lib/model/om/BaseDocentePeer.php'; - if ($this->aActividad === null && ($this->fk_actividad_id !== null)) { + if ($this->aDocente === null && ($this->fk_docente_id !== null)) { - $this->aActividad = ActividadPeer::retrieveByPK($this->fk_actividad_id, $con); + $this->aDocente = DocentePeer::retrieveByPK($this->fk_docente_id, $con); } - return $this->aActividad; + return $this->aDocente; } - public function setRepeticion($v) + public function setEvento($v) { if ($v === null) { - $this->setFkRepeticionId('0'); + $this->setFkEventoId('0'); } else { - $this->setFkRepeticionId($v->getId()); + $this->setFkEventoId($v->getId()); } - $this->aRepeticion = $v; + $this->aEvento = $v; } - public function getRepeticion($con = null) + public function getEvento($con = null) { - include_once 'lib/model/om/BaseRepeticionPeer.php'; + include_once 'lib/model/om/BaseEventoPeer.php'; - if ($this->aRepeticion === null && ($this->fk_repeticion_id !== null)) { + if ($this->aEvento === null && ($this->fk_evento_id !== null)) { - $this->aRepeticion = RepeticionPeer::retrieveByPK($this->fk_repeticion_id, $con); + $this->aEvento = EventoPeer::retrieveByPK($this->fk_evento_id, $con); } - return $this->aRepeticion; + return $this->aEvento; } - public function setEvento($v) + public function setRepeticion($v) { if ($v === null) { - $this->setFkEventoId('0'); + $this->setFkRepeticionId('0'); } else { - $this->setFkEventoId($v->getId()); + $this->setFkRepeticionId($v->getId()); } - $this->aEvento = $v; + $this->aRepeticion = $v; } - public function getEvento($con = null) + public function getRepeticion($con = null) { - include_once 'lib/model/om/BaseEventoPeer.php'; + include_once 'lib/model/om/BaseRepeticionPeer.php'; - if ($this->aEvento === null && ($this->fk_evento_id !== null)) { + if ($this->aRepeticion === null && ($this->fk_repeticion_id !== null)) { - $this->aEvento = EventoPeer::retrieveByPK($this->fk_evento_id, $con); + $this->aRepeticion = RepeticionPeer::retrieveByPK($this->fk_repeticion_id, $con); } - return $this->aEvento; + return $this->aRepeticion; } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocentePeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocentePeer.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocentePeer.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -247,7 +247,7 @@ - public static function doCountJoinDocente(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinActividad(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -263,7 +263,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); $rs = RelDivisionActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -275,7 +275,7 @@ - public static function doCountJoinActividad(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinDocente(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -291,7 +291,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); $rs = RelDivisionActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -303,7 +303,7 @@ - public static function doCountJoinRepeticion(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinEvento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -319,7 +319,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); $rs = RelDivisionActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -331,7 +331,7 @@ - public static function doCountJoinEvento(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinRepeticion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -347,7 +347,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); $rs = RelDivisionActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -406,7 +406,7 @@ - public static function doSelectJoinDocente(Criteria $c, $con = null) + public static function doSelectJoinActividad(Criteria $c, $con = null) { $c = clone $c; @@ -416,9 +416,9 @@ RelDivisionActividadDocentePeer::addSelectColumns($c); $startcol = (RelDivisionActividadDocentePeer::NUM_COLUMNS - RelDivisionActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - DocentePeer::addSelectColumns($c); + ActividadPeer::addSelectColumns($c); - $c->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -430,7 +430,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = DocentePeer::getOMClass(); + $omClass = ActividadPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -438,7 +438,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getActividad(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelDivisionActividadDocente($obj1); break; } @@ -453,7 +453,7 @@ - public static function doSelectJoinActividad(Criteria $c, $con = null) + public static function doSelectJoinDocente(Criteria $c, $con = null) { $c = clone $c; @@ -463,9 +463,9 @@ RelDivisionActividadDocentePeer::addSelectColumns($c); $startcol = (RelDivisionActividadDocentePeer::NUM_COLUMNS - RelDivisionActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - ActividadPeer::addSelectColumns($c); + DocentePeer::addSelectColumns($c); - $c->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -477,7 +477,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = ActividadPeer::getOMClass(); + $omClass = DocentePeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -485,7 +485,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getActividad(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelDivisionActividadDocente($obj1); break; } @@ -500,7 +500,7 @@ - public static function doSelectJoinRepeticion(Criteria $c, $con = null) + public static function doSelectJoinEvento(Criteria $c, $con = null) { $c = clone $c; @@ -510,9 +510,9 @@ RelDivisionActividadDocentePeer::addSelectColumns($c); $startcol = (RelDivisionActividadDocentePeer::NUM_COLUMNS - RelDivisionActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - RepeticionPeer::addSelectColumns($c); + EventoPeer::addSelectColumns($c); - $c->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -524,7 +524,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = RepeticionPeer::getOMClass(); + $omClass = EventoPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -532,7 +532,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getRepeticion(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getEvento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelDivisionActividadDocente($obj1); break; } @@ -547,7 +547,7 @@ - public static function doSelectJoinEvento(Criteria $c, $con = null) + public static function doSelectJoinRepeticion(Criteria $c, $con = null) { $c = clone $c; @@ -557,9 +557,9 @@ RelDivisionActividadDocentePeer::addSelectColumns($c); $startcol = (RelDivisionActividadDocentePeer::NUM_COLUMNS - RelDivisionActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - EventoPeer::addSelectColumns($c); + RepeticionPeer::addSelectColumns($c); - $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -571,7 +571,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = EventoPeer::getOMClass(); + $omClass = RepeticionPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -579,7 +579,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getEvento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getRepeticion(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelDivisionActividadDocente($obj1); break; } @@ -612,14 +612,14 @@ $criteria->addJoin(RelDivisionActividadDocentePeer::FK_DIVISION_ID, DivisionPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); - $criteria->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); $criteria->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); - $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); - $rs = RelDivisionActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -644,28 +644,28 @@ DivisionPeer::addSelectColumns($c); $startcol3 = $startcol2 + DivisionPeer::NUM_COLUMNS; + ActividadPeer::addSelectColumns($c); + $startcol4 = $startcol3 + ActividadPeer::NUM_COLUMNS; + DocentePeer::addSelectColumns($c); - $startcol4 = $startcol3 + DocentePeer::NUM_COLUMNS; + $startcol5 = $startcol4 + DocentePeer::NUM_COLUMNS; - ActividadPeer::addSelectColumns($c); - $startcol5 = $startcol4 + ActividadPeer::NUM_COLUMNS; + EventoPeer::addSelectColumns($c); + $startcol6 = $startcol5 + EventoPeer::NUM_COLUMNS; RepeticionPeer::addSelectColumns($c); - $startcol6 = $startcol5 + RepeticionPeer::NUM_COLUMNS; + $startcol7 = $startcol6 + RepeticionPeer::NUM_COLUMNS; - EventoPeer::addSelectColumns($c); - $startcol7 = $startcol6 + EventoPeer::NUM_COLUMNS; - $c->addJoin(RelDivisionActividadDocentePeer::FK_DIVISION_ID, DivisionPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); - $c->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); $c->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); - $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -703,7 +703,7 @@ - $omClass = DocentePeer::getOMClass(); + $omClass = ActividadPeer::getOMClass(); $cls = Propel::import($omClass); @@ -713,7 +713,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getDocente(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getActividad(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addRelDivisionActividadDocente($obj1); break; } @@ -726,7 +726,7 @@ - $omClass = ActividadPeer::getOMClass(); + $omClass = DocentePeer::getOMClass(); $cls = Propel::import($omClass); @@ -736,7 +736,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj4 = $temp_obj1->getActividad(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { + $temp_obj4 = $temp_obj1->getDocente(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { $newObject = false; $temp_obj4->addRelDivisionActividadDocente($obj1); break; } @@ -749,7 +749,7 @@ - $omClass = RepeticionPeer::getOMClass(); + $omClass = EventoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -759,7 +759,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj5 = $temp_obj1->getRepeticion(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { + $temp_obj5 = $temp_obj1->getEvento(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { $newObject = false; $temp_obj5->addRelDivisionActividadDocente($obj1); break; } @@ -772,7 +772,7 @@ - $omClass = EventoPeer::getOMClass(); + $omClass = RepeticionPeer::getOMClass(); $cls = Propel::import($omClass); @@ -782,7 +782,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj6 = $temp_obj1->getEvento(); if ($temp_obj6->getPrimaryKey() === $obj6->getPrimaryKey()) { + $temp_obj6 = $temp_obj1->getRepeticion(); if ($temp_obj6->getPrimaryKey() === $obj6->getPrimaryKey()) { $newObject = false; $temp_obj6->addRelDivisionActividadDocente($obj1); break; } @@ -816,14 +816,14 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); - $criteria->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); $criteria->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); - $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); - $rs = RelDivisionActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -834,7 +834,7 @@ - public static function doCountJoinAllExceptDocente(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptActividad(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -852,12 +852,12 @@ $criteria->addJoin(RelDivisionActividadDocentePeer::FK_DIVISION_ID, DivisionPeer::ID); - $criteria->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); - $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); - $rs = RelDivisionActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -868,7 +868,7 @@ - public static function doCountJoinAllExceptActividad(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptDocente(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -886,12 +886,12 @@ $criteria->addJoin(RelDivisionActividadDocentePeer::FK_DIVISION_ID, DivisionPeer::ID); - $criteria->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); - $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); - $rs = RelDivisionActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -902,7 +902,7 @@ - public static function doCountJoinAllExceptRepeticion(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptEvento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -920,12 +920,12 @@ $criteria->addJoin(RelDivisionActividadDocentePeer::FK_DIVISION_ID, DivisionPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); - $criteria->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); - $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); - $rs = RelDivisionActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -936,7 +936,7 @@ - public static function doCountJoinAllExceptEvento(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptRepeticion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -954,12 +954,12 @@ $criteria->addJoin(RelDivisionActividadDocentePeer::FK_DIVISION_ID, DivisionPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); - $criteria->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); - $criteria->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); - $rs = RelDivisionActividadDocentePeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -981,27 +981,27 @@ RelDivisionActividadDocentePeer::addSelectColumns($c); $startcol2 = (RelDivisionActividadDocentePeer::NUM_COLUMNS - RelDivisionActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; + ActividadPeer::addSelectColumns($c); + $startcol3 = $startcol2 + ActividadPeer::NUM_COLUMNS; + DocentePeer::addSelectColumns($c); - $startcol3 = $startcol2 + DocentePeer::NUM_COLUMNS; + $startcol4 = $startcol3 + DocentePeer::NUM_COLUMNS; - ActividadPeer::addSelectColumns($c); - $startcol4 = $startcol3 + ActividadPeer::NUM_COLUMNS; + EventoPeer::addSelectColumns($c); + $startcol5 = $startcol4 + EventoPeer::NUM_COLUMNS; RepeticionPeer::addSelectColumns($c); - $startcol5 = $startcol4 + RepeticionPeer::NUM_COLUMNS; + $startcol6 = $startcol5 + RepeticionPeer::NUM_COLUMNS; - EventoPeer::addSelectColumns($c); - $startcol6 = $startcol5 + EventoPeer::NUM_COLUMNS; + $c->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); $c->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); - $c->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); $c->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); - $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -1013,7 +1013,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = DocentePeer::getOMClass(); + $omClass = ActividadPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1023,7 +1023,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getActividad(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelDivisionActividadDocente($obj1); break; @@ -1035,7 +1035,7 @@ $obj2->addRelDivisionActividadDocente($obj1); } - $omClass = ActividadPeer::getOMClass(); + $omClass = DocentePeer::getOMClass(); $cls = Propel::import($omClass); @@ -1045,7 +1045,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getActividad(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getDocente(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addRelDivisionActividadDocente($obj1); break; @@ -1057,7 +1057,7 @@ $obj3->addRelDivisionActividadDocente($obj1); } - $omClass = RepeticionPeer::getOMClass(); + $omClass = EventoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1067,7 +1067,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj4 = $temp_obj1->getRepeticion(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { + $temp_obj4 = $temp_obj1->getEvento(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { $newObject = false; $temp_obj4->addRelDivisionActividadDocente($obj1); break; @@ -1079,7 +1079,7 @@ $obj4->addRelDivisionActividadDocente($obj1); } - $omClass = EventoPeer::getOMClass(); + $omClass = RepeticionPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1089,7 +1089,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj5 = $temp_obj1->getEvento(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { + $temp_obj5 = $temp_obj1->getRepeticion(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { $newObject = false; $temp_obj5->addRelDivisionActividadDocente($obj1); break; @@ -1108,7 +1108,7 @@ - public static function doSelectJoinAllExceptDocente(Criteria $c, $con = null) + public static function doSelectJoinAllExceptActividad(Criteria $c, $con = null) { $c = clone $c; @@ -1122,24 +1122,24 @@ DivisionPeer::addSelectColumns($c); $startcol3 = $startcol2 + DivisionPeer::NUM_COLUMNS; - ActividadPeer::addSelectColumns($c); - $startcol4 = $startcol3 + ActividadPeer::NUM_COLUMNS; + DocentePeer::addSelectColumns($c); + $startcol4 = $startcol3 + DocentePeer::NUM_COLUMNS; + EventoPeer::addSelectColumns($c); + $startcol5 = $startcol4 + EventoPeer::NUM_COLUMNS; + RepeticionPeer::addSelectColumns($c); - $startcol5 = $startcol4 + RepeticionPeer::NUM_COLUMNS; + $startcol6 = $startcol5 + RepeticionPeer::NUM_COLUMNS; - EventoPeer::addSelectColumns($c); - $startcol6 = $startcol5 + EventoPeer::NUM_COLUMNS; - $c->addJoin(RelDivisionActividadDocentePeer::FK_DIVISION_ID, DivisionPeer::ID); - $c->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); - $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -1173,7 +1173,7 @@ $obj2->addRelDivisionActividadDocente($obj1); } - $omClass = ActividadPeer::getOMClass(); + $omClass = DocentePeer::getOMClass(); $cls = Propel::import($omClass); @@ -1183,7 +1183,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getActividad(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getDocente(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addRelDivisionActividadDocente($obj1); break; @@ -1195,7 +1195,7 @@ $obj3->addRelDivisionActividadDocente($obj1); } - $omClass = RepeticionPeer::getOMClass(); + $omClass = EventoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1205,7 +1205,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj4 = $temp_obj1->getRepeticion(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { + $temp_obj4 = $temp_obj1->getEvento(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { $newObject = false; $temp_obj4->addRelDivisionActividadDocente($obj1); break; @@ -1217,7 +1217,7 @@ $obj4->addRelDivisionActividadDocente($obj1); } - $omClass = EventoPeer::getOMClass(); + $omClass = RepeticionPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1227,7 +1227,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj5 = $temp_obj1->getEvento(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { + $temp_obj5 = $temp_obj1->getRepeticion(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { $newObject = false; $temp_obj5->addRelDivisionActividadDocente($obj1); break; @@ -1246,7 +1246,7 @@ - public static function doSelectJoinAllExceptActividad(Criteria $c, $con = null) + public static function doSelectJoinAllExceptDocente(Criteria $c, $con = null) { $c = clone $c; @@ -1260,24 +1260,24 @@ DivisionPeer::addSelectColumns($c); $startcol3 = $startcol2 + DivisionPeer::NUM_COLUMNS; - DocentePeer::addSelectColumns($c); - $startcol4 = $startcol3 + DocentePeer::NUM_COLUMNS; + ActividadPeer::addSelectColumns($c); + $startcol4 = $startcol3 + ActividadPeer::NUM_COLUMNS; + EventoPeer::addSelectColumns($c); + $startcol5 = $startcol4 + EventoPeer::NUM_COLUMNS; + RepeticionPeer::addSelectColumns($c); - $startcol5 = $startcol4 + RepeticionPeer::NUM_COLUMNS; + $startcol6 = $startcol5 + RepeticionPeer::NUM_COLUMNS; - EventoPeer::addSelectColumns($c); - $startcol6 = $startcol5 + EventoPeer::NUM_COLUMNS; - $c->addJoin(RelDivisionActividadDocentePeer::FK_DIVISION_ID, DivisionPeer::ID); - $c->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); - $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -1311,7 +1311,7 @@ $obj2->addRelDivisionActividadDocente($obj1); } - $omClass = DocentePeer::getOMClass(); + $omClass = ActividadPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1321,7 +1321,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getDocente(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getActividad(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addRelDivisionActividadDocente($obj1); break; @@ -1333,7 +1333,7 @@ $obj3->addRelDivisionActividadDocente($obj1); } - $omClass = RepeticionPeer::getOMClass(); + $omClass = EventoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1343,7 +1343,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj4 = $temp_obj1->getRepeticion(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { + $temp_obj4 = $temp_obj1->getEvento(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { $newObject = false; $temp_obj4->addRelDivisionActividadDocente($obj1); break; @@ -1355,7 +1355,7 @@ $obj4->addRelDivisionActividadDocente($obj1); } - $omClass = EventoPeer::getOMClass(); + $omClass = RepeticionPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1365,7 +1365,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj5 = $temp_obj1->getEvento(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { + $temp_obj5 = $temp_obj1->getRepeticion(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { $newObject = false; $temp_obj5->addRelDivisionActividadDocente($obj1); break; @@ -1384,7 +1384,7 @@ - public static function doSelectJoinAllExceptRepeticion(Criteria $c, $con = null) + public static function doSelectJoinAllExceptEvento(Criteria $c, $con = null) { $c = clone $c; @@ -1398,24 +1398,24 @@ DivisionPeer::addSelectColumns($c); $startcol3 = $startcol2 + DivisionPeer::NUM_COLUMNS; + ActividadPeer::addSelectColumns($c); + $startcol4 = $startcol3 + ActividadPeer::NUM_COLUMNS; + DocentePeer::addSelectColumns($c); - $startcol4 = $startcol3 + DocentePeer::NUM_COLUMNS; + $startcol5 = $startcol4 + DocentePeer::NUM_COLUMNS; - ActividadPeer::addSelectColumns($c); - $startcol5 = $startcol4 + ActividadPeer::NUM_COLUMNS; + RepeticionPeer::addSelectColumns($c); + $startcol6 = $startcol5 + RepeticionPeer::NUM_COLUMNS; - EventoPeer::addSelectColumns($c); - $startcol6 = $startcol5 + EventoPeer::NUM_COLUMNS; - $c->addJoin(RelDivisionActividadDocentePeer::FK_DIVISION_ID, DivisionPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); - $c->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); - $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -1449,7 +1449,7 @@ $obj2->addRelDivisionActividadDocente($obj1); } - $omClass = DocentePeer::getOMClass(); + $omClass = ActividadPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1459,7 +1459,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getDocente(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getActividad(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addRelDivisionActividadDocente($obj1); break; @@ -1471,7 +1471,7 @@ $obj3->addRelDivisionActividadDocente($obj1); } - $omClass = ActividadPeer::getOMClass(); + $omClass = DocentePeer::getOMClass(); $cls = Propel::import($omClass); @@ -1481,7 +1481,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj4 = $temp_obj1->getActividad(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { + $temp_obj4 = $temp_obj1->getDocente(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { $newObject = false; $temp_obj4->addRelDivisionActividadDocente($obj1); break; @@ -1493,7 +1493,7 @@ $obj4->addRelDivisionActividadDocente($obj1); } - $omClass = EventoPeer::getOMClass(); + $omClass = RepeticionPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1503,7 +1503,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj5 = $temp_obj1->getEvento(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { + $temp_obj5 = $temp_obj1->getRepeticion(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { $newObject = false; $temp_obj5->addRelDivisionActividadDocente($obj1); break; @@ -1522,7 +1522,7 @@ - public static function doSelectJoinAllExceptEvento(Criteria $c, $con = null) + public static function doSelectJoinAllExceptRepeticion(Criteria $c, $con = null) { $c = clone $c; @@ -1536,24 +1536,24 @@ DivisionPeer::addSelectColumns($c); $startcol3 = $startcol2 + DivisionPeer::NUM_COLUMNS; + ActividadPeer::addSelectColumns($c); + $startcol4 = $startcol3 + ActividadPeer::NUM_COLUMNS; + DocentePeer::addSelectColumns($c); - $startcol4 = $startcol3 + DocentePeer::NUM_COLUMNS; + $startcol5 = $startcol4 + DocentePeer::NUM_COLUMNS; - ActividadPeer::addSelectColumns($c); - $startcol5 = $startcol4 + ActividadPeer::NUM_COLUMNS; + EventoPeer::addSelectColumns($c); + $startcol6 = $startcol5 + EventoPeer::NUM_COLUMNS; - RepeticionPeer::addSelectColumns($c); - $startcol6 = $startcol5 + RepeticionPeer::NUM_COLUMNS; - $c->addJoin(RelDivisionActividadDocentePeer::FK_DIVISION_ID, DivisionPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); - $c->addJoin(RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $c->addJoin(RelDivisionActividadDocentePeer::FK_EVENTO_ID, EventoPeer::ID); - $c->addJoin(RelDivisionActividadDocentePeer::FK_REPETICION_ID, RepeticionPeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -1587,7 +1587,7 @@ $obj2->addRelDivisionActividadDocente($obj1); } - $omClass = DocentePeer::getOMClass(); + $omClass = ActividadPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1597,7 +1597,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getDocente(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getActividad(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addRelDivisionActividadDocente($obj1); break; @@ -1609,7 +1609,7 @@ $obj3->addRelDivisionActividadDocente($obj1); } - $omClass = ActividadPeer::getOMClass(); + $omClass = DocentePeer::getOMClass(); $cls = Propel::import($omClass); @@ -1619,7 +1619,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj4 = $temp_obj1->getActividad(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { + $temp_obj4 = $temp_obj1->getDocente(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { $newObject = false; $temp_obj4->addRelDivisionActividadDocente($obj1); break; @@ -1631,7 +1631,7 @@ $obj4->addRelDivisionActividadDocente($obj1); } - $omClass = RepeticionPeer::getOMClass(); + $omClass = EventoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1641,7 +1641,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj5 = $temp_obj1->getRepeticion(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { + $temp_obj5 = $temp_obj1->getEvento(); if ($temp_obj5->getPrimaryKey() === $obj5->getPrimaryKey()) { $newObject = false; $temp_obj5->addRelDivisionActividadDocente($obj1); break; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelDocenteEstablecimiento.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelDocenteEstablecimiento.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelDocenteEstablecimiento.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -15,13 +15,17 @@ protected $fk_docente_id = 0; + - protected $aDocente; + protected $id; protected $aEstablecimiento; + protected $aDocente; + + protected $alreadyInSave = false; @@ -42,6 +46,13 @@ } + public function getId() + { + + return $this->id; + } + + public function setFkEstablecimientoId($v) { @@ -78,6 +89,20 @@ } + public function setId($v) + { + + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->id !== $v) { + $this->id = $v; + $this->modifiedColumns[] = RelDocenteEstablecimientoPeer::ID; + } + + } + public function hydrate(ResultSet $rs, $startcol = 1) { try { @@ -86,11 +111,13 @@ $this->fk_docente_id = $rs->getInt($startcol + 1); + $this->id = $rs->getInt($startcol + 2); + $this->resetModified(); $this->setNew(false); - return $startcol + 2; + return $startcol + 3; } catch (Exception $e) { throw new PropelException("Error populating RelDocenteEstablecimiento object", $e); } @@ -148,6 +175,13 @@ + if ($this->aEstablecimiento !== null) { + if ($this->aEstablecimiento->isModified()) { + $affectedRows += $this->aEstablecimiento->save($con); + } + $this->setEstablecimiento($this->aEstablecimiento); + } + if ($this->aDocente !== null) { if ($this->aDocente->isModified()) { $affectedRows += $this->aDocente->save($con); @@ -155,18 +189,12 @@ $this->setDocente($this->aDocente); } - if ($this->aEstablecimiento !== null) { - if ($this->aEstablecimiento->isModified()) { - $affectedRows += $this->aEstablecimiento->save($con); - } - $this->setEstablecimiento($this->aEstablecimiento); - } - if ($this->isModified()) { if ($this->isNew()) { $pk = RelDocenteEstablecimientoPeer::doInsert($this, $con); $affectedRows += 1; + $this->setId($pk); $this->setNew(false); } else { $affectedRows += RelDocenteEstablecimientoPeer::doUpdate($this, $con); @@ -210,19 +238,19 @@ + if ($this->aEstablecimiento !== null) { + if (!$this->aEstablecimiento->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aEstablecimiento->getValidationFailures()); + } + } + if ($this->aDocente !== null) { if (!$this->aDocente->validate($columns)) { $failureMap = array_merge($failureMap, $this->aDocente->getValidationFailures()); } } - if ($this->aEstablecimiento !== null) { - if (!$this->aEstablecimiento->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aEstablecimiento->getValidationFailures()); - } - } - if (($retval = RelDocenteEstablecimientoPeer::doValidate($this, $columns)) !== true) { $failureMap = array_merge($failureMap, $retval); } @@ -252,6 +280,9 @@ case 1: return $this->getFkDocenteId(); break; + case 2: + return $this->getId(); + break; default: return null; break; @@ -264,6 +295,7 @@ $result = array( $keys[0] => $this->getFkEstablecimientoId(), $keys[1] => $this->getFkDocenteId(), + $keys[2] => $this->getId(), ); return $result; } @@ -285,6 +317,9 @@ case 1: $this->setFkDocenteId($value); break; + case 2: + $this->setId($value); + break; } } @@ -294,6 +329,7 @@ if (array_key_exists($keys[0], $arr)) $this->setFkEstablecimientoId($arr[$keys[0]]); if (array_key_exists($keys[1], $arr)) $this->setFkDocenteId($arr[$keys[1]]); + if (array_key_exists($keys[2], $arr)) $this->setId($arr[$keys[2]]); } @@ -303,6 +339,7 @@ if ($this->isColumnModified(RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID)) $criteria->add(RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID, $this->fk_establecimiento_id); if ($this->isColumnModified(RelDocenteEstablecimientoPeer::FK_DOCENTE_ID)) $criteria->add(RelDocenteEstablecimientoPeer::FK_DOCENTE_ID, $this->fk_docente_id); + if ($this->isColumnModified(RelDocenteEstablecimientoPeer::ID)) $criteria->add(RelDocenteEstablecimientoPeer::ID, $this->id); return $criteria; } @@ -312,6 +349,7 @@ { $criteria = new Criteria(RelDocenteEstablecimientoPeer::DATABASE_NAME); + $criteria->add(RelDocenteEstablecimientoPeer::ID, $this->id); return $criteria; } @@ -319,13 +357,14 @@ public function getPrimaryKey() { - return null; + return $this->getId(); } - public function setPrimaryKey($pk) - { - } + public function setPrimaryKey($key) + { + $this->setId($key); + } public function copyInto($copyObj, $deepCopy = false) @@ -338,6 +377,7 @@ $copyObj->setNew(true); + $copyObj->setId(NULL); } @@ -359,63 +399,63 @@ } - public function setDocente($v) + public function setEstablecimiento($v) { if ($v === null) { - $this->setFkDocenteId('0'); + $this->setFkEstablecimientoId('0'); } else { - $this->setFkDocenteId($v->getId()); + $this->setFkEstablecimientoId($v->getId()); } - $this->aDocente = $v; + $this->aEstablecimiento = $v; } - public function getDocente($con = null) + public function getEstablecimiento($con = null) { - include_once 'lib/model/om/BaseDocentePeer.php'; + include_once 'lib/model/om/BaseEstablecimientoPeer.php'; - if ($this->aDocente === null && ($this->fk_docente_id !== null)) { + if ($this->aEstablecimiento === null && ($this->fk_establecimiento_id !== null)) { - $this->aDocente = DocentePeer::retrieveByPK($this->fk_docente_id, $con); + $this->aEstablecimiento = EstablecimientoPeer::retrieveByPK($this->fk_establecimiento_id, $con); } - return $this->aDocente; + return $this->aEstablecimiento; } - public function setEstablecimiento($v) + public function setDocente($v) { if ($v === null) { - $this->setFkEstablecimientoId('0'); + $this->setFkDocenteId('0'); } else { - $this->setFkEstablecimientoId($v->getId()); + $this->setFkDocenteId($v->getId()); } - $this->aEstablecimiento = $v; + $this->aDocente = $v; } - public function getEstablecimiento($con = null) + public function getDocente($con = null) { - include_once 'lib/model/om/BaseEstablecimientoPeer.php'; + include_once 'lib/model/om/BaseDocentePeer.php'; - if ($this->aEstablecimiento === null && ($this->fk_establecimiento_id !== null)) { + if ($this->aDocente === null && ($this->fk_docente_id !== null)) { - $this->aEstablecimiento = EstablecimientoPeer::retrieveByPK($this->fk_establecimiento_id, $con); + $this->aDocente = DocentePeer::retrieveByPK($this->fk_docente_id, $con); } - return $this->aEstablecimiento; + return $this->aDocente; } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelDocenteEstablecimientoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelDocenteEstablecimientoPeer.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelDocenteEstablecimientoPeer.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,7 +13,7 @@ const CLASS_DEFAULT = 'lib.model.RelDocenteEstablecimiento'; - const NUM_COLUMNS = 2; + const NUM_COLUMNS = 3; const NUM_LAZY_LOAD_COLUMNS = 0; @@ -26,23 +26,26 @@ const FK_DOCENTE_ID = 'rel_docente_establecimiento.FK_DOCENTE_ID'; + const ID = 'rel_docente_establecimiento.ID'; + + private static $phpNameMap = null; private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('FkEstablecimientoId', 'FkDocenteId', ), - BasePeer::TYPE_COLNAME => array (RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID, RelDocenteEstablecimientoPeer::FK_DOCENTE_ID, ), - BasePeer::TYPE_FIELDNAME => array ('fk_establecimiento_id', 'fk_docente_id', ), - BasePeer::TYPE_NUM => array (0, 1, ) + BasePeer::TYPE_PHPNAME => array ('FkEstablecimientoId', 'FkDocenteId', 'Id', ), + BasePeer::TYPE_COLNAME => array (RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID, RelDocenteEstablecimientoPeer::FK_DOCENTE_ID, RelDocenteEstablecimientoPeer::ID, ), + BasePeer::TYPE_FIELDNAME => array ('fk_establecimiento_id', 'fk_docente_id', 'id', ), + BasePeer::TYPE_NUM => array (0, 1, 2, ) ); private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('FkEstablecimientoId' => 0, 'FkDocenteId' => 1, ), - BasePeer::TYPE_COLNAME => array (RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID => 0, RelDocenteEstablecimientoPeer::FK_DOCENTE_ID => 1, ), - BasePeer::TYPE_FIELDNAME => array ('fk_establecimiento_id' => 0, 'fk_docente_id' => 1, ), - BasePeer::TYPE_NUM => array (0, 1, ) + BasePeer::TYPE_PHPNAME => array ('FkEstablecimientoId' => 0, 'FkDocenteId' => 1, 'Id' => 2, ), + BasePeer::TYPE_COLNAME => array (RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID => 0, RelDocenteEstablecimientoPeer::FK_DOCENTE_ID => 1, RelDocenteEstablecimientoPeer::ID => 2, ), + BasePeer::TYPE_FIELDNAME => array ('fk_establecimiento_id' => 0, 'fk_docente_id' => 1, 'id' => 2, ), + BasePeer::TYPE_NUM => array (0, 1, 2, ) ); @@ -100,10 +103,12 @@ $criteria->addSelectColumn(RelDocenteEstablecimientoPeer::FK_DOCENTE_ID); + $criteria->addSelectColumn(RelDocenteEstablecimientoPeer::ID); + } - const COUNT = 'COUNT(*)'; - const COUNT_DISTINCT = 'COUNT(DISTINCT *)'; + const COUNT = 'COUNT(rel_docente_establecimiento.ID)'; + const COUNT_DISTINCT = 'COUNT(DISTINCT rel_docente_establecimiento.ID)'; public static function doCount(Criteria $criteria, $distinct = false, $con = null) @@ -179,7 +184,7 @@ } - public static function doCountJoinDocente(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -195,7 +200,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelDocenteEstablecimientoPeer::FK_DOCENTE_ID, DocentePeer::ID); + $criteria->addJoin(RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); $rs = RelDocenteEstablecimientoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -207,7 +212,7 @@ - public static function doCountJoinEstablecimiento(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinDocente(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -223,7 +228,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); + $criteria->addJoin(RelDocenteEstablecimientoPeer::FK_DOCENTE_ID, DocentePeer::ID); $rs = RelDocenteEstablecimientoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -235,7 +240,7 @@ - public static function doSelectJoinDocente(Criteria $c, $con = null) + public static function doSelectJoinEstablecimiento(Criteria $c, $con = null) { $c = clone $c; @@ -245,9 +250,9 @@ RelDocenteEstablecimientoPeer::addSelectColumns($c); $startcol = (RelDocenteEstablecimientoPeer::NUM_COLUMNS - RelDocenteEstablecimientoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - DocentePeer::addSelectColumns($c); + EstablecimientoPeer::addSelectColumns($c); - $c->addJoin(RelDocenteEstablecimientoPeer::FK_DOCENTE_ID, DocentePeer::ID); + $c->addJoin(RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -259,7 +264,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = DocentePeer::getOMClass(); + $omClass = EstablecimientoPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -267,7 +272,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getEstablecimiento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelDocenteEstablecimiento($obj1); break; } @@ -282,7 +287,7 @@ - public static function doSelectJoinEstablecimiento(Criteria $c, $con = null) + public static function doSelectJoinDocente(Criteria $c, $con = null) { $c = clone $c; @@ -292,9 +297,9 @@ RelDocenteEstablecimientoPeer::addSelectColumns($c); $startcol = (RelDocenteEstablecimientoPeer::NUM_COLUMNS - RelDocenteEstablecimientoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - EstablecimientoPeer::addSelectColumns($c); + DocentePeer::addSelectColumns($c); - $c->addJoin(RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); + $c->addJoin(RelDocenteEstablecimientoPeer::FK_DOCENTE_ID, DocentePeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -306,7 +311,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = EstablecimientoPeer::getOMClass(); + $omClass = DocentePeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -314,7 +319,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getEstablecimiento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelDocenteEstablecimiento($obj1); break; } @@ -345,10 +350,10 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); + $criteria->addJoin(RelDocenteEstablecimientoPeer::FK_DOCENTE_ID, DocentePeer::ID); - $criteria->addJoin(RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); - $rs = RelDocenteEstablecimientoPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -370,16 +375,16 @@ RelDocenteEstablecimientoPeer::addSelectColumns($c); $startcol2 = (RelDocenteEstablecimientoPeer::NUM_COLUMNS - RelDocenteEstablecimientoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + EstablecimientoPeer::addSelectColumns($c); + $startcol3 = $startcol2 + EstablecimientoPeer::NUM_COLUMNS; + DocentePeer::addSelectColumns($c); - $startcol3 = $startcol2 + DocentePeer::NUM_COLUMNS; + $startcol4 = $startcol3 + DocentePeer::NUM_COLUMNS; - EstablecimientoPeer::addSelectColumns($c); - $startcol4 = $startcol3 + EstablecimientoPeer::NUM_COLUMNS; + $c->addJoin(RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); $c->addJoin(RelDocenteEstablecimientoPeer::FK_DOCENTE_ID, DocentePeer::ID); - $c->addJoin(RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); - $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -394,7 +399,7 @@ - $omClass = DocentePeer::getOMClass(); + $omClass = EstablecimientoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -404,7 +409,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getEstablecimiento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelDocenteEstablecimiento($obj1); break; } @@ -417,7 +422,7 @@ - $omClass = EstablecimientoPeer::getOMClass(); + $omClass = DocentePeer::getOMClass(); $cls = Propel::import($omClass); @@ -427,7 +432,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getEstablecimiento(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getDocente(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addRelDocenteEstablecimiento($obj1); break; } @@ -445,7 +450,7 @@ - public static function doCountJoinAllExceptDocente(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -461,7 +466,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); + $criteria->addJoin(RelDocenteEstablecimientoPeer::FK_DOCENTE_ID, DocentePeer::ID); $rs = RelDocenteEstablecimientoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -473,7 +478,7 @@ - public static function doCountJoinAllExceptEstablecimiento(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptDocente(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -489,7 +494,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(RelDocenteEstablecimientoPeer::FK_DOCENTE_ID, DocentePeer::ID); + $criteria->addJoin(RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); $rs = RelDocenteEstablecimientoPeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -501,7 +506,7 @@ - public static function doSelectJoinAllExceptDocente(Criteria $c, $con = null) + public static function doSelectJoinAllExceptEstablecimiento(Criteria $c, $con = null) { $c = clone $c; @@ -512,10 +517,10 @@ RelDocenteEstablecimientoPeer::addSelectColumns($c); $startcol2 = (RelDocenteEstablecimientoPeer::NUM_COLUMNS - RelDocenteEstablecimientoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - EstablecimientoPeer::addSelectColumns($c); - $startcol3 = $startcol2 + EstablecimientoPeer::NUM_COLUMNS; + DocentePeer::addSelectColumns($c); + $startcol3 = $startcol2 + DocentePeer::NUM_COLUMNS; - $c->addJoin(RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); + $c->addJoin(RelDocenteEstablecimientoPeer::FK_DOCENTE_ID, DocentePeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -529,7 +534,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = EstablecimientoPeer::getOMClass(); + $omClass = DocentePeer::getOMClass(); $cls = Propel::import($omClass); @@ -539,7 +544,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getEstablecimiento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelDocenteEstablecimiento($obj1); break; @@ -558,7 +563,7 @@ - public static function doSelectJoinAllExceptEstablecimiento(Criteria $c, $con = null) + public static function doSelectJoinAllExceptDocente(Criteria $c, $con = null) { $c = clone $c; @@ -569,10 +574,10 @@ RelDocenteEstablecimientoPeer::addSelectColumns($c); $startcol2 = (RelDocenteEstablecimientoPeer::NUM_COLUMNS - RelDocenteEstablecimientoPeer::NUM_LAZY_LOAD_COLUMNS) + 1; - DocentePeer::addSelectColumns($c); - $startcol3 = $startcol2 + DocentePeer::NUM_COLUMNS; + EstablecimientoPeer::addSelectColumns($c); + $startcol3 = $startcol2 + EstablecimientoPeer::NUM_COLUMNS; - $c->addJoin(RelDocenteEstablecimientoPeer::FK_DOCENTE_ID, DocentePeer::ID); + $c->addJoin(RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -586,7 +591,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = DocentePeer::getOMClass(); + $omClass = EstablecimientoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -596,7 +601,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getEstablecimiento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addRelDocenteEstablecimiento($obj1); break; @@ -636,6 +641,7 @@ $criteria = clone $values; } else { $criteria = $values->buildCriteria(); } + $criteria->remove(RelDocenteEstablecimientoPeer::ID); $criteria->setDbName(self::DATABASE_NAME); @@ -662,6 +668,9 @@ if ($values instanceof Criteria) { $criteria = clone $values; + $comparison = $criteria->getComparison(RelDocenteEstablecimientoPeer::ID); + $selectCriteria->add(RelDocenteEstablecimientoPeer::ID, $criteria->remove(RelDocenteEstablecimientoPeer::ID), $comparison); + } else { $criteria = $values->buildCriteria(); $selectCriteria = $values->buildPkeyCriteria(); } $criteria->setDbName(self::DATABASE_NAME); @@ -696,19 +705,10 @@ if ($values instanceof Criteria) { $criteria = clone $values; } elseif ($values instanceof RelDocenteEstablecimiento) { - $criteria = $values->buildCriteria(); + $criteria = $values->buildPkeyCriteria(); } else { $criteria = new Criteria(self::DATABASE_NAME); - if(count($values) == count($values, COUNT_RECURSIVE)) - { - $values = array($values); - } - $vals = array(); - foreach($values as $value) - { - - } - + $criteria->add(RelDocenteEstablecimientoPeer::ID, (array) $values, Criteria::IN); } $criteria->setDbName(self::DATABASE_NAME); @@ -761,6 +761,41 @@ return $res; } + + public static function retrieveByPK($pk, $con = null) + { + if ($con === null) { + $con = Propel::getConnection(self::DATABASE_NAME); + } + + $criteria = new Criteria(RelDocenteEstablecimientoPeer::DATABASE_NAME); + + $criteria->add(RelDocenteEstablecimientoPeer::ID, $pk); + + + $v = RelDocenteEstablecimientoPeer::doSelect($criteria, $con); + + return !empty($v) > 0 ? $v[0] : null; + } + + + public static function retrieveByPKs($pks, $con = null) + { + if ($con === null) { + $con = Propel::getConnection(self::DATABASE_NAME); + } + + $objs = null; + if (empty($pks)) { + $objs = array(); + } else { + $criteria = new Criteria(); + $criteria->add(RelDocenteEstablecimientoPeer::ID, $pks, Criteria::IN); + $objs = RelDocenteEstablecimientoPeer::doSelect($criteria, $con); + } + return $objs; + } + } if (Propel::isInit()) { try { Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelRolresponsableResponsable.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelRolresponsableResponsable.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelRolresponsableResponsable.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -25,7 +25,7 @@ - protected $descripcion = ''; + protected $descripcion = 'null'; protected $aRolResponsable; @@ -153,7 +153,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === '') { + if ($this->descripcion !== $v || $v === 'null') { $this->descripcion = $v; $this->modifiedColumns[] = RelRolresponsableResponsablePeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRepeticion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRepeticion.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRepeticion.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,7 +13,7 @@ - protected $descripcion = ''; + protected $descripcion = 'null'; @@ -74,7 +74,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === '') { + if ($this->descripcion !== $v || $v === 'null') { $this->descripcion = $v; $this->modifiedColumns[] = RepeticionPeer::DESCRIPCION; } @@ -492,7 +492,7 @@ - public function getRelDivisionActividadDocentesJoinDocente($criteria = null, $con = null) + public function getRelDivisionActividadDocentesJoinActividad($criteria = null, $con = null) { include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; if ($criteria === null) { @@ -510,14 +510,14 @@ $criteria->add(RelDivisionActividadDocentePeer::FK_REPETICION_ID, $this->getId()); - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinDocente($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinActividad($criteria, $con); } } else { $criteria->add(RelDivisionActividadDocentePeer::FK_REPETICION_ID, $this->getId()); if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinDocente($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinActividad($criteria, $con); } } $this->lastRelDivisionActividadDocenteCriteria = $criteria; @@ -527,7 +527,7 @@ - public function getRelDivisionActividadDocentesJoinActividad($criteria = null, $con = null) + public function getRelDivisionActividadDocentesJoinDocente($criteria = null, $con = null) { include_once 'lib/model/om/BaseRelDivisionActividadDocentePeer.php'; if ($criteria === null) { @@ -545,14 +545,14 @@ $criteria->add(RelDivisionActividadDocentePeer::FK_REPETICION_ID, $this->getId()); - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinActividad($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinDocente($criteria, $con); } } else { $criteria->add(RelDivisionActividadDocentePeer::FK_REPETICION_ID, $this->getId()); if (!isset($this->lastRelDivisionActividadDocenteCriteria) || !$this->lastRelDivisionActividadDocenteCriteria->equals($criteria)) { - $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinActividad($criteria, $con); + $this->collRelDivisionActividadDocentes = RelDivisionActividadDocentePeer::doSelectJoinDocente($criteria, $con); } } $this->lastRelDivisionActividadDocenteCriteria = $criteria; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseResponsable.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseResponsable.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseResponsable.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,23 +13,23 @@ - protected $nombre = ''; + protected $nombre = 'null'; - protected $apellido = ''; + protected $apellido = 'null'; - protected $direccion = ''; + protected $direccion = 'null'; - protected $ciudad = ''; + protected $ciudad = 'null'; - protected $codigo_postal = ''; + protected $codigo_postal = 'null'; @@ -37,15 +37,15 @@ - protected $telefono = ''; + protected $telefono = 'null'; - protected $telefono_movil = ''; + protected $telefono_movil = 'null'; - protected $nro_documento = ''; + protected $nro_documento = 'null'; @@ -53,19 +53,19 @@ - protected $sexo = ''; + protected $sexo = 'null'; - protected $email = ''; + protected $email = 'null'; - protected $observacion = ''; + protected $observacion = 'null'; - protected $autorizacion_retiro = true; + protected $autorizacion_retiro = false; @@ -76,15 +76,15 @@ protected $fk_rolresponsable_id = 1; - protected $aCuenta; - - protected $aProvincia; protected $aTipodocumento; + protected $aCuenta; + + protected $aRolResponsable; @@ -240,7 +240,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = ResponsablePeer::NOMBRE; } @@ -254,7 +254,7 @@ $v = (string) $v; } - if ($this->apellido !== $v || $v === '') { + if ($this->apellido !== $v || $v === 'null') { $this->apellido = $v; $this->modifiedColumns[] = ResponsablePeer::APELLIDO; } @@ -268,7 +268,7 @@ $v = (string) $v; } - if ($this->direccion !== $v || $v === '') { + if ($this->direccion !== $v || $v === 'null') { $this->direccion = $v; $this->modifiedColumns[] = ResponsablePeer::DIRECCION; } @@ -282,7 +282,7 @@ $v = (string) $v; } - if ($this->ciudad !== $v || $v === '') { + if ($this->ciudad !== $v || $v === 'null') { $this->ciudad = $v; $this->modifiedColumns[] = ResponsablePeer::CIUDAD; } @@ -296,7 +296,7 @@ $v = (string) $v; } - if ($this->codigo_postal !== $v || $v === '') { + if ($this->codigo_postal !== $v || $v === 'null') { $this->codigo_postal = $v; $this->modifiedColumns[] = ResponsablePeer::CODIGO_POSTAL; } @@ -328,7 +328,7 @@ $v = (string) $v; } - if ($this->telefono !== $v || $v === '') { + if ($this->telefono !== $v || $v === 'null') { $this->telefono = $v; $this->modifiedColumns[] = ResponsablePeer::TELEFONO; } @@ -342,7 +342,7 @@ $v = (string) $v; } - if ($this->telefono_movil !== $v || $v === '') { + if ($this->telefono_movil !== $v || $v === 'null') { $this->telefono_movil = $v; $this->modifiedColumns[] = ResponsablePeer::TELEFONO_MOVIL; } @@ -356,7 +356,7 @@ $v = (string) $v; } - if ($this->nro_documento !== $v || $v === '') { + if ($this->nro_documento !== $v || $v === 'null') { $this->nro_documento = $v; $this->modifiedColumns[] = ResponsablePeer::NRO_DOCUMENTO; } @@ -388,7 +388,7 @@ $v = (string) $v; } - if ($this->sexo !== $v || $v === '') { + if ($this->sexo !== $v || $v === 'null') { $this->sexo = $v; $this->modifiedColumns[] = ResponsablePeer::SEXO; } @@ -402,7 +402,7 @@ $v = (string) $v; } - if ($this->email !== $v || $v === '') { + if ($this->email !== $v || $v === 'null') { $this->email = $v; $this->modifiedColumns[] = ResponsablePeer::EMAIL; } @@ -416,7 +416,7 @@ $v = (string) $v; } - if ($this->observacion !== $v || $v === '') { + if ($this->observacion !== $v || $v === 'null') { $this->observacion = $v; $this->modifiedColumns[] = ResponsablePeer::OBSERVACION; } @@ -426,7 +426,7 @@ public function setAutorizacionRetiro($v) { - if ($this->autorizacion_retiro !== $v || $v === true) { + if ($this->autorizacion_retiro !== $v || $v === false) { $this->autorizacion_retiro = $v; $this->modifiedColumns[] = ResponsablePeer::AUTORIZACION_RETIRO; } @@ -569,13 +569,6 @@ - if ($this->aCuenta !== null) { - if ($this->aCuenta->isModified()) { - $affectedRows += $this->aCuenta->save($con); - } - $this->setCuenta($this->aCuenta); - } - if ($this->aProvincia !== null) { if ($this->aProvincia->isModified()) { $affectedRows += $this->aProvincia->save($con); @@ -590,6 +583,13 @@ $this->setTipodocumento($this->aTipodocumento); } + if ($this->aCuenta !== null) { + if ($this->aCuenta->isModified()) { + $affectedRows += $this->aCuenta->save($con); + } + $this->setCuenta($this->aCuenta); + } + if ($this->aRolResponsable !== null) { if ($this->aRolResponsable->isModified()) { $affectedRows += $this->aRolResponsable->save($con); @@ -654,12 +654,6 @@ - if ($this->aCuenta !== null) { - if (!$this->aCuenta->validate($columns)) { - $failureMap = array_merge($failureMap, $this->aCuenta->getValidationFailures()); - } - } - if ($this->aProvincia !== null) { if (!$this->aProvincia->validate($columns)) { $failureMap = array_merge($failureMap, $this->aProvincia->getValidationFailures()); @@ -672,6 +666,12 @@ } } + if ($this->aCuenta !== null) { + if (!$this->aCuenta->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aCuenta->getValidationFailures()); + } + } + if ($this->aRolResponsable !== null) { if (!$this->aRolResponsable->validate($columns)) { $failureMap = array_merge($failureMap, $this->aRolResponsable->getValidationFailures()); @@ -998,93 +998,93 @@ } - public function setCuenta($v) + public function setProvincia($v) { if ($v === null) { - $this->setFkCuentaId('0'); + $this->setFkProvinciaId('0'); } else { - $this->setFkCuentaId($v->getId()); + $this->setFkProvinciaId($v->getId()); } - $this->aCuenta = $v; + $this->aProvincia = $v; } - public function getCuenta($con = null) + public function getProvincia($con = null) { - include_once 'lib/model/om/BaseCuentaPeer.php'; + include_once 'lib/model/om/BaseProvinciaPeer.php'; - if ($this->aCuenta === null && ($this->fk_cuenta_id !== null)) { + if ($this->aProvincia === null && ($this->fk_provincia_id !== null)) { - $this->aCuenta = CuentaPeer::retrieveByPK($this->fk_cuenta_id, $con); + $this->aProvincia = ProvinciaPeer::retrieveByPK($this->fk_provincia_id, $con); } - return $this->aCuenta; + return $this->aProvincia; } - public function setProvincia($v) + public function setTipodocumento($v) { if ($v === null) { - $this->setFkProvinciaId('0'); + $this->setFkTipodocumentoId('0'); } else { - $this->setFkProvinciaId($v->getId()); + $this->setFkTipodocumentoId($v->getId()); } - $this->aProvincia = $v; + $this->aTipodocumento = $v; } - public function getProvincia($con = null) + public function getTipodocumento($con = null) { - include_once 'lib/model/om/BaseProvinciaPeer.php'; + include_once 'lib/model/om/BaseTipodocumentoPeer.php'; - if ($this->aProvincia === null && ($this->fk_provincia_id !== null)) { + if ($this->aTipodocumento === null && ($this->fk_tipodocumento_id !== null)) { - $this->aProvincia = ProvinciaPeer::retrieveByPK($this->fk_provincia_id, $con); + $this->aTipodocumento = TipodocumentoPeer::retrieveByPK($this->fk_tipodocumento_id, $con); } - return $this->aProvincia; + return $this->aTipodocumento; } - public function setTipodocumento($v) + public function setCuenta($v) { if ($v === null) { - $this->setFkTipodocumentoId('0'); + $this->setFkCuentaId('0'); } else { - $this->setFkTipodocumentoId($v->getId()); + $this->setFkCuentaId($v->getId()); } - $this->aTipodocumento = $v; + $this->aCuenta = $v; } - public function getTipodocumento($con = null) + public function getCuenta($con = null) { - include_once 'lib/model/om/BaseTipodocumentoPeer.php'; + include_once 'lib/model/om/BaseCuentaPeer.php'; - if ($this->aTipodocumento === null && ($this->fk_tipodocumento_id !== null)) { + if ($this->aCuenta === null && ($this->fk_cuenta_id !== null)) { - $this->aTipodocumento = TipodocumentoPeer::retrieveByPK($this->fk_tipodocumento_id, $con); + $this->aCuenta = CuentaPeer::retrieveByPK($this->fk_cuenta_id, $con); } - return $this->aTipodocumento; + return $this->aCuenta; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseResponsablePeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseResponsablePeer.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseResponsablePeer.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -254,7 +254,7 @@ } - public static function doCountJoinCuenta(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -270,7 +270,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); + $criteria->addJoin(ResponsablePeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $rs = ResponsablePeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -282,7 +282,7 @@ - public static function doCountJoinProvincia(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinTipodocumento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -298,7 +298,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(ResponsablePeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(ResponsablePeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); $rs = ResponsablePeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -310,7 +310,7 @@ - public static function doCountJoinTipodocumento(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinCuenta(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -326,7 +326,7 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(ResponsablePeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); + $criteria->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); $rs = ResponsablePeer::doSelectRS($criteria, $con); if ($rs->next()) { @@ -366,7 +366,7 @@ - public static function doSelectJoinCuenta(Criteria $c, $con = null) + public static function doSelectJoinProvincia(Criteria $c, $con = null) { $c = clone $c; @@ -376,9 +376,9 @@ ResponsablePeer::addSelectColumns($c); $startcol = (ResponsablePeer::NUM_COLUMNS - ResponsablePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - CuentaPeer::addSelectColumns($c); + ProvinciaPeer::addSelectColumns($c); - $c->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); + $c->addJoin(ResponsablePeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -390,7 +390,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = CuentaPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -398,7 +398,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getCuenta(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addResponsable($obj1); break; } @@ -413,7 +413,7 @@ - public static function doSelectJoinProvincia(Criteria $c, $con = null) + public static function doSelectJoinTipodocumento(Criteria $c, $con = null) { $c = clone $c; @@ -423,9 +423,9 @@ ResponsablePeer::addSelectColumns($c); $startcol = (ResponsablePeer::NUM_COLUMNS - ResponsablePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - ProvinciaPeer::addSelectColumns($c); + TipodocumentoPeer::addSelectColumns($c); - $c->addJoin(ResponsablePeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(ResponsablePeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -437,7 +437,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = ProvinciaPeer::getOMClass(); + $omClass = TipodocumentoPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -445,7 +445,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getTipodocumento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addResponsable($obj1); break; } @@ -460,7 +460,7 @@ - public static function doSelectJoinTipodocumento(Criteria $c, $con = null) + public static function doSelectJoinCuenta(Criteria $c, $con = null) { $c = clone $c; @@ -470,9 +470,9 @@ ResponsablePeer::addSelectColumns($c); $startcol = (ResponsablePeer::NUM_COLUMNS - ResponsablePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - TipodocumentoPeer::addSelectColumns($c); + CuentaPeer::addSelectColumns($c); - $c->addJoin(ResponsablePeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); + $c->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -484,7 +484,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = TipodocumentoPeer::getOMClass(); + $omClass = CuentaPeer::getOMClass(); $cls = Propel::import($omClass); $obj2 = new $cls(); @@ -492,7 +492,7 @@ $newObject = true; foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getTipodocumento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getCuenta(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addResponsable($obj1); break; } @@ -570,12 +570,12 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); - $criteria->addJoin(ResponsablePeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $criteria->addJoin(ResponsablePeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); + $criteria->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); + $criteria->addJoin(ResponsablePeer::FK_ROLRESPONSABLE_ID, RolResponsablePeer::ID); $rs = ResponsablePeer::doSelectRS($criteria, $con); @@ -599,24 +599,24 @@ ResponsablePeer::addSelectColumns($c); $startcol2 = (ResponsablePeer::NUM_COLUMNS - ResponsablePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - CuentaPeer::addSelectColumns($c); - $startcol3 = $startcol2 + CuentaPeer::NUM_COLUMNS; - ProvinciaPeer::addSelectColumns($c); - $startcol4 = $startcol3 + ProvinciaPeer::NUM_COLUMNS; + $startcol3 = $startcol2 + ProvinciaPeer::NUM_COLUMNS; TipodocumentoPeer::addSelectColumns($c); - $startcol5 = $startcol4 + TipodocumentoPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + TipodocumentoPeer::NUM_COLUMNS; + CuentaPeer::addSelectColumns($c); + $startcol5 = $startcol4 + CuentaPeer::NUM_COLUMNS; + RolResponsablePeer::addSelectColumns($c); $startcol6 = $startcol5 + RolResponsablePeer::NUM_COLUMNS; - $c->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); - $c->addJoin(ResponsablePeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $c->addJoin(ResponsablePeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); + $c->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); + $c->addJoin(ResponsablePeer::FK_ROLRESPONSABLE_ID, RolResponsablePeer::ID); $rs = BasePeer::doSelect($c, $con); @@ -633,7 +633,7 @@ - $omClass = CuentaPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -643,7 +643,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getCuenta(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addResponsable($obj1); break; } @@ -656,7 +656,7 @@ - $omClass = ProvinciaPeer::getOMClass(); + $omClass = TipodocumentoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -666,7 +666,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getProvincia(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getTipodocumento(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addResponsable($obj1); break; } @@ -679,7 +679,7 @@ - $omClass = TipodocumentoPeer::getOMClass(); + $omClass = CuentaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -689,7 +689,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj4 = $temp_obj1->getTipodocumento(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { + $temp_obj4 = $temp_obj1->getCuenta(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { $newObject = false; $temp_obj4->addResponsable($obj1); break; } @@ -730,7 +730,7 @@ - public static function doCountJoinAllExceptCuenta(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -746,10 +746,10 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(ResponsablePeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); - $criteria->addJoin(ResponsablePeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); + $criteria->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); + $criteria->addJoin(ResponsablePeer::FK_ROLRESPONSABLE_ID, RolResponsablePeer::ID); $rs = ResponsablePeer::doSelectRS($criteria, $con); @@ -762,7 +762,7 @@ - public static function doCountJoinAllExceptProvincia(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptTipodocumento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -778,10 +778,10 @@ $criteria->addSelectColumn($column); } + $criteria->addJoin(ResponsablePeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); - $criteria->addJoin(ResponsablePeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); - $criteria->addJoin(ResponsablePeer::FK_ROLRESPONSABLE_ID, RolResponsablePeer::ID); $rs = ResponsablePeer::doSelectRS($criteria, $con); @@ -794,7 +794,7 @@ - public static function doCountJoinAllExceptTipodocumento(Criteria $criteria, $distinct = false, $con = null) + public static function doCountJoinAllExceptCuenta(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -810,10 +810,10 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); - $criteria->addJoin(ResponsablePeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $criteria->addJoin(ResponsablePeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); + $criteria->addJoin(ResponsablePeer::FK_ROLRESPONSABLE_ID, RolResponsablePeer::ID); $rs = ResponsablePeer::doSelectRS($criteria, $con); @@ -842,12 +842,12 @@ $criteria->addSelectColumn($column); } - $criteria->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); - $criteria->addJoin(ResponsablePeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $criteria->addJoin(ResponsablePeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); + $criteria->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); + $rs = ResponsablePeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -858,7 +858,7 @@ - public static function doSelectJoinAllExceptCuenta(Criteria $c, $con = null) + public static function doSelectJoinAllExceptProvincia(Criteria $c, $con = null) { $c = clone $c; @@ -869,19 +869,19 @@ ResponsablePeer::addSelectColumns($c); $startcol2 = (ResponsablePeer::NUM_COLUMNS - ResponsablePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - ProvinciaPeer::addSelectColumns($c); - $startcol3 = $startcol2 + ProvinciaPeer::NUM_COLUMNS; - TipodocumentoPeer::addSelectColumns($c); - $startcol4 = $startcol3 + TipodocumentoPeer::NUM_COLUMNS; + $startcol3 = $startcol2 + TipodocumentoPeer::NUM_COLUMNS; + CuentaPeer::addSelectColumns($c); + $startcol4 = $startcol3 + CuentaPeer::NUM_COLUMNS; + RolResponsablePeer::addSelectColumns($c); $startcol5 = $startcol4 + RolResponsablePeer::NUM_COLUMNS; - $c->addJoin(ResponsablePeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); - $c->addJoin(ResponsablePeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); + $c->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); + $c->addJoin(ResponsablePeer::FK_ROLRESPONSABLE_ID, RolResponsablePeer::ID); @@ -896,7 +896,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = ProvinciaPeer::getOMClass(); + $omClass = TipodocumentoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -906,7 +906,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getTipodocumento(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addResponsable($obj1); break; @@ -918,7 +918,7 @@ $obj2->addResponsable($obj1); } - $omClass = TipodocumentoPeer::getOMClass(); + $omClass = CuentaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -928,7 +928,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getTipodocumento(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getCuenta(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addResponsable($obj1); break; @@ -969,7 +969,7 @@ - public static function doSelectJoinAllExceptProvincia(Criteria $c, $con = null) + public static function doSelectJoinAllExceptTipodocumento(Criteria $c, $con = null) { $c = clone $c; @@ -980,19 +980,19 @@ ResponsablePeer::addSelectColumns($c); $startcol2 = (ResponsablePeer::NUM_COLUMNS - ResponsablePeer::NUM_LAZY_LOAD_COLUMNS) + 1; + ProvinciaPeer::addSelectColumns($c); + $startcol3 = $startcol2 + ProvinciaPeer::NUM_COLUMNS; + CuentaPeer::addSelectColumns($c); - $startcol3 = $startcol2 + CuentaPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + CuentaPeer::NUM_COLUMNS; - TipodocumentoPeer::addSelectColumns($c); - $startcol4 = $startcol3 + TipodocumentoPeer::NUM_COLUMNS; - RolResponsablePeer::addSelectColumns($c); $startcol5 = $startcol4 + RolResponsablePeer::NUM_COLUMNS; + $c->addJoin(ResponsablePeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); - $c->addJoin(ResponsablePeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); - $c->addJoin(ResponsablePeer::FK_ROLRESPONSABLE_ID, RolResponsablePeer::ID); @@ -1007,7 +1007,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = CuentaPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1017,7 +1017,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getCuenta(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addResponsable($obj1); break; @@ -1029,7 +1029,7 @@ $obj2->addResponsable($obj1); } - $omClass = TipodocumentoPeer::getOMClass(); + $omClass = CuentaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1039,7 +1039,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getTipodocumento(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getCuenta(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addResponsable($obj1); break; @@ -1080,7 +1080,7 @@ - public static function doSelectJoinAllExceptTipodocumento(Criteria $c, $con = null) + public static function doSelectJoinAllExceptCuenta(Criteria $c, $con = null) { $c = clone $c; @@ -1091,19 +1091,19 @@ ResponsablePeer::addSelectColumns($c); $startcol2 = (ResponsablePeer::NUM_COLUMNS - ResponsablePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - CuentaPeer::addSelectColumns($c); - $startcol3 = $startcol2 + CuentaPeer::NUM_COLUMNS; - ProvinciaPeer::addSelectColumns($c); - $startcol4 = $startcol3 + ProvinciaPeer::NUM_COLUMNS; + $startcol3 = $startcol2 + ProvinciaPeer::NUM_COLUMNS; + TipodocumentoPeer::addSelectColumns($c); + $startcol4 = $startcol3 + TipodocumentoPeer::NUM_COLUMNS; + RolResponsablePeer::addSelectColumns($c); $startcol5 = $startcol4 + RolResponsablePeer::NUM_COLUMNS; - $c->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); - $c->addJoin(ResponsablePeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); + $c->addJoin(ResponsablePeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); + $c->addJoin(ResponsablePeer::FK_ROLRESPONSABLE_ID, RolResponsablePeer::ID); @@ -1118,7 +1118,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = CuentaPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1128,7 +1128,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getCuenta(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addResponsable($obj1); break; @@ -1140,7 +1140,7 @@ $obj2->addResponsable($obj1); } - $omClass = ProvinciaPeer::getOMClass(); + $omClass = TipodocumentoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1150,7 +1150,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getProvincia(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getTipodocumento(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addResponsable($obj1); break; @@ -1202,22 +1202,22 @@ ResponsablePeer::addSelectColumns($c); $startcol2 = (ResponsablePeer::NUM_COLUMNS - ResponsablePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - CuentaPeer::addSelectColumns($c); - $startcol3 = $startcol2 + CuentaPeer::NUM_COLUMNS; - ProvinciaPeer::addSelectColumns($c); - $startcol4 = $startcol3 + ProvinciaPeer::NUM_COLUMNS; + $startcol3 = $startcol2 + ProvinciaPeer::NUM_COLUMNS; TipodocumentoPeer::addSelectColumns($c); - $startcol5 = $startcol4 + TipodocumentoPeer::NUM_COLUMNS; + $startcol4 = $startcol3 + TipodocumentoPeer::NUM_COLUMNS; - $c->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); + CuentaPeer::addSelectColumns($c); + $startcol5 = $startcol4 + CuentaPeer::NUM_COLUMNS; $c->addJoin(ResponsablePeer::FK_PROVINCIA_ID, ProvinciaPeer::ID); $c->addJoin(ResponsablePeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID); + $c->addJoin(ResponsablePeer::FK_CUENTA_ID, CuentaPeer::ID); + $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -1229,7 +1229,7 @@ $obj1 = new $cls(); $obj1->hydrate($rs); - $omClass = CuentaPeer::getOMClass(); + $omClass = ProvinciaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1239,7 +1239,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj2 = $temp_obj1->getCuenta(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $temp_obj2 = $temp_obj1->getProvincia(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { $newObject = false; $temp_obj2->addResponsable($obj1); break; @@ -1251,7 +1251,7 @@ $obj2->addResponsable($obj1); } - $omClass = ProvinciaPeer::getOMClass(); + $omClass = TipodocumentoPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1261,7 +1261,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj3 = $temp_obj1->getProvincia(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $temp_obj3 = $temp_obj1->getTipodocumento(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { $newObject = false; $temp_obj3->addResponsable($obj1); break; @@ -1273,7 +1273,7 @@ $obj3->addResponsable($obj1); } - $omClass = TipodocumentoPeer::getOMClass(); + $omClass = CuentaPeer::getOMClass(); $cls = Propel::import($omClass); @@ -1283,7 +1283,7 @@ $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; - $temp_obj4 = $temp_obj1->getTipodocumento(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { + $temp_obj4 = $temp_obj1->getCuenta(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { $newObject = false; $temp_obj4->addResponsable($obj1); break; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRol.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRol.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRol.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,11 +13,11 @@ - protected $nombre = ''; + protected $nombre = 'null'; - protected $descripcion = ''; + protected $descripcion = 'null'; @@ -85,7 +85,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = RolPeer::NOMBRE; } @@ -99,7 +99,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === '') { + if ($this->descripcion !== $v || $v === 'null') { $this->descripcion = $v; $this->modifiedColumns[] = RolPeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRolResponsable.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRolResponsable.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRolResponsable.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,11 +13,11 @@ - protected $nombre = ''; + protected $nombre = 'null'; - protected $descripcion = ''; + protected $descripcion = 'null'; @@ -91,7 +91,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = RolResponsablePeer::NOMBRE; } @@ -105,7 +105,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === '') { + if ($this->descripcion !== $v || $v === 'null') { $this->descripcion = $v; $this->modifiedColumns[] = RolResponsablePeer::DESCRIPCION; } @@ -517,7 +517,7 @@ - public function getResponsablesJoinCuenta($criteria = null, $con = null) + public function getResponsablesJoinProvincia($criteria = null, $con = null) { include_once 'lib/model/om/BaseResponsablePeer.php'; if ($criteria === null) { @@ -535,14 +535,14 @@ $criteria->add(ResponsablePeer::FK_ROLRESPONSABLE_ID, $this->getId()); - $this->collResponsables = ResponsablePeer::doSelectJoinCuenta($criteria, $con); + $this->collResponsables = ResponsablePeer::doSelectJoinProvincia($criteria, $con); } } else { $criteria->add(ResponsablePeer::FK_ROLRESPONSABLE_ID, $this->getId()); if (!isset($this->lastResponsableCriteria) || !$this->lastResponsableCriteria->equals($criteria)) { - $this->collResponsables = ResponsablePeer::doSelectJoinCuenta($criteria, $con); + $this->collResponsables = ResponsablePeer::doSelectJoinProvincia($criteria, $con); } } $this->lastResponsableCriteria = $criteria; @@ -552,7 +552,7 @@ - public function getResponsablesJoinProvincia($criteria = null, $con = null) + public function getResponsablesJoinTipodocumento($criteria = null, $con = null) { include_once 'lib/model/om/BaseResponsablePeer.php'; if ($criteria === null) { @@ -570,14 +570,14 @@ $criteria->add(ResponsablePeer::FK_ROLRESPONSABLE_ID, $this->getId()); - $this->collResponsables = ResponsablePeer::doSelectJoinProvincia($criteria, $con); + $this->collResponsables = ResponsablePeer::doSelectJoinTipodocumento($criteria, $con); } } else { $criteria->add(ResponsablePeer::FK_ROLRESPONSABLE_ID, $this->getId()); if (!isset($this->lastResponsableCriteria) || !$this->lastResponsableCriteria->equals($criteria)) { - $this->collResponsables = ResponsablePeer::doSelectJoinProvincia($criteria, $con); + $this->collResponsables = ResponsablePeer::doSelectJoinTipodocumento($criteria, $con); } } $this->lastResponsableCriteria = $criteria; @@ -587,7 +587,7 @@ - public function getResponsablesJoinTipodocumento($criteria = null, $con = null) + public function getResponsablesJoinCuenta($criteria = null, $con = null) { include_once 'lib/model/om/BaseResponsablePeer.php'; if ($criteria === null) { @@ -605,14 +605,14 @@ $criteria->add(ResponsablePeer::FK_ROLRESPONSABLE_ID, $this->getId()); - $this->collResponsables = ResponsablePeer::doSelectJoinTipodocumento($criteria, $con); + $this->collResponsables = ResponsablePeer::doSelectJoinCuenta($criteria, $con); } } else { $criteria->add(ResponsablePeer::FK_ROLRESPONSABLE_ID, $this->getId()); if (!isset($this->lastResponsableCriteria) || !$this->lastResponsableCriteria->equals($criteria)) { - $this->collResponsables = ResponsablePeer::doSelectJoinTipodocumento($criteria, $con); + $this->collResponsables = ResponsablePeer::doSelectJoinCuenta($criteria, $con); } } $this->lastResponsableCriteria = $criteria; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTipoasistencia.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTipoasistencia.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipoasistencia.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -17,7 +17,7 @@ - protected $descripcion = ''; + protected $descripcion = 'null'; @@ -25,7 +25,7 @@ - protected $grupo = ''; + protected $grupo = 'null'; @@ -121,7 +121,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === '') { + if ($this->descripcion !== $v || $v === 'null') { $this->descripcion = $v; $this->modifiedColumns[] = TipoasistenciaPeer::DESCRIPCION; } @@ -145,7 +145,7 @@ $v = (string) $v; } - if ($this->grupo !== $v || $v === '') { + if ($this->grupo !== $v || $v === 'null') { $this->grupo = $v; $this->modifiedColumns[] = TipoasistenciaPeer::GRUPO; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTipodocente.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTipodocente.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipodocente.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -17,7 +17,7 @@ - protected $descripcion = ''; + protected $descripcion = 'null'; protected $alreadyInSave = false; @@ -82,7 +82,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === '') { + if ($this->descripcion !== $v || $v === 'null') { $this->descripcion = $v; $this->modifiedColumns[] = TipodocentePeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTipodocumento.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTipodocumento.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipodocumento.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,11 +13,11 @@ - protected $nombre = ''; + protected $nombre = 'null'; - protected $descripcion = ''; + protected $descripcion = 'null'; @@ -97,7 +97,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = TipodocumentoPeer::NOMBRE; } @@ -111,7 +111,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === '') { + if ($this->descripcion !== $v || $v === 'null') { $this->descripcion = $v; $this->modifiedColumns[] = TipodocumentoPeer::DESCRIPCION; } @@ -547,7 +547,7 @@ - public function getAlumnosJoinCuenta($criteria = null, $con = null) + public function getAlumnosJoinProvincia($criteria = null, $con = null) { include_once 'lib/model/om/BaseAlumnoPeer.php'; if ($criteria === null) { @@ -565,14 +565,14 @@ $criteria->add(AlumnoPeer::FK_TIPODOCUMENTO_ID, $this->getId()); - $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); } } else { $criteria->add(AlumnoPeer::FK_TIPODOCUMENTO_ID, $this->getId()); if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) { - $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); } } $this->lastAlumnoCriteria = $criteria; @@ -617,7 +617,7 @@ - public function getAlumnosJoinProvincia($criteria = null, $con = null) + public function getAlumnosJoinCuenta($criteria = null, $con = null) { include_once 'lib/model/om/BaseAlumnoPeer.php'; if ($criteria === null) { @@ -635,14 +635,14 @@ $criteria->add(AlumnoPeer::FK_TIPODOCUMENTO_ID, $this->getId()); - $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); } } else { $criteria->add(AlumnoPeer::FK_TIPODOCUMENTO_ID, $this->getId()); if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->equals($criteria)) { - $this->collAlumnos = AlumnoPeer::doSelectJoinProvincia($criteria, $con); + $this->collAlumnos = AlumnoPeer::doSelectJoinCuenta($criteria, $con); } } $this->lastAlumnoCriteria = $criteria; @@ -792,7 +792,7 @@ - public function getResponsablesJoinCuenta($criteria = null, $con = null) + public function getResponsablesJoinProvincia($criteria = null, $con = null) { include_once 'lib/model/om/BaseResponsablePeer.php'; if ($criteria === null) { @@ -810,14 +810,14 @@ $criteria->add(ResponsablePeer::FK_TIPODOCUMENTO_ID, $this->getId()); - $this->collResponsables = ResponsablePeer::doSelectJoinCuenta($criteria, $con); + $this->collResponsables = ResponsablePeer::doSelectJoinProvincia($criteria, $con); } } else { $criteria->add(ResponsablePeer::FK_TIPODOCUMENTO_ID, $this->getId()); if (!isset($this->lastResponsableCriteria) || !$this->lastResponsableCriteria->equals($criteria)) { - $this->collResponsables = ResponsablePeer::doSelectJoinCuenta($criteria, $con); + $this->collResponsables = ResponsablePeer::doSelectJoinProvincia($criteria, $con); } } $this->lastResponsableCriteria = $criteria; @@ -827,7 +827,7 @@ - public function getResponsablesJoinProvincia($criteria = null, $con = null) + public function getResponsablesJoinCuenta($criteria = null, $con = null) { include_once 'lib/model/om/BaseResponsablePeer.php'; if ($criteria === null) { @@ -845,14 +845,14 @@ $criteria->add(ResponsablePeer::FK_TIPODOCUMENTO_ID, $this->getId()); - $this->collResponsables = ResponsablePeer::doSelectJoinProvincia($criteria, $con); + $this->collResponsables = ResponsablePeer::doSelectJoinCuenta($criteria, $con); } } else { $criteria->add(ResponsablePeer::FK_TIPODOCUMENTO_ID, $this->getId()); if (!isset($this->lastResponsableCriteria) || !$this->lastResponsableCriteria->equals($criteria)) { - $this->collResponsables = ResponsablePeer::doSelectJoinProvincia($criteria, $con); + $this->collResponsables = ResponsablePeer::doSelectJoinCuenta($criteria, $con); } } $this->lastResponsableCriteria = $criteria; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTipoespacio.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTipoespacio.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipoespacio.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,11 +13,11 @@ - protected $nombre = ''; + protected $nombre = 'null'; - protected $descripcion = ''; + protected $descripcion = 'null'; protected $collEspacios; @@ -74,7 +74,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = TipoespacioPeer::NOMBRE; } @@ -88,7 +88,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === '') { + if ($this->descripcion !== $v || $v === 'null') { $this->descripcion = $v; $this->modifiedColumns[] = TipoespacioPeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTipoiva.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTipoiva.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipoiva.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,11 +13,11 @@ - protected $nombre = ''; + protected $nombre = 'null'; - protected $descripcion = ''; + protected $descripcion = 'null'; @@ -91,7 +91,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = TipoivaPeer::NOMBRE; } @@ -105,7 +105,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === '') { + if ($this->descripcion !== $v || $v === 'null') { $this->descripcion = $v; $this->modifiedColumns[] = TipoivaPeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTipolocacion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTipolocacion.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipolocacion.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,11 +13,11 @@ - protected $nombre = ''; + protected $nombre = 'null'; - protected $descripcion = ''; + protected $descripcion = 'null'; protected $collLocacions; @@ -74,7 +74,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === '') { + if ($this->nombre !== $v || $v === 'null') { $this->nombre = $v; $this->modifiedColumns[] = TipolocacionPeer::NOMBRE; } @@ -88,7 +88,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === '') { + if ($this->descripcion !== $v || $v === 'null') { $this->descripcion = $v; $this->modifiedColumns[] = TipolocacionPeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTurnos.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTurnos.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTurnos.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -25,7 +25,7 @@ - protected $descripcion = ''; + protected $descripcion = 'null'; protected $aCiclolectivo; @@ -187,7 +187,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === '') { + if ($this->descripcion !== $v || $v === 'null') { $this->descripcion = $v; $this->modifiedColumns[] = TurnosPeer::DESCRIPCION; } @@ -754,7 +754,7 @@ - public function getHorarioescolarsJoinHorarioescolartipo($criteria = null, $con = null) + public function getHorarioescolarsJoinEstablecimiento($criteria = null, $con = null) { include_once 'lib/model/om/BaseHorarioescolarPeer.php'; if ($criteria === null) { @@ -772,14 +772,14 @@ $criteria->add(HorarioescolarPeer::FK_TURNOS_ID, $this->getId()); - $this->collHorarioescolars = HorarioescolarPeer::doSelectJoinHorarioescolartipo($criteria, $con); + $this->collHorarioescolars = HorarioescolarPeer::doSelectJoinEstablecimiento($criteria, $con); } } else { $criteria->add(HorarioescolarPeer::FK_TURNOS_ID, $this->getId()); if (!isset($this->lastHorarioescolarCriteria) || !$this->lastHorarioescolarCriteria->equals($criteria)) { - $this->collHorarioescolars = HorarioescolarPeer::doSelectJoinHorarioescolartipo($criteria, $con); + $this->collHorarioescolars = HorarioescolarPeer::doSelectJoinEstablecimiento($criteria, $con); } } $this->lastHorarioescolarCriteria = $criteria; @@ -789,7 +789,7 @@ - public function getHorarioescolarsJoinEstablecimiento($criteria = null, $con = null) + public function getHorarioescolarsJoinHorarioescolartipo($criteria = null, $con = null) { include_once 'lib/model/om/BaseHorarioescolarPeer.php'; if ($criteria === null) { @@ -807,14 +807,14 @@ $criteria->add(HorarioescolarPeer::FK_TURNOS_ID, $this->getId()); - $this->collHorarioescolars = HorarioescolarPeer::doSelectJoinEstablecimiento($criteria, $con); + $this->collHorarioescolars = HorarioescolarPeer::doSelectJoinHorarioescolartipo($criteria, $con); } } else { $criteria->add(HorarioescolarPeer::FK_TURNOS_ID, $this->getId()); if (!isset($this->lastHorarioescolarCriteria) || !$this->lastHorarioescolarCriteria->equals($criteria)) { - $this->collHorarioescolars = HorarioescolarPeer::doSelectJoinEstablecimiento($criteria, $con); + $this->collHorarioescolars = HorarioescolarPeer::doSelectJoinHorarioescolartipo($criteria, $con); } } $this->lastHorarioescolarCriteria = $criteria; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseUsuario.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseUsuario.php 2007-07-18 19:30:33 UTC (rev 4827) +++ prosistem/alba/trunk/alba/lib/model/om/BaseUsuario.php 2007-07-18 20:23:56 UTC (rev 4828) @@ -13,11 +13,11 @@ - protected $usuario = ''; + protected $usuario = 'null'; - protected $clave = ''; + protected $clave = 'null'; @@ -53,7 +53,7 @@ - protected $borrado = true; + protected $borrado = false; protected $aEstablecimiento; @@ -212,7 +212,7 @@ $v = (string) $v; } - if ($this->usuario !== $v || $v === '') { + if ($this->usuario !== $v || $v === 'null') { $this->usuario = $v; $this->modifiedColumns[] = UsuarioPeer::USUARIO; } @@ -226,7 +226,7 @@ $v = (string) $v; } - if ($this->clave !== $v || $v === '') { + if ($this->clave !== $v || $v === 'null') { $this->clave = $v; $this->modifiedColumns[] = UsuarioPeer::CLAVE; } @@ -350,7 +350,7 @@ public function setBorrado($v) { - if ($this->borrado !== $v || $v === true) { + if ($this->borrado !== $v || $v === false) { $this->borrado = $v; $this->modifiedColumns[] = UsuarioPeer::BORRADO; } @@ -1008,7 +1008,7 @@ - public function getLegajopedagogicosJoinLegajocategoria($criteria = null, $con = null) + public function getLegajopedagogicosJoinAlumno($criteria = null, $con = null) { include_once 'lib/model/om/BaseLegajopedagogicoPeer.php'; if ($criteria === null) { @@ -1026,14 +1026,14 @@ $criteria->add(LegajopedagogicoPeer::FK_USUARIO_ID, $this->getId()); - $this->collLegajopedagogicos = LegajopedagogicoPeer::doSelectJoinLegajocategoria($criteria, $con); + $this->collLegajopedagogicos = LegajopedagogicoPeer::doSelectJoinAlumno($criteria, $con); } } else { $criteria->add(LegajopedagogicoPeer::FK_USUARIO_ID, $this->getId()); if (!isset($this->lastLegajopedagogicoCriteria) || !$this->lastLegajopedagogicoCriteria->equals($criteria)) { - $this->collLegajopedagogicos = LegajopedagogicoPeer::doSelectJoinLegajocategoria($criteria, $con); + $this->collLegajopedagogicos = LegajopedagogicoPeer::doSelectJoinAlumno($criteria, $con); } } $this->lastLegajopedagogicoCriteria = $criteria; @@ -1043,7 +1043,7 @@ - public function getLegajopedagogicosJoinAlumno($criteria = null, $con = null) + public function getLegajopedagogicosJoinLegajocategoria($criteria = null, $con = null) { include_once 'lib/model/om/BaseLegajopedagogicoPeer.php'; if ($criteria === null) { @@ -1061,14 +1061,14 @@ $criteria->add(LegajopedagogicoPeer::FK_USUARIO_ID, $this->getId()); - $this->collLegajopedagogicos = LegajopedagogicoPeer::doSelectJoinAlumno($criteria, $con); + $this->collLegajopedagogicos = LegajopedagogicoPeer::doSelectJoinLegajocategoria($criteria, $con); } } else { $criteria->add(LegajopedagogicoPeer::FK_USUARIO_ID, $this->getId()); if (!isset($this->lastLegajopedagogicoCriteria) || !$this->lastLegajopedagogicoCriteria->equals($criteria)) { - $this->collLegajopedagogicos = LegajopedagogicoPeer::doSelectJoinAlumno($criteria, $con); + $this->collLegajopedagogicos = LegajopedagogicoPeer::doSelectJoinLegajocategoria($criteria, $con); } } $this->lastLegajopedagogicoCriteria = $criteria;
participants (1)
-
commits＠pressenter.com.ar