]> git.llucax.com Git - z.facultad/75.10/miklolife.git/blobdiff - diagramas/der.dia
projects / z.facultad / 75.10 / miklolife.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Separo diagrama de clases y de relaciones porque al agregar métodos se va a hacer...
[z.facultad/75.10/miklolife.git] / diagramas / der.dia
diff --git a/diagramas/der.dia b/diagramas/der.dia
index ea19a34d3ee00c58d0124771462f3a1d855a5c83..00761b7a3df80677df7e8b65c41080498c9c4c91 100644 (file)
--- a/diagramas/der.dia
+++ b/diagramas/der.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.36051851511001587"/>
+          <dia:real val="0.36051854491233826"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -196,13 +196,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.45,8.5"/>
+        <dia:point val="38.75,6.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.4,8.45;51.9,18.15"/>
+        <dia:rectangle val="38.7,6.9;51.2,16.6"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="39.45,8.5"/>
+        <dia:point val="38.75,6.95"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="12.4"/>
@@ -326,7 +326,7 @@
             <dia:string>#Tipo de documento.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="2"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -349,7 +349,7 @@
             <dia:string>#Número de documento#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="2"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -372,7 +372,7 @@
             <dia:string>#Primer y segundo nombre (en ese orden).#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -395,7 +395,7 @@
             <dia:string>#Apellido completo.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -418,7 +418,7 @@
             <dia:string>#Dirección de correo electrónico de la persona.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -441,7 +441,7 @@
             <dia:string>#Fecha de nacimiento (es una clase??? Para mí sí)#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -464,7 +464,7 @@
             <dia:string>#Género de la persona#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -487,7 +487,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -504,13 +504,13 @@
             <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
-            <dia:string>#PK#</dia:string>
+            <dia:string>#FK#</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -528,19 +528,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="21.6,23.05"/>
+        <dia:point val="29.45,23.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.55,23;30.3,31.1"/>
+        <dia:rectangle val="29.4,23.7;38.15,31"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="21.6,23.05"/>
+        <dia:point val="29.45,23.75"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="8"/>
+        <dia:real val="7.1999999999999993"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Afiliado#</dia:string>
@@ -658,7 +658,7 @@
             <dia:string>#Identificador único de afiliado (con alguna codificación? int?).#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="2"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -681,7 +681,7 @@
             <dia:string>#Fecha en la que se lo dio de alta en el sistema.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -704,30 +704,7 @@
             <dia:string>#Fecha en la que el afiliado solicita la baja#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="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>#activo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#True si está en actividad (afiliado). (No convendría poner Plan = NULL en caso de no estar más afiliado?)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -750,7 +727,7 @@
             <dia:string>#Indica cuantos meses adeuda.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -773,7 +750,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -796,7 +773,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -814,19 +791,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O3">
       <dia:attribute name="obj_pos">
-        <dia:point val="-4.925,14.45"/>
+        <dia:point val="-4.975,17.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.975,14.4;3.425,18.5"/>
+        <dia:rectangle val="-5.025,17.6;3.375,22.5"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-4.925,14.45"/>
+        <dia:point val="-4.975,17.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.3000000000000007"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4"/>
+        <dia:real val="4.8000000000000007"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestacion#</dia:string>
@@ -930,6 +907,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#codigo#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#int#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Código de prestación según el codificador#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#nombre#</dia:string>
@@ -944,7 +944,7 @@
             <dia:string>#Nombre de la prestación (descripción breve).#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -967,7 +967,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1115,7 +1115,7 @@
             <dia:string>#Codigo de plan (nomenclador).#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="2"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1126,10 +1126,10 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#categoría#</dia:string>
+            <dia:string>#categoria#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1138,7 +1138,7 @@
             <dia:string>#Categoría a la que pertenece (nomenclador).#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1161,7 +1161,7 @@
             <dia:string>#Una breve descripción del plan.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1184,7 +1184,7 @@
             <dia:string>#Permanencia mínima que debe cumplir en el plan antes de pasarse a otro.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1195,19 +1195,19 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#activo#</dia:string>
+            <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
+            <dia:string>#Fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Flag que indica si se el plan esta activo y por lo tanto se pueden tomar nuevas afiliaciones al mismo#</dia:string>
+            <dia:string>#Fecha en la que el plan se dio de baja#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1228,7 +1228,7 @@
         <dia:point val="1.5,-0.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.45,-0.9;9.85,5.6"/>
+        <dia:rectangle val="1.45,-0.9;9.85,4.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="1.5,-0.85"/>
@@ -1237,7 +1237,7 @@
         <dia:real val="8.3000000000000007"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="6.4000000000000004"/>
+        <dia:real val="5.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestador#</dia:string>
@@ -1378,7 +1378,7 @@
             <dia:string>#Nombre legal de la entidad.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1401,30 +1401,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#idTelefono#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>#FK#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1447,7 +1424,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1583,7 +1560,7 @@
         </dia:composite>
         <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>
