X-Git-Url: https://git.llucax.com/software/sercom.git/blobdiff_plain/0a4d5872de93f4eb8cb0564d3cd50cf3d9039f92..4ffef02da32cf65f61ee65831a40f6ff07ec109f:/doc/schema/tareas.dia?ds=sidebyside

diff --git a/doc/schema/tareas.dia b/doc/schema/tareas.dia
index d393948..ef4f87c 100644
--- a/doc/schema/tareas.dia
+++ b/doc/schema/tareas.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.43935909867286682"/>
+          <dia:real val="0.38389000296592712"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -71,19 +71,19 @@
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - LargePackage" version="0" id="O0">
       <dia:attribute name="obj_pos">
-        <dia:point val="-24.3,-9.05"/>
+        <dia:point val="-24.3,-14.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-24.35,-10.1;28.9,24.85"/>
+        <dia:rectangle val="-24.35,-15.15;28.9,24.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-24.3,-9.05"/>
+        <dia:point val="-24.3,-14.1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="53.149999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="33.850000000000001"/>
+        <dia:real val="38.900000000000034"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -152,13 +152,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="-22.33,17.295"/>
+        <dia:point val="-22.13,8.945"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-22.38,17.245;-13.73,21.345"/>
+        <dia:rectangle val="-22.18,8.895;-13.53,12.995"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-22.33,17.295"/>
+        <dia:point val="-22.13,8.945"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.5500000000000007"/>
@@ -378,13 +378,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O3">
       <dia:attribute name="obj_pos">
-        <dia:point val="-21.78,2.445"/>
+        <dia:point val="-21.98,2.595"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-21.83,2.395;-15.78,4.895"/>
+        <dia:rectangle val="-22.03,2.545;-15.98,5.045"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-21.78,2.445"/>
+        <dia:point val="-21.98,2.595"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.9500000000000002"/>
@@ -558,13 +558,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O4">
       <dia:attribute name="obj_pos">
-        <dia:point val="-8.33,16.295"/>
+        <dia:point val="-21.38,15.945"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-8.38,16.245;-1.23,20.345"/>
+        <dia:rectangle val="-21.43,15.895;-14.28,19.995"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-8.33,16.295"/>
+        <dia:point val="-21.38,15.945"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.0499999999999998"/>
@@ -784,13 +784,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.57,9.745"/>
+        <dia:point val="-7.58,-13.255"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.52,9.695;12.12,16.995"/>
+        <dia:rectangle val="-7.63,-13.305;-0.03,-6.005"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="4.57,9.745"/>
+        <dia:point val="-7.58,-13.255"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5"/>
@@ -1554,13 +1554,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.82,-7.405"/>
+        <dia:point val="13.87,-6.605"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.77,-7.455;23.82,8.645"/>
+        <dia:rectangle val="13.82,-6.655;23.87,9.445"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="13.82,-7.405"/>
+        <dia:point val="13.87,-6.605"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="9.9499999999999993"/>
@@ -2125,13 +2125,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="-3.23,2.345"/>
+        <dia:point val="-3.08,9.745"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.28,2.295;8.72,6.395"/>
+        <dia:rectangle val="-3.13,9.695;8.87,13.795"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-3.23,2.345"/>
+        <dia:point val="-3.08,9.745"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.9"/>
@@ -2351,13 +2351,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="-21.73,-2.155"/>
+        <dia:point val="-21.73,-2.055"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-21.78,-2.205;-15.88,0.295"/>
+        <dia:rectangle val="-21.78,-2.105;-15.88,0.395"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-21.73,-2.155"/>
+        <dia:point val="-21.73,-2.055"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.7999999999999998"/>
@@ -2531,13 +2531,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="-3.18,-3.355"/>
+        <dia:point val="-3.03,-3.405"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.23,-3.405;8.62,0.695"/>
+        <dia:rectangle val="-3.08,-3.455;8.77,0.645"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-3.18,-3.355"/>
+        <dia:point val="-3.03,-3.405"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.75"/>
@@ -2864,13 +2864,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="-3.53,8.745"/>
+        <dia:point val="-5.88,16.845"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.58,8.695;1.17,10.995"/>
+        <dia:rectangle val="-5.93,16.795;-1.18,19.095"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-3.53,8.745"/>
+        <dia:point val="-5.88,16.845"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.6500000000000004"/>
@@ -2971,13 +2971,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="-14.11,9.16"/>
+        <dia:point val="6.59,15.16"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-14.16,9.11;-7.26,14.81"/>
+        <dia:rectangle val="6.54,15.11;13.44,20.81"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-14.11,9.16"/>
+        <dia:point val="6.59,15.16"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="6.7999999999999998"/>
@@ -3197,13 +3197,13 @@
         <dia:point val="-15.58,-5.805"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-15.63,-5.855;2.895,-1.80487"/>
