- Sincronización entre DER, DC y DRC.

- Vuelvo a poner responsable como un string común y corriente (tal vez sea
  conveniente sacarlo para evitar confusiones).
- Arreglos de nomenclatura (+ y - en el DER).

diff --git a/carpeta/diagramas/clases.dia b/carpeta/diagramas/clases.dia
index c31c598f9835e896b6434e40f263fd057255cfce..c81c4d5ba48131020b43809325f856d4597ca0a7 100644 (file)
--- 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"/>

diff --git a/carpeta/diagramas/clases.relaciones.dia b/carpeta/diagramas/clases.relaciones.dia
index 0a8c80676407f31a0bb459a9938fda56293920ab..359f6b6535cc8910748b8ccfc6d97d5b3b57197c 100644 (file)
--- a/carpeta/diagramas/clases.relaciones.dia
+++ b/carpeta/diagramas/clases.relaciones.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.57727813720703125"/>
+          <dia:real val="0.57825964689254761"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -175,13 +175,13 @@
         <dia:point val="21,11"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.95,10.95;24.95,12.45"/>
+        <dia:rectangle val="20.95,10.95;25.1,12.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="21,11"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="3.8999999999999999"/>
+        <dia:real val="4.0499999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="1.3999999999999999"/>
@@ -377,13 +377,13 @@
         <dia:point val="-4,14"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.05,13.95;0.95,15.45"/>
+        <dia:rectangle val="-4.05,13.95;1,15.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4,14"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="4.8999999999999995"/>
+        <dia:real val="4.9499999999999993"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="1.3999999999999999"/>
@@ -952,13 +952,13 @@
         <dia:point val="32,12"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.95,11.95;34.65,13.45"/>
+        <dia:rectangle val="31.95,11.95;34.75,13.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="32,12"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="2.6000000000000001"/>
+        <dia:real val="2.7000000000000002"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="1.3999999999999999"/>
@@ -1053,13 +1053,13 @@
         <dia:point val="30,16"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.95,15.95;34.9,17.45"/>
+        <dia:rectangle val="29.95,15.95;34.95,17.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="30,16"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="4.8499999999999996"/>
+        <dia:real val="4.8999999999999995"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="1.3999999999999999"/>
@@ -1663,7 +1663,7 @@
         <dia:point val="-0.3,26.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-0.35,25.9;9.75,27.5"/>
+        <dia:rectangle val="-0.35,25.95;9.75,27.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-0.3,26.7"/>
@@ -1725,7 +1725,7 @@
         <dia:point val="11.35,26.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.3,21.6;17.35,27.5"/>
+        <dia:rectangle val="11.3,21.65;17.35,27.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="11.35,26.7"/>
@@ -1787,7 +1787,7 @@
         <dia:point val="32,12.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.325,6.65;32.7,13.5"/>
+        <dia:rectangle val="27.325,6.65;32.7,13.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="32,12.7"/>
@@ -1844,7 +1844,7 @@
         <dia:point val="30,16"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.45,15.2;30.7,17.5"/>
+        <dia:rectangle val="25.45,15.25;30.7,17.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="30,16"/>
@@ -1962,7 +1962,7 @@
         <dia:point val="-5,26.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.05,14.6;-3.65,27.5"/>
+        <dia:rectangle val="-6.05,14.65;-3.65,27.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5,26.7"/>
@@ -2021,7 +2021,7 @@
         <dia:point val="-4,14.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.05,9.65;1.075,15.5"/>
+        <dia:rectangle val="-5.05,9.65;1.075,15.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4,14.7"/>
@@ -2079,14 +2079,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O26">
       <dia:attribute name="obj_pos">
-        <dia:point val="-2,9"/>
+        <dia:point val="14.175,6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.05,4.2;34.1,12.75"/>
+        <dia:rectangle val="14.125,4.25;34.1,12.75"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-2,9"/>
-        <dia:point val="-2,5"/>
+        <dia:point val="14.175,6"/>
+        <dia:point val="14.175,5"/>
         <dia:point val="33.35,5"/>
         <dia:point val="33.35,12"/>
       </dia:attribute>
@@ -2135,7 +2135,7 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O5" connection="0"/>
+        <dia:connection handle="0" to="O28" connection="1"/>
         <dia:connection handle="1" to="O10" connection="1"/>
       </dia:connections>
     </dia:object>
