]> git.llucax.com Git - z.facultad/75.10/miklolife.git/blobdiff - diagramas/clases.dia
projects / z.facultad / 75.10 / miklolife.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
pequeño fix
[z.facultad/75.10/miklolife.git] / diagramas / clases.dia
diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 77d2e321b0334d71e015fd0d952f91892c7aa586..1d0dc3287eb3df9662d1eea583c6fc64e385a441 100644 (file)
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.38150566816329956"/>
+          <dia:real val="0.37046089768409729"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -71,13 +71,13 @@
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - Class" version="0" id="O0">
       <dia:attribute name="obj_pos">
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - Class" version="0" id="O0">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.05,25.1"/>
+        <dia:point val="34.6,23.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34,25.05;38.6,26.95"/>
+        <dia:rectangle val="34.55,23.3;39.15,25.2"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="34.05,25.1"/>
+        <dia:point val="34.6,23.35"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.5"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.5"/>
@@ -175,13 +175,13 @@
         <dia:point val="33.3,8.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="33.3,8.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.25,8.9;45.85,16.2"/>
+        <dia:rectangle val="33.25,8.9;45.75,16.2"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="33.3,8.95"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="33.3,8.95"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="12.5"/>
+        <dia:real val="12.4"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="7.1999999999999993"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="7.1999999999999993"/>
@@ -438,13 +438,13 @@
         <dia:point val="21.6,23.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="21.6,23.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.55,23;30.65,28.7"/>
+        <dia:rectangle val="21.55,23;30.3,28.7"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="21.6,23.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="21.6,23.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="9"/>
+        <dia:real val="8.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="5.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="5.5999999999999996"/>
@@ -530,7 +530,7 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#nroAfiliado#</dia:string>
+            <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
@@ -553,7 +553,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#fecha_afiliacion#</dia:string>
+            <dia:string>#fechaAfiliacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#Fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#Fecha#</dia:string>
@@ -576,7 +576,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#fecha_baja#</dia:string>
+            <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#Fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#Fecha#</dia:string>
@@ -655,16 +655,16 @@
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.875,13;1.075,16.3"/>
+        <dia:rectangle val="-4.875,13;1.025,15.5"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="5.8499999999999996"/>
+        <dia:real val="5.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="2.3999999999999999"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestacion#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestacion#</dia:string>
@@ -768,29 +768,6 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#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>#Identificador único de la prestación (esto está por el codificador? o porque nos pintó a nosotros?)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
       </dia:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
       </dia:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
@@ -800,19 +777,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O4">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O4">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.375,26.1"/>
+        <dia:point val="10.475,25.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.325,26.05;18.675,30.95"/>
+        <dia:rectangle val="10.425,25.75;20.075,31.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="11.375,26.1"/>
+        <dia:point val="10.475,25.8"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="7.25"/>
+        <dia:real val="9.5499999999999989"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="5.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Plan#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Plan#</dia:string>
@@ -898,13 +875,13 @@
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Codigo de plan (nomenclador).#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -918,16 +895,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#precio#</dia:string>
+            <dia:string>#categoría#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Categoría a la que pertenece (nomenclador).#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -944,13 +921,13 @@
             <dia:string>#descripcion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#descripcion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Una breve descripción del plan.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -964,17 +941,40 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#permanencia_minima#</dia:string>
+            <dia:string>#permanenciaMinima#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#Tiempo#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
+            <dia:string>#Permanencia mínima que debe cumplir en el plan antes de pasarse a otro.#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#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: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:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
@@ -994,19 +994,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O5">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="-4,2.75"/>
+        <dia:point val="-4.5,2.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.05,2.7;1.9,6.8"/>
+        <dia:rectangle val="-4.55,2.7;1.35,6"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-4,2.75"/>
+        <dia:point val="-4.5,2.75"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="5.8499999999999996"/>
+        <dia:real val="5.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4"/>
+        <dia:real val="3.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestador#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestador#</dia:string>
@@ -1089,7 +1089,7 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#codigo#</dia:string>
+            <dia:string>#cuit#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
@@ -1098,7 +1098,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Identificador único (para nosotros? o por codificador o algo?).#</dia:string>
+            <dia:string>#Número de CUIT (lo necesitamos!?!?!).#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1133,29 +1133,6 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#cuit#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Número de CUIT (lo necesitamos!?!?!).#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
       </dia:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
       </dia:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
