X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/blobdiff_plain/bea6b7b3c2a29e38bed0f7d023fadbeb1ae9cb54..9ed8c3e62faeae02efd5e0e941e3e2887569762b:/diagramas/clases.dia

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 5a988b9..69b87d6 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.37498420476913452"/>
+          <dia:real val="0.39678561687469482"/>
         </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="34.6,23.35"/>
+        <dia:point val="35.7,23.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.55,23.3;39.15,25.2"/>
+        <dia:rectangle val="35.65,23.5;40.25,25.4"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="34.6,23.35"/>
+        <dia:point val="35.7,23.55"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.5"/>
@@ -172,16 +172,16 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="33.3,8.95"/>
+        <dia:point val="29.95,13.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.25,8.9;45.85,16.2"/>
+        <dia:rectangle val="29.9,13.15;42.4,20.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="33.3,8.95"/>
+        <dia:point val="29.95,13.2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="12.5"/>
+        <dia:real val="12.4"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="7.1999999999999993"/>
@@ -435,19 +435,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="21.6,23.05"/>
+        <dia:point val="23.6,22.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.55,23;30.3,28.7"/>
+        <dia:rectangle val="23.55,22.7;32.3,29.4"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="21.6,23.05"/>
+        <dia:point val="23.6,22.75"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="5.5999999999999996"/>
+        <dia:real val="6.6000000000000005"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Afiliado#</dia:string>
@@ -471,7 +471,7 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_comments">
         <dia:boolean val="false"/>
@@ -599,16 +599,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#activo#</dia:string>
+            <dia:string>#moroso#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#bool#</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>#True si está en actividad (afiliado). (No convendría poner Plan = NULL en caso de no estar más afiliado?)#</dia:string>
+            <dia:string>#Indica cuantos meses adeuda.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -620,31 +620,69 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umlattribute">
+      </dia:attribute>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#moroso#</dia:string>
+            <dia:string>#existe#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#bool#</dia:string>
           </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Indica cuantos meses adeuda.#</dia:string>
+            <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:attribute>
-      <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
@@ -655,16 +693,16 @@
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.875,13;1.075,15.5"/>
+        <dia:rectangle val="-4.875,13;1.025,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.8499999999999996"/>
+        <dia:real val="5.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="2.3999999999999999"/>
+        <dia:real val="3.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestacion#</dia:string>
@@ -745,6 +783,29 @@
         <dia:real val="1"/>
       </dia:attribute>
       <dia:attribute name="attributes">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#codigo#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#int#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Código de la prestación según el codificador#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#nombre#</dia:string>
@@ -777,16 +838,16 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O4">
       <dia:attribute name="obj_pos">
-        <dia:point val="10.525,26.1"/>
+        <dia:point val="11.125,26.9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.475,26.05;20.275,31.75"/>
+        <dia:rectangle val="11.075,26.85;20.725,32.55"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="10.525,26.1"/>
+        <dia:point val="11.125,26.9"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="9.6999999999999993"/>
+        <dia:real val="9.5499999999999989"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="5.5999999999999996"/>
@@ -964,16 +1025,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"/>
@@ -994,16 +1055,16 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="-4,2.75"/>
+        <dia:point val="-5.05,4.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.05,2.7;1.9,6"/>
+        <dia:rectangle val="-5.1,4.1;0.8,7.4"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-4,2.75"/>
+        <dia:point val="-5.05,4.15"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="5.8499999999999996"/>
+        <dia:real val="5.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
@@ -1142,19 +1203,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="32.375,0.1"/>
+        <dia:point val="37.575,3.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.325,0.05;40.025,3.35"/>
+        <dia:rectangle val="37.525,3;45.225,7.1"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="32.375,0.1"/>
+        <dia:point val="37.575,3.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="4"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Cap#</dia:string>
@@ -1281,6 +1342,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#codigo#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Código único para identificar al Cap (se usa para referirse al Cap en listados, etc)#</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">
@@ -1290,19 +1374,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="5.775,4.65"/>
+        <dia:point val="5.525,6.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.725,4.6;16.925,13.7"/>
+        <dia:rectangle val="5.475,6.8;16.625,15.1"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="5.775,4.65"/>
+        <dia:point val="5.525,6.85"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="11.1"/>
+        <dia:real val="11.049999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="9"/>
+        <dia:real val="8.1999999999999993"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>
@@ -1359,7 +1443,7 @@
         <dia:font family="sans" style="80" name="Helvetica"/>
       </dia:attribute>
       <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="0" name="Helvetica"/>
