(no commit message)

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

index 69b87d6862dcf13c44af8450683f09d39db3059f..02667a31e755203d21951e61e25c654a65a86492 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.39678561687469482"/>
+          <dia:real val="0.40429577231407166"/>
          </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="35.7,23.55"/>
+        <dia:point val="11.3,31.6"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="35.65,23.5;40.25,25.4"/>
+        <dia:rectangle val="11.25,31.55;15.85,33.45"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="35.7,23.55"/>
+        <dia:point val="11.3,31.6"/>
        </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="29.95,13.2"/>
+        <dia:point val="3,10"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.9,13.15;42.4,20.45"/>
+        <dia:rectangle val="2.95,9.95;15.55,17.25"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="29.95,13.2"/>
+        <dia:point val="3,10"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="12.4"/>
+        <dia:real val="12.5"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="7.1999999999999993"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="7.1999999999999993"/>
@@ -391,7 +391,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Fecha de nacimiento (es una clase??? Para mí sí)#</dia:string>
+            <dia:string>#Fecha de nacimiento#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -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="23.6,22.75"/>
+        <dia:point val="-9.85,21.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="23.55,22.7;32.3,29.4"/>
+        <dia:rectangle val="-9.9,21;12.85,30.1"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="23.6,22.75"/>
+        <dia:point val="-9.85,21.05"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="8.6500000000000004"/>
+        <dia:real val="22.650000000000002"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="6.6000000000000005"/>
+        <dia:real val="9"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Afiliado#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Afiliado#</dia:string>
@@ -539,7 +539,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 de afiliado (con alguna codificación? int?).#</dia:string>
+            <dia:string>#Identificador único de afiliado.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -682,6 +682,132 @@
            </dia:attribute>
            <dia:attribute name="parameters"/>
          </dia:composite>
            </dia:attribute>
            <dia:attribute name="parameters"/>
          </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#guardar#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Guarda los datos del afiliado en la DB y retorna True si no hubo error#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#VerificarCobertura#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#codCobertura#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#integer#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="value">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="comment">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#ObtenerCantidadDePrestacionesRealizadas#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#int#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#codPrestacion#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="value">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="comment">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
+        </dia:composite>
        </dia:attribute>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
@@ -690,19 +816,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O3">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O3">
        <dia:attribute name="obj_pos">
-        <dia:point val="-4.825,13.05"/>
+        <dia:point val="-5,6"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.875,13;1.025,16.3"/>
+        <dia:rectangle val="-5.05,5.95;1.6,10.05"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-4.825,13.05"/>
+        <dia:point val="-5,6"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="5.7999999999999998"/>
+        <dia:real val="6.5499999999999998"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="4"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Prestacion#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Prestacion#</dia:string>
@@ -829,6 +955,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>#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:attribute name="comment">
+            <dia:string>#Fecha en la que fue dado de baja (o NULL si está activo)#</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">
@@ -838,19 +987,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.125,26.9"/>
+        <dia:point val="3,1"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.075,26.85;20.725,32.55"/>
+        <dia:rectangle val="2.95,0.95;19.75,9.25"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="11.125,26.9"/>
+        <dia:point val="3,1"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="9.5499999999999989"/>
+        <dia:real val="16.700000000000003"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="5.5999999999999996"/>
+        <dia:real val="8.1999999999999993"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Plan#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Plan#</dia:string>
@@ -859,7 +1008,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>#Plan para los Afiliados de la obra social#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -868,13 +1017,13 @@
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="suppress_operations">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="suppress_operations">
-        <dia:boolean val="true"/>
+        <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="visible_attributes">
          <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_operations">
        </dia:attribute>
        <dia:attribute name="visible_attributes">
          <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"/>
@@ -942,7 +1091,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Codigo de plan (nomenclador).#</dia:string>
+            <dia:string>#Código de plan.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -959,13 +1108,13 @@
              <dia:string>#categoría#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#categoría#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#float#</dia:string>
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
            </dia:attribute>
            <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Categoría a la que pertenece (nomenclador).#</dia:string>
