Author: josx Date: 2007-09-05 14:21:24 -0300 (Wed, 05 Sep 2007) New Revision: 5060 Modified: prosistem/alba/trunk/alba/config/schema.yml prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql prosistem/alba/trunk/alba/lib/model/map/BoletinActividadesMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/BoletinConceptualMapBuilder.php prosistem/alba/trunk/alba/lib/model/om/BaseBoletinActividades.php prosistem/alba/trunk/alba/lib/model/om/BaseBoletinConceptual.php Log: No se hacen obligatorios para el boletin conceptual y de notas el campo fk_escalanotas_id Modified: prosistem/alba/trunk/alba/config/schema.yml =================================================================== --- prosistem/alba/trunk/alba/config/schema.yml 2007-09-05 16:18:34 UTC (rev 5059) +++ prosistem/alba/trunk/alba/config/schema.yml 2007-09-05 17:21:24 UTC (rev 5060) @@ -1148,8 +1148,7 @@ fk_escalanota_id: type: integer size: 11 - required: true - default: 0 + required: false foreignTable: escalanota foreignReference: id fk_alumno_id: @@ -1191,8 +1190,7 @@ fk_escalanota_id: type: integer size: 11 - required: true - default: 0 + required: false foreignTable: escalanota foreignReference: id fk_alumno_id: Modified: prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql 2007-09-05 16:18:34 UTC (rev 5059) +++ prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql 2007-09-05 17:21:24 UTC (rev 5060) @@ -888,7 +888,7 @@ CREATE TABLE `boletin_conceptual` ( `id` INTEGER(11) NOT NULL AUTO_INCREMENT, - `fk_escalanota_id` INTEGER(11) default 0 NOT NULL, + `fk_escalanota_id` INTEGER(11), `fk_alumno_id` INTEGER(11) default 0 NOT NULL, `fk_concepto_id` INTEGER(11) default 0 NOT NULL, `fk_periodo_id` INTEGER(11) default 0 NOT NULL, @@ -923,7 +923,7 @@ CREATE TABLE `boletin_actividades` ( `id` INTEGER(11) NOT NULL AUTO_INCREMENT, - `fk_escalanota_id` INTEGER(11) default 0 NOT NULL, + `fk_escalanota_id` INTEGER(11), `fk_alumno_id` INTEGER(11) default 0 NOT NULL, `fk_actividad_id` INTEGER(11) default 0 NOT NULL, `fk_periodo_id` INTEGER(11) default 0 NOT NULL, Modified: prosistem/alba/trunk/alba/lib/model/map/BoletinActividadesMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/BoletinActividadesMapBuilder.php 2007-09-05 16:18:34 UTC (rev 5059) +++ prosistem/alba/trunk/alba/lib/model/map/BoletinActividadesMapBuilder.php 2007-09-05 17:21:24 UTC (rev 5060) @@ -34,7 +34,7 @@ $tMap->addPrimaryKey('ID', 'Id', 'int', CreoleTypes::INTEGER, true, 11); - $tMap->addForeignKey('FK_ESCALANOTA_ID', 'FkEscalanotaId', 'int', CreoleTypes::INTEGER, 'escalanota', 'ID', true, 11); + $tMap->addForeignKey('FK_ESCALANOTA_ID', 'FkEscalanotaId', 'int', CreoleTypes::INTEGER, 'escalanota', 'ID', false, 11); $tMap->addForeignKey('FK_ALUMNO_ID', 'FkAlumnoId', 'int', CreoleTypes::INTEGER, 'alumno', 'ID', true, 11); Modified: prosistem/alba/trunk/alba/lib/model/map/BoletinConceptualMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/BoletinConceptualMapBuilder.php 2007-09-05 16:18:34 UTC (rev 5059) +++ prosistem/alba/trunk/alba/lib/model/map/BoletinConceptualMapBuilder.php 2007-09-05 17:21:24 UTC (rev 5060) @@ -34,7 +34,7 @@ $tMap->addPrimaryKey('ID', 'Id', 'int', CreoleTypes::INTEGER, true, 11); - $tMap->addForeignKey('FK_ESCALANOTA_ID', 'FkEscalanotaId', 'int', CreoleTypes::INTEGER, 'escalanota', 'ID', true, 11); + $tMap->addForeignKey('FK_ESCALANOTA_ID', 'FkEscalanotaId', 'int', CreoleTypes::INTEGER, 'escalanota', 'ID', false, 11); $tMap->addForeignKey('FK_ALUMNO_ID', 'FkAlumnoId', 'int', CreoleTypes::INTEGER, 'alumno', 'ID', true, 11); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseBoletinActividades.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseBoletinActividades.php 2007-09-05 16:18:34 UTC (rev 5059) +++ prosistem/alba/trunk/alba/lib/model/om/BaseBoletinActividades.php 2007-09-05 17:21:24 UTC (rev 5060) @@ -13,7 +13,7 @@ - protected $fk_escalanota_id = 0; + protected $fk_escalanota_id; @@ -139,7 +139,7 @@ $v = (int) $v; } - if ($this->fk_escalanota_id !== $v || $v === 0) { + if ($this->fk_escalanota_id !== $v) { $this->fk_escalanota_id = $v; $this->modifiedColumns[] = BoletinActividadesPeer::FK_ESCALANOTA_ID; } @@ -621,7 +621,7 @@ if ($v === null) { - $this->setFkEscalanotaId('0'); + $this->setFkEscalanotaId(NULL); } else { $this->setFkEscalanotaId($v->getId()); } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseBoletinConceptual.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseBoletinConceptual.php 2007-09-05 16:18:34 UTC (rev 5059) +++ prosistem/alba/trunk/alba/lib/model/om/BaseBoletinConceptual.php 2007-09-05 17:21:24 UTC (rev 5060) @@ -13,7 +13,7 @@ - protected $fk_escalanota_id = 0; + protected $fk_escalanota_id; @@ -139,7 +139,7 @@ $v = (int) $v; } - if ($this->fk_escalanota_id !== $v || $v === 0) { + if ($this->fk_escalanota_id !== $v) { $this->fk_escalanota_id = $v; $this->modifiedColumns[] = BoletinConceptualPeer::FK_ESCALANOTA_ID; } @@ -621,7 +621,7 @@ if ($v === null) { - $this->setFkEscalanotaId('0'); + $this->setFkEscalanotaId(NULL); } else { $this->setFkEscalanotaId($v->getId()); }