X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/blobdiff_plain/c6bcdd5130dc423ca1f574d63ad7ecf3e3cf1774..26985d6b9b80aa9f75c4b08a5a3d69ce514c0ae2:/carpeta/diagramas/der.dia?ds=sidebyside

diff --git a/carpeta/diagramas/der.dia b/carpeta/diagramas/der.dia
index 98f5ab0..0b5a18d 100644
--- 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: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"/>
@@ -83,7 +83,7 @@
         <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>
@@ -187,6 +187,29 @@
             <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">
@@ -199,16 +222,16 @@
         <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.25,15.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="38.75,6.95"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="12.5"/>
+        <dia:real val="12.449999999999999"/>
       </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>
@@ -473,29 +496,6 @@
             <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>
@@ -1251,7 +1251,7 @@
         <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"/>
@@ -1260,7 +1260,7 @@
         <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>
@@ -1435,19 +1435,19 @@
         </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:string>#INT#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
-            <dia:string>#FK#</dia:string>
+            <dia:string>##</dia:string>
           </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:enum val="1"/>
+            <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1479,29 +1479,6 @@
             <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">
@@ -1514,16 +1491,16 @@
         <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,5.25"/>
       </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:real val="6.4000000000000004"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Cap#</dia:string>
@@ -1652,7 +1629,7 @@
         </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>
@@ -1661,7 +1638,7 @@
             <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"/>
@@ -1675,19 +1652,19 @@
         </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: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: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:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1719,6 +1696,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#idPersona#</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>#Nombre del responsable (gerente) del CAP.#</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">
@@ -1731,13 +1731,13 @@
         <dia:point val="7.475,6.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.425,6.6;20.725,17.9"/>
+        <dia:rectangle val="7.425,6.6;20.675,17.9"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="7.475,6.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="13.199999999999999"/>
+        <dia:real val="13.15"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="11.200000000000001"/>
@@ -2010,7 +2010,7 @@
             <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>
@@ -2760,13 +2760,13 @@
         <dia:point val="-5.635,33.07"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.685,33.02;7.615,39.52"/>
+        <dia:rectangle val="-5.685,33.02;7.565,39.52"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-5.635,33.07"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="13.199999999999999"/>
+        <dia:real val="13.15"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="6.4000000000000004"/>
@@ -3000,13 +3000,13 @@
         <dia:point val="-2.735,26.67"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.785,26.62;5.265,31.52"/>
+        <dia:rectangle val="-2.785,26.62;5.215,31.52"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-2.735,26.67"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="7.9499999999999993"/>
+        <dia:real val="7.8999999999999995"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
@@ -3194,7 +3194,7 @@
         <dia:point val="7.565,35.77"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.515,26.9;10.825,36.57"/>
+        <dia:rectangle val="7.515,26.95;10.825,36.62"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="7.565,35.77"/>
@@ -3256,7 +3256,7 @@
         <dia:point val="20.175,27.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.125,26.9;29.8,30.45"/>
+        <dia:rectangle val="20.125,26.95;29.8,30.5"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.175,27.7"/>
@@ -3318,7 +3318,7 @@
         <dia:point val="28.215,2.56"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.165,-1.3;35.525,3.36"/>
+        <dia:rectangle val="28.165,-1.25;35.525,3.41"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="28.215,2.56"/>
@@ -3377,7 +3377,7 @@
         <dia:point val="-5.635,34.97"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.975,17.55;-4.625,35.77"/>
+        <dia:rectangle val="-6.975,17.6;-4.625,35.82"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.635,34.97"/>
@@ -3439,7 +3439,7 @@
         <dia:point val="-5.125,10.9325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.175,-0.95;1.85,11.7325"/>
+        <dia:rectangle val="-6.175,-0.9;1.85,11.7825"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.125,10.9325"/>
@@ -3489,7 +3489,7 @@
         </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>
@@ -3692,7 +3692,7 @@
         <dia:point val="22.4508,10.7575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="22.4008,10.7075;33.6008,18.8075"/>
+        <dia:rectangle val="22.4008,10.7075;33.6008,19.6075"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="22.4508,10.7575"/>
@@ -3701,7 +3701,7 @@
         <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>
@@ -3966,6 +3966,29 @@
             <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="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">
@@ -3975,17 +3998,17 @@
     </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="28.0008,19.5575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.9508,15.25;39.1,21.1575"/>
