X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/blobdiff_plain/a6cb32fb81a51973223b4140221a0ca17db75930..ff9d5e90f4cebfe42cea87b143f035264d6c3cae:/carpeta/diagramas/clases.dia?ds=sidebyside

diff --git a/carpeta/diagramas/clases.dia b/carpeta/diagramas/clases.dia
index 97c0741..4f8235a 100644
--- a/carpeta/diagramas/clases.dia
+++ b/carpeta/diagramas/clases.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.35272139310836792"/>
+          <dia:real val="0.42301926016807556"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -71,19 +71,19 @@
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - Class" version="0" id="O0">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.2,28.8"/>
+        <dia:point val="-10,25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.15,28.75;15.75,30.65"/>
+        <dia:rectangle val="-10.05,24.95;-3.4,27.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="11.2,28.8"/>
+        <dia:point val="-10,25"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="4.5"/>
+        <dia:real val="6.5499999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="1.7999999999999998"/>
+        <dia:real val="2.3999999999999999"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Promotor#</dia:string>
@@ -163,7 +163,31 @@
       <dia:attribute name="comment_font_height">
         <dia:real val="1"/>
       </dia:attribute>
-      <dia:attribute name="attributes"/>
+      <dia:attribute name="attributes">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#fechaBaja#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#fecha#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Fecha en la que fue dado de baja el promotor (si no está activo)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
@@ -172,13 +196,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="-2.65,11.1"/>
+        <dia:point val="-10,15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.7,11.05;9.9,18.35"/>
+        <dia:rectangle val="-10.05,14.95;2.55,22.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-2.65,11.1"/>
+        <dia:point val="-10,15"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="12.5"/>
@@ -435,19 +459,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="-19,21.05"/>
+        <dia:point val="2,26"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-19.05,21;11.05,28.5"/>
+        <dia:rectangle val="1.95,25.95;24.7,34.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-19,21.05"/>
+        <dia:point val="2,26"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="30"/>
+        <dia:real val="22.650000000000002"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="7.4000000000000004"/>
+        <dia:real val="8.2000000000000011"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Afiliado#</dia:string>
@@ -477,10 +501,10 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
+        <dia:int val="30"/>
       </dia:attribute>
       <dia:attribute name="line_color">
         <dia:color val="#000000"/>
@@ -556,7 +580,7 @@
             <dia:string>#fechaAfiliacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -579,7 +603,7 @@
             <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -791,13 +815,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O3">
       <dia:attribute name="obj_pos">
-        <dia:point val="-9.8,6.35"/>
+        <dia:point val="-10,10"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-9.85,6.3;-3.2,10.4"/>
+        <dia:rectangle val="-10.05,9.95;-3.4,14.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-9.8,6.35"/>
+        <dia:point val="-10,10"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="6.5499999999999998"/>
@@ -935,7 +959,7 @@
             <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -962,13 +986,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O4">
       <dia:attribute name="obj_pos">
-        <dia:point val="-2.65,1"/>
+        <dia:point val="-2,4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.7,0.95;14.45,10.05"/>
+        <dia:rectangle val="-2.05,3.95;15.1,13.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-2.65,1"/>
+        <dia:point val="-2,4"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="17.050000000000001"/>
@@ -1152,7 +1176,7 @@
             <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1336,13 +1360,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="-9.75,1"/>
+        <dia:point val="-10,4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-9.8,0.95;-3.15,5.85"/>
+        <dia:rectangle val="-10.05,3.95;-3.4,8.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-9.75,1"/>
+        <dia:point val="-10,4"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="6.5499999999999998"/>
@@ -1480,7 +1504,7 @@
             <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1530,16 +1554,16 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="24.75,22.3"/>
+        <dia:point val="40,26"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.7,22.25;32.4,26.35"/>
+        <dia:rectangle val="39.95,25.95;46.6,30.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="24.75,22.3"/>
+        <dia:point val="40,26"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="7.5999999999999996"/>
+        <dia:real val="6.5499999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4"/>
@@ -1648,7 +1672,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#responsable#</dia:string>
+            <dia:string>#horario#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#string#</dia:string>
@@ -1657,7 +1681,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Nombre del responsable (gerente) del CAP#</dia:string>
+            <dia:string>#Horario de atención (texto libre)#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1671,16 +1695,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#horario#</dia:string>
+            <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</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>#Horario de atención (texto libre)#</dia:string>
+            <dia:string>#Fecha de baja del CAP#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1701,19 +1725,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="15.95,-1.25"/>
+        <dia:point val="16,-2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.9,-1.3;49.15,10.2"/>
+        <dia:rectangle val="15.95,-2.05;46.75,10.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="15.95,-1.25"/>
+        <dia:point val="16,-2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="33.149999999999999"/>
+        <dia:real val="30.700000000000003"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="11.399999999999999"/>
+        <dia:real val="12.199999999999999"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>
@@ -1743,10 +1767,10 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
+        <dia:int val="80"/>
       </dia:attribute>
       <dia:attribute name="line_color">
         <dia:color val="#000000"/>
