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

SVN Alba r4949 - in prosistem/alba/trunk/alba: apps/principal/modules/docente/actions apps/principal/modules/docente/config apps/principal/modules/docente/templates config data/sql lib/model lib/model/map lib/model/om
by commits＠pressenter.com.ar 13 Aug '07

13 Aug '07

Author: josx Date: 2007-08-13 15:57:58 -0300 (Mon, 13 Aug 2007) New Revision: 4949 Added: prosistem/alba/trunk/alba/lib/model/RelAnioActividadDocente.php prosistem/alba/trunk/alba/lib/model/RelAnioActividadDocentePeer.php prosistem/alba/trunk/alba/lib/model/map/RelAnioActividadDocenteMapBuilder.php prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadDocente.php prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadDocentePeer.php Removed: prosistem/alba/trunk/alba/lib/model/RelActividadDocente.php prosistem/alba/trunk/alba/lib/model/RelActividadDocentePeer.php prosistem/alba/trunk/alba/lib/model/map/RelActividadDocenteMapBuilder.php prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocente.php prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocentePeer.php Modified: prosistem/alba/trunk/alba/apps/principal/modules/docente/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/docente/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/docente/templates/actividadesPorDocenteSuccess.php prosistem/alba/trunk/alba/config/schema.yml prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0rc2.sql prosistem/alba/trunk/alba/data/sql/datos_ejemplo.sql prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql prosistem/alba/trunk/alba/lib/model/RelAnioActividad.php prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividad.php Log: Se agrego el a?\195?\177o a la carga de los docentes ( #124 ) Modified: prosistem/alba/trunk/alba/apps/principal/modules/docente/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/docente/actions/actions.class.php 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/apps/principal/modules/docente/actions/actions.class.php 2007-08-13 18:57:58 UTC (rev 4949) @@ -41,8 +41,8 @@ } $c = New Criteria(); - $c->Add(RelActividadDocentePeer::FK_DOCENTE_ID,$this->docente->getId()); - $this->actividades = RelActividadDocentePeer::doSelectJoinActividad($c); + $c->Add(RelAnioActividadDocentePeer::FK_DOCENTE_ID,$this->docente->getId()); + $this->actividades = RelAnioActividadDocentePeer::doSelect($c); } function executeHorariosPorDocente() { @@ -63,15 +63,15 @@ // Update many-to-many for "actividades" $c = new Criteria(); - $c->add(RelActividadDocentePeer::FK_DOCENTE_ID, $docente->getPrimaryKey()); - RelActividadDocentePeer::doDelete($c); + $c->add(RelAnioActividadDocentePeer::FK_DOCENTE_ID, $docente->getPrimaryKey()); + RelAnioActividadDocentePeer::doDelete($c); $ids = $this->getRequestParameter('associated_actividades'); if (is_array($ids)) { foreach ($ids as $id){ - $RelActividadDocente = new RelActividadDocente(); - $RelActividadDocente->setFkDocenteId($docente->getPrimaryKey()); - $RelActividadDocente->setFkActividadId($id); - $RelActividadDocente->save(); + $RelAnioActividadDocente = new RelAnioActividadDocente(); + $RelAnioActividadDocente->setFkDocenteId($docente->getPrimaryKey()); + $RelAnioActividadDocente->setFkAnioActividadId($id); + $RelAnioActividadDocente->save(); } } } Modified: prosistem/alba/trunk/alba/apps/principal/modules/docente/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/docente/config/generator.yml 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/apps/principal/modules/docente/config/generator.yml 2007-08-13 18:57:58 UTC (rev 4949) @@ -27,7 +27,7 @@ edit: title: Editar Docente fields: - actividades: { type: admin_double_list, params: through_class=RelActividadDocente } + actividades: { type: admin_double_list, params: through_class=RelAnioActividadDocente style=width:260px } display: "Informacion general": [apellido, nombre, fecha_nacimiento, _sexo, fk_tipodocumento_id, nro_documento ] Modified: prosistem/alba/trunk/alba/apps/principal/modules/docente/templates/actividadesPorDocenteSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/docente/templates/actividadesPorDocenteSuccess.php 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/apps/principal/modules/docente/templates/actividadesPorDocenteSuccess.php 2007-08-13 18:57:58 UTC (rev 4949) @@ -29,7 +29,10 @@ foreach($actividades as $actividad){ ?> <tr class="sf_admin_row_0"> - <td><?echo $actividad->getActividad()->getNombre();?></td> + <td> + + <?echo $actividad->getRelAnioActividad()->getActividad()->getNombre()." de ".$actividad->getRelAnioActividad()->getAnio()->getDescripcion()." ".(($actividad->getRelAnioActividad()->getOrientacion())?" de ".$actividad->getRelAnioActividad()->getOrientacion()->getNombre():"");?> + </td> </tr> <?}?> </tbody> Modified: prosistem/alba/trunk/alba/config/schema.yml =================================================================== --- prosistem/alba/trunk/alba/config/schema.yml 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/config/schema.yml 2007-08-13 18:57:58 UTC (rev 4949) @@ -1584,23 +1584,6 @@ 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 @@ -1832,3 +1815,20 @@ descripcion: type: VARCHAR size: 255 + rel_anio_actividad_docente: + _attributes: + idMethod: native + fk_anio_actividad_id: + type: integer + size: 11 + required: true + primaryKey: true + foreignTable: rel_anio_actividad + foreignReference: id + fk_docente_id: + type: integer + size: 11 + required: true + primaryKey: true + foreignTable: docente + foreignReference: id \ No newline at end of file Modified: prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0rc2.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0rc2.sql 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0rc2.sql 2007-08-13 18:57:58 UTC (rev 4949) @@ -104,6 +104,29 @@ ALTER TABLE `rel_anio_actividad` ADD CONSTRAINT `orientacion_FK_4` FOREIGN KEY (`fk_orientacion_id`) REFERENCES `orientacion` (`id`); +CREATE TABLE `rel_anio_actividad_docente` +( + `fk_anio_actividad_id` INTEGER(11) NOT NULL, + `fk_docente_id` INTEGER(11) NOT NULL, + PRIMARY KEY (`fk_anio_actividad_id`,`fk_docente_id`), + CONSTRAINT `rel_anio_actividad_docente_FK_1` + FOREIGN KEY (`fk_anio_actividad_id`) + REFERENCES `rel_anio_actividad` (`id`), + INDEX `rel_anio_actividad_docente_FI_2` (`fk_docente_id`), + CONSTRAINT `rel_anio_actividad_docente_FK_2` + FOREIGN KEY (`fk_docente_id`) + REFERENCES `docente` (`id`) +)Type=InnoDB; + + + +INSERT INTO rel_anio_actividad_docente (fk_anio_actividad_id , fk_docente_id) +SELECT id, fk_docente_id +FROM rel_actividad_docente, rel_anio_actividad +WHERE rel_anio_actividad.fk_actividad_id = rel_actividad_docente.fk_actividad_id; + +DROP TABLE `rel_actividad_docente`; + SET FOREIGN_KEY_CHECKS = 1; Modified: prosistem/alba/trunk/alba/data/sql/datos_ejemplo.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/datos_ejemplo.sql 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/data/sql/datos_ejemplo.sql 2007-08-13 18:57:58 UTC (rev 4949) @@ -2813,72 +2813,89 @@ INSERT INTO `provincia` (`id`, `nombre_corto`, `nombre_largo`, `fk_pais_id`, `orden`) VALUES (27, 'Tucumán', 'Tucumán', 1, 0); -- --- Volcar la base de datos para la tabla `rel_actividad_docente` +-- Volcar la base de datos para la tabla `rel_anio_actividad_docente` -- +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (1, 11); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (2, 11); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (3, 11); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (4, 11); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (7, 11); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (8, 11); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (9, 11); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (10, 11); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (15, 11); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (16, 11); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (17, 11); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (18, 11); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (1, 12); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (2, 12); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (3, 12); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (4, 12); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (7, 12); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (8, 12); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (9, 12); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (10, 12); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (15, 12); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (16, 12); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (17, 12); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (18, 12); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (5, 13); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (13, 13); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (19, 13); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (12, 14); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (5, 15); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (13, 15); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (19, 15); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (1, 16); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (2, 16); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (3, 16); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (4, 16); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (7, 16); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (8, 16); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (9, 16); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (10, 16); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (15, 16); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (16, 16); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (17, 16); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (18, 16); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (1, 17); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (2, 17); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (3, 17); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (4, 17); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (7, 17); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (8, 17); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (9, 17); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (10, 17); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (15, 17); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (16, 17); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (17, 17); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (18, 17); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (1, 18); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (2, 18); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (3, 18); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (4, 18); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (7, 18); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (8, 18); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (9, 18); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (10, 18); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (15, 18); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (16, 18); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (17, 18); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (18, 18); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (20, 19); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (1, 20); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (2, 20); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (3, 20); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (4, 20); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (7, 20); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (8, 20); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (9, 20); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (10, 20); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (15, 20); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (16, 20); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (17, 20); +INSERT INTO `rel_anio_actividad_docente` (`fk_anio_actividad_id`, `fk_docente_id`) VALUES (18, 20); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (7, 1); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (8, 1); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (9, 1); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (10, 1); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (7, 2); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (8, 2); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (10, 2); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (7, 3); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (8, 3); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (9, 3); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (10, 3); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (9, 2); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (14, 4); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (7, 5); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (8, 5); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (9, 5); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (10, 5); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (7, 6); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (8, 6); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (9, 6); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (10, 6); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (7, 7); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (8, 7); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (9, 7); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (10, 7); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (7, 8); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (8, 8); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (9, 8); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (10, 8); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (15, 9); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (7, 10); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (8, 10); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (9, 10); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (10, 10); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (7, 11); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (8, 11); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (9, 11); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (10, 11); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (7, 12); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (8, 12); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (9, 12); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (10, 12); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (13, 13); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (16, 13); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (12, 14); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (13, 15); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (7, 16); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (8, 16); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (9, 16); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (10, 16); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (7, 17); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (8, 17); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (9, 17); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (10, 17); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (7, 18); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (8, 18); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (9, 18); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (10, 18); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (15, 19); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (7, 20); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (8, 20); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (9, 20); -INSERT INTO `rel_actividad_docente` (`fk_actividad_id`, `fk_docente_id`) VALUES (10, 20); -- -- Volcar la base de datos para la tabla `rel_alumno_division` Modified: prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql 2007-08-13 18:57:58 UTC (rev 4949) @@ -1232,27 +1232,6 @@ )Type=InnoDB; #----------------------------------------------------------------------------- -#-- rel_actividad_docente -#----------------------------------------------------------------------------- - -DROP TABLE IF EXISTS `rel_actividad_docente`; - - -CREATE TABLE `rel_actividad_docente` -( - `fk_actividad_id` INTEGER(11) NOT NULL, - `fk_docente_id` INTEGER(11) NOT NULL, - PRIMARY KEY (`fk_actividad_id`,`fk_docente_id`), - CONSTRAINT `rel_actividad_docente_FK_1` - FOREIGN KEY (`fk_actividad_id`) - REFERENCES `actividad` (`id`), - INDEX `rel_actividad_docente_FI_2` (`fk_docente_id`), - CONSTRAINT `rel_actividad_docente_FK_2` - FOREIGN KEY (`fk_docente_id`) - REFERENCES `docente` (`id`) -)Type=InnoDB; - -#----------------------------------------------------------------------------- #-- docente_horario #----------------------------------------------------------------------------- @@ -1432,5 +1411,26 @@ REFERENCES `alumno` (`id`) )Type=InnoDB; +#----------------------------------------------------------------------------- +#-- rel_anio_actividad_docente +#----------------------------------------------------------------------------- + +DROP TABLE IF EXISTS `rel_anio_actividad_docente`; + + +CREATE TABLE `rel_anio_actividad_docente` +( + `fk_anio_actividad_id` INTEGER(11) NOT NULL, + `fk_docente_id` INTEGER(11) NOT NULL, + PRIMARY KEY (`fk_anio_actividad_id`,`fk_docente_id`), + CONSTRAINT `rel_anio_actividad_docente_FK_1` + FOREIGN KEY (`fk_anio_actividad_id`) + REFERENCES `rel_anio_actividad` (`id`), + INDEX `rel_anio_actividad_docente_FI_2` (`fk_docente_id`), + CONSTRAINT `rel_anio_actividad_docente_FK_2` + FOREIGN KEY (`fk_docente_id`) + REFERENCES `docente` (`id`) +)Type=InnoDB; + # This restores the fkey checks, after having unset them earlier SET FOREIGN_KEY_CHECKS = 1; Deleted: prosistem/alba/trunk/alba/lib/model/RelActividadDocente.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/RelActividadDocente.php 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/lib/model/RelActividadDocente.php 2007-08-13 18:57:58 UTC (rev 4949) @@ -1,19 +0,0 @@ -<?php - -require_once 'lib/model/om/BaseRelActividadDocente.php'; - - -/** - * Skeleton subclass for representing a row from the 'rel_actividad_docente' table. - * - * - * - * You should add additional methods to this class to meet the - * application requirements. This class will only be generated as - * long as it does not already exist in the output directory. - * - * @package model - */ -class RelActividadDocente extends BaseRelActividadDocente { - -} // RelActividadDocente Deleted: prosistem/alba/trunk/alba/lib/model/RelActividadDocentePeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/RelActividadDocentePeer.php 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/lib/model/RelActividadDocentePeer.php 2007-08-13 18:57:58 UTC (rev 4949) @@ -1,23 +0,0 @@ -<?php - - // include base peer class - require_once 'lib/model/om/BaseRelActividadDocentePeer.php'; - - // include object class - include_once 'lib/model/RelActividadDocente.php'; - - -/** - * Skeleton subclass for performing query and update operations on the 'rel_actividad_docente' table. - * - * - * - * You should add additional methods to this class to meet the - * application requirements. This class will only be generated as - * long as it does not already exist in the output directory. - * - * @package model - */ -class RelActividadDocentePeer extends BaseRelActividadDocentePeer { - -} // RelActividadDocentePeer Modified: prosistem/alba/trunk/alba/lib/model/RelAnioActividad.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/RelAnioActividad.php 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/lib/model/RelAnioActividad.php 2007-08-13 18:57:58 UTC (rev 4949) @@ -15,5 +15,7 @@ * @package model */ class RelAnioActividad extends BaseRelAnioActividad { - + function __toString() { + return $this->getAnio()->getDescripcion()." de ".$this->getActividad()->getDescripcion()." ".(($this->getOrientacion())?" de ".$this->getOrientacion()->getNombre():""); + } } // RelAnioActividad Added: prosistem/alba/trunk/alba/lib/model/RelAnioActividadDocente.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/RelAnioActividadDocente.php 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/lib/model/RelAnioActividadDocente.php 2007-08-13 18:57:58 UTC (rev 4949) @@ -0,0 +1,12 @@ +<?php + +/** + * Subclass for representing a row from the 'rel_anio_actividad_docente' table. + * + * + * + * @package lib.model + */ +class RelAnioActividadDocente extends BaseRelAnioActividadDocente +{ +} Property changes on: prosistem/alba/trunk/alba/lib/model/RelAnioActividadDocente.php ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Added: prosistem/alba/trunk/alba/lib/model/RelAnioActividadDocentePeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/RelAnioActividadDocentePeer.php 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/lib/model/RelAnioActividadDocentePeer.php 2007-08-13 18:57:58 UTC (rev 4949) @@ -0,0 +1,12 @@ +<?php + +/** + * Subclass for performing query and update operations on the 'rel_anio_actividad_docente' table. + * + * + * + * @package lib.model + */ +class RelAnioActividadDocentePeer extends BaseRelAnioActividadDocentePeer +{ +} Property changes on: prosistem/alba/trunk/alba/lib/model/RelAnioActividadDocentePeer.php ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Deleted: prosistem/alba/trunk/alba/lib/model/map/RelActividadDocenteMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelActividadDocenteMapBuilder.php 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/lib/model/map/RelActividadDocenteMapBuilder.php 2007-08-13 18:57:58 UTC (rev 4949) @@ -1,40 +0,0 @@ -<?php - - - -class RelActividadDocenteMapBuilder { - - - const CLASS_NAME = 'lib.model.map.RelActividadDocenteMapBuilder'; - - - private $dbMap; - - - public function isBuilt() - { - return ($this->dbMap !== null); - } - - - public function getDatabaseMap() - { - return $this->dbMap; - } - - - public function doBuild() - { - $this->dbMap = Propel::getDatabaseMap('alba'); - - $tMap = $this->dbMap->addTable('rel_actividad_docente'); - $tMap->setPhpName('RelActividadDocente'); - - $tMap->setUseIdGenerator(false); - - $tMap->addForeignPrimaryKey('FK_ACTIVIDAD_ID', 'FkActividadId', 'int' , CreoleTypes::INTEGER, 'actividad', 'ID', true, 11); - - $tMap->addForeignPrimaryKey('FK_DOCENTE_ID', 'FkDocenteId', 'int' , CreoleTypes::INTEGER, 'docente', 'ID', true, 11); - - } -} \ No newline at end of file Added: prosistem/alba/trunk/alba/lib/model/map/RelAnioActividadDocenteMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelAnioActividadDocenteMapBuilder.php 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/lib/model/map/RelAnioActividadDocenteMapBuilder.php 2007-08-13 18:57:58 UTC (rev 4949) @@ -0,0 +1,40 @@ +<?php + + + +class RelAnioActividadDocenteMapBuilder { + + + const CLASS_NAME = 'lib.model.map.RelAnioActividadDocenteMapBuilder'; + + + private $dbMap; + + + public function isBuilt() + { + return ($this->dbMap !== null); + } + + + public function getDatabaseMap() + { + return $this->dbMap; + } + + + public function doBuild() + { + $this->dbMap = Propel::getDatabaseMap('alba'); + + $tMap = $this->dbMap->addTable('rel_anio_actividad_docente'); + $tMap->setPhpName('RelAnioActividadDocente'); + + $tMap->setUseIdGenerator(false); + + $tMap->addForeignPrimaryKey('FK_ANIO_ACTIVIDAD_ID', 'FkAnioActividadId', 'int' , CreoleTypes::INTEGER, 'rel_anio_actividad', 'ID', true, 11); + + $tMap->addForeignPrimaryKey('FK_DOCENTE_ID', 'FkDocenteId', 'int' , CreoleTypes::INTEGER, 'docente', 'ID', true, 11); + + } +} \ No newline at end of file Property changes on: prosistem/alba/trunk/alba/lib/model/map/RelAnioActividadDocenteMapBuilder.php ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Modified: prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php 2007-08-13 18:57:58 UTC (rev 4949) @@ -51,12 +51,6 @@ protected $lastRelDivisionActividadDocenteCriteria = null; - protected $collRelActividadDocentes; - - - protected $lastRelActividadDocenteCriteria = null; - - protected $alreadyInSave = false; @@ -276,14 +270,6 @@ } } - if ($this->collRelActividadDocentes !== null) { - foreach($this->collRelActividadDocentes as $referrerFK) { - if (!$referrerFK->isDeleted()) { - $affectedRows += $referrerFK->save($con); - } - } - } - $this->alreadyInSave = false; } return $affectedRows; @@ -365,15 +351,7 @@ } } - if ($this->collRelActividadDocentes !== null) { - foreach($this->collRelActividadDocentes as $referrerFK) { - if (!$referrerFK->validate($columns)) { - $failureMap = array_merge($failureMap, $referrerFK->getValidationFailures()); - } - } - } - $this->alreadyInValidation = false; } @@ -522,10 +500,6 @@ $copyObj->addRelDivisionActividadDocente($relObj->copy($deepCopy)); } - foreach($this->getRelActividadDocentes() as $relObj) { - $copyObj->addRelActividadDocente($relObj->copy($deepCopy)); - } - } $copyObj->setNew(true); @@ -1246,109 +1220,4 @@ return $this->collRelDivisionActividadDocentes; } - - public function initRelActividadDocentes() - { - if ($this->collRelActividadDocentes === null) { - $this->collRelActividadDocentes = array(); - } - } - - - public function getRelActividadDocentes($criteria = null, $con = null) - { - include_once 'lib/model/om/BaseRelActividadDocentePeer.php'; - if ($criteria === null) { - $criteria = new Criteria(); - } - elseif ($criteria instanceof Criteria) - { - $criteria = clone $criteria; - } - - if ($this->collRelActividadDocentes === null) { - if ($this->isNew()) { - $this->collRelActividadDocentes = array(); - } else { - - $criteria->add(RelActividadDocentePeer::FK_ACTIVIDAD_ID, $this->getId()); - - RelActividadDocentePeer::addSelectColumns($criteria); - $this->collRelActividadDocentes = RelActividadDocentePeer::doSelect($criteria, $con); - } - } else { - if (!$this->isNew()) { - - - $criteria->add(RelActividadDocentePeer::FK_ACTIVIDAD_ID, $this->getId()); - - RelActividadDocentePeer::addSelectColumns($criteria); - if (!isset($this->lastRelActividadDocenteCriteria) || !$this->lastRelActividadDocenteCriteria->equals($criteria)) { - $this->collRelActividadDocentes = RelActividadDocentePeer::doSelect($criteria, $con); - } - } - } - $this->lastRelActividadDocenteCriteria = $criteria; - return $this->collRelActividadDocentes; - } - - - public function countRelActividadDocentes($criteria = null, $distinct = false, $con = null) - { - include_once 'lib/model/om/BaseRelActividadDocentePeer.php'; - if ($criteria === null) { - $criteria = new Criteria(); - } - elseif ($criteria instanceof Criteria) - { - $criteria = clone $criteria; - } - - $criteria->add(RelActividadDocentePeer::FK_ACTIVIDAD_ID, $this->getId()); - - return RelActividadDocentePeer::doCount($criteria, $distinct, $con); - } - - - public function addRelActividadDocente(RelActividadDocente $l) - { - $this->collRelActividadDocentes[] = $l; - $l->setActividad($this); - } - - - - public function getRelActividadDocentesJoinDocente($criteria = null, $con = null) - { - include_once 'lib/model/om/BaseRelActividadDocentePeer.php'; - if ($criteria === null) { - $criteria = new Criteria(); - } - elseif ($criteria instanceof Criteria) - { - $criteria = clone $criteria; - } - - if ($this->collRelActividadDocentes === null) { - if ($this->isNew()) { - $this->collRelActividadDocentes = array(); - } else { - - $criteria->add(RelActividadDocentePeer::FK_ACTIVIDAD_ID, $this->getId()); - - $this->collRelActividadDocentes = RelActividadDocentePeer::doSelectJoinDocente($criteria, $con); - } - } else { - - $criteria->add(RelActividadDocentePeer::FK_ACTIVIDAD_ID, $this->getId()); - - if (!isset($this->lastRelActividadDocenteCriteria) || !$this->lastRelActividadDocenteCriteria->equals($criteria)) { - $this->collRelActividadDocentes = RelActividadDocentePeer::doSelectJoinDocente($criteria, $con); - } - } - $this->lastRelActividadDocenteCriteria = $criteria; - - return $this->collRelActividadDocentes; - } - } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php 2007-08-13 18:57:58 UTC (rev 4949) @@ -98,16 +98,16 @@ protected $lastRelDocenteEstablecimientoCriteria = null; - protected $collRelActividadDocentes; + protected $collDocenteHorarios; - protected $lastRelActividadDocenteCriteria = null; + protected $lastDocenteHorarioCriteria = null; - protected $collDocenteHorarios; + protected $collRelAnioActividadDocentes; - protected $lastDocenteHorarioCriteria = null; + protected $lastRelAnioActividadDocenteCriteria = null; protected $alreadyInSave = false; @@ -652,16 +652,16 @@ } } - if ($this->collRelActividadDocentes !== null) { - foreach($this->collRelActividadDocentes as $referrerFK) { + if ($this->collDocenteHorarios !== null) { + foreach($this->collDocenteHorarios as $referrerFK) { if (!$referrerFK->isDeleted()) { $affectedRows += $referrerFK->save($con); } } } - if ($this->collDocenteHorarios !== null) { - foreach($this->collDocenteHorarios as $referrerFK) { + if ($this->collRelAnioActividadDocentes !== null) { + foreach($this->collRelAnioActividadDocentes as $referrerFK) { if (!$referrerFK->isDeleted()) { $affectedRows += $referrerFK->save($con); } @@ -739,16 +739,16 @@ } } - if ($this->collRelActividadDocentes !== null) { - foreach($this->collRelActividadDocentes as $referrerFK) { + if ($this->collDocenteHorarios !== null) { + foreach($this->collDocenteHorarios as $referrerFK) { if (!$referrerFK->validate($columns)) { $failureMap = array_merge($failureMap, $referrerFK->getValidationFailures()); } } } - if ($this->collDocenteHorarios !== null) { - foreach($this->collDocenteHorarios as $referrerFK) { + if ($this->collRelAnioActividadDocentes !== null) { + foreach($this->collRelAnioActividadDocentes as $referrerFK) { if (!$referrerFK->validate($columns)) { $failureMap = array_merge($failureMap, $referrerFK->getValidationFailures()); } @@ -1050,14 +1050,14 @@ $copyObj->addRelDocenteEstablecimiento($relObj->copy($deepCopy)); } - foreach($this->getRelActividadDocentes() as $relObj) { - $copyObj->addRelActividadDocente($relObj->copy($deepCopy)); - } - foreach($this->getDocenteHorarios() as $relObj) { $copyObj->addDocenteHorario($relObj->copy($deepCopy)); } + foreach($this->getRelAnioActividadDocentes() as $relObj) { + $copyObj->addRelAnioActividadDocente($relObj->copy($deepCopy)); + } + } $copyObj->setNew(true); @@ -1424,17 +1424,17 @@ } - public function initRelActividadDocentes() + public function initDocenteHorarios() { - if ($this->collRelActividadDocentes === null) { - $this->collRelActividadDocentes = array(); + if ($this->collDocenteHorarios === null) { + $this->collDocenteHorarios = array(); } } - public function getRelActividadDocentes($criteria = null, $con = null) + public function getDocenteHorarios($criteria = null, $con = null) { - include_once 'lib/model/om/BaseRelActividadDocentePeer.php'; + include_once 'lib/model/om/BaseDocenteHorarioPeer.php'; if ($criteria === null) { $criteria = new Criteria(); } @@ -1443,36 +1443,36 @@ $criteria = clone $criteria; } - if ($this->collRelActividadDocentes === null) { + if ($this->collDocenteHorarios === null) { if ($this->isNew()) { - $this->collRelActividadDocentes = array(); + $this->collDocenteHorarios = array(); } else { - $criteria->add(RelActividadDocentePeer::FK_DOCENTE_ID, $this->getId()); + $criteria->add(DocenteHorarioPeer::FK_DOCENTE_ID, $this->getId()); - RelActividadDocentePeer::addSelectColumns($criteria); - $this->collRelActividadDocentes = RelActividadDocentePeer::doSelect($criteria, $con); + DocenteHorarioPeer::addSelectColumns($criteria); + $this->collDocenteHorarios = DocenteHorarioPeer::doSelect($criteria, $con); } } else { if (!$this->isNew()) { - $criteria->add(RelActividadDocentePeer::FK_DOCENTE_ID, $this->getId()); + $criteria->add(DocenteHorarioPeer::FK_DOCENTE_ID, $this->getId()); - RelActividadDocentePeer::addSelectColumns($criteria); - if (!isset($this->lastRelActividadDocenteCriteria) || !$this->lastRelActividadDocenteCriteria->equals($criteria)) { - $this->collRelActividadDocentes = RelActividadDocentePeer::doSelect($criteria, $con); + DocenteHorarioPeer::addSelectColumns($criteria); + if (!isset($this->lastDocenteHorarioCriteria) || !$this->lastDocenteHorarioCriteria->equals($criteria)) { + $this->collDocenteHorarios = DocenteHorarioPeer::doSelect($criteria, $con); } } } - $this->lastRelActividadDocenteCriteria = $criteria; - return $this->collRelActividadDocentes; + $this->lastDocenteHorarioCriteria = $criteria; + return $this->collDocenteHorarios; } - public function countRelActividadDocentes($criteria = null, $distinct = false, $con = null) + public function countDocenteHorarios($criteria = null, $distinct = false, $con = null) { - include_once 'lib/model/om/BaseRelActividadDocentePeer.php'; + include_once 'lib/model/om/BaseDocenteHorarioPeer.php'; if ($criteria === null) { $criteria = new Criteria(); } @@ -1481,23 +1481,23 @@ $criteria = clone $criteria; } - $criteria->add(RelActividadDocentePeer::FK_DOCENTE_ID, $this->getId()); + $criteria->add(DocenteHorarioPeer::FK_DOCENTE_ID, $this->getId()); - return RelActividadDocentePeer::doCount($criteria, $distinct, $con); + return DocenteHorarioPeer::doCount($criteria, $distinct, $con); } - public function addRelActividadDocente(RelActividadDocente $l) + public function addDocenteHorario(DocenteHorario $l) { - $this->collRelActividadDocentes[] = $l; + $this->collDocenteHorarios[] = $l; $l->setDocente($this); } - public function getRelActividadDocentesJoinActividad($criteria = null, $con = null) + public function getDocenteHorariosJoinEvento($criteria = null, $con = null) { - include_once 'lib/model/om/BaseRelActividadDocentePeer.php'; + include_once 'lib/model/om/BaseDocenteHorarioPeer.php'; if ($criteria === null) { $criteria = new Criteria(); } @@ -1506,40 +1506,40 @@ $criteria = clone $criteria; } - if ($this->collRelActividadDocentes === null) { + if ($this->collDocenteHorarios === null) { if ($this->isNew()) { - $this->collRelActividadDocentes = array(); + $this->collDocenteHorarios = array(); } else { - $criteria->add(RelActividadDocentePeer::FK_DOCENTE_ID, $this->getId()); + $criteria->add(DocenteHorarioPeer::FK_DOCENTE_ID, $this->getId()); - $this->collRelActividadDocentes = RelActividadDocentePeer::doSelectJoinActividad($criteria, $con); + $this->collDocenteHorarios = DocenteHorarioPeer::doSelectJoinEvento($criteria, $con); } } else { - $criteria->add(RelActividadDocentePeer::FK_DOCENTE_ID, $this->getId()); + $criteria->add(DocenteHorarioPeer::FK_DOCENTE_ID, $this->getId()); - if (!isset($this->lastRelActividadDocenteCriteria) || !$this->lastRelActividadDocenteCriteria->equals($criteria)) { - $this->collRelActividadDocentes = RelActividadDocentePeer::doSelectJoinActividad($criteria, $con); + if (!isset($this->lastDocenteHorarioCriteria) || !$this->lastDocenteHorarioCriteria->equals($criteria)) { + $this->collDocenteHorarios = DocenteHorarioPeer::doSelectJoinEvento($criteria, $con); } } - $this->lastRelActividadDocenteCriteria = $criteria; + $this->lastDocenteHorarioCriteria = $criteria; - return $this->collRelActividadDocentes; + return $this->collDocenteHorarios; } - public function initDocenteHorarios() + public function initRelAnioActividadDocentes() { - if ($this->collDocenteHorarios === null) { - $this->collDocenteHorarios = array(); + if ($this->collRelAnioActividadDocentes === null) { + $this->collRelAnioActividadDocentes = array(); } } - public function getDocenteHorarios($criteria = null, $con = null) + public function getRelAnioActividadDocentes($criteria = null, $con = null) { - include_once 'lib/model/om/BaseDocenteHorarioPeer.php'; + include_once 'lib/model/om/BaseRelAnioActividadDocentePeer.php'; if ($criteria === null) { $criteria = new Criteria(); } @@ -1548,36 +1548,36 @@ $criteria = clone $criteria; } - if ($this->collDocenteHorarios === null) { + if ($this->collRelAnioActividadDocentes === null) { if ($this->isNew()) { - $this->collDocenteHorarios = array(); + $this->collRelAnioActividadDocentes = array(); } else { - $criteria->add(DocenteHorarioPeer::FK_DOCENTE_ID, $this->getId()); + $criteria->add(RelAnioActividadDocentePeer::FK_DOCENTE_ID, $this->getId()); - DocenteHorarioPeer::addSelectColumns($criteria); - $this->collDocenteHorarios = DocenteHorarioPeer::doSelect($criteria, $con); + RelAnioActividadDocentePeer::addSelectColumns($criteria); + $this->collRelAnioActividadDocentes = RelAnioActividadDocentePeer::doSelect($criteria, $con); } } else { if (!$this->isNew()) { - $criteria->add(DocenteHorarioPeer::FK_DOCENTE_ID, $this->getId()); + $criteria->add(RelAnioActividadDocentePeer::FK_DOCENTE_ID, $this->getId()); - DocenteHorarioPeer::addSelectColumns($criteria); - if (!isset($this->lastDocenteHorarioCriteria) || !$this->lastDocenteHorarioCriteria->equals($criteria)) { - $this->collDocenteHorarios = DocenteHorarioPeer::doSelect($criteria, $con); + RelAnioActividadDocentePeer::addSelectColumns($criteria); + if (!isset($this->lastRelAnioActividadDocenteCriteria) || !$this->lastRelAnioActividadDocenteCriteria->equals($criteria)) { + $this->collRelAnioActividadDocentes = RelAnioActividadDocentePeer::doSelect($criteria, $con); } } } - $this->lastDocenteHorarioCriteria = $criteria; - return $this->collDocenteHorarios; + $this->lastRelAnioActividadDocenteCriteria = $criteria; + return $this->collRelAnioActividadDocentes; } - public function countDocenteHorarios($criteria = null, $distinct = false, $con = null) + public function countRelAnioActividadDocentes($criteria = null, $distinct = false, $con = null) { - include_once 'lib/model/om/BaseDocenteHorarioPeer.php'; + include_once 'lib/model/om/BaseRelAnioActividadDocentePeer.php'; if ($criteria === null) { $criteria = new Criteria(); } @@ -1586,23 +1586,23 @@ $criteria = clone $criteria; } - $criteria->add(DocenteHorarioPeer::FK_DOCENTE_ID, $this->getId()); + $criteria->add(RelAnioActividadDocentePeer::FK_DOCENTE_ID, $this->getId()); - return DocenteHorarioPeer::doCount($criteria, $distinct, $con); + return RelAnioActividadDocentePeer::doCount($criteria, $distinct, $con); } - public function addDocenteHorario(DocenteHorario $l) + public function addRelAnioActividadDocente(RelAnioActividadDocente $l) { - $this->collDocenteHorarios[] = $l; + $this->collRelAnioActividadDocentes[] = $l; $l->setDocente($this); } - public function getDocenteHorariosJoinEvento($criteria = null, $con = null) + public function getRelAnioActividadDocentesJoinRelAnioActividad($criteria = null, $con = null) { - include_once 'lib/model/om/BaseDocenteHorarioPeer.php'; + include_once 'lib/model/om/BaseRelAnioActividadDocentePeer.php'; if ($criteria === null) { $criteria = new Criteria(); } @@ -1611,26 +1611,26 @@ $criteria = clone $criteria; } - if ($this->collDocenteHorarios === null) { + if ($this->collRelAnioActividadDocentes === null) { if ($this->isNew()) { - $this->collDocenteHorarios = array(); + $this->collRelAnioActividadDocentes = array(); } else { - $criteria->add(DocenteHorarioPeer::FK_DOCENTE_ID, $this->getId()); + $criteria->add(RelAnioActividadDocentePeer::FK_DOCENTE_ID, $this->getId()); - $this->collDocenteHorarios = DocenteHorarioPeer::doSelectJoinEvento($criteria, $con); + $this->collRelAnioActividadDocentes = RelAnioActividadDocentePeer::doSelectJoinRelAnioActividad($criteria, $con); } } else { - $criteria->add(DocenteHorarioPeer::FK_DOCENTE_ID, $this->getId()); + $criteria->add(RelAnioActividadDocentePeer::FK_DOCENTE_ID, $this->getId()); - if (!isset($this->lastDocenteHorarioCriteria) || !$this->lastDocenteHorarioCriteria->equals($criteria)) { - $this->collDocenteHorarios = DocenteHorarioPeer::doSelectJoinEvento($criteria, $con); + if (!isset($this->lastRelAnioActividadDocenteCriteria) || !$this->lastRelAnioActividadDocenteCriteria->equals($criteria)) { + $this->collRelAnioActividadDocentes = RelAnioActividadDocentePeer::doSelectJoinRelAnioActividad($criteria, $con); } } - $this->lastDocenteHorarioCriteria = $criteria; + $this->lastRelAnioActividadDocenteCriteria = $criteria; - return $this->collDocenteHorarios; + return $this->collRelAnioActividadDocentes; } } \ No newline at end of file Deleted: prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocente.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocente.php 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocente.php 2007-08-13 18:57:58 UTC (rev 4949) @@ -1,432 +0,0 @@ -<?php - - -abstract class BaseRelActividadDocente extends BaseObject implements Persistent { - - - - protected static $peer; - - - - protected $fk_actividad_id; - - - - protected $fk_docente_id; - - - protected $aActividad; - - - protected $aDocente; - - - protected $alreadyInSave = false; - - - protected $alreadyInValidation = false; - - - public function getFkActividadId() - { - - return $this->fk_actividad_id; - } - - - public function getFkDocenteId() - { - - return $this->fk_docente_id; - } - - - public function setFkActividadId($v) - { - - if ($v !== null && !is_int($v) && is_numeric($v)) { - $v = (int) $v; - } - - if ($this->fk_actividad_id !== $v) { - $this->fk_actividad_id = $v; - $this->modifiedColumns[] = RelActividadDocentePeer::FK_ACTIVIDAD_ID; - } - - if ($this->aActividad !== null && $this->aActividad->getId() !== $v) { - $this->aActividad = null; - } - - } - - public function setFkDocenteId($v) - { - - if ($v !== null && !is_int($v) && is_numeric($v)) { - $v = (int) $v; - } - - if ($this->fk_docente_id !== $v) { - $this->fk_docente_id = $v; - $this->modifiedColumns[] = RelActividadDocentePeer::FK_DOCENTE_ID; - } - - if ($this->aDocente !== null && $this->aDocente->getId() !== $v) { - $this->aDocente = null; - } - - } - - public function hydrate(ResultSet $rs, $startcol = 1) - { - try { - - $this->fk_actividad_id = $rs->getInt($startcol + 0); - - $this->fk_docente_id = $rs->getInt($startcol + 1); - - $this->resetModified(); - - $this->setNew(false); - - return $startcol + 2; - } catch (Exception $e) { - throw new PropelException("Error populating RelActividadDocente object", $e); - } - } - - - public function delete($con = null) - { - if ($this->isDeleted()) { - throw new PropelException("This object has already been deleted."); - } - - if ($con === null) { - $con = Propel::getConnection(RelActividadDocentePeer::DATABASE_NAME); - } - - try { - $con->begin(); - RelActividadDocentePeer::doDelete($this, $con); - $this->setDeleted(true); - $con->commit(); - } catch (PropelException $e) { - $con->rollback(); - throw $e; - } - } - - - public function save($con = null) - { - if ($this->isDeleted()) { - throw new PropelException("You cannot save an object that has been deleted."); - } - - if ($con === null) { - $con = Propel::getConnection(RelActividadDocentePeer::DATABASE_NAME); - } - - try { - $con->begin(); - $affectedRows = $this->doSave($con); - $con->commit(); - return $affectedRows; - } catch (PropelException $e) { - $con->rollback(); - throw $e; - } - } - - - protected function doSave($con) - { - $affectedRows = 0; if (!$this->alreadyInSave) { - $this->alreadyInSave = true; - - - - 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); - } - $this->setDocente($this->aDocente); - } - - - if ($this->isModified()) { - if ($this->isNew()) { - $pk = RelActividadDocentePeer::doInsert($this, $con); - $affectedRows += 1; - $this->setNew(false); - } else { - $affectedRows += RelActividadDocentePeer::doUpdate($this, $con); - } - $this->resetModified(); } - - $this->alreadyInSave = false; - } - return $affectedRows; - } - - protected $validationFailures = array(); - - - public function getValidationFailures() - { - return $this->validationFailures; - } - - - public function validate($columns = null) - { - $res = $this->doValidate($columns); - if ($res === true) { - $this->validationFailures = array(); - return true; - } else { - $this->validationFailures = $res; - return false; - } - } - - - protected function doValidate($columns = null) - { - if (!$this->alreadyInValidation) { - $this->alreadyInValidation = true; - $retval = null; - - $failureMap = array(); - - - - 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 (($retval = RelActividadDocentePeer::doValidate($this, $columns)) !== true) { - $failureMap = array_merge($failureMap, $retval); - } - - - - $this->alreadyInValidation = false; - } - - return (!empty($failureMap) ? $failureMap : true); - } - - - public function getByName($name, $type = BasePeer::TYPE_PHPNAME) - { - $pos = RelActividadDocentePeer::translateFieldName($name, $type, BasePeer::TYPE_NUM); - return $this->getByPosition($pos); - } - - - public function getByPosition($pos) - { - switch($pos) { - case 0: - return $this->getFkActividadId(); - break; - case 1: - return $this->getFkDocenteId(); - break; - default: - return null; - break; - } } - - - public function toArray($keyType = BasePeer::TYPE_PHPNAME) - { - $keys = RelActividadDocentePeer::getFieldNames($keyType); - $result = array( - $keys[0] => $this->getFkActividadId(), - $keys[1] => $this->getFkDocenteId(), - ); - return $result; - } - - - public function setByName($name, $value, $type = BasePeer::TYPE_PHPNAME) - { - $pos = RelActividadDocentePeer::translateFieldName($name, $type, BasePeer::TYPE_NUM); - return $this->setByPosition($pos, $value); - } - - - public function setByPosition($pos, $value) - { - switch($pos) { - case 0: - $this->setFkActividadId($value); - break; - case 1: - $this->setFkDocenteId($value); - break; - } } - - - public function fromArray($arr, $keyType = BasePeer::TYPE_PHPNAME) - { - $keys = RelActividadDocentePeer::getFieldNames($keyType); - - if (array_key_exists($keys[0], $arr)) $this->setFkActividadId($arr[$keys[0]]); - if (array_key_exists($keys[1], $arr)) $this->setFkDocenteId($arr[$keys[1]]); - } - - - public function buildCriteria() - { - $criteria = new Criteria(RelActividadDocentePeer::DATABASE_NAME); - - if ($this->isColumnModified(RelActividadDocentePeer::FK_ACTIVIDAD_ID)) $criteria->add(RelActividadDocentePeer::FK_ACTIVIDAD_ID, $this->fk_actividad_id); - if ($this->isColumnModified(RelActividadDocentePeer::FK_DOCENTE_ID)) $criteria->add(RelActividadDocentePeer::FK_DOCENTE_ID, $this->fk_docente_id); - - return $criteria; - } - - - public function buildPkeyCriteria() - { - $criteria = new Criteria(RelActividadDocentePeer::DATABASE_NAME); - - $criteria->add(RelActividadDocentePeer::FK_ACTIVIDAD_ID, $this->fk_actividad_id); - $criteria->add(RelActividadDocentePeer::FK_DOCENTE_ID, $this->fk_docente_id); - - return $criteria; - } - - - public function getPrimaryKey() - { - $pks = array(); - - $pks[0] = $this->getFkActividadId(); - - $pks[1] = $this->getFkDocenteId(); - - return $pks; - } - - - public function setPrimaryKey($keys) - { - - $this->setFkActividadId($keys[0]); - - $this->setFkDocenteId($keys[1]); - - } - - - public function copyInto($copyObj, $deepCopy = false) - { - - - $copyObj->setNew(true); - - $copyObj->setFkActividadId(NULL); - $copyObj->setFkDocenteId(NULL); - } - - - public function copy($deepCopy = false) - { - $clazz = get_class($this); - $copyObj = new $clazz(); - $this->copyInto($copyObj, $deepCopy); - return $copyObj; - } - - - public function getPeer() - { - if (self::$peer === null) { - self::$peer = new RelActividadDocentePeer(); - } - return self::$peer; - } - - - public function setActividad($v) - { - - - if ($v === null) { - $this->setFkActividadId(NULL); - } else { - $this->setFkActividadId($v->getId()); - } - - - $this->aActividad = $v; - } - - - - public function getActividad($con = null) - { - include_once 'lib/model/om/BaseActividadPeer.php'; - - if ($this->aActividad === null && ($this->fk_actividad_id !== null)) { - - $this->aActividad = ActividadPeer::retrieveByPK($this->fk_actividad_id, $con); - - - } - return $this->aActividad; - } - - - public function setDocente($v) - { - - - if ($v === null) { - $this->setFkDocenteId(NULL); - } else { - $this->setFkDocenteId($v->getId()); - } - - - $this->aDocente = $v; - } - - - - public function getDocente($con = null) - { - include_once 'lib/model/om/BaseDocentePeer.php'; - - if ($this->aDocente === null && ($this->fk_docente_id !== null)) { - - $this->aDocente = DocentePeer::retrieveByPK($this->fk_docente_id, $con); - - - } - return $this->aDocente; - } - -} \ No newline at end of file Deleted: prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocentePeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocentePeer.php 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocentePeer.php 2007-08-13 18:57:58 UTC (rev 4949) @@ -1,796 +0,0 @@ -<?php - - -abstract class BaseRelActividadDocentePeer { - - - const DATABASE_NAME = 'alba'; - - - const TABLE_NAME = 'rel_actividad_docente'; - - - const CLASS_DEFAULT = 'lib.model.RelActividadDocente'; - - - const NUM_COLUMNS = 2; - - - const NUM_LAZY_LOAD_COLUMNS = 0; - - - - const FK_ACTIVIDAD_ID = 'rel_actividad_docente.FK_ACTIVIDAD_ID'; - - - const FK_DOCENTE_ID = 'rel_actividad_docente.FK_DOCENTE_ID'; - - - private static $phpNameMap = null; - - - - private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('FkActividadId', 'FkDocenteId', ), - BasePeer::TYPE_COLNAME => array (RelActividadDocentePeer::FK_ACTIVIDAD_ID, RelActividadDocentePeer::FK_DOCENTE_ID, ), - BasePeer::TYPE_FIELDNAME => array ('fk_actividad_id', 'fk_docente_id', ), - BasePeer::TYPE_NUM => array (0, 1, ) - ); - - - private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('FkActividadId' => 0, 'FkDocenteId' => 1, ), - BasePeer::TYPE_COLNAME => array (RelActividadDocentePeer::FK_ACTIVIDAD_ID => 0, RelActividadDocentePeer::FK_DOCENTE_ID => 1, ), - BasePeer::TYPE_FIELDNAME => array ('fk_actividad_id' => 0, 'fk_docente_id' => 1, ), - BasePeer::TYPE_NUM => array (0, 1, ) - ); - - - public static function getMapBuilder() - { - include_once 'lib/model/map/RelActividadDocenteMapBuilder.php'; - return BasePeer::getMapBuilder('lib.model.map.RelActividadDocenteMapBuilder'); - } - - public static function getPhpNameMap() - { - if (self::$phpNameMap === null) { - $map = RelActividadDocentePeer::getTableMap(); - $columns = $map->getColumns(); - $nameMap = array(); - foreach ($columns as $column) { - $nameMap[$column->getPhpName()] = $column->getColumnName(); - } - self::$phpNameMap = $nameMap; - } - return self::$phpNameMap; - } - - static public function translateFieldName($name, $fromType, $toType) - { - $toNames = self::getFieldNames($toType); - $key = isset(self::$fieldKeys[$fromType][$name]) ? self::$fieldKeys[$fromType][$name] : null; - if ($key === null) { - throw new PropelException("'$name' could not be found in the field names of type '$fromType'. These are: " . print_r(self::$fieldKeys[$fromType], true)); - } - return $toNames[$key]; - } - - - - static public function getFieldNames($type = BasePeer::TYPE_PHPNAME) - { - if (!array_key_exists($type, self::$fieldNames)) { - throw new PropelException('Method getFieldNames() expects the parameter $type to be one of the class constants TYPE_PHPNAME, TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM. ' . $type . ' was given.'); - } - return self::$fieldNames[$type]; - } - - - public static function alias($alias, $column) - { - return str_replace(RelActividadDocentePeer::TABLE_NAME.'.', $alias.'.', $column); - } - - - public static function addSelectColumns(Criteria $criteria) - { - - $criteria->addSelectColumn(RelActividadDocentePeer::FK_ACTIVIDAD_ID); - - $criteria->addSelectColumn(RelActividadDocentePeer::FK_DOCENTE_ID); - - } - - const COUNT = 'COUNT(rel_actividad_docente.FK_ACTIVIDAD_ID)'; - const COUNT_DISTINCT = 'COUNT(DISTINCT rel_actividad_docente.FK_ACTIVIDAD_ID)'; - - - public static function doCount(Criteria $criteria, $distinct = false, $con = null) - { - $criteria = clone $criteria; - - $criteria->clearSelectColumns()->clearOrderByColumns(); - if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { - $criteria->addSelectColumn(RelActividadDocentePeer::COUNT_DISTINCT); - } else { - $criteria->addSelectColumn(RelActividadDocentePeer::COUNT); - } - - foreach($criteria->getGroupByColumns() as $column) - { - $criteria->addSelectColumn($column); - } - - $rs = RelActividadDocentePeer::doSelectRS($criteria, $con); - if ($rs->next()) { - return $rs->getInt(1); - } else { - return 0; - } - } - - public static function doSelectOne(Criteria $criteria, $con = null) - { - $critcopy = clone $criteria; - $critcopy->setLimit(1); - $objects = RelActividadDocentePeer::doSelect($critcopy, $con); - if ($objects) { - return $objects[0]; - } - return null; - } - - public static function doSelect(Criteria $criteria, $con = null) - { - return RelActividadDocentePeer::populateObjects(RelActividadDocentePeer::doSelectRS($criteria, $con)); - } - - public static function doSelectRS(Criteria $criteria, $con = null) - { - if ($con === null) { - $con = Propel::getConnection(self::DATABASE_NAME); - } - - if (!$criteria->getSelectColumns()) { - $criteria = clone $criteria; - RelActividadDocentePeer::addSelectColumns($criteria); - } - - $criteria->setDbName(self::DATABASE_NAME); - - return BasePeer::doSelect($criteria, $con); - } - - public static function populateObjects(ResultSet $rs) - { - $results = array(); - - $cls = RelActividadDocentePeer::getOMClass(); - $cls = Propel::import($cls); - while($rs->next()) { - - $obj = new $cls(); - $obj->hydrate($rs); - $results[] = $obj; - - } - return $results; - } - - - public static function doCountJoinActividad(Criteria $criteria, $distinct = false, $con = null) - { - $criteria = clone $criteria; - - $criteria->clearSelectColumns()->clearOrderByColumns(); - if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { - $criteria->addSelectColumn(RelActividadDocentePeer::COUNT_DISTINCT); - } else { - $criteria->addSelectColumn(RelActividadDocentePeer::COUNT); - } - - foreach($criteria->getGroupByColumns() as $column) - { - $criteria->addSelectColumn($column); - } - - $criteria->addJoin(RelActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); - - $rs = RelActividadDocentePeer::doSelectRS($criteria, $con); - if ($rs->next()) { - return $rs->getInt(1); - } else { - return 0; - } - } - - - - public static function doCountJoinDocente(Criteria $criteria, $distinct = false, $con = null) - { - $criteria = clone $criteria; - - $criteria->clearSelectColumns()->clearOrderByColumns(); - if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { - $criteria->addSelectColumn(RelActividadDocentePeer::COUNT_DISTINCT); - } else { - $criteria->addSelectColumn(RelActividadDocentePeer::COUNT); - } - - foreach($criteria->getGroupByColumns() as $column) - { - $criteria->addSelectColumn($column); - } - - $criteria->addJoin(RelActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); - - $rs = RelActividadDocentePeer::doSelectRS($criteria, $con); - if ($rs->next()) { - return $rs->getInt(1); - } else { - return 0; - } - } - - - - public static function doSelectJoinActividad(Criteria $c, $con = null) - { - $c = clone $c; - - if ($c->getDbName() == Propel::getDefaultDB()) { - $c->setDbName(self::DATABASE_NAME); - } - - RelActividadDocentePeer::addSelectColumns($c); - $startcol = (RelActividadDocentePeer::NUM_COLUMNS - RelActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - ActividadPeer::addSelectColumns($c); - - $c->addJoin(RelActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); - $rs = BasePeer::doSelect($c, $con); - $results = array(); - - while($rs->next()) { - - $omClass = RelActividadDocentePeer::getOMClass(); - - $cls = Propel::import($omClass); - $obj1 = new $cls(); - $obj1->hydrate($rs); - - $omClass = ActividadPeer::getOMClass(); - - $cls = Propel::import($omClass); - $obj2 = new $cls(); - $obj2->hydrate($rs, $startcol); - - $newObject = true; - foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getActividad(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { - $newObject = false; - $temp_obj2->addRelActividadDocente($obj1); break; - } - } - if ($newObject) { - $obj2->initRelActividadDocentes(); - $obj2->addRelActividadDocente($obj1); } - $results[] = $obj1; - } - return $results; - } - - - - public static function doSelectJoinDocente(Criteria $c, $con = null) - { - $c = clone $c; - - if ($c->getDbName() == Propel::getDefaultDB()) { - $c->setDbName(self::DATABASE_NAME); - } - - RelActividadDocentePeer::addSelectColumns($c); - $startcol = (RelActividadDocentePeer::NUM_COLUMNS - RelActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - DocentePeer::addSelectColumns($c); - - $c->addJoin(RelActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); - $rs = BasePeer::doSelect($c, $con); - $results = array(); - - while($rs->next()) { - - $omClass = RelActividadDocentePeer::getOMClass(); - - $cls = Propel::import($omClass); - $obj1 = new $cls(); - $obj1->hydrate($rs); - - $omClass = DocentePeer::getOMClass(); - - $cls = Propel::import($omClass); - $obj2 = new $cls(); - $obj2->hydrate($rs, $startcol); - - $newObject = true; - foreach($results as $temp_obj1) { - $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { - $newObject = false; - $temp_obj2->addRelActividadDocente($obj1); break; - } - } - if ($newObject) { - $obj2->initRelActividadDocentes(); - $obj2->addRelActividadDocente($obj1); } - $results[] = $obj1; - } - return $results; - } - - - - public static function doCountJoinAll(Criteria $criteria, $distinct = false, $con = null) - { - $criteria = clone $criteria; - - $criteria->clearSelectColumns()->clearOrderByColumns(); - if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { - $criteria->addSelectColumn(RelActividadDocentePeer::COUNT_DISTINCT); - } else { - $criteria->addSelectColumn(RelActividadDocentePeer::COUNT); - } - - foreach($criteria->getGroupByColumns() as $column) - { - $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()) { - return $rs->getInt(1); - } else { - return 0; - } - } - - - - public static function doSelectJoinAll(Criteria $c, $con = null) - { - $c = clone $c; - - if ($c->getDbName() == Propel::getDefaultDB()) { - $c->setDbName(self::DATABASE_NAME); - } - - RelActividadDocentePeer::addSelectColumns($c); - $startcol2 = (RelActividadDocentePeer::NUM_COLUMNS - RelActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - - ActividadPeer::addSelectColumns($c); - $startcol3 = $startcol2 + ActividadPeer::NUM_COLUMNS; - - DocentePeer::addSelectColumns($c); - $startcol4 = $startcol3 + DocentePeer::NUM_COLUMNS; - - $c->addJoin(RelActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); - - $c->addJoin(RelActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); - - $rs = BasePeer::doSelect($c, $con); - $results = array(); - - while($rs->next()) { - - $omClass = RelActividadDocentePeer::getOMClass(); - - - $cls = Propel::import($omClass); - $obj1 = new $cls(); - $obj1->hydrate($rs); - - - - $omClass = ActividadPeer::getOMClass(); - - - $cls = Propel::import($omClass); - $obj2 = new $cls(); - $obj2->hydrate($rs, $startcol2); - - $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()) { - $newObject = false; - $temp_obj2->addRelActividadDocente($obj1); break; - } - } - - if ($newObject) { - $obj2->initRelActividadDocentes(); - $obj2->addRelActividadDocente($obj1); - } - - - - $omClass = DocentePeer::getOMClass(); - - - $cls = Propel::import($omClass); - $obj3 = new $cls(); - $obj3->hydrate($rs, $startcol3); - - $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()) { - $newObject = false; - $temp_obj3->addRelActividadDocente($obj1); break; - } - } - - if ($newObject) { - $obj3->initRelActividadDocentes(); - $obj3->addRelActividadDocente($obj1); - } - - $results[] = $obj1; - } - return $results; - } - - - - public static function doCountJoinAllExceptActividad(Criteria $criteria, $distinct = false, $con = null) - { - $criteria = clone $criteria; - - $criteria->clearSelectColumns()->clearOrderByColumns(); - if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { - $criteria->addSelectColumn(RelActividadDocentePeer::COUNT_DISTINCT); - } else { - $criteria->addSelectColumn(RelActividadDocentePeer::COUNT); - } - - foreach($criteria->getGroupByColumns() as $column) - { - $criteria->addSelectColumn($column); - } - - $criteria->addJoin(RelActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); - - $rs = RelActividadDocentePeer::doSelectRS($criteria, $con); - if ($rs->next()) { - return $rs->getInt(1); - } else { - return 0; - } - } - - - - public static function doCountJoinAllExceptDocente(Criteria $criteria, $distinct = false, $con = null) - { - $criteria = clone $criteria; - - $criteria->clearSelectColumns()->clearOrderByColumns(); - if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { - $criteria->addSelectColumn(RelActividadDocentePeer::COUNT_DISTINCT); - } else { - $criteria->addSelectColumn(RelActividadDocentePeer::COUNT); - } - - foreach($criteria->getGroupByColumns() as $column) - { - $criteria->addSelectColumn($column); - } - - $criteria->addJoin(RelActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); - - $rs = RelActividadDocentePeer::doSelectRS($criteria, $con); - if ($rs->next()) { - return $rs->getInt(1); - } else { - return 0; - } - } - - - - public static function doSelectJoinAllExceptActividad(Criteria $c, $con = null) - { - $c = clone $c; - - if ($c->getDbName() == Propel::getDefaultDB()) { - $c->setDbName(self::DATABASE_NAME); - } - - RelActividadDocentePeer::addSelectColumns($c); - $startcol2 = (RelActividadDocentePeer::NUM_COLUMNS - RelActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - - DocentePeer::addSelectColumns($c); - $startcol3 = $startcol2 + DocentePeer::NUM_COLUMNS; - - $c->addJoin(RelActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); - - - $rs = BasePeer::doSelect($c, $con); - $results = array(); - - while($rs->next()) { - - $omClass = RelActividadDocentePeer::getOMClass(); - - $cls = Propel::import($omClass); - $obj1 = new $cls(); - $obj1->hydrate($rs); - - $omClass = DocentePeer::getOMClass(); - - - $cls = Propel::import($omClass); - $obj2 = new $cls(); - $obj2->hydrate($rs, $startcol2); - - $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()) { - $newObject = false; - $temp_obj2->addRelActividadDocente($obj1); - break; - } - } - - if ($newObject) { - $obj2->initRelActividadDocentes(); - $obj2->addRelActividadDocente($obj1); - } - - $results[] = $obj1; - } - return $results; - } - - - - public static function doSelectJoinAllExceptDocente(Criteria $c, $con = null) - { - $c = clone $c; - - if ($c->getDbName() == Propel::getDefaultDB()) { - $c->setDbName(self::DATABASE_NAME); - } - - RelActividadDocentePeer::addSelectColumns($c); - $startcol2 = (RelActividadDocentePeer::NUM_COLUMNS - RelActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; - - ActividadPeer::addSelectColumns($c); - $startcol3 = $startcol2 + ActividadPeer::NUM_COLUMNS; - - $c->addJoin(RelActividadDocentePeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); - - - $rs = BasePeer::doSelect($c, $con); - $results = array(); - - while($rs->next()) { - - $omClass = RelActividadDocentePeer::getOMClass(); - - $cls = Propel::import($omClass); - $obj1 = new $cls(); - $obj1->hydrate($rs); - - $omClass = ActividadPeer::getOMClass(); - - - $cls = Propel::import($omClass); - $obj2 = new $cls(); - $obj2->hydrate($rs, $startcol2); - - $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()) { - $newObject = false; - $temp_obj2->addRelActividadDocente($obj1); - break; - } - } - - if ($newObject) { - $obj2->initRelActividadDocentes(); - $obj2->addRelActividadDocente($obj1); - } - - $results[] = $obj1; - } - return $results; - } - - - public static function getTableMap() - { - return Propel::getDatabaseMap(self::DATABASE_NAME)->getTable(self::TABLE_NAME); - } - - - public static function getOMClass() - { - return RelActividadDocentePeer::CLASS_DEFAULT; - } - - - public static function doInsert($values, $con = null) - { - if ($con === null) { - $con = Propel::getConnection(self::DATABASE_NAME); - } - - if ($values instanceof Criteria) { - $criteria = clone $values; } else { - $criteria = $values->buildCriteria(); } - - - $criteria->setDbName(self::DATABASE_NAME); - - try { - $con->begin(); - $pk = BasePeer::doInsert($criteria, $con); - $con->commit(); - } catch(PropelException $e) { - $con->rollback(); - throw $e; - } - - return $pk; - } - - - public static function doUpdate($values, $con = null) - { - if ($con === null) { - $con = Propel::getConnection(self::DATABASE_NAME); - } - - $selectCriteria = new Criteria(self::DATABASE_NAME); - - if ($values instanceof Criteria) { - $criteria = clone $values; - $comparison = $criteria->getComparison(RelActividadDocentePeer::FK_ACTIVIDAD_ID); - $selectCriteria->add(RelActividadDocentePeer::FK_ACTIVIDAD_ID, $criteria->remove(RelActividadDocentePeer::FK_ACTIVIDAD_ID), $comparison); - - $comparison = $criteria->getComparison(RelActividadDocentePeer::FK_DOCENTE_ID); - $selectCriteria->add(RelActividadDocentePeer::FK_DOCENTE_ID, $criteria->remove(RelActividadDocentePeer::FK_DOCENTE_ID), $comparison); - - } else { $criteria = $values->buildCriteria(); $selectCriteria = $values->buildPkeyCriteria(); } - - $criteria->setDbName(self::DATABASE_NAME); - - return BasePeer::doUpdate($selectCriteria, $criteria, $con); - } - - - public static function doDeleteAll($con = null) - { - if ($con === null) { - $con = Propel::getConnection(self::DATABASE_NAME); - } - $affectedRows = 0; try { - $con->begin(); - $affectedRows += BasePeer::doDeleteAll(RelActividadDocentePeer::TABLE_NAME, $con); - $con->commit(); - return $affectedRows; - } catch (PropelException $e) { - $con->rollback(); - throw $e; - } - } - - - public static function doDelete($values, $con = null) - { - if ($con === null) { - $con = Propel::getConnection(RelActividadDocentePeer::DATABASE_NAME); - } - - if ($values instanceof Criteria) { - $criteria = clone $values; } elseif ($values instanceof RelActividadDocente) { - - $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) - { - - $vals[0][] = $value[0]; - $vals[1][] = $value[1]; - } - - $criteria->add(RelActividadDocentePeer::FK_ACTIVIDAD_ID, $vals[0], Criteria::IN); - $criteria->add(RelActividadDocentePeer::FK_DOCENTE_ID, $vals[1], Criteria::IN); - } - - $criteria->setDbName(self::DATABASE_NAME); - - $affectedRows = 0; - try { - $con->begin(); - - $affectedRows += BasePeer::doDelete($criteria, $con); - $con->commit(); - return $affectedRows; - } catch (PropelException $e) { - $con->rollback(); - throw $e; - } - } - - - public static function doValidate(RelActividadDocente $obj, $cols = null) - { - $columns = array(); - - if ($cols) { - $dbMap = Propel::getDatabaseMap(RelActividadDocentePeer::DATABASE_NAME); - $tableMap = $dbMap->getTable(RelActividadDocentePeer::TABLE_NAME); - - if (! is_array($cols)) { - $cols = array($cols); - } - - foreach($cols as $colName) { - if ($tableMap->containsColumn($colName)) { - $get = 'get' . $tableMap->getColumn($colName)->getPhpName(); - $columns[$colName] = $obj->$get(); - } - } - } else { - - } - - $res = BasePeer::doValidate(RelActividadDocentePeer::DATABASE_NAME, RelActividadDocentePeer::TABLE_NAME, $columns); - if ($res !== true) { - $request = sfContext::getInstance()->getRequest(); - foreach ($res as $failed) { - $col = RelActividadDocentePeer::translateFieldname($failed->getColumn(), BasePeer::TYPE_COLNAME, BasePeer::TYPE_PHPNAME); - $request->setError($col, $failed->getMessage()); - } - } - - return $res; - } - - - public static function retrieveByPK( $fk_actividad_id, $fk_docente_id, $con = null) { - if ($con === null) { - $con = Propel::getConnection(self::DATABASE_NAME); - } - $criteria = new Criteria(); - $criteria->add(RelActividadDocentePeer::FK_ACTIVIDAD_ID, $fk_actividad_id); - $criteria->add(RelActividadDocentePeer::FK_DOCENTE_ID, $fk_docente_id); - $v = RelActividadDocentePeer::doSelect($criteria, $con); - - return !empty($v) ? $v[0] : null; - } -} -if (Propel::isInit()) { - try { - BaseRelActividadDocentePeer::getMapBuilder(); - } catch (Exception $e) { - Propel::log('Could not initialize Peer: ' . $e->getMessage(), Propel::LOG_ERR); - } -} else { - require_once 'lib/model/map/RelActividadDocenteMapBuilder.php'; - Propel::registerMapBuilder('lib.model.map.RelActividadDocenteMapBuilder'); -} Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividad.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividad.php 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividad.php 2007-08-13 18:57:58 UTC (rev 4949) @@ -37,6 +37,12 @@ protected $aOrientacion; + protected $collRelAnioActividadDocentes; + + + protected $lastRelAnioActividadDocenteCriteria = null; + + protected $alreadyInSave = false; @@ -265,6 +271,14 @@ } $this->resetModified(); } + if ($this->collRelAnioActividadDocentes !== null) { + foreach($this->collRelAnioActividadDocentes as $referrerFK) { + if (!$referrerFK->isDeleted()) { + $affectedRows += $referrerFK->save($con); + } + } + } + $this->alreadyInSave = false; } return $affectedRows; @@ -326,7 +340,15 @@ } + if ($this->collRelAnioActividadDocentes !== null) { + foreach($this->collRelAnioActividadDocentes as $referrerFK) { + if (!$referrerFK->validate($columns)) { + $failureMap = array_merge($failureMap, $referrerFK->getValidationFailures()); + } + } + } + $this->alreadyInValidation = false; } @@ -467,6 +489,15 @@ $copyObj->setHoras($this->horas); + if ($deepCopy) { + $copyObj->setNew(false); + + foreach($this->getRelAnioActividadDocentes() as $relObj) { + $copyObj->addRelAnioActividadDocente($relObj->copy($deepCopy)); + } + + } + $copyObj->setNew(true); $copyObj->setId(NULL); @@ -580,4 +611,109 @@ return $this->aOrientacion; } + + public function initRelAnioActividadDocentes() + { + if ($this->collRelAnioActividadDocentes === null) { + $this->collRelAnioActividadDocentes = array(); + } + } + + + public function getRelAnioActividadDocentes($criteria = null, $con = null) + { + include_once 'lib/model/om/BaseRelAnioActividadDocentePeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + if ($this->collRelAnioActividadDocentes === null) { + if ($this->isNew()) { + $this->collRelAnioActividadDocentes = array(); + } else { + + $criteria->add(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $this->getId()); + + RelAnioActividadDocentePeer::addSelectColumns($criteria); + $this->collRelAnioActividadDocentes = RelAnioActividadDocentePeer::doSelect($criteria, $con); + } + } else { + if (!$this->isNew()) { + + + $criteria->add(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $this->getId()); + + RelAnioActividadDocentePeer::addSelectColumns($criteria); + if (!isset($this->lastRelAnioActividadDocenteCriteria) || !$this->lastRelAnioActividadDocenteCriteria->equals($criteria)) { + $this->collRelAnioActividadDocentes = RelAnioActividadDocentePeer::doSelect($criteria, $con); + } + } + } + $this->lastRelAnioActividadDocenteCriteria = $criteria; + return $this->collRelAnioActividadDocentes; + } + + + public function countRelAnioActividadDocentes($criteria = null, $distinct = false, $con = null) + { + include_once 'lib/model/om/BaseRelAnioActividadDocentePeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + $criteria->add(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $this->getId()); + + return RelAnioActividadDocentePeer::doCount($criteria, $distinct, $con); + } + + + public function addRelAnioActividadDocente(RelAnioActividadDocente $l) + { + $this->collRelAnioActividadDocentes[] = $l; + $l->setRelAnioActividad($this); + } + + + + public function getRelAnioActividadDocentesJoinDocente($criteria = null, $con = null) + { + include_once 'lib/model/om/BaseRelAnioActividadDocentePeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + if ($this->collRelAnioActividadDocentes === null) { + if ($this->isNew()) { + $this->collRelAnioActividadDocentes = array(); + } else { + + $criteria->add(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $this->getId()); + + $this->collRelAnioActividadDocentes = RelAnioActividadDocentePeer::doSelectJoinDocente($criteria, $con); + } + } else { + + $criteria->add(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $this->getId()); + + if (!isset($this->lastRelAnioActividadDocenteCriteria) || !$this->lastRelAnioActividadDocenteCriteria->equals($criteria)) { + $this->collRelAnioActividadDocentes = RelAnioActividadDocentePeer::doSelectJoinDocente($criteria, $con); + } + } + $this->lastRelAnioActividadDocenteCriteria = $criteria; + + return $this->collRelAnioActividadDocentes; + } + } \ No newline at end of file Added: prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadDocente.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadDocente.php 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadDocente.php 2007-08-13 18:57:58 UTC (rev 4949) @@ -0,0 +1,432 @@ +<?php + + +abstract class BaseRelAnioActividadDocente extends BaseObject implements Persistent { + + + + protected static $peer; + + + + protected $fk_anio_actividad_id; + + + + protected $fk_docente_id; + + + protected $aRelAnioActividad; + + + protected $aDocente; + + + protected $alreadyInSave = false; + + + protected $alreadyInValidation = false; + + + public function getFkAnioActividadId() + { + + return $this->fk_anio_actividad_id; + } + + + public function getFkDocenteId() + { + + return $this->fk_docente_id; + } + + + public function setFkAnioActividadId($v) + { + + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->fk_anio_actividad_id !== $v) { + $this->fk_anio_actividad_id = $v; + $this->modifiedColumns[] = RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID; + } + + if ($this->aRelAnioActividad !== null && $this->aRelAnioActividad->getId() !== $v) { + $this->aRelAnioActividad = null; + } + + } + + public function setFkDocenteId($v) + { + + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->fk_docente_id !== $v) { + $this->fk_docente_id = $v; + $this->modifiedColumns[] = RelAnioActividadDocentePeer::FK_DOCENTE_ID; + } + + if ($this->aDocente !== null && $this->aDocente->getId() !== $v) { + $this->aDocente = null; + } + + } + + public function hydrate(ResultSet $rs, $startcol = 1) + { + try { + + $this->fk_anio_actividad_id = $rs->getInt($startcol + 0); + + $this->fk_docente_id = $rs->getInt($startcol + 1); + + $this->resetModified(); + + $this->setNew(false); + + return $startcol + 2; + } catch (Exception $e) { + throw new PropelException("Error populating RelAnioActividadDocente object", $e); + } + } + + + public function delete($con = null) + { + if ($this->isDeleted()) { + throw new PropelException("This object has already been deleted."); + } + + if ($con === null) { + $con = Propel::getConnection(RelAnioActividadDocentePeer::DATABASE_NAME); + } + + try { + $con->begin(); + RelAnioActividadDocentePeer::doDelete($this, $con); + $this->setDeleted(true); + $con->commit(); + } catch (PropelException $e) { + $con->rollback(); + throw $e; + } + } + + + public function save($con = null) + { + if ($this->isDeleted()) { + throw new PropelException("You cannot save an object that has been deleted."); + } + + if ($con === null) { + $con = Propel::getConnection(RelAnioActividadDocentePeer::DATABASE_NAME); + } + + try { + $con->begin(); + $affectedRows = $this->doSave($con); + $con->commit(); + return $affectedRows; + } catch (PropelException $e) { + $con->rollback(); + throw $e; + } + } + + + protected function doSave($con) + { + $affectedRows = 0; if (!$this->alreadyInSave) { + $this->alreadyInSave = true; + + + + if ($this->aRelAnioActividad !== null) { + if ($this->aRelAnioActividad->isModified()) { + $affectedRows += $this->aRelAnioActividad->save($con); + } + $this->setRelAnioActividad($this->aRelAnioActividad); + } + + if ($this->aDocente !== null) { + if ($this->aDocente->isModified()) { + $affectedRows += $this->aDocente->save($con); + } + $this->setDocente($this->aDocente); + } + + + if ($this->isModified()) { + if ($this->isNew()) { + $pk = RelAnioActividadDocentePeer::doInsert($this, $con); + $affectedRows += 1; + $this->setNew(false); + } else { + $affectedRows += RelAnioActividadDocentePeer::doUpdate($this, $con); + } + $this->resetModified(); } + + $this->alreadyInSave = false; + } + return $affectedRows; + } + + protected $validationFailures = array(); + + + public function getValidationFailures() + { + return $this->validationFailures; + } + + + public function validate($columns = null) + { + $res = $this->doValidate($columns); + if ($res === true) { + $this->validationFailures = array(); + return true; + } else { + $this->validationFailures = $res; + return false; + } + } + + + protected function doValidate($columns = null) + { + if (!$this->alreadyInValidation) { + $this->alreadyInValidation = true; + $retval = null; + + $failureMap = array(); + + + + if ($this->aRelAnioActividad !== null) { + if (!$this->aRelAnioActividad->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aRelAnioActividad->getValidationFailures()); + } + } + + if ($this->aDocente !== null) { + if (!$this->aDocente->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aDocente->getValidationFailures()); + } + } + + + if (($retval = RelAnioActividadDocentePeer::doValidate($this, $columns)) !== true) { + $failureMap = array_merge($failureMap, $retval); + } + + + + $this->alreadyInValidation = false; + } + + return (!empty($failureMap) ? $failureMap : true); + } + + + public function getByName($name, $type = BasePeer::TYPE_PHPNAME) + { + $pos = RelAnioActividadDocentePeer::translateFieldName($name, $type, BasePeer::TYPE_NUM); + return $this->getByPosition($pos); + } + + + public function getByPosition($pos) + { + switch($pos) { + case 0: + return $this->getFkAnioActividadId(); + break; + case 1: + return $this->getFkDocenteId(); + break; + default: + return null; + break; + } } + + + public function toArray($keyType = BasePeer::TYPE_PHPNAME) + { + $keys = RelAnioActividadDocentePeer::getFieldNames($keyType); + $result = array( + $keys[0] => $this->getFkAnioActividadId(), + $keys[1] => $this->getFkDocenteId(), + ); + return $result; + } + + + public function setByName($name, $value, $type = BasePeer::TYPE_PHPNAME) + { + $pos = RelAnioActividadDocentePeer::translateFieldName($name, $type, BasePeer::TYPE_NUM); + return $this->setByPosition($pos, $value); + } + + + public function setByPosition($pos, $value) + { + switch($pos) { + case 0: + $this->setFkAnioActividadId($value); + break; + case 1: + $this->setFkDocenteId($value); + break; + } } + + + public function fromArray($arr, $keyType = BasePeer::TYPE_PHPNAME) + { + $keys = RelAnioActividadDocentePeer::getFieldNames($keyType); + + if (array_key_exists($keys[0], $arr)) $this->setFkAnioActividadId($arr[$keys[0]]); + if (array_key_exists($keys[1], $arr)) $this->setFkDocenteId($arr[$keys[1]]); + } + + + public function buildCriteria() + { + $criteria = new Criteria(RelAnioActividadDocentePeer::DATABASE_NAME); + + if ($this->isColumnModified(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID)) $criteria->add(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $this->fk_anio_actividad_id); + if ($this->isColumnModified(RelAnioActividadDocentePeer::FK_DOCENTE_ID)) $criteria->add(RelAnioActividadDocentePeer::FK_DOCENTE_ID, $this->fk_docente_id); + + return $criteria; + } + + + public function buildPkeyCriteria() + { + $criteria = new Criteria(RelAnioActividadDocentePeer::DATABASE_NAME); + + $criteria->add(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $this->fk_anio_actividad_id); + $criteria->add(RelAnioActividadDocentePeer::FK_DOCENTE_ID, $this->fk_docente_id); + + return $criteria; + } + + + public function getPrimaryKey() + { + $pks = array(); + + $pks[0] = $this->getFkAnioActividadId(); + + $pks[1] = $this->getFkDocenteId(); + + return $pks; + } + + + public function setPrimaryKey($keys) + { + + $this->setFkAnioActividadId($keys[0]); + + $this->setFkDocenteId($keys[1]); + + } + + + public function copyInto($copyObj, $deepCopy = false) + { + + + $copyObj->setNew(true); + + $copyObj->setFkAnioActividadId(NULL); + $copyObj->setFkDocenteId(NULL); + } + + + public function copy($deepCopy = false) + { + $clazz = get_class($this); + $copyObj = new $clazz(); + $this->copyInto($copyObj, $deepCopy); + return $copyObj; + } + + + public function getPeer() + { + if (self::$peer === null) { + self::$peer = new RelAnioActividadDocentePeer(); + } + return self::$peer; + } + + + public function setRelAnioActividad($v) + { + + + if ($v === null) { + $this->setFkAnioActividadId(NULL); + } else { + $this->setFkAnioActividadId($v->getId()); + } + + + $this->aRelAnioActividad = $v; + } + + + + public function getRelAnioActividad($con = null) + { + include_once 'lib/model/om/BaseRelAnioActividadPeer.php'; + + if ($this->aRelAnioActividad === null && ($this->fk_anio_actividad_id !== null)) { + + $this->aRelAnioActividad = RelAnioActividadPeer::retrieveByPK($this->fk_anio_actividad_id, $con); + + + } + return $this->aRelAnioActividad; + } + + + public function setDocente($v) + { + + + if ($v === null) { + $this->setFkDocenteId(NULL); + } else { + $this->setFkDocenteId($v->getId()); + } + + + $this->aDocente = $v; + } + + + + public function getDocente($con = null) + { + include_once 'lib/model/om/BaseDocentePeer.php'; + + if ($this->aDocente === null && ($this->fk_docente_id !== null)) { + + $this->aDocente = DocentePeer::retrieveByPK($this->fk_docente_id, $con); + + + } + return $this->aDocente; + } + +} \ No newline at end of file Property changes on: prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadDocente.php ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Added: prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadDocentePeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadDocentePeer.php 2007-08-10 21:56:09 UTC (rev 4948) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadDocentePeer.php 2007-08-13 18:57:58 UTC (rev 4949) @@ -0,0 +1,796 @@ +<?php + + +abstract class BaseRelAnioActividadDocentePeer { + + + const DATABASE_NAME = 'alba'; + + + const TABLE_NAME = 'rel_anio_actividad_docente'; + + + const CLASS_DEFAULT = 'lib.model.RelAnioActividadDocente'; + + + const NUM_COLUMNS = 2; + + + const NUM_LAZY_LOAD_COLUMNS = 0; + + + + const FK_ANIO_ACTIVIDAD_ID = 'rel_anio_actividad_docente.FK_ANIO_ACTIVIDAD_ID'; + + + const FK_DOCENTE_ID = 'rel_anio_actividad_docente.FK_DOCENTE_ID'; + + + private static $phpNameMap = null; + + + + private static $fieldNames = array ( + BasePeer::TYPE_PHPNAME => array ('FkAnioActividadId', 'FkDocenteId', ), + BasePeer::TYPE_COLNAME => array (RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, RelAnioActividadDocentePeer::FK_DOCENTE_ID, ), + BasePeer::TYPE_FIELDNAME => array ('fk_anio_actividad_id', 'fk_docente_id', ), + BasePeer::TYPE_NUM => array (0, 1, ) + ); + + + private static $fieldKeys = array ( + BasePeer::TYPE_PHPNAME => array ('FkAnioActividadId' => 0, 'FkDocenteId' => 1, ), + BasePeer::TYPE_COLNAME => array (RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID => 0, RelAnioActividadDocentePeer::FK_DOCENTE_ID => 1, ), + BasePeer::TYPE_FIELDNAME => array ('fk_anio_actividad_id' => 0, 'fk_docente_id' => 1, ), + BasePeer::TYPE_NUM => array (0, 1, ) + ); + + + public static function getMapBuilder() + { + include_once 'lib/model/map/RelAnioActividadDocenteMapBuilder.php'; + return BasePeer::getMapBuilder('lib.model.map.RelAnioActividadDocenteMapBuilder'); + } + + public static function getPhpNameMap() + { + if (self::$phpNameMap === null) { + $map = RelAnioActividadDocentePeer::getTableMap(); + $columns = $map->getColumns(); + $nameMap = array(); + foreach ($columns as $column) { + $nameMap[$column->getPhpName()] = $column->getColumnName(); + } + self::$phpNameMap = $nameMap; + } + return self::$phpNameMap; + } + + static public function translateFieldName($name, $fromType, $toType) + { + $toNames = self::getFieldNames($toType); + $key = isset(self::$fieldKeys[$fromType][$name]) ? self::$fieldKeys[$fromType][$name] : null; + if ($key === null) { + throw new PropelException("'$name' could not be found in the field names of type '$fromType'. These are: " . print_r(self::$fieldKeys[$fromType], true)); + } + return $toNames[$key]; + } + + + + static public function getFieldNames($type = BasePeer::TYPE_PHPNAME) + { + if (!array_key_exists($type, self::$fieldNames)) { + throw new PropelException('Method getFieldNames() expects the parameter $type to be one of the class constants TYPE_PHPNAME, TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM. ' . $type . ' was given.'); + } + return self::$fieldNames[$type]; + } + + + public static function alias($alias, $column) + { + return str_replace(RelAnioActividadDocentePeer::TABLE_NAME.'.', $alias.'.', $column); + } + + + public static function addSelectColumns(Criteria $criteria) + { + + $criteria->addSelectColumn(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID); + + $criteria->addSelectColumn(RelAnioActividadDocentePeer::FK_DOCENTE_ID); + + } + + const COUNT = 'COUNT(rel_anio_actividad_docente.FK_ANIO_ACTIVIDAD_ID)'; + const COUNT_DISTINCT = 'COUNT(DISTINCT rel_anio_actividad_docente.FK_ANIO_ACTIVIDAD_ID)'; + + + public static function doCount(Criteria $criteria, $distinct = false, $con = null) + { + $criteria = clone $criteria; + + $criteria->clearSelectColumns()->clearOrderByColumns(); + if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { + $criteria->addSelectColumn(RelAnioActividadDocentePeer::COUNT_DISTINCT); + } else { + $criteria->addSelectColumn(RelAnioActividadDocentePeer::COUNT); + } + + foreach($criteria->getGroupByColumns() as $column) + { + $criteria->addSelectColumn($column); + } + + $rs = RelAnioActividadDocentePeer::doSelectRS($criteria, $con); + if ($rs->next()) { + return $rs->getInt(1); + } else { + return 0; + } + } + + public static function doSelectOne(Criteria $criteria, $con = null) + { + $critcopy = clone $criteria; + $critcopy->setLimit(1); + $objects = RelAnioActividadDocentePeer::doSelect($critcopy, $con); + if ($objects) { + return $objects[0]; + } + return null; + } + + public static function doSelect(Criteria $criteria, $con = null) + { + return RelAnioActividadDocentePeer::populateObjects(RelAnioActividadDocentePeer::doSelectRS($criteria, $con)); + } + + public static function doSelectRS(Criteria $criteria, $con = null) + { + if ($con === null) { + $con = Propel::getConnection(self::DATABASE_NAME); + } + + if (!$criteria->getSelectColumns()) { + $criteria = clone $criteria; + RelAnioActividadDocentePeer::addSelectColumns($criteria); + } + + $criteria->setDbName(self::DATABASE_NAME); + + return BasePeer::doSelect($criteria, $con); + } + + public static function populateObjects(ResultSet $rs) + { + $results = array(); + + $cls = RelAnioActividadDocentePeer::getOMClass(); + $cls = Propel::import($cls); + while($rs->next()) { + + $obj = new $cls(); + $obj->hydrate($rs); + $results[] = $obj; + + } + return $results; + } + + + public static function doCountJoinRelAnioActividad(Criteria $criteria, $distinct = false, $con = null) + { + $criteria = clone $criteria; + + $criteria->clearSelectColumns()->clearOrderByColumns(); + if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { + $criteria->addSelectColumn(RelAnioActividadDocentePeer::COUNT_DISTINCT); + } else { + $criteria->addSelectColumn(RelAnioActividadDocentePeer::COUNT); + } + + foreach($criteria->getGroupByColumns() as $column) + { + $criteria->addSelectColumn($column); + } + + $criteria->addJoin(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, RelAnioActividadPeer::ID); + + $rs = RelAnioActividadDocentePeer::doSelectRS($criteria, $con); + if ($rs->next()) { + return $rs->getInt(1); + } else { + return 0; + } + } + + + + public static function doCountJoinDocente(Criteria $criteria, $distinct = false, $con = null) + { + $criteria = clone $criteria; + + $criteria->clearSelectColumns()->clearOrderByColumns(); + if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { + $criteria->addSelectColumn(RelAnioActividadDocentePeer::COUNT_DISTINCT); + } else { + $criteria->addSelectColumn(RelAnioActividadDocentePeer::COUNT); + } + + foreach($criteria->getGroupByColumns() as $column) + { + $criteria->addSelectColumn($column); + } + + $criteria->addJoin(RelAnioActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + + $rs = RelAnioActividadDocentePeer::doSelectRS($criteria, $con); + if ($rs->next()) { + return $rs->getInt(1); + } else { + return 0; + } + } + + + + public static function doSelectJoinRelAnioActividad(Criteria $c, $con = null) + { + $c = clone $c; + + if ($c->getDbName() == Propel::getDefaultDB()) { + $c->setDbName(self::DATABASE_NAME); + } + + RelAnioActividadDocentePeer::addSelectColumns($c); + $startcol = (RelAnioActividadDocentePeer::NUM_COLUMNS - RelAnioActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; + RelAnioActividadPeer::addSelectColumns($c); + + $c->addJoin(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, RelAnioActividadPeer::ID); + $rs = BasePeer::doSelect($c, $con); + $results = array(); + + while($rs->next()) { + + $omClass = RelAnioActividadDocentePeer::getOMClass(); + + $cls = Propel::import($omClass); + $obj1 = new $cls(); + $obj1->hydrate($rs); + + $omClass = RelAnioActividadPeer::getOMClass(); + + $cls = Propel::import($omClass); + $obj2 = new $cls(); + $obj2->hydrate($rs, $startcol); + + $newObject = true; + foreach($results as $temp_obj1) { + $temp_obj2 = $temp_obj1->getRelAnioActividad(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $newObject = false; + $temp_obj2->addRelAnioActividadDocente($obj1); break; + } + } + if ($newObject) { + $obj2->initRelAnioActividadDocentes(); + $obj2->addRelAnioActividadDocente($obj1); } + $results[] = $obj1; + } + return $results; + } + + + + public static function doSelectJoinDocente(Criteria $c, $con = null) + { + $c = clone $c; + + if ($c->getDbName() == Propel::getDefaultDB()) { + $c->setDbName(self::DATABASE_NAME); + } + + RelAnioActividadDocentePeer::addSelectColumns($c); + $startcol = (RelAnioActividadDocentePeer::NUM_COLUMNS - RelAnioActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; + DocentePeer::addSelectColumns($c); + + $c->addJoin(RelAnioActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + $rs = BasePeer::doSelect($c, $con); + $results = array(); + + while($rs->next()) { + + $omClass = RelAnioActividadDocentePeer::getOMClass(); + + $cls = Propel::import($omClass); + $obj1 = new $cls(); + $obj1->hydrate($rs); + + $omClass = DocentePeer::getOMClass(); + + $cls = Propel::import($omClass); + $obj2 = new $cls(); + $obj2->hydrate($rs, $startcol); + + $newObject = true; + foreach($results as $temp_obj1) { + $temp_obj2 = $temp_obj1->getDocente(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $newObject = false; + $temp_obj2->addRelAnioActividadDocente($obj1); break; + } + } + if ($newObject) { + $obj2->initRelAnioActividadDocentes(); + $obj2->addRelAnioActividadDocente($obj1); } + $results[] = $obj1; + } + return $results; + } + + + + public static function doCountJoinAll(Criteria $criteria, $distinct = false, $con = null) + { + $criteria = clone $criteria; + + $criteria->clearSelectColumns()->clearOrderByColumns(); + if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { + $criteria->addSelectColumn(RelAnioActividadDocentePeer::COUNT_DISTINCT); + } else { + $criteria->addSelectColumn(RelAnioActividadDocentePeer::COUNT); + } + + foreach($criteria->getGroupByColumns() as $column) + { + $criteria->addSelectColumn($column); + } + + $criteria->addJoin(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, RelAnioActividadPeer::ID); + + $criteria->addJoin(RelAnioActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + + $rs = RelAnioActividadDocentePeer::doSelectRS($criteria, $con); + if ($rs->next()) { + return $rs->getInt(1); + } else { + return 0; + } + } + + + + public static function doSelectJoinAll(Criteria $c, $con = null) + { + $c = clone $c; + + if ($c->getDbName() == Propel::getDefaultDB()) { + $c->setDbName(self::DATABASE_NAME); + } + + RelAnioActividadDocentePeer::addSelectColumns($c); + $startcol2 = (RelAnioActividadDocentePeer::NUM_COLUMNS - RelAnioActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; + + RelAnioActividadPeer::addSelectColumns($c); + $startcol3 = $startcol2 + RelAnioActividadPeer::NUM_COLUMNS; + + DocentePeer::addSelectColumns($c); + $startcol4 = $startcol3 + DocentePeer::NUM_COLUMNS; + + $c->addJoin(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, RelAnioActividadPeer::ID); + + $c->addJoin(RelAnioActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + + $rs = BasePeer::doSelect($c, $con); + $results = array(); + + while($rs->next()) { + + $omClass = RelAnioActividadDocentePeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj1 = new $cls(); + $obj1->hydrate($rs); + + + + $omClass = RelAnioActividadPeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj2 = new $cls(); + $obj2->hydrate($rs, $startcol2); + + $newObject = true; + for ($j=0, $resCount=count($results); $j < $resCount; $j++) { + $temp_obj1 = $results[$j]; + $temp_obj2 = $temp_obj1->getRelAnioActividad(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $newObject = false; + $temp_obj2->addRelAnioActividadDocente($obj1); break; + } + } + + if ($newObject) { + $obj2->initRelAnioActividadDocentes(); + $obj2->addRelAnioActividadDocente($obj1); + } + + + + $omClass = DocentePeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj3 = new $cls(); + $obj3->hydrate($rs, $startcol3); + + $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()) { + $newObject = false; + $temp_obj3->addRelAnioActividadDocente($obj1); break; + } + } + + if ($newObject) { + $obj3->initRelAnioActividadDocentes(); + $obj3->addRelAnioActividadDocente($obj1); + } + + $results[] = $obj1; + } + return $results; + } + + + + public static function doCountJoinAllExceptRelAnioActividad(Criteria $criteria, $distinct = false, $con = null) + { + $criteria = clone $criteria; + + $criteria->clearSelectColumns()->clearOrderByColumns(); + if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { + $criteria->addSelectColumn(RelAnioActividadDocentePeer::COUNT_DISTINCT); + } else { + $criteria->addSelectColumn(RelAnioActividadDocentePeer::COUNT); + } + + foreach($criteria->getGroupByColumns() as $column) + { + $criteria->addSelectColumn($column); + } + + $criteria->addJoin(RelAnioActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + + $rs = RelAnioActividadDocentePeer::doSelectRS($criteria, $con); + if ($rs->next()) { + return $rs->getInt(1); + } else { + return 0; + } + } + + + + public static function doCountJoinAllExceptDocente(Criteria $criteria, $distinct = false, $con = null) + { + $criteria = clone $criteria; + + $criteria->clearSelectColumns()->clearOrderByColumns(); + if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { + $criteria->addSelectColumn(RelAnioActividadDocentePeer::COUNT_DISTINCT); + } else { + $criteria->addSelectColumn(RelAnioActividadDocentePeer::COUNT); + } + + foreach($criteria->getGroupByColumns() as $column) + { + $criteria->addSelectColumn($column); + } + + $criteria->addJoin(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, RelAnioActividadPeer::ID); + + $rs = RelAnioActividadDocentePeer::doSelectRS($criteria, $con); + if ($rs->next()) { + return $rs->getInt(1); + } else { + return 0; + } + } + + + + public static function doSelectJoinAllExceptRelAnioActividad(Criteria $c, $con = null) + { + $c = clone $c; + + if ($c->getDbName() == Propel::getDefaultDB()) { + $c->setDbName(self::DATABASE_NAME); + } + + RelAnioActividadDocentePeer::addSelectColumns($c); + $startcol2 = (RelAnioActividadDocentePeer::NUM_COLUMNS - RelAnioActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; + + DocentePeer::addSelectColumns($c); + $startcol3 = $startcol2 + DocentePeer::NUM_COLUMNS; + + $c->addJoin(RelAnioActividadDocentePeer::FK_DOCENTE_ID, DocentePeer::ID); + + + $rs = BasePeer::doSelect($c, $con); + $results = array(); + + while($rs->next()) { + + $omClass = RelAnioActividadDocentePeer::getOMClass(); + + $cls = Propel::import($omClass); + $obj1 = new $cls(); + $obj1->hydrate($rs); + + $omClass = DocentePeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj2 = new $cls(); + $obj2->hydrate($rs, $startcol2); + + $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()) { + $newObject = false; + $temp_obj2->addRelAnioActividadDocente($obj1); + break; + } + } + + if ($newObject) { + $obj2->initRelAnioActividadDocentes(); + $obj2->addRelAnioActividadDocente($obj1); + } + + $results[] = $obj1; + } + return $results; + } + + + + public static function doSelectJoinAllExceptDocente(Criteria $c, $con = null) + { + $c = clone $c; + + if ($c->getDbName() == Propel::getDefaultDB()) { + $c->setDbName(self::DATABASE_NAME); + } + + RelAnioActividadDocentePeer::addSelectColumns($c); + $startcol2 = (RelAnioActividadDocentePeer::NUM_COLUMNS - RelAnioActividadDocentePeer::NUM_LAZY_LOAD_COLUMNS) + 1; + + RelAnioActividadPeer::addSelectColumns($c); + $startcol3 = $startcol2 + RelAnioActividadPeer::NUM_COLUMNS; + + $c->addJoin(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, RelAnioActividadPeer::ID); + + + $rs = BasePeer::doSelect($c, $con); + $results = array(); + + while($rs->next()) { + + $omClass = RelAnioActividadDocentePeer::getOMClass(); + + $cls = Propel::import($omClass); + $obj1 = new $cls(); + $obj1->hydrate($rs); + + $omClass = RelAnioActividadPeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj2 = new $cls(); + $obj2->hydrate($rs, $startcol2); + + $newObject = true; + for ($j=0, $resCount=count($results); $j < $resCount; $j++) { + $temp_obj1 = $results[$j]; + $temp_obj2 = $temp_obj1->getRelAnioActividad(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $newObject = false; + $temp_obj2->addRelAnioActividadDocente($obj1); + break; + } + } + + if ($newObject) { + $obj2->initRelAnioActividadDocentes(); + $obj2->addRelAnioActividadDocente($obj1); + } + + $results[] = $obj1; + } + return $results; + } + + + public static function getTableMap() + { + return Propel::getDatabaseMap(self::DATABASE_NAME)->getTable(self::TABLE_NAME); + } + + + public static function getOMClass() + { + return RelAnioActividadDocentePeer::CLASS_DEFAULT; + } + + + public static function doInsert($values, $con = null) + { + if ($con === null) { + $con = Propel::getConnection(self::DATABASE_NAME); + } + + if ($values instanceof Criteria) { + $criteria = clone $values; } else { + $criteria = $values->buildCriteria(); } + + + $criteria->setDbName(self::DATABASE_NAME); + + try { + $con->begin(); + $pk = BasePeer::doInsert($criteria, $con); + $con->commit(); + } catch(PropelException $e) { + $con->rollback(); + throw $e; + } + + return $pk; + } + + + public static function doUpdate($values, $con = null) + { + if ($con === null) { + $con = Propel::getConnection(self::DATABASE_NAME); + } + + $selectCriteria = new Criteria(self::DATABASE_NAME); + + if ($values instanceof Criteria) { + $criteria = clone $values; + $comparison = $criteria->getComparison(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID); + $selectCriteria->add(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $criteria->remove(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID), $comparison); + + $comparison = $criteria->getComparison(RelAnioActividadDocentePeer::FK_DOCENTE_ID); + $selectCriteria->add(RelAnioActividadDocentePeer::FK_DOCENTE_ID, $criteria->remove(RelAnioActividadDocentePeer::FK_DOCENTE_ID), $comparison); + + } else { $criteria = $values->buildCriteria(); $selectCriteria = $values->buildPkeyCriteria(); } + + $criteria->setDbName(self::DATABASE_NAME); + + return BasePeer::doUpdate($selectCriteria, $criteria, $con); + } + + + public static function doDeleteAll($con = null) + { + if ($con === null) { + $con = Propel::getConnection(self::DATABASE_NAME); + } + $affectedRows = 0; try { + $con->begin(); + $affectedRows += BasePeer::doDeleteAll(RelAnioActividadDocentePeer::TABLE_NAME, $con); + $con->commit(); + return $affectedRows; + } catch (PropelException $e) { + $con->rollback(); + throw $e; + } + } + + + public static function doDelete($values, $con = null) + { + if ($con === null) { + $con = Propel::getConnection(RelAnioActividadDocentePeer::DATABASE_NAME); + } + + if ($values instanceof Criteria) { + $criteria = clone $values; } elseif ($values instanceof RelAnioActividadDocente) { + + $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) + { + + $vals[0][] = $value[0]; + $vals[1][] = $value[1]; + } + + $criteria->add(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $vals[0], Criteria::IN); + $criteria->add(RelAnioActividadDocentePeer::FK_DOCENTE_ID, $vals[1], Criteria::IN); + } + + $criteria->setDbName(self::DATABASE_NAME); + + $affectedRows = 0; + try { + $con->begin(); + + $affectedRows += BasePeer::doDelete($criteria, $con); + $con->commit(); + return $affectedRows; + } catch (PropelException $e) { + $con->rollback(); + throw $e; + } + } + + + public static function doValidate(RelAnioActividadDocente $obj, $cols = null) + { + $columns = array(); + + if ($cols) { + $dbMap = Propel::getDatabaseMap(RelAnioActividadDocentePeer::DATABASE_NAME); + $tableMap = $dbMap->getTable(RelAnioActividadDocentePeer::TABLE_NAME); + + if (! is_array($cols)) { + $cols = array($cols); + } + + foreach($cols as $colName) { + if ($tableMap->containsColumn($colName)) { + $get = 'get' . $tableMap->getColumn($colName)->getPhpName(); + $columns[$colName] = $obj->$get(); + } + } + } else { + + } + + $res = BasePeer::doValidate(RelAnioActividadDocentePeer::DATABASE_NAME, RelAnioActividadDocentePeer::TABLE_NAME, $columns); + if ($res !== true) { + $request = sfContext::getInstance()->getRequest(); + foreach ($res as $failed) { + $col = RelAnioActividadDocentePeer::translateFieldname($failed->getColumn(), BasePeer::TYPE_COLNAME, BasePeer::TYPE_PHPNAME); + $request->setError($col, $failed->getMessage()); + } + } + + return $res; + } + + + public static function retrieveByPK( $fk_anio_actividad_id, $fk_docente_id, $con = null) { + if ($con === null) { + $con = Propel::getConnection(self::DATABASE_NAME); + } + $criteria = new Criteria(); + $criteria->add(RelAnioActividadDocentePeer::FK_ANIO_ACTIVIDAD_ID, $fk_anio_actividad_id); + $criteria->add(RelAnioActividadDocentePeer::FK_DOCENTE_ID, $fk_docente_id); + $v = RelAnioActividadDocentePeer::doSelect($criteria, $con); + + return !empty($v) ? $v[0] : null; + } +} +if (Propel::isInit()) { + try { + BaseRelAnioActividadDocentePeer::getMapBuilder(); + } catch (Exception $e) { + Propel::log('Could not initialize Peer: ' . $e->getMessage(), Propel::LOG_ERR); + } +} else { + require_once 'lib/model/map/RelAnioActividadDocenteMapBuilder.php'; + Propel::registerMapBuilder('lib.model.map.RelAnioActividadDocenteMapBuilder'); +} Property changes on: prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadDocentePeer.php ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev"

1 0

SVN Alba r4943 - in prosistem/alba/trunk/alba/apps/principal/modules/division: actions config templates
by commits＠pressenter.com.ar 08 Aug '07

08 Aug '07

Author: josx Date: 2007-08-08 16:47:57 -0300 (Wed, 08 Aug 2007) New Revision: 4943 Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anioorden_id.php Log: Cambio en los filtros de Divisiones Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php 2007-08-08 19:37:43 UTC (rev 4942) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php 2007-08-08 19:47:57 UTC (rev 4943) @@ -33,20 +33,10 @@ class divisionActions extends autodivisionActions { - protected function addFiltersCriteria($c) - { - $c->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $this->getUser()->getAttribute('fk_establecimiento_id')); - $c->addJoin(DivisionPeer::FK_ANIO_ID,AnioPeer::ID); - $c->addAscendingOrderByColumn(AnioPeer::DESCRIPCION); - $c->addAscendingOrderByColumn(DivisionPeer::ORDEN); - $c->addAscendingOrderByColumn(DivisionPeer::DESCRIPCION); - } - public function executeAlumnosPorDivision() { $this->redirect('alumno/list?filters%5Bdivision%5D='.$this->getRequestParameter('id').'&filter=filtrar'); } - } ?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml 2007-08-08 19:37:43 UTC (rev 4942) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml 2007-08-08 19:47:57 UTC (rev 4943) @@ -25,5 +25,5 @@ _edit: - _delete: - alumnosPorDivision: { name: Alumnos por Division, action: alumnosPorDivision, icon: small/alumnos.png } - filters: [ _fk_anioorden_id ] + filters: [ fk_anio_id, fk_orientacion_id, fk_turno_id ] Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anioorden_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anioorden_id.php 2007-08-08 19:37:43 UTC (rev 4942) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anioorden_id.php 2007-08-08 19:47:57 UTC (rev 4943) @@ -8,5 +8,6 @@ foreach ($anios as $anio) { $optionsAnios[$anio->getId()] = $anio->getDescripcion(); } + echo select_tag('anios', options_for_select($optionsAnios, $anio->getId()) ) ; ?>