@@ -1316,16 +1293,16 @@
         <dia:point val="5.775,4.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="5.775,4.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.725,4.6;17.275,16.1"/>
+        <dia:rectangle val="5.725,4.6;16.875,12.9"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="5.775,4.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="5.775,4.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="11.449999999999999"/>
+        <dia:real val="11.049999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="11.4"/>
+        <dia:real val="8.1999999999999993"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>
@@ -1431,16 +1408,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#tipo#</dia:string>
+            <dia:string>#porcentajeCobertura#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </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:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Tipo de autorización. (esto si tenemos subclases no debería existir)#</dia:string>
+            <dia:string>#Porcentaje de la prestacion cubierto por la Autorizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1477,7 +1454,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#fechaResolucion#</dia:string>
+            <dia:string>#fechaRealizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#Fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#Fecha#</dia:string>
@@ -1486,7 +1463,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Fecha en la que se aprobó la autorización.#</dia:string>
+            <dia:string>#Fecha en que efectivizada la autorización. Es decir el dia en que se rechazo o el dia en que el afiliado la utilizo.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1509,7 +1486,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en que vence la autorización.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1523,39 +1500,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#porcentajeCobertura#</dia:string>
+            <dia:string>#aprobada#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </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>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#observaciones#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#bool#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Observaciones sobre la autorización (debería ir sólo en Manual o no?)#</dia:string>
+            <dia:string>#Indica si la autorizacion fue aprobada o no.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1569,7 +1523,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#fundamentos_resolucion#</dia:string>
+            <dia:string>#fundamentosResolucion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#string#</dia:string>
@@ -1578,76 +1532,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#fecha_realizacion#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</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>#fecha_vencimiento#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</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>#Aprobada#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Una descripcion coloquial del por qué se aprueba o rechaza la autorización#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1663,7 +1548,7 @@
       <dia:attribute name="operations">
         <dia:composite type="umloperation">
           <dia:attribute name="name">
       <dia:attribute name="operations">
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#get_estado#</dia:string>
+            <dia:string>#getEstado#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
@@ -1702,13 +1587,13 @@
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.05,16.1;40.35,23.52"/>
+        <dia:rectangle val="25.875,16.1;40.35,23.57"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="39.5,16.15"/>
         <dia:point val="39.5,22.72"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="39.5,16.15"/>
         <dia:point val="39.5,22.72"/>
-        <dia:point val="26.1,22.72"/>
-        <dia:point val="26.1,23.05"/>
+        <dia:point val="25.925,22.72"/>
+        <dia:point val="25.925,23.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -1737,13 +1622,13 @@
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="36.25,16.1;40.35,25.15"/>
+        <dia:rectangle val="36.8,16.1;40.35,23.57"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="39.5,16.15"/>
         <dia:point val="39.5,22.72"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="39.5,16.15"/>
         <dia:point val="39.5,22.72"/>
-        <dia:point val="36.3,22.72"/>
-        <dia:point val="36.3,25.1"/>
+        <dia:point val="36.85,22.72"/>
+        <dia:point val="36.85,23.35"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -1864,16 +1749,16 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#codigo#</dia:string>
+            <dia:string>#nombre#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#País en donde se encuentra.#</dia:string>
+            <dia:string>#Nombre de la Zona#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1896,7 +1781,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Descripción de la Zona#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1917,13 +1802,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="42.665,24.4"/>
+        <dia:point val="42.415,25.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="42.615,24.35;51.365,29.25"/>
+        <dia:rectangle val="42.365,25.35;51.115,30.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="42.665,24.4"/>
+        <dia:point val="42.415,25.4"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -2090,7 +1975,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Indica si el solicitante fue visitado o no.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -2114,13 +1999,13 @@
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.65,16.1;47.04,24.45"/>
+        <dia:rectangle val="38.65,16.1;46.79,25.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="39.5,16.15"/>
         <dia:point val="39.5,22.72"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="39.5,16.15"/>
         <dia:point val="39.5,22.72"/>
