Observaciones solo tiene sentido en Autorizacion Manual, se elimina del padre "Autori...

[z.facultad/75.10/miklolife.git] / diagramas / clases.dia

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index f047f2cf43e698022ec04b51fa175484ba927e98..ee1920a3564fa31346446e6aa9851b9dde2c0032 100644 (file)
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -530,7 +530,7 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#nroAfiliado#</dia:string>
+            <dia:string>#codigo#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>


@@ -655,7 +655,7 @@
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-4.875,13;1.075,16.3"/>
+        <dia:rectangle val="-4.875,13;1.075,15.5"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4.825,13.05"/>


@@ -664,7 +664,7 @@
         <dia:real val="5.8499999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="5.8499999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="2.3999999999999999"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestacion#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestacion#</dia:string>


@@ -768,29 +768,6 @@
             <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>#codigo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Identificador único de la prestación (esto está por el codificador? o porque nos pintó a nosotros?)#</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">


@@ -997,7 +974,7 @@
         <dia:point val="-4,2.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="-4,2.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-4.05,2.7;1.9,6.8"/>
+        <dia:rectangle val="-4.05,2.7;1.9,6"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4,2.75"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4,2.75"/>


@@ -1006,7 +983,7 @@
         <dia:real val="5.8499999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="5.8499999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="4"/>
+        <dia:real val="3.2000000000000002"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestador#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestador#</dia:string>


@@ -1089,7 +1066,7 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#codigo#</dia:string>
+            <dia:string>#cuit#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>


@@ -1098,7 +1075,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>#Identificador único (para nosotros? o por codificador o algo?).#</dia:string>
+            <dia:string>#Número de CUIT (lo necesitamos!?!?!).#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1133,29 +1110,6 @@
             <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>#cuit#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Número de CUIT (lo necesitamos!?!?!).#</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">


@@ -1316,7 +1270,7 @@
         <dia:point val="5.775,4.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="5.775,4.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="5.725,4.6;16.925,15.3"/>
+        <dia:rectangle val="5.725,4.6;16.925,13.7"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="5.775,4.65"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="5.775,4.65"/>


@@ -1325,7 +1279,7 @@
         <dia:real val="11.1"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="11.1"/>
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="10.6"/>
+        <dia:real val="9"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>


@@ -1498,29 +1452,6 @@
             <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>#fechaResolucion#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Fecha en la que se aprobó la autorización.#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>

         <dia:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#fechaRealizacion#</dia:string>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#fechaRealizacion#</dia:string>


@@ -1613,29 +1544,6 @@
             <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>#observaciones#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Observaciones sobre la autorización (debería ir sólo en Manual o no?)#</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:composite type="umloperation">
       </dia:attribute>
       <dia:attribute name="operations">
         <dia:composite type="umloperation">


@@ -1841,16 +1749,16 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#codigo#</dia:string>
+            <dia:string>#nombre#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>#int#</dia:string>
+            <dia:string>#string#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>#País en donde se encuentra.#</dia:string>
+            <dia:string>#Nombre de la Zona#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1873,7 +1781,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Descripción de la Zona#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -2126,16 +2034,16 @@
         <dia:point val="10.365,21.26"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="10.365,21.26"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="10.315,21.21;18.965,23.71"/>
+        <dia:rectangle val="10.315,21.21;19.065,24.51"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="10.365,21.26"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="10.365,21.26"/>
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="8.5500000000000007"/>
+        <dia:real val="8.6500000000000004"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="2.3999999999999999"/>
+        <dia:real val="3.2000000000000002"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionManual#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionManual#</dia:string>


@@ -2239,6 +2147,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>#fechaResolucion#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#fecha#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Fecha en la que se aprobo/rechazo la autorizacion.#</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">


@@ -2248,16 +2179,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O14">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O14">
       <dia:attribute name="obj_pos">

-        <dia:point val="11.325,15.25"/>
+        <dia:point val="11.325,13.65"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="10.475,15.2;14.69,21.31"/>
+        <dia:rectangle val="10.475,13.6;14.74,21.31"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="11.325,15.25"/>
+        <dia:point val="11.325,13.65"/>

         <dia:point val="11.325,17.97"/>
         <dia:point val="11.325,17.97"/>

-        <dia:point val="14.64,17.97"/>
-        <dia:point val="14.64,21.26"/>
+        <dia:point val="14.69,17.97"/>
+        <dia:point val="14.69,21.26"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>


@@ -2384,13 +2315,13 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">

-        <dia:point val="11.325,15.25"/>
+        <dia:point val="11.325,13.65"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="7.18,15.2;12.175,21.27"/>
+        <dia:rectangle val="7.18,13.6;12.175,21.27"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="11.325,15.25"/>
+        <dia:point val="11.325,13.65"/>

         <dia:point val="11.325,17.97"/>
         <dia:point val="7.23,17.97"/>
         <dia:point val="7.23,21.22"/>
         <dia:point val="11.325,17.97"/>
         <dia:point val="7.23,17.97"/>
         <dia:point val="7.23,21.22"/>


@@ -3184,14 +3115,14 @@
         <dia:point val="-5.585,28.22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="-5.585,28.22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-6.635,15.5;-1.175,29.02"/>
+        <dia:rectangle val="-6.635,14.7;-1.175,29.02"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.585,28.22"/>
         <dia:point val="-6.585,28.22"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.585,28.22"/>
         <dia:point val="-6.585,28.22"/>

-        <dia:point val="-6.585,22.235"/>
-        <dia:point val="-1.925,22.235"/>
-        <dia:point val="-1.925,16.25"/>
+        <dia:point val="-6.585,21.835"/>
+        <dia:point val="-1.925,21.835"/>
+        <dia:point val="-1.925,15.45"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>


@@ -3245,14 +3176,14 @@
         <dia:point val="-4.825,13.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="-4.825,13.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-5.875,6;-0.35,14.55"/>
+        <dia:rectangle val="-5.875,5.2;-0.35,14.55"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4.825,13.75"/>
         <dia:point val="-5.825,13.75"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4.825,13.75"/>
         <dia:point val="-5.825,13.75"/>

-        <dia:point val="-5.825,10.25"/>
-        <dia:point val="-1.1,10.25"/>
-        <dia:point val="-1.1,6.75"/>
+        <dia:point val="-5.825,9.85"/>
+        <dia:point val="-1.1,9.85"/>
+        <dia:point val="-1.1,5.95"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>


@@ -4082,13 +4013,13 @@
         <dia:point val="25.6258,18.2075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="25.6258,18.2075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="1.75,6.7;26.3258,20.6075"/>
+        <dia:rectangle val="1.75,5.9;26.3258,20.6075"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="25.6258,18.2075"/>
         <dia:point val="25.6258,19.2075"/>
         <dia:point val="1.8,19.2075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="25.6258,18.2075"/>
         <dia:point val="25.6258,19.2075"/>
         <dia:point val="1.8,19.2075"/>

-        <dia:point val="1.8,6.75"/>
+        <dia:point val="1.8,5.95"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>