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

SVN Alba r5359 - prosistem/alba/trunk/alba/data/sql
by commits＠pressenter.com.ar 26 Dec '07

26 Dec '07

Author: hsanchez Date: 2007-12-26 17:45:14 -0300 (Wed, 26 Dec 2007) New Revision: 5359 Added: prosistem/alba/trunk/alba/data/sql/actualizacion_1.0_luego.sql Removed: prosistem/alba/trunk/alba/data/sql/actualizacion_luego_1.0.sql Log: Corrigiendo el orden del nombre en el archivo Copied: prosistem/alba/trunk/alba/data/sql/actualizacion_1.0_luego.sql (from rev 5355, prosistem/alba/trunk/alba/data/sql/actualizacion_luego_1.0.sql) =================================================================== --- prosistem/alba/trunk/alba/data/sql/actualizacion_1.0_luego.sql (rev 0) +++ prosistem/alba/trunk/alba/data/sql/actualizacion_1.0_luego.sql 2007-12-26 20:45:14 UTC (rev 5359) @@ -0,0 +1,44 @@ +SET CHARACTER SET utf8; +SET FOREIGN_KEY_CHECKS = 0; + + +DROP TABLE IF EXISTS `informe`; + + +CREATE TABLE `informe` +( + `id` INTEGER NOT NULL AUTO_INCREMENT, + `nombre` VARCHAR(128) NOT NULL, + `descripcion` VARCHAR(255), + `fk_adjunto_id` INTEGER(11) NOT NULL, + `fk_tipoinforme_id` INTEGER(11) NOT NULL, + `listado` INTEGER default 0 NOT NULL, + `variables` VARCHAR(128), + PRIMARY KEY (`id`), + INDEX `informe_FI_1` (`fk_adjunto_id`), + CONSTRAINT `informe_FK_1` + FOREIGN KEY (`fk_adjunto_id`) + REFERENCES `adjunto` (`id`), + INDEX `informe_FI_2` (`fk_tipoinforme_id`), + CONSTRAINT `informe_FK_2` + FOREIGN KEY (`fk_tipoinforme_id`) + REFERENCES `tipoinforme` (`id`) +)Type=InnoDB; + +#----------------------------------------------------------------------------- +#-- tipoinforme +#----------------------------------------------------------------------------- + +DROP TABLE IF EXISTS `tipoinforme`; + + +CREATE TABLE `tipoinforme` +( + `id` INTEGER NOT NULL AUTO_INCREMENT, + `nombre` VARCHAR(128) NOT NULL, + `descripcion` VARCHAR(255), + PRIMARY KEY (`id`) +)Type=InnoDB; + +# This restores the fkey checks, after having unset them earlier +SET FOREIGN_KEY_CHECKS = 1; Deleted: prosistem/alba/trunk/alba/data/sql/actualizacion_luego_1.0.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/actualizacion_luego_1.0.sql 2007-12-26 20:43:21 UTC (rev 5358) +++ prosistem/alba/trunk/alba/data/sql/actualizacion_luego_1.0.sql 2007-12-26 20:45:14 UTC (rev 5359) @@ -1,44 +0,0 @@ -SET CHARACTER SET utf8; -SET FOREIGN_KEY_CHECKS = 0; - - -DROP TABLE IF EXISTS `informe`; - - -CREATE TABLE `informe` -( - `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) NOT NULL, - `descripcion` VARCHAR(255), - `fk_adjunto_id` INTEGER(11) NOT NULL, - `fk_tipoinforme_id` INTEGER(11) NOT NULL, - `listado` INTEGER default 0 NOT NULL, - `variables` VARCHAR(128), - PRIMARY KEY (`id`), - INDEX `informe_FI_1` (`fk_adjunto_id`), - CONSTRAINT `informe_FK_1` - FOREIGN KEY (`fk_adjunto_id`) - REFERENCES `adjunto` (`id`), - INDEX `informe_FI_2` (`fk_tipoinforme_id`), - CONSTRAINT `informe_FK_2` - FOREIGN KEY (`fk_tipoinforme_id`) - REFERENCES `tipoinforme` (`id`) -)Type=InnoDB; - -#----------------------------------------------------------------------------- -#-- tipoinforme -#----------------------------------------------------------------------------- - -DROP TABLE IF EXISTS `tipoinforme`; - - -CREATE TABLE `tipoinforme` -( - `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) NOT NULL, - `descripcion` VARCHAR(255), - PRIMARY KEY (`id`) -)Type=InnoDB; - -# This restores the fkey checks, after having unset them earlier -SET FOREIGN_KEY_CHECKS = 1;

1 0

SVN Alba r5358 - prosistem/alba/trunk/alba/data/sql
by commits＠pressenter.com.ar 26 Dec '07

26 Dec '07

Author: hsanchez Date: 2007-12-26 17:43:21 -0300 (Wed, 26 Dec 2007) New Revision: 5358 Modified: prosistem/alba/trunk/alba/data/sql/datos_ejemplo.sql Log: Agregando datos defecto de anio Modified: prosistem/alba/trunk/alba/data/sql/datos_ejemplo.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/datos_ejemplo.sql 2007-12-26 20:38:47 UTC (rev 5357) +++ prosistem/alba/trunk/alba/data/sql/datos_ejemplo.sql 2007-12-26 20:43:21 UTC (rev 5358) @@ -89,13 +89,13 @@ -- Volcar la base de datos para la tabla `anio` -- -INSERT INTO `anio` (`id`, `fk_establecimiento_id`, `descripcion`) VALUES (1, 1, 'Primer Grado'); -INSERT INTO `anio` (`id`, `fk_establecimiento_id`, `descripcion`) VALUES (2, 1, 'Segundo Grado '); -INSERT INTO `anio` (`id`, `fk_establecimiento_id`, `descripcion`) VALUES (3, 1, 'Tercer Grado'); -INSERT INTO `anio` (`id`, `fk_establecimiento_id`, `descripcion`) VALUES (4, 1, 'Cuarto Grado'); -INSERT INTO `anio` (`id`, `fk_establecimiento_id`, `descripcion`) VALUES (5, 1, 'Quinto grado'); -INSERT INTO `anio` (`id`, `fk_establecimiento_id`, `descripcion`) VALUES (6, 1, 'Sexto Grado'); -INSERT INTO `anio` (`id`, `fk_establecimiento_id`, `descripcion`) VALUES (7, 1, 'Séptimo Grado'); +INSERT INTO `anio` (`id`, `fk_establecimiento_id`, `descripcion`, `orden`) VALUES (1, 1, 'Primer Grado', 10); +INSERT INTO `anio` (`id`, `fk_establecimiento_id`, `descripcion`, `orden`) VALUES (2, 1, 'Segundo Grado ', 20); +INSERT INTO `anio` (`id`, `fk_establecimiento_id`, `descripcion`, `orden`) VALUES (3, 1, 'Tercer Grado', 30); +INSERT INTO `anio` (`id`, `fk_establecimiento_id`, `descripcion`, `orden`) VALUES (4, 1, 'Cuarto Grado', 40); +INSERT INTO `anio` (`id`, `fk_establecimiento_id`, `descripcion`, `orden`) VALUES (5, 1, 'Quinto grado', 50); +INSERT INTO `anio` (`id`, `fk_establecimiento_id`, `descripcion`, `orden`) VALUES (6, 1, 'Sexto Grado', 60); +INSERT INTO `anio` (`id`, `fk_establecimiento_id`, `descripcion`, `orden`) VALUES (7, 1, 'Séptimo Grado', 70); -- -- Volcar la base de datos para la tabla `asistencia`

