X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/blobdiff_plain/917fd3e4238a5d7c7d1d8a211da0e33db41cd384..3b8fb2bc8a04bba930f7744f6b16abdd6c7c7ae9:/diagramas/der.dia?ds=inline

diff --git a/diagramas/der.dia b/diagramas/der.dia
index ea19a34..299506d 100644
--- a/diagramas/der.dia
+++ b/diagramas/der.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.36051851511001587"/>
+          <dia:real val="0.36051854491233826"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -196,13 +196,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.45,8.5"/>
+        <dia:point val="38.85,6.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.4,8.45;51.9,18.15"/>
+        <dia:rectangle val="38.8,6.75;51.3,16.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="39.45,8.5"/>
+        <dia:point val="38.85,6.8"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="12.4"/>
@@ -1228,7 +1228,7 @@
         <dia:point val="1.5,-0.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.45,-0.9;9.85,5.6"/>
+        <dia:rectangle val="1.45,-0.9;9.85,4.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="1.5,-0.85"/>
@@ -1237,7 +1237,7 @@
         <dia:real val="8.3000000000000007"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="6.4000000000000004"/>
+        <dia:real val="5.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestador#</dia:string>
@@ -1410,29 +1410,6 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#idTelefono#</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>##</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:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#idDireccion#</dia:string>
@@ -1468,7 +1445,7 @@
         <dia:point val="33.525,-1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.475,-1.05;41.875,4.65"/>
+        <dia:rectangle val="33.475,-1.05;41.875,3.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="33.525,-1"/>
@@ -1477,7 +1454,7 @@
         <dia:real val="8.3000000000000007"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="5.5999999999999996"/>
+        <dia:real val="4.8000000000000007"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Cap#</dia:string>
@@ -1627,29 +1604,6 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#idTelefono#</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>##</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:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#idDireccion#</dia:string>
@@ -2060,13 +2014,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="50.415,-2.29"/>
+        <dia:point val="18.515,-1.74"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="50.365,-2.34;58.065,2.56"/>
+        <dia:rectangle val="18.465,-1.79;26.165,3.11"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="50.415,-2.29"/>
+        <dia:point val="18.515,-1.74"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -3246,16 +3200,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="50.415,2.01"/>
+        <dia:point val="26.115,2.56"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="41.775,-1.05;51.115,2.86"/>
+        <dia:rectangle val="26.065,-1.05;33.875,3.41"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="50.415,2.01"/>
-        <dia:point val="46.12,2.01"/>
-        <dia:point val="46.12,-0.3"/>
-        <dia:point val="41.825,-0.3"/>
+        <dia:point val="26.115,2.56"/>
+        <dia:point val="29.82,2.56"/>
+        <dia:point val="29.82,-0.3"/>
+        <dia:point val="33.525,-0.3"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3299,8 +3253,8 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O8" connection="14"/>
-        <dia:connection handle="1" to="O6" connection="4"/>
+        <dia:connection handle="0" to="O8" connection="15"/>
+        <dia:connection handle="1" to="O6" connection="3"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O16">
@@ -3482,7 +3436,7 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O38" connection="8"/>
+        <dia:connection handle="0" to="O33" connection="8"/>
         <dia:connection handle="1" to="O5" connection="3"/>
       </dia:connections>
     </dia:object>
@@ -3682,22 +3636,22 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.5008,-2.49249"/>
+        <dia:point val="20.8508,11.3575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.4508,-2.54249;28.4508,1.55751"/>
+        <dia:rectangle val="20.8008,11.3075;31.9508,19.4075"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="13.5008,-2.49249"/>
+        <dia:point val="20.8508,11.3575"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="14.9"/>
+        <dia:real val="11.049999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4"/>
+        <dia:real val="8"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#Telefono#</dia:string>
+        <dia:string>#Direccion#</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -3800,30 +3754,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#tipo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#enum(particular, laboral, celular)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Tipo de telefono.#</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:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#numero#</dia:string>
+            <dia:string>#calle#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#string#</dia:string>
@@ -3832,7 +3763,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Numero de telefono#</dia:string>
+            <dia:string>#Calle del domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -3844,143 +3775,18 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-      </dia:attribute>
-      <dia:attribute name="operations"/>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O21">
-      <dia:attribute name="obj_pos">
-        <dia:point val="20.8508,11.3575"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.8008,11.3075;31.9508,18.6075"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="20.8508,11.3575"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="11.049999999999999"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="7.1999999999999993"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#Direccion#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="comment">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="abstract">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_attributes">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_attributes">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_comments">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#id#</dia:string>
+            <dia:string>#numero#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
           </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>#PK#</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:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#calle#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