@@ -1845,7 +1869,7 @@
             <dia:string>#fechaSolicitud#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1868,7 +1892,7 @@
             <dia:string>#fechaRealizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1891,7 +1915,7 @@
             <dia:string>#fechaVencimiento#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1992,7 +2016,7 @@
             <dia:string>#getEstado#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
+            <dia:string>#abstract#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#enum(Pendiente, Aprobada, Rechazada, Realizada, Vencida)#</dia:string>
@@ -2021,7 +2045,7 @@
                 <dia:string>#fechaRecepcion#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#Fecha#</dia:string>
+                <dia:string>#fecha#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -2129,29 +2153,12 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="parameters">
-            <dia:composite type="umlparameter">
-              <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>##</dia:string>
-              </dia:attribute>
-              <dia:attribute name="kind">
-                <dia:enum val="1"/>
-              </dia:attribute>
-            </dia:composite>
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
                 <dia:string>#fechaSolicitud#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#Fecha#</dia:string>
+                <dia:string>#fecha#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -2203,13 +2210,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="33.65,27.3"/>
+        <dia:point val="39,21"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.6,27.25;41.3,30.55"/>
+        <dia:rectangle val="38.95,20.95;46.65,24.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="33.65,27.3"/>
+        <dia:point val="39,21"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -2351,13 +2358,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.85,22.4"/>
+        <dia:point val="-7,28"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.8,22.35;23.55,27.65"/>
+        <dia:rectangle val="-7.05,27.95;1.7,33.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="14.85,22.4"/>
+        <dia:point val="-7,28"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -2545,19 +2552,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="26.95,13"/>
+        <dia:point val="27,13"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.9,12.95;46.85,18.05"/>
+        <dia:rectangle val="26.95,12.95;45.85,19.65"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="26.95,13"/>
+        <dia:point val="27,13"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="19.850000000000001"/>
+        <dia:real val="18.800000000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="5"/>
+        <dia:real val="6.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionManual#</dia:string>
@@ -2587,10 +2594,10 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
+        <dia:int val="50"/>
       </dia:attribute>
       <dia:attribute name="line_color">
         <dia:color val="#000000"/>
@@ -2740,10 +2747,10 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#codigo#</dia:string>
+                <dia:string>#fechaSolicitud#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#int#</dia:string>
+                <dia:string>#fecha#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -2752,15 +2759,46 @@
                 <dia:string>##</dia:string>
               </dia:attribute>
               <dia:attribute name="kind">
-                <dia:enum val="1"/>
+                <dia:enum val="0"/>
               </dia:attribute>
             </dia:composite>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#getEstado#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#enum(Pendiente, Aprobada, Rechazada, Realizada, Vencida)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#fechaSolicitud#</dia:string>
+                <dia:string>#fechaRecepcion#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#Fecha#</dia:string>
+                <dia:string>#fecha#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -2769,7 +2807,7 @@
                 <dia:string>##</dia:string>
               </dia:attribute>
               <dia:attribute name="kind">
-                <dia:enum val="0"/>
+                <dia:enum val="1"/>
               </dia:attribute>
             </dia:composite>
           </dia:attribute>
@@ -2782,19 +2820,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.4,18.65"/>
+        <dia:point val="15,21"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.35,18.6;42.75,21.5"/>
+        <dia:rectangle val="14.95,20.95;37.35,25.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="20.4,18.65"/>
+        <dia:point val="15,21"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="22.300000000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="2.7999999999999998"/>
+        <dia:real val="4.4000000000000004"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionAutomatica#</dia:string>
@@ -2824,10 +2862,10 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
+        <dia:int val="60"/>
       </dia:attribute>
       <dia:attribute name="line_color">
         <dia:color val="#000000"/>
@@ -2907,10 +2945,10 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#codigo#</dia:string>
+                <dia:string>#fechaSolicitud#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#int#</dia:string>
+                <dia:string>#fecha#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -2922,12 +2960,43 @@
                 <dia:enum val="1"/>
               </dia:attribute>
             </dia:composite>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#getEstado#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#enum(Pendiente, Aprobada, Rechazada, Realizada, Vencida)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#fechaSolicitud#</dia:string>
+                <dia:string>#fechaRecepcion#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#Fecha#</dia:string>
+                <dia:string>#fecha#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -2949,13 +3018,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="33.65,21.9"/>
+        <dia:point val="26,26"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.6,21.85;46.9,26.75"/>
+        <dia:rectangle val="25.95,25.95;39.25,30.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="33.65,21.9"/>
+        <dia:point val="26,26"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="13.199999999999999"/>
@@ -3143,13 +3212,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="-9.7,11.1"/>
+        <dia:point val="17,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-9.75,11.05;-3.1,15.15"/>
+        <dia:rectangle val="16.95,10.95;23.6,15.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-9.7,11.1"/>
+        <dia:point val="17,11"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="6.5499999999999998"/>
@@ -3287,7 +3356,7 @@
             <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3314,13 +3383,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="24.85,27.3"/>