1 0

SVN Alba r5357 - prosistem/alba/trunk/alba/data/sql
by commits＠pressenter.com.ar 26 Dec '07

26 Dec '07

Author: hsanchez Date: 2007-12-26 17:38:47 -0300 (Wed, 26 Dec 2007) New Revision: 5357 Modified: prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql Log: Agregando el orden a anio Modified: prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql 2007-12-26 20:31:30 UTC (rev 5356) +++ prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql 2007-12-26 20:38:47 UTC (rev 5357) @@ -996,6 +996,7 @@ `id` INTEGER(11) NOT NULL AUTO_INCREMENT, `fk_establecimiento_id` INTEGER(11) default 0 NOT NULL, `descripcion` VARCHAR(255) NOT NULL, + `orden` INTEGER default 0, PRIMARY KEY (`id`), INDEX `anio_FI_1` (`fk_establecimiento_id`), CONSTRAINT `anio_FK_1`

1 0

SVN Alba r5356 - in prosistem/alba/trunk/alba: config lib/model/map lib/model/om
by commits＠pressenter.com.ar 26 Dec '07

26 Dec '07

Author: hsanchez Date: 2007-12-26 17:31:30 -0300 (Wed, 26 Dec 2007) New Revision: 5356 Modified: prosistem/alba/trunk/alba/config/schema.yml prosistem/alba/trunk/alba/lib/model/map/AnioMapBuilder.php prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php prosistem/alba/trunk/alba/lib/model/om/BaseAnioPeer.php Log: Cambiando el modelo para anio Modified: prosistem/alba/trunk/alba/config/schema.yml =================================================================== --- prosistem/alba/trunk/alba/config/schema.yml 2007-12-26 20:19:46 UTC (rev 5355) +++ prosistem/alba/trunk/alba/config/schema.yml 2007-12-26 20:31:30 UTC (rev 5356) @@ -1287,6 +1287,10 @@ type: varchar size: 255 required: true + orden: + type: INTEGER + required: false + default: 0 division: _attributes: idMethod: native @@ -1889,4 +1893,4 @@ descripcion: type: VARCHAR size: 255 - required: false \ No newline at end of file + required: false Modified: prosistem/alba/trunk/alba/lib/model/map/AnioMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/AnioMapBuilder.php 2007-12-26 20:19:46 UTC (rev 5355) +++ prosistem/alba/trunk/alba/lib/model/map/AnioMapBuilder.php 2007-12-26 20:31:30 UTC (rev 5356) @@ -38,5 +38,7 @@ $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, true, 255); + $tMap->addColumn('ORDEN', 'Orden', 'int', CreoleTypes::INTEGER, false, null); + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php 2007-12-26 20:19:46 UTC (rev 5355) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php 2007-12-26 20:31:30 UTC (rev 5356) @@ -19,7 +19,11 @@ protected $descripcion; + + protected $orden = 0; + + protected $aEstablecimiento; @@ -62,6 +66,13 @@ } + public function getOrden() + { + + return $this->orden; + } + + public function setId($v) { @@ -108,6 +119,20 @@ } + public function setOrden($v) + { + + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->orden !== $v || $v === 0) { + $this->orden = $v; + $this->modifiedColumns[] = AnioPeer::ORDEN; + } + + } + public function hydrate(ResultSet $rs, $startcol = 1) { try { @@ -118,11 +143,13 @@ $this->descripcion = $rs->getString($startcol + 2); + $this->orden = $rs->getInt($startcol + 3); + $this->resetModified(); $this->setNew(false); - return $startcol + 3; + return $startcol + 4; } catch (Exception $e) { throw new PropelException("Error populating Anio object", $e); } @@ -307,6 +334,9 @@ case 2: return $this->getDescripcion(); break; + case 3: + return $this->getOrden(); + break; default: return null; break; @@ -320,6 +350,7 @@ $keys[0] => $this->getId(), $keys[1] => $this->getFkEstablecimientoId(), $keys[2] => $this->getDescripcion(), + $keys[3] => $this->getOrden(), ); return $result; } @@ -344,6 +375,9 @@ case 2: $this->setDescripcion($value); break; + case 3: + $this->setOrden($value); + break; } } @@ -354,6 +388,7 @@ if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); if (array_key_exists($keys[1], $arr)) $this->setFkEstablecimientoId($arr[$keys[1]]); if (array_key_exists($keys[2], $arr)) $this->setDescripcion($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setOrden($arr[$keys[3]]); } @@ -364,6 +399,7 @@ if ($this->isColumnModified(AnioPeer::ID)) $criteria->add(AnioPeer::ID, $this->id); if ($this->isColumnModified(AnioPeer::FK_ESTABLECIMIENTO_ID)) $criteria->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $this->fk_establecimiento_id); if ($this->isColumnModified(AnioPeer::DESCRIPCION)) $criteria->add(AnioPeer::DESCRIPCION, $this->descripcion); + if ($this->isColumnModified(AnioPeer::ORDEN)) $criteria->add(AnioPeer::ORDEN, $this->orden); return $criteria; } @@ -398,7 +434,9 @@ $copyObj->setDescripcion($this->descripcion); + $copyObj->setOrden($this->orden); + if ($deepCopy) { $copyObj->setNew(false); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAnioPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAnioPeer.php 2007-12-26 20:19:46 UTC (rev 5355) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAnioPeer.php 2007-12-26 20:31:30 UTC (rev 5356) @@ -13,7 +13,7 @@ const CLASS_DEFAULT = 'lib.model.Anio'; - const NUM_COLUMNS = 3; + const NUM_COLUMNS = 4; const NUM_LAZY_LOAD_COLUMNS = 0; @@ -29,23 +29,26 @@ const DESCRIPCION = 'anio.DESCRIPCION'; + const ORDEN = 'anio.ORDEN'; + + private static $phpNameMap = null; private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('Id', 'FkEstablecimientoId', 'Descripcion', ), - BasePeer::TYPE_COLNAME => array (AnioPeer::ID, AnioPeer::FK_ESTABLECIMIENTO_ID, AnioPeer::DESCRIPCION, ), - BasePeer::TYPE_FIELDNAME => array ('id', 'fk_establecimiento_id', 'descripcion', ), - BasePeer::TYPE_NUM => array (0, 1, 2, ) + BasePeer::TYPE_PHPNAME => array ('Id', 'FkEstablecimientoId', 'Descripcion', 'Orden', ), + BasePeer::TYPE_COLNAME => array (AnioPeer::ID, AnioPeer::FK_ESTABLECIMIENTO_ID, AnioPeer::DESCRIPCION, AnioPeer::ORDEN, ), + BasePeer::TYPE_FIELDNAME => array ('id', 'fk_establecimiento_id', 'descripcion', 'orden', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) ); private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'FkEstablecimientoId' => 1, 'Descripcion' => 2, ), - BasePeer::TYPE_COLNAME => array (AnioPeer::ID => 0, AnioPeer::FK_ESTABLECIMIENTO_ID => 1, AnioPeer::DESCRIPCION => 2, ), - BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'fk_establecimiento_id' => 1, 'descripcion' => 2, ), - BasePeer::TYPE_NUM => array (0, 1, 2, ) + BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'FkEstablecimientoId' => 1, 'Descripcion' => 2, 'Orden' => 3, ), + BasePeer::TYPE_COLNAME => array (AnioPeer::ID => 0, AnioPeer::FK_ESTABLECIMIENTO_ID => 1, AnioPeer::DESCRIPCION => 2, AnioPeer::ORDEN => 3, ), + BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'fk_establecimiento_id' => 1, 'descripcion' => 2, 'orden' => 3, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) ); @@ -105,6 +108,8 @@ $criteria->addSelectColumn(AnioPeer::DESCRIPCION); + $criteria->addSelectColumn(AnioPeer::ORDEN); + } const COUNT = 'COUNT(anio.ID)';

