Se agrega a Afiliado y Solicitante existe() y getNext().

[z.facultad/75.10/miklolife.git] / diagramas / clases.dia
diff --git a/diagramas/clases.dia b/diagramas/clases.dia

index 7e849e9a358a84b7559e9f13747d9d6bb7e6665b..69b87d6862dcf13c44af8450683f09d39db3059f 100644 (file)
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -28,7 +28,7 @@
            <dia:boolean val="false"/>
          </dia:attribute>
          <dia:attribute name="scaling">
            <dia:boolean val="false"/>
          </dia:attribute>
          <dia:attribute name="scaling">
-          <dia:real val="0.38150566816329956"/>
+          <dia:real val="0.39678561687469482"/>
          </dia:attribute>
          <dia:attribute name="fitto">
            <dia:boolean val="true"/>
          </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:layer name="Fondo" visible="true">
      <dia:object type="UML - Class" version="0" id="O0">
        <dia:attribute name="obj_pos">
-        <dia:point val="34.05,25.1"/>
+        <dia:point val="35.7,23.55"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="34,25.05;38.6,26.95"/>
+        <dia:rectangle val="35.65,23.5;40.25,25.4"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="34.05,25.1"/>
+        <dia:point val="35.7,23.55"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="4.5"/>
        </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: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: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: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: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"/>
        </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: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: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: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: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>
        </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="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"/>
        </dia:attribute>
        <dia:attribute name="visible_comments">
          <dia:boolean val="false"/>
@@ -530,7 +530,7 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#nroAfiliado#</dia:string>
+            <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#int#</dia:string>
@@ -599,16 +599,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#activo#</dia:string>
+            <dia:string>#moroso#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </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: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"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -620,31 +620,69 @@
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
              <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: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:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#bool#</dia:string>
            </dia:attribute>
            </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: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>
            <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="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="class_scope">
              <dia:boolean val="false"/>
            </dia:attribute>
+          <dia:attribute name="parameters"/>
          </dia:composite>
        </dia:attribute>
          </dia:composite>
        </dia:attribute>
-      <dia:attribute name="operations"/>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
@@ -655,13 +693,13 @@
          <dia:point val="-4.825,13.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
          <dia:point val="-4.825,13.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.875,13;1.075,16.3"/>
+        <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: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="3.2000000000000002"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="3.2000000000000002"/>
@@ -747,16 +785,16 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#nombre#</dia:string>
+            <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Nombre de la prestación (descripción breve).#</dia:string>
+            <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="visibility">
              <dia:enum val="0"/>
@@ -770,16 +808,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#codigo#</dia:string>
+            <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Identificador único de la prestación (esto está por el codificador? o porque nos pintó a nosotros?)#</dia:string>
+            <dia:string>#Nombre de la prestación (descripción breve).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -800,19 +838,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O4">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O4">
        <dia:attribute name="obj_pos">
-        <dia:point val="11.375,26.1"/>
+        <dia:point val="11.125,26.9"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.325,26.05;18.675,30.95"/>
+        <dia:rectangle val="11.075,26.85;20.725,32.55"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="11.375,26.1"/>
+        <dia:point val="11.125,26.9"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="7.25"/>
+        <dia:real val="9.5499999999999989"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="5.5999999999999996"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Plan#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Plan#</dia:string>
@@ -898,13 +936,13 @@
              <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Codigo de plan (nomenclador).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -918,16 +956,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#precio#</dia:string>
+            <dia:string>#categoría#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Categoría a la que pertenece (nomenclador).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -944,13 +982,13 @@
              <dia:string>#descripcion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#descripcion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Una breve descripción del plan.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -964,17 +1002,40 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#permanencia_minima#</dia:string>
+            <dia:string>#permanenciaMinima#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Tiempo#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
+            <dia:string>#Permanencia mínima que debe cumplir en el plan antes de pasarse a otro.#</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>#fechaBaja#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#Fecha#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
              <dia:string>##</dia:string>
            </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Fecha en la que el afiliado solicita la baja#</dia:string>
+          </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
@@ -994,19 +1055,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O5">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O5">
        <dia:attribute name="obj_pos">