+            <dia:string>#Categoría del plan. Cuanto más grande es la categoría, mejor es el plan#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1005,13 +1154,13 @@
              <dia:string>#permanenciaMinima#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#permanenciaMinima#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Tiempo#</dia:string>
+            <dia:string>#float#</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:string>#Permanencia mínima (en meses) 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="visibility">
              <dia:enum val="0"/>
@@ -1047,7 +1196,116 @@
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
-      <dia:attribute name="operations"/>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#borrar#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Cambia fechaBaja a la fecha actual del sistema#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#guardar#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Registra en la BD todo el esquema del plan#</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>#ObtenerCobertura#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#Cobertura#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#codPrestacion#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="value">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="comment">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
@@ -1055,19 +1313,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="-5.05,4.15"/>
+        <dia:point val="-5,1"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.1,4.1;0.8,7.4"/>
+        <dia:rectangle val="-5.05,0.95;1.6,5.05"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-5.05,4.15"/>
+        <dia:point val="-5,1"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="5.7999999999999998"/>
+        <dia:real val="6.5499999999999998"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="4"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Prestador#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Prestador#</dia:string>
@@ -1159,7 +1417,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 de CUIT (lo necesitamos!?!?!).#</dia:string>
+            <dia:string>#Número de CUIT.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1194,6 +1452,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>#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:attribute name="comment">
+            <dia:string>#Fecha en la que fue dado de baja (o NULL si está activo)#</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">
@@ -1203,13 +1484,13 @@
      </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="37.575,3.05"/>
+        <dia:point val="21,15.75"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.525,3;45.225,7.1"/>
+        <dia:rectangle val="20.95,15.7;28.65,19.8"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="37.575,3.05"/>
+        <dia:point val="21,15.75"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="7.5999999999999996"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="7.5999999999999996"/>
@@ -1298,7 +1579,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>#responsable#</dia:string>
+            <dia:string>#codigo#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#string#</dia:string>
@@ -1307,7 +1588,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Nombre del responsable (gerente) del CAP (lo usamos para algo!?!?!?!!).#</dia:string>
+            <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="visibility">
              <dia:enum val="0"/>
@@ -1321,7 +1602,7 @@
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
          </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
-            <dia:string>#horario#</dia:string>
+            <dia:string>#responsable#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#string#</dia:string>
@@ -1330,7 +1611,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Horario de atención (debería volar!?!?!?).#</dia:string>
+            <dia:string>#Nombre del responsable (gerente) del CAP#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1344,7 +1625,7 @@
          </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>#horario#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#string#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#string#</dia:string>
@@ -1353,7 +1634,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <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:string>#Horario de atención (texto libre)#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -1374,19 +1655,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.525,6.85"/>
+        <dia:point val="32.85,0.55"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.475,6.8;16.625,15.1"/>
+        <dia:rectangle val="32.8,0.5;49.6,10.4"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="5.525,6.85"/>
+        <dia:point val="32.85,0.55"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="11.049999999999999"/>
+        <dia:real val="16.700000000000003"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="8.1999999999999993"/>
+        <dia:real val="9.7999999999999989"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Autorizacion#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Autorizacion#</dia:string>
@@ -1660,91 +1941,134 @@
            </dia:attribute>
            <dia:attribute name="parameters"/>
          </dia:composite>
            </dia:attribute>
            <dia:attribute name="parameters"/>
          </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#getEstado#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#int#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#fechaRecepcion#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#DateTime#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="value">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="comment">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#setResolucion#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Aprueba o rechaza la autorizacion#</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 type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#Motivo#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#string#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="value">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="comment">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#Aprobada#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#bool#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="value">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="comment">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="0"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
+        </dia:composite>
        </dia:attribute>
        </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="O8">
-      <dia:attribute name="obj_pos">
-        <dia:point val="36.15,20.4"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.875,20.35;37,23.57"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <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: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="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O1" connection="6"/>
-        <dia:connection handle="1" to="O2" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O9">
-      <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;38,23.6"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <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:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="orth_autoroute">
+      <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
          <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="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O1" connection="6"/>