1 0

[Pressenter - SVN Alba] #267: error al visualizar informe de Docente
by Pressenter - SVN Alba 26 Dec '07

26 Dec '07

#267: error al visualizar informe de Docente ---------------------------+------------------------------------------------ Reporter: ftoledo | Owner: ftoledo Type: defecto | Status: new Priority: normal | Milestone: Component: alba-informes | Version: desarollo Severity: normal | Keywords: permisos ---------------------------+------------------------------------------------ url: /alba/index.php/informes/mostrar/id/7 {{{ TinyButStrong Error SetProcessDir method : Directory not writable : /home/ftoledo/alba/alba/web/uploads/informes/ TinyButStrong Error NewDocFromTpl method : Can't create directory : /home/ftoledo/alba/alba/web/uploads/informes/568129bd982a8187b425cb6d9fbaa7ab TinyButStrong Error LoadXmlFromDoc method : File not found : /home/ftoledo/alba/alba/web/uploads/informes/568129bd982a8187b425cb6d9fbaa7ab/content.xml TinyButStrong Error SaveXmlToDoc method : File not found : /home/ftoledo/alba/alba/web/uploads/informes/568129bd982a8187b425cb6d9fbaa7ab/content.xml }}} -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/267> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba - Sistema Informático Abierto de Gestión Unificada para Unidades Educacionales

1 3

SVN Alba r5355 - prosistem/alba/trunk/alba/doc
by commits＠pressenter.com.ar 26 Dec '07

26 Dec '07