-        <dia:point val="-4,2.75"/>
+        <dia:point val="-5.05,4.15"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.05,2.7;1.9,6.8"/>
+        <dia:rectangle val="-5.1,4.1;0.8,7.4"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-4,2.75"/>
+        <dia:point val="-5.05,4.15"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </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:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4"/>
+        <dia:real val="3.2000000000000002"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Prestador#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Prestador#</dia:string>
@@ -1089,7 +1150,7 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#codigo#</dia:string>
+            <dia:string>#cuit#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#int#</dia:string>
@@ -1098,7 +1159,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Identificador único (para nosotros? o por codificador o algo?).#</dia:string>
+            <dia:string>#Número de CUIT (lo necesitamos!?!?!).#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1133,29 +1194,6 @@
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#cuit#</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>#Número de CUIT (lo necesitamos!?!?!).#</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:attribute>
        <dia:attribute name="operations"/>
        <dia:attribute name="template">
@@ -1165,19 +1203,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O6">
        <dia:attribute name="obj_pos">
      </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: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: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: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>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Cap#</dia:string>
@@ -1304,6 +1342,29 @@
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#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">
        </dia:attribute>
        <dia:attribute name="operations"/>
        <dia:attribute name="template">
@@ -1313,19 +1374,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O7">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O7">
        <dia:attribute name="obj_pos">
-        <dia:point val="5.775,4.65"/>
+        <dia:point val="5.525,6.85"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.725,4.6;16.925,15.3"/>
+        <dia:rectangle val="5.475,6.8;16.625,15.1"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="5.775,4.65"/>
+        <dia:point val="5.525,6.85"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="11.1"/>
+        <dia:real val="11.049999999999999"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="10.6"/>
+        <dia:real val="8.1999999999999993"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Autorizacion#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Autorizacion#</dia:string>
@@ -1429,29 +1490,6 @@
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#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>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
              <dia:string>#porcentajeCobertura#</dia:string>
@@ -1463,7 +1501,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Porcentaje de la prestacion cubierto por la Autorizacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1498,29 +1536,6 @@
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#fechaResolucion#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Fecha en la que se aprobó la autorización.#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
              <dia:string>#fechaRealizacion#</dia:string>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
              <dia:string>#fechaRealizacion#</dia:string>
@@ -1532,7 +1547,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en que efectivizada la autorización. Es decir el dia en que se rechazo o el dia en que el afiliado la utilizo.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1555,7 +1570,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en que vence la autorización.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1578,7 +1593,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Indica si la autorizacion fue aprobada o no.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1601,30 +1616,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#observaciones#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Observaciones sobre la autorización (debería ir sólo en Manual o no?)#</dia:string>
+            <dia: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"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1640,7 +1632,7 @@
        <dia:attribute name="operations">
          <dia:composite type="umloperation">
            <dia:attribute name="name">
        <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>
            </dia:attribute>
            <dia:attribute name="stereotype">
              <dia:string>##</dia:string>
@@ -1676,16 +1668,16 @@
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O8">
        <dia:attribute name="obj_pos">
      </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: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: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"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -1711,16 +1703,16 @@
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O9">
        <dia:attribute name="obj_pos">
      </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:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="36.25,16.1;40.35,25.15"/>
+        <dia:rectangle val="35.3,20.35;38,23.6"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </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.3,22.72"/>
-        <dia:point val="36.3,25.1"/>
+        <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"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -1746,13 +1738,13 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O10">
        <dia:attribute name="obj_pos">
      </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: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: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"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="7.5999999999999996"/>
@@ -1841,16 +1833,16 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#codigo#</dia:string>
+            <dia:string>#nombre#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#País en donde se encuentra.#</dia:string>
+            <dia:string>#Nombre de la Zona#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1873,7 +1865,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Descripción de la Zona#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1894,19 +1886,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O11">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O11">
        <dia:attribute name="obj_pos">
-        <dia:point val="42.665,24.4"/>
+        <dia:point val="43.715,24.65"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="42.615,24.35;51.365,29.25"/>
+        <dia:rectangle val="43.665,24.6;52.415,31.3"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="42.665,24.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: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>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Solicitante#</dia:string>
@@ -1930,7 +1922,7 @@
          <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_operations">
          <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"/>
        </dia:attribute>
        <dia:attribute name="visible_comments">
          <dia:boolean val="false"/>