1 0

SVN Alba r4942 - in prosistem/alba/trunk/alba: apps/principal/modules/relAnioActividad/actions apps/principal/modules/relAnioActividad/config apps/principal/modules/relAnioActividad/templates config data/sql lib/model/map lib/model/om
by commits＠pressenter.com.ar 08 Aug '07

08 Aug '07

Author: josx Date: 2007-08-08 16:37:43 -0300 (Wed, 08 Aug 2007) New Revision: 4942 Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/templates/_edit_form.php prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/templates/_list_td_tabular.php prosistem/alba/trunk/alba/config/schema.yml prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0rc2.sql prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql prosistem/alba/trunk/alba/lib/model/map/RelAnioActividadMapBuilder.php prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php prosistem/alba/trunk/alba/lib/model/om/BaseOrientacion.php prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividad.php prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadPeer.php Log: Agregue campo orientacion a el listado de actividades por a?\195?\177o. Tambien se modificaron los filtros de ese modulo. Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/actions/actions.class.php 2007-08-08 19:21:49 UTC (rev 4941) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/actions/actions.class.php 2007-08-08 19:37:43 UTC (rev 4942) @@ -53,7 +53,11 @@ if (isset($rel_anio_actividad['fk_actividad_id'])) { $this->rel_anio_actividad->setFkActividadId($rel_anio_actividad['fk_actividad_id'] ? $rel_anio_actividad['fk_actividad_id'] : null); } - + + if (isset($rel_anio_actividad['fk_orientacion_id'])) { + $this->rel_anio_actividad->setFkOrientacionId($rel_anio_actividad['fk_orientacion_id'] ? $rel_anio_actividad['fk_orientacion_id'] : null); + } + if (isset($rel_anio_actividad['horas'])) { $this->rel_anio_actividad->setHoras($rel_anio_actividad['horas']); } Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/config/generator.yml 2007-08-08 19:21:49 UTC (rev 4941) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/config/generator.yml 2007-08-08 19:37:43 UTC (rev 4942) @@ -8,17 +8,19 @@ anio: { name: Año } fk_actividad_id: { name: Actividad } horas: { name: Horas Semanales } + fk_orientacion_id: { name: Orientación } edit: title: Editar Actividades del Año fields: fk_anio_id: { params: include_custom=>>Seleccione un Año<< } fk_actividad_id: { params: include_custom=>>Seleccione una Actividad<< } - display: [ fk_anio_id, fk_actividad_id, horas ] + fk_orientacion_id: { params: include_custom=>>Seleccione una Orientación<< } + display: [ fk_anio_id, fk_actividad_id, fk_orientacion_id, horas ] list: title: Listado de Actividades por Año - display: [ anio, actividad, horas ] + display: [anio, actividad, orientacion, horas] object_actions: _edit: - _delete: - - filters: [ fk_anio_id ] + filters: [ fk_anio_id, fk_actividad_id, fk_orientacion_id ] Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/templates/_edit_form.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/templates/_edit_form.php 2007-08-08 19:21:49 UTC (rev 4941) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/templates/_edit_form.php 2007-08-08 19:37:43 UTC (rev 4942) @@ -43,7 +43,23 @@ </div> </div> +<div class="form-row"> + <?php echo label_for('rel_anio_actividad[fk_orientacion_id]', __($labels['rel_anio_actividad{fk_orientacion_id}']), 'class="required" ') ?> + <div class="content<?php if ($sf_request->hasError('rel_anio_actividad{fk_orientacion_id}')): ?> form-error<?php endif; ?>"> + <?php if ($sf_request->hasError('rel_anio_actividad{fk_orientacion_id}')): ?> + <?php echo form_error('rel_anio_actividad{fk_orientacion_id}', array('class' => 'form-error-msg')) ?> + <?php endif; ?> + <?php $value = object_select_tag($rel_anio_actividad, 'getFkOrientacionId', array ( + 'related_class' => 'Orientacion', + 'control_name' => 'rel_anio_actividad[fk_orientacion_id]', + 'include_custom' => '>>Seleccione una Orientacion<<', +)); echo $value ? $value : ' ' ?> + </div> +</div> + + + <div class="form-row"> <?php echo label_for('rel_anio_actividad[horas]', __($labels['rel_anio_actividad{horas}']), 'class="required" ') ?> <div class="content<?php if ($sf_request->hasError('rel_anio_actividad{horas}')): ?> form-error<?php endif; ?>"> Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/templates/_list_td_tabular.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/templates/_list_td_tabular.php 2007-08-08 19:21:49 UTC (rev 4941) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/templates/_list_td_tabular.php 2007-08-08 19:37:43 UTC (rev 4942) @@ -4,4 +4,5 @@ ?> <td><?php echo $rel_anio_actividad->getAnio() ?></td> <td><?php echo $rel_anio_actividad->getActividad() ?></td> + <td><?php echo $rel_anio_actividad->getOrientacion() ?></td> <td><?php echo $rel_anio_actividad->getHoras() ?></td> Modified: prosistem/alba/trunk/alba/config/schema.yml =================================================================== --- prosistem/alba/trunk/alba/config/schema.yml 2007-08-08 19:21:49 UTC (rev 4941) +++ prosistem/alba/trunk/alba/config/schema.yml 2007-08-08 19:37:43 UTC (rev 4942) @@ -1392,6 +1392,12 @@ default: 0 foreignTable: actividad foreignReference: id + fk_orientacion_id: + type: integer + size: 11 + required: false + foreignTable: orientacion + foreignReference: id horas: type: decimal size: 10,2 Modified: prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0rc2.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0rc2.sql 2007-08-08 19:21:49 UTC (rev 4941) +++ prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0rc2.sql 2007-08-08 19:37:43 UTC (rev 4942) @@ -100,6 +100,10 @@ ALTER TABLE `division` ADD `fk_orientacion_id` INT; ALTER TABLE `division` ADD CONSTRAINT `orientacion_FK_4` FOREIGN KEY (`fk_orientacion_id`) REFERENCES `orientacion` (`id`); +ALTER TABLE `rel_anio_actividad` ADD `fk_orientacion_id` INT; +ALTER TABLE `rel_anio_actividad` ADD CONSTRAINT `orientacion_FK_4` FOREIGN KEY (`fk_orientacion_id`) REFERENCES `orientacion` (`id`); + + SET FOREIGN_KEY_CHECKS = 1; Modified: prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql 2007-08-08 19:21:49 UTC (rev 4941) +++ prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql 2007-08-08 19:37:43 UTC (rev 4942) @@ -1080,6 +1080,7 @@ `id` INTEGER(11) NOT NULL AUTO_INCREMENT, `fk_anio_id` INTEGER(11) default 0 NOT NULL, `fk_actividad_id` INTEGER(11) default 0 NOT NULL, + `fk_orientacion_id` INTEGER(11), `horas` DECIMAL(10,2) default 0 NOT NULL, PRIMARY KEY (`id`), INDEX `rel_anio_actividad_FI_1` (`fk_anio_id`), @@ -1089,7 +1090,11 @@ INDEX `rel_anio_actividad_FI_2` (`fk_actividad_id`), CONSTRAINT `rel_anio_actividad_FK_2` FOREIGN KEY (`fk_actividad_id`) - REFERENCES `actividad` (`id`) + REFERENCES `actividad` (`id`), + INDEX `rel_anio_actividad_FI_3` (`fk_orientacion_id`), + CONSTRAINT `rel_anio_actividad_FK_3` + FOREIGN KEY (`fk_orientacion_id`) + REFERENCES `orientacion` (`id`) )Type=InnoDB; #----------------------------------------------------------------------------- Modified: prosistem/alba/trunk/alba/lib/model/map/RelAnioActividadMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelAnioActividadMapBuilder.php 2007-08-08 19:21:49 UTC (rev 4941) +++ prosistem/alba/trunk/alba/lib/model/map/RelAnioActividadMapBuilder.php 2007-08-08 19:37:43 UTC (rev 4942) @@ -38,6 +38,8 @@ $tMap->addForeignKey('FK_ACTIVIDAD_ID', 'FkActividadId', 'int', CreoleTypes::INTEGER, 'actividad', 'ID', true, 11); + $tMap->addForeignKey('FK_ORIENTACION_ID', 'FkOrientacionId', 'int', CreoleTypes::INTEGER, 'orientacion', 'ID', false, 11); + $tMap->addColumn('HORAS', 'Horas', 'double', CreoleTypes::DECIMAL, true, 10,2); } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php 2007-08-08 19:21:49 UTC (rev 4941) +++ prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php 2007-08-08 19:37:43 UTC (rev 4942) @@ -1036,7 +1036,42 @@ return $this->collRelAnioActividads; } + + public function getRelAnioActividadsJoinOrientacion($criteria = null, $con = null) + { + include_once 'lib/model/om/BaseRelAnioActividadPeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + if ($this->collRelAnioActividads === null) { + if ($this->isNew()) { + $this->collRelAnioActividads = array(); + } else { + + $criteria->add(RelAnioActividadPeer::FK_ACTIVIDAD_ID, $this->getId()); + + $this->collRelAnioActividads = RelAnioActividadPeer::doSelectJoinOrientacion($criteria, $con); + } + } else { + + $criteria->add(RelAnioActividadPeer::FK_ACTIVIDAD_ID, $this->getId()); + + if (!isset($this->lastRelAnioActividadCriteria) || !$this->lastRelAnioActividadCriteria->equals($criteria)) { + $this->collRelAnioActividads = RelAnioActividadPeer::doSelectJoinOrientacion($criteria, $con); + } + } + $this->lastRelAnioActividadCriteria = $criteria; + + return $this->collRelAnioActividads; + } + + public function initRelDivisionActividadDocentes() { if ($this->collRelDivisionActividadDocentes === null) { Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php 2007-08-08 19:21:49 UTC (rev 4941) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php 2007-08-08 19:37:43 UTC (rev 4942) @@ -710,4 +710,39 @@ return $this->collRelAnioActividads; } + + + public function getRelAnioActividadsJoinOrientacion($criteria = null, $con = null) + { + include_once 'lib/model/om/BaseRelAnioActividadPeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + if ($this->collRelAnioActividads === null) { + if ($this->isNew()) { + $this->collRelAnioActividads = array(); + } else { + + $criteria->add(RelAnioActividadPeer::FK_ANIO_ID, $this->getId()); + + $this->collRelAnioActividads = RelAnioActividadPeer::doSelectJoinOrientacion($criteria, $con); + } + } else { + + $criteria->add(RelAnioActividadPeer::FK_ANIO_ID, $this->getId()); + + if (!isset($this->lastRelAnioActividadCriteria) || !$this->lastRelAnioActividadCriteria->equals($criteria)) { + $this->collRelAnioActividads = RelAnioActividadPeer::doSelectJoinOrientacion($criteria, $con); + } + } + $this->lastRelAnioActividadCriteria = $criteria; + + return $this->collRelAnioActividads; + } + } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseOrientacion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseOrientacion.php 2007-08-08 19:21:49 UTC (rev 4941) +++ prosistem/alba/trunk/alba/lib/model/om/BaseOrientacion.php 2007-08-08 19:37:43 UTC (rev 4942) @@ -26,6 +26,12 @@ protected $lastDivisionCriteria = null; + protected $collRelAnioActividads; + + + protected $lastRelAnioActividadCriteria = null; + + protected $alreadyInSave = false; @@ -185,6 +191,14 @@ } } + if ($this->collRelAnioActividads !== null) { + foreach($this->collRelAnioActividads as $referrerFK) { + if (!$referrerFK->isDeleted()) { + $affectedRows += $referrerFK->save($con); + } + } + } + $this->alreadyInSave = false; } return $affectedRows; @@ -234,7 +248,15 @@ } } + if ($this->collRelAnioActividads !== null) { + foreach($this->collRelAnioActividads as $referrerFK) { + if (!$referrerFK->validate($columns)) { + $failureMap = array_merge($failureMap, $referrerFK->getValidationFailures()); + } + } + } + $this->alreadyInValidation = false; } @@ -360,6 +382,10 @@ $copyObj->addDivision($relObj->copy($deepCopy)); } + foreach($this->getRelAnioActividads() as $relObj) { + $copyObj->addRelAnioActividad($relObj->copy($deepCopy)); + } + } $copyObj->setNew(true); @@ -525,4 +551,144 @@ return $this->collDivisions; } + + public function initRelAnioActividads() + { + if ($this->collRelAnioActividads === null) { + $this->collRelAnioActividads = array(); + } + } + + + public function getRelAnioActividads($criteria = null, $con = null) + { + include_once 'lib/model/om/BaseRelAnioActividadPeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + if ($this->collRelAnioActividads === null) { + if ($this->isNew()) { + $this->collRelAnioActividads = array(); + } else { + + $criteria->add(RelAnioActividadPeer::FK_ORIENTACION_ID, $this->getId()); + + RelAnioActividadPeer::addSelectColumns($criteria); + $this->collRelAnioActividads = RelAnioActividadPeer::doSelect($criteria, $con); + } + } else { + if (!$this->isNew()) { + + + $criteria->add(RelAnioActividadPeer::FK_ORIENTACION_ID, $this->getId()); + + RelAnioActividadPeer::addSelectColumns($criteria); + if (!isset($this->lastRelAnioActividadCriteria) || !$this->lastRelAnioActividadCriteria->equals($criteria)) { + $this->collRelAnioActividads = RelAnioActividadPeer::doSelect($criteria, $con); + } + } + } + $this->lastRelAnioActividadCriteria = $criteria; + return $this->collRelAnioActividads; + } + + + public function countRelAnioActividads($criteria = null, $distinct = false, $con = null) + { + include_once 'lib/model/om/BaseRelAnioActividadPeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + $criteria->add(RelAnioActividadPeer::FK_ORIENTACION_ID, $this->getId()); + + return RelAnioActividadPeer::doCount($criteria, $distinct, $con); + } + + + public function addRelAnioActividad(RelAnioActividad $l) + { + $this->collRelAnioActividads[] = $l; + $l->setOrientacion($this); + } + + + + public function getRelAnioActividadsJoinAnio($criteria = null, $con = null) + { + include_once 'lib/model/om/BaseRelAnioActividadPeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + if ($this->collRelAnioActividads === null) { + if ($this->isNew()) { + $this->collRelAnioActividads = array(); + } else { + + $criteria->add(RelAnioActividadPeer::FK_ORIENTACION_ID, $this->getId()); + + $this->collRelAnioActividads = RelAnioActividadPeer::doSelectJoinAnio($criteria, $con); + } + } else { + + $criteria->add(RelAnioActividadPeer::FK_ORIENTACION_ID, $this->getId()); + + if (!isset($this->lastRelAnioActividadCriteria) || !$this->lastRelAnioActividadCriteria->equals($criteria)) { + $this->collRelAnioActividads = RelAnioActividadPeer::doSelectJoinAnio($criteria, $con); + } + } + $this->lastRelAnioActividadCriteria = $criteria; + + return $this->collRelAnioActividads; + } + + + + public function getRelAnioActividadsJoinActividad($criteria = null, $con = null) + { + include_once 'lib/model/om/BaseRelAnioActividadPeer.php'; + if ($criteria === null) { + $criteria = new Criteria(); + } + elseif ($criteria instanceof Criteria) + { + $criteria = clone $criteria; + } + + if ($this->collRelAnioActividads === null) { + if ($this->isNew()) { + $this->collRelAnioActividads = array(); + } else { + + $criteria->add(RelAnioActividadPeer::FK_ORIENTACION_ID, $this->getId()); + + $this->collRelAnioActividads = RelAnioActividadPeer::doSelectJoinActividad($criteria, $con); + } + } else { + + $criteria->add(RelAnioActividadPeer::FK_ORIENTACION_ID, $this->getId()); + + if (!isset($this->lastRelAnioActividadCriteria) || !$this->lastRelAnioActividadCriteria->equals($criteria)) { + $this->collRelAnioActividads = RelAnioActividadPeer::doSelectJoinActividad($criteria, $con); + } + } + $this->lastRelAnioActividadCriteria = $criteria; + + return $this->collRelAnioActividads; + } + } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividad.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividad.php 2007-08-08 19:21:49 UTC (rev 4941) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividad.php 2007-08-08 19:37:43 UTC (rev 4942) @@ -21,6 +21,10 @@ + protected $fk_orientacion_id; + + + protected $horas = 0; @@ -30,6 +34,9 @@ protected $aActividad; + protected $aOrientacion; + + protected $alreadyInSave = false; @@ -57,6 +64,13 @@ } + public function getFkOrientacionId() + { + + return $this->fk_orientacion_id; + } + + public function getHoras() { @@ -114,6 +128,24 @@ } + public function setFkOrientacionId($v) + { + + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->fk_orientacion_id !== $v) { + $this->fk_orientacion_id = $v; + $this->modifiedColumns[] = RelAnioActividadPeer::FK_ORIENTACION_ID; + } + + if ($this->aOrientacion !== null && $this->aOrientacion->getId() !== $v) { + $this->aOrientacion = null; + } + + } + public function setHoras($v) { @@ -134,13 +166,15 @@ $this->fk_actividad_id = $rs->getInt($startcol + 2); - $this->horas = $rs->getFloat($startcol + 3); + $this->fk_orientacion_id = $rs->getInt($startcol + 3); + $this->horas = $rs->getFloat($startcol + 4); + $this->resetModified(); $this->setNew(false); - return $startcol + 4; + return $startcol + 5; } catch (Exception $e) { throw new PropelException("Error populating RelAnioActividad object", $e); } @@ -212,7 +246,14 @@ $this->setActividad($this->aActividad); } + if ($this->aOrientacion !== null) { + if ($this->aOrientacion->isModified()) { + $affectedRows += $this->aOrientacion->save($con); + } + $this->setOrientacion($this->aOrientacion); + } + if ($this->isModified()) { if ($this->isNew()) { $pk = RelAnioActividadPeer::doInsert($this, $con); @@ -273,7 +314,13 @@ } } + if ($this->aOrientacion !== null) { + if (!$this->aOrientacion->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aOrientacion->getValidationFailures()); + } + } + if (($retval = RelAnioActividadPeer::doValidate($this, $columns)) !== true) { $failureMap = array_merge($failureMap, $retval); } @@ -307,6 +354,9 @@ return $this->getFkActividadId(); break; case 3: + return $this->getFkOrientacionId(); + break; + case 4: return $this->getHoras(); break; default: @@ -322,7 +372,8 @@ $keys[0] => $this->getId(), $keys[1] => $this->getFkAnioId(), $keys[2] => $this->getFkActividadId(), - $keys[3] => $this->getHoras(), + $keys[3] => $this->getFkOrientacionId(), + $keys[4] => $this->getHoras(), ); return $result; } @@ -348,6 +399,9 @@ $this->setFkActividadId($value); break; case 3: + $this->setFkOrientacionId($value); + break; + case 4: $this->setHoras($value); break; } } @@ -360,7 +414,8 @@ if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); if (array_key_exists($keys[1], $arr)) $this->setFkAnioId($arr[$keys[1]]); if (array_key_exists($keys[2], $arr)) $this->setFkActividadId($arr[$keys[2]]); - if (array_key_exists($keys[3], $arr)) $this->setHoras($arr[$keys[3]]); + if (array_key_exists($keys[3], $arr)) $this->setFkOrientacionId($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setHoras($arr[$keys[4]]); } @@ -371,6 +426,7 @@ if ($this->isColumnModified(RelAnioActividadPeer::ID)) $criteria->add(RelAnioActividadPeer::ID, $this->id); if ($this->isColumnModified(RelAnioActividadPeer::FK_ANIO_ID)) $criteria->add(RelAnioActividadPeer::FK_ANIO_ID, $this->fk_anio_id); if ($this->isColumnModified(RelAnioActividadPeer::FK_ACTIVIDAD_ID)) $criteria->add(RelAnioActividadPeer::FK_ACTIVIDAD_ID, $this->fk_actividad_id); + if ($this->isColumnModified(RelAnioActividadPeer::FK_ORIENTACION_ID)) $criteria->add(RelAnioActividadPeer::FK_ORIENTACION_ID, $this->fk_orientacion_id); if ($this->isColumnModified(RelAnioActividadPeer::HORAS)) $criteria->add(RelAnioActividadPeer::HORAS, $this->horas); return $criteria; @@ -406,6 +462,8 @@ $copyObj->setFkActividadId($this->fk_actividad_id); + $copyObj->setFkOrientacionId($this->fk_orientacion_id); + $copyObj->setHoras($this->horas); @@ -492,4 +550,34 @@ return $this->aActividad; } + + public function setOrientacion($v) + { + + + if ($v === null) { + $this->setFkOrientacionId(NULL); + } else { + $this->setFkOrientacionId($v->getId()); + } + + + $this->aOrientacion = $v; + } + + + + public function getOrientacion($con = null) + { + include_once 'lib/model/om/BaseOrientacionPeer.php'; + + if ($this->aOrientacion === null && ($this->fk_orientacion_id !== null)) { + + $this->aOrientacion = OrientacionPeer::retrieveByPK($this->fk_orientacion_id, $con); + + + } + return $this->aOrientacion; + } + } \ 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-08-08 19:21:49 UTC (rev 4941) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadPeer.php 2007-08-08 19:37:43 UTC (rev 4942) @@ -13,7 +13,7 @@ const CLASS_DEFAULT = 'lib.model.RelAnioActividad'; - const NUM_COLUMNS = 4; + const NUM_COLUMNS = 5; const NUM_LAZY_LOAD_COLUMNS = 0; @@ -29,6 +29,9 @@ const FK_ACTIVIDAD_ID = 'rel_anio_actividad.FK_ACTIVIDAD_ID'; + const FK_ORIENTACION_ID = 'rel_anio_actividad.FK_ORIENTACION_ID'; + + const HORAS = 'rel_anio_actividad.HORAS'; @@ -37,18 +40,18 @@ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('Id', 'FkAnioId', 'FkActividadId', 'Horas', ), - BasePeer::TYPE_COLNAME => array (RelAnioActividadPeer::ID, RelAnioActividadPeer::FK_ANIO_ID, RelAnioActividadPeer::FK_ACTIVIDAD_ID, RelAnioActividadPeer::HORAS, ), - BasePeer::TYPE_FIELDNAME => array ('id', 'fk_anio_id', 'fk_actividad_id', 'horas', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) + BasePeer::TYPE_PHPNAME => array ('Id', 'FkAnioId', 'FkActividadId', 'FkOrientacionId', 'Horas', ), + BasePeer::TYPE_COLNAME => array (RelAnioActividadPeer::ID, RelAnioActividadPeer::FK_ANIO_ID, RelAnioActividadPeer::FK_ACTIVIDAD_ID, RelAnioActividadPeer::FK_ORIENTACION_ID, RelAnioActividadPeer::HORAS, ), + BasePeer::TYPE_FIELDNAME => array ('id', 'fk_anio_id', 'fk_actividad_id', 'fk_orientacion_id', 'horas', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, ) ); private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'FkAnioId' => 1, 'FkActividadId' => 2, 'Horas' => 3, ), - BasePeer::TYPE_COLNAME => array (RelAnioActividadPeer::ID => 0, RelAnioActividadPeer::FK_ANIO_ID => 1, RelAnioActividadPeer::FK_ACTIVIDAD_ID => 2, RelAnioActividadPeer::HORAS => 3, ), - BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'fk_anio_id' => 1, 'fk_actividad_id' => 2, 'horas' => 3, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) + BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'FkAnioId' => 1, 'FkActividadId' => 2, 'FkOrientacionId' => 3, 'Horas' => 4, ), + BasePeer::TYPE_COLNAME => array (RelAnioActividadPeer::ID => 0, RelAnioActividadPeer::FK_ANIO_ID => 1, RelAnioActividadPeer::FK_ACTIVIDAD_ID => 2, RelAnioActividadPeer::FK_ORIENTACION_ID => 3, RelAnioActividadPeer::HORAS => 4, ), + BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'fk_anio_id' => 1, 'fk_actividad_id' => 2, 'fk_orientacion_id' => 3, 'horas' => 4, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, ) ); @@ -108,6 +111,8 @@ $criteria->addSelectColumn(RelAnioActividadPeer::FK_ACTIVIDAD_ID); + $criteria->addSelectColumn(RelAnioActividadPeer::FK_ORIENTACION_ID); + $criteria->addSelectColumn(RelAnioActividadPeer::HORAS); } @@ -245,6 +250,34 @@ + public static function doCountJoinOrientacion(Criteria $criteria, $distinct = false, $con = null) + { + $criteria = clone $criteria; + + $criteria->clearSelectColumns()->clearOrderByColumns(); + if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { + $criteria->addSelectColumn(RelAnioActividadPeer::COUNT_DISTINCT); + } else { + $criteria->addSelectColumn(RelAnioActividadPeer::COUNT); + } + + foreach($criteria->getGroupByColumns() as $column) + { + $criteria->addSelectColumn($column); + } + + $criteria->addJoin(RelAnioActividadPeer::FK_ORIENTACION_ID, OrientacionPeer::ID); + + $rs = RelAnioActividadPeer::doSelectRS($criteria, $con); + if ($rs->next()) { + return $rs->getInt(1); + } else { + return 0; + } + } + + + public static function doSelectJoinAnio(Criteria $c, $con = null) { $c = clone $c; @@ -339,6 +372,53 @@ + public static function doSelectJoinOrientacion(Criteria $c, $con = null) + { + $c = clone $c; + + if ($c->getDbName() == Propel::getDefaultDB()) { + $c->setDbName(self::DATABASE_NAME); + } + + RelAnioActividadPeer::addSelectColumns($c); + $startcol = (RelAnioActividadPeer::NUM_COLUMNS - RelAnioActividadPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + OrientacionPeer::addSelectColumns($c); + + $c->addJoin(RelAnioActividadPeer::FK_ORIENTACION_ID, OrientacionPeer::ID); + $rs = BasePeer::doSelect($c, $con); + $results = array(); + + while($rs->next()) { + + $omClass = RelAnioActividadPeer::getOMClass(); + + $cls = Propel::import($omClass); + $obj1 = new $cls(); + $obj1->hydrate($rs); + + $omClass = OrientacionPeer::getOMClass(); + + $cls = Propel::import($omClass); + $obj2 = new $cls(); + $obj2->hydrate($rs, $startcol); + + $newObject = true; + foreach($results as $temp_obj1) { + $temp_obj2 = $temp_obj1->getOrientacion(); if ($temp_obj2->getPrimaryKey() === $obj2->getPrimaryKey()) { + $newObject = false; + $temp_obj2->addRelAnioActividad($obj1); break; + } + } + if ($newObject) { + $obj2->initRelAnioActividads(); + $obj2->addRelAnioActividad($obj1); } + $results[] = $obj1; + } + return $results; + } + + + public static function doCountJoinAll(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; @@ -359,6 +439,8 @@ $criteria->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelAnioActividadPeer::FK_ORIENTACION_ID, OrientacionPeer::ID); + $rs = RelAnioActividadPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -386,10 +468,15 @@ ActividadPeer::addSelectColumns($c); $startcol4 = $startcol3 + ActividadPeer::NUM_COLUMNS; + OrientacionPeer::addSelectColumns($c); + $startcol5 = $startcol4 + OrientacionPeer::NUM_COLUMNS; + $c->addJoin(RelAnioActividadPeer::FK_ANIO_ID, AnioPeer::ID); $c->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $c->addJoin(RelAnioActividadPeer::FK_ORIENTACION_ID, OrientacionPeer::ID); + $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -448,6 +535,29 @@ $obj3->addRelAnioActividad($obj1); } + + + $omClass = OrientacionPeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj4 = new $cls(); + $obj4->hydrate($rs, $startcol4); + + $newObject = true; + for ($j=0, $resCount=count($results); $j < $resCount; $j++) { + $temp_obj1 = $results[$j]; + $temp_obj4 = $temp_obj1->getOrientacion(); if ($temp_obj4->getPrimaryKey() === $obj4->getPrimaryKey()) { + $newObject = false; + $temp_obj4->addRelAnioActividad($obj1); break; + } + } + + if ($newObject) { + $obj4->initRelAnioActividads(); + $obj4->addRelAnioActividad($obj1); + } + $results[] = $obj1; } return $results; @@ -473,6 +583,8 @@ $criteria->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $criteria->addJoin(RelAnioActividadPeer::FK_ORIENTACION_ID, OrientacionPeer::ID); + $rs = RelAnioActividadPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -501,6 +613,8 @@ $criteria->addJoin(RelAnioActividadPeer::FK_ANIO_ID, AnioPeer::ID); + $criteria->addJoin(RelAnioActividadPeer::FK_ORIENTACION_ID, OrientacionPeer::ID); + $rs = RelAnioActividadPeer::doSelectRS($criteria, $con); if ($rs->next()) { return $rs->getInt(1); @@ -511,6 +625,36 @@ + public static function doCountJoinAllExceptOrientacion(Criteria $criteria, $distinct = false, $con = null) + { + $criteria = clone $criteria; + + $criteria->clearSelectColumns()->clearOrderByColumns(); + if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { + $criteria->addSelectColumn(RelAnioActividadPeer::COUNT_DISTINCT); + } else { + $criteria->addSelectColumn(RelAnioActividadPeer::COUNT); + } + + foreach($criteria->getGroupByColumns() as $column) + { + $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()) { + return $rs->getInt(1); + } else { + return 0; + } + } + + + public static function doSelectJoinAllExceptAnio(Criteria $c, $con = null) { $c = clone $c; @@ -525,9 +669,14 @@ ActividadPeer::addSelectColumns($c); $startcol3 = $startcol2 + ActividadPeer::NUM_COLUMNS; + OrientacionPeer::addSelectColumns($c); + $startcol4 = $startcol3 + OrientacionPeer::NUM_COLUMNS; + $c->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + $c->addJoin(RelAnioActividadPeer::FK_ORIENTACION_ID, OrientacionPeer::ID); + $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -561,6 +710,28 @@ $obj2->addRelAnioActividad($obj1); } + $omClass = OrientacionPeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj3 = new $cls(); + $obj3->hydrate($rs, $startcol3); + + $newObject = true; + for ($j=0, $resCount=count($results); $j < $resCount; $j++) { + $temp_obj1 = $results[$j]; + $temp_obj3 = $temp_obj1->getOrientacion(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $newObject = false; + $temp_obj3->addRelAnioActividad($obj1); + break; + } + } + + if ($newObject) { + $obj3->initRelAnioActividads(); + $obj3->addRelAnioActividad($obj1); + } + $results[] = $obj1; } return $results; @@ -582,9 +753,14 @@ AnioPeer::addSelectColumns($c); $startcol3 = $startcol2 + AnioPeer::NUM_COLUMNS; + OrientacionPeer::addSelectColumns($c); + $startcol4 = $startcol3 + OrientacionPeer::NUM_COLUMNS; + $c->addJoin(RelAnioActividadPeer::FK_ANIO_ID, AnioPeer::ID); + $c->addJoin(RelAnioActividadPeer::FK_ORIENTACION_ID, OrientacionPeer::ID); + $rs = BasePeer::doSelect($c, $con); $results = array(); @@ -618,12 +794,118 @@ $obj2->addRelAnioActividad($obj1); } + $omClass = OrientacionPeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj3 = new $cls(); + $obj3->hydrate($rs, $startcol3); + + $newObject = true; + for ($j=0, $resCount=count($results); $j < $resCount; $j++) { + $temp_obj1 = $results[$j]; + $temp_obj3 = $temp_obj1->getOrientacion(); if ($temp_obj3->getPrimaryKey() === $obj3->getPrimaryKey()) { + $newObject = false; + $temp_obj3->addRelAnioActividad($obj1); + break; + } + } + + if ($newObject) { + $obj3->initRelAnioActividads(); + $obj3->addRelAnioActividad($obj1); + } + $results[] = $obj1; } return $results; } + + public static function doSelectJoinAllExceptOrientacion(Criteria $c, $con = null) + { + $c = clone $c; + + if ($c->getDbName() == Propel::getDefaultDB()) { + $c->setDbName(self::DATABASE_NAME); + } + + RelAnioActividadPeer::addSelectColumns($c); + $startcol2 = (RelAnioActividadPeer::NUM_COLUMNS - RelAnioActividadPeer::NUM_LAZY_LOAD_COLUMNS) + 1; + + AnioPeer::addSelectColumns($c); + $startcol3 = $startcol2 + AnioPeer::NUM_COLUMNS; + + ActividadPeer::addSelectColumns($c); + $startcol4 = $startcol3 + ActividadPeer::NUM_COLUMNS; + + $c->addJoin(RelAnioActividadPeer::FK_ANIO_ID, AnioPeer::ID); + + $c->addJoin(RelAnioActividadPeer::FK_ACTIVIDAD_ID, ActividadPeer::ID); + + + $rs = BasePeer::doSelect($c, $con); + $results = array(); + + while($rs->next()) { + + $omClass = RelAnioActividadPeer::getOMClass(); + + $cls = Propel::import($omClass); + $obj1 = new $cls(); + $obj1->hydrate($rs); + + $omClass = AnioPeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj2 = new $cls(); + $obj2->hydrate($rs, $startcol2); + + $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()) { + $newObject = false; + $temp_obj2->addRelAnioActividad($obj1); + break; + } + } + + if ($newObject) { + $obj2->initRelAnioActividads(); + $obj2->addRelAnioActividad($obj1); + } + + $omClass = ActividadPeer::getOMClass(); + + + $cls = Propel::import($omClass); + $obj3 = new $cls(); + $obj3->hydrate($rs, $startcol3); + + $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()) { + $newObject = false; + $temp_obj3->addRelAnioActividad($obj1); + break; + } + } + + if ($newObject) { + $obj3->initRelAnioActividads(); + $obj3->addRelAnioActividad($obj1); + } + + $results[] = $obj1; + } + return $results; + } + + public static function getTableMap() { return Propel::getDatabaseMap(self::DATABASE_NAME)->getTable(self::TABLE_NAME);

