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

diff --git a/carpeta/diagramas/clases.dia b/carpeta/diagramas/clases.dia
index 22adfa9..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.41510957479476929"/>
+          <dia:real val="0.34073087573051453"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -199,13 +199,13 @@
         <dia:point val="-10,15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-10.05,14.95;2.45,22.25"/>
+        <dia:rectangle val="-10.05,14.95;2.55,22.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-10,15"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="12.4"/>
+        <dia:real val="12.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="7.1999999999999993"/>
@@ -1363,7 +1363,7 @@
         <dia:point val="-10,4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-10.05,3.95;-3.4,8.85"/>
+        <dia:rectangle val="-10.05,3.95;-3.4,9.65"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-10,4"/>
@@ -1372,7 +1372,7 @@
         <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>
@@ -1545,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">
@@ -1728,13 +1751,13 @@
         <dia:point val="16,-2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.95,-2.05;46,10.25"/>
+        <dia:rectangle val="15.95,-2.05;46.75,10.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="16,-2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="29.950000000000003"/>
+        <dia:real val="30.700000000000003"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="12.199999999999999"/>
@@ -2016,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>
@@ -2153,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>
@@ -2569,19 +2575,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="28,14"/>
+        <dia:point val="27.35,13.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.95,13.95;47.9,19.05"/>
+        <dia:rectangle val="27.3,13;60.55,18.9"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="28,14"/>
+        <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>
@@ -2764,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>
@@ -2776,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>
@@ -2793,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>
@@ -2806,19 +2843,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="16,20"/>
+        <dia:point val="15.6,19.9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.95,19.95;38.3,22.85"/>
+        <dia:rectangle val="15.55,19.85;48.8,23.55"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="16,20"/>
+        <dia:point val="15.6,19.9"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="22.25"/>
+        <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>
@@ -2931,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>
@@ -2946,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>
@@ -2976,13 +3044,13 @@
         <dia:point val="34,25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.95,24.95;47.15,29.85"/>
+        <dia:rectangle val="33.95,24.95;47.25,29.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="34,25"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="13.1"/>
+        <dia:real val="13.199999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
@@ -3489,13 +3557,13 @@
         <dia:point val="4,15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="3.95,14.95;15.1,22.25"/>
+        <dia:rectangle val="3.95,14.95;15.15,22.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="4,15"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="11.049999999999999"/>
+        <dia:real val="11.1"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="7.1999999999999993"/>
@@ -3749,16 +3817,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.975,10.2"/>
+        <dia:point val="31.35,10.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.125,10.15;37.975,14.05"/>
+        <dia:rectangle val="30.5,10.15;43.975,13.1"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.975,10.2"/>
-        <dia:point val="30.975,12"/>
-        <dia:point val="37.925,12"/>
-        <dia:point val="37.925,14"/>
+        <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"/>
@@ -3784,16 +3852,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.975,10.2"/>
+        <dia:point val="31.35,10.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.075,10.15;31.825,20.05"/>
+        <dia:rectangle val="26.675,10.15;32.2,19.85"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.975,10.2"/>
-        <dia:point val="30.975,12"/>
-        <dia:point val="27.125,12"/>
-        <dia:point val="27.125,20"/>
+        <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"/>
@@ -3814,7 +3882,6 @@
       </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">
@@ -3933,10 +4000,10 @@
         <dia:point val="-9,-2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="22.25"/>
+        <dia:real val="22.250000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4.9000000000000004"/>
+        <dia:real val="4.8999999999999995"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -3960,7 +4027,7 @@ Clases no se incluyen en este diagrama por simplicidad.#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="-8.65,-0.75"/>
+            <dia:point val="-8.65,-0.8"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>