X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/blobdiff_plain/61b9f07446345b969f6d534cfcf1de5a49b0af37..7724f05143783f6d634f85d82c9eb77ccc7c01ee:/diagramas/clases.dia

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 81b4ba3..3c2c8a9 100644
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.40271711349487305"/>
+          <dia:real val="0.40218973159790039"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -71,13 +71,13 @@
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - Class" version="0" id="O0">
       <dia:attribute name="obj_pos">
-        <dia:point val="26,17.3"/>
+        <dia:point val="30.35,17.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.95,17.25;35.05,20.55"/>
+        <dia:rectangle val="30.3,17.25;39.4,20.55"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="26,17.3"/>
+        <dia:point val="30.35,17.3"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="9"/>
@@ -219,16 +219,16 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="24.3,1.95"/>
+        <dia:point val="28.5,1.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.25,1.9;36.75,13.2"/>
+        <dia:rectangle val="28.45,1.9;41.05,13.2"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="24.3,1.95"/>
+        <dia:point val="28.5,1.95"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="12.4"/>
+        <dia:real val="12.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="11.200000000000001"/>
@@ -597,13 +597,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="16.1,16.75"/>
+        <dia:point val="19.4,17.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.05,16.7;24.8,23.2"/>
+        <dia:rectangle val="19.35,17;28.1,23.5"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="16.1,16.75"/>
+        <dia:point val="19.4,17.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -840,13 +840,13 @@
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.875,13;1.025,16.3"/>
+        <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="3.2000000000000002"/>
@@ -988,13 +988,13 @@
         <dia:point val="12.325,27.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="12.275,27.45;19.475,33.15"/>
