X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/blobdiff_plain/6302a8e2c2649f0f7599bf23fdadf648def842b1..47065ba6f0ab4fdff7bf6ee1154ab36a9ddbee5b:/diagramas/clases.dia

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 02667a3..0c52497 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.40429577231407166"/>
+          <dia:real val="0.41945245862007141"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -172,13 +172,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="3,10"/>
+        <dia:point val="3,11.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.95,9.95;15.55,17.25"/>
+        <dia:rectangle val="2.95,11;15.55,18.3"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="3,10"/>
+        <dia:point val="3,11.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="12.5"/>
@@ -438,7 +438,7 @@
         <dia:point val="-9.85,21.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-9.9,21;12.85,30.1"/>
+        <dia:rectangle val="-9.9,21;12.85,27.7"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-9.85,21.05"/>
@@ -447,7 +447,7 @@
         <dia:real val="22.650000000000002"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="9"/>
+        <dia:real val="6.6000000000000005"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Afiliado#</dia:string>
@@ -624,97 +624,7 @@
       <dia:attribute name="operations">
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#existe#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Devuelve True si el afiliado existe y carga el resto de los datos correspondientes. Si no existe devuelve False. Si existe más de uno, se pueden obtener con getNext().#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="inheritance_type">
-            <dia:enum val="2"/>
-          </dia:attribute>
-          <dia:attribute name="query">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="parameters"/>
-        </dia:composite>
-        <dia:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#getNext#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Si encontró uno nuevo, devuelve True y lo carga. Si no devuelve False y queda intacto.#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="inheritance_type">
-            <dia:enum val="2"/>
-          </dia:attribute>
-          <dia:attribute name="query">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="parameters"/>
-        </dia:composite>
-        <dia:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#guardar#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Guarda los datos del afiliado en la DB y retorna True si no hubo error#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="inheritance_type">
-            <dia:enum val="2"/>
-          </dia:attribute>
-          <dia:attribute name="query">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="parameters"/>
-        </dia:composite>
-        <dia:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#VerificarCobertura#</dia:string>
+            <dia:string>#verificarCobertura#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
@@ -762,7 +672,7 @@
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#ObtenerCantidadDePrestacionesRealizadas#</dia:string>
+            <dia:string>#obtenerCantidadDePrestacionesRealizadas#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
@@ -816,13 +726,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O3">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5,6"/>
+        <dia:point val="-5,6.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.05,5.95;1.6,10.05"/>
+        <dia:rectangle val="-5.05,6.45;1.6,10.55"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5,6"/>
+        <dia:point val="-5,6.5"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="6.5499999999999998"/>
@@ -914,7 +824,7 @@
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -990,16 +900,16 @@
         <dia:point val="3,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.95,0.95;19.75,9.25"/>
+        <dia:rectangle val="2.95,0.95;20.1,10.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="3,1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="16.700000000000003"/>
+        <dia:real val="17.050000000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="8.1999999999999993"/>
+        <dia:real val="9"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Plan#</dia:string>
@@ -1229,19 +1139,19 @@
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#guardar#</dia:string>
+            <dia:string>#obtenerCobertura#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
+            <dia:string>#Cobertura#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Registra en la BD todo el esquema del plan#</dia:string>
+            <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1255,17 +1165,35 @@
           <dia:attribute name="class_scope">
             <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="parameters"/>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#codPrestacion#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia: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="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#ObtenerCobertura#</dia:string>
+            <dia:string>#agregarCobertura#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Cobertura#</dia:string>
+            <dia:string>#bool#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1288,10 +1216,10 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#codPrestacion#</dia:string>
+                <dia:string>#cobertura#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>##</dia:string>
+                <dia:string>#Cobertura#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -1305,6 +1233,36 @@
             </dia:composite>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#obtenerCoberturas#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#Cobertura[]#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
       </dia:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
@@ -1316,7 +1274,7 @@
         <dia:point val="-5,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.05,0.95;1.6,5.05"/>
+        <dia:rectangle val="-5.05,0.95;1.6,5.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-5,1"/>
@@ -1325,7 +1283,7 @@
         <dia:real val="6.5499999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4"/>
+        <dia:real val="4.8000000000000007"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestador#</dia:string>
@@ -1411,7 +1369,7 @@
             <dia:string>#cuit#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1475,6 +1433,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#email#</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>#Mail del Presador, utilizado para informarle errores en sus archivos enviados #</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
       </dia:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
@@ -1484,13 +1465,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="21,15.75"/>
+        <dia:point val="24.6,21.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.95,15.7;28.65,19.8"/>
+        <dia:rectangle val="24.55,21.9;32.25,26"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="21,15.75"/>
+        <dia:point val="24.6,21.95"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -1655,16 +1636,16 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="32.85,0.55"/>
+        <dia:point val="21.5,0.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.8,0.5;49.6,10.4"/>
+        <dia:rectangle val="21.45,0.25;47.35,10.15"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="32.85,0.55"/>
+        <dia:point val="21.5,0.3"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="16.700000000000003"/>
+        <dia:real val="25.800000000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="9.7999999999999989"/>
@@ -1776,7 +1757,7 @@
             <dia:string>#porcentajeCobertura#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#float#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2020,7 +2001,7 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#Motivo#</dia:string>
+                <dia:string>#fundamentosResolucion#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
                 <dia:string>#string#</dia:string>
@@ -2037,7 +2018,7 @@
             </dia:composite>
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#Aprobada#</dia:string>
+                <dia:string>#porcentajeCobertura#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
                 <dia:string>#bool#</dia:string>
@@ -2213,7 +2194,7 @@
         <dia:point val="14.2,21"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.15,20.95;22.9,29.25"/>
