X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/blobdiff_plain/33d534351554bb1a94b6e2e42b2626d5e2bd9480..c445dc2b8e6ea7784920423526632e6505d15ca8:/diagramas/der.dia

diff --git a/diagramas/der.dia b/diagramas/der.dia
index a16c914..dda56c0 100644
--- a/diagramas/der.dia
+++ b/diagramas/der.dia
@@ -504,7 +504,7 @@
             <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
-            <dia:string>#PK#</dia:string>
+            <dia:string>#FK#</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
@@ -528,13 +528,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="21.6,23.05"/>
+        <dia:point val="29.45,23.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.55,23;30.3,30.3"/>
+        <dia:rectangle val="29.4,23.7;38.15,31"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="21.6,23.05"/>
+        <dia:point val="29.45,23.75"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -791,19 +791,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O3">
       <dia:attribute name="obj_pos">
-        <dia:point val="-4.925,14.45"/>
+        <dia:point val="-4.975,17.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.975,14.4;3.425,18.5"/>
+        <dia:rectangle val="-5.025,17.6;3.375,22.5"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-4.925,14.45"/>
+        <dia:point val="-4.975,17.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.3000000000000007"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4"/>
+        <dia:real val="4.8000000000000007"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestacion#</dia:string>
@@ -930,6 +930,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#codigo#</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>#Código de prestación según el codificador#</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>#idCategoria#</dia:string>
@@ -1938,7 +1961,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#idCobertura#</dia:string>
+            <dia:string>#idPrestacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
@@ -2185,13 +2208,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="47.615,28.65"/>
+        <dia:point val="47.715,28.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="47.565,28.6;56.315,35.9"/>
+        <dia:rectangle val="47.665,28.1;56.415,35.4"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="47.615,28.65"/>
+        <dia:point val="47.715,28.15"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -2448,13 +2471,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="7.765,20.61"/>
+        <dia:point val="8.165,20.91"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.715,20.56;18.215,24.66"/>
+        <dia:rectangle val="8.115,20.86;18.615,24.96"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="7.765,20.61"/>
+        <dia:point val="8.165,20.91"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="10.4"/>
@@ -2619,19 +2642,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.885,28.57"/>
+        <dia:point val="-5.635,33.07"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.935,28.52;7.265,35.82"/>
+        <dia:rectangle val="-5.685,33.02;7.515,39.52"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5.885,28.57"/>
+        <dia:point val="-5.635,33.07"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="13.1"/>
       </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>#Cobertura#</dia:string>
@@ -2714,13 +2737,13 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#id#</dia:string>
+            <dia:string>#idPrestacion#</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:string>#FK#</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
@@ -2737,16 +2760,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#carencia#</dia:string>
+            <dia:string>#idPlan#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Tiempo#</dia:string>
+            <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
-            <dia:string>##</dia:string>
+            <dia:string>#FK#</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Antigüedad que debe tener el afiliado en el plan para ser cubierto. (años? meses?)#</dia:string>
+            <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -2760,16 +2783,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#porcentaje#</dia:string>
+            <dia:string>#carencia#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#Tiempo#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Porcentaje de la prestación cubierto.#</dia:string>
+            <dia:string>#Antigüedad que debe tener el afiliado en el plan para ser cubierto. (años? meses?)#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -2783,7 +2806,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#limiteAnual#</dia:string>
+            <dia:string>#porcentaje#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
@@ -2792,7 +2815,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Cantidad de prestaciones que se puede realizar por año (cero indica que no hay límite).#</dia:string>
+            <dia:string>#Porcentaje de la prestación cubierto.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -2806,16 +2829,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#tipoAutorizacion#</dia:string>
+            <dia:string>#limiteAnual#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#enum(manual,auto)#</dia:string>
+            <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Indica el tipo de autorización que necesita para realizarse la prestación.#</dia:string>
+            <dia:string>#Cantidad de prestaciones que se puede realizar por año (cero indica que no hay límite).#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -2829,39 +2852,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#idPrestacion#</dia:string>
+            <dia:string>#tipoAutorizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#enum(manual,auto)#</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>#idPlan#</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:string>#Indica el tipo de autorización que necesita para realizarse la prestación.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -2882,13 +2882,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="-3.685,22.32"/>
+        <dia:point val="-2.735,26.67"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.735,22.27;2.165,26.37"/>
+        <dia:rectangle val="-2.785,26.62;3.115,30.72"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-3.685,22.32"/>
+        <dia:point val="-2.735,26.67"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.7999999999999998"/>
@@ -3053,14 +3053,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="7.215,35.27"/>
+        <dia:point val="7.465,35.77"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.165,26.95;10.825,36.12"/>
+        <dia:rectangle val="7.415,26.95;10.825,36.62"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="7.215,35.27"/>
-        <dia:point val="8.96521,35.27"/>
+        <dia:point val="7.465,35.77"/>
+        <dia:point val="8.96521,35.77"/>
         <dia:point val="8.96521,27.7"/>
         <dia:point val="10.475,27.7"/>
       </dia:attribute>