@@ -2067,7 +2059,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Indica si el solicitante fue visitado o no.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2080,36 +2072,97 @@
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
            </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 - Generalization" version="0" id="O12">
-      <dia:attribute name="obj_pos">
-        <dia:point val="39.5,16.15"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.65,16.1;47.04,24.45"/>
-      </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.99,22.72"/>
-        <dia:point val="46.99,24.4"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="orth_autoroute">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="line_colour">
-        <dia:color val="#000000"/>
-      </dia:attribute>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#existe#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Devuelve True si el afiliado existe y carga el resto de los datos correspondientes. Si no existe devuelve False. Si existe más de uno, se pueden obtener con getNext().#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#getNext#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Si encontró uno nuevo, devuelve True y lo carga. Si no devuelve False y queda intacto.#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
+    </dia:object>
+    <dia:object type="UML - Generalization" version="0" id="O12">
+      <dia:attribute name="obj_pos">
+        <dia:point val="36.15,20.4"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="35.3,20.35;48.09,24.7"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <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"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
        </dia:attribute>
@@ -2123,19 +2176,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O13">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O13">
        <dia:attribute name="obj_pos">
-        <dia:point val="10.365,21.26"/>
+        <dia:point val="11.215,20.01"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.315,21.21;18.965,23.71"/>
+        <dia:rectangle val="11.165,19.96;19.915,23.26"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="10.365,21.26"/>
+        <dia:point val="11.215,20.01"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="8.5500000000000007"/>
+        <dia:real val="8.6500000000000004"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="2.3999999999999999"/>
+        <dia:real val="3.2000000000000002"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#AutorizacionManual#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#AutorizacionManual#</dia:string>
@@ -2227,7 +2280,30 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Comentarios sobre la autorización#</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"/>
+          </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>#fechaResolucion#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#fecha#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Fecha en la que se aprobo/rechazo la autorizacion.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2248,16 +2324,16 @@
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O14">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O14">
        <dia:attribute name="obj_pos">
-        <dia:point val="11.325,15.25"/>
+        <dia:point val="11.05,15.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.475,15.2;14.69,21.31"/>
+        <dia:rectangle val="10.2,15;15.59,20.06"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="11.325,15.25"/>
-        <dia:point val="11.325,17.97"/>
-        <dia:point val="14.64,17.97"/>
-        <dia:point val="14.64,21.26"/>
+        <dia:point val="11.05,15.05"/>
+        <dia:point val="11.05,18.0325"/>
+        <dia:point val="15.54,18.0325"/>
+        <dia:point val="15.54,20.01"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -2283,22 +2359,22 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O15">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O15">
        <dia:attribute name="obj_pos">
-        <dia:point val="4.58,21.22"/>
+        <dia:point val="-0.17,20.02"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.53,21.17;9.93,23.07"/>
+        <dia:rectangle val="-0.22,19.97;10.23,21.87"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="4.58,21.22"/>
+        <dia:point val="-0.17,20.02"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="5.2999999999999998"/>
+        <dia:real val="10.35"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="1.7999999999999998"/>
        </dia:attribute>
        <dia:attribute name="name">
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="1.7999999999999998"/>
        </dia:attribute>
        <dia:attribute name="name">
-        <dia:string>#Automatica#</dia:string>
+        <dia:string>#AutorizacionAutomatica#</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
@@ -2384,16 +2460,16 @@
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O16">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O16">
        <dia:attribute name="obj_pos">
-        <dia:point val="11.325,15.25"/>
+        <dia:point val="11.05,15.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.18,15.2;12.175,21.27"/>
+        <dia:rectangle val="4.955,15;11.9,20.07"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="11.325,15.25"/>
-        <dia:point val="11.325,17.97"/>
-        <dia:point val="7.23,17.97"/>
-        <dia:point val="7.23,21.22"/>
+        <dia:point val="11.05,15.05"/>
+        <dia:point val="11.05,18.0325"/>
+        <dia:point val="5.005,18.0325"/>
+        <dia:point val="5.005,20.02"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -2419,16 +2495,16 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O17">
        <dia:attribute name="obj_pos">
      </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: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: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: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"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="4.8000000000000007"/>
