[Alba-desarrollo] SVN Alba r4181 - in prosistem/alba/trunk/alba:
apps/principal/lib/helper apps/principal/modules/alumno/config
apps/principal/modules/informes/actions
apps/principal/modules/informes/config
apps/principal/modules/informes/templates config data/sql
lib/model/map lib/model/om web/css
commits en pressenter.com.ar
commits en pressenter.com.ar
Lun Feb 12 20:41:41 CET 2007
Author: josx
Date: 2007-02-12 16:41:32 -0300 (Mon, 12 Feb 2007)
New Revision: 4181
Added:
prosistem/alba/trunk/alba/apps/principal/modules/informes/config/view.=
yml
prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/ce=
rtificadoPrimariaFormularioSuccess.php
prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/ce=
rtificadoPrimariaListadoSuccess.php
prosistem/alba/trunk/alba/web/css/informes.css
Modified:
prosistem/alba/trunk/alba/apps/principal/lib/helper/MiscHelper.php
prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/generat=
or.yml
prosistem/alba/trunk/alba/apps/principal/modules/informes/actions/acti=
ons.class.php
prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/co=
nstanciaAlumnoRegularListadoSuccess.php
prosistem/alba/trunk/alba/config/schema.xml
prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.sql
prosistem/alba/trunk/alba/data/sql/datos_desde_cero.sql
prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php
prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php
prosistem/alba/trunk/alba/lib/model/om/BaseAlumnoPeer.php
prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php
prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.php
prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php
prosistem/alba/trunk/alba/lib/model/om/BasePais.php
prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php
prosistem/alba/trunk/alba/lib/model/om/BaseTipodocumento.php
Log:
Se agrego el Certificado de terminacion de estudios primarios. Se agregue=
css especifico para los informes. Se agrego nacionalidad y lugar de naci=
miento la tabla y abm de alumnos.
Modified: prosistem/alba/trunk/alba/apps/principal/lib/helper/MiscHelper.=
php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/apps/principal/lib/helper/MiscHelper.php 20=
07-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/apps/principal/lib/helper/MiscHelper.php 20=
07-02-12 19:41:32 UTC (rev 4181)
@@ -23,8 +23,8 @@
* MiscHelper Funciones generales
*
* @package alba
- * @author Jos=E9 Luis Di Biase <josx en interorganic.com.ar>
- * @author H=E9ctor Sanchez <hsanchez en pressenter.com.ar>
+ * @author Jos=C3=A9 Luis Di Biase <josx en interorganic.com.ar>
+ * @author H=C3=A9ctor Sanchez <hsanchez en pressenter.com.ar>
* @author Fernando Toledo <ftoledo en pressenter.com.ar>
* @version SVN: $Id$
* @filesource
@@ -54,6 +54,7 @@
return $aColor;
}
=20
+
function Meses() {
$aMeses =3D array( 1 =3D> 'Enero', 2 =3D> 'Febrero', 3 =3D> 'Mar=
zo', 4 =3D> 'Abril', 5 =3D> 'Mayo', 6 =3D> 'Junio', 7 =3D> 'Julio', 8 =3D=
> 'Agosto', 9 =3D> 'Septiembre', 10 =3D> 'Octubre', 11 =3D> 'Noviembre', =
12 =3D> 'Diciembre');
return $aMeses;
Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/=
generator.yml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/genera=
tor.yml 2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/genera=
tor.yml 2007-02-12 19:41:32 UTC (rev 4181)
@@ -26,6 +26,8 @@
activo: { name: =C2=BFEstá activo? }
nombre_apellido: { name: Nombre }
division: { name: División }
+ fk_pais_id: { name: Nacionalidad}
+ lugar_nacimiento: { name: Lugar de Nacimiento}
=20
list:
title: Listado de Alumnos
@@ -49,7 +51,7 @@
fk_cuenta_id: { params: include_custom=3D>>Seleccione =
un Cuenta<<}
fk_provincia_id: { params: include_custom=3D>>Seleccio=
ne una Provincia<<}
display:
- "Informacion general": [apellido, nombre, _sexo, fk_tip=
odocumento_id, nro_documento, fecha_nacimiento, email, activo ]
+ "Informacion general": [apellido, nombre, _sexo, fk_tip=
odocumento_id, nro_documento, lugar_nacimiento, fecha_nacimiento, fk_pais=
_id, email, activo ]
"Donde vive": [direccion, ciudad, fk_provincia_id, codig=
o_postal, telefono]
"Prioridades": [ distancia_escuela, hermanos_escuela, hi=
jo_maestro_escuela ]
"Otros": [ certificado_medico, _fk_cuenta_id ]
Modified: prosistem/alba/trunk/alba/apps/principal/modules/informes/actio=
ns/actions.class.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/apps/principal/modules/informes/actions/act=
ions.class.php 2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/apps/principal/modules/informes/actions/act=
ions.class.php 2007-02-12 19:41:32 UTC (rev 4181)
@@ -190,5 +190,93 @@
$this->vista =3D "imprimir";
}
=20
+
+
+ public function executeCertificadoPrimariaFormulario() {
+ =20
+ // inicializando variables
+ $optionsDivision =3D array();
+ $aAlumno =3D array(); =20
+
+ // tomando los datos del formulario
+ $division_id =3D $this->getRequestParameter('division_id');
+ $txt =3D $this->getRequestParameter('txt');
+
+ // llenando el combo de division segun establecimiento
+ $establecimiento_id =3D $this->getUser()->getAttribute('fk_estab=
lecimiento_id');
+ $criteria =3D new Criteria();
+ $criteria->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $establecimiento=
_id);
+ $divisiones =3D DivisionPeer::doSelectJoinAnio($criteria);
+ $optionsDivision[] =3D "";
+ foreach($divisiones as $division) {
+ $optionsDivision[$division->getId()] =3D $division->getAnio(=
)->getDescripcion()." ".$division->getDescripcion();
+ }
+ asort($optionsDivision);
+ =20
+ if ($this->getRequest()->getMethod() =3D=3D sfRequest::POST) {
+ // buscando alumnos
+ $criteria =3D new Criteria();
+ if($division_id) {
+ $criteria->add(DivisionPeer::ID, $division_id);
+ }
+ $criteria->addJoin(RelAlumnoDivisionPeer::FK_ALUMNO_ID, Alum=
noPeer::ID);
+ $criteria->addJoin(RelAlumnoDivisionPeer::FK_DIVISION_ID, Di=
visionPeer::ID);
+ $criteria->addJoin(DivisionPeer::FK_ANIO_ID, AnioPeer::ID);
+ =20
+ if($txt) {
+ $cton1 =3D $criteria->getNewCriterion(AlumnoPeer::NOMBRE=
, "%$txt%", Criteria::LIKE);
+ $cton2 =3D $criteria->getNewCriterion(AlumnoPeer::APELLI=
DO, "%$txt%", Criteria::LIKE);
+ $cton1->addOr($cton2);
+ $criteria->add($cton1);
+ }
+
+ $criteria->addAsColumn("alumno_id", AlumnoPeer::ID);
+ $criteria->addAsColumn("alumno_nombre", AlumnoPeer::NOMBRE);
+ $criteria->addAsColumn("alumno_apellido", AlumnoPeer::APELLI=
DO);
+ $criteria->addAsColumn("division_id", DivisionPeer::ID);
+ $criteria->addAsColumn("division_descripcion", DivisionPeer:=
:DESCRIPCION);
+ $criteria->addAsColumn("anio_descripcion", AnioPeer::DESCRIP=
CION);
+
+ $alumnos =3D BasePeer::doSelect($criteria);
+ foreach($alumnos as $alumno) {
+ $aAlumno[] =3D (object) array( 'alumno_id' =3D> $alumno[=
0],'alumno_nombre' =3D> $alumno[1], 'alumno_apellido' =3D> $alumno[2], 'd=
ivision_id' =3D> $alumno[3], 'division_nombre' =3D> $alumno[4], 'anio_des=
cripcion' =3D> $alumno[5] );
+ }
+ =20
+ }
+
+ // asignando variables para ser usadas en el template
+ $this->optionsDivision =3D $optionsDivision;
+ $this->division_id =3D $division_id;
+ $this->txt =3D $txt;
+ $this->aAlumno =3D $aAlumno;
+ $this->vista =3D "imprimir";
+
+
+ }
+
+ // no valida que realmente ha terminado septimo grado
+ public function executeCertificadoPrimariaListado() {
+
+ // tomando los datos del formulario
+ $alumno_id =3D $this->getRequestParameter('alumno_id');
+ $establecimiento_id =3D $this->getUser()->getAttribute('fk_estab=
lecimiento_id');
+ $ciclolectivo_id =3D $this->getUser()->getAttribute('fk_ciclolec=
tivo_id');
+
+ $alumno =3D AlumnoPeer::retrieveByPK($alumno_id);
+ $establecimiento =3D EstablecimientoPeer::retrieveByPK($establec=
imiento_id);
+
+ // asignando variables para ser usadas en el template
+ $this->alumno =3D $alumno;
+ $this->establecimiento =3D $establecimiento;
+ $this->vista =3D "imprimir";
+
+ Misc::use_helper('Misc');
+ $aMeses =3D meses();
+
+ $this->anio =3D date("Y");
+ $this->mes =3D $aMeses[date("n")];
+ $this->dia =3D date("d");
+ }
+
}
?>
\ No newline at end of file
Added: prosistem/alba/trunk/alba/apps/principal/modules/informes/config/v=
iew.yml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/apps/principal/modules/informes/config/view=
.yml 2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/apps/principal/modules/informes/config/view=
.yml 2007-02-12 19:41:32 UTC (rev 4181)
@@ -0,0 +1,2 @@
+default:
+ stylesheets: [ informes ]=20
Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/inf=
ormes/config/view.yml
___________________________________________________________________
Name: svn:keywords
+ Id Date Author Rev URL
Added: prosistem/alba/trunk/alba/apps/principal/modules/informes/template=
s/certificadoPrimariaFormularioSuccess.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/c=
ertificadoPrimariaFormularioSuccess.php 2007-02-12 18:18:42 UTC (rev 4180=
)
+++ prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/c=
ertificadoPrimariaFormularioSuccess.php 2007-02-12 19:41:32 UTC (rev 4181=
)
@@ -0,0 +1,62 @@
+<h1>Informe: Certificado de Terminación de Estudios Primarios</h1=
>
+
+<?php echo form_tag('informes/certificadoPrimariaFormulario', 'id=3Dsf_a=
dmin_edit_form name=3Dsf_admin_edit_form multipart=3Dtrue') ?>
+
+<fieldset id=3D"sf_fieldset_none" class=3D"">
+ <div class=3D"form-row">
+ <?php echo label_for('Buscar', __('Buscar Alumnos:')) ?>
+ <?php echo input_tag('txt', $txt) ?> =20
+ </div>
+
+ <div class=3D"form-row">
+ <?php echo label_for('division', __('Division:')) ?>
+ <?php echo select_tag('division_id', options_for_select($options=
Division, $division_id)) ?>
+ </div>
+</fieldset>
+
+ <ul class=3D"sf_admin_actions">
+ <li><?php echo submit_tag(__('Buscar'), array (
+ 'name' =3D> 'Mostrar',
+ 'class' =3D> 'sf_admin_action_save',
+)) ?></li>
+</ul>
+
+</form>
+
+
+<? if (count($aAlumno) > 0) {
+ if ($txt) { ?>
+ Ustde busco -<?=3D$txt?>-
+ <? } ?>
+<h1>Alumnos</h1>
+<table cellspacing=3D"0" class=3D"sf_admin_list">
+ <thead>
+ <tr>
+ <th id=3D"sf_admin_list_th_alumno"> Alumno</th>
+ <th id=3D"sf_admin_list_th_sf_actions">Ver Informe</th>
+ </tr>
+ </thead>
+
+ <tbody>
+<?
+ $i =3D 0;
+ foreach($aAlumno as $alumno){
+?>
+ <tr class=3D"sf_admin_row_0">
+ <td><?echo $alumno->alumno_apellido." ".$alumno->alumno_nombre; ?> (=
<?=3D$alumno->anio_descripcion?> - <?=3D$alumno->division_nombre?> ) </t=
d>
+ <td>
+ <ul class=3D"sf_admin_td_actions">
+ <li><?php echo link_to(image_tag('/sf/images/sf_admin/edit_icon.png=
', array('alt' =3D> 'editar', 'title' =3D> 'Editar')) , 'informes?action=3D=
certificadoPrimariaListado&alumno_id=3D'.$alumno->alumno_id); ?></li>
+ </ul>
+ </td>
+ </tr>
+ <? } ?>
+ </tbody>
+</table>
+
+<? } else {
+ if ($txt) { ?>
+ Su búsqueda por -<?=3D$txt?>- no ha encontrado alumnos.
+ <? }=20
+}=20
+?>
\ No newline at end of file
Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/inf=
ormes/templates/certificadoPrimariaFormularioSuccess.php
___________________________________________________________________
Name: svn:keywords
+ Id Date Author Rev URL
Added: prosistem/alba/trunk/alba/apps/principal/modules/informes/template=
s/certificadoPrimariaListadoSuccess.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/c=
ertificadoPrimariaListadoSuccess.php 2007-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/c=
ertificadoPrimariaListadoSuccess.php 2007-02-12 19:41:32 UTC (rev 4181)
@@ -0,0 +1,44 @@
+<?
+ use_helper('Misc');
+ $meses =3D Meses();
+?>
+<div style=3D"text-align: center;"><?=3Dimage_tag('small/escudo_bsas_chi=
co.jpg')?></div>
+<div style=3D"text-align: center;" class=3D"titulo">REPÚBLICA ARG=
ENTINA<br><br>
+<span style=3D"font-weight: bold;" class=3D"titulo">GOBIERNO DE LA CIUDA=
D DE BUENOS AIRES</span><br style=3D"font-weight: bold;">
+<span style=3D"font-weight: bold;" class=3D"titulo">SECRETARíA DE=
EDUCACION</span><br>
+<br>
+<span class=3D"subtitulo">CERTIFICADO DE TERMINACIÓN <br>DE ESTUD=
IOS PRIMARIOS</span><br>
+</div>
+<br>
+<br>
+
+<div class=3D"texto">
+Certifico que <?=3D$alumno->getApellido()?>, <?=3D$alumno->getNombre()?>=
quien acredita identidad con <?=3D$alumno->getTipoDocumento()->getDescr=
ipcion()?> <br> N° <?=3D$alumno->getNroDocumento()?> nacido <?=3D($a=
lumno->getLugarNacimiento())?" en ".$alumno->getLugarNacimiento():""?> el=
<?=3Ddate("d",strtotime($alumno->getFechaNacimiento()))?> de <?=3D$meses=
[date("n",strtotime($alumno->getFechaNacimiento()))]?> de <?=3Ddate("Y",=
strtotime($alumno->getFechaNacimiento()))?> aprobó el sépti=
mo grado, como alumno <br>=20
+regular en <?=3Dstrtoupper($establecimiento->getNombre())?> en el a&ntil=
de;o <?=3D$anio?><br>
+<br>
+Se extiende el presente <span style=3D"font-weight: bold;">CERTIFICADO D=
E TERMINACIÓN DE ESTUDIOS PRIMARIOS</span>, <br>
+en Buenos Aires, a los <?=3D$dia?> días del mes de <?=3D$mes?> de=
l año <?=3D$anio?> <br>
+</div>
+
+<br>
+<br>
+<br>
+
+
+<table style=3D"text-align: left; width: 100%;" border=3D"0" cellpadding=
=3D"2" cellspacing=3D"2">
+ <tbody>
+ <tr>
+ <td style=3D"text-align: center;">................................=
..................<br>
+Firma del Maestro de Grado</td>
+ <td></td>
+ <td style=3D"text-align: center;">................................=
..................<br>
+Firma del Director de la Escuela</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td style=3D"text-align: center;">................................=
..................<br>
+Firma del Supervisor</td>
+ <td></td>
+ </tr>
+ </tbody>
+</table>
Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/inf=
ormes/templates/certificadoPrimariaListadoSuccess.php
___________________________________________________________________
Name: svn:keywords
+ Id Date Author Rev URL
Modified: prosistem/alba/trunk/alba/apps/principal/modules/informes/templ=
ates/constanciaAlumnoRegularListadoSuccess.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/c=
onstanciaAlumnoRegularListadoSuccess.php 2007-02-12 18:18:42 UTC (rev 418=
0)
+++ prosistem/alba/trunk/alba/apps/principal/modules/informes/templates/c=
onstanciaAlumnoRegularListadoSuccess.php 2007-02-12 19:41:32 UTC (rev 418=
1)
@@ -1,31 +1,4 @@
-<style>
=20
-.titulo
-{
- color: #000;
- font-family: "Trebuchet MS", Arial, Verdana, sans-serif;
- font-size: 20px;
- font-weight: bold
-}
-
-.subtitulo
-{
- color: #000;
- font-family: "Trebuchet MS", Arial, Verdana, sans-serif;
- font-size: 18px;
- font-weight: bold
-}
-
-.texto
-{
- color: #000;
- font-family: "Trebuchet MS", Arial, Verdana, sans-serif;
- font-size: 17px;
-}
-
-</style>
-
-
<div style=3D"text-align: center;">
<table border=3D"0" cellpadding=3D"0" cellspacing=3D"0" width=3D"100%">
<tbody>
Modified: prosistem/alba/trunk/alba/config/schema.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/config/schema.xml 2007-02-12 18:18:42 UTC (=
rev 4180)
+++ prosistem/alba/trunk/alba/config/schema.xml 2007-02-12 19:41:32 UTC (=
rev 4181)
@@ -234,6 +234,7 @@
<column name=3D"codigo_postal" type=3D"VARCHAR" size=3D"20" required=
=3D"true" default=3D""/>
<column name=3D"fk_provincia_id" type=3D"INTEGER" required=3D"true" =
default=3D"0"/>
<column name=3D"telefono" type=3D"VARCHAR" size=3D"20" required=3D"f=
alse" default=3D""/>
+ <column name=3D"lugar_nacimiento" type=3D"VARCHAR" size=3D"128" requ=
ired=3D"false" default=3D""/>
<column name=3D"fk_tipodocumento_id" type=3D"integer" size=3D"11" re=
quired=3D"true" default=3D"0"/>
<column name=3D"nro_documento" type=3D"varchar" size=3D"16" required=
=3D"true" default=3D""/>
<column name=3D"sexo" type=3D"CHAR" size=3D"1" required=3D"true" def=
ault=3D""/>
@@ -246,6 +247,7 @@
<column name=3D"certificado_medico" type=3D"boolean" required=3D"tru=
e" default=3D"0"/>
<column name=3D"activo" type=3D"boolean" required=3D"true" default=3D=
"true"/>
<column name=3D"fk_conceptobaja_id" type=3D"INTEGER" required=3D"tru=
e" default=3D"0"/>
+ <column name=3D"fk_pais_id" type=3D"INTEGER" required=3D"true" defau=
lt=3D"0"/>
<foreign-key foreignTable=3D"tipodocumento"> =20
<reference local=3D"fk_tipodocumento_id" foreign=3D"id"/> =20
</foreign-key>
@@ -261,6 +263,9 @@
<foreign-key foreignTable=3D"conceptobaja"> =20
<reference local=3D"fk_conceptobaja_id" foreign=3D"id"/> =20
</foreign-key>
+ <foreign-key foreignTable=3D"pais"> =20
+ <reference local=3D"fk_pais_id" foreign=3D"id"/> =20
+ </foreign-key>
</table> =20
<table name=3D"responsable" idMethod=3D"native">
<column name=3D"id" type=3D"INTEGER" required=3D"true" autoIncrement=
=3D"true" primaryKey=3D"true"/>
Modified: prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.s=
ql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.sql 200=
7-02-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.sql 200=
7-02-12 19:41:32 UTC (rev 4181)
@@ -13,6 +13,9 @@
-- Dumping data for table `menu`
--
DELETE FROM menu;
-INSERT INTO `menu` VALUES (1,'-- Menu Raiz --','#','',0,0,''),(2,'Genera=
l','#','',10,0,''),(3,'Cuentas','#','',1,10,''),(4,'Alumnos','#','',1,20,=
''),(5,'Docentes','#','',1,30,''),(6,'Gestión Escolar','#','',1,40=
,''),(7,'Calendarios y Horarios','#','',1,50,''),(8,'Locaciones y Espacio=
s','#','',1,60,''),(9,'Informes y Consultas','#','',1,70,''),(10,'Adminis=
tración','#','',1,0,''),(11,'Preferencias Generales','preferencia'=
,'preferencia',10,100,''),(12,'Seguridad','#','usuario',10,200,''),(13,'U=
suario','usuario/','usuario',12,0,''),(14,'Rol','rol/','rol',12,0,''),(15=
,'Permiso','permiso/','permiso',12,0,''),(16,'Módulo','modulo/','m=
odulo',12,0,''),(18,'Definir Organización','organizacion/edit?id=3D=
1','organizacion',2,0,''),(19,'Definir Establecimiento','establecimiento'=
,'establecimiento',2,0,''),(20,'Definir Distritos Escolares','distritoesc=
olar','distrito',83,30,''),(21,'Definir Provincias','provincia','provinci=
a',83,20,''),(22,'Definir Países','pais/','pais',83,10,''),(23,'De=
finir Categoría de IVA','tipoiva/','tipoiva',83,40,''),(24,'Admini=
strar','cuenta/','cuenta',3,0,''),(26,'Responsables','responsable/','resp=
onsable',3,10,''),(27,'Boletines','#','',4,50,''),(29,'-','#','',10,50,''=
),(30,'Salir','seguridad/logout','',1,90,''),(31,'Definir Escala de notas=
','escalanota','escalanota',84,30,''),(32,'Definir Categorías del =
Boletín de Concepto','concepto','concepto',84,50,''),(33,'Buscar A=
lumno para...','legajopedagogico','legajopedagogico',4,20,''),(34,'Tipos =
de entrada al legajo pedagógico','legajocategoria','legajocategori=
a',84,40,''),(35,'Ingresar Nuevo','alumno/create','alumno',4,0,''),(37,'A=
dministrar','docente','',5,0,''),(39,'Tipos de docentes','tipodocente','t=
ipodocente',85,10,''),(40,'Motivos de baja','cargobaja','cargobaja',85,20=
,''),(41,'Ingresar Materias/Actividades','actividad','',6,40,''),(42,'Def=
inir Grados/Años','anio','',6,0,''),(43,'Actividades por Grado/A&n=
tilde;o','relAnioActividad','',6,50,''),(44,'Definir Secciones/Divisiones=
','di
vision','',6,10,''),(45,'Definir feriados del año','feriado','feri=
ado',86,40,''),(46,'Ciclo lectivo (actual)','ciclolectivo','',86,0,''),(4=
7,'Horario Escolar','#','',7,50,''),(48,'Tipos de intevalos de horario es=
colar','horarioescolartipo','horarioescolartipo',86,20,''),(49,'Calendari=
o de vacunas','calendariovacunacion','calendariovacunacion',86,30,''),(50=
,'Horario segun...?','#','',7,100,''),(51,'...docentes','calendario/busqu=
edaDocente','',50,0,''),(52,'...sección/división','calendar=
io/busquedaDivision','',50,0,''),(53,'Listado de Locaciones','locacion','=
',8,0,''),(54,'Definir tipos de Locaciones','tipolocacion','tipolocacion'=
,87,10,''),(55,'Listado de Espacios x Locación','espacios','',8,10=
,''),(56,'Definir tipos de Espacios','tipoespacio','tipoespacio',87,20,''=
),(57,'Definir horario clases','horarioescolar','',47,0,''),(58,'Constanc=
ia Alumno Regular','informes/constanciaAlumnoRegularFormulario?vista=3Dim=
primir','informes',9,0,'_blank'),(60,'Constancia Egreso 7mo','#','',9,0,'=
'),(61,'-','','',9,10,''),(63,'Matrícula Inicial?','','',9,100,'')=
,(64,'Matrícula Final?','','',9,100,''),(65,'Ayuda','#','',1,80,''=
),(67,'Indice...','ayuda/','',65,0,''),(68,'Créditos','creditos/',=
'',65,0,''),(69,'Generar Horario por sección/división','cal=
endario','calendario',47,0,''),(71,'Configuraciones Previas','#','',10,10=
,''),(72,'Definir tipo de bajas','conceptobaja','conceptobaja',84,10,''),=
(73,'Asistencia por Sección/División','asistencia','asisten=
cia',4,40,''),(74,'Definir tipo de asistencia','tipoasistencia','tipoasis=
tencia',84,20,''),(75,'Definir turnos','turnos','turnos',86,10,''),(78,'A=
signar Alumno a Sección/División','relAlumnoDivision/create=
','relAlumnoDivision',6,20,''),(79,'Actividad/Materia por Docente','relAc=
tividadDocente','relActividadDocente',5,300,''),(81,'Concepto','boletin/l=
istConcepto','boletinconcepto',27,0,''),(82,'Notas','boletin/list','bolet=
innotas',27,1,''),(83,'Generales','#','',71,10,''),(84,'Alumnos','#','',7=
1,20,'
'),(85,'Docentes','#','',71,30,''),(86,'Calendarios y Horarios','#','',71=
,40,''),(87,'Locaciones y Espacios','#','',71,50,''),(88,'Listar Todos','=
alumno/list','alumno',4,2,''),(89,'Tipo Documento','tipodocumento','',83,=
40,''),(90,'Alumnos por división','informes/alumnosPorDivisionForm=
ulario?vista=3Dimprimir','informes',9,0,'_blank');
+INSERT INTO `menu` VALUES (1,'-- Menu Raiz --','#','',0,0,''),(2,'Genera=
l','#','',10,0,''),(3,'Cuentas','#','',1,10,''),(4,'Alumnos','#','',1,20,=
''),(5,'Docentes','#','',1,30,''),(6,'Gestión Escolar','#','',1,40=
,''),(7,'Calendarios y Horarios','#','',1,50,''),(8,'Locaciones y Espacio=
s','#','',1,60,''),(9,'Informes y Consultas','#','',1,70,''),(10,'Adminis=
tración','#','',1,0,''),(11,'Preferencias Generales','preferencia'=
,'preferencia',10,100,''),(12,'Seguridad','#','usuario',10,200,''),(13,'U=
suario','usuario/','usuario',12,0,''),(14,'Rol','rol/','rol',12,0,''),(15=
,'Permiso','permiso/','permiso',12,0,''),(16,'Módulo','modulo/','m=
odulo',12,0,''),(18,'Definir Organización','organizacion/edit?id=3D=
1','organizacion',2,0,''),(19,'Definir Establecimiento','establecimiento'=
,'establecimiento',2,0,''),(20,'Definir Distritos Escolares','distritoesc=
olar','distrito',83,30,''),(21,'Definir Provincias','provincia','provinci=
a',83,20,''),(22,'Definir Países','pais/','pais',83,10,''),(23,'De=
finir Categoría de IVA','tipoiva/','tipoiva',83,40,''),(24,'Admini=
strar','cuenta/','cuenta',3,0,''),(26,'Responsables','responsable/','resp=
onsable',3,10,''),(27,'Boletines','#','',4,50,''),(29,'-','#','',10,50,''=
),(30,'Salir','seguridad/logout','',1,90,''),(31,'Definir Escala de notas=
','escalanota','escalanota',84,30,''),(32,'Definir Categorías del =
Boletín de Concepto','concepto','concepto',84,50,''),(33,'Buscar A=
lumno para...','legajopedagogico','legajopedagogico',4,20,''),(34,'Tipos =
de entrada al legajo pedagógico','legajocategoria','legajocategori=
a',84,40,''),(35,'Ingresar Nuevo','alumno/create','alumno',4,0,''),(37,'A=
dministrar','docente','',5,0,''),(39,'Tipos de docentes','tipodocente','t=
ipodocente',85,10,''),(40,'Motivos de baja','cargobaja','cargobaja',85,20=
,''),(41,'Ingresar Materias/Actividades','actividad','',6,40,''),(42,'Def=
inir Grados/Años','anio','',6,0,''),(43,'Actividades por Grado/A&n=
tilde;o','relAnioActividad','',6,50,''),(44,'Definir Secciones/Divisiones=
','di
vision','',6,10,''),(45,'Definir feriados del año','feriado','feri=
ado',86,40,''),(46,'Ciclo lectivo (actual)','ciclolectivo','',86,0,''),(4=
7,'Horario Escolar','#','',7,50,''),(48,'Tipos de intevalos de horario es=
colar','horarioescolartipo','horarioescolartipo',86,20,''),(49,'Calendari=
o de vacunas','calendariovacunacion','calendariovacunacion',86,30,''),(50=
,'Horario segun...?','#','',7,100,''),(51,'...docentes','calendario/busqu=
edaDocente','',50,0,''),(52,'...sección/división','calendar=
io/busquedaDivision','',50,0,''),(53,'Listado de Locaciones','locacion','=
',8,0,''),(54,'Definir tipos de Locaciones','tipolocacion','tipolocacion'=
,87,10,''),(55,'Listado de Espacios x Locación','espacios','',8,10=
,''),(56,'Definir tipos de Espacios','tipoespacio','tipoespacio',87,20,''=
),(57,'Definir horario clases','horarioescolar','',47,0,''),(58,'Constanc=
ia Alumno Regular','informes/constanciaAlumnoRegularFormulario?vista=3Dim=
primir','informes',9,0,'_blank'),(60, 'Constancia Egreso 7mo', 'informes/=
certificadoPrimariaFormulario?vista=3Dimprimir', 'informes', 9, 0, '_blan=
k'),(61,'-','','',9,10,''),(63,'Matrícula Inicial?','','',9,100,''=
),(64,'Matrícula Final?','','',9,100,''),(65,'Ayuda','#','',1,80,'=
'),(67,'Indice...','ayuda/','',65,0,''),(68,'Créditos','creditos/'=
,'',65,0,''),(69,'Generar Horario por sección/división','ca=
lendario','calendario',47,0,''),(71,'Configuraciones Previas','#','',10,1=
0,''),(72,'Definir tipo de bajas','conceptobaja','conceptobaja',84,10,'')=
,(73,'Asistencia por Sección/División','asistencia','asiste=
ncia',4,40,''),(74,'Definir tipo de asistencia','tipoasistencia','tipoasi=
stencia',84,20,''),(75,'Definir turnos','turnos','turnos',86,10,''),(78,'=
Asignar Alumno a Sección/División','relAlumnoDivision/creat=
e','relAlumnoDivision',6,20,''),(79,'Actividad/Materia por Docente','relA=
ctividadDocente','relActividadDocente',5,300,''),(81,'Concepto','boletin/=
listConcepto','boletinconcepto',27,0,''),(82,'Notas','boletin/list','bole=
tinnotas
',27,1,''),(83,'Generales','#','',71,10,''),(84,'Alumnos','#','',71,20,''=
),(85,'Docentes','#','',71,30,''),(86,'Calendarios y Horarios','#','',71,=
40,''),(87,'Locaciones y Espacios','#','',71,50,''),(88,'Listar Todos','a=
lumno/list','alumno',4,2,''),(89,'Tipo Documento','tipodocumento','',83,4=
0,''),(90,'Alumnos por división','informes/alumnosPorDivisionFormu=
lario?vista=3Dimprimir','informes',9,0,'_blank');
=20
-ALTER TABLE locacion ADD `principal` TINYINT(1) NOT NULL DEFAULT '0';
\ No newline at end of file
+ALTER TABLE locacion ADD `principal` TINYINT(1) NOT NULL DEFAULT '0';
+
+ALTER TABLE `alumno` ADD `lugar_nacimiento` VARCHAR( 128 ) NOT NULL AFTE=
R `id` ,
+ADD `fk_pais_id` INT NOT NULL AFTER `lugar_nacimiento` ;
Modified: prosistem/alba/trunk/alba/data/sql/datos_desde_cero.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/data/sql/datos_desde_cero.sql 2007-02-12 18=
:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/data/sql/datos_desde_cero.sql 2007-02-12 19=
:41:32 UTC (rev 4181)
@@ -167,7 +167,7 @@
--=20
=20
=20
-INSERT INTO `menu` VALUES (1,'-- Menu Raiz --','#','',0,0,''),(2,'Genera=
l','#','',10,0,''),(3,'Cuentas','#','',1,10,''),(4,'Alumnos','#','',1,20,=
''),(5,'Docentes','#','',1,30,''),(6,'Gestión Escolar','#','',1,40=
,''),(7,'Calendarios y Horarios','#','',1,50,''),(8,'Locaciones y Espacio=
s','#','',1,60,''),(9,'Informes y Consultas','#','',1,70,''),(10,'Adminis=
tración','#','',1,0,''),(11,'Preferencias Generales','preferencia'=
,'preferencia',10,100,''),(12,'Seguridad','#','usuario',10,200,''),(13,'U=
suario','usuario/','usuario',12,0,''),(14,'Rol','rol/','rol',12,0,''),(15=
,'Permiso','permiso/','permiso',12,0,''),(16,'Módulo','modulo/','m=
odulo',12,0,''),(18,'Definir Organización','organizacion/edit?id=3D=
1','organizacion',2,0,''),(19,'Definir Establecimiento','establecimiento'=
,'establecimiento',2,0,''),(20,'Definir Distritos Escolares','distritoesc=
olar','distrito',83,30,''),(21,'Definir Provincias','provincia','provinci=
a',83,20,''),(22,'Definir Países','pais/','pais',83,10,''),(23,'De=
finir Categoría de IVA','tipoiva/','tipoiva',83,40,''),(24,'Admini=
strar','cuenta/','cuenta',3,0,''),(26,'Responsables','responsable/','resp=
onsable',3,10,''),(27,'Boletines','#','',4,50,''),(29,'-','#','',10,50,''=
),(30,'Salir','seguridad/logout','',1,90,''),(31,'Definir Escala de notas=
','escalanota','escalanota',84,30,''),(32,'Definir Categorías del =
Boletín de Concepto','concepto','concepto',84,50,''),(33,'Buscar A=
lumno para...','legajopedagogico','legajopedagogico',4,20,''),(34,'Tipos =
de entrada al legajo pedagógico','legajocategoria','legajocategori=
a',84,40,''),(35,'Ingresar Nuevo','alumno/create','alumno',4,0,''),(37,'A=
dministrar','docente','',5,0,''),(39,'Tipos de docentes','tipodocente','t=
ipodocente',85,10,''),(40,'Motivos de baja','cargobaja','cargobaja',85,20=
,''),(41,'Ingresar Materias/Actividades','actividad','',6,40,''),(42,'Def=
inir Grados/Años','anio','',6,0,''),(43,'Actividades por Grado/A&n=
tilde;o','relAnioActividad','',6,50,''),(44,'Definir Secciones/Divisiones=
','di
vision','',6,10,''),(45,'Definir feriados del año','feriado','feri=
ado',86,40,''),(46,'Ciclo lectivo (actual)','ciclolectivo','',86,0,''),(4=
7,'Horario Escolar','#','',7,50,''),(48,'Tipos de intevalos de horario es=
colar','horarioescolartipo','horarioescolartipo',86,20,''),(49,'Calendari=
o de vacunas','calendariovacunacion','calendariovacunacion',86,30,''),(50=
,'Horario segun...?','#','',7,100,''),(51,'...docentes','calendario/busqu=
edaDocente','',50,0,''),(52,'...sección/división','calendar=
io/busquedaDivision','',50,0,''),(53,'Listado de Locaciones','locacion','=
',8,0,''),(54,'Definir tipos de Locaciones','tipolocacion','tipolocacion'=
,87,10,''),(55,'Listado de Espacios x Locación','espacios','',8,10=
,''),(56,'Definir tipos de Espacios','tipoespacio','tipoespacio',87,20,''=
),(57,'Definir horario clases','horarioescolar','',47,0,''),(58,'Constanc=
ia Alumno Regular','informes/constanciaAlumnoRegularFormulario?vista=3Dim=
primir','informes',9,0,'_blank'),(60,'Constancia Egreso 7mo','#','',9,0,'=
'),(61,'-','','',9,10,''),(63,'Matrícula Inicial?','','',9,100,'')=
,(64,'Matrícula Final?','','',9,100,''),(65,'Ayuda','#','',1,80,''=
),(67,'Indice...','ayuda/','',65,0,''),(68,'Créditos','creditos/',=
'',65,0,''),(69,'Generar Horario por sección/división','cal=
endario','calendario',47,0,''),(71,'Configuraciones Previas','#','',10,10=
,''),(72,'Definir tipo de bajas','conceptobaja','conceptobaja',84,10,''),=
(73,'Asistencia por Sección/División','asistencia','asisten=
cia',4,40,''),(74,'Definir tipo de asistencia','tipoasistencia','tipoasis=
tencia',84,20,''),(75,'Definir turnos','turnos','turnos',86,10,''),(78,'A=
signar Alumno a Sección/División','relAlumnoDivision/create=
','relAlumnoDivision',6,20,''),(79,'Actividad/Materia por Docente','relAc=
tividadDocente','relActividadDocente',5,300,''),(81,'Concepto','boletin/l=
istConcepto','boletinconcepto',27,0,''),(82,'Notas','boletin/list','bolet=
innotas',27,1,''),(83,'Generales','#','',71,10,''),(84,'Alumnos','#','',7=
1,20,'
'),(85,'Docentes','#','',71,30,''),(86,'Calendarios y Horarios','#','',71=
,40,''),(87,'Locaciones y Espacios','#','',71,50,''),(88,'Listar Todos','=
alumno/list','alumno',4,2,''),(89,'Tipo Documento','tipodocumento','',83,=
40,''),(90,'Alumnos por división','informes/alumnosPorDivisionForm=
ulario?vista=3Dimprimir','informes',9,0,'_blank');
+INSERT INTO `menu` VALUES (1,'-- Menu Raiz --','#','',0,0,''),(2,'Genera=
l','#','',10,0,''),(3,'Cuentas','#','',1,10,''),(4,'Alumnos','#','',1,20,=
''),(5,'Docentes','#','',1,30,''),(6,'Gestión Escolar','#','',1,40=
,''),(7,'Calendarios y Horarios','#','',1,50,''),(8,'Locaciones y Espacio=
s','#','',1,60,''),(9,'Informes y Consultas','#','',1,70,''),(10,'Adminis=
tración','#','',1,0,''),(11,'Preferencias Generales','preferencia'=
,'preferencia',10,100,''),(12,'Seguridad','#','usuario',10,200,''),(13,'U=
suario','usuario/','usuario',12,0,''),(14,'Rol','rol/','rol',12,0,''),(15=
,'Permiso','permiso/','permiso',12,0,''),(16,'Módulo','modulo/','m=
odulo',12,0,''),(18,'Definir Organización','organizacion/edit?id=3D=
1','organizacion',2,0,''),(19,'Definir Establecimiento','establecimiento'=
,'establecimiento',2,0,''),(20,'Definir Distritos Escolares','distritoesc=
olar','distrito',83,30,''),(21,'Definir Provincias','provincia','provinci=
a',83,20,''),(22,'Definir Países','pais/','pais',83,10,''),(23,'De=
finir Categoría de IVA','tipoiva/','tipoiva',83,40,''),(24,'Admini=
strar','cuenta/','cuenta',3,0,''),(26,'Responsables','responsable/','resp=
onsable',3,10,''),(27,'Boletines','#','',4,50,''),(29,'-','#','',10,50,''=
),(30,'Salir','seguridad/logout','',1,90,''),(31,'Definir Escala de notas=
','escalanota','escalanota',84,30,''),(32,'Definir Categorías del =
Boletín de Concepto','concepto','concepto',84,50,''),(33,'Buscar A=
lumno para...','legajopedagogico','legajopedagogico',4,20,''),(34,'Tipos =
de entrada al legajo pedagógico','legajocategoria','legajocategori=
a',84,40,''),(35,'Ingresar Nuevo','alumno/create','alumno',4,0,''),(37,'A=
dministrar','docente','',5,0,''),(39,'Tipos de docentes','tipodocente','t=
ipodocente',85,10,''),(40,'Motivos de baja','cargobaja','cargobaja',85,20=
,''),(41,'Ingresar Materias/Actividades','actividad','',6,40,''),(42,'Def=
inir Grados/Años','anio','',6,0,''),(43,'Actividades por Grado/A&n=
tilde;o','relAnioActividad','',6,50,''),(44,'Definir Secciones/Divisiones=
','di
vision','',6,10,''),(45,'Definir feriados del año','feriado','feri=
ado',86,40,''),(46,'Ciclo lectivo (actual)','ciclolectivo','',86,0,''),(4=
7,'Horario Escolar','#','',7,50,''),(48,'Tipos de intevalos de horario es=
colar','horarioescolartipo','horarioescolartipo',86,20,''),(49,'Calendari=
o de vacunas','calendariovacunacion','calendariovacunacion',86,30,''),(50=
,'Horario segun...?','#','',7,100,''),(51,'...docentes','calendario/busqu=
edaDocente','',50,0,''),(52,'...sección/división','calendar=
io/busquedaDivision','',50,0,''),(53,'Listado de Locaciones','locacion','=
',8,0,''),(54,'Definir tipos de Locaciones','tipolocacion','tipolocacion'=
,87,10,''),(55,'Listado de Espacios x Locación','espacios','',8,10=
,''),(56,'Definir tipos de Espacios','tipoespacio','tipoespacio',87,20,''=
),(57,'Definir horario clases','horarioescolar','',47,0,''),(58,'Constanc=
ia Alumno Regular','informes/constanciaAlumnoRegularFormulario?vista=3Dim=
primir','informes',9,0,'_blank'),(60, 'Constancia Egreso 7mo', 'informes/=
certificadoPrimariaFormulario?vista=3Dimprimir', 'informes', 9, 0, '_blan=
k'),(61,'-','','',9,10,''),(63,'Matrícula Inicial?','','',9,100,''=
),(64,'Matrícula Final?','','',9,100,''),(65,'Ayuda','#','',1,80,'=
'),(67,'Indice...','ayuda/','',65,0,''),(68,'Créditos','creditos/'=
,'',65,0,''),(69,'Generar Horario por sección/división','ca=
lendario','calendario',47,0,''),(71,'Configuraciones Previas','#','',10,1=
0,''),(72,'Definir tipo de bajas','conceptobaja','conceptobaja',84,10,'')=
,(73,'Asistencia por Sección/División','asistencia','asiste=
ncia',4,40,''),(74,'Definir tipo de asistencia','tipoasistencia','tipoasi=
stencia',84,20,''),(75,'Definir turnos','turnos','turnos',86,10,''),(78,'=
Asignar Alumno a Sección/División','relAlumnoDivision/creat=
e','relAlumnoDivision',6,20,''),(79,'Actividad/Materia por Docente','relA=
ctividadDocente','relActividadDocente',5,300,''),(81,'Concepto','boletin/=
listConcepto','boletinconcepto',27,0,''),(82,'Notas','boletin/list','bole=
tinnotas
',27,1,''),(83,'Generales','#','',71,10,''),(84,'Alumnos','#','',71,20,''=
),(85,'Docentes','#','',71,30,''),(86,'Calendarios y Horarios','#','',71,=
40,''),(87,'Locaciones y Espacios','#','',71,50,''),(88,'Listar Todos','a=
lumno/list','alumno',4,2,''),(89,'Tipo Documento','tipodocumento','',83,4=
0,''),(90,'Alumnos por división','informes/alumnosPorDivisionFormu=
lario?vista=3Dimprimir','informes',9,0,'_blank');
=20
=20
--=20
Modified: prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php 2007-02-=
12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php 2007-02-=
12 19:41:32 UTC (rev 4181)
@@ -82,6 +82,8 @@
=20
$tMap->addColumn('TELEFONO', 'Telefono', 'string', CreoleTypes::VARCHA=
R, false);
=20
+ $tMap->addColumn('LUGAR_NACIMIENTO', 'LugarNacimiento', 'string', Creo=
leTypes::VARCHAR, false);
+
$tMap->addForeignKey('FK_TIPODOCUMENTO_ID', 'FkTipodocumentoId', 'int'=
, CreoleTypes::INTEGER, 'tipodocumento', 'ID', true, 11);
=20
$tMap->addColumn('NRO_DOCUMENTO', 'NroDocumento', 'string', CreoleType=
s::VARCHAR, true);
@@ -105,6 +107,8 @@
$tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, =
true);
=20
$tMap->addForeignKey('FK_CONCEPTOBAJA_ID', 'FkConceptobajaId', 'int', =
CreoleTypes::INTEGER, 'conceptobaja', 'ID', true, null);
+
+ $tMap->addForeignKey('FK_PAIS_ID', 'FkPaisId', 'int', CreoleTypes::INT=
EGER, 'pais', 'ID', true, null);
=09
} // doBuild()
=20
Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php 2007-02-12 18:1=
8:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php 2007-02-12 19:4=
1:32 UTC (rev 4181)
@@ -92,6 +92,13 @@
=20
=20
/**
+ * The value for the lugar_nacimiento field.
+ * @var string
+ */
+ protected $lugar_nacimiento =3D '';
+
+
+ /**
* The value for the fk_tipodocumento_id field.
* @var int
*/
@@ -174,7 +181,14 @@
*/
protected $fk_conceptobaja_id =3D 0;
=20
+
/**
+ * The value for the fk_pais_id field.
+ * @var int
+ */
+ protected $fk_pais_id =3D 0;
+
+ /**
* @var Tipodocumento
*/
protected $aTipodocumento;
@@ -200,6 +214,11 @@
protected $aConceptobaja;
=20
/**
+ * @var Pais
+ */
+ protected $aPais;
+
+ /**
* Collection to store aggregation of collRelCalendariovacunacionAlumno=
s.
* @var array
*/
@@ -417,6 +436,17 @@
}
=20
/**
+ * Get the [lugar_nacimiento] column value.
+ *=20
+ * @return string
+ */
+ public function getLugarNacimiento()
+ {
+
+ return $this->lugar_nacimiento;
+ }
+
+ /**
* Get the [fk_tipodocumento_id] column value.
*=20
* @return int
@@ -549,6 +579,17 @@
}
=20
/**
+ * Get the [fk_pais_id] column value.
+ *=20
+ * @return int
+ */
+ public function getFkPaisId()
+ {
+
+ return $this->fk_pais_id;
+ }
+
+ /**
* Set the value of [id] column.
*=20
* @param int $v new value
@@ -705,6 +746,22 @@
} // setTelefono()
=20
/**
+ * Set the value of [lugar_nacimiento] column.
+ *=20
+ * @param string $v new value
+ * @return void
+ */
+ public function setLugarNacimiento($v)
+ {
+
+ if ($this->lugar_nacimiento !=3D=3D $v || $v =3D=3D=3D '') {
+ $this->lugar_nacimiento =3D $v;
+ $this->modifiedColumns[] =3D AlumnoPeer::LUGAR_NACIMIENTO;
+ }
+
+ } // setLugarNacimiento()
+
+ /**
* Set the value of [fk_tipodocumento_id] column.
*=20
* @param int $v new value
@@ -913,6 +970,26 @@
} // setFkConceptobajaId()
=20
/**
+ * Set the value of [fk_pais_id] column.
+ *=20
+ * @param int $v new value
+ * @return void
+ */
+ public function setFkPaisId($v)
+ {
+
+ if ($this->fk_pais_id !=3D=3D $v || $v =3D=3D=3D 0) {
+ $this->fk_pais_id =3D $v;
+ $this->modifiedColumns[] =3D AlumnoPeer::FK_PAIS_ID;
+ }
+
+ if ($this->aPais !=3D=3D null && $this->aPais->getId() !=3D=3D $v) {
+ $this->aPais =3D null;
+ }
+
+ } // setFkPaisId()
+
+ /**
* Hydrates (populates) the object variables with values from the datab=
ase resultset.
*
* An offset (1-based "start column") is specified so that objects can =
be hydrated
@@ -947,36 +1024,40 @@
=20
$this->telefono =3D $rs->getString($startcol + 8);
=20
- $this->fk_tipodocumento_id =3D $rs->getInt($startcol + 9);
+ $this->lugar_nacimiento =3D $rs->getString($startcol + 9);
=20
- $this->nro_documento =3D $rs->getString($startcol + 10);
+ $this->fk_tipodocumento_id =3D $rs->getInt($startcol + 10);
=20
- $this->sexo =3D $rs->getString($startcol + 11);
+ $this->nro_documento =3D $rs->getString($startcol + 11);
=20
- $this->email =3D $rs->getString($startcol + 12);
+ $this->sexo =3D $rs->getString($startcol + 12);
=20
- $this->distancia_escuela =3D $rs->getInt($startcol + 13);
+ $this->email =3D $rs->getString($startcol + 13);
=20
- $this->hermanos_escuela =3D $rs->getBoolean($startcol + 14);
+ $this->distancia_escuela =3D $rs->getInt($startcol + 14);
=20
- $this->hijo_maestro_escuela =3D $rs->getBoolean($startcol + 15);
+ $this->hermanos_escuela =3D $rs->getBoolean($startcol + 15);
=20
- $this->fk_establecimiento_id =3D $rs->getInt($startcol + 16);
+ $this->hijo_maestro_escuela =3D $rs->getBoolean($startcol + 16);
=20
- $this->fk_cuenta_id =3D $rs->getInt($startcol + 17);
+ $this->fk_establecimiento_id =3D $rs->getInt($startcol + 17);
=20
- $this->certificado_medico =3D $rs->getBoolean($startcol + 18);
+ $this->fk_cuenta_id =3D $rs->getInt($startcol + 18);
=20
- $this->activo =3D $rs->getBoolean($startcol + 19);
+ $this->certificado_medico =3D $rs->getBoolean($startcol + 19);
=20
- $this->fk_conceptobaja_id =3D $rs->getInt($startcol + 20);
+ $this->activo =3D $rs->getBoolean($startcol + 20);
=20
+ $this->fk_conceptobaja_id =3D $rs->getInt($startcol + 21);
+
+ $this->fk_pais_id =3D $rs->getInt($startcol + 22);
+
$this->resetModified();
=20
$this->setNew(false);
=20
// FIXME - using NUM_COLUMNS may be clearer.
- return $startcol + 21; // 21 =3D AlumnoPeer::NUM_COLUMNS - AlumnoPeer=
::NUM_LAZY_LOAD_COLUMNS).
+ return $startcol + 23; // 23 =3D AlumnoPeer::NUM_COLUMNS - AlumnoPeer=
::NUM_LAZY_LOAD_COLUMNS).
=20
} catch (Exception $e) {
throw new PropelException("Error populating Alumno object", $e);
@@ -1102,7 +1183,14 @@
$this->setConceptobaja($this->aConceptobaja);
}
=20
+ if ($this->aPais !=3D=3D null) {
+ if ($this->aPais->isModified()) {
+ $affectedRows +=3D $this->aPais->save($con);
+ }
+ $this->setPais($this->aPais);
+ }
=20
+
// If this object has been modified, then save it to the database.
if ($this->isModified()) {
if ($this->isNew()) {
@@ -1276,7 +1364,13 @@
}
}
=20
+ if ($this->aPais !=3D=3D null) {
+ if (!$this->aPais->validate($columns)) {
+ $failureMap =3D array_merge($failureMap, $this->aPais->getValidatio=
nFailures());
+ }
+ }
=20
+
if (($retval =3D AlumnoPeer::doValidate($this, $columns)) !=3D=3D tru=
e) {
$failureMap =3D array_merge($failureMap, $retval);
}
@@ -1398,41 +1492,47 @@
return $this->getTelefono();
break;
case 9:
+ return $this->getLugarNacimiento();
+ break;
+ case 10:
return $this->getFkTipodocumentoId();
break;
- case 10:
+ case 11:
return $this->getNroDocumento();
break;
- case 11:
+ case 12:
return $this->getSexo();
break;
- case 12:
+ case 13:
return $this->getEmail();
break;
- case 13:
+ case 14:
return $this->getDistanciaEscuela();
break;
- case 14:
+ case 15:
return $this->getHermanosEscuela();
break;
- case 15:
+ case 16:
return $this->getHijoMaestroEscuela();
break;
- case 16:
+ case 17:
return $this->getFkEstablecimientoId();
break;
- case 17:
+ case 18:
return $this->getFkCuentaId();
break;
- case 18:
+ case 19:
return $this->getCertificadoMedico();
break;
- case 19:
+ case 20:
return $this->getActivo();
break;
- case 20:
+ case 21:
return $this->getFkConceptobajaId();
break;
+ case 22:
+ return $this->getFkPaisId();
+ break;
default:
return null;
break;
@@ -1462,18 +1562,20 @@
$keys[6] =3D> $this->getCodigoPostal(),
$keys[7] =3D> $this->getFkProvinciaId(),
$keys[8] =3D> $this->getTelefono(),
- $keys[9] =3D> $this->getFkTipodocumentoId(),
- $keys[10] =3D> $this->getNroDocumento(),
- $keys[11] =3D> $this->getSexo(),
- $keys[12] =3D> $this->getEmail(),
- $keys[13] =3D> $this->getDistanciaEscuela(),
- $keys[14] =3D> $this->getHermanosEscuela(),
- $keys[15] =3D> $this->getHijoMaestroEscuela(),
- $keys[16] =3D> $this->getFkEstablecimientoId(),
- $keys[17] =3D> $this->getFkCuentaId(),
- $keys[18] =3D> $this->getCertificadoMedico(),
- $keys[19] =3D> $this->getActivo(),
- $keys[20] =3D> $this->getFkConceptobajaId(),
+ $keys[9] =3D> $this->getLugarNacimiento(),
+ $keys[10] =3D> $this->getFkTipodocumentoId(),
+ $keys[11] =3D> $this->getNroDocumento(),
+ $keys[12] =3D> $this->getSexo(),
+ $keys[13] =3D> $this->getEmail(),
+ $keys[14] =3D> $this->getDistanciaEscuela(),
+ $keys[15] =3D> $this->getHermanosEscuela(),
+ $keys[16] =3D> $this->getHijoMaestroEscuela(),
+ $keys[17] =3D> $this->getFkEstablecimientoId(),
+ $keys[18] =3D> $this->getFkCuentaId(),
+ $keys[19] =3D> $this->getCertificadoMedico(),
+ $keys[20] =3D> $this->getActivo(),
+ $keys[21] =3D> $this->getFkConceptobajaId(),
+ $keys[22] =3D> $this->getFkPaisId(),
);
return $result;
}
@@ -1533,41 +1635,47 @@
$this->setTelefono($value);
break;
case 9:
+ $this->setLugarNacimiento($value);
+ break;
+ case 10:
$this->setFkTipodocumentoId($value);
break;
- case 10:
+ case 11:
$this->setNroDocumento($value);
break;
- case 11:
+ case 12:
$this->setSexo($value);
break;
- case 12:
+ case 13:
$this->setEmail($value);
break;
- case 13:
+ case 14:
$this->setDistanciaEscuela($value);
break;
- case 14:
+ case 15:
$this->setHermanosEscuela($value);
break;
- case 15:
+ case 16:
$this->setHijoMaestroEscuela($value);
break;
- case 16:
+ case 17:
$this->setFkEstablecimientoId($value);
break;
- case 17:
+ case 18:
$this->setFkCuentaId($value);
break;
- case 18:
+ case 19:
$this->setCertificadoMedico($value);
break;
- case 19:
+ case 20:
$this->setActivo($value);
break;
- case 20:
+ case 21:
$this->setFkConceptobajaId($value);
break;
+ case 22:
+ $this->setFkPaisId($value);
+ break;
} // switch()
}
=20
@@ -1600,18 +1708,20 @@
if (array_key_exists($keys[6], $arr)) $this->setCodigoPostal($arr[$key=
s[6]]);
if (array_key_exists($keys[7], $arr)) $this->setFkProvinciaId($arr[$ke=
ys[7]]);
if (array_key_exists($keys[8], $arr)) $this->setTelefono($arr[$keys[8]=
]);
- if (array_key_exists($keys[9], $arr)) $this->setFkTipodocumentoId($arr=
[$keys[9]]);
- if (array_key_exists($keys[10], $arr)) $this->setNroDocumento($arr[$ke=
ys[10]]);
- if (array_key_exists($keys[11], $arr)) $this->setSexo($arr[$keys[11]])=
;
- if (array_key_exists($keys[12], $arr)) $this->setEmail($arr[$keys[12]]=
);
- if (array_key_exists($keys[13], $arr)) $this->setDistanciaEscuela($arr=
[$keys[13]]);
- if (array_key_exists($keys[14], $arr)) $this->setHermanosEscuela($arr[=
$keys[14]]);
- if (array_key_exists($keys[15], $arr)) $this->setHijoMaestroEscuela($a=
rr[$keys[15]]);
- if (array_key_exists($keys[16], $arr)) $this->setFkEstablecimientoId($=
arr[$keys[16]]);
- if (array_key_exists($keys[17], $arr)) $this->setFkCuentaId($arr[$keys=
[17]]);
- if (array_key_exists($keys[18], $arr)) $this->setCertificadoMedico($ar=
r[$keys[18]]);
- if (array_key_exists($keys[19], $arr)) $this->setActivo($arr[$keys[19]=
]);
- if (array_key_exists($keys[20], $arr)) $this->setFkConceptobajaId($arr=
[$keys[20]]);
+ if (array_key_exists($keys[9], $arr)) $this->setLugarNacimiento($arr[$=
keys[9]]);
+ if (array_key_exists($keys[10], $arr)) $this->setFkTipodocumentoId($ar=
r[$keys[10]]);
+ if (array_key_exists($keys[11], $arr)) $this->setNroDocumento($arr[$ke=
ys[11]]);
+ if (array_key_exists($keys[12], $arr)) $this->setSexo($arr[$keys[12]])=
;
+ if (array_key_exists($keys[13], $arr)) $this->setEmail($arr[$keys[13]]=
);
+ if (array_key_exists($keys[14], $arr)) $this->setDistanciaEscuela($arr=
[$keys[14]]);
+ if (array_key_exists($keys[15], $arr)) $this->setHermanosEscuela($arr[=
$keys[15]]);
+ if (array_key_exists($keys[16], $arr)) $this->setHijoMaestroEscuela($a=
rr[$keys[16]]);
+ if (array_key_exists($keys[17], $arr)) $this->setFkEstablecimientoId($=
arr[$keys[17]]);
+ if (array_key_exists($keys[18], $arr)) $this->setFkCuentaId($arr[$keys=
[18]]);
+ if (array_key_exists($keys[19], $arr)) $this->setCertificadoMedico($ar=
r[$keys[19]]);
+ if (array_key_exists($keys[20], $arr)) $this->setActivo($arr[$keys[20]=
]);
+ if (array_key_exists($keys[21], $arr)) $this->setFkConceptobajaId($arr=
[$keys[21]]);
+ if (array_key_exists($keys[22], $arr)) $this->setFkPaisId($arr[$keys[2=
2]]);
}
=20
/**
@@ -1632,6 +1742,7 @@
if ($this->isColumnModified(AlumnoPeer::CODIGO_POSTAL)) $criteria->add=
(AlumnoPeer::CODIGO_POSTAL, $this->codigo_postal);
if ($this->isColumnModified(AlumnoPeer::FK_PROVINCIA_ID)) $criteria->a=
dd(AlumnoPeer::FK_PROVINCIA_ID, $this->fk_provincia_id);
if ($this->isColumnModified(AlumnoPeer::TELEFONO)) $criteria->add(Alum=
noPeer::TELEFONO, $this->telefono);
+ if ($this->isColumnModified(AlumnoPeer::LUGAR_NACIMIENTO)) $criteria->=
add(AlumnoPeer::LUGAR_NACIMIENTO, $this->lugar_nacimiento);
if ($this->isColumnModified(AlumnoPeer::FK_TIPODOCUMENTO_ID)) $criteri=
a->add(AlumnoPeer::FK_TIPODOCUMENTO_ID, $this->fk_tipodocumento_id);
if ($this->isColumnModified(AlumnoPeer::NRO_DOCUMENTO)) $criteria->add=
(AlumnoPeer::NRO_DOCUMENTO, $this->nro_documento);
if ($this->isColumnModified(AlumnoPeer::SEXO)) $criteria->add(AlumnoPe=
er::SEXO, $this->sexo);
@@ -1644,6 +1755,7 @@
if ($this->isColumnModified(AlumnoPeer::CERTIFICADO_MEDICO)) $criteria=
->add(AlumnoPeer::CERTIFICADO_MEDICO, $this->certificado_medico);
if ($this->isColumnModified(AlumnoPeer::ACTIVO)) $criteria->add(Alumno=
Peer::ACTIVO, $this->activo);
if ($this->isColumnModified(AlumnoPeer::FK_CONCEPTOBAJA_ID)) $criteria=
->add(AlumnoPeer::FK_CONCEPTOBAJA_ID, $this->fk_conceptobaja_id);
+ if ($this->isColumnModified(AlumnoPeer::FK_PAIS_ID)) $criteria->add(Al=
umnoPeer::FK_PAIS_ID, $this->fk_pais_id);
=20
return $criteria;
}
@@ -1714,6 +1826,8 @@
=20
$copyObj->setTelefono($this->telefono);
=20
+ $copyObj->setLugarNacimiento($this->lugar_nacimiento);
+
$copyObj->setFkTipodocumentoId($this->fk_tipodocumento_id);
=20
$copyObj->setNroDocumento($this->nro_documento);
@@ -1738,7 +1852,9 @@
=20
$copyObj->setFkConceptobajaId($this->fk_conceptobaja_id);
=20
+ $copyObj->setFkPaisId($this->fk_pais_id);
=20
+
if ($deepCopy) {
// important: temporarily setNew(false) because this affects the beha=
vior of
// the getter/setter methods for fkey referrer objects.
@@ -2075,6 +2191,57 @@
}
=20
/**
+ * Declares an association between this object and a Pais object.
+ *
+ * @param Pais $v
+ * @return void
+ * @throws PropelException
+ */
+ public function setPais($v)
+ {
+
+
+ if ($v =3D=3D=3D null) {
+ $this->setFkPaisId('0');
+ } else {
+ $this->setFkPaisId($v->getId());
+ }
+
+
+ $this->aPais =3D $v;
+ }
+
+
+ /**
+ * Get the associated Pais object
+ *
+ * @param Connection Optional Connection object.
+ * @return Pais The associated Pais object.
+ * @throws PropelException
+ */
+ public function getPais($con =3D null)
+ {
+ // include the related Peer class
+ include_once 'model/om/BasePaisPeer.php';
+
+ if ($this->aPais =3D=3D=3D null && ($this->fk_pais_id !=3D=3D null)) {
+
+ $this->aPais =3D PaisPeer::retrieveByPK($this->fk_pais_id, $con);
+
+ /* The following can be used instead of the line above to
+ guarantee the related object contains a reference
+ to this object, but this level of coupling
+ may be undesirable in many circumstances.
+ As it can lead to a db query with many results that may
+ never be used.
+ $obj =3D PaisPeer::retrieveByPK($this->fk_pais_id, $con);
+ $obj->addPaiss($this);
+ */
+ }
+ return $this->aPais;
+ }
+
+ /**
* Temporary storage of collRelCalendariovacunacionAlumnos to save a po=
ssible db hit in
* the event objects are add to the collection, but the
* complete collection is never requested.
Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAlumnoPeer.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/lib/model/om/BaseAlumnoPeer.php 2007-02-12 =
18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/om/BaseAlumnoPeer.php 2007-02-12 =
19:41:32 UTC (rev 4181)
@@ -24,7 +24,7 @@
const CLASS_DEFAULT =3D 'model.Alumno';
=20
/** The total number of columns. */
- const NUM_COLUMNS =3D 21;
+ const NUM_COLUMNS =3D 23;
=20
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS =3D 0;
@@ -57,6 +57,9 @@
/** the column name for the TELEFONO field */
const TELEFONO =3D 'alumno.TELEFONO';
=20
+ /** the column name for the LUGAR_NACIMIENTO field */
+ const LUGAR_NACIMIENTO =3D 'alumno.LUGAR_NACIMIENTO';
+
/** the column name for the FK_TIPODOCUMENTO_ID field */
const FK_TIPODOCUMENTO_ID =3D 'alumno.FK_TIPODOCUMENTO_ID';
=20
@@ -93,6 +96,9 @@
/** the column name for the FK_CONCEPTOBAJA_ID field */
const FK_CONCEPTOBAJA_ID =3D 'alumno.FK_CONCEPTOBAJA_ID';
=20
+ /** the column name for the FK_PAIS_ID field */
+ const FK_PAIS_ID =3D 'alumno.FK_PAIS_ID';
+
/** The PHP to DB Name Mapping */
private static $phpNameMap =3D null;
=20
@@ -104,10 +110,10 @@
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] =3D 'Id'
*/
private static $fieldNames =3D array (
- BasePeer::TYPE_PHPNAME =3D> array ('Id', 'Nombre', 'Apellido', 'FechaN=
acimiento', 'Direccion', 'Ciudad', 'CodigoPostal', 'FkProvinciaId', 'Tele=
fono', 'FkTipodocumentoId', 'NroDocumento', 'Sexo', 'Email', 'DistanciaEs=
cuela', 'HermanosEscuela', 'HijoMaestroEscuela', 'FkEstablecimientoId', '=
FkCuentaId', 'CertificadoMedico', 'Activo', 'FkConceptobajaId', ),
- BasePeer::TYPE_COLNAME =3D> array (AlumnoPeer::ID, AlumnoPeer::NOMBRE,=
AlumnoPeer::APELLIDO, AlumnoPeer::FECHA_NACIMIENTO, AlumnoPeer::DIRECCIO=
N, AlumnoPeer::CIUDAD, AlumnoPeer::CODIGO_POSTAL, AlumnoPeer::FK_PROVINCI=
A_ID, AlumnoPeer::TELEFONO, AlumnoPeer::FK_TIPODOCUMENTO_ID, AlumnoPeer::=
NRO_DOCUMENTO, AlumnoPeer::SEXO, AlumnoPeer::EMAIL, AlumnoPeer::DISTANCIA=
_ESCUELA, AlumnoPeer::HERMANOS_ESCUELA, AlumnoPeer::HIJO_MAESTRO_ESCUELA,=
AlumnoPeer::FK_ESTABLECIMIENTO_ID, AlumnoPeer::FK_CUENTA_ID, AlumnoPeer:=
:CERTIFICADO_MEDICO, AlumnoPeer::ACTIVO, AlumnoPeer::FK_CONCEPTOBAJA_ID, =
),
- BasePeer::TYPE_FIELDNAME =3D> array ('id', 'nombre', 'apellido', 'fech=
a_nacimiento', 'direccion', 'ciudad', 'codigo_postal', 'fk_provincia_id',=
'telefono', 'fk_tipodocumento_id', 'nro_documento', 'sexo', 'email', 'di=
stancia_escuela', 'hermanos_escuela', 'hijo_maestro_escuela', 'fk_estable=
cimiento_id', 'fk_cuenta_id', 'certificado_medico', 'activo', 'fk_concept=
obaja_id', ),
- BasePeer::TYPE_NUM =3D> array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 1=
2, 13, 14, 15, 16, 17, 18, 19, 20, )
+ BasePeer::TYPE_PHPNAME =3D> array ('Id', 'Nombre', 'Apellido', 'FechaN=
acimiento', 'Direccion', 'Ciudad', 'CodigoPostal', 'FkProvinciaId', 'Tele=
fono', 'LugarNacimiento', 'FkTipodocumentoId', 'NroDocumento', 'Sexo', 'E=
mail', 'DistanciaEscuela', 'HermanosEscuela', 'HijoMaestroEscuela', 'FkEs=
tablecimientoId', 'FkCuentaId', 'CertificadoMedico', 'Activo', 'FkConcept=
obajaId', 'FkPaisId', ),
+ BasePeer::TYPE_COLNAME =3D> array (AlumnoPeer::ID, AlumnoPeer::NOMBRE,=
AlumnoPeer::APELLIDO, AlumnoPeer::FECHA_NACIMIENTO, AlumnoPeer::DIRECCIO=
N, AlumnoPeer::CIUDAD, AlumnoPeer::CODIGO_POSTAL, AlumnoPeer::FK_PROVINCI=
A_ID, AlumnoPeer::TELEFONO, AlumnoPeer::LUGAR_NACIMIENTO, AlumnoPeer::FK_=
TIPODOCUMENTO_ID, AlumnoPeer::NRO_DOCUMENTO, AlumnoPeer::SEXO, AlumnoPeer=
::EMAIL, AlumnoPeer::DISTANCIA_ESCUELA, AlumnoPeer::HERMANOS_ESCUELA, Alu=
mnoPeer::HIJO_MAESTRO_ESCUELA, AlumnoPeer::FK_ESTABLECIMIENTO_ID, AlumnoP=
eer::FK_CUENTA_ID, AlumnoPeer::CERTIFICADO_MEDICO, AlumnoPeer::ACTIVO, Al=
umnoPeer::FK_CONCEPTOBAJA_ID, AlumnoPeer::FK_PAIS_ID, ),
+ BasePeer::TYPE_FIELDNAME =3D> array ('id', 'nombre', 'apellido', 'fech=
a_nacimiento', 'direccion', 'ciudad', 'codigo_postal', 'fk_provincia_id',=
'telefono', 'lugar_nacimiento', 'fk_tipodocumento_id', 'nro_documento', =
'sexo', 'email', 'distancia_escuela', 'hermanos_escuela', 'hijo_maestro_e=
scuela', 'fk_establecimiento_id', 'fk_cuenta_id', 'certificado_medico', '=
activo', 'fk_conceptobaja_id', 'fk_pais_id', ),
+ BasePeer::TYPE_NUM =3D> array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 1=
2, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, )
);
=20
/**
@@ -117,10 +123,10 @@
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] =3D 0
*/
private static $fieldKeys =3D array (
- BasePeer::TYPE_PHPNAME =3D> array ('Id' =3D> 0, 'Nombre' =3D> 1, 'Apel=
lido' =3D> 2, 'FechaNacimiento' =3D> 3, 'Direccion' =3D> 4, 'Ciudad' =3D>=
5, 'CodigoPostal' =3D> 6, 'FkProvinciaId' =3D> 7, 'Telefono' =3D> 8, 'Fk=
TipodocumentoId' =3D> 9, 'NroDocumento' =3D> 10, 'Sexo' =3D> 11, 'Email' =
=3D> 12, 'DistanciaEscuela' =3D> 13, 'HermanosEscuela' =3D> 14, 'HijoMaes=
troEscuela' =3D> 15, 'FkEstablecimientoId' =3D> 16, 'FkCuentaId' =3D> 17,=
'CertificadoMedico' =3D> 18, 'Activo' =3D> 19, 'FkConceptobajaId' =3D> 2=
0, ),
- BasePeer::TYPE_COLNAME =3D> array (AlumnoPeer::ID =3D> 0, AlumnoPeer::=
NOMBRE =3D> 1, AlumnoPeer::APELLIDO =3D> 2, AlumnoPeer::FECHA_NACIMIENTO =
=3D> 3, AlumnoPeer::DIRECCION =3D> 4, AlumnoPeer::CIUDAD =3D> 5, AlumnoPe=
er::CODIGO_POSTAL =3D> 6, AlumnoPeer::FK_PROVINCIA_ID =3D> 7, AlumnoPeer:=
:TELEFONO =3D> 8, AlumnoPeer::FK_TIPODOCUMENTO_ID =3D> 9, AlumnoPeer::NRO=
_DOCUMENTO =3D> 10, AlumnoPeer::SEXO =3D> 11, AlumnoPeer::EMAIL =3D> 12, =
AlumnoPeer::DISTANCIA_ESCUELA =3D> 13, AlumnoPeer::HERMANOS_ESCUELA =3D> =
14, AlumnoPeer::HIJO_MAESTRO_ESCUELA =3D> 15, AlumnoPeer::FK_ESTABLECIMIE=
NTO_ID =3D> 16, AlumnoPeer::FK_CUENTA_ID =3D> 17, AlumnoPeer::CERTIFICADO=
_MEDICO =3D> 18, AlumnoPeer::ACTIVO =3D> 19, AlumnoPeer::FK_CONCEPTOBAJA_=
ID =3D> 20, ),
- BasePeer::TYPE_FIELDNAME =3D> array ('id' =3D> 0, 'nombre' =3D> 1, 'ap=
ellido' =3D> 2, 'fecha_nacimiento' =3D> 3, 'direccion' =3D> 4, 'ciudad' =3D=
> 5, 'codigo_postal' =3D> 6, 'fk_provincia_id' =3D> 7, 'telefono' =3D> 8,=
'fk_tipodocumento_id' =3D> 9, 'nro_documento' =3D> 10, 'sexo' =3D> 11, '=
email' =3D> 12, 'distancia_escuela' =3D> 13, 'hermanos_escuela' =3D> 14, =
'hijo_maestro_escuela' =3D> 15, 'fk_establecimiento_id' =3D> 16, 'fk_cuen=
ta_id' =3D> 17, 'certificado_medico' =3D> 18, 'activo' =3D> 19, 'fk_conce=
ptobaja_id' =3D> 20, ),
- BasePeer::TYPE_NUM =3D> array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 1=
2, 13, 14, 15, 16, 17, 18, 19, 20, )
+ BasePeer::TYPE_PHPNAME =3D> array ('Id' =3D> 0, 'Nombre' =3D> 1, 'Apel=
lido' =3D> 2, 'FechaNacimiento' =3D> 3, 'Direccion' =3D> 4, 'Ciudad' =3D>=
5, 'CodigoPostal' =3D> 6, 'FkProvinciaId' =3D> 7, 'Telefono' =3D> 8, 'Lu=
garNacimiento' =3D> 9, 'FkTipodocumentoId' =3D> 10, 'NroDocumento' =3D> 1=
1, 'Sexo' =3D> 12, 'Email' =3D> 13, 'DistanciaEscuela' =3D> 14, 'Hermanos=
Escuela' =3D> 15, 'HijoMaestroEscuela' =3D> 16, 'FkEstablecimientoId' =3D=
> 17, 'FkCuentaId' =3D> 18, 'CertificadoMedico' =3D> 19, 'Activo' =3D> 20=
, 'FkConceptobajaId' =3D> 21, 'FkPaisId' =3D> 22, ),
+ BasePeer::TYPE_COLNAME =3D> array (AlumnoPeer::ID =3D> 0, AlumnoPeer::=
NOMBRE =3D> 1, AlumnoPeer::APELLIDO =3D> 2, AlumnoPeer::FECHA_NACIMIENTO =
=3D> 3, AlumnoPeer::DIRECCION =3D> 4, AlumnoPeer::CIUDAD =3D> 5, AlumnoPe=
er::CODIGO_POSTAL =3D> 6, AlumnoPeer::FK_PROVINCIA_ID =3D> 7, AlumnoPeer:=
:TELEFONO =3D> 8, AlumnoPeer::LUGAR_NACIMIENTO =3D> 9, AlumnoPeer::FK_TIP=
ODOCUMENTO_ID =3D> 10, AlumnoPeer::NRO_DOCUMENTO =3D> 11, AlumnoPeer::SEX=
O =3D> 12, AlumnoPeer::EMAIL =3D> 13, AlumnoPeer::DISTANCIA_ESCUELA =3D> =
14, AlumnoPeer::HERMANOS_ESCUELA =3D> 15, AlumnoPeer::HIJO_MAESTRO_ESCUEL=
A =3D> 16, AlumnoPeer::FK_ESTABLECIMIENTO_ID =3D> 17, AlumnoPeer::FK_CUEN=
TA_ID =3D> 18, AlumnoPeer::CERTIFICADO_MEDICO =3D> 19, AlumnoPeer::ACTIVO=
=3D> 20, AlumnoPeer::FK_CONCEPTOBAJA_ID =3D> 21, AlumnoPeer::FK_PAIS_ID =
=3D> 22, ),
+ BasePeer::TYPE_FIELDNAME =3D> array ('id' =3D> 0, 'nombre' =3D> 1, 'ap=
ellido' =3D> 2, 'fecha_nacimiento' =3D> 3, 'direccion' =3D> 4, 'ciudad' =3D=
> 5, 'codigo_postal' =3D> 6, 'fk_provincia_id' =3D> 7, 'telefono' =3D> 8,=
'lugar_nacimiento' =3D> 9, 'fk_tipodocumento_id' =3D> 10, 'nro_documento=
' =3D> 11, 'sexo' =3D> 12, 'email' =3D> 13, 'distancia_escuela' =3D> 14, =
'hermanos_escuela' =3D> 15, 'hijo_maestro_escuela' =3D> 16, 'fk_estableci=
miento_id' =3D> 17, 'fk_cuenta_id' =3D> 18, 'certificado_medico' =3D> 19,=
'activo' =3D> 20, 'fk_conceptobaja_id' =3D> 21, 'fk_pais_id' =3D> 22, ),
+ BasePeer::TYPE_NUM =3D> array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 1=
2, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, )
);
=20
/**
@@ -239,6 +245,8 @@
=20
$criteria->addSelectColumn(AlumnoPeer::TELEFONO);
=20
+ $criteria->addSelectColumn(AlumnoPeer::LUGAR_NACIMIENTO);
+
$criteria->addSelectColumn(AlumnoPeer::FK_TIPODOCUMENTO_ID);
=20
$criteria->addSelectColumn(AlumnoPeer::NRO_DOCUMENTO);
@@ -263,6 +271,8 @@
=20
$criteria->addSelectColumn(AlumnoPeer::FK_CONCEPTOBAJA_ID);
=20
+ $criteria->addSelectColumn(AlumnoPeer::FK_PAIS_ID);
+
}
=20
const COUNT =3D 'COUNT(alumno.ID)';
@@ -588,6 +598,45 @@
=20
=20
/**
+ * Returns the number of rows matching criteria, joining the related Pa=
is table
+ *
+ * @param Criteria $c
+ * @param boolean $distinct Whether to select only distinct columns (Yo=
u can also set DISTINCT modifier in Criteria).
+ * @param Connection $con
+ * @return int Number of matching rows.
+ */
+ public static function doCountJoinPais(Criteria $criteria, $distinct =3D=
false, $con =3D null)
+ {
+ // we're going to modify criteria, so copy it first
+ $criteria =3D clone $criteria;
+ =09
+ // clear out anything that might confuse the ORDER BY clause
+ $criteria->clearSelectColumns()->clearOrderByColumns();
+ if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModi=
fiers())) {
+ $criteria->addSelectColumn(AlumnoPeer::COUNT_DISTINCT);
+ } else {
+ $criteria->addSelectColumn(AlumnoPeer::COUNT);
+ }
+ =09
+ // just in case we're grouping: add those columns to the select statem=
ent
+ foreach($criteria->getGroupByColumns() as $column)
+ {
+ $criteria->addSelectColumn($column);
+ }
+
+ $criteria->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+
+ $rs =3D AlumnoPeer::doSelectRS($criteria, $con);
+ if ($rs->next()) {
+ return $rs->getInt(1);
+ } else {
+ // no rows returned; we infer that means 0 matches.
+ return 0;
+ }
+ }
+
+
+ /**
* Selects a collection of Alumno objects pre-filled with their Tipodoc=
umento objects.
*
* @return array Array of Alumno objects.
@@ -878,6 +927,64 @@
=20
=20
/**
+ * Selects a collection of Alumno objects pre-filled with their Pais ob=
jects.
+ *
+ * @return array Array of Alumno objects.
+ * @throws PropelException Any exceptions caught during processing will=
be
+ * rethrown wrapped into a PropelException.
+ */
+ public static function doSelectJoinPais(Criteria $c, $con =3D null)
+ {
+ $c =3D clone $c;
+
+ // Set the correct dbName if it has not been overridden
+ if ($c->getDbName() =3D=3D Propel::getDefaultDB()) {
+ $c->setDbName(self::DATABASE_NAME);
+ }
+
+ AlumnoPeer::addSelectColumns($c);
+ $startcol =3D (AlumnoPeer::NUM_COLUMNS - AlumnoPeer::NUM_LAZY_LOAD_COL=
UMNS) + 1;
+ PaisPeer::addSelectColumns($c);
+
+ $c->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+ $rs =3D BasePeer::doSelect($c, $con);
+ $results =3D array();
+
+ while($rs->next()) {
+
+ $omClass =3D AlumnoPeer::getOMClass();
+
+ $cls =3D Propel::import($omClass);
+ $obj1 =3D new $cls();
+ $obj1->hydrate($rs);
+
+ $omClass =3D PaisPeer::getOMClass();
+
+ $cls =3D Propel::import($omClass);
+ $obj2 =3D new $cls();
+ $obj2->hydrate($rs, $startcol);
+
+ $newObject =3D true;
+ foreach($results as $temp_obj1) {
+ $temp_obj2 =3D $temp_obj1->getPais(); //CHECKME
+ if ($temp_obj2->getPrimaryKey() =3D=3D=3D $obj2->getPrimaryKey()) {
+ $newObject =3D false;
+ // e.g. $author->addBookRelatedByBookId()
+ $temp_obj2->addAlumno($obj1); //CHECKME
+ break;
+ }
+ }
+ if ($newObject) {
+ $obj2->initAlumnos();
+ $obj2->addAlumno($obj1); //CHECKME
+ }
+ $results[] =3D $obj1;
+ }
+ return $results;
+ }
+
+
+ /**
* Returns the number of rows matching criteria, joining all related ta=
bles
*
* @param Criteria $c
@@ -913,6 +1020,8 @@
=20
$criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::I=
D);
=20
+ $criteria->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+
$rs =3D AlumnoPeer::doSelectRS($criteria, $con);
if ($rs->next()) {
return $rs->getInt(1);
@@ -957,6 +1066,9 @@
ConceptobajaPeer::addSelectColumns($c);
$startcol7 =3D $startcol6 + ConceptobajaPeer::NUM_COLUMNS;
=20
+ PaisPeer::addSelectColumns($c);
+ $startcol8 =3D $startcol7 + PaisPeer::NUM_COLUMNS;
+
$c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID);
=20
$c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID);
@@ -967,6 +1079,8 @@
=20
$c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
=20
+ $c->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+
$rs =3D BasePeer::doSelect($c, $con);
$results =3D array();
=09
@@ -1109,6 +1223,32 @@
$obj6->addAlumno($obj1);
}
=20
+ =09
+ // Add objects for joined Pais rows
+=09
+ $omClass =3D PaisPeer::getOMClass();
+
+=09
+ $cls =3D Propel::import($omClass);
+ $obj7 =3D new $cls();
+ $obj7->hydrate($rs, $startcol7);
+ =09
+ $newObject =3D true;
+ for ($j=3D0, $resCount=3Dcount($results); $j < $resCount; $j++) {
+ $temp_obj1 =3D $results[$j];
+ $temp_obj7 =3D $temp_obj1->getPais(); // CHECKME
+ if ($temp_obj7->getPrimaryKey() =3D=3D=3D $obj7->getPrimaryKey()) {
+ $newObject =3D false;
+ $temp_obj7->addAlumno($obj1); // CHECKME
+ break;
+ }
+ }
+ =09
+ if ($newObject) {
+ $obj7->initAlumnos();
+ $obj7->addAlumno($obj1);
+ }
+
$results[] =3D $obj1;
}
return $results;
@@ -1150,6 +1290,8 @@
=20
$criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::I=
D);
=20
+ $criteria->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+
$rs =3D AlumnoPeer::doSelectRS($criteria, $con);
if ($rs->next()) {
return $rs->getInt(1);
@@ -1195,6 +1337,8 @@
=20
$criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::I=
D);
=20
+ $criteria->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+
$rs =3D AlumnoPeer::doSelectRS($criteria, $con);
if ($rs->next()) {
return $rs->getInt(1);
@@ -1240,6 +1384,8 @@
=20
$criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::I=
D);
=20
+ $criteria->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+
$rs =3D AlumnoPeer::doSelectRS($criteria, $con);
if ($rs->next()) {
return $rs->getInt(1);
@@ -1285,6 +1431,8 @@
=20
$criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::I=
D);
=20
+ $criteria->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+
$rs =3D AlumnoPeer::doSelectRS($criteria, $con);
if ($rs->next()) {
return $rs->getInt(1);
@@ -1330,6 +1478,8 @@
=20
$criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID);
=20
+ $criteria->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
+
$rs =3D AlumnoPeer::doSelectRS($criteria, $con);
if ($rs->next()) {
return $rs->getInt(1);
@@ -1341,6 +1491,53 @@
=20
=20
/**
+ * Returns the number of rows matching criteria, joining the related Pa=
is table
+ *
+ * @param Criteria $c
+ * @param boolean $distinct Whether to select only distinct columns (Yo=
u can also set DISTINCT modifier in Criteria).
+ * @param Connection $con
+ * @return int Number of matching rows.
+ */
+ public static function doCountJoinAllExceptPais(Criteria $criteria, $di=
stinct =3D false, $con =3D null)
+ {
+ // we're going to modify criteria, so copy it first
+ $criteria =3D clone $criteria;
+ =09
+ // clear out anything that might confuse the ORDER BY clause
+ $criteria->clearSelectColumns()->clearOrderByColumns();
+ if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModi=
fiers())) {
+ $criteria->addSelectColumn(AlumnoPeer::COUNT_DISTINCT);
+ } else {
+ $criteria->addSelectColumn(AlumnoPeer::COUNT);
+ }
+ =09
+ // just in case we're grouping: add those columns to the select statem=
ent
+ foreach($criteria->getGroupByColumns() as $column)
+ {
+ $criteria->addSelectColumn($column);
+ }
+
+ $criteria->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer:=
:ID);
+
+ $criteria->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID);
+
+ $criteria->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoP=
eer::ID);
+
+ $criteria->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID);
+
+ $criteria->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::I=
D);
+
+ $rs =3D AlumnoPeer::doSelectRS($criteria, $con);
+ if ($rs->next()) {
+ return $rs->getInt(1);
+ } else {
+ // no rows returned; we infer that means 0 matches.
+ return 0;
+ }
+ }
+
+
+ /**
* Selects a collection of Alumno objects pre-filled with all related o=
bjects except Tipodocumento.
*
* @return array Array of Alumno objects.
@@ -1373,6 +1570,9 @@
ConceptobajaPeer::addSelectColumns($c);
$startcol6 =3D $startcol5 + ConceptobajaPeer::NUM_COLUMNS;
=20
+ PaisPeer::addSelectColumns($c);
+ $startcol7 =3D $startcol6 + PaisPeer::NUM_COLUMNS;
+
$c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID);
=20
$c->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID=
);
@@ -1381,7 +1581,9 @@
=20
$c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
=20
+ $c->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
=20
+
$rs =3D BasePeer::doSelect($c, $con);
$results =3D array();
=09
@@ -1485,6 +1687,29 @@
$obj5->addAlumno($obj1);
}
=20
+ $omClass =3D PaisPeer::getOMClass();
+
+=09
+ $cls =3D Propel::import($omClass);
+ $obj6 =3D new $cls();
+ $obj6->hydrate($rs, $startcol6);
+ =09
+ $newObject =3D true;
+ for ($j=3D0, $resCount=3Dcount($results); $j < $resCount; $j++) {
+ $temp_obj1 =3D $results[$j];
+ $temp_obj6 =3D $temp_obj1->getPais(); //CHECKME
+ if ($temp_obj6->getPrimaryKey() =3D=3D=3D $obj6->getPrimaryKey()) {
+ $newObject =3D false;
+ $temp_obj6->addAlumno($obj1);
+ break;
+ }
+ }
+ =09
+ if ($newObject) {
+ $obj6->initAlumnos();
+ $obj6->addAlumno($obj1);
+ }
+
$results[] =3D $obj1;
}
return $results;
@@ -1524,6 +1749,9 @@
ConceptobajaPeer::addSelectColumns($c);
$startcol6 =3D $startcol5 + ConceptobajaPeer::NUM_COLUMNS;
=20
+ PaisPeer::addSelectColumns($c);
+ $startcol7 =3D $startcol6 + PaisPeer::NUM_COLUMNS;
+
$c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID);
=20
$c->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID=
);
@@ -1532,7 +1760,9 @@
=20
$c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
=20
+ $c->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
=20
+
$rs =3D BasePeer::doSelect($c, $con);
$results =3D array();
=09
@@ -1636,6 +1866,29 @@
$obj5->addAlumno($obj1);
}
=20
+ $omClass =3D PaisPeer::getOMClass();
+
+=09
+ $cls =3D Propel::import($omClass);
+ $obj6 =3D new $cls();
+ $obj6->hydrate($rs, $startcol6);
+ =09
+ $newObject =3D true;
+ for ($j=3D0, $resCount=3Dcount($results); $j < $resCount; $j++) {
+ $temp_obj1 =3D $results[$j];
+ $temp_obj6 =3D $temp_obj1->getPais(); //CHECKME
+ if ($temp_obj6->getPrimaryKey() =3D=3D=3D $obj6->getPrimaryKey()) {
+ $newObject =3D false;
+ $temp_obj6->addAlumno($obj1);
+ break;
+ }
+ }
+ =09
+ if ($newObject) {
+ $obj6->initAlumnos();
+ $obj6->addAlumno($obj1);
+ }
+
$results[] =3D $obj1;
}
return $results;
@@ -1675,6 +1928,9 @@
ConceptobajaPeer::addSelectColumns($c);
$startcol6 =3D $startcol5 + ConceptobajaPeer::NUM_COLUMNS;
=20
+ PaisPeer::addSelectColumns($c);
+ $startcol7 =3D $startcol6 + PaisPeer::NUM_COLUMNS;
+
$c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID);
=20
$c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID);
@@ -1683,7 +1939,9 @@
=20
$c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
=20
+ $c->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
=20
+
$rs =3D BasePeer::doSelect($c, $con);
$results =3D array();
=09
@@ -1787,6 +2045,29 @@
$obj5->addAlumno($obj1);
}
=20
+ $omClass =3D PaisPeer::getOMClass();
+
+=09
+ $cls =3D Propel::import($omClass);
+ $obj6 =3D new $cls();
+ $obj6->hydrate($rs, $startcol6);
+ =09
+ $newObject =3D true;
+ for ($j=3D0, $resCount=3Dcount($results); $j < $resCount; $j++) {
+ $temp_obj1 =3D $results[$j];
+ $temp_obj6 =3D $temp_obj1->getPais(); //CHECKME
+ if ($temp_obj6->getPrimaryKey() =3D=3D=3D $obj6->getPrimaryKey()) {
+ $newObject =3D false;
+ $temp_obj6->addAlumno($obj1);
+ break;
+ }
+ }
+ =09
+ if ($newObject) {
+ $obj6->initAlumnos();
+ $obj6->addAlumno($obj1);
+ }
+
$results[] =3D $obj1;
}
return $results;
@@ -1826,6 +2107,9 @@
ConceptobajaPeer::addSelectColumns($c);
$startcol6 =3D $startcol5 + ConceptobajaPeer::NUM_COLUMNS;
=20
+ PaisPeer::addSelectColumns($c);
+ $startcol7 =3D $startcol6 + PaisPeer::NUM_COLUMNS;
+
$c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID);
=20
$c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID);
@@ -1834,7 +2118,9 @@
=20
$c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
=20
+ $c->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
=20
+
$rs =3D BasePeer::doSelect($c, $con);
$results =3D array();
=09
@@ -1938,6 +2224,29 @@
$obj5->addAlumno($obj1);
}
=20
+ $omClass =3D PaisPeer::getOMClass();
+
+=09
+ $cls =3D Propel::import($omClass);
+ $obj6 =3D new $cls();
+ $obj6->hydrate($rs, $startcol6);
+ =09
+ $newObject =3D true;
+ for ($j=3D0, $resCount=3Dcount($results); $j < $resCount; $j++) {
+ $temp_obj1 =3D $results[$j];
+ $temp_obj6 =3D $temp_obj1->getPais(); //CHECKME
+ if ($temp_obj6->getPrimaryKey() =3D=3D=3D $obj6->getPrimaryKey()) {
+ $newObject =3D false;
+ $temp_obj6->addAlumno($obj1);
+ break;
+ }
+ }
+ =09
+ if ($newObject) {
+ $obj6->initAlumnos();
+ $obj6->addAlumno($obj1);
+ }
+
$results[] =3D $obj1;
}
return $results;
@@ -1977,6 +2286,9 @@
ProvinciaPeer::addSelectColumns($c);
$startcol6 =3D $startcol5 + ProvinciaPeer::NUM_COLUMNS;
=20
+ PaisPeer::addSelectColumns($c);
+ $startcol7 =3D $startcol6 + PaisPeer::NUM_COLUMNS;
+
$c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID);
=20
$c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID);
@@ -1985,7 +2297,9 @@
=20
$c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID);
=20
+ $c->addJoin(AlumnoPeer::FK_PAIS_ID, PaisPeer::ID);
=20
+
$rs =3D BasePeer::doSelect($c, $con);
$results =3D array();
=09
@@ -2089,12 +2403,214 @@
$obj5->addAlumno($obj1);
}
=20
+ $omClass =3D PaisPeer::getOMClass();
+
+=09
+ $cls =3D Propel::import($omClass);
+ $obj6 =3D new $cls();
+ $obj6->hydrate($rs, $startcol6);
+ =09
+ $newObject =3D true;
+ for ($j=3D0, $resCount=3Dcount($results); $j < $resCount; $j++) {
+ $temp_obj1 =3D $results[$j];
+ $temp_obj6 =3D $temp_obj1->getPais(); //CHECKME
+ if ($temp_obj6->getPrimaryKey() =3D=3D=3D $obj6->getPrimaryKey()) {
+ $newObject =3D false;
+ $temp_obj6->addAlumno($obj1);
+ break;
+ }
+ }
+ =09
+ if ($newObject) {
+ $obj6->initAlumnos();
+ $obj6->addAlumno($obj1);
+ }
+
$results[] =3D $obj1;
}
return $results;
}
=20
+
/**
+ * Selects a collection of Alumno objects pre-filled with all related o=
bjects except Pais.
+ *
+ * @return array Array of Alumno objects.
+ * @throws PropelException Any exceptions caught during processing will=
be
+ * rethrown wrapped into a PropelException.
+ */
+ public static function doSelectJoinAllExceptPais(Criteria $c, $con =3D =
null)
+ {
+ $c =3D clone $c;
+
+ // Set the correct dbName if it has not been overridden
+ // $c->getDbName() will return the same object if not set to another v=
alue
+ // so =3D=3D check is okay and faster
+ if ($c->getDbName() =3D=3D Propel::getDefaultDB()) {
+ $c->setDbName(self::DATABASE_NAME);
+ }
+
+ AlumnoPeer::addSelectColumns($c);
+ $startcol2 =3D (AlumnoPeer::NUM_COLUMNS - AlumnoPeer::NUM_LAZY_LOAD_CO=
LUMNS) + 1;
+
+ TipodocumentoPeer::addSelectColumns($c);
+ $startcol3 =3D $startcol2 + TipodocumentoPeer::NUM_COLUMNS;
+
+ CuentaPeer::addSelectColumns($c);
+ $startcol4 =3D $startcol3 + CuentaPeer::NUM_COLUMNS;
+
+ EstablecimientoPeer::addSelectColumns($c);
+ $startcol5 =3D $startcol4 + EstablecimientoPeer::NUM_COLUMNS;
+
+ ProvinciaPeer::addSelectColumns($c);
+ $startcol6 =3D $startcol5 + ProvinciaPeer::NUM_COLUMNS;
+
+ ConceptobajaPeer::addSelectColumns($c);
+ $startcol7 =3D $startcol6 + ConceptobajaPeer::NUM_COLUMNS;
+
+ $c->addJoin(AlumnoPeer::FK_TIPODOCUMENTO_ID, TipodocumentoPeer::ID);
+
+ $c->addJoin(AlumnoPeer::FK_CUENTA_ID, CuentaPeer::ID);
+
+ $c->addJoin(AlumnoPeer::FK_ESTABLECIMIENTO_ID, EstablecimientoPeer::ID=
);
+
+ $c->addJoin(AlumnoPeer::FK_PROVINCIA_ID, ProvinciaPeer::ID);
+
+ $c->addJoin(AlumnoPeer::FK_CONCEPTOBAJA_ID, ConceptobajaPeer::ID);
+
+
+ $rs =3D BasePeer::doSelect($c, $con);
+ $results =3D array();
+ =09
+ while($rs->next()) {
+
+ $omClass =3D AlumnoPeer::getOMClass();
+
+ $cls =3D Propel::import($omClass);
+ $obj1 =3D new $cls();
+ $obj1->hydrate($rs); =09
+
+ $omClass =3D TipodocumentoPeer::getOMClass();
+
+=09
+ $cls =3D Propel::import($omClass);
+ $obj2 =3D new $cls();
+ $obj2->hydrate($rs, $startcol2);
+ =09
+ $newObject =3D true;
+ for ($j=3D0, $resCount=3Dcount($results); $j < $resCount; $j++) {
+ $temp_obj1 =3D $results[$j];
+ $temp_obj2 =3D $temp_obj1->getTipodocumento(); //CHECKME
+ if ($temp_obj2->getPrimaryKey() =3D=3D=3D $obj2->getPrimaryKey()) {
+ $newObject =3D false;
+ $temp_obj2->addAlumno($obj1);
+ break;
+ }
+ }
+ =09
+ if ($newObject) {
+ $obj2->initAlumnos();
+ $obj2->addAlumno($obj1);
+ }
+
+ $omClass =3D CuentaPeer::getOMClass();
+
+=09
+ $cls =3D Propel::import($omClass);
+ $obj3 =3D new $cls();
+ $obj3->hydrate($rs, $startcol3);
+ =09
+ $newObject =3D true;
+ for ($j=3D0, $resCount=3Dcount($results); $j < $resCount; $j++) {
+ $temp_obj1 =3D $results[$j];
+ $temp_obj3 =3D $temp_obj1->getCuenta(); //CHECKME
+ if ($temp_obj3->getPrimaryKey() =3D=3D=3D $obj3->getPrimaryKey()) {
+ $newObject =3D false;
+ $temp_obj3->addAlumno($obj1);
+ break;
+ }
+ }
+ =09
+ if ($newObject) {
+ $obj3->initAlumnos();
+ $obj3->addAlumno($obj1);
+ }
+
+ $omClass =3D EstablecimientoPeer::getOMClass();
+
+=09
+ $cls =3D Propel::import($omClass);
+ $obj4 =3D new $cls();
+ $obj4->hydrate($rs, $startcol4);
+ =09
+ $newObject =3D true;
+ for ($j=3D0, $resCount=3Dcount($results); $j < $resCount; $j++) {
+ $temp_obj1 =3D $results[$j];
+ $temp_obj4 =3D $temp_obj1->getEstablecimiento(); //CHECKME
+ if ($temp_obj4->getPrimaryKey() =3D=3D=3D $obj4->getPrimaryKey()) {
+ $newObject =3D false;
+ $temp_obj4->addAlumno($obj1);
+ break;
+ }
+ }
+ =09
+ if ($newObject) {
+ $obj4->initAlumnos();
+ $obj4->addAlumno($obj1);
+ }
+
+ $omClass =3D ProvinciaPeer::getOMClass();
+
+=09
+ $cls =3D Propel::import($omClass);
+ $obj5 =3D new $cls();
+ $obj5->hydrate($rs, $startcol5);
+ =09
+ $newObject =3D true;
+ for ($j=3D0, $resCount=3Dcount($results); $j < $resCount; $j++) {
+ $temp_obj1 =3D $results[$j];
+ $temp_obj5 =3D $temp_obj1->getProvincia(); //CHECKME
+ if ($temp_obj5->getPrimaryKey() =3D=3D=3D $obj5->getPrimaryKey()) {
+ $newObject =3D false;
+ $temp_obj5->addAlumno($obj1);
+ break;
+ }
+ }
+ =09
+ if ($newObject) {
+ $obj5->initAlumnos();
+ $obj5->addAlumno($obj1);
+ }
+
+ $omClass =3D ConceptobajaPeer::getOMClass();
+
+=09
+ $cls =3D Propel::import($omClass);
+ $obj6 =3D new $cls();
+ $obj6->hydrate($rs, $startcol6);
+ =09
+ $newObject =3D true;
+ for ($j=3D0, $resCount=3Dcount($results); $j < $resCount; $j++) {
+ $temp_obj1 =3D $results[$j];
+ $temp_obj6 =3D $temp_obj1->getConceptobaja(); //CHECKME
+ if ($temp_obj6->getPrimaryKey() =3D=3D=3D $obj6->getPrimaryKey()) {
+ $newObject =3D false;
+ $temp_obj6->addAlumno($obj1);
+ break;
+ }
+ }
+ =09
+ if ($newObject) {
+ $obj6->initAlumnos();
+ $obj6->addAlumno($obj1);
+ }
+
+ $results[] =3D $obj1;
+ }
+ return $results;
+ }
+
+ /**
* Returns the TableMap related to this peer.
* This method is not needed for general use but a specific application=
could have a need.
* @return TableMap
Modified: prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php 2007-02-1=
2 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php 2007-02-1=
2 19:41:32 UTC (rev 4181)
@@ -934,4 +934,53 @@
return $this->collAlumnos;
}
=20
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Conceptobaja is new, it will return
+ * an empty collection; or if this Conceptobaja has previously
+ * been saved, it will retrieve related Alumnos from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Conceptobaja.
+ */
+ public function getAlumnosJoinPais($criteria =3D null, $con =3D null)
+ {
+ // include the Peer class
+ include_once 'model/om/BaseAlumnoPeer.php';
+ if ($criteria =3D=3D=3D null) {
+ $criteria =3D new Criteria();
+ }
+ elseif ($criteria instanceof Criteria)
+ {
+ $criteria =3D clone $criteria;
+ }
+
+ if ($this->collAlumnos =3D=3D=3D null) {
+ if ($this->isNew()) {
+ $this->collAlumnos =3D array();
+ } else {
+
+ $criteria->add(AlumnoPeer::FK_CONCEPTOBAJA_ID, $this->getId());
+
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinPais($criteria, $con)=
;
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(AlumnoPeer::FK_CONCEPTOBAJA_ID, $this->getId());
+
+ if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->=
equals($criteria)) {
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinPais($criteria, $con)=
;
+ }
+ }
+ $this->lastAlumnoCriteria =3D $criteria;
+
+ return $this->collAlumnos;
+ }
+
} // BaseConceptobaja
Modified: prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.php 2007-02-12 18:1=
8:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.php 2007-02-12 19:4=
1:32 UTC (rev 4181)
@@ -1453,7 +1453,56 @@
return $this->collAlumnos;
}
=20
+
/**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Cuenta is new, it will return
+ * an empty collection; or if this Cuenta has previously
+ * been saved, it will retrieve related Alumnos from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Cuenta.
+ */
+ public function getAlumnosJoinPais($criteria =3D null, $con =3D null)
+ {
+ // include the Peer class
+ include_once 'model/om/BaseAlumnoPeer.php';
+ if ($criteria =3D=3D=3D null) {
+ $criteria =3D new Criteria();
+ }
+ elseif ($criteria instanceof Criteria)
+ {
+ $criteria =3D clone $criteria;
+ }
+
+ if ($this->collAlumnos =3D=3D=3D null) {
+ if ($this->isNew()) {
+ $this->collAlumnos =3D array();
+ } else {
+
+ $criteria->add(AlumnoPeer::FK_CUENTA_ID, $this->getId());
+
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinPais($criteria, $con)=
;
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(AlumnoPeer::FK_CUENTA_ID, $this->getId());
+
+ if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->=
equals($criteria)) {
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinPais($criteria, $con)=
;
+ }
+ }
+ $this->lastAlumnoCriteria =3D $criteria;
+
+ return $this->collAlumnos;
+ }
+
+ /**
* Temporary storage of collResponsables to save a possible db hit in
* the event objects are add to the collection, but the
* complete collection is never requested.
Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php 2007-0=
2-12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php 2007-0=
2-12 19:41:32 UTC (rev 4181)
@@ -1857,7 +1857,56 @@
return $this->collAlumnos;
}
=20
+
/**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Establecimiento is new, it will return
+ * an empty collection; or if this Establecimiento has previously
+ * been saved, it will retrieve related Alumnos from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Establecimiento.
+ */
+ public function getAlumnosJoinPais($criteria =3D null, $con =3D null)
+ {
+ // include the Peer class
+ include_once 'model/om/BaseAlumnoPeer.php';
+ if ($criteria =3D=3D=3D null) {
+ $criteria =3D new Criteria();
+ }
+ elseif ($criteria instanceof Criteria)
+ {
+ $criteria =3D clone $criteria;
+ }
+
+ if ($this->collAlumnos =3D=3D=3D null) {
+ if ($this->isNew()) {
+ $this->collAlumnos =3D array();
+ } else {
+
+ $criteria->add(AlumnoPeer::FK_ESTABLECIMIENTO_ID, $this->getId());
+
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinPais($criteria, $con)=
;
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(AlumnoPeer::FK_ESTABLECIMIENTO_ID, $this->getId());
+
+ if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->=
equals($criteria)) {
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinPais($criteria, $con)=
;
+ }
+ }
+ $this->lastAlumnoCriteria =3D $criteria;
+
+ return $this->collAlumnos;
+ }
+
+ /**
* Temporary storage of collCiclolectivos to save a possible db hit in
* the event objects are add to the collection, but the
* complete collection is never requested.
Modified: prosistem/alba/trunk/alba/lib/model/om/BasePais.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/lib/model/om/BasePais.php 2007-02-12 18:18:=
42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/om/BasePais.php 2007-02-12 19:41:=
32 UTC (rev 4181)
@@ -68,6 +68,18 @@
protected $lastProvinciaCriteria =3D null;
=20
/**
+ * Collection to store aggregation of collAlumnos.
+ * @var array
+ */
+ protected $collAlumnos;
+
+ /**
+ * The criteria used to select the current contents of collAlumnos.
+ * @var Criteria
+ */
+ protected $lastAlumnoCriteria =3D null;
+
+ /**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
* @var boolean
@@ -330,6 +342,14 @@
}
}
=20
+ if ($this->collAlumnos !=3D=3D null) {
+ foreach($this->collAlumnos as $referrerFK) {
+ if (!$referrerFK->isDeleted()) {
+ $affectedRows +=3D $referrerFK->save($con);
+ }
+ }
+ }
+
$this->alreadyInSave =3D false;
}
return $affectedRows;
@@ -408,7 +428,15 @@
}
}
=20
+ if ($this->collAlumnos !=3D=3D null) {
+ foreach($this->collAlumnos as $referrerFK) {
+ if (!$referrerFK->validate($columns)) {
+ $failureMap =3D array_merge($failureMap, $referrerFK->getValidati=
onFailures());
+ }
+ }
+ }
=20
+
$this->alreadyInValidation =3D false;
}
=20
@@ -631,6 +659,10 @@
$copyObj->addProvincia($relObj->copy($deepCopy));
}
=20
+ foreach($this->getAlumnos() as $relObj) {
+ $copyObj->addAlumno($relObj->copy($deepCopy));
+ }
+
} // if ($deepCopy)
=20
=20
@@ -785,4 +817,356 @@
$l->setPais($this);
}
=20
+ /**
+ * Temporary storage of collAlumnos to save a possible db hit in
+ * the event objects are add to the collection, but the
+ * complete collection is never requested.
+ * @return void
+ */
+ public function initAlumnos()
+ {
+ if ($this->collAlumnos =3D=3D=3D null) {
+ $this->collAlumnos =3D array();
+ }
+ }
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Pais has previously
+ * been saved, it will retrieve related Alumnos from storage.
+ * If this Pais is new, it will return
+ * an empty collection or the current collection, the criteria
+ * is ignored on a new object.
+ *
+ * @param Connection $con
+ * @param Criteria $criteria
+ * @throws PropelException
+ */
+ public function getAlumnos($criteria =3D null, $con =3D null)
+ {
+ // include the Peer class
+ include_once 'model/om/BaseAlumnoPeer.php';
+ if ($criteria =3D=3D=3D null) {
+ $criteria =3D new Criteria();
+ }
+ elseif ($criteria instanceof Criteria)
+ {
+ $criteria =3D clone $criteria;
+ }
+
+ if ($this->collAlumnos =3D=3D=3D null) {
+ if ($this->isNew()) {
+ $this->collAlumnos =3D array();
+ } else {
+
+ $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+ AlumnoPeer::addSelectColumns($criteria);
+ $this->collAlumnos =3D AlumnoPeer::doSelect($criteria, $con);
+ }
+ } else {
+ // criteria has no effect for a new object
+ if (!$this->isNew()) {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+
+ $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+ AlumnoPeer::addSelectColumns($criteria);
+ if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria-=
>equals($criteria)) {
+ $this->collAlumnos =3D AlumnoPeer::doSelect($criteria, $con);
+ }
+ }
+ }
+ $this->lastAlumnoCriteria =3D $criteria;
+ return $this->collAlumnos;
+ }
+
+ /**
+ * Returns the number of related Alumnos.
+ *
+ * @param Criteria $criteria
+ * @param boolean $distinct
+ * @param Connection $con
+ * @throws PropelException
+ */
+ public function countAlumnos($criteria =3D null, $distinct =3D false, $=
con =3D null)
+ {
+ // include the Peer class
+ include_once 'model/om/BaseAlumnoPeer.php';
+ if ($criteria =3D=3D=3D null) {
+ $criteria =3D new Criteria();
+ }
+ elseif ($criteria instanceof Criteria)
+ {
+ $criteria =3D clone $criteria;
+ }
+
+ $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+ return AlumnoPeer::doCount($criteria, $distinct, $con);
+ }
+
+ /**
+ * Method called to associate a Alumno object to this object
+ * through the Alumno foreign key attribute
+ *
+ * @param Alumno $l Alumno
+ * @return void
+ * @throws PropelException
+ */
+ public function addAlumno(Alumno $l)
+ {
+ $this->collAlumnos[] =3D $l;
+ $l->setPais($this);
+ }
+
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Pais is new, it will return
+ * an empty collection; or if this Pais has previously
+ * been saved, it will retrieve related Alumnos from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Pais.
+ */
+ public function getAlumnosJoinTipodocumento($criteria =3D null, $con =3D=
null)
+ {
+ // include the Peer class
+ include_once 'model/om/BaseAlumnoPeer.php';
+ if ($criteria =3D=3D=3D null) {
+ $criteria =3D new Criteria();
+ }
+ elseif ($criteria instanceof Criteria)
+ {
+ $criteria =3D clone $criteria;
+ }
+
+ if ($this->collAlumnos =3D=3D=3D null) {
+ if ($this->isNew()) {
+ $this->collAlumnos =3D array();
+ } else {
+
+ $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinTipodocumento($criter=
ia, $con);
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+ if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->=
equals($criteria)) {
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinTipodocumento($criter=
ia, $con);
+ }
+ }
+ $this->lastAlumnoCriteria =3D $criteria;
+
+ return $this->collAlumnos;
+ }
+
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Pais is new, it will return
+ * an empty collection; or if this Pais has previously
+ * been saved, it will retrieve related Alumnos from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Pais.
+ */
+ public function getAlumnosJoinCuenta($criteria =3D null, $con =3D null)
+ {
+ // include the Peer class
+ include_once 'model/om/BaseAlumnoPeer.php';
+ if ($criteria =3D=3D=3D null) {
+ $criteria =3D new Criteria();
+ }
+ elseif ($criteria instanceof Criteria)
+ {
+ $criteria =3D clone $criteria;
+ }
+
+ if ($this->collAlumnos =3D=3D=3D null) {
+ if ($this->isNew()) {
+ $this->collAlumnos =3D array();
+ } else {
+
+ $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinCuenta($criteria, $co=
n);
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+ if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->=
equals($criteria)) {
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinCuenta($criteria, $co=
n);
+ }
+ }
+ $this->lastAlumnoCriteria =3D $criteria;
+
+ return $this->collAlumnos;
+ }
+
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Pais is new, it will return
+ * an empty collection; or if this Pais has previously
+ * been saved, it will retrieve related Alumnos from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Pais.
+ */
+ public function getAlumnosJoinEstablecimiento($criteria =3D null, $con =
=3D null)
+ {
+ // include the Peer class
+ include_once 'model/om/BaseAlumnoPeer.php';
+ if ($criteria =3D=3D=3D null) {
+ $criteria =3D new Criteria();
+ }
+ elseif ($criteria instanceof Criteria)
+ {
+ $criteria =3D clone $criteria;
+ }
+
+ if ($this->collAlumnos =3D=3D=3D null) {
+ if ($this->isNew()) {
+ $this->collAlumnos =3D array();
+ } else {
+
+ $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinEstablecimiento($crit=
eria, $con);
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+ if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->=
equals($criteria)) {
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinEstablecimiento($crit=
eria, $con);
+ }
+ }
+ $this->lastAlumnoCriteria =3D $criteria;
+
+ return $this->collAlumnos;
+ }
+
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Pais is new, it will return
+ * an empty collection; or if this Pais has previously
+ * been saved, it will retrieve related Alumnos from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Pais.
+ */
+ public function getAlumnosJoinProvincia($criteria =3D null, $con =3D nu=
ll)
+ {
+ // include the Peer class
+ include_once 'model/om/BaseAlumnoPeer.php';
+ if ($criteria =3D=3D=3D null) {
+ $criteria =3D new Criteria();
+ }
+ elseif ($criteria instanceof Criteria)
+ {
+ $criteria =3D clone $criteria;
+ }
+
+ if ($this->collAlumnos =3D=3D=3D null) {
+ if ($this->isNew()) {
+ $this->collAlumnos =3D array();
+ } else {
+
+ $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinProvincia($criteria, =
$con);
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+ if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->=
equals($criteria)) {
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinProvincia($criteria, =
$con);
+ }
+ }
+ $this->lastAlumnoCriteria =3D $criteria;
+
+ return $this->collAlumnos;
+ }
+
+
+ /**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Pais is new, it will return
+ * an empty collection; or if this Pais has previously
+ * been saved, it will retrieve related Alumnos from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Pais.
+ */
+ public function getAlumnosJoinConceptobaja($criteria =3D null, $con =3D=
null)
+ {
+ // include the Peer class
+ include_once 'model/om/BaseAlumnoPeer.php';
+ if ($criteria =3D=3D=3D null) {
+ $criteria =3D new Criteria();
+ }
+ elseif ($criteria instanceof Criteria)
+ {
+ $criteria =3D clone $criteria;
+ }
+
+ if ($this->collAlumnos =3D=3D=3D null) {
+ if ($this->isNew()) {
+ $this->collAlumnos =3D array();
+ } else {
+
+ $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinConceptobaja($criteri=
a, $con);
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(AlumnoPeer::FK_PAIS_ID, $this->getId());
+
+ if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->=
equals($criteria)) {
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinConceptobaja($criteri=
a, $con);
+ }
+ }
+ $this->lastAlumnoCriteria =3D $criteria;
+
+ return $this->collAlumnos;
+ }
+
} // BasePais
Modified: prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php 2007-02-12 1=
8:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php 2007-02-12 1=
9:41:32 UTC (rev 4181)
@@ -1741,7 +1741,56 @@
return $this->collAlumnos;
}
=20
+
/**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Provincia is new, it will return
+ * an empty collection; or if this Provincia has previously
+ * been saved, it will retrieve related Alumnos from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Provincia.
+ */
+ public function getAlumnosJoinPais($criteria =3D null, $con =3D null)
+ {
+ // include the Peer class
+ include_once 'model/om/BaseAlumnoPeer.php';
+ if ($criteria =3D=3D=3D null) {
+ $criteria =3D new Criteria();
+ }
+ elseif ($criteria instanceof Criteria)
+ {
+ $criteria =3D clone $criteria;
+ }
+
+ if ($this->collAlumnos =3D=3D=3D null) {
+ if ($this->isNew()) {
+ $this->collAlumnos =3D array();
+ } else {
+
+ $criteria->add(AlumnoPeer::FK_PROVINCIA_ID, $this->getId());
+
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinPais($criteria, $con)=
;
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(AlumnoPeer::FK_PROVINCIA_ID, $this->getId());
+
+ if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->=
equals($criteria)) {
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinPais($criteria, $con)=
;
+ }
+ }
+ $this->lastAlumnoCriteria =3D $criteria;
+
+ return $this->collAlumnos;
+ }
+
+ /**
* Temporary storage of collResponsables to save a possible db hit in
* the event objects are add to the collection, but the
* complete collection is never requested.
Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTipodocumento.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/lib/model/om/BaseTipodocumento.php 2007-02-=
12 18:18:42 UTC (rev 4180)
+++ prosistem/alba/trunk/alba/lib/model/om/BaseTipodocumento.php 2007-02-=
12 19:41:32 UTC (rev 4181)
@@ -1045,7 +1045,56 @@
return $this->collAlumnos;
}
=20
+
/**
+ * If this collection has already been initialized with
+ * an identical criteria, it returns the collection.
+ * Otherwise if this Tipodocumento is new, it will return
+ * an empty collection; or if this Tipodocumento has previously
+ * been saved, it will retrieve related Alumnos from storage.
+ *
+ * This method is protected by default in order to keep the public
+ * api reasonable. You can provide public methods for those you
+ * actually need in Tipodocumento.
+ */
+ public function getAlumnosJoinPais($criteria =3D null, $con =3D null)
+ {
+ // include the Peer class
+ include_once 'model/om/BaseAlumnoPeer.php';
+ if ($criteria =3D=3D=3D null) {
+ $criteria =3D new Criteria();
+ }
+ elseif ($criteria instanceof Criteria)
+ {
+ $criteria =3D clone $criteria;
+ }
+
+ if ($this->collAlumnos =3D=3D=3D null) {
+ if ($this->isNew()) {
+ $this->collAlumnos =3D array();
+ } else {
+
+ $criteria->add(AlumnoPeer::FK_TIPODOCUMENTO_ID, $this->getId());
+
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinPais($criteria, $con)=
;
+ }
+ } else {
+ // the following code is to determine if a new query is
+ // called for. If the criteria is the same as the last
+ // one, just return the collection.
+
+ $criteria->add(AlumnoPeer::FK_TIPODOCUMENTO_ID, $this->getId());
+
+ if (!isset($this->lastAlumnoCriteria) || !$this->lastAlumnoCriteria->=
equals($criteria)) {
+ $this->collAlumnos =3D AlumnoPeer::doSelectJoinPais($criteria, $con)=
;
+ }
+ }
+ $this->lastAlumnoCriteria =3D $criteria;
+
+ return $this->collAlumnos;
+ }
+
+ /**
* Temporary storage of collResponsables to save a possible db hit in
* the event objects are add to the collection, but the
* complete collection is never requested.
Added: prosistem/alba/trunk/alba/web/css/informes.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- prosistem/alba/trunk/alba/web/css/informes.css 2007-02-12 18:18:42 UT=
C (rev 4180)
+++ prosistem/alba/trunk/alba/web/css/informes.css 2007-02-12 19:41:32 UT=
C (rev 4181)
@@ -0,0 +1,22 @@
+.titulo
+{
+ color: #000;
+ font-family: "Trebuchet MS", Arial, Verdana, sans-serif;
+ font-size: 20px;
+ font-weight: bold
+}
+
+.subtitulo
+{
+ color: #000;
+ font-family: "Trebuchet MS", Arial, Verdana, sans-serif;
+ font-size: 18px;
+ font-weight: bold
+}
+
+.texto
+{
+ color: #000;
+ font-family: "Trebuchet MS", Arial, Verdana, sans-serif;
+ font-size: 17px;
+}
Property changes on: prosistem/alba/trunk/alba/web/css/informes.css
___________________________________________________________________
Name: svn:keywords
+ Id Date Author Rev URL
Más información sobre la lista de distribución Alba-desarrollo