@@ -1592,10 +1569,10 @@
             <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 de identificación del Cap.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="2"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1606,7 +1583,7 @@
         </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>
@@ -1615,10 +1592,10 @@
             <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 (lo usamos para algo!?!?!?!!).#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1629,19 +1606,19 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#idTelefono#</dia:string>
+            <dia:string>#horario#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
-            <dia:string>#FK#</dia:string>
+            <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Horario de atención (debería volar!?!?!?).#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1664,7 +1641,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1812,7 +1789,7 @@
             <dia:string>#Identificador único.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="2"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1835,7 +1812,7 @@
             <dia:string>#Porcentaje de la prestacion cubierto por la Autorizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1858,7 +1835,7 @@
             <dia:string>#Fecha en que fue solicitada la autorización.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1881,7 +1858,7 @@
             <dia:string>#Fecha en que efectivizada la autorización. Es decir el dia en que se rechazo o el dia en que el afiliado la utilizo.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1904,7 +1881,7 @@
             <dia:string>#Fecha en que vence la autorización.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1927,7 +1904,7 @@
             <dia:string>#Indica si la autorizacion fue aprobada o no.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1950,7 +1927,7 @@
             <dia:string>#Una descripcion coloquial del por qué se aprueba o rechaza la autorización#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1973,7 +1950,7 @@
             <dia:string>#Tipo de autorización#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1996,7 +1973,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2007,7 +1984,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#idCobertura#</dia:string>
+            <dia:string>#idPrestacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
@@ -2019,7 +1996,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2042,7 +2019,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2060,13 +2037,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="50.415,-2.29"/>
+        <dia:point val="18.515,-1.74"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="50.365,-2.34;58.065,2.56"/>
+        <dia:rectangle val="18.465,-1.79;26.165,3.11"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="50.415,-2.29"/>
+        <dia:point val="18.515,-1.74"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -2190,7 +2167,7 @@
             <dia:string>#Nombre de la Zona#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="2"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2213,7 +2190,7 @@
             <dia:string>#Descripción de la Zona#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2236,7 +2213,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2254,13 +2231,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="47.615,28.65"/>
+        <dia:point val="47.665,31.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="47.565,28.6;56.315,35.9"/>
+        <dia:rectangle val="47.615,31.7;56.365,39"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="47.615,28.65"/>
+        <dia:point val="47.665,31.75"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -2384,7 +2361,7 @@
             <dia:string>#Horario en el cual puede ser visitado (de nuevo, representación???).#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2407,7 +2384,7 @@
             <dia:string>#Cantidad de integrantes del grupo familiar a afiliar.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2430,7 +2407,7 @@
             <dia:string>#Observaciones que puedan ser de utilidad para el Promotor.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2453,7 +2430,7 @@
             <dia:string>#Indica si el solicitante fue visitado o no.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2476,7 +2453,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2499,7 +2476,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2517,13 +2494,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="7.765,20.61"/>
+        <dia:point val="8.165,20.91"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.715,20.56;18.215,24.66"/>
+        <dia:rectangle val="8.115,20.86;18.615,24.96"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="7.765,20.61"/>
+        <dia:point val="8.165,20.91"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="10.4"/>
@@ -2647,7 +2624,7 @@
             <dia:string>#Una descripcion coloquial del por qué se solicita la autorización#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2670,7 +2647,7 @@
             <dia:string>#Fecha en la que se aprobo/rechazo la autorizacion.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2688,19 +2665,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.885,28.57"/>
+        <dia:point val="-5.635,33.07"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.935,28.52;7.265,35.82"/>
+        <dia:rectangle val="-5.685,33.02;7.515,39.52"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5.885,28.57"/>
+        <dia:point val="-5.635,33.07"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="13.1"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="7.1999999999999993"/>
+        <dia:real val="6.4000000000000004"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Cobertura#</dia:string>
@@ -2783,13 +2760,13 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#id#</dia:string>
+            <dia:string>#idPrestacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
-            <dia:string>#PK#</dia:string>
+            <dia:string>#PK/FK#</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
@@ -2806,16 +2783,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#tiempoPermanencia#</dia:string>
+            <dia:string>#idPlan#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Tiempo#</dia:string>
+            <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
-            <dia:string>##</dia:string>
+            <dia:string>#PK/FK#</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>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -2829,19 +2806,19 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#porcentaje#</dia:string>
+            <dia:string>#carencia#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#Tiempo#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Porcentaje de la prestación cubierto.#</dia:string>
+            <dia:string>#Antigüedad que debe tener el afiliado en el plan para ser cubierto. (años? meses?)#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2852,7 +2829,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#limiteAnual#</dia:string>
+            <dia:string>#porcentaje#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
@@ -2861,10 +2838,10 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Cantidad de prestaciones que se puede realizar por año (cero indica que no hay límite).#</dia:string>
+            <dia:string>#Porcentaje de la prestación cubierto.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2875,19 +2852,19 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#tipoAutorizacion#</dia:string>
+            <dia:string>#limiteAnual#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#enum(manual,auto)#</dia:string>
+            <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Indica el tipo de autorización que necesita para realizarse la prestación.#</dia:string>
+            <dia:string>#Cantidad de prestaciones que se puede realizar por año (cero indica que no hay límite).#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2898,42 +2875,19 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#idPrestacion#</dia:string>
+            <dia:string>#tipoAutorizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#enum(manual,auto)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
-            <dia:string>#FK#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#idPlan#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>#FK#</dia:string>
-          </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Indica el tipo de autorización que necesita para realizarse la prestación.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2951,13 +2905,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="-3.685,22.32"/>
+        <dia:point val="-2.735,26.67"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.735,22.27;2.165,26.37"/>
+        <dia:rectangle val="-2.785,26.62;3.115,30.72"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-3.685,22.32"/>
+        <dia:point val="-2.735,26.67"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.7999999999999998"/>
@@ -3081,7 +3035,7 @@
             <dia:string>#Identificador único (por codificador, no?)#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="2"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -3104,7 +3058,7 @@
             <dia:string>#Nombre de la categoría.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -3122,14 +3076,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="7.215,35.27"/>