+        <dia:rectangle val="-15.63,-5.855;3.045,-1.85194"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-15.58,-5.805"/>
         <dia:point val="-15.58,-4.675"/>
-        <dia:point val="2.695,-4.675"/>
-        <dia:point val="2.695,-3.40487"/>
+        <dia:point val="2.845,-4.675"/>
+        <dia:point val="2.845,-3.45194"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3262,24 +3262,24 @@
     </dia:object>
     <dia:object type="UML - Association" version="1" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="19.245,12.195"/>
+        <dia:point val="-22.13,10.845"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.195,10.525;26.095,16.195"/>
+        <dia:rectangle val="-23.18,-8.005;-17.38,11.745"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="19.245,12.195"/>
-        <dia:point val="19.245,10.575"/>
-        <dia:point val="25.545,10.575"/>
-        <dia:point val="25.545,15.395"/>
+        <dia:point val="-22.13,10.845"/>
+        <dia:point val="-23.13,10.845"/>
+        <dia:point val="-23.13,-7.305"/>
+        <dia:point val="-17.43,-7.305"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
+        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -3293,7 +3293,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string>#* #</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3310,7 +3310,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
+            <dia:string># 1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3323,20 +3323,23 @@
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
-      <dia:childnode parent="O0"/>
+      <dia:connections>
+        <dia:connection handle="0" to="O2" connection="8"/>
+        <dia:connection handle="1" to="O12" connection="3"/>
+      </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="1" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="-22.33,19.195"/>
+        <dia:point val="8.86892,11.745"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-23.38,-8.005;-17.38,20.095"/>
+        <dia:rectangle val="8.81892,3.395;13.92,12.645"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-22.33,19.195"/>
-        <dia:point val="-23.33,19.195"/>
-        <dia:point val="-23.33,-7.305"/>
-        <dia:point val="-17.43,-7.305"/>
+        <dia:point val="8.86892,11.745"/>
+        <dia:point val="10.8452,11.745"/>
+        <dia:point val="10.8452,4.095"/>
+        <dia:point val="13.87,4.095"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3344,7 +3347,7 @@
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="autorouting">
-        <dia:boolean val="true"/>
+        <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -3358,7 +3361,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#* #</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3389,22 +3392,22 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O2" connection="8"/>
-        <dia:connection handle="1" to="O12" connection="3"/>
+        <dia:connection handle="0" to="O9" connection="14"/>
+        <dia:connection handle="1" to="O8" connection="30"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="1" id="O18">
       <dia:attribute name="obj_pos">
-        <dia:point val="8.71966,4.345"/>
+        <dia:point val="-15.93,-1.355"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.66966,2.595;13.87,5.245"/>
+        <dia:rectangle val="-15.98,-2.055;-12.58,0.045"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="8.71966,4.345"/>
-        <dia:point val="10.8452,4.345"/>
-        <dia:point val="10.8452,3.295"/>
-        <dia:point val="13.82,3.295"/>
+        <dia:point val="-15.93,-1.355"/>
+        <dia:point val="-14.28,-1.355"/>
+        <dia:point val="-14.28,-0.855"/>
+        <dia:point val="-12.63,-0.855"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3412,7 +3415,7 @@
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -3443,7 +3446,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string># 1#</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3457,22 +3460,22 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O9" connection="14"/>
-        <dia:connection handle="1" to="O8" connection="30"/>
+        <dia:connection handle="0" to="O10" connection="4"/>
+        <dia:connection handle="1" to="O7" connection="8"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="1" id="O19">
       <dia:attribute name="obj_pos">
