Cambios en clases y der

- Se elimino Afiliado.activo ya que se puede chequear por fechaBaja == NULL
- Se puso fechaBaja en planes para poder realizar mantenimiento a largo plazo.
  Tambien ¿soluciona? problema de cambio de plan compulsivo
- Cobertura.tiempPermanencia se renombra a Cobertura.carencia.
- Se borra la relacion entre Autorizacion y Cobertura. Estaba por el porcentaje
  de Cobertura pero ahora lo almacenamos.

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 5c2490cd6119bfc9e4265c08d73044b983dbaefc..cb9ab877d94f1ee524c2afcdc28e424543a98959 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:real val="0.40462720394134521"/>
+          <dia:real val="0.4046272337436676"/>
         </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: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"/>
@@ -447,7 +447,7 @@
         <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>
@@ -597,29 +597,6 @@
             <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>
@@ -964,16 +941,16 @@
         </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: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: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"/>
@@ -2445,7 +2422,7 @@
       <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>
@@ -2811,7 +2788,6 @@
       </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">
@@ -2990,68 +2966,6 @@
       </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>
@@ -3110,7 +3024,7 @@
         <dia:connection handle="1" to="O3" connection="8"/>
       </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>
@@ -3171,7 +3085,7 @@
         <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:point val="-5.1,2.55"/>
       </dia:attribute>
@@ -3233,7 +3147,7 @@
         <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>
@@ -3381,7 +3295,7 @@
       </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>
@@ -3644,7 +3558,7 @@
       </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>
@@ -3697,16 +3611,16 @@
         </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: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:rectangle val="-2.95,0.5075;22.0008,3.3"/>
+        <dia:rectangle val="-2.95,-0.1925;22.0008,3.3"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="21.6508,1.5575"/>
@@ -3758,11 +3672,11 @@
         </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:object type="UML - Association" version="0" id="O32">
+    <dia:object type="UML - Association" version="0" id="O31">
       <dia:attribute name="obj_pos">
         <dia:point val="0.7,3.25"/>
       </dia:attribute>
@@ -3819,7 +3733,7 @@
         <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:point val="16.825,5.35"/>
       </dia:attribute>
@@ -3881,18 +3795,18 @@
         <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:point val="23.6,28.35"/>
+        <dia:point val="23.6,27.55"/>
       </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: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="27.925,28.35"/>
+        <dia:point val="27.925,27.55"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3943,7 +3857,7 @@
         <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:point val="15.25,31.4"/>
       </dia:attribute>
@@ -4002,19 +3916,19 @@
       </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:object type="UML - Association" version="0" id="O36">
+    <dia:object type="UML - Association" version="0" id="O35">
       <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: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: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>
@@ -4063,11 +3977,11 @@
         </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: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>
@@ -4122,11 +4036,11 @@
         </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: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>

diff --git a/diagramas/der.dia b/diagramas/der.dia
index 299506d2b6c27f298accad6cbf29fdb1d159c8fc..a16c9140698c73d76c6f52444725b183f472212a 100644 (file)
--- a/diagramas/der.dia
+++ b/diagramas/der.dia
@@ -531,7 +531,7 @@
         <dia:point val="21.6,23.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.55,23;30.3,31.1"/>
+        <dia:rectangle val="21.55,23;30.3,30.3"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="21.6,23.05"/>
@@ -540,7 +540,7 @@
         <dia:real val="8.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="8"/>
+        <dia:real val="7.1999999999999993"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Afiliado#</dia:string>
@@ -713,29 +713,6 @@
             <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>
@@ -1195,16 +1172,16 @@
         </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: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: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 plan se dio de baja#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -2760,7 +2737,7 @@
         </dia:composite>
         <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>
@@ -3141,13 +3118,13 @@
         <dia:point val="20.025,27.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.975,26.95;21.95,30.6"/>