+        <dia:point val="7.465,35.77"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.165,26.95;10.825,36.12"/>
+        <dia:rectangle val="7.415,26.95;10.825,36.62"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="7.215,35.27"/>
-        <dia:point val="8.96521,35.27"/>
+        <dia:point val="7.465,35.77"/>
+        <dia:point val="8.96521,35.77"/>
         <dia:point val="8.96521,27.7"/>
         <dia:point val="10.475,27.7"/>
       </dia:attribute>
@@ -3178,7 +3132,7 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O11" connection="21"/>
+        <dia:connection handle="0" to="O11" connection="11"/>
         <dia:connection handle="1" to="O4" connection="3"/>
       </dia:connections>
     </dia:object>
@@ -3187,13 +3141,13 @@
         <dia:point val="20.025,27.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.975,26.95;21.95,30.6"/>
+        <dia:rectangle val="19.975,26.95;29.8,30.5"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.025,27.7"/>
         <dia:point val="20.8125,27.7"/>
-        <dia:point val="20.8125,29.75"/>
-        <dia:point val="21.6,29.75"/>
+        <dia:point val="20.8125,29.65"/>
+        <dia:point val="29.45,29.65"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3241,21 +3195,21 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O4" connection="4"/>
-        <dia:connection handle="1" to="O2" connection="20"/>
+        <dia:connection handle="1" to="O2" connection="18"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="50.415,2.01"/>
+        <dia:point val="26.115,2.56"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="41.775,-1.05;51.115,2.86"/>
+        <dia:rectangle val="26.065,-1.05;33.875,3.41"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="50.415,2.01"/>
-        <dia:point val="46.12,2.01"/>
-        <dia:point val="46.12,-0.3"/>
-        <dia:point val="41.825,-0.3"/>
+        <dia:point val="26.115,2.56"/>
+        <dia:point val="29.82,2.56"/>
+        <dia:point val="29.82,-0.3"/>
+        <dia:point val="33.525,-0.3"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3299,22 +3253,22 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O8" connection="14"/>
-        <dia:connection handle="1" to="O6" connection="4"/>
+        <dia:connection handle="0" to="O8" connection="15"/>
+        <dia:connection handle="1" to="O6" connection="3"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="6.925,16.55"/>
+        <dia:point val="-5.635,34.97"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.615,15.8;7.975,29.42"/>
+        <dia:rectangle val="-6.975,17.6;-4.625,35.82"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="6.925,16.55"/>
-        <dia:point val="4.825,16.55"/>
-        <dia:point val="4.825,28.57"/>
-        <dia:point val="0.665,28.57"/>
+        <dia:point val="-5.635,34.97"/>
+        <dia:point val="-6.925,34.97"/>
+        <dia:point val="-6.925,18.35"/>
+        <dia:point val="-4.975,18.35"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3336,7 +3290,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string># * #</dia:string>
+            <dia:string>#* #</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3361,31 +3315,28 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O7" connection="28"/>
-        <dia:connection handle="1" to="O11" connection="1"/>
+        <dia:connection handle="0" to="O11" connection="8"/>
+        <dia:connection handle="1" to="O3" connection="3"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.885,34.47"/>
+        <dia:point val="-5.125,10.9325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.975,14.4;-4.575,35.32"/>
+        <dia:rectangle val="-6.175,-0.9;1.85,11.7825"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-5.885,34.47"/>
-        <dia:point val="-6.925,34.47"/>
-        <dia:point val="-6.925,15.15"/>
-        <dia:point val="-4.925,15.15"/>
+        <dia:point val="-5.125,10.9325"/>
+        <dia:point val="-6.125,10.9325"/>
+        <dia:point val="-6.125,-0.15"/>
+        <dia:point val="1.5,-0.15"/>
       </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>