+        <dia:font family="sans" style="88" name="Helvetica"/>
       </dia:attribute>
       <dia:attribute name="comment_font">
         <dia:font family="sans" style="8" name="Helvetica"/>
@@ -1406,29 +1490,6 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#tipo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#enum(manual,auto)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Tipo de autorización. (esto si tenemos subclases no debería existir)#</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>#porcentajeCobertura#</dia:string>
@@ -1555,7 +1616,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Una descripcion de porque se aprueba/rechaza la autorizacion.#</dia:string>
+            <dia:string>#Una descripcion coloquial del por qué se aprueba o rechaza la autorización#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1571,7 +1632,7 @@
       <dia:attribute name="operations">
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#get_estado#</dia:string>
+            <dia:string>#getEstado#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
@@ -1607,16 +1668,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.5,16.15"/>
+        <dia:point val="36.15,20.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.875,16.1;40.35,23.52"/>
+        <dia:rectangle val="27.875,20.35;37,23.57"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="39.5,16.15"/>
-        <dia:point val="39.5,22.72"/>
-        <dia:point val="25.925,22.72"/>
-        <dia:point val="25.925,23.05"/>
+        <dia:point val="36.15,20.4"/>
+        <dia:point val="36.15,22.72"/>
+        <dia:point val="27.925,22.72"/>
+        <dia:point val="27.925,22.75"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -1642,16 +1703,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.5,16.15"/>
+        <dia:point val="36.15,20.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="36.8,16.1;40.35,23.52"/>
+        <dia:rectangle val="35.3,20.35;38,23.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="39.5,16.15"/>
-        <dia:point val="39.5,22.72"/>
-        <dia:point val="36.85,22.72"/>
-        <dia:point val="36.85,23.35"/>
+        <dia:point val="36.15,20.4"/>
+        <dia:point val="36.15,22.72"/>
+        <dia:point val="37.95,22.72"/>
+        <dia:point val="37.95,23.55"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -1677,13 +1738,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="44.115,-2.04"/>
+        <dia:point val="44.715,11.06"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="44.065,-2.09;51.765,1.21"/>
+        <dia:rectangle val="44.665,11.01;52.365,14.31"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="44.115,-2.04"/>
+        <dia:point val="44.715,11.06"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -1825,19 +1886,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="42.415,25.4"/>
+        <dia:point val="43.715,24.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="42.365,25.35;51.115,30.25"/>
+        <dia:rectangle val="43.665,24.6;52.415,31.3"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="42.415,25.4"/>
+        <dia:point val="43.715,24.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="6.6000000000000005"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Solicitante#</dia:string>
@@ -1861,7 +1922,7 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_comments">
         <dia:boolean val="false"/>