-        <dia:point val="-15.93,-1.455"/>
+        <dia:point val="-16.03,3.295"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-15.98,-2.155;-12.58,0.045"/>
+        <dia:rectangle val="-16.08,2.595;-12.6805,4.995"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-15.93,-1.455"/>
-        <dia:point val="-14.28,-1.455"/>
-        <dia:point val="-14.28,-0.855"/>
-        <dia:point val="-12.63,-0.855"/>
+        <dia:point val="-16.03,3.295"/>
+        <dia:point val="-14.3802,3.295"/>
+        <dia:point val="-14.3802,4.095"/>
+        <dia:point val="-12.7305,4.095"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3525,22 +3528,22 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O10" connection="4"/>
-        <dia:connection handle="1" to="O7" connection="8"/>
+        <dia:connection handle="0" to="O3" connection="4"/>
+        <dia:connection handle="1" to="O6" connection="14"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="1" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="-15.83,3.145"/>
+        <dia:point val="-5.23135,-0.755"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-15.88,2.445;-12.6805,4.995"/>
+        <dia:rectangle val="-5.28135,-2.205;-2.98,0.145"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-15.83,3.145"/>
-        <dia:point val="-14.2802,3.145"/>
-        <dia:point val="-14.2802,4.095"/>
-        <dia:point val="-12.7305,4.095"/>
+        <dia:point val="-5.23135,-0.755"/>
+        <dia:point val="-4.17977,-0.755"/>
+        <dia:point val="-4.17977,-1.505"/>
+        <dia:point val="-3.03,-1.505"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3548,7 +3551,7 @@
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="autorouting">
-        <dia:boolean val="true"/>
+        <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -3593,22 +3596,22 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O3" connection="4"/>
-        <dia:connection handle="1" to="O6" connection="14"/>
+        <dia:connection handle="0" to="O7" connection="14"/>
+        <dia:connection handle="1" to="O11" connection="8"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="1" id="O21">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.23135,-0.755"/>
+        <dia:point val="8.72,-1.505"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.28135,-2.155;-3.13,0.145"/>
+        <dia:rectangle val="8.67,-2.205;13.92,-0.605"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-5.23135,-0.755"/>
-        <dia:point val="-4.17977,-0.755"/>
-        <dia:point val="-4.17977,-1.455"/>
-        <dia:point val="-3.18,-1.455"/>
+        <dia:point val="8.72,-1.505"/>
+        <dia:point val="10.95,-1.505"/>
+        <dia:point val="10.95,-1.505"/>
+        <dia:point val="13.87,-1.505"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3647,7 +3650,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
+            <dia:string># 1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3661,22 +3664,22 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O7" connection="14"/>
-        <dia:connection handle="1" to="O11" connection="8"/>
+        <dia:connection handle="0" to="O11" connection="9"/>
+        <dia:connection handle="1" to="O8" connection="16"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="1" id="O22">
       <dia:attribute name="obj_pos">
-        <dia:point val="8.57,-1.455"/>
+        <dia:point val="-5.18,4.795"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.52,-3.005;13.87,-0.555"/>
+        <dia:rectangle val="-5.23,4.095;-3.03,12.545"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="8.57,-1.455"/>
-        <dia:point val="10.95,-1.455"/>
-        <dia:point val="10.95,-2.305"/>
-        <dia:point val="13.82,-2.305"/>
+        <dia:point val="-5.18,4.795"/>
+        <dia:point val="-4.05,4.795"/>
+        <dia:point val="-4.05,11.645"/>
+        <dia:point val="-3.08,11.645"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3715,7 +3718,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string># 1#</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3729,22 +3732,22 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O11" connection="9"/>
-        <dia:connection handle="1" to="O8" connection="16"/>
+        <dia:connection handle="0" to="O6" connection="11"/>
+        <dia:connection handle="1" to="O9" connection="8"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="1" id="O23">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.18,4.795"/>
+        <dia:point val="-17.855,15.8947"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.23,3.545;-3.18,5.695"/>
+        <dia:rectangle val="-17.905,12.9245;-16.955,16.6947"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-5.18,4.795"/>
-        <dia:point val="-4.05,4.795"/>
-        <dia:point val="-4.05,4.245"/>
-        <dia:point val="-3.23,4.245"/>
+        <dia:point val="-17.855,15.8947"/>
+        <dia:point val="-17.855,15.8947"/>
+        <dia:point val="-17.855,12.9953"/>
+        <dia:point val="-17.855,12.9953"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3752,7 +3755,7 @@
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -3766,7 +3769,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string>#* #</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3783,7 +3786,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
+            <dia:string># 1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3797,30 +3800,30 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O6" connection="11"/>
-        <dia:connection handle="1" to="O9" connection="8"/>
+        <dia:connection handle="0" to="O4" connection="14"/>
+        <dia:connection handle="1" to="O2" connection="14"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="1" id="O24">
       <dia:attribute name="obj_pos">