@@ -3423,93 +3374,34 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O11" connection="18"/>
-        <dia:connection handle="1" to="O3" connection="3"/>
+        <dia:connection handle="0" to="O32" connection="8"/>
+        <dia:connection handle="1" to="O5" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O18">
+    <dia:object type="UML - Class" version="0" id="O18">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.075,9.78251"/>
+        <dia:point val="20.815,34.7325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.125,-0.9;1.85,10.6325"/>
+        <dia:rectangle val="20.765,34.6825;29.865,39.5825"/>
       </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="-5.075,9.78251"/>
-        <dia:point val="-6.075,9.78251"/>
-        <dia:point val="-6.075,-0.15"/>
-        <dia:point val="1.5,-0.15"/>
+      <dia:attribute name="elem_corner">
+        <dia:point val="20.815,34.7325"/>
       </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="9"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="4.8000000000000007"/>
       </dia:attribute>
       <dia:attribute name="name">
+        <dia:string>#HistoriaPlan#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
         <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="O38" connection="8"/>
-        <dia:connection handle="1" to="O5" connection="3"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O19">
-      <dia:attribute name="obj_pos">
-        <dia:point val="20.915,33.8825"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.865,33.8325;29.965,38.7325"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="20.915,33.8825"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="9"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#HistoriaPlan#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="comment">
-        <dia:string>#Representa el período de tiempo que un afiliado estuvo en un plan.#</dia:string>
+      <dia:attribute name="comment">
+        <dia:string>#Representa el período de tiempo que un afiliado estuvo en un plan.#</dia:string>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
@@ -3641,7 +3533,7 @@
             <dia:string>#Fecha en que se dio de alta el plan#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -3664,7 +3556,7 @@
             <dia:string>#Fecha en la que el plan no rige mas para el afiliado#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -3680,183 +3572,12 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O20">
-      <dia:attribute name="obj_pos">
-        <dia:point val="13.5008,-2.49249"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.4508,-2.54249;28.4508,1.55751"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="13.5008,-2.49249"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="14.9"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="4"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#Telefono#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="comment">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="abstract">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_attributes">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_attributes">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_comments">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="attributes">
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#id#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>#PK#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#tipo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#enum(particular, laboral, celular)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Tipo de telefono.#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#numero#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Numero de telefono#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:attribute name="operations"/>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O21">
+    <dia:object type="UML - Class" version="0" id="O19">
       <dia:attribute name="obj_pos">
         <dia:point val="20.8508,11.3575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.8008,11.3075;31.9508,18.6075"/>
+        <dia:rectangle val="20.8008,11.3075;31.9508,19.4075"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="20.8508,11.3575"/>
@@ -3865,7 +3586,7 @@
         <dia:real val="11.049999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="7.1999999999999993"/>
+        <dia:real val="8"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Direccion#</dia:string>
@@ -3983,7 +3704,7 @@
             <dia:string>#Calle del domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -4006,7 +3727,7 @@
             <dia:string>#Número del domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -4029,7 +3750,7 @@
             <dia:string>#Piso del domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -4052,7 +3773,7 @@
             <dia:string>#Departamento del domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -4075,7 +3796,7 @@
             <dia:string>#Código postal del domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -4098,7 +3819,7 @@
             <dia:string>#Provincia donde se encuentra el domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -4107,85 +3828,49 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-      </dia:attribute>
-      <dia:attribute name="operations"/>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O22">
-      <dia:attribute name="obj_pos">
-        <dia:point val="30.996,7.53251"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.946,6.78251;39.8,10.05"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="30.996,7.53251"/>
-        <dia:point val="35.223,7.53251"/>
-        <dia:point val="35.223,9.2"/>
-        <dia:point val="39.45,9.2"/>
-      </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>#telefono#</dia:string>
           </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
           </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
+          <dia:attribute name="value">
             <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="arrow">
+          <dia:attribute name="visibility">
+            <dia:enum val="3"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O40" connection="11"/>
-        <dia:connection handle="1" to="O1" connection="3"/>
-      </dia:connections>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O23">
+    <dia:object type="UML - Association" version="0" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="26.3758,18.5575"/>
+        <dia:point val="26.3758,19.3575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.3258,16.85;39.8,20.9575"/>
+        <dia:rectangle val="26.3258,15.3;39.1,21.7575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="26.3758,18.5575"/>
-        <dia:point val="26.3758,19.5575"/>
-        <dia:point val="32.9129,19.5575"/>
-        <dia:point val="32.9129,17.6"/>
-        <dia:point val="39.45,17.6"/>
+        <dia:point val="26.3758,19.3575"/>
+        <dia:point val="26.3758,20.3575"/>
+        <dia:point val="32.5629,20.3575"/>
+        <dia:point val="32.5629,16.05"/>
+        <dia:point val="38.75,16.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4230,19 +3915,19 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O21" connection="6"/>
+        <dia:connection handle="0" to="O19" connection="6"/>
         <dia:connection handle="1" to="O1" connection="26"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O24">