+        <dia:point val="16,16"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.8,27.25;32.5,30.55"/>
+        <dia:rectangle val="15.95,15.95;23.65,19.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="24.85,27.3"/>
+        <dia:point val="16,16"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -3412,7 +3481,7 @@
             <dia:string>#fechaIngreso#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3435,7 +3504,7 @@
             <dia:string>#fechaEgreso#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#fecha#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -3462,13 +3531,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="10.55,11.1"/>
+        <dia:point val="3,15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.5,11.05;21.7,18.35"/>
+        <dia:rectangle val="2.95,14.95;14.15,22.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="10.55,11.1"/>
+        <dia:point val="3,15"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.1"/>
@@ -3725,16 +3794,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="32.525,10.15"/>
+        <dia:point val="31.325,10.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.675,10.1;36.925,13.211"/>
+        <dia:rectangle val="30.475,10.15;36.45,13.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="32.525,10.15"/>
-        <dia:point val="32.525,12.411"/>
-        <dia:point val="36.875,12.411"/>
-        <dia:point val="36.875,13"/>
+        <dia:point val="31.325,10.2"/>
+        <dia:point val="31.325,12"/>
+        <dia:point val="36.4,12"/>
+        <dia:point val="36.4,13"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3760,16 +3829,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="32.525,10.15"/>
+        <dia:point val="31.325,10.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.9525,10.1;33.375,18.711"/>
+        <dia:rectangle val="26.075,10.15;32.175,21.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="32.525,10.15"/>
-        <dia:point val="32.525,12.411"/>
-        <dia:point val="25.0025,12.411"/>
-        <dia:point val="25.0025,18.661"/>
+        <dia:point val="31.325,10.2"/>
+        <dia:point val="31.325,11.996"/>
+        <dia:point val="26.125,11.996"/>
+        <dia:point val="26.125,21"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3790,20 +3859,21 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O7" connection="6"/>
+        <dia:connection handle="1" to="O11" connection="1"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O18">
       <dia:attribute name="obj_pos">
-        <dia:point val="3.6,18.3"/>
+        <dia:point val="-3.8,22.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.05,18.25;4.45,21.1"/>
+        <dia:rectangle val="-4.65,22.15;13.375,26.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="3.6,18.3"/>
-        <dia:point val="3.6,19.675"/>
-        <dia:point val="-4,19.675"/>
-        <dia:point val="-4,21.05"/>
+        <dia:point val="-3.8,22.2"/>
+        <dia:point val="-3.8,24"/>
+        <dia:point val="13.325,24"/>
+        <dia:point val="13.325,26"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3811,7 +3881,7 @@
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_autoroute">
-        <dia:boolean val="true"/>
+        <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -3829,16 +3899,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O19">
       <dia:attribute name="obj_pos">
-        <dia:point val="3.6,18.3"/>
+        <dia:point val="-3.8,22.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.75,18.25;19.225,22.45"/>
+        <dia:rectangle val="-4.65,22.15;-2.625,28.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="3.6,18.3"/>
-        <dia:point val="3.6,19.6506"/>
-        <dia:point val="19.175,19.6506"/>
-        <dia:point val="19.175,22.4"/>
+        <dia:point val="-3.8,22.2"/>
+        <dia:point val="-3.8,24"/>
+        <dia:point val="-2.675,24"/>
+        <dia:point val="-2.675,28"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3864,16 +3934,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="3.6,18.3"/>
+        <dia:point val="-3.8,22.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.75,18.25;13.5,28.85"/>
+        <dia:rectangle val="-6.775,22.15;-2.95,25.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="3.6,18.3"/>
-        <dia:point val="3.6,19.6506"/>
-        <dia:point val="13.45,19.6506"/>
-        <dia:point val="13.45,28.8"/>
+        <dia:point val="-3.8,22.2"/>
+        <dia:point val="-3.8,24"/>
+        <dia:point val="-6.725,24"/>
+        <dia:point val="-6.725,25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3899,19 +3969,19 @@
     </dia:object>
     <dia:object type="UML - Note" version="0" id="O21">
       <dia:attribute name="obj_pos">
-        <dia:point val="-8.7,-3.54999"/>
+        <dia:point val="-9,-2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-8.75,-3.59999;13.6,-0.19999"/>
+        <dia:rectangle val="-9.05,-2.05;13.3,2.95"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-8.7,-3.54999"/>
+        <dia:point val="-9,-2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="22.250000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="3.3000000000000003"/>
+        <dia:real val="4.8999999999999995"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -3922,9 +3992,11 @@
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#
-Se accede a los atributos de clase a traves de propertys, con
-mismo nombre que el atributo, salvo 1er letra en mayuscula.#</dia:string>
+            <dia:string>#Se accede a los atributos de clase a traves de propertys, con
+mismo nombre que el atributo, salvo 1er letra en mayuscula.
+
+Los atributos que se deducen del Diagrama de Relaciones de
+Clases no se incluyen en este diagrama por simplicidad.#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="monospace" style="0" name="Courier"/>
@@ -3933,7 +4005,7 @@ mismo nombre que el atributo, salvo 1er letra en mayuscula.#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="-8.35,-2.34999"/>
+            <dia:point val="-8.65,-0.8"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>