@@ -2245,13 +2245,13 @@
         <dia:point val="12,6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.95,5.95;16.3,7.45"/>
+        <dia:rectangle val="11.95,5.95;16.4,7.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="12,6"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="4.25"/>
+        <dia:real val="4.3499999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="1.3999999999999999"/>
@@ -2346,7 +2346,7 @@
         <dia:point val="14.175,7.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.125,7.35;21.75,12.5"/>
+        <dia:rectangle val="14.125,7.35;21.75,12.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="14.175,7.4"/>
@@ -2403,7 +2403,7 @@
         <dia:point val="12,6.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-0.425,5.9;12.35,9.75"/>
+        <dia:rectangle val="-0.425,5.95;12.35,9.75"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="12,6.7"/>
@@ -2460,7 +2460,7 @@
         <dia:point val="2.65,9.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.6,8.9;6.35,15.5"/>
+        <dia:rectangle val="2.6,8.95;6.35,15.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="2.65,9.7"/>
@@ -2519,7 +2519,7 @@
         <dia:point val="11.65,14.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.6,13.9;17.75,22.5"/>
+        <dia:rectangle val="11.6,13.95;17.75,22.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="11.65,14.7"/>
@@ -2581,7 +2581,7 @@
         <dia:point val="17,22.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.25,21.65;27.25,29.05"/>
+        <dia:rectangle val="16.25,21.65;27.1,29.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="17,22.4"/>
@@ -2705,7 +2705,7 @@
         <dia:point val="20.6,22.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.85,21.6;34.75,28.5"/>
+        <dia:rectangle val="19.85,21.65;34.75,28.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.6,22.4"/>
@@ -2767,7 +2767,7 @@
         <dia:point val="16.35,6.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.35,5.9;27.0707,7.5"/>
+        <dia:rectangle val="16.35,5.95;27.0707,7.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="16.35,6.7"/>
@@ -2885,7 +2885,7 @@
         <dia:point val="6,15.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.9,13.9;6.35,16.2"/>
+        <dia:rectangle val="0.9,13.95;6.35,16.25"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="6,15.4"/>

diff --git a/carpeta/diagramas/der.dia b/carpeta/diagramas/der.dia
index 0b5a18d1877563ee39aa69df14a395680087bced..1c51d22e6d02deb1ca0c47f38174076504574599 100644 (file)
--- a/carpeta/diagramas/der.dia
+++ b/carpeta/diagramas/der.dia
@@ -1447,7 +1447,7 @@
             <dia:string>#Mail del Presador, utilizado para informarle errores en sus archivos enviados #</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1491,13 +1491,13 @@
         <dia:point val="35.175,-1.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="35.125,-1.25;43.525,5.25"/>
+        <dia:rectangle val="35.125,-1.25;44.925,5.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="35.175,-1.2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="8.3000000000000007"/>
+        <dia:real val="9.6999999999999993"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="6.4000000000000004"/>
@@ -1629,7 +1629,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#horario#</dia:string>
+            <dia:string>#responsable#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#VARCHAR(255)#</dia:string>
@@ -1638,7 +1638,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Horario de atención como un texto libre.#</dia:string>
+            <dia:string>#Nombre del responsable (gerente) del CAP.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="3"/>
@@ -1652,19 +1652,19 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#fechaBaja#</dia:string>
+            <dia:string>#horario#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#DATE#</dia:string>
+            <dia:string>#VARCHAR(255)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+            <dia:string>#Horario de atención como un texto libre.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1675,19 +1675,19 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#idDireccion#</dia:string>
+            <dia:string>#fechaBaja#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#INT#</dia:string>
+            <dia:string>#DATE#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
-            <dia:string>#FK#</dia:string>
+            <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#No puede ser NULL#</dia:string>
+            <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="1"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -1698,19 +1698,19 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#idPersona#</dia:string>
+            <dia:string>#idDireccion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#INT = FK#</dia:string>
+            <dia:string>#INT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
-            <dia:string>##</dia:string>
+            <dia:string>#FK#</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Nombre del responsable (gerente) del CAP.#</dia:string>
+            <dia:string>#No puede ser NULL#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="3"/>
+            <dia:enum val="1"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -2739,7 +2739,7 @@
             <dia:string>#El nro de legajo del auditor medico que resolvio (apruebo/rechazo) la autorizacion.#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="3"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -3689,13 +3689,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O19">
       <dia:attribute name="obj_pos">