+    <dia:object type="UML - Association" version="0" id="O21">
       <dia:attribute name="obj_pos">
-        <dia:point val="5.65,5.55"/>
+        <dia:point val="5.65,4.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.6,5.5;7.275,16.6"/>
+        <dia:rectangle val="5.6,4.7;7.275,16.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="5.65,5.55"/>
+        <dia:point val="5.65,4.75"/>
         <dia:point val="5.65,15.75"/>
         <dia:point val="6.925,15.75"/>
       </dia:attribute>
@@ -4291,18 +3976,18 @@
         <dia:connection handle="1" to="O7" connection="26"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O25">
+    <dia:object type="UML - Association" version="0" id="O22">
       <dia:attribute name="obj_pos">
         <dia:point val="17.975,17.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.925,16.6;21.95,24.6"/>
+        <dia:rectangle val="17.925,16.6;29.8,25.3"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="17.975,17.35"/>
         <dia:point val="19.515,17.35"/>
-        <dia:point val="19.515,23.75"/>
-        <dia:point val="21.6,23.75"/>
+        <dia:point val="19.515,24.45"/>
+        <dia:point val="29.45,24.45"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4353,69 +4038,7 @@
         <dia:connection handle="1" to="O2" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O26">
-      <dia:attribute name="obj_pos">
-        <dia:point val="33.525,3.3"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.3508,-2.54249;33.875,4.15"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="33.525,3.3"/>
-        <dia:point val="30.9629,3.3"/>
-        <dia:point val="30.9629,-1.79249"/>
-        <dia:point val="28.4008,-1.79249"/>
-      </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>#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="O6" connection="14"/>
-        <dia:connection handle="1" to="O20" connection="4"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O27">
+    <dia:object type="UML - Association" version="0" id="O23">
       <dia:attribute name="obj_pos">
         <dia:point val="31.9008,12.0575"/>
       </dia:attribute>
@@ -4470,28 +4093,31 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O21" connection="4"/>
+        <dia:connection handle="0" to="O19" connection="4"/>
         <dia:connection handle="1" to="O6" connection="16"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O28">
+    <dia:object type="UML - Association" version="0" id="O24">
       <dia:attribute name="obj_pos">
-        <dia:point val="47.615,35.35"/>
+        <dia:point val="47.665,38.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.2,26.6;48.315,36.2"/>
+        <dia:rectangle val="38.05,27.3;48.365,39.3"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="47.615,35.35"/>
-        <dia:point val="38.9325,35.35"/>
-        <dia:point val="38.9325,27.35"/>
-        <dia:point val="30.25,27.35"/>
+        <dia:point val="47.665,38.45"/>
+        <dia:point val="41.0501,38.45"/>
+        <dia:point val="41.0501,28.05"/>
+        <dia:point val="38.1,28.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>#titularidad#</dia:string>
       </dia:attribute>
@@ -4533,81 +4159,19 @@
         <dia:connection handle="1" to="O2" connection="15"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O29">
-      <dia:attribute name="obj_pos">
-        <dia:point val="13.5008,-1.79249"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,-2.54249;13.8508,5.1"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="13.5008,-1.79249"/>
-        <dia:point val="12.025,-1.79249"/>
-        <dia:point val="12.025,4.25"/>
-        <dia:point val="9.8,4.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="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>#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="O20" connection="3"/>
-        <dia:connection handle="1" to="O5" connection="17"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O30">
+    <dia:object type="UML - Association" version="0" id="O25">
       <dia:attribute name="obj_pos">
         <dia:point val="12.45,17.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.325,17.8;13.15,23.36"/>
+        <dia:rectangle val="6.325,17.8;13.15,23.66"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="12.45,17.85"/>
         <dia:point val="12.45,19.3325"/>
         <dia:point val="6.375,19.3325"/>
-        <dia:point val="6.375,22.51"/>
-        <dia:point val="7.765,22.51"/>
+        <dia:point val="6.375,22.81"/>
+        <dia:point val="8.165,22.81"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4659,19 +4223,19 @@
         <dia:connection handle="1" to="O10" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O31">
+    <dia:object type="UML - Association" version="0" id="O26">
       <dia:attribute name="obj_pos">
-        <dia:point val="51.85,18.1"/>
+        <dia:point val="51.15,16.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="46.565,18.05;52.55,31.4"/>
+        <dia:rectangle val="46.0501,16.5;51.85,34.5"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="51.85,18.1"/>
-        <dia:point val="51.85,19.1"/>
-        <dia:point val="46.615,19.1"/>
-        <dia:point val="46.615,30.55"/>
-        <dia:point val="47.615,30.55"/>
+        <dia:point val="51.15,16.55"/>
+        <dia:point val="51.15,19.46"/>
+        <dia:point val="46.1001,19.46"/>
+        <dia:point val="46.1001,33.65"/>
+        <dia:point val="47.665,33.65"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4679,6 +4243,9 @@
         <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>#herencia#</dia:string>
       </dia:attribute>