-        <dia:point val="46.99,22.72"/>
-        <dia:point val="46.99,24.4"/>
+        <dia:point val="46.74,22.72"/>
+        <dia:point val="46.74,25.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2146,19 +2031,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O13">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="10.365,21.26"/>
+        <dia:point val="10.165,20.76"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.315,21.21;18.965,23.71"/>
+        <dia:rectangle val="10.115,20.71;18.865,24.01"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="10.365,21.26"/>
+        <dia:point val="10.165,20.76"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="8.5500000000000007"/>
+        <dia:real val="8.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="2.3999999999999999"/>
+        <dia:real val="3.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionManual#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionManual#</dia:string>
@@ -2250,7 +2135,30 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Comentarios sobre la autorización#</dia:string>
+            <dia:string>#Una descripcion coloquial del por qué se solicita la autorización#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#fechaResolucion#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#fecha#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Fecha en la que se aprobo/rechazo la autorizacion.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -2271,16 +2179,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O14">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.5,16.05"/>
+        <dia:point val="11.3,12.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.65,16;14.69,21.31"/>
+        <dia:rectangle val="10.45,12.8;14.54,20.81"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="11.5,16.05"/>
-        <dia:point val="11.5,17.97"/>
-        <dia:point val="14.64,17.97"/>
-        <dia:point val="14.64,21.26"/>
+        <dia:point val="11.3,12.85"/>
+        <dia:point val="11.3,15.0325"/>
+        <dia:point val="14.49,15.0325"/>
+        <dia:point val="14.49,20.76"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2306,22 +2214,22 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O15">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.58,21.22"/>
+        <dia:point val="3.38,16.37"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.53,21.17;9.93,23.07"/>
+        <dia:rectangle val="3.33,16.32;13.78,18.22"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="4.58,21.22"/>
+        <dia:point val="3.38,16.37"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="5.2999999999999998"/>
+        <dia:real val="10.35"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="1.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="1.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#Automatica#</dia:string>
+        <dia:string>#AutorizacionAutomatica#</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -2407,16 +2315,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.5,16.05"/>
+        <dia:point val="11.3,12.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.18,16;12.35,21.27"/>
+        <dia:rectangle val="8.505,12.8;12.15,16.42"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="11.5,16.05"/>
-        <dia:point val="11.5,17.97"/>
-        <dia:point val="7.23,17.97"/>
-        <dia:point val="7.23,21.22"/>
+        <dia:point val="11.3,12.85"/>
+        <dia:point val="11.3,15.0325"/>
+        <dia:point val="8.555,15.0325"/>
+        <dia:point val="8.555,16.37"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2445,13 +2353,13 @@
         <dia:point val="-5.585,27.52"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="-5.585,27.52"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.635,27.47;7.665,32.37"/>
+        <dia:rectangle val="-5.635,27.47;7.565,32.37"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-5.585,27.52"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-5.585,27.52"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="13.199999999999999"/>
+        <dia:real val="13.1"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
@@ -2609,7 +2517,7 @@
             <dia:string>#tipoAutorizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#tipoAutorizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#emun(manual,auto)#</dia:string>
+            <dia:string>#enum(manual,auto)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2636,16 +2544,16 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O18">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O18">
       <dia:attribute name="obj_pos">
-        <dia:point val="0.815,-3.52999"/>
+        <dia:point val="-4.985,21.17"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.765,-3.57999;6.715,-0.27999"/>
+        <dia:rectangle val="-5.035,21.12;0.865,24.42"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="0.815,-3.52999"/>
+        <dia:point val="-4.985,21.17"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="5.8499999999999996"/>
+        <dia:real val="5.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
@@ -2784,16 +2692,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O19">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O19">
       <dia:attribute name="obj_pos">
