* Pasos finales ... la pucha que esta query me hace renegar :D

[z.facultad/75.10/miklolife.git] / carpeta / diagramas / der.dia

diff --git a/carpeta/diagramas/der.dia b/carpeta/diagramas/der.dia
index 848f7dd5eb546455b8bdf9d8852e8ec940884881..702c4e403e10caf4bad51536cf0dbbfbc9237ae2 100644 (file)
--- a/carpeta/diagramas/der.dia
+++ b/carpeta/diagramas/der.dia
@@ -74,7 +74,7 @@
         <dia:point val="50,24.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="50,24.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="49.95,24.65;58.7,27.15"/>
+        <dia:rectangle val="49.95,24.65;58.7,27.95"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="50,24.7"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="50,24.7"/>


@@ -83,7 +83,7 @@
         <dia:real val="8.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="8.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="2.3999999999999999"/>
+        <dia:real val="3.2000000000000002"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Promotor#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Promotor#</dia:string>


@@ -187,6 +187,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>

+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#fechaBaja#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#DATE#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>

       </dia:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
       </dia:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">


@@ -199,7 +222,7 @@
         <dia:point val="38.75,6.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="38.75,6.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="38.7,6.9;51.3,16.6"/>
+        <dia:rectangle val="38.7,6.9;51.3,15.8"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="38.75,6.95"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="38.75,6.95"/>


@@ -208,7 +231,7 @@
         <dia:real val="12.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="12.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="9.5999999999999996"/>
+        <dia:real val="8.7999999999999989"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Persona#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Persona#</dia:string>


@@ -473,29 +496,6 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>

-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#idCap#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#INT#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>#FK#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#No puede ser NULL#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="1"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>

         <dia:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#idDireccion#</dia:string>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#idDireccion#</dia:string>


@@ -1251,7 +1251,7 @@
         <dia:point val="1.5,-0.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="1.5,-0.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="1.45,-0.9;9.85,6.4"/>
+        <dia:rectangle val="1.45,-0.9;9.85,5.6"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="1.5,-0.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="1.5,-0.85"/>


@@ -1260,7 +1260,7 @@
         <dia:real val="8.3000000000000007"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="8.3000000000000007"/>
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="7.1999999999999993"/>
+        <dia:real val="6.4000000000000004"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestador#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestador#</dia:string>


@@ -1435,19 +1435,19 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#idZona#</dia:string>
+            <dia:string>#email#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>#INT#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
           </dia:attribute>
           <dia:attribute name="value">

-            <dia:string>#FK#</dia:string>
+            <dia:string>##</dia:string>

           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>#No puede ser NULL#</dia:string>
+            <dia:string>#Mail del Presador, utilizado para informarle errores en sus archivos enviados #</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
           </dia:attribute>
           <dia:attribute name="visibility">

-            <dia:enum val="1"/>
+            <dia:enum val="3"/>

           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>


@@ -1479,29 +1479,6 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>

-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#email#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#VARCHAR(255)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Mail del Presador, utilizado para informarle errores en sus archivos enviados #</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>

       </dia:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
       </dia:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">


@@ -1514,13 +1491,13 @@
         <dia:point val="35.175,-1.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="35.175,-1.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="35.125,-1.25;44.925,4.45"/>
+        <dia:rectangle val="35.125,-1.25;43.525,4.45"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="35.175,-1.2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="35.175,-1.2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="9.6999999999999993"/>
+        <dia:real val="8.3000000000000007"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="5.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="5.5999999999999996"/>


@@ -1652,7 +1629,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#responsable#</dia:string>
+            <dia:string>#horario#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#VARCHAR(255)#</dia:string>


@@ -1661,7 +1638,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>#Nombre del responsable (gerente) del CAP.#</dia:string>
+            <dia:string>#Horario de atención como un texto libre.#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="3"/>


@@ -1675,16 +1652,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#horario#</dia:string>
+            <dia:string>#fechaBaja#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>#VARCHAR(255)#</dia:string>
+            <dia:string>#DATE#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>#Horario de atención como un texto libre.#</dia:string>
+            <dia:string>##</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="3"/>


@@ -2010,7 +1987,7 @@
             <dia:string>#tipo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#tipo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>#ENUMmanual,auto)#</dia:string>
+            <dia:string>#ENUM(manual,auto)#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>


@@ -2566,7 +2543,7 @@
         <dia:point val="8.165,20.91"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="8.165,20.91"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="8.115,20.86;18.615,24.96"/>
+        <dia:rectangle val="8.115,20.86;18.615,25.76"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="8.165,20.91"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="8.165,20.91"/>