+        <dia:rectangle val="27.9508,14.5;39.1,21.9575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="28.0008,18.7575"/>
+        <dia:point val="28.0008,19.5575"/>
         <dia:point val="28.0008,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"/>
@@ -4034,18 +4057,18 @@
       </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:point val="5.65,6.35"/>
+        <dia:point val="5.65,5.55"/>
       </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.6"/>
       </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>
@@ -4096,13 +4119,13 @@
     </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:rectangle val="20.625,16.55;29.8,25.25"/>
+        <dia:rectangle val="20.575,16.6;29.8,25.3"/>
       </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"/>
@@ -4161,7 +4184,7 @@
         <dia:point val="33.5508,11.4575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.5008,3.1;35.525,12.2575"/>
+        <dia:rectangle val="33.5008,3.15;35.525,12.3075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="33.5508,11.4575"/>
@@ -4220,7 +4243,7 @@
         <dia:point val="47.665,38.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.05,27.25;48.365,39.25"/>
+        <dia:rectangle val="38.05,27.3;48.365,39.3"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="47.665,38.45"/>
@@ -4279,14 +4302,14 @@
     </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:rectangle val="6.325,17.8;14.775,23.61"/>
+        <dia:rectangle val="6.325,17.8;14.75,23.66"/>
       </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"/>
@@ -4343,13 +4366,13 @@
     </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:rectangle val="46.0501,16.5;51.9,34.45"/>
+        <dia:rectangle val="46.0501,15.7;51.9,34.5"/>
       </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"/>
@@ -4406,80 +4429,16 @@
       </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:rectangle val="38.05,16.5;45.675,26.45"/>
+        <dia:rectangle val="38.05,15.7;45.675,26.5"/>
       </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"/>
@@ -4526,12 +4485,12 @@
         <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_bb">
-        <dia:rectangle val="15.275,33.35;21.165,38.2325"/>
+        <dia:rectangle val="15.275,33.35;21.165,38.2825"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.815,37.4325"/>
@@ -4583,12 +4542,12 @@
         <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_bb">
-        <dia:rectangle val="-6.025,21.95;-2.385,28.17"/>
+        <dia:rectangle val="-6.025,22;-2.385,28.22"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4.975,22.75"/>
@@ -4642,12 +4601,12 @@
         <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:point val="22.4508,11.4575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,4.25;22.8008,12.2575"/>
+        <dia:rectangle val="9.75,4.3;22.8008,12.3075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="22.4508,11.4575"/>
@@ -4704,7 +4663,7 @@
         <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>
@@ -4852,12 +4811,12 @@
       </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_bb">
-        <dia:rectangle val="-6.175,10.9325;4.375,19.15"/>
+        <dia:rectangle val="-6.175,10.9825;4.375,19.2"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.125,11.7325"/>
@@ -4911,16 +4870,16 @@
         </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: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_bb">
-        <dia:rectangle val="47.8651,6.85;58.7651,27.4"/>
+        <dia:rectangle val="47.8651,6.9;58.7651,27.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="51.2,7.65"/>
@@ -4981,12 +4940,12 @@
         <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_bb">
-        <dia:rectangle val="58.365,24.6;59.75,38.45"/>
+        <dia:rectangle val="58.365,24.65;59.75,38.5"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="58.415,37.65"/>
@@ -5040,12 +4999,12 @@
         <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_bb">
-        <dia:rectangle val="27.9501,29.65;34.475,33.35"/>
+        <dia:rectangle val="27.9501,29.7;34.475,33.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="29.45,30.45"/>
@@ -5104,12 +5063,12 @@
         <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_bb">
-        <dia:rectangle val="29.765,30.9;38.8,37.4325"/>
+        <dia:rectangle val="29.765,30.9;38.8,37.4825"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="38.1,30.95"/>
@@ -5161,23 +5120,28 @@
         <dia:connection handle="1" to="O18" connection="9"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O38">
+    <dia:object type="UML - Association" version="0" id="O37">
       <dia:attribute name="obj_pos">
-        <dia:point val="9.8,4.25"/>
+        <dia:point val="7.475,16.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,-1.84;18.865,5.05"/>
+        <dia:rectangle val="-0.875,15.8;7.825,25.65"/>
       </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:point val="7.475,16.55"/>