-        <dia:point val="7.515,28.22"/>
+        <dia:point val="7.615,28.22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.465,26;12.125,29.02"/>
+        <dia:rectangle val="7.565,25.75;11.225,29.07"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="7.515,28.22"/>
-        <dia:point val="9.895,28.22"/>
-        <dia:point val="9.895,26.8"/>
-        <dia:point val="11.375,26.8"/>
+        <dia:point val="7.615,28.22"/>
+        <dia:point val="8.96521,28.22"/>
+        <dia:point val="8.96521,26.5"/>
+        <dia:point val="10.475,26.5"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -2846,15 +2754,15 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O20">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="18.475,26.8"/>
+        <dia:point val="20.025,26.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="18.425,26;21.95,28.15"/>
+        <dia:rectangle val="19.975,25.75;21.95,28.2"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="18.475,26.8"/>
-        <dia:point val="20.0375,26.8"/>
-        <dia:point val="20.0375,27.35"/>
+        <dia:point val="20.025,26.5"/>
+        <dia:point val="20.8125,26.5"/>
+        <dia:point val="20.8125,27.35"/>
         <dia:point val="21.6,27.35"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:point val="21.6,27.35"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -2862,6 +2770,9 @@
         <dia:enum val="1"/>
         <dia:enum val="0"/>
       </dia:attribute>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
       </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
       </dia:attribute>
@@ -2888,7 +2799,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -2908,7 +2819,7 @@
         <dia:point val="44.115,-1.34"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="44.115,-1.34"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.225,-2.14;44.815,1.6"/>
+        <dia:rectangle val="39.225,-2.09;44.815,1.65"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="44.115,-1.34"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="44.115,-1.34"/>
@@ -3026,16 +2937,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O23">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O23">
       <dia:attribute name="obj_pos">
-        <dia:point val="42.665,25.1"/>
+        <dia:point val="42.415,25.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.5,24.3;43.365,26.6"/>
+        <dia:rectangle val="39.05,23.3;43.115,26.25"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="42.665,25.1"/>
-        <dia:point val="40.6075,25.1"/>
-        <dia:point val="40.6075,25.8"/>
-        <dia:point val="38.55,25.8"/>
+        <dia:point val="42.415,25.4"/>
+        <dia:point val="40.7575,25.4"/>
+        <dia:point val="40.7575,24.05"/>
+        <dia:point val="39.1,24.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3079,23 +2990,25 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O11" connection="3"/>
+        <dia:connection handle="0" to="O11" connection="0"/>
         <dia:connection handle="1" to="O0" connection="4"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O24">
       <dia:attribute name="obj_pos">
         <dia:connection handle="1" to="O0" connection="4"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O24">
       <dia:attribute name="obj_pos">
-        <dia:point val="0.975,13.75"/>
+        <dia:point val="-1.925,15.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.925,-1.07999;4.465,14.55"/>
+        <dia:rectangle val="-2.835,15.4;-0.875,21.92"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="0.975,13.75"/>
-        <dia:point val="3.715,13.75"/>
-        <dia:point val="3.715,-0.32999"/>
+        <dia:point val="-1.925,15.45"/>
+        <dia:point val="-1.925,18.31"/>
+        <dia:point val="-2.085,18.31"/>
+        <dia:point val="-2.085,21.17"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
       </dia:attribute>
       <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
       </dia:attribute>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
       </dia:attribute>
@@ -3136,8 +3049,8 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O3" connection="4"/>
-        <dia:connection handle="1" to="O18" connection="6"/>
+        <dia:connection handle="0" to="O3" connection="6"/>
+        <dia:connection handle="1" to="O18" connection="1"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O25">
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O25">
@@ -3145,13 +3058,13 @@
         <dia:point val="5.775,5.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="5.775,5.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.215,4.55;6.825,28.32"/>