1 0

SVN Alba r4941 - in prosistem/alba/trunk/alba: config doc
by commits＠pressenter.com.ar 08 Aug '07

08 Aug '07

Author: ftoledo Date: 2007-08-08 16:21:49 -0300 (Wed, 08 Aug 2007) New Revision: 4941 Removed: prosistem/alba/trunk/alba/config/schema.xml.sample Modified: prosistem/alba/trunk/alba/doc/DER.xmi Log: sacando schema de ejmplo y agregando tabla espacio al der Deleted: prosistem/alba/trunk/alba/config/schema.xml.sample =================================================================== --- prosistem/alba/trunk/alba/config/schema.xml.sample 2007-08-08 16:54:38 UTC (rev 4940) +++ prosistem/alba/trunk/alba/config/schema.xml.sample 2007-08-08 19:21:49 UTC (rev 4941) @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <database name="propel" defaultIdMethod="native" noxsd="true"> - </database> Modified: prosistem/alba/trunk/alba/doc/DER.xmi =================================================================== --- prosistem/alba/trunk/alba/doc/DER.xmi 2007-08-08 16:54:38 UTC (rev 4940) +++ prosistem/alba/trunk/alba/doc/DER.xmi 2007-08-08 19:21:49 UTC (rev 4941) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<XMI xmlns:UML="http://schema.omg.org/spec/UML/1.3" verified="false" timestamp="2007-01-31T16:15:23" xmi.version="1.2" > +<XMI xmlns:UML="http://schema.omg.org/spec/UML/1.3" verified="false" timestamp="2007-08-08T16:17:48" xmi.version="1.2" > <XMI.header> <XMI.documentation> <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter> @@ -15,6 +15,8 @@ <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> + <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> + <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2211" isRoot="false" isAbstract="false" name="datatype" /> <UML:Model stereotype="2" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="1" isRoot="false" isAbstract="false" name="Logical View" > <UML:Namespace.ownedElement> @@ -393,6 +395,16 @@ <UML:EntityAttribute attributes="" values="" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2494" auto_increment="0" xmi.id="2496" isRoot="false" initialValue="" type="2210" isAbstract="false" name="fk_division_id" /> <UML:EntityAttribute attributes="" values="" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2494" auto_increment="0" xmi.id="2497" isRoot="false" initialValue="" type="2210" isAbstract="false" name="fk_alumno_id" /> </UML:Entity> + <UML:Entity isSpecification="false" isLeaf="false" visibility="public" namespace="6" xmi.id="2507" isRoot="false" isAbstract="false" name="espacio" > + <UML:EntityAttribute attributes="" values="" dbindex_type="1101" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2507" auto_increment="1" xmi.id="2508" isRoot="false" initialValue="" type="2210" isAbstract="false" name="id" /> + <UML:EntityAttribute attributes="" values="128" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2507" auto_increment="0" xmi.id="2509" isRoot="false" initialValue="" type="2441" isAbstract="false" name="nombre" /> + <UML:EntityAttribute attributes="" values="" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2507" auto_increment="0" xmi.id="2510" isRoot="false" initialValue="" type="2214" isAbstract="false" name="m2" /> + <UML:EntityAttribute attributes="" values="255" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2507" auto_increment="0" xmi.id="2511" isRoot="false" initialValue="" type="2441" isAbstract="false" name="capacidad" /> + <UML:EntityAttribute attributes="" values="255" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2507" auto_increment="0" xmi.id="2512" isRoot="false" initialValue="" type="2441" isAbstract="false" name="descripcion" /> + <UML:EntityAttribute attributes="" values="255" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2507" auto_increment="0" xmi.id="2513" isRoot="false" initialValue="" type="2441" isAbstract="false" name="estado" /> + <UML:EntityAttribute attributes="" values="" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2507" auto_increment="0" xmi.id="2514" isRoot="false" initialValue="" type="2210" isAbstract="false" name="fk_tipoespacio_id" /> + <UML:EntityAttribute attributes="" values="" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2507" auto_increment="0" xmi.id="2515" isRoot="false" initialValue="" type="2210" isAbstract="false" name="fk_locacion_id" /> + </UML:Entity> <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2469" name="" > <UML:Association.connection> <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2470" aggregation="none" type="2465" name="" /> @@ -423,60 +435,91 @@ <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2500" aggregation="none" type="2439" name="" /> </UML:Association.connection> </UML:Association> + <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2501" name="" > + <UML:Association.connection> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2502" aggregation="none" type="2220" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2503" aggregation="none" type="2494" name="" /> + </UML:Association.connection> + </UML:Association> + <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2504" name="" > + <UML:Association.connection> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2505" aggregation="none" type="2221" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2506" aggregation="none" type="2465" name="" /> + </UML:Association.connection> + </UML:Association> + <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2516" name="" > + <UML:Association.connection> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2517" aggregation="none" type="2481" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2518" aggregation="none" type="2222" name="" /> + </UML:Association.connection> + </UML:Association> + <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2519" name="" > + <UML:Association.connection> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2520" aggregation="none" type="2507" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2521" aggregation="none" type="2481" name="" /> + </UML:Association.connection> + </UML:Association> + <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2522" name="" > + <UML:Association.connection> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2523" aggregation="none" type="2507" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2524" aggregation="none" type="2222" name="" /> + </UML:Association.connection> + </UML:Association> </UML:Namespace.ownedElement> <XMI.extension xmi.extender="umbrello" > <diagrams> - <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1396" snapy="10" showatts="1" xmi.id="2219" documentation="" type="9" showops="1" showpackage="0" name="DER - Alba" localid="900000" showstereotype="0" showscope="1" snapcsgrid="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="1318" > + <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="81" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1588" snapy="10" showatts="1" xmi.id="2219" documentation="" type="9" showops="1" showpackage="0" name="DER - Alba" localid="900000" showstereotype="0" showscope="1" snapcsgrid="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="1353" > <widgets> - <entitywidget usesdiagramfillcolour="0" width="148" usesdiagramusefillcolour="0" x="597" y="358" linewidth="none" fillcolour="#ffffc0" height="270" usefillcolor="1" isinstance="0" xmi.id="2220" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="132" usesdiagramusefillcolour="0" x="965" y="277" linewidth="none" fillcolour="#ffffc0" height="144" usefillcolor="1" isinstance="0" xmi.id="2221" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="137" usesdiagramusefillcolour="0" x="575" y="675" linewidth="none" fillcolour="#ffffc0" height="216" usefillcolor="1" isinstance="0" xmi.id="2222" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="148" usesdiagramusefillcolour="0" x="481" y="456" linewidth="none" fillcolour="#ffffc0" height="270" usefillcolor="1" isinstance="0" xmi.id="2220" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="132" usesdiagramusefillcolour="0" x="1097" y="139" linewidth="none" fillcolour="#ffffc0" height="144" usefillcolor="1" isinstance="0" xmi.id="2221" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="137" usesdiagramusefillcolour="0" x="117" y="1087" linewidth="none" fillcolour="#ffffc0" height="216" usefillcolor="1" isinstance="0" xmi.id="2222" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> <entitywidget usesdiagramfillcolour="0" width="103" usesdiagramusefillcolour="0" x="429" y="124" linewidth="none" fillcolour="#ffffc0" height="198" usefillcolor="1" isinstance="0" xmi.id="2223" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="82" usesdiagramusefillcolour="0" x="702" y="1026" linewidth="none" fillcolour="#ffffc0" height="108" usefillcolor="1" isinstance="0" xmi.id="2224" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="84" usesdiagramusefillcolour="0" x="1197" y="278" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2225" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="82" usesdiagramusefillcolour="0" x="1353" y="964" linewidth="none" fillcolour="#ffffc0" height="108" usefillcolor="1" isinstance="0" xmi.id="2224" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="84" usesdiagramusefillcolour="0" x="1351" y="147" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2225" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> <entitywidget usesdiagramfillcolour="0" width="108" usesdiagramusefillcolour="0" x="708" y="119" linewidth="none" fillcolour="#ffffc0" height="216" usefillcolor="1" isinstance="0" xmi.id="2226" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="100" usesdiagramusefillcolour="0" x="317" y="677" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2227" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="100" usesdiagramusefillcolour="0" x="46" y="550" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2227" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> <entitywidget usesdiagramfillcolour="0" width="94" usesdiagramusefillcolour="0" x="1012" y="1112" linewidth="none" fillcolour="#ffffc0" height="108" usefillcolor="1" isinstance="0" xmi.id="2228" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="124" usesdiagramusefillcolour="0" x="1183" y="526" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2229" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="100" usesdiagramusefillcolour="0" x="416" y="475" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2230" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="225" usesdiagramusefillcolour="0" x="774" y="548" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2231" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="126" usesdiagramusefillcolour="0" x="841" y="1109" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2232" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="124" usesdiagramusefillcolour="0" x="1423" y="547" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2229" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="100" usesdiagramusefillcolour="0" x="237" y="553" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2230" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="225" usesdiagramusefillcolour="0" x="978" y="589" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2231" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="126" usesdiagramusefillcolour="0" x="840" y="1142" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2232" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> <entitywidget usesdiagramfillcolour="0" width="161" usesdiagramusefillcolour="0" x="959" y="993" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2233" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="186" usesdiagramusefillcolour="0" x="1179" y="699" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2234" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="129" usesdiagramusefillcolour="0" x="211" y="123" linewidth="none" fillcolour="#ffffc0" height="306" usefillcolor="1" isinstance="0" xmi.id="2235" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="82" usesdiagramusefillcolour="0" x="845" y="1224" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2236" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="186" usesdiagramusefillcolour="0" x="1398" y="766" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2234" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="129" usesdiagramusefillcolour="0" x="216" y="68" linewidth="none" fillcolour="#ffffc0" height="306" usefillcolor="1" isinstance="0" xmi.id="2235" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="82" usesdiagramusefillcolour="0" x="692" y="1133" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2236" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> <entitywidget usesdiagramfillcolour="0" width="82" usesdiagramusefillcolour="0" x="572" y="121" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2237" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="148" usesdiagramusefillcolour="0" x="961" y="703" linewidth="none" fillcolour="#ffffc0" height="234" usefillcolor="1" isinstance="0" xmi.id="2238" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="1" width="87" usesdiagramusefillcolour="1" x="196" y="738" linewidth="none" fillcolour="none" height="90" usefillcolor="1" isinstance="0" xmi.id="2439" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> - <entitywidget usesdiagramfillcolour="1" width="148" usesdiagramusefillcolour="1" x="65" y="593" linewidth="none" fillcolour="none" height="72" usefillcolor="1" isinstance="0" xmi.id="2465" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> - <entitywidget usesdiagramfillcolour="1" width="115" usesdiagramusefillcolour="1" x="191" y="887" linewidth="none" fillcolour="none" height="108" usefillcolor="1" isinstance="0" xmi.id="2475" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> - <entitywidget usesdiagramfillcolour="1" width="148" usesdiagramusefillcolour="1" x="6" y="916" linewidth="none" fillcolour="none" height="126" usefillcolor="1" isinstance="0" xmi.id="2481" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> - <entitywidget usesdiagramfillcolour="0" width="146" usesdiagramusefillcolour="0" x="356" y="832" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2494" showstereotype="1" font="Sans Serif,10,-1,0,75,1,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="148" usesdiagramusefillcolour="0" x="1169" y="688" linewidth="none" fillcolour="#ffffc0" height="234" usefillcolor="1" isinstance="0" xmi.id="2238" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="1" width="87" usesdiagramusefillcolour="1" x="777" y="723" linewidth="none" fillcolour="none" height="90" usefillcolor="1" isinstance="0" xmi.id="2439" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> + <entitywidget usesdiagramfillcolour="1" width="148" usesdiagramusefillcolour="1" x="773" y="591" linewidth="none" fillcolour="none" height="72" usefillcolor="1" isinstance="0" xmi.id="2465" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> + <entitywidget usesdiagramfillcolour="1" width="115" usesdiagramusefillcolour="1" x="669" y="912" linewidth="none" fillcolour="none" height="108" usefillcolor="1" isinstance="0" xmi.id="2475" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> + <entitywidget usesdiagramfillcolour="1" width="148" usesdiagramusefillcolour="1" x="433" y="1007" linewidth="none" fillcolour="none" height="126" usefillcolor="1" isinstance="0" xmi.id="2481" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> + <entitywidget usesdiagramfillcolour="0" width="146" usesdiagramusefillcolour="0" x="489" y="816" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2494" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="119" usesdiagramusefillcolour="0" x="343" y="1187" linewidth="none" fillcolour="#ffffc0" height="162" usefillcolor="1" isinstance="0" xmi.id="2507" showstereotype="1" font="Sans Serif,10,-1,0,75,1,0,0,0,0" linecolor="#ff0000" /> </widgets> <messages/> <associations> - <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="2230" widgetaid="2227" xmi.id="2372" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2230" widgetaid="2227" xmi.id="2372" linecolor="none" > <linepath> - <startpoint startx="367" starty="677" /> - <endpoint endx="449" endy="565" /> + <startpoint startx="146" starty="595" /> + <endpoint endx="237" endy="598" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2221" widgetaid="2225" xmi.id="2378" linecolor="none" > <linepath> - <startpoint startx="1197" starty="314" /> - <endpoint endx="1097" endy="349" /> + <startpoint startx="1351" starty="183" /> + <endpoint endx="1229" endy="211" /> </linepath> </assocwidget> - <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2222" widgetaid="2230" xmi.id="2381" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2222" widgetaid="2230" xmi.id="2381" linecolor="none" > <linepath> - <startpoint startx="482" starty="565" /> - <endpoint endx="575" endy="783" /> - <point x="550" y="722" /> + <startpoint startx="287" starty="643" /> + <endpoint endx="185" endy="1087" /> + <point x="285" y="738" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2233" widgetaid="2238" xmi.id="2384" linecolor="none" > <linepath> - <startpoint startx="1035" starty="937" /> + <startpoint startx="1169" starty="805" /> <endpoint endx="1039" endy="993" /> </linepath> </assocwidget> @@ -489,7 +532,7 @@ <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="2221" widgetaid="2226" xmi.id="2390" linecolor="none" > <linepath> <startpoint startx="816" starty="227" /> - <endpoint endx="965" endy="325" /> + <endpoint endx="1097" endy="187" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2226" widgetaid="2237" xmi.id="2393" linecolor="none" > @@ -498,114 +541,135 @@ <endpoint endx="708" endy="227" /> </linepath> </assocwidget> - <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2231" widgetaid="2221" xmi.id="2396" linecolor="none" > + <assocwidget totalcounta="4" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2231" widgetaid="2221" xmi.id="2396" linecolor="none" > <linepath> - <startpoint startx="1009" starty="421" /> - <endpoint endx="886" endy="548" /> + <startpoint startx="1163" starty="283" /> + <endpoint endx="1090" endy="589" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="2223" widgetaid="2237" xmi.id="2399" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2223" widgetaid="2237" xmi.id="2399" linecolor="none" > <linepath> <startpoint startx="572" starty="157" /> - <endpoint endx="532" endy="190" /> + <endpoint endx="532" endy="223" /> </linepath> </assocwidget> - <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2223" widgetaid="2230" xmi.id="2402" linecolor="none" > + <assocwidget totalcounta="3" indexa="2" totalcountb="3" indexb="1" linewidth="none" widgetbid="2223" widgetaid="2230" xmi.id="2402" linecolor="none" > <linepath> - <startpoint startx="482" starty="475" /> - <endpoint endx="480" endy="322" /> + <startpoint startx="303" starty="553" /> + <endpoint endx="463" endy="322" /> </linepath> </assocwidget> - <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2238" widgetaid="2221" xmi.id="2405" linecolor="none" > + <assocwidget totalcounta="4" indexa="3" totalcountb="2" indexb="1" linewidth="none" widgetbid="2238" widgetaid="2221" xmi.id="2405" linecolor="none" > <linepath> - <startpoint startx="1053" starty="421" /> - <endpoint endx="1035" endy="703" /> + <startpoint startx="1196" starty="283" /> + <endpoint endx="1243" endy="688" /> </linepath> </assocwidget> - <assocwidget totalcounta="3" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="2235" widgetaid="2230" xmi.id="2408" linecolor="none" > + <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2235" widgetaid="2230" xmi.id="2408" linecolor="none" > <linepath> - <startpoint startx="449" starty="475" /> - <endpoint endx="340" endy="327" /> + <startpoint startx="270" starty="553" /> + <endpoint endx="280" endy="374" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="2235" widgetaid="2223" xmi.id="2411" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2235" widgetaid="2223" xmi.id="2411" linecolor="none" > <linepath> <startpoint startx="429" starty="223" /> - <endpoint endx="340" endy="225" /> + <endpoint endx="345" endy="221" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2232" widgetaid="2236" xmi.id="2414" linecolor="none" > <linepath> - <startpoint startx="886" starty="1224" /> - <endpoint endx="904" endy="1181" /> + <startpoint startx="774" starty="1178" /> + <endpoint endx="840" endy="1178" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2232" widgetaid="2228" xmi.id="2417" linecolor="none" > <linepath> <startpoint startx="1012" starty="1166" /> - <endpoint endx="967" endy="1145" /> + <endpoint endx="966" endy="1178" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2234" widgetaid="2229" xmi.id="2420" linecolor="none" > <linepath> - <startpoint startx="1245" starty="616" /> - <endpoint endx="1272" endy="699" /> + <startpoint startx="1485" starty="637" /> + <endpoint endx="1491" endy="766" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2234" widgetaid="2238" xmi.id="2423" linecolor="none" > <linepath> - <startpoint startx="1109" starty="820" /> - <endpoint endx="1179" endy="735" /> + <startpoint startx="1317" starty="805" /> + <endpoint endx="1398" endy="802" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2231" widgetaid="2222" xmi.id="2426" linecolor="none" > + <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2231" widgetaid="2222" xmi.id="2426" linecolor="none" > <linepath> - <startpoint startx="712" starty="783" /> - <endpoint endx="886" endy="620" /> + <startpoint startx="254" starty="1159" /> + <endpoint endx="1090" endy="661" /> + <point x="604" y="1163" /> + <point x="852" y="983" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="2220" widgetaid="2230" xmi.id="2429" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2220" widgetaid="2230" xmi.id="2429" linecolor="none" > <linepath> - <startpoint startx="516" starty="520" /> - <endpoint endx="597" endy="538" /> + <startpoint startx="337" starty="598" /> + <endpoint endx="481" endy="591" /> </linepath> </assocwidget> <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2220" widgetaid="2221" xmi.id="2432" linecolor="none" > <linepath> - <startpoint startx="965" starty="373" /> - <endpoint endx="745" endy="493" /> + <startpoint startx="1097" starty="235" /> + <endpoint endx="629" endy="591" /> </linepath> </assocwidget> - <assocwidget totalcounta="3" indexa="2" totalcountb="3" indexb="1" linewidth="none" widgetbid="2220" widgetaid="2223" xmi.id="2435" linecolor="none" > + <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2220" widgetaid="2223" xmi.id="2435" linecolor="none" > <linepath> - <startpoint startx="532" starty="256" /> - <endpoint endx="597" endy="448" /> + <startpoint startx="497" starty="322" /> + <endpoint endx="555" endy="456" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2465" widgetaid="2439" xmi.id="2472" linecolor="none" > <linepath> - <startpoint startx="239" starty="738" /> - <endpoint endx="139" endy="665" /> + <startpoint startx="820" starty="723" /> + <endpoint endx="847" endy="663" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2439" widgetaid="2475" xmi.id="2488" linecolor="none" > <linepath> - <startpoint startx="248" starty="887" /> - <endpoint endx="239" endy="828" /> + <startpoint startx="726" starty="912" /> + <endpoint endx="820" endy="813" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2475" widgetaid="2481" xmi.id="2491" linecolor="none" > <linepath> - <startpoint startx="154" starty="979" /> - <endpoint endx="191" endy="941" /> + <startpoint startx="581" starty="1070" /> + <endpoint endx="669" endy="966" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2439" widgetaid="2494" xmi.id="2498" linecolor="none" > <linepath> - <startpoint startx="356" starty="868" /> - <endpoint endx="283" endy="783" /> + <startpoint startx="635" starty="852" /> + <endpoint endx="777" endy="768" /> </linepath> </assocwidget> + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2494" widgetaid="2220" xmi.id="2501" linecolor="none" > + <linepath> + <startpoint startx="555" starty="726" /> + <endpoint endx="562" endy="816" /> + <point x="594" y="712" /> + </linepath> + </assocwidget> + <assocwidget totalcounta="4" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2465" widgetaid="2221" xmi.id="2504" linecolor="none" > + <linepath> + <startpoint startx="1130" starty="283" /> + <endpoint endx="847" endy="591" /> + </linepath> + </assocwidget> + <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="2222" widgetaid="2507" xmi.id="2522" linecolor="none" > + <linepath> + <startpoint startx="343" starty="1268" /> + <endpoint endx="254" endy="1231" /> + </linepath> + </assocwidget> </associations> </diagram> </diagrams> @@ -615,7 +679,7 @@ </UML:Model> </XMI.content> <XMI.extensions xmi.extender="umbrello" > - <docsettings viewid="2219" documentation="" uniqueid="2500" /> + <docsettings viewid="2219" documentation="" uniqueid="2524" /> <listview> <listitem open="1" type="800" label="Vistas" > <listitem open="1" type="801" id="1" > @@ -705,6 +769,16 @@ <listitem open="0" type="833" id="2463" /> <listitem open="0" type="833" id="2464" /> </listitem> + <listitem open="1" type="832" id="2507" > + <listitem open="0" type="833" id="2508" /> + <listitem open="0" type="833" id="2509" /> + <listitem open="0" type="833" id="2510" /> + <listitem open="0" type="833" id="2511" /> + <listitem open="0" type="833" id="2512" /> + <listitem open="0" type="833" id="2513" /> + <listitem open="0" type="833" id="2514" /> + <listitem open="0" type="833" id="2515" /> + </listitem> <listitem open="1" type="832" id="2221" > <listitem open="0" type="833" id="2261" /> <listitem open="0" type="833" id="2262" />