-        <dia:point val="-8.38044,18.295"/>
+        <dia:point val="-13.58,12.945"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-13.7797,17.595;-8.33044,20.195"/>
+        <dia:rectangle val="-13.63,12.895;3.42,15.75"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-8.38044,18.295"/>
-        <dia:point val="-11.0551,18.295"/>
-        <dia:point val="-11.0551,19.295"/>
-        <dia:point val="-13.7297,19.295"/>
+        <dia:point val="-13.58,12.945"/>
+        <dia:point val="-13.58,15.65"/>
+        <dia:point val="2.87,15.65"/>
+        <dia:point val="2.87,13.7952"/>
       </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="true"/>
+        <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -3834,7 +3837,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#* #</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3851,7 +3854,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string># 1#</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3865,31 +3868,426 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O4" connection="14"/>
-        <dia:connection handle="1" to="O2" connection="14"/>
+        <dia:connection handle="0" to="O2" connection="7"/>
+        <dia:connection handle="1" to="O9" connection="14"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="1" id="O25">
+    <dia:object type="UML - Generalization" version="1" id="O25">
       <dia:attribute name="obj_pos">
-        <dia:point val="-18.055,17.295"/>
+        <dia:point val="-7.63046,-9.655"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-18.105,6.295;3.27,18.095"/>
+        <dia:rectangle val="-13.7295,-10.505;-7.58046,-6.68"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-18.055,17.295"/>
-        <dia:point val="-18.055,7.875"/>
-        <dia:point val="2.72,7.875"/>
-        <dia:point val="2.72,6.345"/>
+        <dia:point val="-7.63046,-9.655"/>
+        <dia:point val="-10.655,-9.655"/>
+        <dia:point val="-10.655,-6.905"/>
+        <dia:point val="-13.6795,-6.905"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O5" connection="22"/>
+        <dia:connection handle="1" to="O12" connection="8"/>
+      </dia:connections>
+      <dia:childnode parent="O0"/>
+    </dia:object>
+    <dia:object type="UML - Class" version="0" id="O26">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-1.5,3.7"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-1.55,3.65;7.2,5.95"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="-1.5,3.7"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="8.6500000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="2.1999999999999997"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#comando_ejecutado#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_attributes">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_operations">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_operations">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_after_char">
+        <dia:int val="40"/>
+      </dia:attribute>
+      <dia:attribute name="comment_line_length">
+        <dia:int val="40"/>
+      </dia:attribute>
+      <dia:attribute name="comment_tagging">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier-Oblique"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica-Oblique"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font_height">
+        <dia:real val="0.69999999999999996"/>
+      </dia:attribute>
+      <dia:attribute name="attributes"/>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
+      <dia:childnode parent="O0"/>
+    </dia:object>
+    <dia:object type="UML - Generalization" version="1" id="O27">
+      <dia:attribute name="obj_pos">
+        <dia:point val="2.825,3.64966"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="1.975,0.59494;3.675,3.69966"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="2.825,3.64966"/>
+        <dia:point val="2.825,1.45"/>
+        <dia:point val="2.845,1.45"/>
+        <dia:point val="2.845,0.64494"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
       </dia:attribute>
-      <dia:attribute name="autorouting">
+      <dia:attribute name="orth_autoroute">
         <dia:boolean val="false"/>
       </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O26" connection="8"/>