+        <dia:rectangle val="12.275,27.45;19.625,33.15"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="12.325,27.5"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="7.0999999999999996"/>
+        <dia:real val="7.25"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="5.5999999999999996"/>
@@ -1419,13 +1419,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="26.875,26.05"/>
+        <dia:point val="27.475,26"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.825,26;34.875,30.9"/>
+        <dia:rectangle val="27.425,25.95;35.475,30.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="26.875,26.05"/>
+        <dia:point val="27.475,26"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.9499999999999993"/>
@@ -1613,19 +1613,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="9.675,3.95"/>
+        <dia:point val="6.575,3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.625,3.9;18.625,12"/>
+        <dia:rectangle val="6.525,2.95;26.125,13.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="9.675,3.95"/>
+        <dia:point val="6.575,3"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="8.9000000000000004"/>
+        <dia:real val="19.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="8"/>
+        <dia:real val="10.4"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>
@@ -1752,6 +1752,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#afiliado#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#Afiliado#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Afiliado que solicitó la autorización.#</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>#fechaSolicitud#</dia:string>
@@ -1800,16 +1823,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#afiliado#</dia:string>
+            <dia:string>#fechaVencimiento#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Afiliado#</dia:string>
+            <dia:string>#Fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Afiliado que solicitó la autorización.#</dia:string>
+            <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1823,16 +1846,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#observaciones#</dia:string>
+            <dia:string>#estado#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#enum(emitida, pendiente, aprobada, rechazada)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Observaciones sobre la autorización (debería ir sólo en Manual o no?)#</dia:string>
+            <dia:string>#True si fue aproba, False si no (no convendría poner NULL en fechaAprobación?)#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1846,16 +1869,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#aprobada#</dia:string>
+            <dia:string>#prestacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
+            <dia:string>#Prestacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#True si fue aproba, False si no (no convendría poner NULL en fechaAprobación?)#</dia:string>
+            <dia:string>#Prestación (no sería Cobertura???) para la cual se pidió autorización.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1869,16 +1892,62 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#prestacion#</dia:string>
+            <dia:string>#porcentajeCobertura#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Prestacion#</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>#Prestación (no sería Cobertura???) para la cual se pidió autorización.#</dia:string>
+            <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>#observaciones#</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>#Observaciones sobre la autorización (debería ir sólo en Manual o no?)#</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>#descripcion_rechazo#</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>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1899,16 +1968,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.5,13.15"/>
+        <dia:point val="34.75,13.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.375,13.1;31.35,16.8"/>
+        <dia:rectangle val="23.675,13.1;35.6,17.1"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.5,13.15"/>
-        <dia:point val="30.5,15.1"/>
-        <dia:point val="20.425,15.1"/>
-        <dia:point val="20.425,16.75"/>
+        <dia:point val="34.75,13.15"/>
+        <dia:point val="34.75,15.1"/>
+        <dia:point val="23.725,15.1"/>
+        <dia:point val="23.725,17.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -1934,16 +2003,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.5,13.15"/>
+        <dia:point val="34.75,13.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.65,13.1;31.35,17.35"/>
+        <dia:rectangle val="33.9,13.1;35.6,17.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.5,13.15"/>
-        <dia:point val="30.5,15.1"/>
-        <dia:point val="30.5,15.1"/>
-        <dia:point val="30.5,17.3"/>
+        <dia:point val="34.75,13.15"/>
+        <dia:point val="34.75,15.1"/>
+        <dia:point val="34.85,15.1"/>
+        <dia:point val="34.85,17.3"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -1969,16 +2038,16 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="40.015,26.06"/>
+        <dia:point val="42.065,26.01"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.965,26.01;47.965,30.91"/>
+        <dia:rectangle val="42.015,25.96;50.065,30.86"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="40.015,26.06"/>
+        <dia:point val="42.065,26.01"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="7.8999999999999995"/>
+        <dia:real val="7.9499999999999993"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
@@ -2163,13 +2232,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.215,17.31"/>
+        <dia:point val="41.565,17.31"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.165,17.26;48.265,21.36"/>
+        <dia:rectangle val="41.515,17.26;50.615,21.36"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="39.215,17.31"/>
+        <dia:point val="41.565,17.31"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="9"/>
@@ -2334,16 +2403,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.5,13.15"/>
+        <dia:point val="34.75,13.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.65,13.1;43.765,17.36"/>
+        <dia:rectangle val="33.9,13.1;46.115,17.36"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.5,13.15"/>
-        <dia:point val="30.5,15.1"/>
-        <dia:point val="43.715,15.1"/>
-        <dia:point val="43.715,17.31"/>
+        <dia:point val="34.75,13.15"/>
+        <dia:point val="34.75,15.1"/>
+        <dia:point val="46.065,15.1"/>
+        <dia:point val="46.065,17.31"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2494,19 +2563,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="5.715,20.91"/>
+        <dia:point val="9.415,17.06"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.665,20.86;15.465,25.76"/>
+        <dia:rectangle val="9.365,17.01;18.015,18.91"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="5.715,20.91"/>
+        <dia:point val="9.415,17.06"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="9.6999999999999993"/>
+        <dia:real val="8.5500000000000007"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="1.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionManual#</dia:string>
@@ -2586,100 +2655,7 @@
       <dia:attribute name="comment_font_height">
         <dia:real val="1"/>
       </dia:attribute>
-      <dia:attribute name="attributes">
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#fecha#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Fecha en la que se hizo efectiva la prestación (??? Esto no es PrestacionRealizada?)#</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>#fechaVencimiento#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Fecha de vencimiento de la autorización, si el Afiliado no la concreta antes de esta fecha, la autorización deja de ser válida.#</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>#descipcionRechazo#</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>#Motivos por los cuales se rechazó una autorización.#</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>#observaciones#</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>#(igual que en Autorización! Por qué hay 2???)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
+      <dia:attribute name="attributes"/>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
@@ -2688,16 +2664,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.125,11.95"/>
+        <dia:point val="16.325,13.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.515,11.9;14.975,20.96"/>
+        <dia:rectangle val="13.64,13.35;17.175,17.11"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="14.125,11.95"/>
-        <dia:point val="14.125,15.07"/>
-        <dia:point val="10.565,15.07"/>
-        <dia:point val="10.565,20.91"/>
+        <dia:point val="16.325,13.4"/>
+        <dia:point val="16.325,15.07"/>
+        <dia:point val="13.69,15.07"/>
+        <dia:point val="13.69,17.06"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2723,13 +2699,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.53,17.82"/>
+        <dia:point val="3.48,17.07"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.48,17.77;9.88,19.67"/>
+        <dia:rectangle val="3.43,17.02;8.83,18.92"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="4.53,17.82"/>
+        <dia:point val="3.48,17.07"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.2999999999999998"/>
@@ -2824,16 +2800,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.125,11.95"/>
+        <dia:point val="16.325,13.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.13,11.9;14.975,17.87"/>
+        <dia:rectangle val="6.08,13.35;17.175,17.12"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="14.125,11.95"/>
-        <dia:point val="14.125,15.07"/>
-        <dia:point val="7.18,15.07"/>
-        <dia:point val="7.18,17.82"/>
+        <dia:point val="16.325,13.4"/>
+        <dia:point val="16.325,15.07"/>
+        <dia:point val="6.13,15.07"/>
+        <dia:point val="6.13,17.07"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2862,13 +2838,13 @@
         <dia:point val="-5.585,27.52"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.635,27.47;7.565,32.37"/>