@@ -2011,7 +2072,68 @@
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
-      <dia:attribute name="operations"/>
+      <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:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
@@ -2019,16 +2141,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.5,16.15"/>
+        <dia:point val="36.15,20.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.65,16.1;46.79,25.45"/>
+        <dia:rectangle val="35.3,20.35;48.09,24.7"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="39.5,16.15"/>
-        <dia:point val="39.5,22.72"/>
-        <dia:point val="46.74,22.72"/>
-        <dia:point val="46.74,25.4"/>
+        <dia:point val="36.15,20.4"/>
+        <dia:point val="36.15,22.72"/>
+        <dia:point val="48.04,22.72"/>
+        <dia:point val="48.04,24.65"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2054,13 +2176,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.065,21.86"/>
+        <dia:point val="11.215,20.01"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.015,21.81;19.765,25.11"/>
+        <dia:rectangle val="11.165,19.96;19.915,23.26"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="11.065,21.86"/>
+        <dia:point val="11.215,20.01"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -2158,7 +2280,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Usado para ampliar los motivos por la cual SE PIDE la autorizacion en 1era instancia.#</dia:string>
+            <dia:string>#Una descripcion coloquial del por qué se solicita la autorización#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -2202,16 +2324,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.325,13.65"/>
+        <dia:point val="11.05,15.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.475,13.6;15.44,21.91"/>
+        <dia:rectangle val="10.2,15;15.59,20.06"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="11.325,13.65"/>
-        <dia:point val="11.325,17.97"/>
-        <dia:point val="15.39,17.97"/>
-        <dia:point val="15.39,21.86"/>
+        <dia:point val="11.05,15.05"/>
+        <dia:point val="11.05,18.0325"/>
+        <dia:point val="15.54,18.0325"/>
+        <dia:point val="15.54,20.01"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2237,13 +2359,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="2.73,19.47"/>
+        <dia:point val="-0.17,20.02"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.68,19.42;13.13,21.32"/>
+        <dia:rectangle val="-0.22,19.97;10.23,21.87"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="2.73,19.47"/>
+        <dia:point val="-0.17,20.02"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="10.35"/>
@@ -2338,16 +2460,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.325,13.65"/>
+        <dia:point val="11.05,15.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.855,13.6;12.175,19.52"/>
+        <dia:rectangle val="4.955,15;11.9,20.07"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="11.325,13.65"/>
-        <dia:point val="11.325,17.97"/>
-        <dia:point val="7.905,17.97"/>
-        <dia:point val="7.905,19.47"/>
+        <dia:point val="11.05,15.05"/>
+        <dia:point val="11.05,18.0325"/>
+        <dia:point val="5.005,18.0325"/>
+        <dia:point val="5.005,20.02"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2373,16 +2495,16 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.585,27.52"/>
+        <dia:point val="-5.485,30.02"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.635,27.47;7.665,32.37"/>
+        <dia:rectangle val="-5.535,29.97;7.665,34.87"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5.585,27.52"/>
+        <dia:point val="-5.485,30.02"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="13.199999999999999"/>
+        <dia:real val="13.1"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
@@ -2468,7 +2590,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>
@@ -2567,16 +2689,16 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O18">
       <dia:attribute name="obj_pos">
-        <dia:point val="0.815,-3.52999"/>
+        <dia:point val="-5.435,24.62"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.765,-3.57999;6.715,-0.27999"/>
+        <dia:rectangle val="-5.485,24.57;0.415,27.87"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="0.815,-3.52999"/>
+        <dia:point val="-5.435,24.62"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="5.8499999999999996"/>
+        <dia:real val="5.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
@@ -2715,16 +2837,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O19">
       <dia:attribute name="obj_pos">
-        <dia:point val="7.615,28.22"/>
+        <dia:point val="7.615,30.72"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.565,26;11.275,29.02"/>
+        <dia:rectangle val="7.565,26.85;11.875,31.57"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="7.615,28.22"/>
-        <dia:point val="8.96521,28.22"/>
-        <dia:point val="8.96521,26.8"/>
-        <dia:point val="10.525,26.8"/>
+        <dia:point val="7.615,30.72"/>
+        <dia:point val="8.96521,30.72"/>
+        <dia:point val="8.96521,27.6"/>
+        <dia:point val="11.125,27.6"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -2777,22 +2899,25 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.225,26.8"/>
+        <dia:point val="20.675,27.6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.175,26;21.95,28.15"/>
+        <dia:rectangle val="20.625,26.3;23.95,28.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="20.225,26.8"/>
-        <dia:point val="20.9125,26.8"/>
-        <dia:point val="20.9125,27.35"/>
-        <dia:point val="21.6,27.35"/>
+        <dia:point val="20.675,27.6"/>
+        <dia:point val="22.115,27.6"/>
+        <dia:point val="22.115,27.05"/>
+        <dia:point val="23.6,27.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia: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>
@@ -2819,7 +2944,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -2831,26 +2956,23 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O4" connection="4"/>
-        <dia:connection handle="1" to="O2" connection="14"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O21">
       <dia:attribute name="obj_pos">