@@ -2575,7 +2552,7 @@
         <dia:real val="10.4"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="10.4"/>
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="4"/>
+        <dia:real val="4.8000000000000007"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionManual#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionManual#</dia:string>


@@ -2725,6 +2702,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>

+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#nroLegajo#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#int#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#El nro de legajo del auditor medico que resolvio (apruebo/rechazo) la autorizacion.#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="3"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>

       </dia:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
       </dia:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">


@@ -3466,7 +3466,7 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
         </dia:composite>
       </dia:attribute>
       <dia:connections>

-        <dia:connection handle="0" to="O32" connection="8"/>
+        <dia:connection handle="0" to="O31" connection="8"/>

         <dia:connection handle="1" to="O5" connection="3"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O5" connection="3"/>
       </dia:connections>
     </dia:object>


@@ -3666,19 +3666,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O19">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O19">
       <dia:attribute name="obj_pos">

-        <dia:point val="22.4508,10.7575"/>
+        <dia:point val="25.0508,10.5575"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="22.4008,10.7075;33.6008,18.8075"/>
+        <dia:rectangle val="25.0008,10.5075;36.2008,19.4075"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">

-        <dia:point val="22.4508,10.7575"/>
+        <dia:point val="25.0508,10.5575"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.1"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.1"/>
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="8"/>
+        <dia:real val="8.7999999999999989"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Direccion#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Direccion#</dia:string>


@@ -3943,6 +3943,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>

+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#idZona#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#INT = FK#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="1"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>

       </dia:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
       </dia:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">


@@ -3952,17 +3975,17 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O20">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O20">
       <dia:attribute name="obj_pos">

-        <dia:point val="28.0008,18.7575"/>
+        <dia:point val="30.6008,19.3575"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="27.9508,15.25;39.1,21.1575"/>
+        <dia:rectangle val="30.5508,14.45;39.1,21.7575"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="28.0008,18.7575"/>
-        <dia:point val="28.0008,20.3575"/>
+        <dia:point val="30.6008,19.3575"/>
+        <dia:point val="30.6008,20.3575"/>

         <dia:point val="36.875,20.3575"/>
         <dia:point val="36.875,20.3575"/>

-        <dia:point val="36.875,16.05"/>
-        <dia:point val="38.75,16.05"/>
+        <dia:point val="36.875,15.25"/>
+        <dia:point val="38.75,15.25"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>


@@ -4011,18 +4034,18 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O19" connection="6"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O19" connection="6"/>

-        <dia:connection handle="1" to="O1" connection="26"/>
+        <dia:connection handle="1" to="O1" connection="24"/>

       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O21">
       <dia:attribute name="obj_pos">
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O21">
       <dia:attribute name="obj_pos">

-        <dia:point val="5.65,6.35"/>
+        <dia:point val="5.65,5.55"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="5.6,6.3;7.825,16.55"/>
+        <dia:rectangle val="5.6,5.5;7.825,16.55"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="5.65,6.35"/>
+        <dia:point val="5.65,5.55"/>

         <dia:point val="5.65,15.75"/>
         <dia:point val="7.475,15.75"/>
       </dia:attribute>
         <dia:point val="5.65,15.75"/>
         <dia:point val="7.475,15.75"/>
       </dia:attribute>


@@ -4073,13 +4096,13 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O22">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O22">
       <dia:attribute name="obj_pos">

-        <dia:point val="20.675,17.35"/>
+        <dia:point val="20.625,17.35"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="20.625,16.55;29.8,25.25"/>
+        <dia:rectangle val="20.575,16.55;29.8,25.25"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="20.675,17.35"/>
+        <dia:point val="20.625,17.35"/>

         <dia:point val="21.8706,17.35"/>
         <dia:point val="21.8706,24.45"/>
         <dia:point val="29.45,24.45"/>
         <dia:point val="21.8706,17.35"/>
         <dia:point val="21.8706,24.45"/>
         <dia:point val="29.45,24.45"/>


@@ -4135,21 +4158,25 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O23">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O23">
       <dia:attribute name="obj_pos">

-        <dia:point val="33.5508,11.4575"/>
+        <dia:point val="36.1508,11.2575"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="33.5008,3.1;35.525,12.2575"/>
+        <dia:rectangle val="34.125,3.1;37.2008,12.0575"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="33.5508,11.4575"/>
-        <dia:point val="34.3629,11.4575"/>
-        <dia:point val="34.3629,3.9"/>
+        <dia:point val="36.1508,11.2575"/>
+        <dia:point val="37.1508,11.2575"/>
+        <dia:point val="37.1508,7.57875"/>
+        <dia:point val="34.175,7.57875"/>
+        <dia:point val="34.175,3.9"/>

         <dia:point val="35.175,3.9"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:point val="35.175,3.9"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>

