X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/blobdiff_plain/a8cf7b3b01deb46c47907b80510a46ad14460a19..ff9d5e90f4cebfe42cea87b143f035264d6c3cae:/carpeta/diagramas/clases.dia

diff --git a/carpeta/diagramas/clases.dia b/carpeta/diagramas/clases.dia
index b8af0e5..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.41763192415237427"/>
+          <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.3,31.6"/>
+        <dia:point val="-10,25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.25,31.55;15.85,33.45"/>
+        <dia:rectangle val="-10.05,24.95;-3.4,27.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="11.3,31.6"/>
+        <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="3,11.05"/>
+        <dia:point val="-10,15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.95,11;15.55,18.3"/>
+        <dia:rectangle val="-10.05,14.95;2.55,22.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="3,11.05"/>
+        <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="-9.85,21.05"/>
+        <dia:point val="2,26"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-9.9,21;12.85,27.7"/>
+        <dia:rectangle val="1.95,25.95;24.7,34.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-9.85,21.05"/>
+        <dia:point val="2,26"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="22.650000000000002"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="6.6000000000000005"/>
+        <dia:real val="8.2000000000000011"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#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>
@@ -718,6 +742,71 @@
             </dia:composite>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#consultarPrestacion#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#float#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#codPrestacion#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#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>#cantPrestacionesRealizadas#</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="2"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
+        </dia:composite>
       </dia:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
@@ -726,13 +815,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O3">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5,6.5"/>
+        <dia:point val="-10,10"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.05,6.45;1.6,10.55"/>
+        <dia:rectangle val="-10.05,9.95;-3.4,14.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5,6.5"/>
+        <dia:point val="-10,10"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="6.5499999999999998"/>
@@ -870,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>
@@ -897,13 +986,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O4">
       <dia:attribute name="obj_pos">
-        <dia:point val="3,1"/>
+        <dia:point val="-2,4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.95,0.95;20.1,10.05"/>
+        <dia:rectangle val="-2.05,3.95;15.1,13.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="3,1"/>
+        <dia:point val="-2,4"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="17.050000000000001"/>
@@ -1087,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>
@@ -1271,13 +1360,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5,1"/>
+        <dia:point val="-10,4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.05,0.95;1.6,5.85"/>
+        <dia:rectangle val="-10.05,3.95;-3.4,8.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5,1"/>
+        <dia:point val="-10,4"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="6.5499999999999998"/>
@@ -1415,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>
@@ -1465,16 +1554,16 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="24.6,21.95"/>
+        <dia:point val="40,26"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.55,21.9;32.25,26"/>
+        <dia:rectangle val="39.95,25.95;46.6,30.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="24.6,21.95"/>
+        <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"/>
@@ -1583,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>
@@ -1592,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"/>
@@ -1606,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"/>
@@ -1636,19 +1725,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="21.5,0.3"/>
+        <dia:point val="16,-2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.45,0.25;47.7,10.15"/>
+        <dia:rectangle val="15.95,-2.05;46.75,10.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="21.5,0.3"/>
+        <dia:point val="16,-2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="26.150000000000002"/>
+        <dia:real val="30.700000000000003"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="9.7999999999999989"/>
+        <dia:real val="12.199999999999999"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>
@@ -1678,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"/>
@@ -1780,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>
@@ -1803,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>
@@ -1826,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>
@@ -1900,7 +1989,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#enum(Pendiente, Aprobada, Rechazada, Realizada, Vencida)#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1927,10 +2016,10 @@
             <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>#int#</dia:string>
+            <dia:string>#enum(Pendiente, Aprobada, Rechazada, Realizada, Vencida)#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1956,7 +2045,7 @@
                 <dia:string>#fechaRecepcion#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#DateTime#</dia:string>
+                <dia:string>#fecha#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -2035,6 +2124,84 @@
             </dia:composite>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#Autorizacion#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#fechaSolicitud#</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="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#obtenerPlazoDeVencimiento#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>#static#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#int#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Devuelve la cantidad de tiempo en días que debe pasar una autorizacion sin realizarse, para que se venza. (En gral 60 = 2 meses)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
       </dia:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
@@ -2043,13 +2210,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="27,29"/>
+        <dia:point val="39,21"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.95,28.95;34.65,32.25"/>
+        <dia:rectangle val="38.95,20.95;46.65,24.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="27,29"/>
+        <dia:point val="39,21"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -2191,13 +2358,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.2,21"/>
+        <dia:point val="-7,28"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.15,20.95;22.9,26.25"/>
+        <dia:rectangle val="-7.05,27.95;1.7,33.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="14.2,21"/>
+        <dia:point val="-7,28"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -2385,19 +2552,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="36.45,18.4"/>
+        <dia:point val="27,13"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="36.4,18.35;45.15,22.85"/>
+        <dia:rectangle val="26.95,12.95;45.85,19.65"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="36.45,18.4"/>
+        <dia:point val="27,13"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="8.6500000000000004"/>
+        <dia:real val="18.800000000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4.4000000000000004"/>
+        <dia:real val="6.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionManual#</dia:string>
@@ -2427,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"/>
@@ -2526,29 +2693,126 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#dniAuditor#</dia:string>
+            <dia:string>#nroLegajo#</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:string>#Se graba el nro de legajo de quien estaba logeado al momento de autorizar/rechazar#</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:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#AutorizacionManual#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#fechaSolicitud#</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="kind">
+                <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>#fechaRecepcion#</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="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
         </dia:composite>
       </dia:attribute>