-        <dia:point val="44.115,-1.34"/>
+        <dia:point val="44.715,11.76"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.225,-2.14;44.815,1.6"/>
+        <dia:rectangle val="40.625,6.3;45.415,12.61"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="44.115,-1.34"/>
-        <dia:point val="42.045,-1.34"/>
-        <dia:point val="42.045,0.8"/>
-        <dia:point val="39.975,0.8"/>
+        <dia:point val="44.715,11.76"/>
+        <dia:point val="41.375,11.76"/>
+        <dia:point val="41.375,7.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
-        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -2890,29 +3012,26 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O10" connection="3"/>
-        <dia:connection handle="1" to="O6" connection="4"/>
+        <dia:connection handle="1" to="O6" connection="6"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O22">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.5,8.95"/>
+        <dia:point val="43.715,24.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="35.425,2.55;40.2,10.55"/>
+        <dia:rectangle val="40.15,23.5;44.415,25.5"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="39.5,8.95"/>
-        <dia:point val="39.5,6.98251"/>
-        <dia:point val="36.175,6.98251"/>
-        <dia:point val="36.175,3.3"/>
+        <dia:point val="43.715,24.65"/>
+        <dia:point val="41.9575,24.65"/>
+        <dia:point val="41.9575,24.25"/>
+        <dia:point val="40.2,24.25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -2926,7 +3045,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
+            <dia:string>#* #</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -2940,38 +3059,38 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string># 1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O1" connection="1"/>
-        <dia:connection handle="1" to="O6" connection="6"/>
+        <dia:connection handle="0" to="O11" connection="0"/>
+        <dia:connection handle="1" to="O0" connection="4"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O23">
       <dia:attribute name="obj_pos">
-        <dia:point val="42.415,25.4"/>
+        <dia:point val="-1.925,16.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.05,23.25;43.115,26.2"/>
+        <dia:rectangle val="-3.285,16.2;-0.875,25.37"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="42.415,25.4"/>
-        <dia:point val="40.7575,25.4"/>
-        <dia:point val="40.7575,24.05"/>
-        <dia:point val="39.1,24.05"/>
+        <dia:point val="-1.925,16.25"/>
+        <dia:point val="-1.925,20.435"/>
+        <dia:point val="-2.535,20.435"/>
+        <dia:point val="-2.535,24.62"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
+        <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -2985,7 +3104,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#* #</dia:string>
+            <dia:string># *#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -2999,36 +3118,38 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string># 1#</dia:string>
+            <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:enum val="1"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O11" connection="0"/>
-        <dia:connection handle="1" to="O0" connection="4"/>
+        <dia:connection handle="0" to="O3" connection="6"/>
+        <dia:connection handle="1" to="O18" connection="1"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O24">
       <dia:attribute name="obj_pos">
-        <dia:point val="0.975,13.75"/>
+        <dia:point val="-5.485,30.72"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.925,-1.07999;4.465,14.55"/>
+        <dia:rectangle val="-6.535,15;-4.475,31.57"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="0.975,13.75"/>
-        <dia:point val="3.715,13.75"/>
-        <dia:point val="3.715,-0.32999"/>
+        <dia:point val="-5.485,30.72"/>
+        <dia:point val="-6.485,30.72"/>
+        <dia:point val="-6.485,15.75"/>
+        <dia:point val="-4.825,15.75"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
+        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -3042,7 +3163,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string># *#</dia:string>
+            <dia:string>#* #</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3062,35 +3183,34 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O3" connection="4"/>
-        <dia:connection handle="1" to="O18" connection="6"/>
+        <dia:connection handle="0" to="O17" connection="3"/>
+        <dia:connection handle="1" to="O3" connection="10"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O25">
       <dia:attribute name="obj_pos">