+        <dia:enum val="1"/>
+        <dia:enum val="0"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>


@@ -4256,14 +4283,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O25">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O25">
       <dia:attribute name="obj_pos">

-        <dia:point val="14.075,17.85"/>
+        <dia:point val="14.05,17.85"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="6.325,17.8;14.775,23.61"/>
+        <dia:rectangle val="6.325,17.8;14.75,23.61"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="14.075,17.85"/>
-        <dia:point val="14.075,19.3325"/>
+        <dia:point val="14.05,17.85"/>
+        <dia:point val="14.05,19.3325"/>

         <dia:point val="6.375,19.3325"/>
         <dia:point val="6.375,22.81"/>
         <dia:point val="8.165,22.81"/>
         <dia:point val="6.375,19.3325"/>
         <dia:point val="6.375,22.81"/>
         <dia:point val="8.165,22.81"/>


@@ -4320,13 +4347,13 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O26">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O26">
       <dia:attribute name="obj_pos">

-        <dia:point val="51.2,16.55"/>
+        <dia:point val="51.2,15.75"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="46.0501,16.5;51.9,34.45"/>
+        <dia:rectangle val="46.0501,15.7;51.9,34.45"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="51.2,16.55"/>
+        <dia:point val="51.2,15.75"/>

         <dia:point val="51.2,19.46"/>
         <dia:point val="46.1001,19.46"/>
         <dia:point val="46.1001,33.65"/>
         <dia:point val="51.2,19.46"/>
         <dia:point val="46.1001,19.46"/>
         <dia:point val="46.1001,33.65"/>


@@ -4383,80 +4410,16 @@
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O27">
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O27">

-      <dia:attribute name="obj_pos">
-        <dia:point val="38.75,15.25"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.7,4.35;40.725,16.05"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="38.75,15.25"/>
-        <dia:point val="37.75,15.25"/>
-        <dia:point val="37.75,6.06"/>
-        <dia:point val="40.025,6.06"/>
-        <dia:point val="40.025,4.4"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O1" connection="24"/>
-        <dia:connection handle="1" to="O6" connection="6"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O28">

       <dia:attribute name="obj_pos">
         <dia:point val="38.1,25.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       <dia:attribute name="obj_pos">
         <dia:point val="38.1,25.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="38.05,16.5;45.675,26.45"/>
+        <dia:rectangle val="38.05,15.7;45.675,26.45"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="38.1,25.65"/>
         <dia:point val="44.975,25.65"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="38.1,25.65"/>
         <dia:point val="44.975,25.65"/>

-        <dia:point val="44.975,16.55"/>
+        <dia:point val="44.975,15.75"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>


@@ -4503,7 +4466,7 @@
         <dia:connection handle="1" to="O1" connection="6"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O1" connection="6"/>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Association" version="0" id="O29">
+    <dia:object type="UML - Association" version="0" id="O28">

       <dia:attribute name="obj_pos">
         <dia:point val="20.815,37.4325"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
         <dia:point val="20.815,37.4325"/>
       </dia:attribute>


@@ -4560,7 +4523,7 @@
         <dia:connection handle="1" to="O4" connection="6"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O4" connection="6"/>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Association" version="0" id="O30">
+    <dia:object type="UML - Association" version="0" id="O29">

       <dia:attribute name="obj_pos">
         <dia:point val="-4.975,22.75"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
         <dia:point val="-4.975,22.75"/>
       </dia:attribute>


@@ -4619,16 +4582,16 @@
         <dia:connection handle="1" to="O12" connection="3"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O12" connection="3"/>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Association" version="0" id="O31">
+    <dia:object type="UML - Association" version="0" id="O30">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="22.4508,11.4575"/>
+        <dia:point val="25.0508,11.2575"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="9.75,4.25;22.8008,12.2575"/>
+        <dia:rectangle val="9.75,4.25;25.4008,12.0575"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="22.4508,11.4575"/>
-        <dia:point val="21.7206,11.4575"/>
+        <dia:point val="25.0508,11.2575"/>
+        <dia:point val="21.7206,11.2575"/>

         <dia:point val="21.7206,5.05"/>
         <dia:point val="9.8,5.05"/>
       </dia:attribute>
         <dia:point val="21.7206,5.05"/>
         <dia:point val="9.8,5.05"/>
       </dia:attribute>


