X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/blobdiff_plain/fb7cf548c915512d06fe71650fc272b2ad46d17f..c9d8fe907a8926d51da243fa827bf5e9d1751f50:/diagramas/der.dia

diff --git a/diagramas/der.dia b/diagramas/der.dia
index 3703992..e5f1b50 100644
--- a/diagramas/der.dia
+++ b/diagramas/der.dia
@@ -199,13 +199,13 @@
         <dia:point val="38.75,6.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.7,6.9;51.25,16.6"/>
+        <dia:rectangle val="38.7,6.9;51.3,16.6"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="38.75,6.95"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="12.449999999999999"/>
+        <dia:real val="12.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="9.5999999999999996"/>
@@ -912,7 +912,7 @@
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#INT#</dia:string>
+            <dia:string>#VARCHAR(8)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1152,7 +1152,7 @@
             <dia:string>#categoria#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#VARCHAR(255)#</dia:string>
+            <dia:string>#FLOAT#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1251,7 +1251,7 @@
         <dia:point val="1.5,-0.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.45,-0.9;9.85,5.6"/>
+        <dia:rectangle val="1.45,-0.9;9.85,6.4"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="1.5,-0.85"/>
@@ -1260,7 +1260,7 @@
         <dia:real val="8.3000000000000007"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="6.4000000000000004"/>
+        <dia:real val="7.1999999999999993"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestador#</dia:string>
@@ -1369,7 +1369,7 @@
             <dia:string>#cuit#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#INT#</dia:string>
+            <dia:string>#VARCHAR(11)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -1479,6 +1479,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#email#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#VARCHAR(255)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <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: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">
@@ -1708,13 +1731,13 @@
         <dia:point val="7.475,6.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.425,6.6;20.675,17.9"/>
+        <dia:rectangle val="7.425,6.6;20.725,17.9"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="7.475,6.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="13.15"/>
+        <dia:real val="13.199999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="11.200000000000001"/>
@@ -1849,7 +1872,7 @@
             <dia:string>#porcentajeCobertura#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#INT(3)#</dia:string>
+            <dia:string>#DECIMAL(3,2)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2714,13 +2737,13 @@
         <dia:point val="-5.635,33.07"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.685,33.02;7.565,39.52"/>
+        <dia:rectangle val="-5.685,33.02;7.615,39.52"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-5.635,33.07"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="13.15"/>
+        <dia:real val="13.199999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="6.4000000000000004"/>
@@ -2954,13 +2977,13 @@
         <dia:point val="-2.735,26.67"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.785,26.62;5.215,31.52"/>
+        <dia:rectangle val="-2.785,26.62;5.265,31.52"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-2.735,26.67"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="7.8999999999999995"/>
+        <dia:real val="7.9499999999999993"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
@@ -3148,7 +3171,7 @@
         <dia:point val="7.515,35.77"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.465,26.95;10.825,36.62"/>
+        <dia:rectangle val="7.465,26.9;10.825,36.57"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="7.515,35.77"/>
@@ -3210,7 +3233,7 @@
         <dia:point val="20.175,27.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.125,26.95;29.8,30.5"/>
+        <dia:rectangle val="20.125,26.9;29.8,30.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.175,27.7"/>
@@ -3272,7 +3295,7 @@
         <dia:point val="28.215,2.56"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.165,-1.25;35.525,3.41"/>
+        <dia:rectangle val="28.165,-1.3;35.525,3.36"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="28.215,2.56"/>
@@ -3331,7 +3354,7 @@
         <dia:point val="-5.635,34.97"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.975,17.6;-4.625,35.82"/>
+        <dia:rectangle val="-6.975,17.55;-4.625,35.77"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.635,34.97"/>
@@ -3393,7 +3416,7 @@
         <dia:point val="-5.125,10.9325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.175,-0.9;1.85,11.7825"/>
+        <dia:rectangle val="-6.175,-0.95;1.85,11.7325"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.125,10.9325"/>
@@ -3932,7 +3955,7 @@
         <dia:point val="28.0008,18.7575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.9508,15.3;39.1,21.1575"/>
+        <dia:rectangle val="27.9508,15.25;39.1,21.1575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="28.0008,18.7575"/>
@@ -3993,13 +4016,13 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O21">
       <dia:attribute name="obj_pos">
-        <dia:point val="5.65,5.55"/>
+        <dia:point val="5.65,6.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.6,5.5;7.825,16.6"/>
+        <dia:rectangle val="5.6,6.3;7.825,16.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="5.65,5.55"/>
+        <dia:point val="5.65,6.35"/>
         <dia:point val="5.65,15.75"/>
         <dia:point val="7.475,15.75"/>
       </dia:attribute>
@@ -4050,13 +4073,13 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O22">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.625,17.35"/>
+        <dia:point val="20.675,17.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.575,16.6;29.8,25.3"/>
+        <dia:rectangle val="20.625,16.55;29.8,25.25"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="20.625,17.35"/>
+        <dia:point val="20.675,17.35"/>
         <dia:point val="21.8706,17.35"/>
         <dia:point val="21.8706,24.45"/>
         <dia:point val="29.45,24.45"/>