+        <dia:rectangle val="0.965,4.6;6.825,28.37"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="5.775,5.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="5.775,5.35"/>
-        <dia:point val="3.965,5.35"/>
-        <dia:point val="3.965,27.52"/>
-        <dia:point val="0.965,27.52"/>
+        <dia:point val="2.315,5.35"/>
+        <dia:point val="2.315,27.52"/>
+        <dia:point val="1.015,27.52"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3193,7 +3106,7 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
@@ -3207,20 +3120,18 @@
         <dia:point val="-5.585,28.22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="-5.585,28.22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.635,15.5;-1.175,29.02"/>
+        <dia:rectangle val="-6.635,14.2;-4.475,29.07"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.585,28.22"/>
         <dia:point val="-6.585,28.22"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.585,28.22"/>
         <dia:point val="-6.585,28.22"/>
-        <dia:point val="-6.585,22.235"/>
-        <dia:point val="-1.925,22.235"/>
-        <dia:point val="-1.925,16.25"/>
+        <dia:point val="-6.585,14.95"/>
+        <dia:point val="-4.825,14.95"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
-        <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -3254,13 +3165,13 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O17" connection="3"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O17" connection="3"/>
-        <dia:connection handle="1" to="O3" connection="6"/>
+        <dia:connection handle="1" to="O3" connection="8"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O27">
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O27">
@@ -3268,14 +3179,14 @@
         <dia:point val="-4.825,13.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="-4.825,13.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.875,6;-0.35,14.55"/>
+        <dia:rectangle val="-5.875,5.2;-0.85,14.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4.825,13.75"/>
         <dia:point val="-5.825,13.75"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4.825,13.75"/>
         <dia:point val="-5.825,13.75"/>
-        <dia:point val="-5.825,10.25"/>
-        <dia:point val="-1.1,10.25"/>
-        <dia:point val="-1.1,6.75"/>
+        <dia:point val="-5.825,9.85"/>
+        <dia:point val="-1.6,9.85"/>
+        <dia:point val="-1.6,5.95"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3326,14 +3237,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O28">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O28">
       <dia:attribute name="obj_pos">
-        <dia:point val="-4,2.75"/>
+        <dia:point val="-4.5,2.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.05,-5.36749;48.665,4.35"/>
+        <dia:rectangle val="-4.55,-5.31749;48.665,4.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-4,2.75"/>
-        <dia:point val="-4,-4.56749"/>
+        <dia:point val="-4.5,2.75"/>
+        <dia:point val="-4.5,-4.56749"/>
         <dia:point val="47.915,-4.56749"/>
         <dia:point val="47.915,-2.04"/>
       </dia:attribute>
         <dia:point val="47.915,-4.56749"/>
         <dia:point val="47.915,-2.04"/>
       </dia:attribute>
@@ -3388,28 +3299,28 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O29">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O29">
       <dia:attribute name="obj_pos">
-        <dia:point val="33.865,27.8825"/>
+        <dia:point val="34.215,30.5325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.815,27.8325;42.015,31.1325"/>
+        <dia:rectangle val="34.165,30.4825;41.865,33.7825"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="33.865,27.8825"/>
+        <dia:point val="34.215,30.5325"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="8.0999999999999996"/>
+        <dia:real val="7.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#Historial de planes#</dia:string>
+        <dia:string>#HistoriaPlan#</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
-        <dia:string>##</dia:string>
+        <dia:string>#Representa el período de tiempo que un afiliado estuvo en un plan.#</dia:string>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
@@ -3483,7 +3394,7 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#fecha_ingreso#</dia:string>
+            <dia:string>#fechaIngreso#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#Fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#Fecha#</dia:string>
@@ -3506,7 +3417,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#fecha_egreso#</dia:string>
+            <dia:string>#fechaEgreso#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#Fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#Fecha#</dia:string>
@@ -3539,13 +3450,13 @@
         <dia:point val="13.2508,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="13.2508,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.2008,-1.29249;28.2508,2.00751"/>