+        <dia:rectangle val="19.975,26.95;21.95,29.8"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.025,27.7"/>
         <dia:point val="20.8125,27.7"/>
-        <dia:point val="20.8125,29.75"/>
-        <dia:point val="21.6,29.75"/>
+        <dia:point val="20.8125,28.95"/>
+        <dia:point val="21.6,28.95"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3195,7 +3172,7 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O4" connection="4"/>
-        <dia:connection handle="1" to="O2" connection="20"/>
+        <dia:connection handle="1" to="O2" connection="18"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O15">
@@ -3258,68 +3235,6 @@
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O16">
-      <dia:attribute name="obj_pos">
-        <dia:point val="6.925,16.55"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.615,15.8;7.975,29.42"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="6.925,16.55"/>
-        <dia:point val="4.825,16.55"/>
-        <dia:point val="4.825,28.57"/>
-        <dia:point val="0.665,28.57"/>
-      </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="28"/>
-        <dia:connection handle="1" to="O11" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O17">
       <dia:attribute name="obj_pos">
         <dia:point val="-5.885,34.47"/>
       </dia:attribute>
@@ -3381,7 +3296,7 @@
         <dia:connection handle="1" to="O3" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O18">
+    <dia:object type="UML - Association" version="0" id="O17">
       <dia:attribute name="obj_pos">
         <dia:point val="-5.075,9.78251"/>
       </dia:attribute>
@@ -3436,11 +3351,11 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O33" connection="8"/>
+        <dia:connection handle="0" to="O32" connection="8"/>
         <dia:connection handle="1" to="O5" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O19">
+    <dia:object type="UML - Class" version="0" id="O18">
       <dia:attribute name="obj_pos">
         <dia:point val="20.915,33.8825"/>
       </dia:attribute>
@@ -3634,7 +3549,7 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O20">
+    <dia:object type="UML - Class" version="0" id="O19">
       <dia:attribute name="obj_pos">
         <dia:point val="20.8508,11.3575"/>
       </dia:attribute>
@@ -3920,7 +3835,7 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O21">
+    <dia:object type="UML - Association" version="0" id="O20">
       <dia:attribute name="obj_pos">
         <dia:point val="26.3758,19.3575"/>
       </dia:attribute>
@@ -3977,11 +3892,11 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O20" connection="6"/>
+        <dia:connection handle="0" to="O19" connection="6"/>
         <dia:connection handle="1" to="O1" connection="26"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O22">
+    <dia:object type="UML - Association" version="0" id="O21">
       <dia:attribute name="obj_pos">
         <dia:point val="5.65,4.75"/>
       </dia:attribute>
@@ -4038,7 +3953,7 @@
         <dia:connection handle="1" to="O7" connection="26"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O23">
+    <dia:object type="UML - Association" version="0" id="O22">
       <dia:attribute name="obj_pos">
         <dia:point val="17.975,17.35"/>
       </dia:attribute>
@@ -4100,7 +4015,7 @@
         <dia:connection handle="1" to="O2" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O24">
+    <dia:object type="UML - Association" version="0" id="O23">
       <dia:attribute name="obj_pos">
         <dia:point val="31.9008,12.0575"/>
       </dia:attribute>
@@ -4155,11 +4070,11 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O20" connection="4"/>
+        <dia:connection handle="0" to="O19" connection="4"/>
         <dia:connection handle="1" to="O6" connection="14"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O25">
+    <dia:object type="UML - Association" version="0" id="O24">
       <dia:attribute name="obj_pos">
         <dia:point val="47.615,35.35"/>
       </dia:attribute>
@@ -4218,7 +4133,7 @@
         <dia:connection handle="1" to="O2" connection="15"/>
       </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="12.45,17.85"/>
       </dia:attribute>
@@ -4282,7 +4197,7 @@
         <dia:connection handle="1" to="O10" connection="8"/>
       </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:point val="51.25,16.4"/>
       </dia:attribute>