@@ -2514,7 +2590,7 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#tiempoPermanencia#</dia:string>
+            <dia:string>#carencia#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#Tiempo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#Tiempo#</dia:string>
@@ -2586,7 +2662,7 @@
              <dia:string>#tipoAutorizacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#tipoAutorizacion#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#emun(manual,auto)#</dia:string>
+            <dia:string>#enum(manual,auto)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
@@ -2613,16 +2689,16 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O18">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O18">
        <dia:attribute name="obj_pos">
-        <dia:point val="0.815,-3.52999"/>
+        <dia:point val="-5.435,24.62"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </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: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: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"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="3.2000000000000002"/>
@@ -2761,16 +2837,16 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O19">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O19">
        <dia:attribute name="obj_pos">
-        <dia:point val="7.515,28.22"/>
+        <dia:point val="7.615,30.72"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.465,26;12.125,29.02"/>
+        <dia:rectangle val="7.565,26.85;11.875,31.57"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="7.515,28.22"/>
-        <dia:point val="9.895,28.22"/>
-        <dia:point val="9.895,26.8"/>
-        <dia:point val="11.375,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"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -2823,22 +2899,25 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O20">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O20">
        <dia:attribute name="obj_pos">
-        <dia:point val="18.475,26.8"/>
+        <dia:point val="20.675,27.6"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="18.425,26;21.95,28.15"/>
+        <dia:rectangle val="20.625,26.3;23.95,28.45"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="18.475,26.8"/>
-        <dia:point val="20.0375,26.8"/>
-        <dia:point val="20.0375,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>
        <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="name">
          <dia:string>##</dia:string>
        </dia:attribute>
@@ -2865,7 +2944,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <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"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
@@ -2877,26 +2956,23 @@
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O4" connection="4"/>
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O4" connection="4"/>
-        <dia:connection handle="1" to="O2" connection="14"/>
        </dia:connections>
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O21">
        <dia:attribute name="obj_pos">
        </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: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: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:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
          <dia:enum val="1"/>
-        <dia:enum val="0"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
@@ -2936,83 +3012,21 @@
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O10" connection="3"/>
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O10" connection="3"/>
-        <dia:connection handle="1" to="O6" connection="4"/>
-      </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:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="35.425,2.55;40.2,10.55"/>
-      </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: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="O1" connection="1"/>
          <dia:connection handle="1" to="O6" connection="6"/>
        </dia:connections>
      </dia:object>
          <dia:connection handle="1" to="O6" connection="6"/>
        </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:attribute name="obj_pos">
-        <dia:point val="42.665,25.1"/>
+        <dia:point val="43.715,24.65"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.5,24.3;43.365,26.6"/>
+        <dia:rectangle val="40.15,23.5;44.415,25.5"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="42.665,25.1"/>
-        <dia:point val="40.6075,25.1"/>
-        <dia:point val="40.6075,25.8"/>
-        <dia:point val="38.55,25.8"/>
+        <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="0"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -3056,87 +3070,27 @@
          </dia:composite>
        </dia:attribute>
        <dia:connections>
          </dia:composite>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O11" connection="3"/>
+        <dia:connection handle="0" to="O11" connection="0"/>
          <dia:connection handle="1" to="O0" connection="4"/>
        </dia:connections>
      </dia:object>
          <dia:connection handle="1" to="O0" connection="4"/>
        </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:attribute name="obj_pos">
-        <dia:point val="0.975,13.75"/>
+        <dia:point val="-1.925,16.25"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.925,-1.07999;4.465,14.55"/>
+        <dia:rectangle val="-3.285,16.2;-0.875,25.37"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </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="-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:attribute>
        <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
          <dia:enum val="1"/>
          <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>#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="O3" connection="4"/>
-        <dia:connection handle="1" to="O18" connection="6"/>
-      </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:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.215,4.55;6.825,28.32"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="5.775,5.35"/>
-        <dia:point val="3.965,5.35"/>
-        <dia:point val="3.965,27.52"/>
-        <dia:point val="0.965,27.52"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
          <dia:enum val="1"/>
          <dia:enum val="0"/>
          <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