@@ -4720,16 +4287,16 @@
         <dia:connection handle="1" to="O9" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O32">
+    <dia:object type="UML - Association" version="0" id="O27">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.45,16.8"/>
+        <dia:point val="38.75,15.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.625,4.55;39.8,17.65"/>
+        <dia:rectangle val="37.625,4.55;39.1,16.1"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="39.45,16.8"/>
-        <dia:point val="37.675,16.8"/>
+        <dia:point val="38.75,15.25"/>
+        <dia:point val="37.675,15.25"/>
         <dia:point val="37.675,4.6"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -4777,17 +4344,17 @@
         <dia:connection handle="1" to="O6" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O33">
+    <dia:object type="UML - Association" version="0" id="O28">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.25,24.95"/>
+        <dia:point val="38.1,25.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.2,18.05;46.35,25.8"/>
+        <dia:rectangle val="38.05,16.5;45.65,26.5"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.25,24.95"/>
-        <dia:point val="45.65,24.95"/>
-        <dia:point val="45.65,18.1"/>
+        <dia:point val="38.1,25.65"/>
+        <dia:point val="44.95,25.65"/>
+        <dia:point val="44.95,16.55"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4834,16 +4401,16 @@
         <dia:connection handle="1" to="O1" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O34">
+    <dia:object type="UML - Association" version="0" id="O29">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.915,36.5825"/>
+        <dia:point val="20.815,37.4325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.2,33.35;21.265,37.4325"/>
+        <dia:rectangle val="15.2,33.35;21.165,38.2825"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="20.915,36.5825"/>
-        <dia:point val="15.25,36.5825"/>
+        <dia:point val="20.815,37.4325"/>
+        <dia:point val="15.25,37.4325"/>
         <dia:point val="15.25,33.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -4887,90 +4454,28 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O19" connection="10"/>
+        <dia:connection handle="0" to="O18" connection="10"/>
         <dia:connection handle="1" to="O4" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O35">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-4.925,17.95"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.975,17.2;-3.335,23.87"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="-4.925,17.95"/>
-        <dia:point val="-5.925,17.95"/>
-        <dia:point val="-5.925,23.02"/>
-        <dia:point val="-3.685,23.02"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="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="O3" connection="12"/>
-        <dia:connection handle="1" to="O12" connection="3"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O36">
+    <dia:object type="UML - Association" version="0" id="O30">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.8508,12.0575"/>
+        <dia:point val="-4.975,21.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,4.3;21.2008,12.9075"/>
+        <dia:rectangle val="-6.025,21.2;-2.385,28.22"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="20.8508,12.0575"/>
-        <dia:point val="20.175,12.0575"/>
-        <dia:point val="20.175,5.05"/>
-        <dia:point val="9.8,5.05"/>
+        <dia:point val="-4.975,21.95"/>
+        <dia:point val="-5.975,21.95"/>
+        <dia:point val="-5.975,27.37"/>
+        <dia:point val="-2.735,27.37"/>
       </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>
@@ -4983,7 +4488,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -5008,26 +4513,24 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O21" connection="3"/>
-        <dia:connection handle="1" to="O5" connection="19"/>
+        <dia:connection handle="0" to="O3" connection="14"/>
+        <dia:connection handle="1" to="O12" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O37">
+    <dia:object type="UML - Association" version="0" id="O31">
       <dia:attribute name="obj_pos">
-        <dia:point val="54.215,-2.29"/>
+        <dia:point val="20.8508,12.0575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,-3.34;54.915,0.7"/>
+        <dia:rectangle val="9.75,3.5;21.2008,12.9075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="54.215,-2.29"/>
-        <dia:point val="54.215,-3.29"/>
-        <dia:point val="11.075,-3.29"/>
-        <dia:point val="11.075,-0.15"/>
-        <dia:point val="9.8,-0.15"/>
+        <dia:point val="20.8508,12.0575"/>
+        <dia:point val="20.175,12.0575"/>
+        <dia:point val="20.175,4.25"/>
+        <dia:point val="9.8,4.25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
@@ -5061,7 +4564,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -5072,19 +4575,19 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O8" connection="1"/>
-        <dia:connection handle="1" to="O5" connection="4"/>
+        <dia:connection handle="0" to="O19" connection="3"/>
+        <dia:connection handle="1" to="O5" connection="17"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O38">
+    <dia:object type="UML - Class" version="0" id="O32">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.075,7.88251"/>
+        <dia:point val="-5.125,9.03251"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.125,7.83251;4.675,11.1325"/>
+        <dia:rectangle val="-5.175,8.98251;4.625,12.2825"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5.075,7.88251"/>
+        <dia:point val="-5.125,9.03251"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="9.6999999999999993"/>
@@ -5224,20 +4727,20 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O39">
+    <dia:object type="UML - Association" version="0" id="O33">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.075,10.5825"/>
+        <dia:point val="-5.125,11.7325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.125,9.83251;4.425,16"/>
+        <dia:rectangle val="-6.175,10.9825;4.375,19.2"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-5.075,10.5825"/>
-        <dia:point val="-6.075,10.5825"/>
-        <dia:point val="-6.075,12.8663"/>
-        <dia:point val="4.375,12.8663"/>
-        <dia:point val="4.375,15.15"/>
-        <dia:point val="3.375,15.15"/>
+        <dia:point val="-5.125,11.7325"/>
+        <dia:point val="-6.125,11.7325"/>
+        <dia:point val="-6.125,15.0413"/>
+        <dia:point val="4.325,15.0413"/>
+        <dia:point val="4.325,18.35"/>
+        <dia:point val="3.325,18.35"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -5283,171 +4786,91 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O38" connection="10"/>
+        <dia:connection handle="0" to="O32" connection="10"/>
         <dia:connection handle="1" to="O3" connection="4"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O40">