@@ -4115,7 +4138,7 @@
         <dia:point val="33.5508,11.4575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.5008,3.15;35.525,12.3075"/>
+        <dia:rectangle val="33.5008,3.1;35.525,12.2575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="33.5508,11.4575"/>
@@ -4174,7 +4197,7 @@
         <dia:point val="47.665,38.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.05,27.3;48.365,39.3"/>
+        <dia:rectangle val="38.05,27.25;48.365,39.25"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="47.665,38.45"/>
@@ -4233,14 +4256,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O25">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.05,17.85"/>
+        <dia:point val="14.075,17.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.325,17.8;14.75,23.66"/>
+        <dia:rectangle val="6.325,17.8;14.775,23.61"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="14.05,17.85"/>
-        <dia:point val="14.05,19.3325"/>
+        <dia:point val="14.075,17.85"/>
+        <dia:point val="14.075,19.3325"/>
         <dia:point val="6.375,19.3325"/>
         <dia:point val="6.375,22.81"/>
         <dia:point val="8.165,22.81"/>
@@ -4300,7 +4323,7 @@
         <dia:point val="51.2,16.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="46.0501,16.5;51.9,34.5"/>
+        <dia:rectangle val="46.0501,16.5;51.9,34.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="51.2,16.55"/>
@@ -4364,7 +4387,7 @@
         <dia:point val="38.75,15.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.7,4.35;40.725,16.1"/>
+        <dia:rectangle val="37.7,4.35;40.725,16.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="38.75,15.25"/>
@@ -4428,7 +4451,7 @@
         <dia:point val="38.1,25.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.05,16.5;45.675,26.5"/>
+        <dia:rectangle val="38.05,16.5;45.675,26.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="38.1,25.65"/>
@@ -4485,7 +4508,7 @@
         <dia:point val="20.815,37.4325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.275,33.35;21.165,38.2825"/>
+        <dia:rectangle val="15.275,33.35;21.165,38.2325"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.815,37.4325"/>
@@ -4542,7 +4565,7 @@
         <dia:point val="-4.975,22.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.025,22;-2.385,28.22"/>
+        <dia:rectangle val="-6.025,21.95;-2.385,28.17"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4.975,22.75"/>
@@ -4601,7 +4624,7 @@
         <dia:point val="22.4508,11.4575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,4.3;22.8008,12.3075"/>
+        <dia:rectangle val="9.75,4.25;22.8008,12.2575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="22.4508,11.4575"/>
@@ -4811,13 +4834,13 @@
         <dia:point val="-5.125,11.7325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.175,10.9825;4.375,19.2"/>
+        <dia:rectangle val="-6.175,10.9325;4.375,19.15"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.125,11.7325"/>
         <dia:point val="-6.125,11.7325"/>
-        <dia:point val="-6.125,15.0413"/>
-        <dia:point val="4.325,15.0413"/>
+        <dia:point val="-6.125,15.0412"/>
+        <dia:point val="4.325,15.0412"/>
         <dia:point val="4.325,18.35"/>
         <dia:point val="3.325,18.35"/>
       </dia:attribute>
@@ -4874,7 +4897,7 @@
         <dia:point val="51.2,7.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="47.8651,6.9;58.7651,27.45"/>
+        <dia:rectangle val="47.8651,6.85;58.7651,27.4"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="51.2,7.65"/>
@@ -4940,7 +4963,7 @@
         <dia:point val="58.415,37.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="58.365,24.65;59.75,38.5"/>
+        <dia:rectangle val="58.365,24.6;59.75,38.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="58.415,37.65"/>
@@ -4999,7 +5022,7 @@
         <dia:point val="29.45,30.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.9501,29.7;34.475,33.35"/>
+        <dia:rectangle val="27.9501,29.65;34.475,33.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="29.45,30.45"/>
@@ -5063,7 +5086,7 @@
         <dia:point val="38.1,30.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.765,30.9;38.8,37.4825"/>
+        <dia:rectangle val="29.765,30.9;38.8,37.4325"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="38.1,30.95"/>
@@ -5120,7 +5143,7 @@
         <dia:point val="9.8,4.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,-1.79;18.865,5.1"/>
+        <dia:rectangle val="9.75,-1.84;18.865,5.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="9.8,4.25"/>
@@ -5179,7 +5202,7 @@
         <dia:point val="7.475,16.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-0.875,15.8;7.825,25.65"/>
+        <dia:rectangle val="-0.875,15.75;7.825,25.65"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="7.475,16.55"/>
@@ -5243,16 +5266,16 @@
         <dia:point val="45.7001,-1.415"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="45.6501,-1.465;59.5501,5.935"/>
+        <dia:rectangle val="45.6501,-1.465;59.6001,5.935"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="45.7001,-1.415"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="13.800000000000001"/>
+        <dia:real val="13.85"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="7.3000000000000007"/>
+        <dia:real val="7.2999999999999998"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -5279,7 +5302,7 @@ antecede un signo + y las FK un -.#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="46.0501,-0.165"/>
+            <dia:point val="46.0501,-0.215"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>