@@ -3150,7 +3104,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <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"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
@@ -3175,29 +3129,27 @@
          </dia:composite>
        </dia:attribute>
        <dia:connections>
          </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="6"/>
+        <dia:connection handle="1" to="O18" connection="1"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O26">
+    <dia:object type="UML - Association" version="0" id="O24">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="-5.585,28.22"/>
+        <dia:point val="-5.485,30.72"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.635,15.5;-1.175,29.02"/>
+        <dia:rectangle val="-6.535,15;-4.475,31.57"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </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,22.235"/>
-        <dia:point val="-1.925,22.235"/>
-        <dia:point val="-1.925,16.25"/>
+        <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="orth_orient">
          <dia:enum val="0"/>
          <dia:enum val="1"/>
          <dia:enum val="0"/>
-        <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
@@ -3231,28 +3183,28 @@
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
              <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="O17" connection="3"/>
            </dia:attribute>
          </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="1" to="O3" connection="10"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O27">
+    <dia:object type="UML - Association" version="0" id="O25">
        <dia:attribute name="obj_pos">
          <dia:point val="-4.825,13.75"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        <dia:attribute name="obj_pos">
          <dia:point val="-4.825,13.75"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.875,6;-0.35,14.55"/>
+        <dia:rectangle val="-5.875,6.6;-1.4,14.6"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="-4.825,13.75"/>
          <dia:point val="-5.825,13.75"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="-4.825,13.75"/>
          <dia:point val="-5.825,13.75"/>
-        <dia:point val="-5.825,10.25"/>
-        <dia:point val="-1.1,10.25"/>
-        <dia:point val="-1.1,6.75"/>
+        <dia:point val="-5.825,10.55"/>
+        <dia:point val="-2.15,10.55"/>
+        <dia:point val="-2.15,7.35"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -3301,18 +3253,18 @@
          <dia:connection handle="1" to="O5" connection="6"/>
        </dia:connections>
      </dia:object>
          <dia:connection handle="1" to="O5" connection="6"/>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O28">
+    <dia:object type="UML - Association" version="0" id="O26">
        <dia:attribute name="obj_pos">
        <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:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.05,-5.36749;48.665,4.35"/>
+        <dia:rectangle val="-5.1,-1.26749;49.265,11.81"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="-4,2.75"/>
-        <dia:point val="-4,-4.56749"/>
-        <dia:point val="47.915,-4.56749"/>
-        <dia:point val="47.915,-2.04"/>
+        <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="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -3363,30 +3315,30 @@
          <dia:connection handle="1" to="O10" connection="1"/>
        </dia:connections>
      </dia:object>
          <dia:connection handle="1" to="O10" connection="1"/>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O29">
+    <dia:object type="UML - Class" version="0" id="O27">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="33.865,27.8825"/>
+        <dia:point val="40.015,31.8325"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.815,27.8325;42.015,31.1325"/>
+        <dia:rectangle val="39.965,31.7825;47.665,35.0825"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="33.865,27.8825"/>
+        <dia:point val="40.015,31.8325"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </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: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: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"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -3511,24 +3463,24 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
        </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: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: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: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:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="14.949999999999999"/>
+        <dia:real val="11.049999999999999"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="7.1999999999999993"/>
        </dia:attribute>
        <dia:attribute name="name">
        </dia:attribute>
        <dia:attribute name="name">
-        <dia:string>#Telefono#</dia:string>
+        <dia:string>#Direccion#</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="stereotype">
          <dia:string>##</dia:string>
@@ -3608,16 +3560,16 @@
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
        <dia:attribute name="attributes">
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#tipo#</dia:string>
+            <dia:string>#calle#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#enum(particular, oficina, celular)#</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Calle del domicilio#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3634,138 +3586,13 @@
              <dia:string>#numero#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#numero#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#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.1008,11.8075"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.0508,11.7575;31.2508,18.2575"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="20.1008,11.8075"/>
