From: Leandro Lucarella <llucax@gmail.com>
Date: Fri, 29 Apr 2005 03:31:53 +0000 (+0000)
Subject: - Se pone la relación entre Autorizacion y Prestacion que faltaba.
X-Git-Tag: svn_import~562
X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/commitdiff_plain/915df7528e6ddeb7c67a24ab9f2fb12286763c7e?ds=sidebyside

- Se pone la relación entre Autorizacion y Prestacion que faltaba.
- Se corrije Persona.idDireccion como FK.
---

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index cb9ab87..a5eccf0 100644
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -632,16 +632,16 @@
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.875,13;1.025,15.5"/>
+        <dia:rectangle val="-4.875,13;1.075,16.3"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="5.7999999999999998"/>
+        <dia:real val="5.8499999999999996"/>
       </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>#Prestacion#</dia:string>
@@ -722,6 +722,29 @@
         <dia:real val="1"/>
       </dia:attribute>
       <dia:attribute name="attributes">
+        <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 la 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>#nombre#</dia:string>
@@ -754,13 +777,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O4">
       <dia:attribute name="obj_pos">
-        <dia:point val="10.475,25.8"/>
+        <dia:point val="11.125,26.9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.425,25.75;20.075,31.45"/>
+        <dia:rectangle val="11.075,26.85;20.725,32.55"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="10.475,25.8"/>
+        <dia:point val="11.125,26.9"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="9.5499999999999989"/>
@@ -971,13 +994,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.1,2.55"/>
+        <dia:point val="-5.05,4.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.15,2.5;0.75,5.8"/>
+        <dia:rectangle val="-5.1,4.1;0.8,7.4"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5.1,2.55"/>
+        <dia:point val="-5.05,4.15"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.7999999999999998"/>
@@ -1267,13 +1290,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="5.775,4.65"/>
+        <dia:point val="5.525,6.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.725,4.6;16.875,12.9"/>
+        <dia:rectangle val="5.475,6.8;16.625,15.1"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="5.775,4.65"/>
+        <dia:point val="5.525,6.85"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.049999999999999"/>
@@ -2008,13 +2031,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.515,20.46"/>
+        <dia:point val="11.215,20.01"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.465,20.41;20.215,23.71"/>
+        <dia:rectangle val="11.165,19.96;19.915,23.26"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="11.515,20.46"/>
+        <dia:point val="11.215,20.01"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -2156,16 +2179,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.3,12.85"/>
+        <dia:point val="11.05,15.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.45,12.8;15.89,20.51"/>
+        <dia:rectangle val="10.2,15;15.59,20.06"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="11.3,12.85"/>
-        <dia:point val="11.3,15.0325"/>
-        <dia:point val="15.84,15.0325"/>
-        <dia:point val="15.84,20.46"/>
+        <dia:point val="11.05,15.05"/>
+        <dia:point val="11.05,18.0325"/>
+        <dia:point val="15.54,18.0325"/>
+        <dia:point val="15.54,20.01"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2191,13 +2214,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="3.03,17.32"/>
+        <dia:point val="-0.17,20.02"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.98,17.27;13.43,19.17"/>
+        <dia:rectangle val="-0.22,19.97;10.23,21.87"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="3.03,17.32"/>
+        <dia:point val="-0.17,20.02"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="10.35"/>
@@ -2292,16 +2315,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.3,12.85"/>
+        <dia:point val="11.05,15.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.155,12.8;12.15,17.37"/>
+        <dia:rectangle val="4.955,15;11.9,20.07"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="11.3,12.85"/>
-        <dia:point val="11.3,15.0325"/>
-        <dia:point val="8.205,15.0325"/>
-        <dia:point val="8.205,17.32"/>
+        <dia:point val="11.05,15.05"/>
+        <dia:point val="11.05,18.0325"/>
+        <dia:point val="5.005,18.0325"/>
+        <dia:point val="5.005,20.02"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2521,13 +2544,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O18">
       <dia:attribute name="obj_pos">