1 0

instalador
by Fernando Toledo 08 Aug '07

08 Aug '07

alos... sigo con el instalador esta, es una idea de pasos para el usuario serial algo asi como next->next->next y listo! http://alba.pressenter.com.ar/cgi-bin/trac.cgi/wiki/Borrador%20del%20nuevo%… sugerencias, comentarios? pd: si alguno quiere escribir en el wiki, me avisa para que le creemos una cuenta. -- Dock Sud BBS http://www.docksud.com.ar telnet://bbs.docksud.com.ar

3 8

SVN Alba r4940 - in prosistem/alba/trunk/alba: apps/principal/modules/relAlumnoDivision/templates lib/model
by commits＠pressenter.com.ar 08 Aug '07

08 Aug '07

Author: josx Date: 2007-08-08 13:54:38 -0300 (Wed, 08 Aug 2007) New Revision: 4940 Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_filtro_fk_division_id.php prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php prosistem/alba/trunk/alba/lib/model/Division.php Log: Cambio en filtro y como muestra las divisiones en alumnos por grado Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_filtro_fk_division_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_filtro_fk_division_id.php 2007-08-08 16:03:25 UTC (rev 4939) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_filtro_fk_division_id.php 2007-08-08 16:54:38 UTC (rev 4940) @@ -11,7 +11,7 @@ $optionsDivisiones = array(); $optionsDivisiones[""] = ""; foreach ($divisiones as $division) { - $optionsDivisiones[$division->getId()] = $division->getAnio()->getDescripcion(). " / " . $division->getDescripcion(); + $optionsDivisiones[$division->getId()] = $division->__toString(); } echo select_tag('filters[fk_division_id]', options_for_select($optionsDivisiones)) ; ?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php 2007-08-08 16:03:25 UTC (rev 4939) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php 2007-08-08 16:54:38 UTC (rev 4940) @@ -11,7 +11,7 @@ $optionsDivisiones = array(); $optionsDivisiones[""] = "--Seleccione una División--"; foreach ($divisiones as $division) { - $optionsDivisiones[$division->getId()] = $division->getAnio()->getDescripcion(). " / " . $division->getDescripcion(); + $optionsDivisiones[$division->getId()] = $division->__toString(); } echo select_tag('rel_alumno_division[fk_division_id]', options_for_select($optionsDivisiones, $rel_alumno_division->getFkDivisionId()) ) ; ?> Modified: prosistem/alba/trunk/alba/lib/model/Division.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/Division.php 2007-08-08 16:03:25 UTC (rev 4939) +++ prosistem/alba/trunk/alba/lib/model/Division.php 2007-08-08 16:54:38 UTC (rev 4940) @@ -16,7 +16,7 @@ */ class Division extends BaseDivision { public function __toString() { - return $this->getAnio()->getDescripcion()." ".$this->getDescripcion().(($this->getOrientacion())?" ".$this-getOrientacion()->getNombre():""); + return $this->getAnio()->getDescripcion()." ".$this->getDescripcion().(($this->getOrientacion())?" ".$this->getOrientacion()->getNombre():""); } } // Division