-          </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Calle del domicilio#</dia:string>
+            <dia:string>#Número del domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -3994,7 +3800,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#numero#</dia:string>
+            <dia:string>#piso#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
@@ -4003,7 +3809,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Número del domicilio#</dia:string>
+            <dia:string>#Piso del domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -4017,16 +3823,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#piso#</dia:string>
+            <dia:string>#departamento#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Piso del domicilio#</dia:string>
+            <dia:string>#Departamento del domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -4040,16 +3846,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#departamento#</dia:string>
+            <dia:string>#codigoPostal#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#string(8)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Departamento del domicilio#</dia:string>
+            <dia:string>#Código postal del domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -4063,16 +3869,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#codigoPostal#</dia:string>
+            <dia:string>#provincia#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string(8)#</dia:string>
+            <dia:string>#enum([provincias])#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Código postal del domicilio#</dia:string>
+            <dia:string>#Provincia donde se encuentra el domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -4086,16 +3892,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#provincia#</dia:string>
+            <dia:string>#telefono#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#enum([provincias])#</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Provincia donde se encuentra el domicilio#</dia:string>
+            <dia:string>#Teléfono del domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -4114,20 +3920,22 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O22">
+    <dia:object type="UML - Association" version="0" id="O21">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.996,7.53251"/>
+        <dia:point val="26.3758,19.3575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.946,6.78251;39.8,10.05"/>
+        <dia:rectangle val="26.3258,15.15;39.2,21.7575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.996,7.53251"/>
-        <dia:point val="35.223,7.53251"/>
-        <dia:point val="35.223,9.2"/>
-        <dia:point val="39.45,9.2"/>
+        <dia:point val="26.3758,19.3575"/>
+        <dia:point val="26.3758,20.3575"/>
+        <dia:point val="32.6129,20.3575"/>
+        <dia:point val="32.6129,15.9"/>
+        <dia:point val="38.85,15.9"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
@@ -4144,7 +3952,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4169,29 +3977,25 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O40" connection="11"/>
-        <dia:connection handle="1" to="O1" connection="3"/>
+        <dia:connection handle="0" to="O20" connection="6"/>
+        <dia:connection handle="1" to="O1" connection="26"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O23">
+    <dia:object type="UML - Association" version="0" id="O22">
       <dia:attribute name="obj_pos">
-        <dia:point val="26.3758,18.5575"/>
+        <dia:point val="5.65,4.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.3258,16.85;39.8,20.9575"/>
+        <dia:rectangle val="5.6,4.7;7.275,16.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="26.3758,18.5575"/>
-        <dia:point val="26.3758,19.5575"/>
-        <dia:point val="32.9129,19.5575"/>
-        <dia:point val="32.9129,17.6"/>
-        <dia:point val="39.45,17.6"/>
+        <dia:point val="5.65,4.75"/>
+        <dia:point val="5.65,15.75"/>
+        <dia:point val="6.925,15.75"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <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>
@@ -4219,7 +4023,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4230,73 +4034,16 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O21" connection="6"/>
-        <dia:connection handle="1" to="O1" connection="26"/>
+        <dia:connection handle="0" to="O5" connection="6"/>
+        <dia:connection handle="1" to="O7" connection="26"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O24">
+    <dia:object type="UML - Association" version="0" id="O23">
       <dia:attribute name="obj_pos">
-        <dia:point val="5.65,5.55"/>
+        <dia:point val="17.975,17.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.6,5.5;7.275,16.6"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="5.65,5.55"/>
-        <dia:point val="5.65,15.75"/>
-        <dia:point val="6.925,15.75"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <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>#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: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:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O5" connection="6"/>
-        <dia:connection handle="1" to="O7" connection="26"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O25">
-      <dia:attribute name="obj_pos">
-        <dia:point val="17.975,17.35"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.925,16.6;21.95,24.6"/>
+        <dia:rectangle val="17.925,16.6;21.95,24.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="17.975,17.35"/>
@@ -4353,80 +4100,18 @@
         <dia:connection handle="1" to="O2" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O26">
-      <dia:attribute name="obj_pos">
-        <dia:point val="33.525,3.3"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.3508,-2.54249;33.875,4.15"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="33.525,3.3"/>
-        <dia:point val="30.9629,3.3"/>
-        <dia:point val="30.9629,-1.79249"/>
-        <dia:point val="28.4008,-1.79249"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </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>#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: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="O6" connection="14"/>
-        <dia:connection handle="1" to="O20" connection="4"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O27">
+    <dia:object type="UML - Association" version="0" id="O24">
       <dia:attribute name="obj_pos">
         <dia:point val="31.9008,12.0575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.8508,3.35;33.875,12.9075"/>