Author: hsanchez Date: 2007-12-26 17:19:46 -0300 (Wed, 26 Dec 2007) New Revision: 5355 Modified: prosistem/alba/trunk/alba/doc/DER.xmi Log: Corrigiendo el modelo Modified: prosistem/alba/trunk/alba/doc/DER.xmi =================================================================== --- prosistem/alba/trunk/alba/doc/DER.xmi 2007-12-26 20:14:04 UTC (rev 5354) +++ prosistem/alba/trunk/alba/doc/DER.xmi 2007-12-26 20:19:46 UTC (rev 5355) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<XMI xmlns:UML="http://schema.omg.org/spec/UML/1.3" verified="false" timestamp="2007-08-08T16:17:48" xmi.version="1.2" > +<XMI xmlns:UML="http://schema.omg.org/spec/UML/1.3" verified="false" timestamp="2007-12-19T13:41:06" xmi.version="1.2" > <XMI.header> <XMI.documentation> <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter> - <XMI.exporterVersion>1.5.5</XMI.exporterVersion> + <XMI.exporterVersion>1.5.8</XMI.exporterVersion> <XMI.exporterEncoding>UnicodeUTF8</XMI.exporterEncoding> </XMI.documentation> <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" /> @@ -11,13 +11,9 @@ <XMI.content> <UML:Model isSpecification="false" isLeaf="false" isRoot="false" xmi.id="m1" isAbstract="false" name="Modelo UML" > <UML:Namespace.ownedElement> - <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> - <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> - <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> - <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> - <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> - <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> - <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2211" isRoot="false" isAbstract="false" name="datatype" /> + <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="folder" isRoot="false" isAbstract="false" name="folder" /> + <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="2211" isRoot="false" isAbstract="false" name="datatype" /> + <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="2" isRoot="false" isAbstract="false" name="2" /> <UML:Model stereotype="2" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="1" isRoot="false" isAbstract="false" name="Logical View" > <UML:Namespace.ownedElement> <UML:Package stereotype="2" isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="8" isRoot="false" isAbstract="false" name="Datatypes" > @@ -58,134 +54,134 @@ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2260" isRoot="false" isAbstract="false" name="tinyint" /> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2372" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2373" aggregation="none" type="2227" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2374" aggregation="none" type="2230" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2sIFqxevuzKm" aggregation="none" type="2227" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="vEHgJcQmraQx" aggregation="none" type="2230" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2375" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2376" aggregation="none" type="2227" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2377" aggregation="none" type="2220" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="BR8apQsrI859" aggregation="none" type="2227" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="6j20iMlbY0Ip" aggregation="none" type="2220" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2378" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2379" aggregation="none" type="2225" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2380" aggregation="none" type="2221" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="ciZSHyNSPV0F" aggregation="none" type="2225" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="vs4Bz9I5sL3Z" aggregation="none" type="2221" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2381" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2382" aggregation="none" type="2230" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2383" aggregation="none" type="2222" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="hmAEnQ3N9dnO" aggregation="none" type="2230" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="ZAoyfpBYfGke" aggregation="none" type="2222" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2384" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2385" aggregation="none" type="2238" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2386" aggregation="none" type="2233" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="N0hGLln1VvFG" aggregation="none" type="2238" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="MIcTtPrSadPD" aggregation="none" type="2233" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2387" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2388" aggregation="none" type="2228" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2389" aggregation="none" type="2233" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Sak6oSkCSSQo" aggregation="none" type="2228" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="BDpg84vSKXvC" aggregation="none" type="2233" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2390" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2391" aggregation="none" type="2226" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2392" aggregation="none" type="2221" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="wkcUO1goaQuO" aggregation="none" type="2226" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="sdaK5y6EBvuI" aggregation="none" type="2221" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2393" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2394" aggregation="none" type="2237" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2395" aggregation="none" type="2226" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="xnkGKgSHO2jm" aggregation="none" type="2237" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2PZcnTyf4Zy9" aggregation="none" type="2226" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2396" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2397" aggregation="none" type="2221" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2398" aggregation="none" type="2231" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="X2NhyGzt3h9O" aggregation="none" type="2221" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="LZdkcKUck3EV" aggregation="none" type="2231" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2399" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2400" aggregation="none" type="2237" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2401" aggregation="none" type="2223" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="VC9Zj7hF74w3" aggregation="none" type="2237" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="ItxKa4gweHeE" aggregation="none" type="2223" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2402" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2403" aggregation="none" type="2230" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2404" aggregation="none" type="2223" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="b8qJC2phCyEw" aggregation="none" type="2230" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="3vBAy5EGy9YW" aggregation="none" type="2223" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2405" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2406" aggregation="none" type="2221" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2407" aggregation="none" type="2238" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="DEQpT415BpMN" aggregation="none" type="2221" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="rB227Gy8C7HA" aggregation="none" type="2238" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2408" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2409" aggregation="none" type="2230" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2410" aggregation="none" type="2235" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="CVO8cxcn93dd" aggregation="none" type="2230" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="5cgGS2bHCdJJ" aggregation="none" type="2235" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2411" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2412" aggregation="none" type="2223" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2413" aggregation="none" type="2235" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="sFS4MhCYAYem" aggregation="none" type="2223" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="THZbIAELnsaD" aggregation="none" type="2235" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2414" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2415" aggregation="none" type="2236" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2416" aggregation="none" type="2232" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="uBS6nmOf1ohM" aggregation="none" type="2236" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="VrsfNXPrmyS2" aggregation="none" type="2232" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2417" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2418" aggregation="none" type="2228" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2419" aggregation="none" type="2232" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="7eNuUx7O7ZTu" aggregation="none" type="2228" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="JrXJdEf83VlQ" aggregation="none" type="2232" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2420" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2421" aggregation="none" type="2229" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2422" aggregation="none" type="2234" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2AFm6hoDJC7n" aggregation="none" type="2229" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="7CAEkb61SdI3" aggregation="none" type="2234" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2423" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2424" aggregation="none" type="2238" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2425" aggregation="none" type="2234" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="pv9qRuHR4WEA" aggregation="none" type="2238" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="C2MTCTFIePWM" aggregation="none" type="2234" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2426" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2427" aggregation="none" type="2222" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2428" aggregation="none" type="2231" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="0bNQCgR2bas0" aggregation="none" type="2222" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="U7SWcgeog0Fr" aggregation="none" type="2231" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2429" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2430" aggregation="none" type="2230" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2431" aggregation="none" type="2220" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="SU94rdQpElDR" aggregation="none" type="2230" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="PeR1EH1iNRCz" aggregation="none" type="2220" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2432" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2433" aggregation="none" type="2221" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2434" aggregation="none" type="2220" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="7rnmp0dFVmJM" aggregation="none" type="2221" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="PjCcVP3u2StG" aggregation="none" type="2220" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="2435" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2436" aggregation="none" type="2223" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2437" aggregation="none" type="2220" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="jtx6K93QyoCm" aggregation="none" type="2223" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="pn1KZLew2oYX" aggregation="none" type="2220" name="" /> </UML:Association.connection> </UML:Association> </UML:Namespace.ownedElement> @@ -248,7 +244,7 @@ <UML:EntityAttribute attributes="" values="128" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2223" auto_increment="0" xmi.id="2274" isRoot="false" initialValue="" type="2241" isAbstract="false" name="localidad" /> <UML:EntityAttribute attributes="" values="16" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2223" auto_increment="0" xmi.id="2275" isRoot="false" initialValue="" type="2241" isAbstract="false" name="codigo_postal" /> <UML:EntityAttribute attributes="" values="11" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2223" auto_increment="0" xmi.id="2276" isRoot="false" initialValue="" type="2210" isAbstract="false" name="fk_provincia_id" /> - <UML:EntityAttribute attributes="" values="11" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2223" auto_increment="0" xmi.id="2277" isRoot="false" initialValue="" type="2210" isAbstract="false" name="fk_tipo_iva_id" /> + <UML:EntityAttribute attributes="" values="11" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2223" auto_increment="0" xmi.id="2277" isRoot="false" initialValue="" type="2210" isAbstract="false" name="fk_tipoiva_id" /> <UML:EntityAttribute attributes="" values="20" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2223" auto_increment="0" xmi.id="2278" isRoot="false" initialValue="" type="2241" isAbstract="false" name="telefono" /> </UML:Entity> <UML:Entity isSpecification="false" isLeaf="false" visibility="public" namespace="6" xmi.id="2224" isRoot="false" isAbstract="false" name="modulo" > @@ -407,267 +403,276 @@ </UML:Entity> <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2469" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2470" aggregation="none" type="2465" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2471" aggregation="none" type="2439" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="02w1gaj9AkAC" aggregation="none" type="2465" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="HlZqMJMD8agS" aggregation="none" type="2439" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2472" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2473" aggregation="none" type="2439" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2474" aggregation="none" type="2465" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="SwN8bIkZKhby" aggregation="none" type="2439" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="FI7O2FaI098M" aggregation="none" type="2465" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2488" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2489" aggregation="none" type="2475" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2490" aggregation="none" type="2439" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="QUXX4DzUANaj" aggregation="none" type="2475" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="dLIx0rvD70bA" aggregation="none" type="2439" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2491" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2492" aggregation="none" type="2481" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2493" aggregation="none" type="2475" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="FASDHaZi37F7" aggregation="none" type="2481" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="KCaSXABAVS5T" aggregation="none" type="2475" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2498" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2499" aggregation="none" type="2494" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2500" aggregation="none" type="2439" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="JyhRwGZBQ1Oi" aggregation="none" type="2494" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="ZwQc1diLnImL" aggregation="none" type="2439" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2501" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2502" aggregation="none" type="2220" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2503" aggregation="none" type="2494" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="SxTwPZPjV48S" aggregation="none" type="2220" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Lhblg0TDurqv" aggregation="none" type="2494" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2504" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2505" aggregation="none" type="2221" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2506" aggregation="none" type="2465" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="SYEGq0ZGy2CN" aggregation="none" type="2221" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Za45eAXzp8jT" aggregation="none" type="2465" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2516" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2517" aggregation="none" type="2481" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2518" aggregation="none" type="2222" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="6Ch02XtS38ir" aggregation="none" type="2481" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="8H74IKQruSwW" aggregation="none" type="2222" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2519" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2520" aggregation="none" type="2507" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2521" aggregation="none" type="2481" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="dRWQYFuePZdP" aggregation="none" type="2507" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="4Ws7cYyjq5n6" aggregation="none" type="2481" name="" /> </UML:Association.connection> </UML:Association> <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2522" name="" > <UML:Association.connection> - <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2523" aggregation="none" type="2507" name="" /> - <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2524" aggregation="none" type="2222" name="" /> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="NDxFesmFJIfr" aggregation="none" type="2507" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="VXUs65IAb8FC" aggregation="none" type="2222" name="" /> </UML:Association.connection> </UML:Association> + <UML:Entity isSpecification="false" isLeaf="false" visibility="public" namespace="6" xmi.id="UuQH9qA7RCrg" isRoot="false" isAbstract="false" name="Responsables" /> </UML:Namespace.ownedElement> <XMI.extension xmi.extender="umbrello" > <diagrams> - <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="81" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1588" snapy="10" showatts="1" xmi.id="2219" documentation="" type="9" showops="1" showpackage="0" name="DER - Alba" localid="900000" showstereotype="0" showscope="1" snapcsgrid="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="1353" > + <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1588" snapy="10" showatts="1" xmi.id="2219" documentation="" type="9" showops="1" showpackage="0" name="DER - Alba" localid="900000" showstereotype="0" showscope="1" snapcsgrid="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="1345" > <widgets> - <entitywidget usesdiagramfillcolour="0" width="148" usesdiagramusefillcolour="0" x="481" y="456" linewidth="none" fillcolour="#ffffc0" height="270" usefillcolor="1" isinstance="0" xmi.id="2220" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="132" usesdiagramusefillcolour="0" x="1097" y="139" linewidth="none" fillcolour="#ffffc0" height="144" usefillcolor="1" isinstance="0" xmi.id="2221" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="137" usesdiagramusefillcolour="0" x="117" y="1087" linewidth="none" fillcolour="#ffffc0" height="216" usefillcolor="1" isinstance="0" xmi.id="2222" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="103" usesdiagramusefillcolour="0" x="429" y="124" linewidth="none" fillcolour="#ffffc0" height="198" usefillcolor="1" isinstance="0" xmi.id="2223" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="82" usesdiagramusefillcolour="0" x="1353" y="964" linewidth="none" fillcolour="#ffffc0" height="108" usefillcolor="1" isinstance="0" xmi.id="2224" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="84" usesdiagramusefillcolour="0" x="1351" y="147" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2225" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="108" usesdiagramusefillcolour="0" x="708" y="119" linewidth="none" fillcolour="#ffffc0" height="216" usefillcolor="1" isinstance="0" xmi.id="2226" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="100" usesdiagramusefillcolour="0" x="46" y="550" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2227" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="94" usesdiagramusefillcolour="0" x="1012" y="1112" linewidth="none" fillcolour="#ffffc0" height="108" usefillcolor="1" isinstance="0" xmi.id="2228" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="124" usesdiagramusefillcolour="0" x="1423" y="547" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2229" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="100" usesdiagramusefillcolour="0" x="237" y="553" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2230" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="225" usesdiagramusefillcolour="0" x="978" y="589" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2231" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="126" usesdiagramusefillcolour="0" x="840" y="1142" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2232" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="161" usesdiagramusefillcolour="0" x="959" y="993" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2233" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="186" usesdiagramusefillcolour="0" x="1398" y="766" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2234" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="129" usesdiagramusefillcolour="0" x="216" y="68" linewidth="none" fillcolour="#ffffc0" height="306" usefillcolor="1" isinstance="0" xmi.id="2235" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="82" usesdiagramusefillcolour="0" x="692" y="1133" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2236" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="82" usesdiagramusefillcolour="0" x="572" y="121" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2237" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="148" usesdiagramusefillcolour="0" x="1169" y="688" linewidth="none" fillcolour="#ffffc0" height="234" usefillcolor="1" isinstance="0" xmi.id="2238" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="1" width="87" usesdiagramusefillcolour="1" x="777" y="723" linewidth="none" fillcolour="none" height="90" usefillcolor="1" isinstance="0" xmi.id="2439" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> - <entitywidget usesdiagramfillcolour="1" width="148" usesdiagramusefillcolour="1" x="773" y="591" linewidth="none" fillcolour="none" height="72" usefillcolor="1" isinstance="0" xmi.id="2465" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> - <entitywidget usesdiagramfillcolour="1" width="115" usesdiagramusefillcolour="1" x="669" y="912" linewidth="none" fillcolour="none" height="108" usefillcolor="1" isinstance="0" xmi.id="2475" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> - <entitywidget usesdiagramfillcolour="1" width="148" usesdiagramusefillcolour="1" x="433" y="1007" linewidth="none" fillcolour="none" height="126" usefillcolor="1" isinstance="0" xmi.id="2481" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> - <entitywidget usesdiagramfillcolour="0" width="146" usesdiagramusefillcolour="0" x="489" y="816" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2494" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="119" usesdiagramusefillcolour="0" x="343" y="1187" linewidth="none" fillcolour="#ffffc0" height="162" usefillcolor="1" isinstance="0" xmi.id="2507" showstereotype="1" font="Sans Serif,10,-1,0,75,1,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="151" x="419" fillcolor="#ffffc0" y="501" linewidth="none" height="282" usefillcolor="1" isinstance="0" xmi.id="2220" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="132" x="1124" fillcolor="#ffffc0" y="93" linewidth="none" height="144" usefillcolor="1" isinstance="0" xmi.id="2221" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="137" x="212" fillcolor="#ffffc0" y="1083" linewidth="none" height="216" usefillcolor="1" isinstance="0" xmi.id="2222" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="119" x="447" fillcolor="#ffffc0" y="89" linewidth="none" height="215" usefillcolor="1" isinstance="0" xmi.id="2223" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="82" x="1353" fillcolor="#ffffc0" y="964" linewidth="none" height="108" usefillcolor="1" isinstance="0" xmi.id="2224" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="84" x="1361" fillcolor="#ffffc0" y="128" linewidth="none" height="72" usefillcolor="1" isinstance="0" xmi.id="2225" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="108" x="849" fillcolor="#ffffc0" y="90" linewidth="none" height="216" usefillcolor="1" isinstance="0" xmi.id="2226" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="100" x="42" fillcolor="#ffffc0" y="509" linewidth="none" height="90" usefillcolor="1" isinstance="0" xmi.id="2227" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="94" x="1012" fillcolor="#ffffc0" y="1112" linewidth="none" height="108" usefillcolor="1" isinstance="0" xmi.id="2228" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="124" x="1423" fillcolor="#ffffc0" y="547" linewidth="none" height="90" usefillcolor="1" isinstance="0" xmi.id="2229" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="100" x="207" fillcolor="#ffffc0" y="505" linewidth="none" height="90" usefillcolor="1" isinstance="0" xmi.id="2230" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="225" x="978" fillcolor="#ffffc0" y="589" linewidth="none" height="72" usefillcolor="1" isinstance="0" xmi.id="2231" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="126" x="840" fillcolor="#ffffc0" y="1142" linewidth="none" height="72" usefillcolor="1" isinstance="0" xmi.id="2232" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="161" x="982" fillcolor="#ffffc0" y="971" linewidth="none" height="72" usefillcolor="1" isinstance="0" xmi.id="2233" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="186" x="1398" fillcolor="#ffffc0" y="766" linewidth="none" height="72" usefillcolor="1" isinstance="0" xmi.id="2234" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="144" x="207" fillcolor="#ffffc0" y="86" linewidth="none" height="322" usefillcolor="1" isinstance="0" xmi.id="2235" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="82" x="692" fillcolor="#ffffc0" y="1133" linewidth="none" height="90" usefillcolor="1" isinstance="0" xmi.id="2236" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="82" x="696" fillcolor="#ffffc0" y="101" linewidth="none" height="72" usefillcolor="1" isinstance="0" xmi.id="2237" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="148" x="1169" fillcolor="#ffffc0" y="688" linewidth="none" height="234" usefillcolor="1" isinstance="0" xmi.id="2238" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="1" width="87" x="825" fillcolor="none" y="737" linewidth="none" height="90" usefillcolor="1" isinstance="0" xmi.id="2439" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> + <entitywidget usesdiagramfillcolor="1" width="148" x="773" fillcolor="none" y="591" linewidth="none" height="72" usefillcolor="1" isinstance="0" xmi.id="2465" showstereotype="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> + <entitywidget usesdiagramfillcolor="1" width="115" x="598" fillcolor="none" y="874" linewidth="none" height="108" usefillcolor="1" isinstance="0" xmi.id="2475" showstereotype="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> + <entitywidget usesdiagramfillcolor="1" width="148" x="414" fillcolor="none" y="873" linewidth="none" height="126" usefillcolor="1" isinstance="0" xmi.id="2481" showstereotype="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> + <entitywidget usesdiagramfillcolor="0" width="146" x="597" fillcolor="#ffffc0" y="731" linewidth="none" height="72" usefillcolor="1" isinstance="0" xmi.id="2494" showstereotype="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolor="0" width="119" x="433" fillcolor="#ffffc0" y="1179" linewidth="none" height="162" usefillcolor="1" isinstance="0" xmi.id="2507" showstereotype="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> </widgets> <messages/> <associations> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2230" widgetaid="2227" xmi.id="2372" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2230" widgetaid="2227" xmi.id="2372" type="516" linecolor="none" > <linepath> - <startpoint startx="146" starty="595" /> - <endpoint endx="237" endy="598" /> + <startpoint startx="142" starty="554" /> + <endpoint endx="207" endy="550" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2221" widgetaid="2225" xmi.id="2378" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2221" widgetaid="2225" xmi.id="2378" type="516" linecolor="none" > <linepath> - <startpoint startx="1351" starty="183" /> - <endpoint endx="1229" endy="211" /> + <startpoint startx="1361" starty="164" /> + <endpoint endx="1256" endy="165" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2222" widgetaid="2230" xmi.id="2381" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2222" widgetaid="2230" xmi.id="2381" type="516" linecolor="none" > <linepath> - <startpoint startx="287" starty="643" /> - <endpoint endx="185" endy="1087" /> + <startpoint startx="257" starty="595" /> + <endpoint endx="280" endy="1083" /> <point x="285" y="738" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2233" widgetaid="2238" xmi.id="2384" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2233" widgetaid="2238" xmi.id="2384" type="516" linecolor="none" > <linepath> <startpoint startx="1169" starty="805" /> - <endpoint endx="1039" endy="993" /> + <endpoint endx="1062" endy="971" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2233" widgetaid="2228" xmi.id="2387" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2233" widgetaid="2228" xmi.id="2387" type="516" linecolor="none" > <linepath> <startpoint startx="1059" starty="1112" /> - <endpoint endx="1039" endy="1065" /> + <endpoint endx="1062" endy="1043" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="2221" widgetaid="2226" xmi.id="2390" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="2221" widgetaid="2226" xmi.id="2390" type="516" linecolor="none" > <linepath> - <startpoint startx="816" starty="227" /> - <endpoint endx="1097" endy="187" /> + <startpoint startx="957" starty="198" /> + <endpoint endx="1124" endy="141" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2226" widgetaid="2237" xmi.id="2393" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2226" widgetaid="2237" xmi.id="2393" type="516" linecolor="none" > <linepath> - <startpoint startx="654" starty="157" /> - <endpoint endx="708" endy="227" /> + <startpoint startx="778" starty="137" /> + <endpoint endx="849" endy="198" /> + <point x="836" y="186" /> </linepath> </assocwidget> - <assocwidget totalcounta="4" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2231" widgetaid="2221" xmi.id="2396" linecolor="none" > + <assocwidget totalcounta="4" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2231" widgetaid="2221" xmi.id="2396" type="516" linecolor="none" > <linepath> - <startpoint startx="1163" starty="283" /> + <startpoint startx="1190" starty="237" /> <endpoint endx="1090" endy="589" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2223" widgetaid="2237" xmi.id="2399" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2223" widgetaid="2237" xmi.id="2399" type="516" linecolor="none" > <linepath> - <startpoint startx="572" starty="157" /> - <endpoint endx="532" endy="223" /> + <startpoint startx="696" starty="137" /> + <endpoint endx="566" endy="196" /> </linepath> </assocwidget> - <assocwidget totalcounta="3" indexa="2" totalcountb="3" indexb="1" linewidth="none" widgetbid="2223" widgetaid="2230" xmi.id="2402" linecolor="none" > + <assocwidget totalcounta="3" indexa="2" totalcountb="3" indexb="1" linewidth="none" widgetbid="2223" widgetaid="2230" xmi.id="2402" type="516" linecolor="none" > <linepath> - <startpoint startx="303" starty="553" /> - <endpoint endx="463" endy="322" /> + <startpoint startx="273" starty="505" /> + <endpoint endx="486" endy="304" /> + <point x="410" y="386" /> </linepath> </assocwidget> - <assocwidget totalcounta="4" indexa="3" totalcountb="2" indexb="1" linewidth="none" widgetbid="2238" widgetaid="2221" xmi.id="2405" linecolor="none" > + <assocwidget totalcounta="4" indexa="3" totalcountb="2" indexb="1" linewidth="none" widgetbid="2238" widgetaid="2221" xmi.id="2405" type="516" linecolor="none" > <linepath> - <startpoint startx="1196" starty="283" /> + <startpoint startx="1223" starty="237" /> <endpoint endx="1243" endy="688" /> </linepath> </assocwidget> - <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2235" widgetaid="2230" xmi.id="2408" linecolor="none" > + <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2235" widgetaid="2230" xmi.id="2408" type="516" linecolor="none" > <linepath> - <startpoint startx="270" starty="553" /> - <endpoint endx="280" endy="374" /> + <startpoint startx="240" starty="505" /> + <endpoint endx="279" endy="408" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2235" widgetaid="2223" xmi.id="2411" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2235" widgetaid="2223" xmi.id="2411" type="516" linecolor="none" > <linepath> - <startpoint startx="429" starty="223" /> - <endpoint endx="345" endy="221" /> + <startpoint startx="447" starty="196" /> + <endpoint endx="351" endy="247" /> + <point x="411" y="237" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2232" widgetaid="2236" xmi.id="2414" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2232" widgetaid="2236" xmi.id="2414" type="516" linecolor="none" > <linepath> <startpoint startx="774" starty="1178" /> <endpoint endx="840" endy="1178" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2232" widgetaid="2228" xmi.id="2417" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2232" widgetaid="2228" xmi.id="2417" type="516" linecolor="none" > <linepath> <startpoint startx="1012" starty="1166" /> <endpoint endx="966" endy="1178" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2234" widgetaid="2229" xmi.id="2420" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2234" widgetaid="2229" xmi.id="2420" type="516" linecolor="none" > <linepath> <startpoint startx="1485" starty="637" /> <endpoint endx="1491" endy="766" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2234" widgetaid="2238" xmi.id="2423" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2234" widgetaid="2238" xmi.id="2423" type="516" linecolor="none" > <linepath> <startpoint startx="1317" starty="805" /> <endpoint endx="1398" endy="802" /> </linepath> </assocwidget> - <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2231" widgetaid="2222" xmi.id="2426" linecolor="none" > + <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2231" widgetaid="2222" xmi.id="2426" type="516" linecolor="none" > <linepath> - <startpoint startx="254" starty="1159" /> + <startpoint startx="349" starty="1155" /> <endpoint endx="1090" endy="661" /> + <point x="517" y="1158" /> <point x="604" y="1163" /> <point x="852" y="983" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2220" widgetaid="2230" xmi.id="2429" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2220" widgetaid="2230" xmi.id="2429" type="516" linecolor="none" > <linepath> - <startpoint startx="337" starty="598" /> - <endpoint endx="481" endy="591" /> + <startpoint startx="307" starty="550" /> + <endpoint endx="419" endy="642" /> </linepath> </assocwidget> - <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2220" widgetaid="2221" xmi.id="2432" linecolor="none" > + <assocwidget totalcounta="3" indexa="2" totalcountb="3" indexb="1" linewidth="none" widgetbid="2220" widgetaid="2221" xmi.id="2432" type="516" linecolor="none" > <linepath> - <startpoint startx="1097" starty="235" /> - <endpoint endx="629" endy="591" /> + <startpoint startx="1124" starty="189" /> + <endpoint endx="570" endy="595" /> + <point x="865" y="446" /> </linepath> </assocwidget> - <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2220" widgetaid="2223" xmi.id="2435" linecolor="none" > + <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2220" widgetaid="2223" xmi.id="2435" type="516" linecolor="none" > <linepath> - <startpoint startx="497" starty="322" /> - <endpoint endx="555" endy="456" /> + <startpoint startx="526" starty="304" /> + <endpoint endx="494" endy="501" /> + <point x="531" y="343" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2465" widgetaid="2439" xmi.id="2472" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2465" widgetaid="2439" xmi.id="2472" type="516" linecolor="none" > <linepath> - <startpoint startx="820" starty="723" /> + <startpoint startx="868" starty="737" /> <endpoint endx="847" endy="663" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2439" widgetaid="2475" xmi.id="2488" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="2439" widgetaid="2475" xmi.id="2488" type="516" linecolor="none" > <linepath> - <startpoint startx="726" starty="912" /> - <endpoint endx="820" endy="813" /> + <startpoint startx="713" starty="928" /> + <endpoint endx="825" endy="797" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2475" widgetaid="2481" xmi.id="2491" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2475" widgetaid="2481" xmi.id="2491" type="516" linecolor="none" > <linepath> - <startpoint startx="581" starty="1070" /> - <endpoint endx="669" endy="966" /> + <startpoint startx="562" starty="936" /> + <endpoint endx="598" endy="928" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2439" widgetaid="2494" xmi.id="2498" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="2439" widgetaid="2494" xmi.id="2498" type="516" linecolor="none" > <linepath> - <startpoint startx="635" starty="852" /> - <endpoint endx="777" endy="768" /> + <startpoint startx="743" starty="767" /> + <endpoint endx="825" endy="767" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2494" widgetaid="2220" xmi.id="2501" linecolor="none" > + <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2494" widgetaid="2220" xmi.id="2501" type="516" linecolor="none" > <linepath> - <startpoint startx="555" starty="726" /> - <endpoint endx="562" endy="816" /> - <point x="594" y="712" /> + <startpoint startx="570" starty="689" /> + <endpoint endx="597" endy="767" /> + <point x="600" y="707" /> + <point x="602" y="723" /> + <point x="616" y="778" /> </linepath> </assocwidget> - <assocwidget totalcounta="4" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2465" widgetaid="2221" xmi.id="2504" linecolor="none" > + <assocwidget totalcounta="4" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2465" widgetaid="2221" xmi.id="2504" type="516" linecolor="none" > <linepath> - <startpoint startx="1130" starty="283" /> + <startpoint startx="1157" starty="237" /> <endpoint endx="847" endy="591" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="2222" widgetaid="2507" xmi.id="2522" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="2222" widgetaid="2507" xmi.id="2522" type="516" linecolor="none" > <linepath> - <startpoint startx="343" starty="1268" /> - <endpoint endx="254" endy="1231" /> + <startpoint startx="433" starty="1260" /> + <endpoint endx="349" endy="1227" /> </linepath> </assocwidget> </associations> @@ -679,10 +684,10 @@ </UML:Model> </XMI.content> <XMI.extensions xmi.extender="umbrello" > - <docsettings viewid="2219" documentation="" uniqueid="2524" /> + <docsettings viewid="2219" documentation="" uniqueid="G65NSl9svBYx" /> <listview> <listitem open="1" type="800" label="Vistas" > - <listitem open="1" type="801" id="1" > + <listitem open="0" type="801" id="1" > <listitem open="1" type="813" id="2244" /> <listitem open="1" type="813" id="2260" /> <listitem open="1" type="813" id="2241" /> @@ -722,6 +727,7 @@ <listitem open="1" type="821" id="4" /> <listitem open="1" type="827" id="5" /> <listitem open="1" type="836" id="6" > + <listitem open="1" type="832" id="UuQH9qA7RCrg" /> <listitem open="0" type="832" id="2220" > <listitem open="0" type="833" id="2239" /> <listitem open="0" type="833" id="2240" /> @@ -743,7 +749,7 @@ <listitem open="0" type="833" id="2467" /> <listitem open="0" type="833" id="2468" /> </listitem> - <listitem open="1" type="832" id="2481" > + <listitem open="0" type="832" id="2481" > <listitem open="0" type="833" id="2482" /> <listitem open="0" type="833" id="2483" /> <listitem open="0" type="833" id="2484" /> @@ -769,7 +775,7 @@ <listitem open="0" type="833" id="2463" /> <listitem open="0" type="833" id="2464" /> </listitem> - <listitem open="1" type="832" id="2507" > + <listitem open="0" type="832" id="2507" > <listitem open="0" type="833" id="2508" /> <listitem open="0" type="833" id="2509" /> <listitem open="0" type="833" id="2510" /> @@ -779,7 +785,7 @@ <listitem open="0" type="833" id="2514" /> <listitem open="0" type="833" id="2515" /> </listitem> - <listitem open="1" type="832" id="2221" > + <listitem open="0" type="832" id="2221" > <listitem open="0" type="833" id="2261" /> <listitem open="0" type="833" id="2262" /> <listitem open="0" type="833" id="2263" /> @@ -851,7 +857,7 @@ <listitem open="0" type="833" id="2345" /> <listitem open="0" type="833" id="2346" /> </listitem> - <listitem open="1" type="832" id="2494" > + <listitem open="0" type="832" id="2494" > <listitem open="0" type="833" id="2495" /> <listitem open="0" type="833" id="2496" /> <listitem open="0" type="833" id="2497" /> @@ -905,7 +911,7 @@ <listitem open="0" type="833" id="2348" /> <listitem open="0" type="833" id="2349" /> </listitem> - <listitem open="1" type="832" id="2475" > + <listitem open="0" type="832" id="2475" > <listitem open="0" type="833" id="2476" /> <listitem open="0" type="833" id="2477" /> <listitem open="0" type="833" id="2478" />