+    <dia:object type="UML - Association" version="0" id="O34">
       <dia:attribute name="obj_pos">
-        <dia:point val="21.996,4.83251"/>
+        <dia:point val="51.15,7.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.946,4.78251;31.046,8.08251"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="21.996,4.83251"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="9"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
+        <dia:rectangle val="47.8651,6.9;58.7651,27.45"/>
       </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#TelefonoPersona#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="comment">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="abstract">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_attributes">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_attributes">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+      <dia:attribute name="orth_points">
+        <dia:point val="51.15,7.65"/>
+        <dia:point val="58.7151,7.65"/>
+        <dia:point val="58.7151,21.2575"/>
+        <dia:point val="47.9151,21.2575"/>
+        <dia:point val="47.9151,26.6"/>
+        <dia:point val="50,26.6"/>
       </dia:attribute>
-      <dia:attribute name="visible_comments">
-        <dia:boolean val="false"/>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
       </dia:attribute>
-      <dia:attribute name="wrap_operations">
+      <dia:attribute name="autorouting">
         <dia:boolean val="false"/>
       </dia:attribute>
-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
+      <dia:attribute name="name">
+        <dia:string>#herencia#</dia:string>
       </dia:attribute>
-      <dia:attribute name="comment_font_height">
-        <dia:real val="1"/>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
       </dia:attribute>
-      <dia:attribute name="attributes">
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#idTelefono#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>#PK/FK#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
             <dia:string>##</dia:string>
           </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
           </dia:attribute>
-          <dia:attribute name="abstract">
+          <dia:attribute name="arrow">
             <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#idPersona#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>#PK/FK#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
+        <dia:composite>
+          <dia:attribute name="role">
             <dia:string>##</dia:string>
           </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+          <dia:attribute name="multiplicity">
+            <dia:string>#0..1#</dia:string>
           </dia:attribute>
-          <dia:attribute name="abstract">
+          <dia:attribute name="arrow">
             <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
           </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:connections>
+        <dia:connection handle="0" to="O1" connection="4"/>
+        <dia:connection handle="1" to="O0" connection="8"/>
+      </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O41">
+    <dia:object type="UML - Association" version="0" id="O35">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.9508,1.50751"/>
+        <dia:point val="56.315,37.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.9008,1.45751;22.346,7.58251"/>
+        <dia:rectangle val="56.265,24.65;59.75,38.5"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="20.9508,1.50751"/>
-        <dia:point val="20.9508,6.73251"/>
-        <dia:point val="21.996,6.73251"/>
+        <dia:point val="56.315,37.65"/>
+        <dia:point val="59.65,37.65"/>
+        <dia:point val="59.65,25.4"/>
+        <dia:point val="58.65,25.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
       </dia:attribute>
@@ -5463,7 +4886,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -5477,7 +4900,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -5488,37 +4911,35 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O20" connection="6"/>
-        <dia:connection handle="1" to="O40" connection="8"/>
+        <dia:connection handle="0" to="O9" connection="19"/>
+        <dia:connection handle="1" to="O0" connection="4"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O42">
+    <dia:object type="UML - Association" version="0" id="O36">
       <dia:attribute name="obj_pos">
-        <dia:point val="51.85,9.2"/>
+        <dia:point val="29.45,30.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="47.8651,8.45;58.7651,27.45"/>
+        <dia:rectangle val="27.9501,29.7;34.475,33.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="51.85,9.2"/>
-        <dia:point val="58.7151,9.2"/>
-        <dia:point val="58.7151,21.2575"/>
-        <dia:point val="47.9151,21.2575"/>
-        <dia:point val="47.9151,26.6"/>
-        <dia:point val="50,26.6"/>
+        <dia:point val="29.45,30.45"/>
+        <dia:point val="28.0001,30.45"/>
+        <dia:point val="28.0001,32.8075"/>
+        <dia:point val="33.775,32.8075"/>
+        <dia:point val="33.775,30.95"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
-        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="autorouting">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#herencia#</dia:string>
+        <dia:string>#titularidad#</dia:string>
       </dia:attribute>
       <dia:attribute name="direction">
         <dia:enum val="0"/>