-        <dia:point val="22.4508,10.7575"/>
+        <dia:point val="25.0508,10.5575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="22.4008,10.7075;33.6008,19.6075"/>
+        <dia:rectangle val="25.0008,10.5075;36.2008,19.4075"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="22.4508,10.7575"/>
+        <dia:point val="25.0508,10.5575"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.1"/>
@@ -3980,7 +3980,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
           <dia:attribute name="abstract">
             <dia:boolean val="false"/>
@@ -3998,14 +3998,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="28.0008,19.5575"/>
+        <dia:point val="30.6008,19.3575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.9508,14.5;39.1,21.9575"/>
+        <dia:rectangle val="30.5508,14.5;39.1,21.7575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="28.0008,19.5575"/>
-        <dia:point val="28.0008,20.3575"/>
+        <dia:point val="30.6008,19.3575"/>
+        <dia:point val="30.6008,20.3575"/>
         <dia:point val="36.875,20.3575"/>
         <dia:point val="36.875,15.25"/>
         <dia:point val="38.75,15.25"/>
@@ -4181,21 +4181,25 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O23">
       <dia:attribute name="obj_pos">
-        <dia:point val="33.5508,11.4575"/>
+        <dia:point val="36.1508,11.2575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.5008,3.15;35.525,12.3075"/>
+        <dia:rectangle val="34.125,3.95;37.2008,12.1075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="33.5508,11.4575"/>
-        <dia:point val="34.3629,11.4575"/>
-        <dia:point val="34.3629,3.9"/>
-        <dia:point val="35.175,3.9"/>
+        <dia:point val="36.1508,11.2575"/>
+        <dia:point val="37.1508,11.2575"/>
+        <dia:point val="37.1508,7.97875"/>
+        <dia:point val="34.175,7.97875"/>
+        <dia:point val="34.175,4.7"/>
+        <dia:point val="35.175,4.7"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -4235,7 +4239,7 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O19" connection="4"/>
-        <dia:connection handle="1" to="O6" connection="16"/>
+        <dia:connection handle="1" to="O6" connection="18"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O24">
@@ -4603,14 +4607,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O30">
       <dia:attribute name="obj_pos">
-        <dia:point val="22.4508,11.4575"/>
+        <dia:point val="25.0508,11.2575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,4.3;22.8008,12.3075"/>
+        <dia:rectangle val="9.75,4.3;25.4008,12.1075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="22.4508,11.4575"/>
-        <dia:point val="21.7206,11.4575"/>
+        <dia:point val="25.0508,11.2575"/>
+        <dia:point val="21.7206,11.2575"/>
         <dia:point val="21.7206,5.05"/>
         <dia:point val="9.8,5.05"/>
       </dia:attribute>
@@ -5238,19 +5242,17 @@ antecede un signo + y las FK un -.#</dia:string>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O39">
       <dia:attribute name="obj_pos">
-        <dia:point val="28.0008,10.7575"/>
+        <dia:point val="25.0508,18.8575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="23.315,3.01;28.7008,12.3575"/>
+        <dia:rectangle val="23.315,3.01;25.4008,19.7075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="28.0008,10.7575"/>
-        <dia:point val="28.0008,6.90875"/>
-        <dia:point val="23.365,6.90875"/>
+        <dia:point val="25.0508,18.8575"/>
+        <dia:point val="23.365,18.8575"/>
         <dia:point val="23.365,3.06"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
       </dia:attribute>
@@ -5291,73 +5293,9 @@ antecede un signo + y las FK un -.#</dia:string>
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O19" connection="1"/>
+        <dia:connection handle="0" to="O19" connection="24"/>
         <dia:connection handle="1" to="O8" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O40">
-      <dia:attribute name="obj_pos">
-        <dia:point val="38.75,10.45"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.7,5.15;41.075,11.3"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="38.75,10.45"/>
-        <dia:point val="37.75,10.45"/>
-        <dia:point val="37.75,6.21"/>
-        <dia:point val="39.325,6.21"/>
-        <dia:point val="39.325,5.2"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#0..1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O1" connection="12"/>
-        <dia:connection handle="1" to="O6" connection="6"/>
-      </dia:connections>
-    </dia:object>
   </dia:layer>
 </dia:diagram>