1 0

SVN Alba r5354 - prosistem/alba/trunk/alba/web/instalar
by commits＠pressenter.com.ar 26 Dec '07

26 Dec '07

Author: ftoledo Date: 2007-12-26 17:14:04 -0300 (Wed, 26 Dec 2007) New Revision: 5354 Modified: prosistem/alba/trunk/alba/web/instalar/funciones.php prosistem/alba/trunk/alba/web/instalar/paso1.php Log: comprobacion del directorio de informes y versiones de apache las funciones de apacha solo estan disponibles si se usa el php com omodulo de apache no asi en nla version cgi o suphp. Modified: prosistem/alba/trunk/alba/web/instalar/funciones.php =================================================================== --- prosistem/alba/trunk/alba/web/instalar/funciones.php 2007-12-26 19:12:06 UTC (rev 5353) +++ prosistem/alba/trunk/alba/web/instalar/funciones.php 2007-12-26 20:14:04 UTC (rev 5354) @@ -184,24 +184,31 @@ } function check_apache2() { DebugLog("Comprobando version de apache"); - $version = 0; - preg_match('!Apache/(.*) !U', apache_get_version(), $version); - return version_compare($version[1],'2.0.0','>='); - + if (extension_loaded('apache')) { + $version = 0; + preg_match('!Apache/(.*) !U', apache_get_version(), $version); + return version_compare($version[1],'2.0.0','>='); + } + else + return 0; } function check_rewrite() { DebugLog("Comprobando mod_rewrite"); - $modulos = apache_get_modules(); - if(count($modulos)>0) { - $res = array_search('mod_rewrite', $modulos); - if($res === false) { + if (extension_loaded('apache')) { + $modulos = apache_get_modules(); + if(count($modulos)>0) { + $res = array_search('mod_rewrite', $modulos); + if($res === false) { + return false; + } else { + return true; + } + } else { return false; - } else { - return true; } - } else { + } + else return false; - } } ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/web/instalar/paso1.php =================================================================== --- prosistem/alba/trunk/alba/web/instalar/paso1.php 2007-12-26 19:12:06 UTC (rev 5353) +++ prosistem/alba/trunk/alba/web/instalar/paso1.php 2007-12-26 20:14:04 UTC (rev 5354) @@ -39,6 +39,7 @@ 'web' . DIRECTORY_SEPARATOR . 'tmp', 'web' . DIRECTORY_SEPARATOR. 'uploads', 'web' . DIRECTORY_SEPARATOR. 'uploads' .DIRECTORY_SEPARATOR. 'assets', + 'web' . DIRECTORY_SEPARATOR. 'uploads' .DIRECTORY_SEPARATOR. 'informes', ); $alba_path = AlbaPath();