1 0

[Pressenter - SVN Alba] #182: MODULO GESTION ESCOLAR
by Pressenter - SVN Alba 08 Aug '07

08 Aug '07

#182: MODULO GESTION ESCOLAR ---------------------+------------------------------------------------------ Reporter: Akela | Owner: somebody Type: defecto | Status: new Priority: normal | Milestone: Component: alba | Version: Severity: normal | Keywords: ---------------------+------------------------------------------------------ MODULO GESTION ESCOLAR -CUANDO QUIERO LIGAR ACTIVIDAD/MATERIA A AÑO/DIVISIÒN ESPECÌFICO/CARGA HORARIA NO ME APARECEN LOS AÑOS/DIVISIONES (1ªINFORMATICA, 2ªMERCANTIL) COMO OPCIONES. SÒLO PUEDO LIGAR LA MATERIA/ACTIVIDAD A UNA ASIGNATURA GENÈRICA -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/182> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 3

[Pressenter - SVN Alba] #203: Validación en Docente Horarios
by Pressenter - SVN Alba 08 Aug '07

08 Aug '07

#203: Validación en Docente Horarios ---------------------------------+------------------------------------------ Reporter: josx | Owner: somebody Type: defecto | Status: new Priority: normal | Milestone: version 1.0 Component: alba-docenteHorario | Version: desarollo Severity: normal | Keywords: ---------------------------------+------------------------------------------ En alba/principal_dev.php/docenteHorario al dar de alta un registro no validad que los horarios entrados sean correctos. ( horario de inicio < horario de finalizacion ) Ya esta implementado el helper para esto, ( ver turnos por ejemplo ) -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/203> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba.