+        <dia:connection handle="1" to="O11" connection="14"/>
+      </dia:connections>
+      <dia:childnode parent="O0"/>
+    </dia:object>
+    <dia:object type="UML - Generalization" version="1" id="O28">
+      <dia:attribute name="obj_pos">
+        <dia:point val="2.825,5.95028"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="1.975,5.90028;3.675,9.74475"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="2.825,5.95028"/>
+        <dia:point val="2.825,7.82252"/>
+        <dia:point val="2.87,7.82252"/>
+        <dia:point val="2.87,9.69475"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O26" connection="8"/>
+        <dia:connection handle="1" to="O9" connection="14"/>
+      </dia:connections>
+      <dia:childnode parent="O0"/>
+    </dia:object>
+    <dia:object type="UML - Class" version="0" id="O29">
+      <dia:attribute name="obj_pos">
+        <dia:point val="3.69,-11.04"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="3.64,-11.09;12.39,-8.19"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="3.69,-11.04"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="8.6500000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="2.7999999999999998"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#comando_ejecutado#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_attributes">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_operations">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_operations">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_after_char">
+        <dia:int val="40"/>
+      </dia:attribute>
+      <dia:attribute name="comment_line_length">
+        <dia:int val="40"/>
+      </dia:attribute>
+      <dia:attribute name="comment_tagging">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier-Oblique"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica-Oblique"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font_height">
+        <dia:real val="0.69999999999999996"/>
+      </dia:attribute>
+      <dia:attribute name="attributes">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#diferencias#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#BLOB#</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:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
+    </dia:object>
+    <dia:object type="UML - Generalization" version="1" id="O30">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-0.0295361,-9.655"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-0.0795361,-10.505;3.68973,-8.0475"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="-0.0295361,-9.655"/>
+        <dia:point val="1.8051,-9.655"/>
+        <dia:point val="1.8051,-9.64"/>
+        <dia:point val="3.63973,-9.64"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O5" connection="22"/>
+        <dia:connection handle="1" to="O29" connection="10"/>
+      </dia:connections>
+      <dia:childnode parent="O0"/>
+    </dia:object>
+    <dia:object type="UML - Association" version="1" id="O31">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-14.2796,17.945"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-14.2796,17.145;-5.38029,19.545"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="-14.2796,17.945"/>
+        <dia:point val="-14.2796,17.945"/>
+        <dia:point val="-5.93029,17.945"/>
+        <dia:point val="-5.93029,17.945"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="true"/>
+      </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
       </dia:attribute>
@@ -3902,7 +4300,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3919,7 +4317,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3933,30 +4331,31 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O2" connection="1"/>
-        <dia:connection handle="1" to="O9" connection="6"/>
+        <dia:connection handle="0" to="O4" connection="14"/>
+        <dia:connection handle="1" to="O13" connection="8"/>
       </dia:connections>
+      <dia:childnode parent="O0"/>
     </dia:object>
-    <dia:object type="UML - Association" version="1" id="O26">
+    <dia:object type="UML - Association" version="1" id="O32">
       <dia:attribute name="obj_pos">
-        <dia:point val="-1.205,10.9951"/>
+        <dia:point val="-1.17971,17.945"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-7.36,10.9451;-0.655,13.775"/>
+        <dia:rectangle val="-1.22971,17.245;6.58958,18.86"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-1.205,10.9951"/>
-        <dia:point val="-1.205,12.975"/>
-        <dia:point val="-7.31,12.975"/>
-        <dia:point val="-7.31,11.86"/>
+        <dia:point val="-1.17971,17.945"/>
+        <dia:point val="2.67993,17.945"/>
+        <dia:point val="2.67993,17.96"/>
+        <dia:point val="6.53958,17.96"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
+        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -4002,8 +4401,9 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O13" connection="8"/>
-        <dia:connection handle="1" to="O14" connection="11"/>
+        <dia:connection handle="1" to="O14" connection="18"/>
       </dia:connections>
+      <dia:childnode parent="O0"/>
     </dia:object>
   </dia:layer>
 </dia:diagram>