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

diff --git a/carpeta/diagramas/clases.dia b/carpeta/diagramas/clases.dia
index c81c4d5..22adfa9 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.40668806433677673"/>
+          <dia:real val="0.41510957479476929"/>
         </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="-3,31"/>
+        <dia:point val="-5,25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.05,30.95;1.55,32.85"/>
+        <dia:rectangle val="-5.05,24.95;1.6,27.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-3,31"/>
+        <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.8,18.35"/>
+        <dia:rectangle val="-10.05,14.95;2.45,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.4"/>
@@ -435,13 +459,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="1,22"/>
+        <dia:point val="2,25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.95,21.95;23.7,30.25"/>
+        <dia:rectangle val="1.95,24.95;24.7,33.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="1,22"/>
+        <dia:point val="2,25"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="22.650000000000002"/>
@@ -480,7 +504,7 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="wrap_after_char">
-        <dia:int val="20"/>
+        <dia:int val="40"/>
       </dia:attribute>
       <dia:attribute name="line_color">
         <dia:color val="#000000"/>
@@ -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,13 +1360,13 @@
     </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,8.85"/>
       </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"/>
@@ -1530,19 +1554,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="25,23"/>
+        <dia:point val="26,25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.95,22.95;32.65,27.85"/>
+        <dia:rectangle val="25.95,24.95;32.6,29.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="25,23"/>
+        <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.8000000000000007"/>
+        <dia:real val="4"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Cap#</dia:string>
@@ -1646,29 +1670,6 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#responsable#</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>#Nombre del responsable (gerente) 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:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#horario#</dia:string>
@@ -1724,19 +1725,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="15.95,-1.25"/>
+        <dia:point val="16,-2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.9,-1.3;49.1,10.2"/>
+        <dia:rectangle val="15.95,-2.05;46,10.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="15.95,-1.25"/>
+        <dia:point val="16,-2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="33.100000000000001"/>
+        <dia:real val="29.950000000000003"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="11.399999999999999"/>
+        <dia:real val="12.199999999999999"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>
@@ -1766,10 +1767,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"/>
@@ -2226,13 +2227,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="34,29"/>
+        <dia:point val="37,31"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.95,28.95;41.65,32.25"/>
+        <dia:rectangle val="36.95,30.95;44.65,34.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="34,29"/>
+        <dia:point val="37,31"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -2374,13 +2375,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="-10,22"/>
+        <dia:point val="-10,29"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-10.05,21.95;-1.3,27.25"/>
+        <dia:rectangle val="-10.05,28.95;-1.3,34.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-10,22"/>
+        <dia:point val="-10,29"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -2568,13 +2569,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="29,13"/>
+        <dia:point val="28,14"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.95,12.95;48.9,18.05"/>
+        <dia:rectangle val="27.95,13.95;47.9,19.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="29,13"/>
+        <dia:point val="28,14"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="19.850000000000001"/>
@@ -2805,13 +2806,13 @@
     </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="16,20"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.35,18.6;42.7,21.5"/>
+        <dia:rectangle val="15.95,19.95;38.3,22.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="20.4,18.65"/>
+        <dia:point val="16,20"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="22.25"/>
@@ -2972,13 +2973,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="34,23"/>
+        <dia:point val="34,25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.95,22.95;47.15,27.85"/>
+        <dia:rectangle val="33.95,24.95;47.15,29.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="34,23"/>
+        <dia:point val="34,25"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="13.1"/>
@@ -3166,13 +3167,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"/>
@@ -3337,13 +3338,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="25,29"/>
+        <dia:point val="27,31"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.95,28.95;32.65,32.25"/>
+        <dia:rectangle val="26.95,30.95;34.65,34.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="25,29"/>
+        <dia:point val="27,31"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -3485,13 +3486,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.65,18.35"/>
+        <dia:rectangle val="3.95,14.95;15.1,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.049999999999999"/>
@@ -3748,16 +3749,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="30.975,10.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.675,10.1;38.975,13.261"/>
+        <dia:rectangle val="30.125,10.15;37.975,14.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="32.525,10.15"/>
-        <dia:point val="32.525,12.411"/>
-        <dia:point val="38.925,12.411"/>
-        <dia:point val="38.925,13"/>
+        <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:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3783,16 +3784,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="30.975,10.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.9525,10.1;33.375,18.711"/>
+        <dia:rectangle val="27.075,10.15;31.825,20.05"/>
       </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="30.975,10.2"/>
+        <dia:point val="30.975,12"/>
+        <dia:point val="27.125,12"/>
+        <dia:point val="27.125,20"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3813,20 +3814,21 @@
       </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">
       <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;12.375,22.05"/>
+        <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,20"/>
-        <dia:point val="12.325,20"/>
-        <dia:point val="12.325,22"/>
+        <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"/>
@@ -3852,16 +3854,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="-5.725,18.25;4.45,22.05"/>
+        <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,20"/>
-        <dia:point val="-5.675,20"/>
-        <dia:point val="-5.675,22"/>
+        <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"/>
@@ -3887,16 +3889,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="-0.8,18.25;4.45,31.05"/>
+        <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,20"/>
-        <dia:point val="-0.75,20"/>
-        <dia:point val="-0.75,31"/>
+        <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"/>
@@ -3922,19 +3924,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.25"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="3.3000000000000003"/>
+        <dia:real val="4.9000000000000004"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -3945,9 +3947,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"/>
@@ -3956,7 +3960,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.29999"/>
+            <dia:point val="-8.65,-0.75"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>