1 0

Re: [symfony-es] Re: haciendo un grafico en symfony
by josx 26 Dec '07

26 Dec '07

El Friday 21 December 2007 16:42:33 josx escribió: > El Friday 21 December 2007 10:38:43 Luciano A. Andrade escribió: > > El que más me gusta es http://ezcomponents.org/docs/tutorials/Graph es > > un poco dificil de usar al principio y algunas cosas no estan hechas > > aun (pero los graficos en 3d son muy lindas) > > > > http://ezcomponents.org/docs/tutorials/GraphDatabaseTiein puede ser lo > > que estes buscando pero nunca lo use. > > Parece ser una de las mejores. > Acá dejo un link de como integrarla al symfony: > http://www.thapole.net/coding/php/2007/08/27/symfony-ezcomponents-integrati >on/ > He empezado a usarla para el Proyecto ALBA, reemplazando la vieja clase de gráficos que usabamos. Aquí commit para ver como fue integrada: http://alba.pressenter.com.ar/cgi-bin/trac.cgi/changeset/5353 Aquí diff de como usamos esta clase para un gráfico de tortas: http://alba.pressenter.com.ar/cgi-bin/trac.cgi/changeset/5353#file716

1 0

[Pressenter - SVN Alba] #266: subject 1
by Pressenter - SVN Alba 26 Dec '07