+        <dia:point val="5.40453,16.55"/>
+        <dia:point val="5.40453,24.25"/>
+        <dia:point val="-0.825,24.25"/>
+        <dia:point val="-0.825,23.25"/>
       </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>
@@ -5216,33 +5180,80 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O5" connection="17"/>
-        <dia:connection handle="1" to="O8" connection="3"/>
+        <dia:connection handle="0" to="O7" connection="28"/>
+        <dia:connection handle="1" to="O3" connection="6"/>
       </dia:connections>
     </dia:object>
+    <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_bb">
+        <dia:rectangle val="45.6501,-1.465;59.5501,5.935"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="45.7001,-1.415"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="13.800000000000001"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="7.3000000000000007"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_colour">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#Las claves primarias naturales se
+representan con un # (el conjunto de
+atributos marcados con # en una tabla
+componen la clave primaria natural).
+Cada tabla tiene un indice compuesto
+por estos atributos.
+Para mejor legibilidad, a las PK las
+antecede un signo + y las FK un -.#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="monospace" style="0" name="Courier"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="46.0501,-0.165"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+    </dia:object>
     <dia:object type="UML - Association" version="0" id="O39">
       <dia:attribute name="obj_pos">
-        <dia:point val="7.475,16.55"/>
+        <dia:point val="28.0008,10.7575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-0.875,15.75;7.825,25.65"/>
+        <dia:rectangle val="23.315,3.01;28.7008,12.3575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="7.475,16.55"/>
-        <dia:point val="5.40453,16.55"/>
-        <dia:point val="5.40453,24.25"/>
-        <dia:point val="-0.825,24.25"/>
-        <dia:point val="-0.825,23.25"/>
+        <dia:point val="28.0008,10.7575"/>
+        <dia:point val="28.0008,6.90875"/>
+        <dia:point val="23.365,6.90875"/>
+        <dia:point val="23.365,3.06"/>
       </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>
@@ -5280,61 +5291,73 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O7" connection="28"/>
-        <dia:connection handle="1" to="O3" connection="6"/>
+        <dia:connection handle="0" to="O19" connection="1"/>
+        <dia:connection handle="1" to="O8" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Note" version="0" id="O40">
+    <dia:object type="UML - Association" version="0" id="O40">
       <dia:attribute name="obj_pos">
-        <dia:point val="45.7001,-1.415"/>
+        <dia:point val="38.75,10.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="45.6501,-1.465;59.6001,5.935"/>
+        <dia:rectangle val="37.7,5.15;41.075,11.3"/>
       </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="45.7001,-1.415"/>
+      <dia:attribute name="orth_points">
+        <dia:point val="38.75,10.45"/>
+        <dia:point val="37.75,10.45"/>
+        <dia:point val="37.75,6.21"/>
+        <dia:point val="39.325,6.21"/>
+        <dia:point val="39.325,5.2"/>
       </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="13.85"/>
+      <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="elem_height">
-        <dia:real val="7.2999999999999998"/>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
       </dia:attribute>
-      <dia:attribute name="line_colour">
-        <dia:color val="#000000"/>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
       </dia:attribute>
-      <dia:attribute name="fill_colour">
-        <dia:color val="#ffffff"/>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
       </dia:attribute>
-      <dia:attribute name="text">
-        <dia:composite type="text">
-          <dia:attribute name="string">
-            <dia:string>#Las claves primarias naturales se
-representan con un # (el conjunto de
-atributos marcados con # en una tabla
-componen la clave primaria natural).
-Cada tabla tiene un indice compuesto
-por estos atributos.
-Para mejor legibilidad, a las PK las
-antecede un signo + y las FK un -.#</dia:string>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
           </dia:attribute>
-          <dia:attribute name="font">
-            <dia:font family="monospace" style="0" name="Courier"/>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
           </dia:attribute>
-          <dia:attribute name="height">
-            <dia:real val="0.80000000000000004"/>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="pos">
-            <dia:point val="46.0501,-0.215"/>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
           </dia:attribute>
-          <dia:attribute name="color">
-            <dia:color val="#000000"/>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
           </dia:attribute>
-          <dia:attribute name="alignment">
+          <dia:attribute name="multiplicity">
+            <dia:string>#0..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="12"/>
+        <dia:connection handle="1" to="O6" connection="6"/>
+      </dia:connections>
     </dia:object>
   </dia:layer>
 </dia:diagram>