+        <dia:rectangle val="14.15,20.95;22.9,26.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="14.2,21"/>
@@ -2222,7 +2203,7 @@
         <dia:real val="8.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="8.2000000000000011"/>
+        <dia:real val="5.2000000000000011"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Solicitante#</dia:string>
@@ -2396,128 +2377,7 @@
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
-      <dia:attribute name="operations">
-        <dia:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#existe#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Devuelve True si el afiliado existe y carga el resto de los datos correspondientes. Si no existe devuelve False. Si existe más de uno, se pueden obtener con getNext().#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="inheritance_type">
-            <dia:enum val="2"/>
-          </dia:attribute>
-          <dia:attribute name="query">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="parameters"/>
-        </dia:composite>
-        <dia:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#getNext#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Si encontró uno nuevo, devuelve True y lo carga. Si no devuelve False y queda intacto.#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="inheritance_type">
-            <dia:enum val="2"/>
-          </dia:attribute>
-          <dia:attribute name="query">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="parameters"/>
-        </dia:composite>
-        <dia:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#guardar#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Guarda los datos del solicitante en la DB y retorna True si no hubo error#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="inheritance_type">
-            <dia:enum val="2"/>
-          </dia:attribute>
-          <dia:attribute name="query">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="parameters"/>
-        </dia:composite>
-        <dia:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#borrar#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Borra el solicitante de la DB y retorna True si no hubo error#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="inheritance_type">
-            <dia:enum val="2"/>
-          </dia:attribute>
-          <dia:attribute name="query">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="parameters"/>
-        </dia:composite>
-      </dia:attribute>
+      <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
@@ -2525,13 +2385,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="38.2,12.7"/>
+        <dia:point val="36.45,18.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.15,12.65;46.9,16.35"/>
+        <dia:rectangle val="36.4,18.35;45.15,22.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="38.2,12.7"/>
+        <dia:point val="36.45,18.4"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -2673,13 +2533,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="25.3,12.8"/>
+        <dia:point val="24.8,18.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.25,12.75;35.7,14.65"/>
+        <dia:rectangle val="24.75,18.65;35.2,20.55"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="25.3,12.8"/>
+        <dia:point val="24.8,18.7"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="10.35"/>
@@ -2774,13 +2634,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="28,20"/>
+        <dia:point val="34.2,22.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.95,19.95;41.25,24.85"/>
+        <dia:rectangle val="34.15,22.7;47.45,27.6"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="28,20"/>
+        <dia:point val="34.2,22.75"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="13.199999999999999"/>
@@ -3287,13 +3147,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.15,0.85"/>
+        <dia:point val="17,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.1,0.8;31.3,8.1"/>
+        <dia:rectangle val="16.95,10.95;28.15,18.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="20.15,0.85"/>
+        <dia:point val="17,11"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.1"/>
@@ -3550,16 +3410,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="41.2,10.35"/>
+        <dia:point val="34.4,10.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="40.35,10.3;42.575,12.75"/>
+        <dia:rectangle val="33.55,10.05;40.825,18.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="41.2,10.35"/>
-        <dia:point val="41.2,11.525"/>
-        <dia:point val="42.525,11.525"/>
-        <dia:point val="42.525,12.7"/>
+        <dia:point val="34.4,10.1"/>
+        <dia:point val="34.4,14.25"/>
+        <dia:point val="40.775,14.25"/>
+        <dia:point val="40.775,18.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3585,16 +3445,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="41.2,10.35"/>
+        <dia:point val="34.4,10.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.425,10.3;42.05,12.85"/>
+        <dia:rectangle val="29.925,10.05;35.25,18.75"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="41.2,10.35"/>
-        <dia:point val="41.2,11.575"/>
-        <dia:point val="30.475,11.575"/>
-        <dia:point val="30.475,12.8"/>
+        <dia:point val="34.4,10.1"/>
+        <dia:point val="34.4,14.4"/>
+        <dia:point val="29.975,14.4"/>
+        <dia:point val="29.975,18.7"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3620,15 +3480,15 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O18">
       <dia:attribute name="obj_pos">
-        <dia:point val="9.2,17.2"/>
+        <dia:point val="9.25,18.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.425,17.15;10.05,21.1"/>
+        <dia:rectangle val="1.425,18.2;10.1,21.1"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="9.2,17.2"/>
-        <dia:point val="9.2,19.125"/>
-        <dia:point val="1.475,19.125"/>
+        <dia:point val="9.25,18.25"/>
+        <dia:point val="9.25,19.65"/>
+        <dia:point val="1.475,19.65"/>
         <dia:point val="1.475,21.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -3655,15 +3515,15 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O19">
       <dia:attribute name="obj_pos">
-        <dia:point val="9.2,17.2"/>
+        <dia:point val="9.25,18.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.35,17.15;18.575,21.05"/>
+        <dia:rectangle val="8.4,18.2;18.575,21.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="9.2,17.2"/>
-        <dia:point val="9.2,19.1"/>
-        <dia:point val="18.525,19.1"/>
+        <dia:point val="9.25,18.25"/>
+        <dia:point val="9.25,19.6506"/>
+        <dia:point val="18.525,19.6506"/>
         <dia:point val="18.525,21"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -3672,7 +3532,7 @@
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_autoroute">
-        <dia:boolean val="true"/>
+        <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -3690,15 +3550,15 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="9.2,17.2"/>
+        <dia:point val="9.25,18.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.35,17.15;13.6,31.65"/>
+        <dia:rectangle val="8.4,18.2;13.6,31.65"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="9.2,17.2"/>
-        <dia:point val="9.2,19.9625"/>
-        <dia:point val="13.55,19.9625"/>
+        <dia:point val="9.25,18.25"/>
+        <dia:point val="9.25,19.6506"/>
+        <dia:point val="13.55,19.6506"/>
         <dia:point val="13.55,31.6"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">