26 Dec '07

#266: subject 1 -----------------------+---------------------------------------------------- Reporter: anonymous | Owner: somebody Type: defecto | Status: new Priority: normal | Milestone: version 1.0 Component: alba | Version: 1.0rc Severity: normal | Keywords: -----------------------+---------------------------------------------------- <a href= http://ahuennatest1.com >ahuenna test1</a> <a href= http://zaebatoepta1.com >zaebato epta1</a> -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/266> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba - Sistema Informático Abierto de Gestión Unificada para Unidades Educacionales

1 1

[Pressenter - SVN Alba] #263: xcovwctw
by Pressenter - SVN Alba 26 Dec '07

26 Dec '07

#263: xcovwctw -----------------------+---------------------------------------------------- Reporter: xcovwctw | Owner: ftoledo Type: mejora | Status: new Priority: muy alta | Milestone: version 1.0 Component: alba-demo | Version: Severity: critica | Keywords: 85702262 -----------------------+---------------------------------------------------- zybzkaok http://wdmnysox.com rgjiuczm djmnoopi [URL=http://uwsshtxx.com]nhezujnu[/URL] <a href="http://dbhautnj.com">rikjxlcq</a> -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/263> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba - Sistema Informático Abierto de Gestión Unificada para Unidades Educacionales

3 3