1 4

SVN Alba r4938 - in prosistem/alba/trunk/alba/apps/principal/modules: docenteHorario/actions docenteHorario/validate horarioescolar/actions
by commits＠pressenter.com.ar 08 Aug '07

08 Aug '07

Author: josx Date: 2007-08-08 10:21:38 -0300 (Wed, 08 Aug 2007) New Revision: 4938 Added: prosistem/alba/trunk/alba/apps/principal/modules/docenteHorario/validate/edit.yml Modified: prosistem/alba/trunk/alba/apps/principal/modules/docenteHorario/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php Log: Se hizo la validaci?\195?\179n de los horarios de los docente ( #203 ). Modified: prosistem/alba/trunk/alba/apps/principal/modules/docenteHorario/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/docenteHorario/actions/actions.class.php 2007-08-07 21:03:03 UTC (rev 4937) +++ prosistem/alba/trunk/alba/apps/principal/modules/docenteHorario/actions/actions.class.php 2007-08-08 13:21:38 UTC (rev 4938) @@ -185,9 +185,29 @@ return array( 'docente_horario{fk_docente_id}' => 'Docente:', 'docente_horario{fk_evento_id}' => 'Evento:', + 'evento{fecha_inicio}' => 'Fecha inicio:', + 'evento{fecha_fin}' => 'Fecha fin:', + 'evento{hora_inicio}' => 'Hora inicio:', + 'evento{hora_fin}' => 'Hora fin:', ); } + + public function handleErrorEdit() { + $this->preExecute(); + $this->docenteHorario = $this->getDocenteHorarioOrCreate(); + $this->docente = DocentePeer::retrieveByPk($this->getRequestParameter('docente_horario[fk_docente_id]')); + $evento_generico = new miEvento(); + $this->evento = $evento_generico->getEventoOrCreate($this->docenteHorario->getFkEventoId()); + $this->evento = $evento_generico->updateEventoFromRequest($this->evento, $this->getRequestParameter('evento'), $this->getUser()->getCulture()); + $this->updateDocenteHorarioFromRequest($this->evento->getId()); + $this->labels = $this->getLabels(); + return sfView::SUCCESS; + } + + + + } -?> +?> \ No newline at end of file Added: prosistem/alba/trunk/alba/apps/principal/modules/docenteHorario/validate/edit.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/docenteHorario/validate/edit.yml 2007-08-07 21:03:03 UTC (rev 4937) +++ prosistem/alba/trunk/alba/apps/principal/modules/docenteHorario/validate/edit.yml 2007-08-08 13:21:38 UTC (rev 4938) @@ -0,0 +1,82 @@ +methods: + post: + - "evento{fecha_inicio}" + - "evento{fecha_fin}" + - "evento{hora_inicio}" + - "evento{hora_fin}" + + +fillin: + enabled: on + +names: + evento{fecha_inicio}: + required: Yes + required_msg: La fecha de inicio es obligatoria + validators: firstDay + + evento{fecha_fin}: + required: No + validators: lastDay + + evento{hora_inicio}: + required: No + validators: horaInicio + + evento{hora_fin}: + required: No + validators: horaFin + + +caracteresMaximos255: + class: sfStringValidator + param: + max: 255 + max_error: La maxima cantidad de caracteres permitida es de 255 + + +caracteresMaximos128: + class: sfStringValidator + param: + max: 128 + max_error: La maxima cantidad de caracteres permitida es de 128 + +validarNumero: + class: sfNumberValidator + param: + nan_error: Por favor ingrese un valor númerico + min: 0 + min_error: El número debe ser positivo + +horaInicio: + class: albaHorasValidator + param: + hora_error: El campo debe ser una hora + compare: evento[hora_fin] + operator: < + compare_error: La hora de inicio debe ser anterior a la hora de fin + +horaFin: + class: albaHorasValidator + param: + hora_error: EL campo debe ser una hora + compare: evento[hora_inicio] + operator: > + compare_error: La hora de fin debe ser posterior a la hora de inicio + +firstDay: + class: albaDateValidator + param: + date_error: El campo debe ser una fecha + compare: evento[fecha_fin] + operator: <= + compare_error: La fecha inicio debe ser anterior a la fecha fin + +lastDay: + class: albaDateValidator + param: + date_error: EL campo debe ser una fecha + compare: evento[fecha_inicio] + operator: >= + compare_error: La fecha fin debe ser posterior a la fecha inicio + Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/docenteHorario/validate/edit.yml ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Modified: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php 2007-08-07 21:03:03 UTC (rev 4937) +++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php 2007-08-08 13:21:38 UTC (rev 4938) @@ -144,7 +144,6 @@ 'horarioescolar{fk_evento_id}' => 'Evento:', 'evento{fecha_inicio}' => 'Fecha inicio:', 'evento{fecha_fin}' => 'Fecha fin:', - 'evento{hora_inicio}' => 'Hora inicio:', 'evento{hora_fin}' => 'Hora fin:',

1 0

Documentación especifica sobre ABM y MENU
by Marcelo 08 Aug '07

08 Aug '07

Hola... Se que la pregunta es un poco amplia, pero podrian ayudarme a ver cual es la estructura de diseño del menu general y del ABM tipo... si tienen algo de tiempo tirenme algunas pistas para entender mas rapido como esta echo... O si quieren lo charlamos en el IRC de Alba en algún momento que dispongan... saludos -- Marcelo http://maramsis.blogspot.com

2 1