-        <dia:connection handle="1" to="O0" connection="1"/>
-      </dia:connections>
+      <dia:attribute name="templates"/>
      </dia:object>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O10">
+    <dia:object type="UML - Class" version="0" id="O8">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="44.715,11.06"/>
+        <dia:point val="27,29"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="44.665,11.01;52.365,14.31"/>
+        <dia:rectangle val="26.95,28.95;34.65,32.25"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="44.715,11.06"/>
+        <dia:point val="27,29"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="7.5999999999999996"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="7.5999999999999996"/>
@@ -1759,7 +2083,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>#Región geográfica, cuya mínima unidad es un barrio.#</dia:string>
+        <dia:string>#Región geográfica que cubre un Cap y a la que pertenecen los Prestadores#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -1884,21 +2208,21 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O11">
+    <dia:object type="UML - Class" version="0" id="O9">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="43.715,24.65"/>
+        <dia:point val="14.2,21"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="43.665,24.6;52.415,31.3"/>
+        <dia:rectangle val="14.15,20.95;22.9,29.25"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="43.715,24.65"/>
+        <dia:point val="14.2,21"/>
        </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="6.6000000000000005"/>
+        <dia:real val="8.2000000000000011"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Solicitante#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Solicitante#</dia:string>
@@ -1990,7 +2314,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Horario en el cual puede ser visitado (de nuevo, representación???).#</dia:string>
+            <dia:string>#Horario en el cual puede ser visitado (como texto libre)#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2133,62 +2457,87 @@
            </dia:attribute>
            <dia:attribute name="parameters"/>
          </dia:composite>
            </dia:attribute>
            <dia:attribute name="parameters"/>
          </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#guardar#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Guarda los datos del solicitante en la DB y retorna True si no hubo error#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#borrar#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Borra el solicitante de la DB y retorna True si no hubo error#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
        </dia:attribute>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
        </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="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O1" connection="6"/>
-        <dia:connection handle="1" to="O11" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O13">
+    <dia:object type="UML - Class" version="0" id="O10">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="11.215,20.01"/>
+        <dia:point val="38.2,12.7"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.165,19.96;19.915,23.26"/>
+        <dia:rectangle val="38.15,12.65;46.9,16.35"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="11.215,20.01"/>
+        <dia:point val="38.2,12.7"/>
        </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="3.2000000000000002"/>
+        <dia:real val="3.6000000000000001"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#AutorizacionManual#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#AutorizacionManual#</dia:string>
@@ -2212,7 +2561,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"/>
@@ -2322,50 +2671,15 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O14">
-      <dia:attribute name="obj_pos">
-        <dia:point val="11.05,15.05"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.2,15;15.59,20.06"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <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: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="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O7" connection="6"/>
-        <dia:connection handle="1" to="O13" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O15">
+    <dia:object type="UML - Class" version="0" id="O11">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="-0.17,20.02"/>
+        <dia:point val="25.3,12.8"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-0.22,19.97;10.23,21.87"/>
+        <dia:rectangle val="25.25,12.75;35.7,14.65"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-0.17,20.02"/>
+        <dia:point val="25.3,12.8"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="10.35"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="10.35"/>
@@ -2380,7 +2694,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>#Autorización aprobada o rechazada automáticamente por el sistema#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -2458,53 +2772,18 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Generalization" version="0" id="O16">
-      <dia:attribute name="obj_pos">
-        <dia:point val="11.05,15.05"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.955,15;11.9,20.07"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <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: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="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O7" connection="6"/>
-        <dia:connection handle="1" to="O15" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O17">
+    <dia:object type="UML - Class" version="0" id="O12">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="-5.485,30.02"/>
+        <dia:point val="28,20"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.535,29.97;7.665,34.87"/>
+        <dia:rectangle val="27.95,19.95;41.25,24.85"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-5.485,30.02"/>
+        <dia:point val="28,20"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="13.1"/>
+        <dia:real val="13.199999999999999"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="4.8000000000000007"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="4.8000000000000007"/>
@@ -2593,13 +2872,13 @@
              <dia:string>#carencia#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
              <dia:string>#carencia#</dia:string>
            </dia:attribute>
            <dia:attribute name="type">
