X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/blobdiff_plain/288e1ce7d896cbf47936e4b74ed745b1c2a20351..23bf26c3f0675941e62ed1420525c2d24e5ba2cd:/diagramas/clases.dia?ds=inline

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 799216f..77d2e32 100644
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.38606157898902893"/>
+          <dia:real val="0.38150566816329956"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -175,13 +175,13 @@
         <dia:point val="33.3,8.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.25,8.9;45.75,16.2"/>
+        <dia:rectangle val="33.25,8.9;45.85,16.2"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="33.3,8.95"/>
       </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"/>
@@ -655,13 +655,13 @@
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.875,13;1.025,16.3"/>
+        <dia:rectangle val="-4.875,13;1.075,16.3"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="5.7999999999999998"/>
+        <dia:real val="5.8499999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
@@ -803,13 +803,13 @@
         <dia:point val="11.375,26.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.325,26.05;18.525,30.95"/>
+        <dia:rectangle val="11.325,26.05;18.675,30.95"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="11.375,26.1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="7.0999999999999996"/>
+        <dia:real val="7.25"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
@@ -997,13 +997,13 @@
         <dia:point val="-4,2.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.05,2.7;1.85,6.8"/>
+        <dia:rectangle val="-4.05,2.7;1.9,6.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4,2.75"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="5.7999999999999998"/>
+        <dia:real val="5.8499999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4"/>
@@ -1316,16 +1316,16 @@
         <dia:point val="5.775,4.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.725,4.6;16.225,15.3"/>
+        <dia:rectangle val="5.725,4.6;17.275,16.1"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="5.775,4.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="10.4"/>
+        <dia:real val="11.449999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="10.6"/>
+        <dia:real val="11.4"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>
@@ -1477,7 +1477,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#fechaAprobacion#</dia:string>
+            <dia:string>#fechaResolucion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#Fecha#</dia:string>
@@ -1569,7 +1569,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#descripcion_rechazo#</dia:string>
+            <dia:string>#fundamentos_resolucion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#string#</dia:string>
@@ -1636,6 +1636,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#Aprobada#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</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="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">
@@ -1679,7 +1702,7 @@
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.05,16.1;40.35,23.57"/>
+        <dia:rectangle val="26.05,16.1;40.35,23.52"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="39.5,16.15"/>
@@ -2248,14 +2271,14 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="10.975,15.25"/>
+        <dia:point val="11.5,16.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.125,15.2;14.69,21.31"/>
+        <dia:rectangle val="10.65,16;14.69,21.31"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="10.975,15.25"/>
-        <dia:point val="10.975,17.97"/>
+        <dia:point val="11.5,16.05"/>
+        <dia:point val="11.5,17.97"/>
         <dia:point val="14.64,17.97"/>
         <dia:point val="14.64,21.26"/>
       </dia:attribute>
@@ -2384,14 +2407,14 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="10.975,15.25"/>
+        <dia:point val="11.5,16.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.18,15.2;11.825,21.27"/>
+        <dia:rectangle val="7.18,16;12.35,21.27"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="10.975,15.25"/>
-        <dia:point val="10.975,17.97"/>
+        <dia:point val="11.5,16.05"/>
+        <dia:point val="11.5,17.97"/>
         <dia:point val="7.23,17.97"/>
         <dia:point val="7.23,21.22"/>
       </dia:attribute>
@@ -2422,13 +2445,13 @@
         <dia:point val="-5.585,27.52"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.635,27.47;7.565,32.37"/>
+        <dia:rectangle val="-5.635,27.47;7.665,32.37"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-5.585,27.52"/>
       </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"/>
@@ -2616,13 +2639,13 @@
         <dia:point val="0.815,-3.52999"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.765,-3.57999;6.665,-0.27999"/>
+        <dia:rectangle val="0.765,-3.57999;6.715,-0.27999"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="0.815,-3.52999"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="5.7999999999999998"/>
+        <dia:real val="5.8499999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
@@ -2764,7 +2787,7 @@
         <dia:point val="7.515,28.22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.465,26.05;12.125,29.07"/>
+        <dia:rectangle val="7.465,26;12.125,29.02"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="7.515,28.22"/>
@@ -2826,7 +2849,7 @@
         <dia:point val="18.475,26.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="18.425,26.05;21.95,28.2"/>
+        <dia:rectangle val="18.425,26;21.95,28.15"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="18.475,26.8"/>
@@ -2885,7 +2908,7 @@
         <dia:point val="44.115,-1.34"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.225,-2.09;44.815,1.65"/>