-        <dia:point val="5.775,5.35"/>
+        <dia:point val="-4.825,13.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.265,4.55;6.825,28.32"/>
+        <dia:rectangle val="-5.875,6.6;-1.4,14.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="5.775,5.35"/>
-        <dia:point val="2.42202,5.35"/>
-        <dia:point val="2.42202,27.52"/>
-        <dia:point val="1.015,27.52"/>
+        <dia:point val="-4.825,13.75"/>
+        <dia:point val="-5.825,13.75"/>
+        <dia:point val="-5.825,10.55"/>
+        <dia:point val="-2.15,10.55"/>
+        <dia:point val="-2.15,7.35"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+        <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -3104,7 +3224,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string># * #</dia:string>
+            <dia:string>#* #</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3118,7 +3238,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3129,30 +3249,31 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O7" connection="3"/>
-        <dia:connection handle="1" to="O17" connection="1"/>
+        <dia:connection handle="0" to="O3" connection="3"/>
+        <dia:connection handle="1" to="O5" connection="6"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O26">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.585,28.22"/>
+        <dia:point val="-5.05,4.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.635,14.7;-1.175,29.02"/>
+        <dia:rectangle val="-5.1,-1.26749;49.265,11.81"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-5.585,28.22"/>
-        <dia:point val="-6.585,28.22"/>
-        <dia:point val="-6.585,21.835"/>
-        <dia:point val="-1.925,21.835"/>
-        <dia:point val="-1.925,15.45"/>
+        <dia:point val="-5.05,4.15"/>
+        <dia:point val="-5.05,-0.51749"/>
+        <dia:point val="48.515,-0.51749"/>
+        <dia:point val="48.515,11.06"/>
       </dia:attribute>
       <dia: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="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
       </dia:attribute>
@@ -3165,7 +3286,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#* #</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3190,157 +3311,34 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O17" connection="3"/>
-        <dia:connection handle="1" to="O3" connection="6"/>
+        <dia:connection handle="0" to="O5" connection="0"/>
+        <dia:connection handle="1" to="O10" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O27">
+    <dia:object type="UML - Class" version="0" id="O27">
       <dia:attribute name="obj_pos">
-        <dia:point val="-4.825,13.75"/>
+        <dia:point val="40.015,31.8325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.875,5.2;-0.35,14.55"/>
+        <dia:rectangle val="39.965,31.7825;47.665,35.0825"/>
       </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="-4.825,13.75"/>
-        <dia:point val="-5.825,13.75"/>
-        <dia:point val="-5.825,9.85"/>
-        <dia:point val="-1.1,9.85"/>
-        <dia:point val="-1.1,5.95"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#* #</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O3" connection="3"/>
-        <dia:connection handle="1" to="O5" connection="6"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O28">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-4,2.75"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.05,-5.36749;48.665,4.35"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="-4,2.75"/>
-        <dia:point val="-4,-4.56749"/>
-        <dia:point val="47.915,-4.56749"/>
-        <dia:point val="47.915,-2.04"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-      </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="1"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O5" connection="0"/>
-        <dia:connection handle="1" to="O10" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O29">
-      <dia:attribute name="obj_pos">
-        <dia:point val="33.565,28.5825"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.515,28.5325;41.715,31.8325"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="33.565,28.5825"/>
+      <dia:attribute name="elem_corner">
+        <dia:point val="40.015,31.8325"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="8.0999999999999996"/>
+        <dia:real val="7.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#Historial de planes#</dia:string>
+        <dia:string>#HistoriaPlan#</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Representa el período de tiempo que un afiliado estuvo en un plan.#</dia:string>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
@@ -3465,169 +3463,21 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O30">
+    <dia:object type="UML - Class" version="0" id="O28">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.2508,-1.24249"/>
+        <dia:point val="21.6508,0.8575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.2008,-1.29249;28.2508,2.00751"/>
+        <dia:rectangle val="21.6008,0.8075;32.7508,8.1075"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="13.2508,-1.24249"/>
+        <dia:point val="21.6508,0.8575"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="14.949999999999999"/>
+        <dia:real val="11.049999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#Telefono#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </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="suppress_attributes">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_attributes">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_comments">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <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>#tipo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#enum(particular, laboral, celular)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Tipo de telefono.#</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>#numero#</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>#Numero de telefono#</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">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O31">
-      <dia:attribute name="obj_pos">
-        <dia:point val="20.9008,11.7575"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.8508,11.7075;32.0508,18.2075"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="20.9008,11.7575"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="11.1"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="6.4000000000000004"/>
+        <dia:real val="7.1999999999999993"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Direccion#</dia:string>
@@ -3846,85 +3696,49 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-      </dia:attribute>
-      <dia:attribute name="operations"/>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O32">
-      <dia:attribute name="obj_pos">
-        <dia:point val="20.7008,1.95751"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.6508,1.90751;33.35,11.25"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="20.7008,1.95751"/>
-        <dia:point val="20.7008,9.65"/>
-        <dia:point val="33.3,9.65"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#telefono#</dia:string>
           </dia:attribute>