-      </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:attribute>
-      <dia:attribute name="name">
-        <dia:string>#Direccion#</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>#calle#</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>#Calle del domicilio#</dia:string>
+            <dia:string>#Número del domicilio#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3779,7 +3606,7 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#numero#</dia:string>
+            <dia:string>#piso#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#int#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#int#</dia:string>
@@ -3788,7 +3615,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Número del domicilio#</dia:string>
+            <dia:string>#Piso del domicilio#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3802,16 +3629,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#piso#</dia:string>
+            <dia:string>#departamento#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Piso del domicilio#</dia:string>
+            <dia:string>#Departamento del domicilio#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3825,16 +3652,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#departamento#</dia:string>
+            <dia:string>#codigoPostal#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#string(8)#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Departamento del domicilio#</dia:string>
+            <dia:string>#Código postal del domicilio#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3848,16 +3675,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#codigoPostal#</dia:string>
+            <dia:string>#provincia#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#string(8)#</dia:string>
+            <dia:string>#enum([provincias])#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Código postal del domicilio#</dia:string>
+            <dia:string>#Provincia donde se encuentra el domicilio#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3871,16 +3698,16 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#provincia#</dia:string>
+            <dia:string>#telefono#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#enum([provincias])#</dia:string>
+            <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Provincia donde se encuentra el domicilio#</dia:string>
+            <dia:string>#Teléfono del domicilio#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3899,17 +3726,17 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O32">
+    <dia:object type="UML - Association" version="0" id="O29">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="20.7008,1.95751"/>
+        <dia:point val="27.1758,8.0575"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.6508,1.90751;33.35,11.25"/>
+        <dia:rectangle val="27.1258,8.0075;30.7,18.35"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </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: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="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -3927,7 +3754,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <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"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
@@ -3941,38 +3768,36 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <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"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
            </dia:attribute>
            <dia:attribute name="arrow">
              <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:attribute>
          </dia:composite>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O30" connection="6"/>
-        <dia:connection handle="1" to="O1" connection="3"/>
+        <dia:connection handle="0" to="O28" connection="6"/>
+        <dia:connection handle="1" to="O1" connection="14"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O33">
+    <dia:object type="UML - Association" version="0" id="O30">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="31.1508,12.5075"/>
+        <dia:point val="21.6508,1.5575"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.1008,11.7075;33.65,14.05"/>
+        <dia:rectangle val="-2.9,0.8075;22.0008,4.9"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="31.1508,12.5075"/>
-        <dia:point val="32.2254,12.5075"/>
-        <dia:point val="32.2254,13.25"/>
-        <dia:point val="33.3,13.25"/>
+        <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="0"/>
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
          <dia:enum val="1"/>
-        <dia:enum val="0"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
@@ -4006,36 +3831,31 @@
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
              <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:attribute>
          </dia:composite>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O31" connection="4"/>
-        <dia:connection handle="1" to="O1" connection="14"/>
+        <dia:connection handle="0" to="O28" connection="3"/>
+        <dia:connection handle="1" to="O5" connection="1"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O34">
+    <dia:object type="UML - Association" version="0" id="O31">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="20.7008,-1.24249"/>
+        <dia:point val="0.75,4.85"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-1.15,-4.81749;21.4008,4.35"/>
+        <dia:rectangle val="0.7,4.1;11.75,8.45"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="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="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:attribute>
        <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
          <dia:enum val="0"/>
          <dia:enum val="1"/>
        </dia:attribute>
          <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="name">
          <dia:string>##</dia:string>
        </dia:attribute>
@@ -4062,7 +3882,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <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"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
@@ -4073,27 +3893,30 @@
          </dia:composite>
        </dia:attribute>
        <dia:connections>
          </dia:composite>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O30" connection="1"/>
-        <dia:connection handle="1" to="O5" connection="1"/>
+        <dia:connection handle="0" to="O5" connection="4"/>
+        <dia:connection handle="1" to="O7" connection="1"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O35">
+    <dia:object type="UML - Association" version="0" id="O32">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="25.6258,18.2075"/>
+        <dia:point val="16.575,7.55"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.75,6.7;26.3258,20.6075"/>
+        <dia:rectangle val="16.525,6.8;23.95,24.3"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="25.6258,18.2075"/>
-        <dia:point val="25.6258,19.2075"/>
-        <dia:point val="1.8,19.2075"/>
-        <dia:point val="1.8,6.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:attribute>
        <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
          <dia:enum val="0"/>
          <dia:enum val="1"/>
          <dia:enum val="0"/>
          <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