-            <dia:string>#Tiempo#</dia:string>
+            <dia:string>#float#</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>#Antigüedad que debe tener el afiliado en el plan para ser cubierto. (años? meses?)#</dia:string>
+            <dia:string>#Antigüedad (en meses) que debe tener el afiliado en el plan para ser cubierto.#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -2687,21 +2966,21 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O18">
+    <dia:object type="UML - Class" version="0" id="O13">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="-5.435,24.62"/>
+        <dia:point val="-5,11"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.485,24.57;0.415,27.87"/>
+        <dia:rectangle val="-5.05,10.95;1.6,15.05"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-5.435,24.62"/>
+        <dia:point val="-5,11"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="5.7999999999999998"/>
+        <dia:real val="6.5499999999999998"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="4"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Categoria#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Categoria#</dia:string>
@@ -2710,7 +2989,7 @@
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="comment">
-        <dia:string>#Clasificación de las Prestaciones. (esto lo necesitamos por el codificador, no?)#</dia:string>
+        <dia:string>#Clasificación de las Prestaciones#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -2793,7 +3072,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 (por codificador, no?)#</dia:string>
+            <dia:string>#Código de la categoría 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"/>
@@ -2828,502 +3107,45 @@
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
-      </dia:attribute>
-      <dia:attribute name="operations"/>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O19">
-      <dia:attribute name="obj_pos">
-        <dia:point val="7.615,30.72"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.565,26.85;11.875,31.57"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <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:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string># *#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="2"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O17" connection="4"/>
-        <dia:connection handle="1" to="O4" connection="3"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O20">
-      <dia:attribute name="obj_pos">
-        <dia:point val="20.675,27.6"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.625,26.3;23.95,28.45"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="20.675,27.6"/>
-        <dia:point val="22.115,27.6"/>
-        <dia:point val="22.115,27.05"/>
-        <dia:point val="23.6,27.05"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string># 1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O4" connection="4"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O21">
-      <dia:attribute name="obj_pos">
-        <dia:point val="44.715,11.76"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="40.625,6.3;45.415,12.61"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <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="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="O10" connection="3"/>
-        <dia:connection handle="1" to="O6" connection="6"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O22">
-      <dia:attribute name="obj_pos">
-        <dia:point val="43.715,24.65"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="40.15,23.5;44.415,25.5"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <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:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#* #</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string># 1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O11" connection="0"/>
-        <dia:connection handle="1" to="O0" connection="4"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O23">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-1.925,16.25"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.285,16.2;-0.875,25.37"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="-1.925,16.25"/>
-        <dia:point val="-1.925,20.435"/>
-        <dia:point val="-2.535,20.435"/>
-        <dia:point val="-2.535,24.62"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string># *#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#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="6"/>
-        <dia:connection handle="1" to="O18" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O24">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-5.485,30.72"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.535,15;-4.475,31.57"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="-5.485,30.72"/>
-        <dia:point val="-6.485,30.72"/>
-        <dia:point val="-6.485,15.75"/>
-        <dia:point val="-4.825,15.75"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </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:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#fechaBaja#</dia:string>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+          <dia:attribute name="type">
+            <dia:string>#Fecha#</dia:string>
            </dia:attribute>
            </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
+          <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
              <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 name="comment">
+            <dia:string>#Fecha en la que fue dado de baja (o NULL si está activo)#</dia:string>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="aggregate">
+          <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
              <dia:enum val="0"/>
            </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O17" connection="3"/>