+        <dia:rectangle val="-5.635,27.47;7.665,32.37"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-5.585,27.52"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="13.1"/>
+        <dia:real val="13.199999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
@@ -3053,29 +3029,30 @@
     </dia:object>
     <dia:object type="Standard - ZigZagLine" version="0" id="O19">
       <dia:attribute name="obj_pos">
-        <dia:point val="18.575,10.65"/>
+        <dia:point val="26.075,9.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.05,10.6;19.625,17.5"/>
+        <dia:rectangle val="19.35,9.65;27.125,17.1"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="18.575,10.65"/>
-        <dia:point val="19.575,10.65"/>
-        <dia:point val="19.575,14.05"/>
-        <dia:point val="15.1,14.05"/>
-        <dia:point val="15.1,17.45"/>
-        <dia:point val="16.1,17.45"/>
+        <dia:point val="26.075,9.7"/>
+        <dia:point val="27.075,9.7"/>
+        <dia:point val="27.075,14.47"/>
+        <dia:point val="19.4,14.47"/>
+        <dia:point val="19.4,17.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
-        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O7" connection="21"/>
-        <dia:connection handle="1" to="O2" connection="3"/>
+        <dia:connection handle="1" to="O2" connection="0"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O20">
@@ -3083,13 +3060,13 @@
         <dia:point val="0.715,-3.67999"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.665,-3.72999;6.565,-0.42999"/>
+        <dia:rectangle val="0.665,-3.72999;6.615,-0.42999"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="0.715,-3.67999"/>
       </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="3.2000000000000002"/>
@@ -3228,15 +3205,15 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O21">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.125,3.95"/>
+        <dia:point val="16.325,3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.275,0.26;14.975,4"/>
+        <dia:rectangle val="14.04,0.26;17.175,3.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="14.125,3.95"/>
-        <dia:point val="14.125,2.13"/>
-        <dia:point val="14.09,2.13"/>
+        <dia:point val="16.325,3"/>
+        <dia:point val="16.325,1.655"/>
+        <dia:point val="14.09,1.655"/>
         <dia:point val="14.09,0.31"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -3266,7 +3243,7 @@
         <dia:point val="7.515,28.22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.465,27.45;13.075,29.07"/>
+        <dia:rectangle val="7.465,27.4;13.075,29.02"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="7.515,28.22"/>
@@ -3325,20 +3302,16 @@
         <dia:point val="19.425,28.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.375,23.1;21.125,29.05"/>
+        <dia:rectangle val="19.375,23.4;24.425,29"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="19.425,28.2"/>
-        <dia:point val="20.425,28.2"/>
-        <dia:point val="20.425,25.675"/>
-        <dia:point val="20.425,25.675"/>
-        <dia:point val="20.425,23.15"/>
+        <dia:point val="23.725,28.2"/>
+        <dia:point val="23.725,23.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>
@@ -3383,16 +3356,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O24">
       <dia:attribute name="obj_pos">