@@ -4107,7 +3930,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <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"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
@@ -4132,28 +3955,33 @@
          </dia:composite>
        </dia:attribute>
        <dia:connections>
          </dia:composite>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O31" connection="6"/>
-        <dia:connection handle="1" to="O5" connection="7"/>
+        <dia:connection handle="0" to="O7" connection="4"/>
+        <dia:connection handle="1" to="O2" connection="3"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O36">
+    <dia:object type="UML - Association" version="0" id="O33">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="1.8,3.45"/>
+        <dia:point val="23.6,29.35"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.05,2.65;12.025,6.25"/>
+        <dia:rectangle val="22.85,28.6;34.425,34.0575"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </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: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:attribute>
        <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
          <dia:enum val="0"/>
          <dia:enum val="1"/>
        </dia:attribute>
          <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:attribute name="name">
-        <dia:string>##</dia:string>
+        <dia:string>#titularidad#</dia:string>
        </dia:attribute>
        <dia:attribute name="direction">
          <dia:enum val="0"/>
        </dia:attribute>
        <dia:attribute name="direction">
          <dia:enum val="0"/>
@@ -4161,7 +3989,7 @@
        <dia:attribute name="ends">
          <dia:composite>
            <dia:attribute name="role">
        <dia:attribute name="ends">
          <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:attribute>
            <dia:attribute name="multiplicity">
              <dia:string>#1#</dia:string>
@@ -4175,7 +4003,7 @@
          </dia:composite>
          <dia:composite>
            <dia:attribute name="role">
          </dia:composite>
          <dia:composite>
            <dia:attribute name="role">
-            <dia:string>##</dia:string>
+            <dia:string>#miembro grupo fam.#</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <dia:string>#*#</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <dia:string>#*#</dia:string>
@@ -4189,27 +4017,27 @@
          </dia:composite>
        </dia:attribute>
        <dia:connections>
          </dia:composite>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O5" connection="4"/>
-        <dia:connection handle="1" to="O7" connection="1"/>
+        <dia:connection handle="0" to="O2" connection="5"/>
+        <dia:connection handle="1" to="O2" connection="6"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O37">
+    <dia:object type="UML - Association" version="0" id="O34">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="16.875,5.35"/>
+        <dia:point val="15.9,32.5"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.825,4.55;22.35,24.55"/>
+        <dia:rectangle val="15.85,32.45;44.515,37.4325"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="16.875,5.35"/>
-        <dia:point val="19.515,5.35"/>
-        <dia:point val="19.515,23.75"/>
-        <dia:point val="21.6,23.75"/>
+        <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:attribute>
        <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
          <dia:enum val="1"/>
          <dia:enum val="0"/>
          <dia:enum val="1"/>
          <dia:enum val="0"/>
+        <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="autorouting">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="autorouting">
          <dia:boolean val="false"/>
@@ -4226,7 +4054,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <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"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
@@ -4239,68 +4067,6 @@
            <dia:attribute name="role">
              <dia:string>##</dia:string>
            </dia:attribute>
            <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="O7" connection="4"/>
-        <dia:connection handle="1" to="O2" connection="3"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O38">
-      <dia:attribute name="obj_pos">
-        <dia:point val="21.6,28.65"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.85,27.9;32.575,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: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>#titularidad#</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>#titular#</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>#miembro grupo fam.#</dia:string>
-          </dia:attribute>
            <dia:attribute name="multiplicity">
              <dia:string>#*#</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <dia:string>#*#</dia:string>
            </dia:attribute>
@@ -4313,33 +4079,33 @@
          </dia:composite>
        </dia:attribute>
        <dia:connections>
          </dia:composite>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O2" connection="5"/>