+        <dia:rectangle val="31.8508,2.55;33.875,12.9075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="31.9008,12.0575"/>
         <dia:point val="32.7129,12.0575"/>
-        <dia:point val="32.7129,4.1"/>
-        <dia:point val="33.525,4.1"/>
+        <dia:point val="32.7129,3.3"/>
+        <dia:point val="33.525,3.3"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4470,11 +4155,11 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O21" connection="4"/>
-        <dia:connection handle="1" to="O6" connection="16"/>
+        <dia:connection handle="0" to="O20" connection="4"/>
+        <dia:connection handle="1" to="O6" connection="14"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O28">
+    <dia:object type="UML - Association" version="0" id="O25">
       <dia:attribute name="obj_pos">
         <dia:point val="47.615,35.35"/>
       </dia:attribute>
@@ -4533,69 +4218,7 @@
         <dia:connection handle="1" to="O2" connection="15"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O29">
-      <dia:attribute name="obj_pos">
-        <dia:point val="13.5008,-1.79249"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,-2.54249;13.8508,5.1"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="13.5008,-1.79249"/>
-        <dia:point val="12.025,-1.79249"/>
-        <dia:point val="12.025,4.25"/>
-        <dia:point val="9.8,4.25"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </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>#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: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="O20" connection="3"/>
-        <dia:connection handle="1" to="O5" connection="17"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O30">
+    <dia:object type="UML - Association" version="0" id="O26">
       <dia:attribute name="obj_pos">
         <dia:point val="12.45,17.85"/>
       </dia:attribute>
@@ -4659,17 +4282,17 @@
         <dia:connection handle="1" to="O10" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O31">
+    <dia:object type="UML - Association" version="0" id="O27">
       <dia:attribute name="obj_pos">
-        <dia:point val="51.85,18.1"/>
+        <dia:point val="51.25,16.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="46.565,18.05;52.55,31.4"/>
+        <dia:rectangle val="46.565,16.35;51.95,31.4"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="51.85,18.1"/>
-        <dia:point val="51.85,19.1"/>
-        <dia:point val="46.615,19.1"/>
+        <dia:point val="51.25,16.4"/>
+        <dia:point val="51.25,17.4"/>
+        <dia:point val="46.615,17.4"/>
         <dia:point val="46.615,30.55"/>
         <dia:point val="47.615,30.55"/>
       </dia:attribute>
@@ -4720,17 +4343,17 @@
         <dia:connection handle="1" to="O9" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O32">
+    <dia:object type="UML - Association" version="0" id="O28">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.45,16.8"/>
+        <dia:point val="38.85,15.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.625,4.55;39.8,17.65"/>
+        <dia:rectangle val="37.625,3.75;39.2,15.95"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="39.45,16.8"/>
-        <dia:point val="37.675,16.8"/>
-        <dia:point val="37.675,4.6"/>
+        <dia:point val="38.85,15.1"/>
+        <dia:point val="37.675,15.1"/>
+        <dia:point val="37.675,3.8"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4777,17 +4400,17 @@
         <dia:connection handle="1" to="O6" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O33">
+    <dia:object type="UML - Association" version="0" id="O29">
       <dia:attribute name="obj_pos">
         <dia:point val="30.25,24.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.2,18.05;46.35,25.8"/>
+        <dia:rectangle val="30.2,16.35;45.75,25.8"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="30.25,24.95"/>
-        <dia:point val="45.65,24.95"/>
-        <dia:point val="45.65,18.1"/>
+        <dia:point val="45.05,24.95"/>
+        <dia:point val="45.05,16.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4834,7 +4457,7 @@
         <dia:connection handle="1" to="O1" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O34">
+    <dia:object type="UML - Association" version="0" id="O30">
       <dia:attribute name="obj_pos">
         <dia:point val="20.915,36.5825"/>
       </dia:attribute>
@@ -4891,7 +4514,7 @@
         <dia:connection handle="1" to="O4" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O35">
+    <dia:object type="UML - Association" version="0" id="O31">
       <dia:attribute name="obj_pos">
         <dia:point val="-4.925,17.95"/>
       </dia:attribute>
@@ -4950,18 +4573,18 @@
         <dia:connection handle="1" to="O12" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O36">
+    <dia:object type="UML - Association" version="0" id="O32">
       <dia:attribute name="obj_pos">
         <dia:point val="20.8508,12.0575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,4.3;21.2008,12.9075"/>
+        <dia:rectangle val="9.75,3.5;21.2008,12.9075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.8508,12.0575"/>
         <dia:point val="20.175,12.0575"/>