-          <dia:attribute name="multiplicity">
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
+          <dia:attribute name="comment">
+            <dia:string>#Teléfono del domicilio#</dia:string>
           </dia:attribute>
-          <dia:attribute name="aggregate">
+          <dia:attribute name="visibility">
             <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>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
+          <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O30" connection="6"/>
-        <dia:connection handle="1" to="O1" connection="3"/>
-      </dia:connections>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O33">
+    <dia:object type="UML - Association" version="0" id="O29">
       <dia:attribute name="obj_pos">
-        <dia:point val="32.0008,12.4575"/>
+        <dia:point val="27.1758,8.0575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.9508,11.6575;33.65,14.05"/>
+        <dia:rectangle val="27.1258,8.0075;30.7,18.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="32.0008,12.4575"/>
-        <dia:point val="32.6504,12.4575"/>
-        <dia:point val="32.6504,13.25"/>
-        <dia:point val="33.3,13.25"/>
+        <dia:point val="27.1758,8.0575"/>
+        <dia:point val="27.1758,17.5"/>
+        <dia:point val="29.95,17.5"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
       </dia:attribute>
@@ -3960,36 +3774,31 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+            <dia:enum val="2"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O31" connection="4"/>
+        <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="O34">
+    <dia:object type="UML - Association" version="0" id="O30">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.7008,-1.24249"/>
+        <dia:point val="21.6508,1.5575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-1.15,-4.81749;21.4008,4.35"/>
+        <dia:rectangle val="-2.9,0.8075;22.0008,4.9"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="20.7008,-1.24249"/>
-        <dia:point val="20.7008,-4.01749"/>
-        <dia:point val="-1.1,-4.01749"/>
-        <dia:point val="-1.1,2.75"/>
+        <dia:point val="21.6508,1.5575"/>
+        <dia:point val="-2.15,1.5575"/>
+        <dia:point val="-2.15,4.15"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
       </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
-      </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
       </dia:attribute>
@@ -4022,30 +3831,28 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+            <dia:enum val="2"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O30" connection="1"/>
+        <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="O35">
+    <dia:object type="UML - Association" version="0" id="O31">
       <dia:attribute name="obj_pos">
-        <dia:point val="26.4508,18.1575"/>
+        <dia:point val="0.75,4.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.75,5.9;27.1508,20.5575"/>
+        <dia:rectangle val="0.7,4.1;11.75,8.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="26.4508,18.1575"/>
-        <dia:point val="26.4508,19.1575"/>
-        <dia:point val="1.8,19.1575"/>
-        <dia:point val="1.8,5.95"/>
+        <dia:point val="0.75,4.85"/>
+        <dia:point val="11.05,4.85"/>
+        <dia:point val="11.05,6.85"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
       </dia:attribute>
