X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/blobdiff_plain/419f78898bac8d6ff8a228777b29a87ab5697686..9dc9cfa89c89ab91568f8653441cd8eb8aff7e7d:/carpeta/diagramas/clases.dia

diff --git a/carpeta/diagramas/clases.dia b/carpeta/diagramas/clases.dia
index 0c52497..8d8565b 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.41945245862007141"/>
+          <dia:real val="0.35272139310836792"/>
         </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:point val="11.3,31.6"/>
+        <dia:point val="11.2,28.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.25,31.55;15.85,33.45"/>
+        <dia:rectangle val="11.15,28.75;15.75,30.65"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="11.3,31.6"/>
+        <dia:point val="11.2,28.8"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.5"/>
@@ -172,13 +172,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="-2.65,11.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.95,11;15.55,18.3"/>
+        <dia:rectangle val="-2.7,11.05;9.9,18.35"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="3,11.05"/>
+        <dia:point val="-2.65,11.1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="12.5"/>
@@ -435,19 +435,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="-19,21.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-9.9,21;12.85,27.7"/>
+        <dia:rectangle val="-19.05,21;11.05,28.5"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-9.85,21.05"/>
+        <dia:point val="-19,21.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="22.650000000000002"/>
+        <dia:real val="30"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="6.6000000000000005"/>
+        <dia:real val="7.4000000000000004"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Afiliado#</dia:string>
@@ -718,6 +718,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 +791,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="-9.8,6.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.05,6.45;1.6,10.55"/>
+        <dia:rectangle val="-9.85,6.3;-3.2,10.4"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5,6.5"/>
+        <dia:point val="-9.8,6.35"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="6.5499999999999998"/>
@@ -897,13 +962,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.65,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.95,0.95;20.1,10.05"/>
+        <dia:rectangle val="-2.7,0.95;14.45,10.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="3,1"/>
+        <dia:point val="-2.65,1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="17.050000000000001"/>
@@ -1271,13 +1336,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="-9.75,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.05,0.95;1.6,5.85"/>
+        <dia:rectangle val="-9.8,0.95;-3.15,5.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5,1"/>
+        <dia:point val="-9.75,1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="6.5499999999999998"/>
@@ -1465,13 +1530,13 @@
     </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="24.75,22.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.55,21.9;32.25,26"/>
+        <dia:rectangle val="24.7,22.25;32.4,26.35"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="24.6,21.95"/>
+        <dia:point val="24.75,22.3"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -1636,19 +1701,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="15.95,-0.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.45,0.25;47.35,10.15"/>
+        <dia:rectangle val="15.9,-0.5;49.15,10.2"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="21.5,0.3"/>
+        <dia:point val="15.95,-0.45"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="25.800000000000001"/>
+        <dia:real val="33.149999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="9.7999999999999989"/>
+        <dia:real val="10.6"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>
@@ -1900,7 +1965,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"/>
@@ -1930,7 +1995,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"/>
@@ -1956,7 +2021,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>
@@ -2021,7 +2086,7 @@
                 <dia:string>#porcentajeCobertura#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#bool#</dia:string>
+                <dia:string>#float#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -2035,6 +2100,71 @@
             </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>#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: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"/>
@@ -2043,13 +2173,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="33.65,27.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.95,28.95;34.65,32.25"/>
+        <dia:rectangle val="33.6,27.25;41.3,30.55"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="27,29"/>
+        <dia:point val="33.65,27.3"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -2191,13 +2321,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="14.85,22.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.15,20.95;22.9,26.25"/>
+        <dia:rectangle val="14.8,22.35;23.55,27.65"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="14.2,21"/>
+        <dia:point val="14.85,22.4"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -2385,19 +2515,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="26.95,13"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="36.4,18.35;45.15,22.05"/>
+        <dia:rectangle val="26.9,12.95;46.85,18.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="36.45,18.4"/>
+        <dia:point val="26.95,13"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="8.6500000000000004"/>
+        <dia:real val="19.850000000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="3.6000000000000001"/>
+        <dia:real val="5"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionManual#</dia:string>
@@ -2524,8 +2654,97 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#nroLegajo#</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>#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>#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:attribute>
+              <dia:attribute name="value">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="comment">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="0"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
+        </dia:composite>
       </dia:attribute>