+        <dia:rectangle val="13.2008,-1.29249;28.2008,2.00751"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="13.2508,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="13.2508,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="14.949999999999999"/>
+        <dia:real val="14.9"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
@@ -3634,13 +3545,13 @@
             <dia:string>#tipo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#tipo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#enum(particular, oficina, celular)#</dia:string>
+            <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:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Tipo de telefono.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -3687,13 +3598,13 @@
         <dia:point val="20.1008,11.8075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="20.1008,11.8075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.0508,11.7575;31.2508,18.2575"/>
+        <dia:rectangle val="20.0508,11.7575;31.2008,18.2575"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="20.1008,11.8075"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="20.1008,11.8075"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="11.1"/>
+        <dia:real val="11.049999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="6.4000000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="6.4000000000000004"/>
@@ -3984,7 +3895,7 @@
         <dia:point val="31.1508,12.5075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="31.1508,12.5075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.1008,11.7075;33.65,14.05"/>
+        <dia:rectangle val="31.1008,11.7575;33.65,14.1"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="31.1508,12.5075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="31.1508,12.5075"/>
@@ -4043,13 +3954,13 @@
         <dia:point val="20.7008,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="20.7008,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-1.15,-4.81749;21.4008,4.35"/>
+        <dia:rectangle val="-1.65,-4.76749;21.4008,4.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.7008,-1.24249"/>
         <dia:point val="20.7008,-4.01749"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.7008,-1.24249"/>
         <dia:point val="20.7008,-4.01749"/>
-        <dia:point val="-1.1,-4.01749"/>
-        <dia:point val="-1.1,2.75"/>
+        <dia:point val="-1.6,-4.01749"/>
+        <dia:point val="-1.6,2.75"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4105,13 +4016,13 @@
         <dia:point val="25.6258,18.2075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="25.6258,18.2075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.75,6.7;26.3258,20.6075"/>
+        <dia:rectangle val="1.25,5.9;26.3258,20.6075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="25.6258,18.2075"/>
         <dia:point val="25.6258,19.2075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="25.6258,18.2075"/>
         <dia:point val="25.6258,19.2075"/>
-        <dia:point val="1.8,19.2075"/>
-        <dia:point val="1.8,6.75"/>
+        <dia:point val="1.3,19.2075"/>
+        <dia:point val="1.3,5.95"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4161,15 +4072,15 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O36">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O36">
       <dia:attribute name="obj_pos">
-        <dia:point val="1.8,3.45"/>
+        <dia:point val="1.3,3.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.05,2.65;12.2,6.25"/>
+        <dia:rectangle val="1.25,2.7;12,6.25"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="1.8,3.45"/>
-        <dia:point val="11.5,3.45"/>
-        <dia:point val="11.5,4.65"/>
+        <dia:point val="1.3,3.45"/>
+        <dia:point val="11.3,3.45"/>
+        <dia:point val="11.3,4.65"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4193,7 +4104,7 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
         <dia:composite>
           </dia:attribute>
         </dia:composite>
         <dia:composite>
@@ -4218,13 +4129,13 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O37">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O37">
       <dia:attribute name="obj_pos">
-        <dia:point val="17.225,5.35"/>
+        <dia:point val="16.825,5.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.175,4.55;22.35,24.55"/>
+        <dia:rectangle val="16.775,4.6;21.95,24.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="17.225,5.35"/>
+        <dia:point val="16.825,5.35"/>
         <dia:point val="19.515,5.35"/>
         <dia:point val="19.515,23.75"/>
         <dia:point val="21.6,23.75"/>
         <dia:point val="19.515,5.35"/>
         <dia:point val="19.515,23.75"/>
         <dia:point val="21.6,23.75"/>
@@ -4269,7 +4180,7 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
@@ -4283,13 +4194,13 @@
         <dia:point val="21.6,28.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="21.6,28.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.85,27.9;32.75,34.0575"/>
+        <dia:rectangle val="20.85,27.9;32.425,34.0575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="21.6,28.65"/>
         <dia:point val="21.6,34.0075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="21.6,28.65"/>
         <dia:point val="21.6,34.0075"/>
