* actualizo

[z.facultad/75.10/miklolife.git] / carpeta / diagramas / der.dia

diff --git a/carpeta/diagramas/der.dia b/carpeta/diagramas/der.dia
index a0540258b2176405f8e821b80a20dc1d78c1fb33..67291b8f86bb52fccc061f26a1e625c647e52454 100644 (file)
--- a/carpeta/diagramas/der.dia
+++ b/carpeta/diagramas/der.dia
@@ -222,13 +222,13 @@
         <dia:point val="38.75,6.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="38.75,6.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="38.7,6.9;51.25,15.8"/>
+        <dia:rectangle val="38.7,6.9;51.3,15.8"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="38.75,6.95"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </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="8.7999999999999989"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="8.7999999999999989"/>


@@ -1251,7 +1251,7 @@
         <dia:point val="1.5,-0.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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"/>
       </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="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>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestador#</dia:string>


@@ -1479,6 +1479,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>

+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#password#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#VARCHAR(50)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</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: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: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: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"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="11.200000000000001"/>


@@ -2737,13 +2760,13 @@
         <dia:point val="-5.635,33.07"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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: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"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="6.4000000000000004"/>


@@ -2977,13 +3000,13 @@
         <dia:point val="-2.735,26.67"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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: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"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>


@@ -3171,7 +3194,7 @@
         <dia:point val="7.565,35.77"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="7.565,35.77"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="7.515,26.95;10.825,36.62"/>
+        <dia:rectangle val="7.515,26.9;10.825,36.57"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="7.565,35.77"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="7.565,35.77"/>


@@ -3233,7 +3256,7 @@
         <dia:point val="20.175,27.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.175,27.7"/>


@@ -3295,7 +3318,7 @@
         <dia:point val="28.215,2.56"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="28.215,2.56"/>


@@ -3354,7 +3377,7 @@
         <dia:point val="-5.635,34.97"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.635,34.97"/>


@@ -3416,7 +3439,7 @@
         <dia:point val="-5.125,10.9325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.125,10.9325"/>


@@ -3978,7 +4001,7 @@
         <dia:point val="30.6008,19.3575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="30.6008,19.3575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="30.5508,14.5;39.1,21.7575"/>
+        <dia:rectangle val="30.5508,14.45;39.1,21.7575"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="30.6008,19.3575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="30.6008,19.3575"/>


@@ -4039,13 +4062,13 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O21">
       <dia:attribute name="obj_pos">
     </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: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: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>
         <dia:point val="5.65,15.75"/>
         <dia:point val="7.475,15.75"/>
       </dia:attribute>


@@ -4099,7 +4122,7 @@
         <dia:point val="20.625,17.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="20.625,17.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="20.575,16.6;29.8,25.3"/>
+        <dia:rectangle val="20.575,16.55;29.8,25.25"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.625,17.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.625,17.35"/>


@@ -4161,7 +4184,7 @@
         <dia:point val="36.1508,11.2575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="36.1508,11.2575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="34.125,3.15;37.2008,12.1075"/>
+        <dia:rectangle val="34.125,3.1;37.2008,12.0575"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="36.1508,11.2575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="36.1508,11.2575"/>


@@ -4224,7 +4247,7 @@
         <dia:point val="47.665,38.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="47.665,38.45"/>


@@ -4286,7 +4309,7 @@
         <dia:point val="14.05,17.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="14.05,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.75,23.61"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="14.05,17.85"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="14.05,17.85"/>


@@ -4350,7 +4373,7 @@
         <dia:point val="51.2,15.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="51.2,15.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="46.0501,15.7;51.9,34.5"/>
+        <dia:rectangle val="46.0501,15.7;51.9,34.45"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="51.2,15.75"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="51.2,15.75"/>


@@ -4414,7 +4437,7 @@
         <dia:point val="38.1,25.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="38.1,25.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="38.05,15.7;45.675,26.5"/>
+        <dia:rectangle val="38.05,15.7;45.675,26.45"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="38.1,25.65"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="38.1,25.65"/>


@@ -4471,7 +4494,7 @@
         <dia:point val="20.815,37.4325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.815,37.4325"/>


@@ -4528,7 +4551,7 @@
         <dia:point val="-4.975,22.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4.975,22.75"/>


@@ -4587,7 +4610,7 @@
         <dia:point val="25.0508,11.2575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="25.0508,11.2575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="9.75,4.3;25.4008,12.1075"/>
+        <dia:rectangle val="9.75,4.25;25.4008,12.0575"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="25.0508,11.2575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="25.0508,11.2575"/>


@@ -4797,7 +4820,7 @@
         <dia:point val="-5.125,11.7325"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.125,11.7325"/>


@@ -4860,7 +4883,7 @@
         <dia:point val="51.2,7.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="51.2,7.65"/>


@@ -4926,7 +4949,7 @@
         <dia:point val="58.415,37.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="58.415,37.65"/>


@@ -4985,7 +5008,7 @@
         <dia:point val="29.45,30.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="29.45,30.45"/>


@@ -5049,7 +5072,7 @@
         <dia:point val="38.1,30.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="38.1,30.95"/>


@@ -5106,7 +5129,7 @@
         <dia:point val="7.475,16.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="7.475,16.55"/>


@@ -5170,16 +5193,16 @@
         <dia:point val="45.7001,-1.415"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <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: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: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"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>


@@ -5206,7 +5229,7 @@ antecede un signo + y las FK un -.#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
             <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"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>


@@ -5222,7 +5245,7 @@ antecede un signo + y las FK un -.#</dia:string>
         <dia:point val="25.0508,18.8575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="25.0508,18.8575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="23.315,3.01;25.4008,19.7075"/>
+        <dia:rectangle val="23.315,3.01;25.4008,19.6575"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="25.0508,18.8575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="25.0508,18.8575"/>