@@ -4343,7 +4258,7 @@
         <dia:connection handle="1" to="O9" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O28">
+    <dia:object type="UML - Association" version="0" id="O27">
       <dia:attribute name="obj_pos">
         <dia:point val="38.85,15.1"/>
       </dia:attribute>
@@ -4400,7 +4315,7 @@
         <dia:connection handle="1" to="O6" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O29">
+    <dia:object type="UML - Association" version="0" id="O28">
       <dia:attribute name="obj_pos">
         <dia:point val="30.25,24.95"/>
       </dia:attribute>
@@ -4457,7 +4372,7 @@
         <dia:connection handle="1" to="O1" connection="6"/>
       </dia:connections>
     </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="20.915,36.5825"/>
       </dia:attribute>
@@ -4510,11 +4425,11 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O19" connection="10"/>
+        <dia:connection handle="0" to="O18" connection="10"/>
         <dia:connection handle="1" to="O4" connection="6"/>
       </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="-4.925,17.95"/>
       </dia:attribute>
@@ -4573,7 +4488,7 @@
         <dia:connection handle="1" to="O12" connection="3"/>
       </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:point val="20.8508,12.0575"/>
       </dia:attribute>
@@ -4631,11 +4546,11 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O20" connection="3"/>
+        <dia:connection handle="0" to="O19" connection="3"/>
         <dia:connection handle="1" to="O5" connection="17"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O33">
+    <dia:object type="UML - Class" version="0" id="O32">
       <dia:attribute name="obj_pos">
         <dia:point val="-5.075,7.88251"/>
       </dia:attribute>
@@ -4783,7 +4698,7 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </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:point val="-5.075,10.5825"/>
       </dia:attribute>
@@ -4842,11 +4757,11 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O33" connection="10"/>
+        <dia:connection handle="0" to="O32" connection="10"/>
         <dia:connection handle="1" to="O3" connection="4"/>
       </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:point val="51.25,7.5"/>
       </dia:attribute>
@@ -4912,7 +4827,7 @@
         <dia:connection handle="1" to="O0" connection="8"/>
       </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:point val="56.265,34.55"/>
       </dia:attribute>
@@ -4971,19 +4886,19 @@
         <dia:connection handle="1" to="O0" connection="4"/>
       </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="21.6,30.55"/>
+        <dia:point val="21.6,29.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.55,29.8;26.625,33.45"/>
+        <dia:rectangle val="20.55,29;26.625,32.8575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="21.6,30.55"/>
-        <dia:point val="20.6,30.55"/>
+        <dia:point val="21.6,29.75"/>
+        <dia:point val="20.6,29.75"/>
         <dia:point val="20.6,32.8075"/>
         <dia:point val="25.925,32.8075"/>
-        <dia:point val="25.925,31.05"/>
+        <dia:point val="25.925,30.25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -5031,20 +4946,20 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O2" connection="22"/>
+        <dia:connection handle="0" to="O2" connection="20"/>
         <dia:connection handle="1" to="O2" connection="6"/>
       </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="30.25,31.05"/>
+        <dia:point val="30.25,30.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.865,30.3;38,36.6325"/>
+        <dia:rectangle val="29.865,29.5;38,36.6325"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.25,31.05"/>
-        <dia:point val="31.25,31.05"/>
+        <dia:point val="30.25,30.25"/>
+        <dia:point val="31.25,30.25"/>
         <dia:point val="31.25,35.7825"/>
         <dia:point val="29.915,35.7825"/>
       </dia:attribute>
@@ -5091,10 +5006,10 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O2" connection="7"/>
-        <dia:connection handle="1" to="O19" connection="9"/>
+        <dia:connection handle="1" to="O18" connection="9"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O39">
+    <dia:object type="UML - Association" version="0" id="O38">
       <dia:attribute name="obj_pos">
         <dia:point val="9.8,3.45"/>
       </dia:attribute>