@@ -3109,7 +3109,7 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O11" connection="21"/>
+        <dia:connection handle="0" to="O11" connection="11"/>
         <dia:connection handle="1" to="O4" connection="3"/>
       </dia:connections>
     </dia:object>
@@ -3118,13 +3118,13 @@
         <dia:point val="20.025,27.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.975,26.95;21.95,29.8"/>
+        <dia:rectangle val="19.975,26.95;29.8,30.5"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.025,27.7"/>
         <dia:point val="20.8125,27.7"/>
-        <dia:point val="20.8125,28.95"/>
-        <dia:point val="21.6,28.95"/>
+        <dia:point val="20.8125,29.65"/>
+        <dia:point val="29.45,29.65"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3236,16 +3236,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.885,34.47"/>
+        <dia:point val="-5.635,34.97"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.975,14.4;-4.575,35.32"/>
+        <dia:rectangle val="-6.975,17.6;-4.625,35.82"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-5.885,34.47"/>
-        <dia:point val="-6.925,34.47"/>
-        <dia:point val="-6.925,15.15"/>
-        <dia:point val="-4.925,15.15"/>
+        <dia:point val="-5.635,34.97"/>
+        <dia:point val="-6.925,34.97"/>
+        <dia:point val="-6.925,18.35"/>
+        <dia:point val="-4.975,18.35"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3292,21 +3292,21 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O11" connection="18"/>
+        <dia:connection handle="0" to="O11" connection="8"/>
         <dia:connection handle="1" to="O3" connection="3"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.075,9.78251"/>
+        <dia:point val="-5.125,10.9325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.125,-0.9;1.85,10.6325"/>
+        <dia:rectangle val="-6.175,-0.9;1.85,11.7825"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-5.075,9.78251"/>
-        <dia:point val="-6.075,9.78251"/>
-        <dia:point val="-6.075,-0.15"/>
+        <dia:point val="-5.125,10.9325"/>
+        <dia:point val="-6.125,10.9325"/>
+        <dia:point val="-6.125,-0.15"/>
         <dia:point val="1.5,-0.15"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -3357,13 +3357,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O18">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.915,33.8825"/>
+        <dia:point val="20.815,34.7325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.865,33.8325;29.965,38.7325"/>
+        <dia:rectangle val="20.765,34.6825;29.865,39.5825"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="20.915,33.8825"/>
+        <dia:point val="20.815,34.7325"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="9"/>
@@ -3958,13 +3958,13 @@
         <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;29.8,25.3"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="17.975,17.35"/>
         <dia:point val="19.515,17.35"/>
-        <dia:point val="19.515,23.75"/>
-        <dia:point val="21.6,23.75"/>
+        <dia:point val="19.515,24.45"/>
+        <dia:point val="29.45,24.45"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4076,16 +4076,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O24">
       <dia:attribute name="obj_pos">
-        <dia:point val="47.615,35.35"/>
+        <dia:point val="47.715,34.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.2,26.6;48.315,36.2"/>
+        <dia:rectangle val="38.05,27.3;48.415,35.7"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="47.615,35.35"/>
-        <dia:point val="38.9325,35.35"/>
-        <dia:point val="38.9325,27.35"/>
-        <dia:point val="30.25,27.35"/>
+        <dia:point val="47.715,34.85"/>
+        <dia:point val="42.9075,34.85"/>
+        <dia:point val="42.9075,28.05"/>
+        <dia:point val="38.1,28.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4138,14 +4138,14 @@
         <dia:point val="12.45,17.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.325,17.8;13.15,23.36"/>
+        <dia:rectangle val="6.325,17.8;13.15,23.66"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="12.45,17.85"/>
         <dia:point val="12.45,19.3325"/>
         <dia:point val="6.375,19.3325"/>
-        <dia:point val="6.375,22.51"/>
-        <dia:point val="7.765,22.51"/>
+        <dia:point val="6.375,22.81"/>
+        <dia:point val="8.165,22.81"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4202,14 +4202,14 @@
         <dia:point val="51.25,16.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="46.565,16.35;51.95,31.4"/>
+        <dia:rectangle val="46.665,16.35;51.95,30.9"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <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:point val="46.715,17.4"/>
+        <dia:point val="46.715,30.05"/>
+        <dia:point val="47.715,30.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4317,14 +4317,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O28">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.25,24.95"/>
+        <dia:point val="38.1,25.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.2,16.35;45.75,25.8"/>
+        <dia:rectangle val="38.05,16.35;45.75,26.5"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.25,24.95"/>
-        <dia:point val="45.05,24.95"/>
+        <dia:point val="38.1,25.65"/>
+        <dia:point val="45.05,25.65"/>
         <dia:point val="45.05,16.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -4374,14 +4374,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O29">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.915,36.5825"/>
+        <dia:point val="20.815,37.4325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.2,33.35;21.265,37.4325"/>
+        <dia:rectangle val="15.2,33.35;21.165,38.2825"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="20.915,36.5825"/>
-        <dia:point val="15.25,36.5825"/>
+        <dia:point val="20.815,37.4325"/>
+        <dia:point val="15.25,37.4325"/>
         <dia:point val="15.25,33.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -4431,16 +4431,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O30">
       <dia:attribute name="obj_pos">