@@ -4681,7 +4644,7 @@
         <dia:connection handle="1" to="O5" connection="19"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O5" connection="19"/>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Class" version="0" id="O32">
+    <dia:object type="UML - Class" version="0" id="O31">

       <dia:attribute name="obj_pos">
         <dia:point val="-5.125,9.03251"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
         <dia:point val="-5.125,9.03251"/>
       </dia:attribute>


@@ -4829,7 +4792,7 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>

-    <dia:object type="UML - Association" version="0" id="O33">
+    <dia:object type="UML - Association" version="0" id="O32">

       <dia:attribute name="obj_pos">
         <dia:point val="-5.125,11.7325"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
         <dia:point val="-5.125,11.7325"/>
       </dia:attribute>


@@ -4888,11 +4851,11 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
         </dia:composite>
       </dia:attribute>
       <dia:connections>

-        <dia:connection handle="0" to="O32" connection="10"/>
+        <dia:connection handle="0" to="O31" connection="10"/>

         <dia:connection handle="1" to="O3" connection="4"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O3" connection="4"/>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Association" version="0" id="O34">
+    <dia:object type="UML - Association" version="0" id="O33">

       <dia:attribute name="obj_pos">
         <dia:point val="51.2,7.65"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
         <dia:point val="51.2,7.65"/>
       </dia:attribute>


@@ -4958,7 +4921,7 @@
         <dia:connection handle="1" to="O0" connection="8"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O0" connection="8"/>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Association" version="0" id="O35">
+    <dia:object type="UML - Association" version="0" id="O34">

       <dia:attribute name="obj_pos">
         <dia:point val="58.415,37.65"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
         <dia:point val="58.415,37.65"/>
       </dia:attribute>


@@ -5017,7 +4980,7 @@
         <dia:connection handle="1" to="O0" connection="4"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O0" connection="4"/>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Association" version="0" id="O36">
+    <dia:object type="UML - Association" version="0" id="O35">

       <dia:attribute name="obj_pos">
         <dia:point val="29.45,30.45"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
         <dia:point val="29.45,30.45"/>
       </dia:attribute>


@@ -5081,7 +5044,7 @@
         <dia:connection handle="1" to="O2" connection="6"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O2" connection="6"/>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Association" version="0" id="O37">
+    <dia:object type="UML - Association" version="0" id="O36">

       <dia:attribute name="obj_pos">
         <dia:point val="38.1,30.95"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
         <dia:point val="38.1,30.95"/>
       </dia:attribute>


@@ -5138,66 +5101,7 @@
         <dia:connection handle="1" to="O18" connection="9"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O18" connection="9"/>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Association" version="0" id="O38">
-      <dia:attribute name="obj_pos">
-        <dia:point val="9.8,4.25"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,-1.84;18.865,5.05"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="9.8,4.25"/>
-        <dia:point val="14.1575,4.25"/>
-        <dia:point val="14.1575,-1.04"/>
-        <dia:point val="18.515,-1.04"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O5" connection="17"/>
-        <dia:connection handle="1" to="O8" connection="3"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O39">
+    <dia:object type="UML - Association" version="0" id="O37">

       <dia:attribute name="obj_pos">
         <dia:point val="7.475,16.55"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
         <dia:point val="7.475,16.55"/>
       </dia:attribute>


@@ -5261,7 +5165,7 @@
         <dia:connection handle="1" to="O3" connection="6"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O3" connection="6"/>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Note" version="0" id="O40">
+    <dia:object type="UML - Note" version="0" id="O38">

       <dia:attribute name="obj_pos">
         <dia:point val="45.7001,-1.415"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
         <dia:point val="45.7001,-1.415"/>
       </dia:attribute>


@@ -5313,5 +5217,62 @@ antecede un signo + y las FK un -.#</dia:string>
         </dia:composite>
       </dia:attribute>
     </dia:object>
         </dia:composite>
       </dia:attribute>
     </dia:object>

+    <dia:object type="UML - Association" version="0" id="O39">
+      <dia:attribute name="obj_pos">
+        <dia:point val="25.0508,18.8575"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="23.315,3.01;25.4008,19.6575"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="25.0508,18.8575"/>
+        <dia:point val="23.365,18.8575"/>
+        <dia:point val="23.365,3.06"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#*#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O19" connection="24"/>
+        <dia:connection handle="1" to="O8" connection="6"/>
+      </dia:connections>
+    </dia:object>

   </dia:layer>
 </dia:diagram>
   </dia:layer>
 </dia:diagram>