+        <dia:rectangle val="39.225,-2.14;44.815,1.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="44.115,-1.34"/>
@@ -3006,7 +3029,7 @@
         <dia:point val="42.665,25.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.5,24.35;43.365,26.65"/>
+        <dia:rectangle val="38.5,24.3;43.365,26.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="42.665,25.1"/>
@@ -3065,7 +3088,7 @@
         <dia:point val="0.975,13.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.925,-1.07999;4.465,14.6"/>
+        <dia:rectangle val="0.925,-1.07999;4.465,14.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="0.975,13.75"/>
@@ -3122,7 +3145,7 @@
         <dia:point val="5.775,5.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.215,4.6;6.825,28.37"/>
+        <dia:rectangle val="0.215,4.55;6.825,28.32"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="5.775,5.35"/>
@@ -3184,7 +3207,7 @@
         <dia:point val="-5.585,28.22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.635,15.5;-1.175,29.07"/>
+        <dia:rectangle val="-6.635,15.5;-1.175,29.02"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.585,28.22"/>
@@ -3245,7 +3268,7 @@
         <dia:point val="-4.825,13.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.875,6;-0.35,14.6"/>
+        <dia:rectangle val="-5.875,6;-0.35,14.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4.825,13.75"/>
@@ -3306,7 +3329,7 @@
         <dia:point val="-4,2.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.05,-4.61749;48.665,4.35"/>
+        <dia:rectangle val="-4.05,-5.36749;48.665,4.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4,2.75"/>
@@ -3516,13 +3539,13 @@
         <dia:point val="13.2508,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.2008,-1.29249;28.2008,2.00751"/>
+        <dia:rectangle val="13.2008,-1.29249;28.2508,2.00751"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="13.2508,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="14.9"/>
+        <dia:real val="14.949999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
@@ -3664,13 +3687,13 @@
         <dia:point val="20.1008,11.8075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.0508,11.7575;31.2008,18.2575"/>
+        <dia:rectangle val="20.0508,11.7575;31.2508,18.2575"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="20.1008,11.8075"/>
       </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="6.4000000000000004"/>
@@ -3961,7 +3984,7 @@
         <dia:point val="31.1508,12.5075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.1008,11.7575;33.65,14.1"/>
+        <dia:rectangle val="31.1008,11.7075;33.65,14.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="31.1508,12.5075"/>
@@ -4020,7 +4043,7 @@
         <dia:point val="20.7008,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-1.15,-4.06749;21.4008,4.35"/>
+        <dia:rectangle val="-1.15,-4.81749;21.4008,4.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.7008,-1.24249"/>
@@ -4141,12 +4164,12 @@
         <dia:point val="1.8,3.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.05,2.7;11.675,6.25"/>
+        <dia:rectangle val="1.05,2.65;12.2,6.25"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="1.8,3.45"/>
-        <dia:point val="10.975,3.45"/>
-        <dia:point val="10.975,4.65"/>
+        <dia:point val="11.5,3.45"/>
+        <dia:point val="11.5,4.65"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4195,13 +4218,13 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O37">
       <dia:attribute name="obj_pos">
-        <dia:point val="16.175,5.35"/>
+        <dia:point val="17.225,5.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.125,4.6;22.35,24.6"/>
+        <dia:rectangle val="17.175,4.55;22.35,24.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="16.175,5.35"/>
+        <dia:point val="17.225,5.35"/>
         <dia:point val="19.515,5.35"/>
         <dia:point val="19.515,23.75"/>
         <dia:point val="21.6,23.75"/>
@@ -4260,7 +4283,7 @@
         <dia:point val="21.6,28.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.85,27.9;32.6,34.0575"/>
+        <dia:rectangle val="20.85,27.9;32.75,34.0575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="21.6,28.65"/>
@@ -4322,7 +4345,7 @@
         <dia:point val="14.925,30.9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.875,30.3325;38.665,35.1575"/>
+        <dia:rectangle val="14.875,30.3325;38.665,34.8825"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="14.925,30.9"/>
@@ -4384,7 +4407,7 @@
         <dia:point val="30.6,27.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.55,26.6;34.215,29.4325"/>
+        <dia:rectangle val="30.55,26.55;34.215,29.3825"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="30.6,27.35"/>
@@ -4443,7 +4466,7 @@
         <dia:point val="32.375,0.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.1008,-1.29249;32.725,1.65"/>
+        <dia:rectangle val="28.1008,-1.34249;32.725,1.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="32.375,0.8"/>
@@ -4502,7 +4525,7 @@
         <dia:point val="25.6258,11.8075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.5758,2.05;32.725,13.4075"/>
+        <dia:rectangle val="25.5758,2;32.725,13.4075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="25.6258,11.8075"/>