X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/blobdiff_plain/a8cf7b3b01deb46c47907b80510a46ad14460a19..4d8e169ccb514192639b687b5305a56bdeddf015:/carpeta/diagramas/clases.dia?ds=sidebyside

diff --git a/carpeta/diagramas/clases.dia b/carpeta/diagramas/clases.dia
index b8af0e5..81f0298 100644
--- a/carpeta/diagramas/clases.dia
+++ b/carpeta/diagramas/clases.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.41763192415237427"/>
+          <dia:real val="0.41439446806907654"/>
         </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"/>
@@ -726,13 +726,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 +897,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 +1271,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 +1465,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.15,18.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.55,21.9;32.25,26"/>
+        <dia:rectangle val="24.1,18.5;31.8,22.6"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="24.6,21.95"/>
+        <dia:point val="24.15,18.55"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -1636,16 +1636,16 @@
     </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="14.95,0.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.45,0.25;47.7,10.15"/>
+        <dia:rectangle val="14.9,0.6;48.15,10.5"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="21.5,0.3"/>
+        <dia:point val="14.95,0.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="26.150000000000002"/>
+        <dia:real val="33.149999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="9.7999999999999989"/>
@@ -1900,7 +1900,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 +1930,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 +1956,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>
@@ -2043,13 +2043,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="16.5,27.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.95,28.95;34.65,32.25"/>
+        <dia:rectangle val="16.45,27.25;24.15,30.55"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="27,29"/>
+        <dia:point val="16.5,27.3"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -2385,13 +2385,13 @@
     </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="35.6,15.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="36.4,18.35;45.15,22.85"/>
+        <dia:rectangle val="35.55,15.6;44.3,20.1"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="36.45,18.4"/>
+        <dia:point val="35.6,15.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -2556,13 +2556,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="25,18.45"/>
+        <dia:point val="23.2,15.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.95,18.4;35.4,20.3"/>
+        <dia:rectangle val="23.15,15.6;33.6,17.5"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="25,18.45"/>
+        <dia:point val="23.2,15.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="10.35"/>
@@ -2657,13 +2657,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.15,23.55"/>
+        <dia:point val="32.9,21.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.1,23.5;47.4,28.4"/>
+        <dia:rectangle val="32.85,21.05;46.15,25.95"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="34.15,23.55"/>
+        <dia:point val="32.9,21.1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="13.199999999999999"/>
@@ -2778,7 +2778,7 @@
             <dia:string>#porcentaje#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#float#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2851,13 +2851,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"/>
@@ -3022,13 +3022,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.2,23.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="36.95,28.95;44.65,32.25"/>
+        <dia:rectangle val="24.15,23.15;31.85,26.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="37,29"/>
+        <dia:point val="24.2,23.2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -3170,13 +3170,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="11,11.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.95,10.95;28.15,18.25"/>
+        <dia:rectangle val="10.95,11;22.15,18.3"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="17,11"/>
+        <dia:point val="11,11.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.1"/>
@@ -3433,16 +3433,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.575,10.1"/>
+        <dia:point val="31.525,10.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.725,10.05;40.825,18.45"/>
+        <dia:rectangle val="30.675,10.4;39.975,15.7"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="34.575,10.1"/>
-        <dia:point val="34.575,14.25"/>
-        <dia:point val="40.775,14.25"/>
-        <dia:point val="40.775,18.4"/>
+        <dia:point val="31.525,10.45"/>
+        <dia:point val="31.525,13.05"/>
+        <dia:point val="39.925,13.05"/>
+        <dia:point val="39.925,15.65"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3468,16 +3468,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.575,10.1"/>
+        <dia:point val="31.525,10.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.125,10.05;35.425,18.5"/>
+        <dia:rectangle val="28.325,10.4;32.375,15.7"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="34.575,10.1"/>
-        <dia:point val="34.575,14.275"/>
-        <dia:point val="30.175,14.275"/>
-        <dia:point val="30.175,18.45"/>
+        <dia:point val="31.525,10.45"/>
+        <dia:point val="31.525,13.05"/>
+        <dia:point val="28.375,13.05"/>
+        <dia:point val="28.375,15.65"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3503,15 +3503,15 @@
     </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="1.425,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="3.6,18.3"/>
+        <dia:point val="3.6,19.675"/>
+        <dia:point val="1.475,19.675"/>
         <dia:point val="1.475,21.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -3538,14 +3538,14 @@
     </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;18.575,21.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="9.25,18.25"/>
-        <dia:point val="9.25,19.6506"/>
+        <dia:point val="3.6,18.3"/>
+        <dia:point val="3.6,19.6506"/>
         <dia:point val="18.525,19.6506"/>
         <dia:point val="18.525,21"/>
       </dia:attribute>
@@ -3573,16 +3573,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"/>