-        <dia:point val="26.1,34.0075"/>
-        <dia:point val="26.1,28.65"/>
+        <dia:point val="25.925,34.0075"/>
+        <dia:point val="25.925,28.65"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4342,16 +4253,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O39">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O39">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.925,30.9"/>
+        <dia:point val="15.25,31.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.875,30.3325;38.665,34.8825"/>
+        <dia:rectangle val="15.2,31.35;38.715,36.1325"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="14.925,30.9"/>
-        <dia:point val="14.925,34.3575"/>
-        <dia:point val="37.915,34.3575"/>
-        <dia:point val="37.915,31.0825"/>
+        <dia:point val="15.25,31.4"/>
+        <dia:point val="15.25,34.3575"/>
+        <dia:point val="38.015,34.3575"/>
+        <dia:point val="38.015,33.7325"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4373,7 +4284,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4393,7 +4304,7 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
@@ -4404,24 +4315,27 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O40">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O40">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.6,27.35"/>
+        <dia:point val="30.25,28.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.55,26.55;34.215,29.3825"/>
+        <dia:rectangle val="29.5,27.4;39.965,32.0825"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.6,27.35"/>
-        <dia:point val="32.2325,27.35"/>
-        <dia:point val="32.2325,28.5825"/>
-        <dia:point val="33.865,28.5825"/>
+        <dia:point val="30.25,28.15"/>
+        <dia:point val="33.215,28.15"/>
+        <dia:point val="33.215,31.2325"/>
+        <dia:point val="34.215,31.2325"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
       </dia:attribute>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
       </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
       <dia:attribute name="name">
       <dia:attribute name="name">
-        <dia:string>##</dia:string>
+        <dia:string>#Historial de planes#</dia:string>
       </dia:attribute>
       <dia:attribute name="direction">
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="direction">
         <dia:enum val="0"/>
@@ -4432,13 +4346,13 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string># 1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
         </dia:composite>
         <dia:composite>
           </dia:attribute>
         </dia:composite>
         <dia:composite>
@@ -4446,7 +4360,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string>#* #</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4457,7 +4371,7 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O2" connection="15"/>
+        <dia:connection handle="0" to="O2" connection="17"/>
         <dia:connection handle="1" to="O29" connection="3"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O29" connection="3"/>
       </dia:connections>
     </dia:object>
@@ -4466,7 +4380,7 @@
         <dia:point val="32.375,0.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="32.375,0.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.1008,-1.34249;32.725,1.6"/>
+        <dia:rectangle val="28.1008,-1.29249;32.725,1.65"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="32.375,0.8"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="32.375,0.8"/>
@@ -4525,7 +4439,7 @@
         <dia:point val="25.6258,11.8075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="25.6258,11.8075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.5758,2;32.725,13.4075"/>
+        <dia:rectangle val="25.5758,2.05;32.725,13.4075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="25.6258,11.8075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="25.6258,11.8075"/>
@@ -4577,5 +4491,64 @@
         <dia:connection handle="1" to="O6" connection="10"/>
       </dia:connections>
     </dia:object>
         <dia:connection handle="1" to="O6" connection="10"/>
       </dia:connections>
     </dia:object>
+    <dia:object type="UML - Association" version="0" id="O43">
+      <dia:attribute name="obj_pos">
+        <dia:point val="42.415,27.3"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="30.2,25.8;43.115,28.15"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="42.415,27.3"/>
+        <dia:point val="36.3325,27.3"/>
+        <dia:point val="36.3325,26.55"/>
+        <dia:point val="30.25,26.55"/>
+      </dia: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>#titularidad#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#* #</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string># titular#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string># 0..1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O11" connection="8"/>
+        <dia:connection handle="1" to="O2" connection="13"/>
+      </dia:connections>
+    </dia:object>
   </dia:layer>
 </dia:diagram>
   </dia:layer>
 </dia:diagram>
Sistema para administrar una obra social (TP de Técnicas de Diseño)