X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/blobdiff_plain/1844ef8c4d80403099c73d4764af86550ac0cd00..8e56dbc522143acf126c3c53671c76add7a99edc:/carpeta/diagramas/clases.dia

diff --git a/carpeta/diagramas/clases.dia b/carpeta/diagramas/clases.dia
index 8d8565b..2100efb 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.34073087573051453"/>
         </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="-5,25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.15,28.75;15.75,30.65"/>
+        <dia:rectangle val="-5.05,24.95;1.6,27.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="11.2,28.8"/>
+        <dia:point val="-5,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,25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-19.05,21;11.05,28.5"/>
+        <dia:rectangle val="1.95,24.95;24.7,33.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-19,21.05"/>
+        <dia:point val="2,25"/>
       </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,7 +501,7 @@
         <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"/>
@@ -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"/>
@@ -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"/>
@@ -1336,19 +1360,19 @@
     </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,9.65"/>
       </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"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="5.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestador#</dia:string>
@@ -1521,6 +1545,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#password#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#String#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Password que utilizará el prestador para logearse al sistema y pedir autorizaciones automaticas, consultas, y verificaciones de autorizacion manual.#</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">
@@ -1530,16 +1577,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="26,25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.7,22.25;32.4,26.35"/>
+        <dia:rectangle val="25.95,24.95;32.6,29.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="24.75,22.3"/>
+        <dia:point val="26,25"/>
       </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 +1695,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 +1704,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 +1718,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 +1748,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="15.95,-0.45"/>
+        <dia:point val="16,-2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.9,-0.5;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,-0.45"/>
+        <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="10.6"/>
+        <dia:real val="12.199999999999999"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>
@@ -1743,10 +1790,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"/>
@@ -1992,7 +2039,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>
@@ -2129,23 +2176,6 @@
             <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>
@@ -2165,6 +2195,36 @@
             </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"/>
@@ -2173,13 +2233,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="37,31"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.6,27.25;41.3,30.55"/>
+        <dia:rectangle val="36.95,30.95;44.65,34.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="33.65,27.3"/>
+        <dia:point val="37,31"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -2321,13 +2381,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="-10,29"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.8,22.35;23.55,27.65"/>
+        <dia:rectangle val="-10.05,28.95;-1.3,34.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="14.85,22.4"/>
+        <dia:point val="-10,29"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -2515,19 +2575,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.35,13.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.9,12.95;46.85,18.05"/>
+        <dia:rectangle val="27.3,13;60.55,18.9"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="26.95,13"/>
+        <dia:point val="27.35,13.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="19.850000000000001"/>
+        <dia:real val="33.149999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="5"/>
+        <dia:real val="5.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionManual#</dia:string>
@@ -2710,10 +2770,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>
@@ -2722,12 +2782,43 @@
                 <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>
@@ -2739,7 +2830,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>
@@ -2752,19 +2843,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.6,19.9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.35,18.6;42.75,21.5"/>
+        <dia:rectangle val="15.55,19.85;48.8,23.55"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="20.4,18.65"/>
+        <dia:point val="15.6,19.9"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="22.300000000000001"/>
+        <dia:real val="33.149999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="2.7999999999999998"/>
+        <dia:real val="3.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionAutomatica#</dia:string>
@@ -2877,10 +2968,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>
@@ -2892,9 +2983,40 @@
                 <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>
@@ -2919,13 +3041,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="34,25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.6,21.85;46.9,26.75"/>
+        <dia:rectangle val="33.95,24.95;47.25,29.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="33.65,21.9"/>
+        <dia:point val="34,25"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="13.199999999999999"/>
@@ -3113,13 +3235,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="18,13"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-9.75,11.05;-3.1,15.15"/>
+        <dia:rectangle val="17.95,12.95;24.6,17.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-9.7,11.1"/>
+        <dia:point val="18,13"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="6.5499999999999998"/>
@@ -3284,13 +3406,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="27,31"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.8,27.25;32.5,30.55"/>
+        <dia:rectangle val="26.95,30.95;34.65,34.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="24.85,27.3"/>
+        <dia:point val="27,31"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -3432,13 +3554,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="4,15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.5,11.05;21.7,18.35"/>
+        <dia:rectangle val="3.95,14.95;15.15,22.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="10.55,11.1"/>
+        <dia:point val="4,15"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.1"/>
@@ -3695,16 +3817,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.35,10.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.675,10.1;36.925,13.211"/>
+        <dia:rectangle val="30.5,10.15;43.975,13.1"/>
       </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.35,10.2"/>
+        <dia:point val="31.35,12"/>
+        <dia:point val="43.925,12"/>
+        <dia:point val="43.925,13.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3730,16 +3852,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.35,10.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.9525,10.1;33.375,18.711"/>
+        <dia:rectangle val="26.675,10.15;32.2,19.85"/>
       </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.35,10.2"/>
+        <dia:point val="31.35,11.996"/>
+        <dia:point val="26.725,11.996"/>
+        <dia:point val="26.725,19.8"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3764,16 +3886,16 @@
     </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,25.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,25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3781,7 +3903,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"/>
@@ -3799,16 +3921,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="-5.725,22.15;-2.95,29.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="-5.675,24"/>
+        <dia:point val="-5.675,29"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3834,16 +3956,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="-4.65,22.15;-1.675,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="-1.725,24"/>
+        <dia:point val="-1.725,25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3869,19 +3991,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"/>
@@ -3892,9 +4014,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"/>
@@ -3903,7 +4027,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"/>