-        <dia:point val="-4.925,17.95"/>
+        <dia:point val="-4.975,21.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.975,17.2;-3.335,23.87"/>
+        <dia:rectangle val="-6.025,21.2;-2.385,28.22"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-4.925,17.95"/>
-        <dia:point val="-5.925,17.95"/>
-        <dia:point val="-5.925,23.02"/>
-        <dia:point val="-3.685,23.02"/>
+        <dia:point val="-4.975,21.95"/>
+        <dia:point val="-5.975,21.95"/>
+        <dia:point val="-5.975,27.37"/>
+        <dia:point val="-2.735,27.37"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4484,7 +4484,7 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O3" connection="12"/>
+        <dia:connection handle="0" to="O3" connection="14"/>
         <dia:connection handle="1" to="O12" connection="3"/>
       </dia:connections>
     </dia:object>
@@ -4552,13 +4552,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O32">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.075,7.88251"/>
+        <dia:point val="-5.125,9.03251"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.125,7.83251;4.675,11.1325"/>
+        <dia:rectangle val="-5.175,8.98251;4.625,12.2825"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5.075,7.88251"/>
+        <dia:point val="-5.125,9.03251"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="9.6999999999999993"/>
@@ -4700,18 +4700,18 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O33">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.075,10.5825"/>
+        <dia:point val="-5.125,11.7325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.125,9.8325;4.425,16"/>
+        <dia:rectangle val="-6.175,10.9825;4.375,19.2"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-5.075,10.5825"/>
-        <dia:point val="-6.075,10.5825"/>
-        <dia:point val="-6.075,12.8663"/>
-        <dia:point val="4.375,12.8663"/>
-        <dia:point val="4.375,15.15"/>
-        <dia:point val="3.375,15.15"/>
+        <dia:point val="-5.125,11.7325"/>
+        <dia:point val="-6.125,11.7325"/>
+        <dia:point val="-6.125,15.0413"/>
+        <dia:point val="4.325,15.0413"/>
+        <dia:point val="4.325,18.35"/>
+        <dia:point val="3.325,18.35"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4829,14 +4829,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O35">
       <dia:attribute name="obj_pos">
-        <dia:point val="56.265,34.55"/>
+        <dia:point val="56.365,34.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="56.215,24.65;59.75,35.4"/>
+        <dia:rectangle val="56.315,24.65;59.75,34.9"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="56.265,34.55"/>
-        <dia:point val="59.65,34.55"/>
+        <dia:point val="56.365,34.05"/>
+        <dia:point val="59.65,34.05"/>
         <dia:point val="59.65,25.4"/>
         <dia:point val="58.65,25.4"/>
       </dia:attribute>
@@ -4888,17 +4888,17 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O36">
       <dia:attribute name="obj_pos">
-        <dia:point val="21.6,29.75"/>
+        <dia:point val="29.45,30.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.55,29;26.625,32.8575"/>
+        <dia:rectangle val="27.9501,29.7;34.475,33.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="21.6,29.75"/>
-        <dia:point val="20.6,29.75"/>
-        <dia:point val="20.6,32.8075"/>
-        <dia:point val="25.925,32.8075"/>
-        <dia:point val="25.925,30.25"/>
+        <dia:point val="29.45,30.45"/>
+        <dia:point val="28.0001,30.45"/>
+        <dia:point val="28.0001,32.8075"/>
+        <dia:point val="33.775,32.8075"/>
+        <dia:point val="33.775,30.95"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4952,19 +4952,17 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O37">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.25,30.25"/>
+        <dia:point val="38.1,30.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.865,29.5;38,36.6325"/>
+        <dia:rectangle val="29.765,30.9;38.8,37.4825"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.25,30.25"/>
-        <dia:point val="31.25,30.25"/>
-        <dia:point val="31.25,35.7825"/>
-        <dia:point val="29.915,35.7825"/>
+        <dia:point val="38.1,30.95"/>
+        <dia:point val="38.1,36.6325"/>
+        <dia:point val="29.815,36.6325"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
       </dia:attribute>
@@ -5068,5 +5066,66 @@
         <dia:connection handle="1" to="O8" connection="3"/>
       </dia:connections>
     </dia:object>
+    <dia:object type="UML - Association" version="0" id="O39">
+      <dia:attribute name="obj_pos">
+        <dia:point val="6.925,16.55"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-0.875,15.8;7.275,24.85"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="6.925,16.55"/>
+        <dia:point val="5.925,16.55"/>
+        <dia:point val="5.925,23.45"/>
+        <dia:point val="-0.825,23.45"/>
+        <dia:point val="-0.825,22.45"/>
+      </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="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="O7" connection="28"/>
+        <dia:connection handle="1" to="O3" connection="6"/>
+      </dia:connections>
+    </dia:object>
   </dia:layer>
 </dia:diagram>