-        <dia:point val="-4.985,21.17"/>
+        <dia:point val="-5.435,24.62"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.035,21.12;0.865,24.42"/>
+        <dia:rectangle val="-5.485,24.57;0.415,27.87"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-4.985,21.17"/>
+        <dia:point val="-5.435,24.62"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.7999999999999998"/>
@@ -2672,13 +2695,13 @@
         <dia:point val="7.615,30.72"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.565,25.75;11.225,31.57"/>
+        <dia:rectangle val="7.565,26.85;11.875,31.57"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="7.615,30.72"/>
         <dia:point val="8.96521,30.72"/>
-        <dia:point val="8.96521,26.5"/>
-        <dia:point val="10.475,26.5"/>
+        <dia:point val="8.96521,27.6"/>
+        <dia:point val="11.125,27.6"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -2731,15 +2754,15 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.025,26.5"/>
+        <dia:point val="20.675,27.6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.975,25.75;23.95,27.9"/>
+        <dia:rectangle val="20.625,26.3;23.95,28.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="20.025,26.5"/>
-        <dia:point val="20.8125,26.5"/>
-        <dia:point val="20.8125,27.05"/>
+        <dia:point val="20.675,27.6"/>
+        <dia:point val="22.115,27.6"/>
+        <dia:point val="22.115,27.05"/>
         <dia:point val="23.6,27.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -2908,16 +2931,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O23">
       <dia:attribute name="obj_pos">
-        <dia:point val="-1.925,15.45"/>
+        <dia:point val="-1.9,16.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.835,15.4;-0.875,21.92"/>
+        <dia:rectangle val="-3.285,16.2;-0.85,25.37"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-1.925,15.45"/>
-        <dia:point val="-1.925,18.31"/>
-        <dia:point val="-2.085,18.31"/>
-        <dia:point val="-2.085,21.17"/>
+        <dia:point val="-1.9,16.25"/>
+        <dia:point val="-1.9,20.435"/>
+        <dia:point val="-2.535,20.435"/>
+        <dia:point val="-2.535,24.62"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2970,13 +2993,13 @@
         <dia:point val="-5.485,30.72"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.535,14.2;-4.475,31.57"/>
+        <dia:rectangle val="-6.535,15;-4.475,31.57"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.485,30.72"/>
         <dia:point val="-6.485,30.72"/>
-        <dia:point val="-6.485,14.95"/>
-        <dia:point val="-4.825,14.95"/>
+        <dia:point val="-6.485,15.75"/>
+        <dia:point val="-4.825,15.75"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3021,7 +3044,7 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O17" connection="3"/>
-        <dia:connection handle="1" to="O3" connection="8"/>
+        <dia:connection handle="1" to="O3" connection="10"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O25">
@@ -3029,14 +3052,14 @@
         <dia:point val="-4.825,13.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.875,5;-1.45,14.6"/>
+        <dia:rectangle val="-5.875,6.6;-1.4,14.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4.825,13.75"/>
         <dia:point val="-5.825,13.75"/>
-        <dia:point val="-5.825,9.75"/>
-        <dia:point val="-2.2,9.75"/>
-        <dia:point val="-2.2,5.75"/>
+        <dia:point val="-5.825,10.55"/>
+        <dia:point val="-2.15,10.55"/>
+        <dia:point val="-2.15,7.35"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3087,14 +3110,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O26">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.1,2.55"/>
+        <dia:point val="-5.05,4.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.15,-1.26749;49.265,11.81"/>
+        <dia:rectangle val="-5.1,-1.26749;49.265,11.81"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-5.1,2.55"/>
-        <dia:point val="-5.1,-0.51749"/>
+        <dia:point val="-5.05,4.15"/>
+        <dia:point val="-5.05,-0.51749"/>
         <dia:point val="48.515,-0.51749"/>
         <dia:point val="48.515,11.06"/>
       </dia:attribute>
@@ -3620,20 +3643,16 @@
         <dia:point val="21.6508,1.5575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.95,-0.1925;22.0008,3.3"/>