-      <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
@@ -2533,19 +2752,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="24.8,18.7"/>
+        <dia:point val="20.4,18.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.75,18.65;35.2,20.55"/>
+        <dia:rectangle val="20.35,18.6;42.75,21.5"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="24.8,18.7"/>
+        <dia:point val="20.4,18.65"/>
       </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="2.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionAutomatica#</dia:string>
@@ -2569,7 +2788,7 @@
         <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"/>
@@ -2626,7 +2845,73 @@
         <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>#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: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>
@@ -2634,13 +2919,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.2,22.75"/>
+        <dia:point val="33.65,21.9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.15,22.7;47.45,27.6"/>
+        <dia:rectangle val="33.6,21.85;46.9,26.75"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="34.2,22.75"/>
+        <dia:point val="33.65,21.9"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="13.199999999999999"/>
@@ -2755,7 +3040,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>
@@ -2828,13 +3113,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="-9.7,11.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.05,10.95;1.6,15.05"/>
+        <dia:rectangle val="-9.75,11.05;-3.1,15.15"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5,11"/>
+        <dia:point val="-9.7,11.1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="6.5499999999999998"/>
@@ -2999,13 +3284,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="24.85,27.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="36.95,28.95;44.65,32.25"/>
+        <dia:rectangle val="24.8,27.25;32.5,30.55"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="37,29"/>
+        <dia:point val="24.85,27.3"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -3147,13 +3432,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="10.55,11.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.95,10.95;28.15,18.25"/>
+        <dia:rectangle val="10.5,11.05;21.7,18.35"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="17,11"/>
+        <dia:point val="10.55,11.1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.1"/>
@@ -3410,16 +3695,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.4,10.1"/>
+        <dia:point val="32.525,10.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.55,10.05;40.825,18.45"/>
+        <dia:rectangle val="31.675,10.1;36.925,13.211"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="34.4,10.1"/>
-        <dia:point val="34.4,14.25"/>
-        <dia:point val="40.775,14.25"/>
-        <dia:point val="40.775,18.4"/>
+        <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:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3427,7 +3712,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"/>
@@ -3445,16 +3730,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.4,10.1"/>
+        <dia:point val="32.525,10.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.925,10.05;35.25,18.75"/>
+        <dia:rectangle val="24.9525,10.1;33.375,18.711"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="34.4,10.1"/>
-        <dia:point val="34.4,14.4"/>
-        <dia:point val="29.975,14.4"/>
-        <dia:point val="29.975,18.7"/>
+        <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:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3462,7 +3747,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"/>
@@ -3475,21 +3760,20 @@
       </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="9.25,18.25"/>
+        <dia:point val="3.6,18.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.425,18.2;10.1,21.1"/>
+        <dia:rectangle val="-4.05,18.25;4.45,21.1"/>
       </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.6,18.3"/>
+        <dia:point val="3.6,19.675"/>
+        <dia:point val="-4,19.675"/>
+        <dia:point val="-4,21.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3515,16 +3799,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.6,18.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.4,18.2;18.575,21.05"/>
+        <dia:rectangle val="2.75,18.25;19.225,22.45"/>
       </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.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:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3550,16 +3834,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.6,18.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.4,18.2;13.6,31.65"/>
+        <dia:rectangle val="2.75,18.25;13.5,28.85"/>
       </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.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:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3585,19 +3869,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="-8.7,-3.54999"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.55,-1.49999;23,0.30001"/>
+        <dia:rectangle val="-8.75,-3.59999;13.6,-0.19999"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-3.5,-1.44999"/>
+        <dia:point val="-8.7,-3.54999"/>
       </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="3.3000000000000003"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -3608,7 +3892,9 @@
       <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.#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="monospace" style="0" name="Courier"/>
@@ -3617,7 +3903,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="-3.15,-0.24999"/>
+            <dia:point val="-8.35,-2.34999"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>