Se agregan las claves primarias 'naturales' con un # adelante.

[z.facultad/75.10/miklolife.git] / diagramas / clases.dia

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 5c2490cd6119bfc9e4265c08d73044b983dbaefc..a5eccf08bac6cb9598a1b176b40365649632cc3c 100644 (file)
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">

-          <dia:real val="0.40462720394134521"/>
+          <dia:real val="0.4046272337436676"/>

         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>


@@ -438,7 +438,7 @@
         <dia:point val="23.6,22.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="23.6,22.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="23.55,22.7;32.3,28.4"/>
+        <dia:rectangle val="23.55,22.7;32.3,27.6"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="23.6,22.75"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="23.6,22.75"/>


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

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

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


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

-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#activo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#True si está en actividad (afiliado). (No convendría poner Plan = NULL en caso de no estar más afiliado?)#</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>#moroso#</dia:string>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#moroso#</dia:string>


@@ -655,16 +632,16 @@
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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: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: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>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestacion#</dia:string>


@@ -745,6 +722,29 @@
         <dia:real val="1"/>
       </dia:attribute>
       <dia:attribute name="attributes">
         <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>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#nombre#</dia:string>


@@ -777,13 +777,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O4">
       <dia:attribute name="obj_pos">
     </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: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: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"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="9.5499999999999989"/>


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

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

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

-            <dia:string>#bool#</dia:string>
+            <dia:string>#Fecha#</dia:string>

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

-            <dia:string>#Flag que indica si se el plan esta activo y por lo tanto se pueden tomar nuevas afiliaciones al mismo#</dia:string>
+            <dia:string>#Fecha en la que el afiliado solicita la baja#</dia:string>

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


@@ -994,13 +994,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O5">
       <dia:attribute name="obj_pos">
     </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: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: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"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.7999999999999998"/>


@@ -1290,13 +1290,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
     </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: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: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"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.049999999999999"/>


@@ -2031,13 +2031,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O13">
       <dia:attribute name="obj_pos">
     </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: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: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"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>


@@ -2179,16 +2179,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O14">
       <dia:attribute name="obj_pos">
     </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: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: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"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>


@@ -2214,13 +2214,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O15">
       <dia:attribute name="obj_pos">
     </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: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: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"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="10.35"/>


@@ -2315,16 +2315,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
     </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: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: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"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>


@@ -2445,7 +2445,7 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#tiempoPermanencia#</dia:string>
+            <dia:string>#carencia#</dia:string>

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


@@ -2544,13 +2544,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O18">
       <dia:attribute name="obj_pos">
     </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: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: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"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.7999999999999998"/>


@@ -2695,13 +2695,13 @@
         <dia:point val="7.615,30.72"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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: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"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>


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

-        <dia:point val="20.025,26.5"/>
+        <dia:point val="20.675,27.6"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </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: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">
         <dia:point val="23.6,27.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">


@@ -2811,7 +2811,6 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O4" connection="4"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O4" connection="4"/>

-        <dia:connection handle="1" to="O2" connection="14"/>

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


@@ -2932,16 +2931,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O23">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O23">
       <dia:attribute name="obj_pos">

-        <dia:point val="-1.925,15.45"/>
+        <dia:point val="-1.9,16.25"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </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: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"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>


@@ -2990,79 +2989,17 @@
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O24">
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O24">

-      <dia:attribute name="obj_pos">
-        <dia:point val="5.775,5.35"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.015,4.6;6.825,30.87"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="5.775,5.35"/>
-        <dia:point val="1.74666,5.35"/>
-        <dia:point val="1.74666,30.02"/>
-        <dia:point val="1.065,30.02"/>
-      </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># * #</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="O17" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O25">

       <dia:attribute name="obj_pos">
         <dia:point val="-5.485,30.72"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       <dia:attribute name="obj_pos">
         <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: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"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>


@@ -3107,22 +3044,22 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O17" connection="3"/>
       </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:connections>
     </dia:object>

-    <dia:object type="UML - Association" version="0" id="O26">
+    <dia:object type="UML - Association" version="0" id="O25">

       <dia:attribute name="obj_pos">
         <dia:point val="-4.825,13.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       <dia:attribute name="obj_pos">
         <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: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"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>


@@ -3171,16 +3108,16 @@
         <dia:connection handle="1" to="O5" connection="6"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O5" connection="6"/>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Association" version="0" id="O27">
+    <dia:object type="UML - Association" version="0" id="O26">

       <dia:attribute name="obj_pos">
       <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: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: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>
         <dia:point val="48.515,-0.51749"/>
         <dia:point val="48.515,11.06"/>
       </dia:attribute>


@@ -3233,7 +3170,7 @@
         <dia:connection handle="1" to="O10" connection="1"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O10" connection="1"/>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Class" version="0" id="O28">
+    <dia:object type="UML - Class" version="0" id="O27">

       <dia:attribute name="obj_pos">
         <dia:point val="40.015,31.0825"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
         <dia:point val="40.015,31.0825"/>
       </dia:attribute>


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

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

       <dia:attribute name="obj_pos">
         <dia:point val="21.6508,0.8575"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
         <dia:point val="21.6508,0.8575"/>
       </dia:attribute>


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

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

       <dia:attribute name="obj_pos">
         <dia:point val="27.1758,8.0575"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
         <dia:point val="27.1758,8.0575"/>
       </dia:attribute>