-        <dia:point val="20.175,5.05"/>
-        <dia:point val="9.8,5.05"/>
+        <dia:point val="20.175,4.25"/>
+        <dia:point val="9.8,4.25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -5008,75 +4631,11 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O21" connection="3"/>
-        <dia:connection handle="1" to="O5" connection="19"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O37">
-      <dia:attribute name="obj_pos">
-        <dia:point val="54.215,-2.29"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,-3.34;54.915,0.7"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="54.215,-2.29"/>
-        <dia:point val="54.215,-3.29"/>
-        <dia:point val="11.075,-3.29"/>
-        <dia:point val="11.075,-0.15"/>
-        <dia:point val="9.8,-0.15"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </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>#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: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:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O8" connection="1"/>
-        <dia:connection handle="1" to="O5" connection="4"/>
+        <dia:connection handle="0" to="O20" connection="3"/>
+        <dia:connection handle="1" to="O5" connection="17"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O38">
+    <dia:object type="UML - Class" version="0" id="O33">
       <dia:attribute name="obj_pos">
         <dia:point val="-5.075,7.88251"/>
       </dia:attribute>
@@ -5224,12 +4783,12 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O39">
+    <dia:object type="UML - Association" version="0" id="O34">
       <dia:attribute name="obj_pos">
         <dia:point val="-5.075,10.5825"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.125,9.83251;4.425,16"/>
+        <dia:rectangle val="-6.125,9.8325;4.425,16"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.075,10.5825"/>
@@ -5283,225 +4842,20 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O38" connection="10"/>
+        <dia:connection handle="0" to="O33" connection="10"/>
         <dia:connection handle="1" to="O3" connection="4"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O40">
-      <dia:attribute name="obj_pos">
-        <dia:point val="21.996,4.83251"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.946,4.78251;31.046,8.08251"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="21.996,4.83251"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="9"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#TelefonoPersona#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="comment">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="abstract">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_attributes">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_attributes">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_comments">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="attributes">
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#idTelefono#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>#PK/FK#</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:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#idPersona#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>#PK/FK#</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:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O41">
-      <dia:attribute name="obj_pos">
-        <dia:point val="20.9508,1.50751"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.9008,1.45751;22.346,7.58251"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="20.9508,1.50751"/>
-        <dia:point val="20.9508,6.73251"/>
-        <dia:point val="21.996,6.73251"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <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>#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: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:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O20" connection="6"/>
-        <dia:connection handle="1" to="O40" connection="8"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O42">
+    <dia:object type="UML - Association" version="0" id="O35">
       <dia:attribute name="obj_pos">
-        <dia:point val="51.85,9.2"/>
+        <dia:point val="51.25,7.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="47.8651,8.45;58.7651,27.45"/>
+        <dia:rectangle val="47.8651,6.75;58.7651,27.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="51.85,9.2"/>
-        <dia:point val="58.7151,9.2"/>
+        <dia:point val="51.25,7.5"/>
+        <dia:point val="58.7151,7.5"/>
         <dia:point val="58.7151,21.2575"/>
         <dia:point val="47.9151,21.2575"/>
         <dia:point val="47.9151,26.6"/>
@@ -5558,7 +4912,7 @@
         <dia:connection handle="1" to="O0" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O43">
+    <dia:object type="UML - Association" version="0" id="O36">
       <dia:attribute name="obj_pos">
         <dia:point val="56.265,34.55"/>
       </dia:attribute>
@@ -5617,7 +4971,7 @@
         <dia:connection handle="1" to="O0" connection="4"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O44">
+    <dia:object type="UML - Association" version="0" id="O37">
       <dia:attribute name="obj_pos">
         <dia:point val="21.6,30.55"/>
       </dia:attribute>
@@ -5681,7 +5035,7 @@
         <dia:connection handle="1" to="O2" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O45">
+    <dia:object type="UML - Association" version="0" id="O38">
       <dia:attribute name="obj_pos">
         <dia:point val="30.25,31.05"/>
       </dia:attribute>
@@ -5740,5 +5094,64 @@
         <dia:connection handle="1" to="O19" connection="9"/>
       </dia:connections>
     </dia:object>
+    <dia:object type="UML - Association" version="0" id="O39">
+      <dia:attribute name="obj_pos">
+        <dia:point val="9.8,3.45"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="9.75,-1.79;18.865,4.3"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="9.8,3.45"/>
+        <dia:point val="14.1575,3.45"/>
+        <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="15"/>
+        <dia:connection handle="1" to="O8" connection="3"/>
+      </dia:connections>
+    </dia:object>
   </dia:layer>
 </dia:diagram>