@@ -4070,63 +3877,6 @@
             <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="O31" connection="6"/>
-        <dia:connection handle="1" to="O5" connection="7"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O36">
-      <dia:attribute name="obj_pos">
-        <dia:point val="1.8,3.45"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.05,2.65;12.025,6.25"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="1.8,3.45"/>
-        <dia:point val="11.325,3.45"/>
-        <dia:point val="11.325,4.65"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
-          </dia:attribute>
-        </dia:composite>
         <dia:composite>
           <dia:attribute name="role">
             <dia:string>##</dia:string>
@@ -4147,18 +3897,18 @@
         <dia:connection handle="1" to="O7" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O37">
+    <dia:object type="UML - Association" version="0" id="O32">
       <dia:attribute name="obj_pos">
-        <dia:point val="16.875,5.35"/>
+        <dia:point val="16.575,7.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.825,4.55;22.35,24.55"/>
+        <dia:rectangle val="16.525,6.8;23.95,24.3"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="16.875,5.35"/>
-        <dia:point val="20.072,5.35"/>
-        <dia:point val="20.072,23.75"/>
-        <dia:point val="21.6,23.75"/>
+        <dia:point val="16.575,7.55"/>
+        <dia:point val="20.8967,7.55"/>
+        <dia:point val="20.8967,23.45"/>
+        <dia:point val="23.6,23.45"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4200,7 +3950,7 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
@@ -4209,18 +3959,18 @@
         <dia:connection handle="1" to="O2" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O38">
+    <dia:object type="UML - Association" version="0" id="O33">
       <dia:attribute name="obj_pos">
-        <dia:point val="21.6,28.65"/>
+        <dia:point val="23.6,29.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.85,27.9;32.575,34.0575"/>
+        <dia:rectangle val="22.85,28.6;34.425,34.0575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="21.6,28.65"/>
-        <dia:point val="21.6,34.0075"/>
-        <dia:point val="25.925,34.0075"/>
-        <dia:point val="25.925,28.65"/>
+        <dia:point val="23.6,29.35"/>
+        <dia:point val="23.6,34.0075"/>
+        <dia:point val="27.925,34.0075"/>
+        <dia:point val="27.925,29.35"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4271,18 +4021,18 @@
         <dia:connection handle="1" to="O2" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O39">
+    <dia:object type="UML - Association" version="0" id="O34">
       <dia:attribute name="obj_pos">
-        <dia:point val="15.375,31.7"/>
+        <dia:point val="15.9,32.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.325,31.0325;38.365,35.5825"/>
+        <dia:rectangle val="15.85,32.45;44.515,37.4325"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="15.375,31.7"/>
-        <dia:point val="15.375,34.3575"/>
-        <dia:point val="37.615,34.3575"/>
-        <dia:point val="37.615,31.7825"/>
+        <dia:point val="15.9,32.5"/>
+        <dia:point val="15.9,36.4075"/>
+        <dia:point val="43.815,36.4075"/>
+        <dia:point val="43.815,35.0325"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4304,7 +4054,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4324,35 +4074,38 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O4" connection="6"/>
-        <dia:connection handle="1" to="O29" connection="6"/>
+        <dia:connection handle="1" to="O27" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O40">
+    <dia:object type="UML - Association" version="0" id="O35">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.25,28.15"/>
+        <dia:point val="32.25,27.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.2,27.35;34.265,30.0825"/>
+        <dia:rectangle val="31.5,26.3;41.8151,33.3825"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.25,28.15"/>
-        <dia:point val="31.9075,28.15"/>
-        <dia:point val="31.9075,29.2825"/>
-        <dia:point val="33.565,29.2825"/>
+        <dia:point val="32.25,27.05"/>
+        <dia:point val="35.0651,27.05"/>
+        <dia:point val="35.0651,32.5325"/>
+        <dia:point val="40.015,32.5325"/>
       </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:string>#Historial de planes#</dia:string>
       </dia:attribute>
       <dia:attribute name="direction">
         <dia:enum val="0"/>