-        <dia:connection handle="1" to="O3" connection="10"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O25">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-4.825,13.75"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <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:point val="-5.825,10.55"/>
-        <dia:point val="-2.15,10.55"/>
-        <dia:point val="-2.15,7.35"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia: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:attribute name="abstract">
              <dia:boolean val="false"/>
            </dia:attribute>
              <dia:boolean val="false"/>
            </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
+          <dia:attribute name="class_scope">
              <dia:boolean val="false"/>
            </dia:attribute>
              <dia:boolean val="false"/>
            </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
-          </dia:attribute>
          </dia:composite>
        </dia:attribute>
          </dia:composite>
        </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O3" connection="3"/>
-        <dia:connection handle="1" to="O5" connection="6"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O26">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-5.05,4.15"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.1,-1.26749;49.265,11.81"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <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:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
          <dia:boolean val="false"/>
        </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O5" connection="0"/>
-        <dia:connection handle="1" to="O10" connection="1"/>
-      </dia:connections>
+      <dia:attribute name="templates"/>
      </dia:object>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O27">
+    <dia:object type="UML - Class" version="0" id="O14">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="40.015,31.8325"/>
+        <dia:point val="37,29"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.965,31.7825;47.665,35.0825"/>
+        <dia:rectangle val="36.95,28.95;44.65,32.25"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="40.015,31.8325"/>
+        <dia:point val="37,29"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="7.5999999999999996"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="7.5999999999999996"/>
@@ -3444,7 +3266,7 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Fecha en la que el plan no rige mas para el afiliado#</dia:string>
+            <dia:string>#Fecha en la que el plan no rige mas para el afiliado (si es el plan actual es NULL)#</dia:string>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
            </dia:attribute>
            <dia:attribute name="visibility">
              <dia:enum val="0"/>
@@ -3463,18 +3285,18 @@
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
        </dia:attribute>
        <dia:attribute name="templates"/>
      </dia:object>
-    <dia:object type="UML - Class" version="0" id="O28">
+    <dia:object type="UML - Class" version="0" id="O15">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="21.6508,0.8575"/>
+        <dia:point val="20.15,0.85"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.6008,0.8075;32.7508,8.1075"/>
+        <dia:rectangle val="20.1,0.8;31.3,8.1"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="21.6508,0.8575"/>
+        <dia:point val="20.15,0.85"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
        </dia:attribute>
        <dia:attribute name="elem_width">
-        <dia:real val="11.049999999999999"/>
+        <dia:real val="11.1"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="7.1999999999999993"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="7.1999999999999993"/>
@@ -3486,7 +3308,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>#Dirección y datos de un domicilio#</dia:string>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="abstract">
          <dia:boolean val="false"/>
@@ -3638,689 +3460,313 @@
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
              <dia:string>##</dia:string>
            </dia:attribute>
            <dia:attribute name="comment">
-            <dia:string>#Departamento del domicilio#</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>#codigoPostal#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#string(8)#</dia:string>
-          </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: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>#provincia#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#enum([provincias])#</dia:string>
-          </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: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>#telefono#</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>#Teléfono del domicilio#</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 - Association" version="0" id="O29">
-      <dia:attribute name="obj_pos">
-        <dia:point val="27.1758,8.0575"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.1258,8.0075;30.7,18.35"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <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:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia: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="2"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O28" connection="6"/>
-        <dia:connection handle="1" to="O1" connection="14"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O30">
-      <dia:attribute name="obj_pos">
-        <dia:point val="21.6508,1.5575"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.9,0.8075;22.0008,4.9"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <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="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="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="2"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O28" connection="3"/>
-        <dia:connection handle="1" to="O5" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O31">
-      <dia:attribute name="obj_pos">
-        <dia:point val="0.75,4.85"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.7,4.1;11.75,8.45"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="0.75,4.85"/>
-        <dia:point val="11.05,4.85"/>
-        <dia:point val="11.05,6.85"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
+            <dia:string>#Departamento del domicilio#</dia:string>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="arrow">
+          <dia:attribute name="abstract">
              <dia:boolean val="false"/>
            </dia:attribute>
              <dia:boolean val="false"/>
            </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
            </dia:attribute>
          </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#codigoPostal#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string(8)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
              <dia:string>##</dia:string>
            </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