-      <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
@@ -2556,19 +2820,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="25,18.45"/>
+        <dia:point val="15,21"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.95,18.4;35.4,20.3"/>
+        <dia:rectangle val="14.95,20.95;37.35,25.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="25,18.45"/>
+        <dia:point val="15,21"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="10.35"/>
+        <dia:real val="22.300000000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="1.7999999999999998"/>
+        <dia:real val="4.4000000000000004"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionAutomatica#</dia:string>
@@ -2592,16 +2856,16 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_comments">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="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"/>
@@ -2649,7 +2913,104 @@
         <dia:real val="1"/>
       </dia:attribute>
       <dia:attribute name="attributes"/>
-      <dia:attribute name="operations"/>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#AutorizacionAutomatica#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#fechaSolicitud#</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="kind">
+                <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>#fechaRecepcion#</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="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
@@ -2657,13 +3018,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.15,23.55"/>
+        <dia:point val="26,26"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.1,23.5;47.4,28.4"/>
+        <dia:rectangle val="25.95,25.95;39.25,30.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="34.15,23.55"/>
+        <dia:point val="26,26"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="13.199999999999999"/>
@@ -2778,7 +3139,7 @@
             <dia:string>#porcentaje#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#float#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2851,13 +3212,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5,11"/>
+        <dia:point val="17,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.05,10.95;1.6,15.05"/>
+        <dia:rectangle val="16.95,10.95;23.6,15.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5,11"/>
+        <dia:point val="17,11"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="6.5499999999999998"/>
@@ -2995,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>
@@ -3022,13 +3383,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="37,29"/>
+        <dia:point val="16,16"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="36.95,28.95;44.65,32.25"/>
+        <dia:rectangle val="15.95,15.95;23.65,19.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="37,29"/>
+        <dia:point val="16,16"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -3120,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>
@@ -3143,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>
@@ -3170,13 +3531,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="17,11"/>
+        <dia:point val="3,15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.95,10.95;28.15,18.25"/>
+        <dia:rectangle val="2.95,14.95;14.15,22.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="17,11"/>
+        <dia:point val="3,15"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.1"/>
@@ -3433,16 +3794,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.575,10.1"/>
+        <dia:point val="31.325,10.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.725,10.05;40.825,18.45"/>
+        <dia:rectangle val="30.475,10.15;36.45,13.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="34.575,10.1"/>
-        <dia:point val="34.575,14.25"/>
-        <dia:point val="40.775,14.25"/>
-        <dia:point val="40.775,18.4"/>
+        <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"/>
@@ -3450,7 +3811,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"/>
@@ -3468,16 +3829,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.575,10.1"/>
+        <dia:point val="31.325,10.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.125,10.05;35.425,18.5"/>
+        <dia:rectangle val="26.075,10.15;32.175,21.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="34.575,10.1"/>
-        <dia:point val="34.575,14.275"/>
-        <dia:point val="30.175,14.275"/>
-        <dia:point val="30.175,18.45"/>
+        <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"/>
@@ -3485,7 +3846,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"/>
@@ -3503,16 +3864,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O18">
       <dia:attribute name="obj_pos">
-        <dia:point val="9.25,18.25"/>
+        <dia:point val="-3.8,22.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.425,18.2;10.1,21.1"/>
+        <dia:rectangle val="-4.65,22.15;13.375,26.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="9.25,18.25"/>
-        <dia:point val="9.25,19.65"/>
-        <dia:point val="1.475,19.65"/>
-        <dia:point val="1.475,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"/>
@@ -3520,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"/>
@@ -3538,16 +3899,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O19">
       <dia:attribute name="obj_pos">
-        <dia:point val="9.25,18.25"/>
+        <dia:point val="-3.8,22.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.4,18.2;18.575,21.05"/>
+        <dia:rectangle val="-4.65,22.15;-2.625,28.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="9.25,18.25"/>
-        <dia:point val="9.25,19.6506"/>
-        <dia:point val="18.525,19.6506"/>
-        <dia:point val="18.525,21"/>
+        <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"/>
@@ -3573,16 +3934,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="9.25,18.25"/>
+        <dia:point val="-3.8,22.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.4,18.2;13.6,31.65"/>
+        <dia:rectangle val="-6.775,22.15;-2.95,25.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="9.25,18.25"/>
-        <dia:point val="9.25,19.6506"/>
-        <dia:point val="13.55,19.6506"/>
-        <dia:point val="13.55,31.6"/>
+        <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"/>
@@ -3608,19 +3969,19 @@
     </dia:object>
     <dia:object type="UML - Note" version="0" id="O21">
       <dia:attribute name="obj_pos">
-        <dia:point val="-3.5,-1.44999"/>
+        <dia:point val="-9,-2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.55,-1.49999;23,0.30001"/>
+        <dia:rectangle val="-9.05,-2.05;13.3,2.95"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-3.5,-1.44999"/>
+        <dia:point val="-9,-2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="26.450000000000003"/>
+        <dia:real val="22.250000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="1.7000000000000002"/>
+        <dia:real val="4.8999999999999995"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -3631,7 +3992,11 @@
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#Todas las clases tienen geters y seters, no se muestran por simplcididad.#</dia:string>
+            <dia: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"/>
@@ -3640,7 +4005,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="-3.15,-0.24999"/>
+            <dia:point val="-8.65,-0.8"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>