@@ -5529,7 +4950,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -5543,7 +4964,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#0..1#</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -5554,30 +4975,28 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O1" connection="4"/>
-        <dia:connection handle="1" to="O0" connection="8"/>
+        <dia:connection handle="0" to="O2" connection="20"/>
+        <dia:connection handle="1" to="O2" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O43">
+    <dia:object type="UML - Association" version="0" id="O37">
       <dia:attribute name="obj_pos">
-        <dia:point val="56.265,34.55"/>
+        <dia:point val="38.1,30.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="56.215,24.65;59.75,35.4"/>
+        <dia:rectangle val="29.765,30.9;38.8,37.4825"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="56.265,34.55"/>
-        <dia:point val="59.65,34.55"/>
-        <dia:point val="59.65,25.4"/>
-        <dia:point val="58.65,25.4"/>
+        <dia:point val="38.1,30.95"/>
+        <dia:point val="38.1,36.6325"/>
+        <dia:point val="29.815,36.6325"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>##</dia:string>
+        <dia:string>#Historial de Planes#</dia:string>
       </dia:attribute>
       <dia:attribute name="direction">
         <dia:enum val="0"/>
@@ -5588,7 +5007,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -5602,7 +5021,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -5613,35 +5032,30 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O9" connection="19"/>
-        <dia:connection handle="1" to="O0" connection="4"/>
+        <dia:connection handle="0" to="O2" connection="7"/>
+        <dia:connection handle="1" to="O18" connection="9"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O44">
+    <dia:object type="UML - Association" version="0" id="O38">
       <dia:attribute name="obj_pos">
-        <dia:point val="21.6,30.55"/>
+        <dia:point val="9.8,3.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.55,29.8;26.625,33.45"/>
+        <dia:rectangle val="9.75,-1.79;18.865,4.3"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="21.6,30.55"/>
-        <dia:point val="20.6,30.55"/>
-        <dia:point val="20.6,32.8075"/>
-        <dia:point val="25.925,32.8075"/>
-        <dia:point val="25.925,31.05"/>
+        <dia:point val="9.8,3.45"/>
+        <dia:point val="14.1575,3.45"/>
+        <dia:point val="14.1575,-1.04"/>
+        <dia:point val="18.515,-1.04"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#titularidad#</dia:string>
+        <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="direction">
         <dia:enum val="0"/>
@@ -5677,30 +5091,32 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O2" connection="22"/>
-        <dia:connection handle="1" to="O2" connection="6"/>
+        <dia:connection handle="0" to="O5" connection="15"/>
+        <dia:connection handle="1" to="O8" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O45">
+    <dia:object type="UML - Association" version="0" id="O39">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.25,31.05"/>
+        <dia:point val="6.925,16.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.865,30.3;38,36.6325"/>
+        <dia:rectangle val="-0.875,15.8;7.275,24.85"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.25,31.05"/>
-        <dia:point val="31.25,31.05"/>
-        <dia:point val="31.25,35.7825"/>
-        <dia:point val="29.915,35.7825"/>
+        <dia:point val="6.925,16.55"/>
+        <dia:point val="5.925,16.55"/>
+        <dia:point val="5.925,23.45"/>
+        <dia:point val="-0.825,23.45"/>
+        <dia:point val="-0.825,22.45"/>
       </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>#Historial de Planes#</dia:string>
+        <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="direction">
         <dia:enum val="0"/>
@@ -5711,7 +5127,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -5725,7 +5141,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -5736,9 +5152,61 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O2" connection="7"/>
-        <dia:connection handle="1" to="O19" connection="9"/>
+        <dia:connection handle="0" to="O7" connection="28"/>
+        <dia:connection handle="1" to="O3" connection="6"/>
       </dia:connections>
     </dia:object>
+    <dia:object type="UML - Note" version="0" id="O40">
+      <dia:attribute name="obj_pos">
+        <dia:point val="45.0501,-1.365"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="45.0001,-1.415;58.9001,5.985"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="45.0501,-1.365"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="13.800000000000001"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="7.3000000000000007"/>
+      </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>#Las claves primarias naturales se
+representan con un # (el conjunto de
+atributos marcados con # en una tabla
+componen la clave primaria natural).
+Cada tabla tiene un indice compuesto
+por estos atributos.
+Para mejor legibilidad, a las PK las
+antecede un signo + y las FK un -.#</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="45.4001,-0.115"/>
+          </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>
Sistema para administrar una obra social (TP de Técnicas de Diseño)