-        <dia:connection handle="1" to="O2" connection="6"/>
+        <dia:connection handle="0" to="O4" connection="6"/>
+        <dia:connection handle="1" to="O27" connection="6"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O39">
+    <dia:object type="UML - Association" version="0" id="O35">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="14.925,30.9"/>
+        <dia:point val="32.25,27.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.875,30.3325;38.665,34.8825"/>
+        <dia:rectangle val="31.5,26.3;41.8151,33.3825"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="14.925,30.9"/>
-        <dia:point val="14.925,34.3575"/>
-        <dia:point val="37.915,34.3575"/>
-        <dia:point val="37.915,31.0825"/>
+        <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:attribute>
        <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
          <dia:enum val="0"/>
          <dia:enum val="1"/>
          <dia:enum val="0"/>
          <dia:enum val="1"/>
+        <dia:enum val="0"/>
        </dia:attribute>
        <dia:attribute name="autorouting">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="name">
        </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"/>
        </dia:attribute>
        <dia:attribute name="direction">
          <dia:enum val="0"/>
@@ -4350,13 +4116,13 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <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"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
            </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:composite>
            </dia:attribute>
          </dia:composite>
          <dia:composite>
@@ -4364,33 +4130,33 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <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"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
            </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: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="0" to="O2" connection="15"/>
+        <dia:connection handle="1" to="O27" connection="3"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O40">
+    <dia:object type="UML - Association" version="0" id="O36">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="30.25,27.35"/>
+        <dia:point val="32.7008,1.5575"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.2,26.55;34.215,29.3825"/>
+        <dia:rectangle val="32.6508,0.8075;38.325,6.6"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="30.25,27.35"/>
-        <dia:point val="32.0575,27.35"/>
-        <dia:point val="32.0575,28.5825"/>
-        <dia:point val="33.865,28.5825"/>
+        <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"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -4429,27 +4195,27 @@
              <dia:boolean val="false"/>
            </dia:attribute>
            <dia:attribute name="aggregate">
              <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:attribute>
          </dia:composite>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O2" connection="15"/>
-        <dia:connection handle="1" to="O29" connection="3"/>
+        <dia:connection handle="0" to="O28" connection="4"/>
+        <dia:connection handle="1" to="O6" connection="10"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O41">
+    <dia:object type="UML - Association" version="0" id="O37">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="32.375,0.8"/>
+        <dia:point val="43.715,26.55"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.1008,-1.34249;32.725,1.6"/>
+        <dia:rectangle val="32.2,25.5;44.415,27.4"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </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="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:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -4457,7 +4223,7 @@
          <dia:enum val="0"/>
        </dia:attribute>
        <dia:attribute name="name">
          <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"/>
        </dia:attribute>
        <dia:attribute name="direction">
          <dia:enum val="0"/>
@@ -4468,7 +4234,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <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"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
@@ -4479,10 +4245,10 @@
          </dia:composite>
          <dia:composite>
            <dia:attribute name="role">
          </dia:composite>
          <dia:composite>
            <dia:attribute name="role">
-            <dia:string>##</dia:string>
+            <dia:string># titular#</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
            </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"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
@@ -4493,23 +4259,25 @@
          </dia:composite>
        </dia:attribute>
        <dia:connections>
          </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="O11" connection="8"/>
+        <dia:connection handle="1" to="O2" connection="13"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O42">
+    <dia:object type="UML - Association" version="0" id="O38">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="25.6258,11.8075"/>
+        <dia:point val="5.525,7.55"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.5758,2;32.725,13.4075"/>
+        <dia:rectangle val="0.925,6.8;5.875,14.6"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="25.6258,11.8075"/>
-        <dia:point val="25.6258,2.8"/>
-        <dia:point val="32.375,2.8"/>
+        <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:attribute>
        <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
          <dia:enum val="1"/>
          <dia:enum val="0"/>
        </dia:attribute>
          <dia:enum val="1"/>
          <dia:enum val="0"/>
        </dia:attribute>
@@ -4525,7 +4293,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="multiplicity">
              <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"/>
            </dia:attribute>
            <dia:attribute name="arrow">
              <dia:boolean val="false"/>
@@ -4550,8 +4318,8 @@
          </dia:composite>
        </dia:attribute>
        <dia:connections>
          </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="O7" connection="3"/>
+        <dia:connection handle="1" to="O3" connection="4"/>
        </dia:connections>
      </dia:object>
    </dia:layer>
        </dia:connections>
      </dia:object>
    </dia:layer>