+          <dia:attribute name="comment">
+            <dia:string>#Código postal del domicilio#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="arrow">
+          <dia:attribute name="abstract">
              <dia:boolean val="false"/>
            </dia:attribute>
              <dia:boolean val="false"/>
            </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
            </dia:attribute>
          </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O5" connection="4"/>
-        <dia:connection handle="1" to="O7" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O32">
-      <dia:attribute name="obj_pos">
-        <dia:point val="16.575,7.55"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.525,6.8;23.95,24.3"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="16.575,7.55"/>
-        <dia:point val="20.8967,7.55"/>
-        <dia:point val="20.8967,23.45"/>
-        <dia:point val="23.6,23.45"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#provincia#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#enum([provincias])#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
              <dia:string>##</dia:string>
            </dia:attribute>
              <dia:string>##</dia:string>
            </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string># *#</dia:string>
+          <dia:attribute name="comment">
+            <dia:string>#Provincia donde se encuentra el domicilio#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="arrow">
+          <dia:attribute name="abstract">
              <dia:boolean val="false"/>
            </dia:attribute>
              <dia:boolean val="false"/>
            </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
            </dia:attribute>
          </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#telefono#</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:string>##</dia:string>
            </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+          <dia:attribute name="comment">
+            <dia:string>#Teléfono del domicilio#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="arrow">
+          <dia:attribute name="abstract">
              <dia:boolean val="false"/>
            </dia:attribute>
              <dia:boolean val="false"/>
            </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
            </dia: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:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
      </dia:object>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O33">
+    <dia:object type="UML - Generalization" version="0" id="O16">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="23.6,29.35"/>
+        <dia:point val="41.2,10.35"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="22.85,28.6;34.425,34.0575"/>
+        <dia:rectangle val="40.35,10.3;42.575,12.75"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <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:point val="41.2,10.35"/>
+        <dia:point val="41.2,11.525"/>
+        <dia:point val="42.525,11.525"/>
+        <dia:point val="42.525,12.7"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
          <dia:enum val="0"/>
          <dia:enum val="1"/>
        </dia:attribute>
        </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 name="orth_autoroute">
+        <dia:boolean val="true"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#titularidad#</dia:string>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
        </dia:attribute>
        </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="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
        </dia:attribute>
        <dia:connections>
        </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="O7" connection="6"/>
+        <dia:connection handle="1" to="O10" connection="1"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O34">
+    <dia:object type="UML - Generalization" version="0" id="O17">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="15.9,32.5"/>
+        <dia:point val="41.2,10.35"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.85,32.45;44.515,37.4325"/>
+        <dia:rectangle val="30.425,10.3;42.05,12.85"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <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:point val="41.2,10.35"/>
+        <dia:point val="41.2,11.575"/>
+        <dia:point val="30.475,11.575"/>
+        <dia:point val="30.475,12.8"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
          <dia:enum val="0"/>
          <dia:enum val="1"/>
        </dia:attribute>
        </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 name="orth_autoroute">
+        <dia:boolean val="true"/>
+      </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>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
        </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
        </dia:attribute>
        <dia:connections>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O4" connection="6"/>
-        <dia:connection handle="1" to="O27" connection="6"/>
+        <dia:connection handle="0" to="O7" connection="6"/>
+        <dia:connection handle="1" to="O11" connection="1"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O35">
+    <dia:object type="UML - Generalization" version="0" id="O18">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="32.25,27.05"/>
+        <dia:point val="9.2,17.2"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.5,26.3;41.8151,33.3825"/>
+        <dia:rectangle val="1.425,17.15;10.05,21.1"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <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:point val="9.2,17.2"/>
+        <dia:point val="9.2,19.125"/>
+        <dia:point val="1.475,19.125"/>
+        <dia:point val="1.475,21.05"/>
        </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>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="true"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#Historial de planes#</dia:string>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string># 1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </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:attribute name="stereotype">