@@ -3697,29 +3634,25 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
         </dia:composite>
       </dia:attribute>
       <dia:connections>

-        <dia:connection handle="0" to="O29" connection="6"/>
+        <dia:connection handle="0" to="O28" connection="6"/>

         <dia:connection handle="1" to="O1" connection="14"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O1" connection="14"/>
       </dia:connections>
     </dia:object>

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

       <dia:attribute name="obj_pos">
         <dia:point val="21.6508,1.5575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       <dia:attribute name="obj_pos">
         <dia:point val="21.6508,1.5575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-2.95,0.5075;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: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: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="name">
         <dia:string>##</dia:string>


@@ -3758,21 +3691,21 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
         </dia:composite>
       </dia:attribute>
       <dia:connections>

-        <dia:connection handle="0" to="O29" connection="3"/>
+        <dia:connection handle="0" to="O28" connection="3"/>

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

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

       <dia:attribute name="obj_pos">
       <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: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: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"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>


@@ -3819,16 +3752,16 @@
         <dia:connection handle="1" to="O7" connection="1"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O7" connection="1"/>
       </dia:connections>
     </dia:object>

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

       <dia:attribute name="obj_pos">
       <dia: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: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: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>
         <dia:point val="20.8967,23.45"/>
         <dia:point val="23.6,23.45"/>
       </dia:attribute>


@@ -3881,18 +3814,18 @@
         <dia:connection handle="1" to="O2" connection="3"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O2" connection="3"/>
       </dia:connections>
     </dia:object>

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

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

-        <dia:point val="23.6,28.35"/>
+        <dia:point val="23.6,27.55"/>

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

-        <dia:rectangle val="22.85,27.6;34.425,34.0575"/>
+        <dia:rectangle val="22.85,26.8;34.425,34.0575"/>

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

-        <dia:point val="23.6,28.35"/>
+        <dia:point val="23.6,27.55"/>

         <dia:point val="23.6,34.0075"/>
         <dia:point val="27.925,34.0075"/>
         <dia:point val="23.6,34.0075"/>
         <dia:point val="27.925,34.0075"/>

-        <dia:point val="27.925,28.35"/>
+        <dia:point val="27.925,27.55"/>

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


@@ -3943,16 +3876,16 @@
         <dia:connection handle="1" to="O2" connection="6"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O2" connection="6"/>
       </dia:connections>
     </dia:object>

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

       <dia:attribute name="obj_pos">
       <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: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: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>
         <dia:point val="43.815,35.0575"/>
         <dia:point val="43.815,34.2825"/>
       </dia:attribute>


@@ -4002,19 +3935,19 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O4" connection="6"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O4" connection="6"/>

-        <dia:connection handle="1" to="O28" connection="6"/>
+        <dia:connection handle="1" to="O27" connection="6"/>

       </dia:connections>
     </dia:object>
       </dia:connections>
     </dia:object>

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

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

-        <dia:point val="32.25,27.85"/>
+        <dia:point val="32.25,27.05"/>

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

-        <dia:rectangle val="31.5,27.1;41.8151,32.6325"/>
+        <dia:rectangle val="31.5,26.3;41.8151,32.6325"/>

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

-        <dia:point val="32.25,27.85"/>
-        <dia:point val="35.0651,27.85"/>
+        <dia:point val="32.25,27.05"/>
+        <dia:point val="35.0651,27.05"/>

         <dia:point val="35.0651,31.7825"/>
         <dia:point val="40.015,31.7825"/>
       </dia:attribute>
         <dia:point val="35.0651,31.7825"/>
         <dia:point val="40.015,31.7825"/>
       </dia:attribute>


@@ -4063,11 +3996,11 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
         </dia:composite>
       </dia:attribute>
       <dia:connections>

-        <dia:connection handle="0" to="O2" connection="17"/>
-        <dia:connection handle="1" to="O28" connection="3"/>
+        <dia:connection handle="0" to="O2" connection="15"/>
+        <dia:connection handle="1" to="O27" connection="3"/>

       </dia:connections>
     </dia:object>
       </dia:connections>
     </dia:object>

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

       <dia:attribute name="obj_pos">
         <dia:point val="32.7008,1.5575"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
         <dia:point val="32.7008,1.5575"/>
       </dia:attribute>


@@ -4122,11 +4055,11 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
         </dia:composite>
       </dia:attribute>
       <dia:connections>

-        <dia:connection handle="0" to="O29" connection="4"/>
+        <dia:connection handle="0" to="O28" connection="4"/>

         <dia:connection handle="1" to="O6" connection="10"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O6" connection="10"/>
       </dia:connections>
     </dia:object>

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

       <dia:attribute name="obj_pos">
         <dia:point val="43.665,27.15"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
         <dia:point val="43.665,27.15"/>
       </dia:attribute>


@@ -4185,5 +4118,64 @@
         <dia:connection handle="1" to="O2" connection="13"/>
       </dia:connections>
     </dia:object>
         <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>
   </dia:layer>
 </dia:diagram>