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

diff --git a/carpeta/diagramas/clases.dia b/carpeta/diagramas/clases.dia
index c31c598..c81c4d5 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.35272136330604553"/>
+          <dia:real val="0.40668806433677673"/>
         </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.2,28.8"/>
+        <dia:point val="-3,31"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.15,28.75;15.75,30.65"/>
+        <dia:rectangle val="-3.05,30.95;1.55,32.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="11.2,28.8"/>
+        <dia:point val="-3,31"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.5"/>
@@ -175,13 +175,13 @@
         <dia:point val="-2.65,11.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.7,11.05;9.9,18.35"/>
+        <dia:rectangle val="-2.7,11.05;9.8,18.35"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-2.65,11.1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="12.5"/>
+        <dia:real val="12.4"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="7.1999999999999993"/>
@@ -435,19 +435,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="1,22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-19.05,21;11.05,28.5"/>
+        <dia:rectangle val="0.95,21.95;23.7,30.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-19,21.05"/>
+        <dia:point val="1,22"/>
       </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,10 +477,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="20"/>
       </dia:attribute>
       <dia:attribute name="line_color">
         <dia:color val="#000000"/>
@@ -1530,19 +1530,19 @@
     </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="25,23"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.7,22.25;32.4,26.35"/>
+        <dia:rectangle val="24.95,22.95;32.65,27.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="24.75,22.3"/>
+        <dia:point val="25,23"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4"/>
+        <dia:real val="4.8000000000000007"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Cap#</dia:string>
@@ -1692,6 +1692,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <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 de baja del CAP#</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">
@@ -1704,13 +1727,13 @@
         <dia:point val="15.95,-1.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.9,-1.3;49.15,10.2"/>
+        <dia:rectangle val="15.9,-1.3;49.1,10.2"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="15.95,-1.25"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="33.149999999999999"/>
+        <dia:real val="33.100000000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="11.399999999999999"/>
@@ -2203,13 +2226,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="34,29"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.6,27.25;41.3,30.55"/>
+        <dia:rectangle val="33.95,28.95;41.65,32.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="33.65,27.3"/>
+        <dia:point val="34,29"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -2351,13 +2374,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,22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.8,22.35;23.55,27.65"/>
+        <dia:rectangle val="-10.05,21.95;-1.3,27.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="14.85,22.4"/>
+        <dia:point val="-10,22"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -2545,13 +2568,13 @@
     </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="29,13"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.9,12.95;46.85,18.05"/>
+        <dia:rectangle val="28.95,12.95;48.9,18.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="26.95,13"/>
+        <dia:point val="29,13"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="19.850000000000001"/>
@@ -2785,13 +2808,13 @@
         <dia:point val="20.4,18.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.35,18.6;42.75,21.5"/>
+        <dia:rectangle val="20.35,18.6;42.7,21.5"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="20.4,18.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="22.300000000000001"/>
+        <dia:real val="22.25"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="2.7999999999999998"/>
@@ -2949,16 +2972,16 @@
     </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,23"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.6,21.85;46.9,26.75"/>
+        <dia:rectangle val="33.95,22.95;47.15,27.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="33.65,21.9"/>
+        <dia:point val="34,23"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="13.199999999999999"/>
+        <dia:real val="13.1"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
@@ -3314,13 +3337,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="25,29"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.8,27.25;32.5,30.55"/>
+        <dia:rectangle val="24.95,28.95;32.65,32.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="24.85,27.3"/>
+        <dia:point val="25,29"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -3465,13 +3488,13 @@
         <dia:point val="10.55,11.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.5,11.05;21.7,18.35"/>
+        <dia:rectangle val="10.5,11.05;21.65,18.35"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="10.55,11.1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="11.1"/>
+        <dia:real val="11.049999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="7.1999999999999993"/>
@@ -3728,13 +3751,13 @@
         <dia:point val="32.525,10.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.675,10.1;36.925,13.211"/>
+        <dia:rectangle val="31.675,10.1;38.975,13.261"/>
       </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="38.925,12.411"/>
+        <dia:point val="38.925,13"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3797,13 +3820,13 @@
         <dia:point val="3.6,18.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.05,18.25;4.45,21.1"/>
+        <dia:rectangle val="2.75,18.25;12.375,22.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.6,20"/>
+        <dia:point val="12.325,20"/>
+        <dia:point val="12.325,22"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3811,7 +3834,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"/>
@@ -3832,13 +3855,13 @@
         <dia:point val="3.6,18.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.75,18.25;19.225,22.45"/>
+        <dia:rectangle val="-5.725,18.25;4.45,22.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.6,20"/>
+        <dia:point val="-5.675,20"/>
+        <dia:point val="-5.675,22"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3867,13 +3890,13 @@
         <dia:point val="3.6,18.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.75,18.25;13.5,28.85"/>
+        <dia:rectangle val="-0.8,18.25;4.45,31.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.6,20"/>
+        <dia:point val="-0.75,20"/>
+        <dia:point val="-0.75,31"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3908,7 +3931,7 @@
         <dia:point val="-8.7,-3.54999"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="22.250000000000004"/>
+        <dia:real val="22.25"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.3000000000000003"/>
@@ -3933,7 +3956,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.35,-2.29999"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>