-        <dia:point val="40.015,26.76"/>
+        <dia:point val="42.065,26.71"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.075,26;40.715,27.61"/>
+        <dia:rectangle val="34.675,25.9;42.765,27.51"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="40.015,26.76"/>
-        <dia:point val="37.42,26.76"/>
-        <dia:point val="37.42,26.75"/>
-        <dia:point val="34.825,26.75"/>
+        <dia:point val="42.065,26.71"/>
+        <dia:point val="38.745,26.71"/>
+        <dia:point val="38.745,26.7"/>
+        <dia:point val="35.425,26.7"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3442,16 +3415,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O25">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.5,20.5"/>
+        <dia:point val="34.85,20.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.1,20.45;31.6,26.8"/>
+        <dia:rectangle val="30.7,20.45;35.55,26.75"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.5,20.5"/>
-        <dia:point val="30.5,23.275"/>
-        <dia:point val="30.85,23.275"/>
-        <dia:point val="30.85,26.05"/>
+        <dia:point val="34.85,20.5"/>
+        <dia:point val="34.85,23.25"/>
+        <dia:point val="31.45,23.25"/>
+        <dia:point val="31.45,26"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3501,16 +3474,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O26">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.215,18.01"/>
+        <dia:point val="41.565,18.01"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.95,17.25;39.915,18.86"/>
+        <dia:rectangle val="39.3,17.2;42.265,18.81"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="39.215,18.01"/>
-        <dia:point val="37.1075,18.01"/>
-        <dia:point val="37.1075,18"/>
-        <dia:point val="35,18"/>
+        <dia:point val="41.565,18.01"/>
+        <dia:point val="40.4575,18.01"/>
+        <dia:point val="40.4575,18"/>
+        <dia:point val="39.35,18"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3563,15 +3536,15 @@
         <dia:point val="-5.75,2.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.685,-4.97999;50.8153,27.61"/>
+        <dia:rectangle val="-6.685,-5.02999;51.765,27.51"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.75,2.05"/>
         <dia:point val="-6.635,2.05"/>
         <dia:point val="-6.635,-4.22999"/>
         <dia:point val="50.7653,-4.22999"/>
-        <dia:point val="50.7653,26.76"/>
-        <dia:point val="47.915,26.76"/>
+        <dia:point val="50.7653,26.71"/>
+        <dia:point val="50.015,26.71"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3629,7 +3602,7 @@
         <dia:point val="0.975,13.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.925,-1.22999;4.365,14.6"/>
+        <dia:rectangle val="0.925,-1.22999;4.365,14.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="0.975,13.75"/>
@@ -3683,15 +3656,15 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O29">
       <dia:attribute name="obj_pos">
-        <dia:point val="9.675,4.65"/>
+        <dia:point val="6.575,3.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.225,3.9;10.725,15.8"/>
+        <dia:rectangle val="0.225,2.9;7.625,15.75"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="9.675,4.65"/>
-        <dia:point val="5.325,4.65"/>
-        <dia:point val="5.325,14.95"/>
+        <dia:point val="6.575,3.7"/>
+        <dia:point val="5.015,3.7"/>
+        <dia:point val="5.015,14.95"/>
         <dia:point val="0.975,14.95"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -3699,6 +3672,9 @@
         <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>
@@ -3751,10 +3727,10 @@
         <dia:point val="-0.35,20.47"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="4.4000000000000004"/>
+        <dia:real val="4.3999999999999995"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4.1000000000000005"/>
+        <dia:real val="4.0999999999999996"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -3777,7 +3753,7 @@ Cobertura?#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="-1.11022e-16,21.72"/>
+            <dia:point val="0,21.67"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -3849,7 +3825,7 @@ Cobertura?#</dia:string>
         <dia:point val="-5.585,28.22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.635,15.5;-1.175,29.07"/>
+        <dia:rectangle val="-6.635,15.5;-1.175,29.02"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.585,28.22"/>
@@ -3910,7 +3886,7 @@ Cobertura?#</dia:string>
         <dia:point val="-4.825,13.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.875,6.2;-1.025,14.6"/>
+        <dia:rectangle val="-5.875,6.2;-1.025,14.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4.825,13.75"/>