@@ -4369,7 +4122,7 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
         </dia:composite>
         <dia:composite>
@@ -4377,7 +4130,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1 #</dia:string>
+            <dia:string>#* #</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4388,22 +4141,22 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O2" connection="17"/>
-        <dia:connection handle="1" to="O29" 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="O41">
+    <dia:object type="UML - Association" version="0" id="O36">
       <dia:attribute name="obj_pos">
-        <dia:point val="32.375,0.8"/>
+        <dia:point val="32.7008,1.5575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.1008,-1.34249;32.725,1.6"/>
+        <dia:rectangle val="32.6508,0.8075;38.325,6.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="32.375,0.8"/>
-        <dia:point val="30.2629,0.8"/>
-        <dia:point val="30.2629,-0.54249"/>
-        <dia:point val="28.1508,-0.54249"/>
+        <dia:point val="32.7008,1.5575"/>
+        <dia:point val="35.1379,1.5575"/>
+        <dia:point val="35.1379,5.75"/>
+        <dia:point val="37.575,5.75"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4442,33 +4195,35 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+            <dia:enum val="2"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O6" connection="3"/>
-        <dia:connection handle="1" to="O30" 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="O42">
+    <dia:object type="UML - Association" version="0" id="O37">
       <dia:attribute name="obj_pos">
-        <dia:point val="26.4508,11.7575"/>
+        <dia:point val="43.715,26.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.4008,2;32.725,13.3575"/>
+        <dia:rectangle val="32.2,25.5;44.415,27.4"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="26.4508,11.7575"/>
-        <dia:point val="26.4508,2.8"/>
-        <dia:point val="32.375,2.8"/>
+        <dia:point val="43.715,26.55"/>
+        <dia:point val="37.9825,26.55"/>
+        <dia:point val="37.9825,26.25"/>
+        <dia:point val="32.25,26.25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>##</dia:string>
+        <dia:string>#titularidad#</dia:string>
       </dia:attribute>
       <dia:attribute name="direction">
         <dia:enum val="0"/>
@@ -4479,7 +4234,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string>#* #</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4490,10 +4245,10 @@
         </dia:composite>
         <dia:composite>
           <dia:attribute name="role">
-            <dia:string>##</dia:string>
+            <dia:string># titular#</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string># 0..1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4504,22 +4259,22 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O31" connection="1"/>
-        <dia:connection handle="1" to="O6" connection="10"/>
+        <dia:connection handle="0" to="O11" connection="8"/>
+        <dia:connection handle="1" to="O2" connection="13"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O43">
+    <dia:object type="UML - Association" version="0" id="O38">
       <dia:attribute name="obj_pos">
-        <dia:point val="42.415,27.3"/>
+        <dia:point val="5.525,7.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.2,25.75;43.115,28.1"/>
+        <dia:rectangle val="0.925,6.8;5.875,14.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="42.415,27.3"/>
-        <dia:point val="36.3325,27.3"/>
-        <dia:point val="36.3325,26.55"/>
-        <dia:point val="30.25,26.55"/>
+        <dia:point val="5.525,7.55"/>
+        <dia:point val="3.25,7.55"/>
+        <dia:point val="3.25,13.75"/>
+        <dia:point val="0.975,13.75"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4527,7 +4282,7 @@
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#titularidad#</dia:string>
+        <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="direction">
         <dia:enum val="0"/>
@@ -4538,7 +4293,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#* #</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4549,10 +4304,10 @@
         </dia:composite>
         <dia:composite>
           <dia:attribute name="role">
-            <dia:string># titular#</dia:string>
+            <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string># 0..1#</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4563,8 +4318,8 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O11" connection="8"/>
-        <dia:connection handle="1" to="O2" connection="13"/>
+        <dia:connection handle="0" to="O7" connection="3"/>
+        <dia:connection handle="1" to="O3" connection="4"/>
       </dia:connections>
     </dia:object>
   </dia:layer>