+        <dia:string>##</dia:string>
        </dia:attribute>
        <dia:connections>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O2" connection="15"/>
-        <dia:connection handle="1" to="O27" connection="3"/>
+        <dia:connection handle="0" to="O1" connection="6"/>
+        <dia:connection handle="1" to="O2" connection="1"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O36">
+    <dia:object type="UML - Generalization" version="0" id="O19">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="32.7008,1.5575"/>
+        <dia:point val="9.2,17.2"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.6508,0.8075;38.325,6.6"/>
+        <dia:rectangle val="8.35,17.15;18.575,21.05"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <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:point val="9.2,17.2"/>
+        <dia:point val="9.2,19.1"/>
+        <dia:point val="18.525,19.1"/>
+        <dia:point val="18.525,21"/>
        </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="orth_autoroute">
+        <dia:boolean val="true"/>
+      </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>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
        </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="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="2"/>
-          </dia:attribute>
-        </dia:composite>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
        </dia:attribute>
        <dia:connections>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O28" connection="4"/>
-        <dia:connection handle="1" to="O6" connection="10"/>
+        <dia:connection handle="0" to="O1" connection="6"/>
+        <dia:connection handle="1" to="O9" connection="1"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O37">
+    <dia:object type="UML - Generalization" version="0" id="O20">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="43.715,26.55"/>
+        <dia:point val="9.2,17.2"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.2,25.5;44.415,27.4"/>
+        <dia:rectangle val="8.35,17.15;13.6,31.65"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <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:point val="9.2,17.2"/>
+        <dia:point val="9.2,19.9625"/>
+        <dia:point val="13.55,19.9625"/>
+        <dia:point val="13.55,31.6"/>
        </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>
-      <dia:attribute name="name">
-        <dia:string>#titularidad#</dia:string>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="false"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
        </dia:attribute>
        </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># titular#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string># 0..1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
        </dia:attribute>
        <dia:connections>
        </dia:attribute>
        <dia:connections>
-        <dia:connection handle="0" to="O11" connection="8"/>
-        <dia:connection handle="1" to="O2" connection="13"/>
+        <dia:connection handle="0" to="O1" connection="6"/>
+        <dia:connection handle="1" to="O0" connection="1"/>
        </dia:connections>
      </dia:object>
        </dia:connections>
      </dia:object>
-    <dia:object type="UML - Association" version="0" id="O38">
+    <dia:object type="UML - Note" version="0" id="O21">
        <dia:attribute name="obj_pos">
        <dia:attribute name="obj_pos">
-        <dia:point val="5.525,7.55"/>
+        <dia:point val="-3.5,-1.44999"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.925,6.8;5.875,14.6"/>
+        <dia:rectangle val="-3.55,-1.49999;23,0.30001"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="orth_points">
-        <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 name="elem_corner">
+        <dia:point val="-3.5,-1.44999"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
+      <dia:attribute name="elem_width">
+        <dia:real val="26.450000000000003"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
+      <dia:attribute name="elem_height">
+        <dia:real val="1.7000000000000002"/>
        </dia:attribute>
        </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
        </dia:attribute>
        </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 name="fill_colour">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#Todas las clases tienen geters y seters, no se muestran por simplcididad.#</dia:string>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+          <dia:attribute name="font">
+            <dia:font family="monospace" style="0" name="Courier"/>
            </dia:attribute>
            </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+          <dia:attribute name="pos">
+            <dia:point val="-3.15,-0.24999"/>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
            </dia:attribute>
            </dia:attribute>
-          <dia:attribute name="aggregate">
+          <dia:attribute name="alignment">
              <dia:enum val="0"/>
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
              <dia:enum val="0"/>
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O7" connection="3"/>
-        <dia:connection handle="1" to="O3" connection="4"/>
-      </dia:connections>
      </dia:object>
    </dia:layer>
  </dia:diagram>
      </dia:object>
    </dia:layer>
  </dia:diagram>