+        <dia:rectangle val="-2.9,0.8075;22.0008,4.9"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="21.6508,1.5575"/>
-        <dia:point val="20.6508,1.5575"/>
-        <dia:point val="20.6508,0.5575"/>
-        <dia:point val="-2.2,0.5575"/>
-        <dia:point val="-2.2,2.55"/>
+        <dia:point val="-2.15,1.5575"/>
+        <dia:point val="-2.15,4.15"/>
       </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>
@@ -3678,15 +3697,15 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O31">
       <dia:attribute name="obj_pos">
-        <dia:point val="0.7,3.25"/>
+        <dia:point val="0.75,4.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.65,2.5;12,6.25"/>
+        <dia:rectangle val="0.7,4.1;11.75,8.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="0.7,3.25"/>
-        <dia:point val="11.3,3.25"/>
-        <dia:point val="11.3,4.65"/>
+        <dia:point val="0.75,4.85"/>
+        <dia:point val="11.05,4.85"/>
+        <dia:point val="11.05,6.85"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3735,14 +3754,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O32">
       <dia:attribute name="obj_pos">
-        <dia:point val="16.825,5.35"/>
+        <dia:point val="16.575,7.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.775,4.6;23.95,24.3"/>
+        <dia:rectangle val="16.525,6.8;23.95,24.3"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="16.825,5.35"/>
-        <dia:point val="20.8967,5.35"/>
+        <dia:point val="16.575,7.55"/>
+        <dia:point val="20.8967,7.55"/>
         <dia:point val="20.8967,23.45"/>
         <dia:point val="23.6,23.45"/>
       </dia:attribute>
@@ -3859,14 +3878,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O34">
       <dia:attribute name="obj_pos">
-        <dia:point val="15.25,31.4"/>
+        <dia:point val="15.9,32.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.2,31.35;44.515,36.6825"/>
+        <dia:rectangle val="15.85,32.45;44.515,36.6825"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="15.25,31.4"/>
-        <dia:point val="15.25,35.0575"/>
+        <dia:point val="15.9,32.5"/>
+        <dia:point val="15.9,35.0575"/>
         <dia:point val="43.815,35.0575"/>
         <dia:point val="43.815,34.2825"/>
       </dia:attribute>
@@ -4099,5 +4118,64 @@
         <dia:connection handle="1" to="O2" connection="13"/>
       </dia:connections>
     </dia:object>
+    <dia:object type="UML - Association" version="0" id="O38">
+      <dia:attribute name="obj_pos">
+        <dia:point val="5.525,7.55"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="0.975,6.8;5.875,14.6"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="5.525,7.55"/>
+        <dia:point val="3.275,7.55"/>
+        <dia:point val="3.275,13.75"/>
+        <dia:point val="1.025,13.75"/>
+      </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="O7" connection="3"/>
+        <dia:connection handle="1" to="O3" connection="4"/>
+      </dia:connections>
+    </dia:object>
   </dia:layer>
 </dia:diagram>
diff --git a/diagramas/der.dia b/diagramas/der.dia
index a16c914..03227c1 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,13 +2642,13 @@
     </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,32.22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.935,28.52;7.265,35.82"/>
+        <dia:rectangle val="-5.685,32.17;7.515,39.47"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5.885,28.57"/>
+        <dia:point val="-5.635,32.22"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="13.1"/>
@@ -2882,13 +2905,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 +3076,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,38.92"/>
       </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,39.77"/>
       </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,38.92"/>
+        <dia:point val="8.96521,38.92"/>
         <dia:point val="8.96521,27.7"/>
         <dia:point val="10.475,27.7"/>
       </dia:attribute>
@@ -3118,13 +3141,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 +3259,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,38.12"/>
       </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,38.97"/>
       </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,38.12"/>
+        <dia:point val="-6.925,38.12"/>
+        <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"/>
@@ -3298,15 +3321,15 @@
     </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 +3380,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 +3981,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 +4099,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 +4161,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 +4225,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 +4340,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 +4397,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 +4454,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 +4507,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 +4575,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 +4723,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 +4852,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 +4911,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 +4975,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 +5089,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>