Hice lo de prestaciones y actualicé el diagrama de persistencia y de los controladore...

[z.facultad/75.10/miklolife.git] / diagramas / clases.dia

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 4f333c7deb1164d725eb166ad82e7620a0344137..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.48352965712547302"/>
+          <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="7,21"/>
+        <dia:point val="11.3,31.6"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="6.95,20.95;11.55,22.85"/>
+        <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="7,21"/>
+        <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"/>


@@ -175,13 +175,13 @@
         <dia:point val="3,10"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="3,10"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="2.95,9.95;15.45,17.25"/>
+        <dia:rectangle val="2.95,9.95;15.55,17.25"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="3,10"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="3,10"/>
       </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="-5,21"/>
+        <dia:point val="-9.85,21.05"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-5.05,20.95;3.7,28.45"/>
+        <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="-5,21"/>
+        <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="7.4000000000000004"/>
+        <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"/>


@@ -712,6 +712,102 @@
           </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>#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"/>


@@ -723,16 +819,16 @@
         <dia:point val="-5,6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="-5,6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-5.05,5.95;0.85,9.25"/>
+        <dia:rectangle val="-5.05,5.95;1.6,10.05"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-5,6"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-5,6"/>
       </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>


@@ -859,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">


@@ -871,16 +990,16 @@
         <dia:point val="3,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="3,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="2.95,0.95;12.6,6.65"/>
+        <dia:rectangle val="2.95,0.95;19.75,9.25"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="3,1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="3,1"/>
       </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>


@@ -889,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"/>


@@ -898,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"/>


@@ -972,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"/>


@@ -989,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"/>


@@ -1035,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"/>


@@ -1077,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>


@@ -1088,16 +1316,16 @@
         <dia:point val="-5,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="-5,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-5.05,0.95;0.85,4.25"/>
+        <dia:rectangle val="-5.05,0.95;1.6,5.05"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-5,1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-5,1"/>
       </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>


@@ -1189,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"/>


@@ -1224,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">


@@ -1233,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="5,28"/>
+        <dia:point val="21,15.75"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="4.95,27.95;12.65,32.05"/>
+        <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="5,28"/>
+        <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"/>


@@ -1328,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>


@@ -1337,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"/>


@@ -1351,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>


@@ -1360,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"/>


@@ -1374,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>


@@ -1383,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"/>


@@ -1404,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="29,1"/>
+        <dia:point val="32.85,0.55"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="28.95,0.95;40.1,9.25"/>
+        <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="29,1"/>
+        <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>


@@ -1690,6 +1941,119 @@
           </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 name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>


@@ -1719,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"/>


@@ -1846,13 +2210,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O9">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O9">
       <dia:attribute name="obj_pos">

-        <dia:point val="15,21"/>
+        <dia:point val="14.2,21"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="14.95,20.95;23.7,29.25"/>
+        <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="15,21"/>
+        <dia:point val="14.2,21"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>


@@ -1950,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"/>


@@ -2161,19 +2525,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">

-        <dia:point val="36,13"/>
+        <dia:point val="38.2,12.7"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="35.95,12.95;44.7,16.25"/>
+        <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="36,13"/>
+        <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>


@@ -2197,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"/>


@@ -2309,13 +2673,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">

-        <dia:point val="23,13"/>
+        <dia:point val="25.3,12.8"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="22.95,12.95;33.4,14.85"/>
+        <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="23,13"/>
+        <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"/>


@@ -2330,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"/>


@@ -2413,13 +2777,13 @@
         <dia:point val="28,20"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="28,20"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="27.95,19.95;41.15,24.85"/>
+        <dia:rectangle val="27.95,19.95;41.25,24.85"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="28,20"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="28,20"/>
       </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"/>


@@ -2508,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"/>


@@ -2607,16 +2971,16 @@
         <dia:point val="-5,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="-5,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-5.05,10.95;0.85,14.25"/>
+        <dia:rectangle val="-5.05,10.95;1.6,15.05"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-5,11"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-5,11"/>
       </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>


@@ -2625,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"/>


@@ -2708,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"/>


@@ -2743,6 +3107,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">


@@ -2879,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"/>


@@ -2900,16 +3287,16 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O15">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O15">
       <dia:attribute name="obj_pos">

-        <dia:point val="15,1"/>
+        <dia:point val="20.15,0.85"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="14.95,0.95;26.1,8.25"/>
+        <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="15,1"/>
+        <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"/>


@@ -2921,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"/>


@@ -3163,16 +3550,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">

-        <dia:point val="34.525,9.2"/>
+        <dia:point val="41.2,10.35"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="33.675,9.15;40.375,13.05"/>
+        <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="34.525,9.2"/>
-        <dia:point val="34.525,11.1"/>
-        <dia:point val="40.325,11.1"/>
-        <dia:point val="40.325,13"/>
+        <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:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>


@@ -3198,16 +3585,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O17">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O17">
       <dia:attribute name="obj_pos">

-        <dia:point val="34.525,9.2"/>
+        <dia:point val="41.2,10.35"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="28.125,9.15;35.375,13.05"/>
+        <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="34.525,9.2"/>
-        <dia:point val="34.525,11.1"/>
-        <dia:point val="28.175,11.1"/>
-        <dia:point val="28.175,13"/>
+        <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:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>


@@ -3236,13 +3623,13 @@
         <dia:point val="9.2,17.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="9.2,17.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-0.725,17.15;10.05,21.05"/>
+        <dia:rectangle val="1.425,17.15;10.05,21.1"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="9.2,17.2"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="9.2,17.2"/>

-        <dia:point val="9.2,19.1"/>
-        <dia:point val="-0.675,19.1"/>
-        <dia:point val="-0.675,21"/>
+        <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:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>


@@ -3271,13 +3658,13 @@
         <dia:point val="9.2,17.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="9.2,17.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="8.35,17.15;19.375,21.05"/>
+        <dia:rectangle val="8.35,17.15;18.575,21.05"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="9.2,17.2"/>
         <dia:point val="9.2,19.1"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="9.2,17.2"/>
         <dia:point val="9.2,19.1"/>

-        <dia:point val="19.325,19.1"/>
-        <dia:point val="19.325,21"/>
+        <dia:point val="18.525,19.1"/>
+        <dia:point val="18.525,21"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>


@@ -3306,13 +3693,13 @@
         <dia:point val="9.2,17.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="9.2,17.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="8.35,17.15;10.05,21.05"/>
+        <dia:rectangle val="8.35,17.15;13.6,31.65"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="9.2,17.2"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="9.2,17.2"/>

-        <dia:point val="9.2,19.1"/>
-        <dia:point val="9.25,19.1"/>
-        <dia:point val="9.25,21"/>
+        <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:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>


@@ -3320,7 +3707,7 @@
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_autoroute">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_autoroute">

-        <dia:boolean val="true"/>
+        <dia:boolean val="false"/>

       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>


@@ -3336,5 +3723,50 @@
         <dia:connection handle="1" to="O0" connection="1"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O0" connection="1"/>
       </dia:connections>
     </dia:object>

+    <dia:object type="UML - Note" version="0" id="O21">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-3.5,-1.44999"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-3.55,-1.49999;23,0.30001"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="-3.5,-1.44999"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="26.450000000000003"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="1.7000000000000002"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <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 name="font">
+            <dia:font family="monospace" style="0" name="Courier"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="-3.15,-0.24999"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+    </dia:object>

   </dia:layer>
 </dia:diagram>
   </dia:layer>
 </dia:diagram>