1) Reordenacón de atributos de Autorización

2) Saqué los underscores de todos los nombres de atributos para unificar notación. Esto después nos va a facilitar la lectura de clases->tablas y el mapeo.

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 87a365952c30e13119bc63454333cd7cc455680e..7e849e9a358a84b7559e9f13747d9d6bb7e6665b 100644 (file)
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -438,13 +438,13 @@
         <dia:point val="21.6,23.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="21.6,23.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="21.55,23;30.65,28.7"/>
+        <dia:rectangle val="21.55,23;30.3,28.7"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="21.6,23.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="21.6,23.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">

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

       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="5.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="5.5999999999999996"/>


@@ -553,7 +553,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#fecha_afiliacion#</dia:string>
+            <dia:string>#fechaAfiliacion#</dia:string>

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


@@ -576,7 +576,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#fecha_baja#</dia:string>
+            <dia:string>#fechaBaja#</dia:string>

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


@@ -1316,13 +1316,13 @@
         <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;17.275,15.3"/>
+        <dia:rectangle val="5.725,4.6;16.925,15.3"/>

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

-        <dia:real val="11.449999999999999"/>
+        <dia:real val="11.1"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="10.6"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="10.6"/>


@@ -1454,16 +1454,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#fechaSolicitud#</dia:string>
+            <dia:string>#porcentajeCobertura#</dia:string>

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

-            <dia:string>#Fecha#</dia:string>
+            <dia:string>#int#</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>#Fecha en que fue solicitada la autorización.#</dia:string>
+            <dia:string>##</dia:string>

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


@@ -1477,7 +1477,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#fechaResolucion#</dia:string>
+            <dia:string>#fechaSolicitud#</dia:string>

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


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

-            <dia:string>#Fecha en la que se aprobó la autorización.#</dia:string>
+            <dia:string>#Fecha en que fue solicitada la autorización.#</dia:string>

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


@@ -1500,7 +1500,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#fechaVencimiento#</dia:string>
+            <dia:string>#fechaResolucion#</dia:string>

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


@@ -1509,7 +1509,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>#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="visibility">
             <dia:enum val="0"/>


@@ -1523,10 +1523,10 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#porcentajeCobertura#</dia:string>
+            <dia:string>#fechaRealizacion#</dia:string>

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

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

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


@@ -1546,16 +1546,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#observaciones#</dia:string>
+            <dia:string>#fechaVencimiento#</dia:string>

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

-            <dia:string>#string#</dia:string>
+            <dia:string>#Fecha#</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>#Observaciones sobre la autorización (debería ir sólo en Manual o no?)#</dia:string>
+            <dia:string>##</dia:string>

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


@@ -1569,10 +1569,10 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#fundamentos_resolucion#</dia:string>
+            <dia:string>#aprobada#</dia:string>

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

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

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


@@ -1592,10 +1592,10 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#fecha_realizacion#</dia:string>
+            <dia:string>#fundamentosResolucion#</dia:string>

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

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

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


@@ -1615,16 +1615,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#Aprobada#</dia:string>
+            <dia:string>#observaciones#</dia:string>

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

-            <dia:string>#bool#</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>##</dia:string>
+            <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="visibility">
             <dia:enum val="0"/>


@@ -1679,13 +1679,13 @@
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="26.05,16.1;40.35,23.52"/>
+        <dia:rectangle val="25.875,16.1;40.35,23.52"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="39.5,16.15"/>
         <dia:point val="39.5,22.72"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="39.5,16.15"/>
         <dia:point val="39.5,22.72"/>

-        <dia:point val="26.1,22.72"/>
-        <dia:point val="26.1,23.05"/>
+        <dia:point val="25.925,22.72"/>
+        <dia:point val="25.925,23.05"/>

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


@@ -2248,14 +2248,14 @@
     </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.5,15.25"/>
+        <dia:point val="11.325,15.25"/>

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

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

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

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

         <dia:point val="14.64,17.97"/>
         <dia:point val="14.64,21.26"/>
       </dia:attribute>
         <dia:point val="14.64,17.97"/>
         <dia:point val="14.64,21.26"/>
       </dia:attribute>


@@ -2384,14 +2384,14 @@
     </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.5,15.25"/>
+        <dia:point val="11.325,15.25"/>

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

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

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

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

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


@@ -3460,7 +3460,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>#fecha_ingreso#</dia:string>
+            <dia:string>#fechaIngreso#</dia:string>

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


@@ -3483,7 +3483,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#fecha_egreso#</dia:string>
+            <dia:string>#fechaEgreso#</dia:string>

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


@@ -4141,12 +4141,12 @@
         <dia:point val="1.8,3.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="1.8,3.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="1.05,2.65;12.2,6.25"/>
+        <dia:rectangle val="1.05,2.65;12.025,6.25"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="1.8,3.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="1.8,3.45"/>

-        <dia:point val="11.5,3.45"/>
-        <dia:point val="11.5,4.65"/>
+        <dia:point val="11.325,3.45"/>
+        <dia:point val="11.325,4.65"/>

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


@@ -4195,13 +4195,13 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O37">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O37">
       <dia:attribute name="obj_pos">

-        <dia:point val="17.225,5.35"/>
+        <dia:point val="16.875,5.35"/>

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

-        <dia:rectangle val="17.175,4.55;22.35,24.55"/>
+        <dia:rectangle val="16.825,4.55;22.35,24.55"/>

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

-        <dia:point val="17.225,5.35"/>
+        <dia:point val="16.875,5.35"/>

         <dia:point val="19.515,5.35"/>
         <dia:point val="19.515,23.75"/>
         <dia:point val="21.6,23.75"/>
         <dia:point val="19.515,5.35"/>
         <dia:point val="19.515,23.75"/>
         <dia:point val="21.6,23.75"/>


@@ -4260,13 +4260,13 @@
         <dia:point val="21.6,28.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="21.6,28.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="20.85,27.9;32.75,34.0575"/>
+        <dia:rectangle val="20.85,27.9;32.575,34.0575"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="21.6,28.65"/>
         <dia:point val="21.6,34.0075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="21.6,28.65"/>
         <dia:point val="21.6,34.0075"/>

-        <dia:point val="26.1,34.0075"/>
-        <dia:point val="26.1,28.65"/>
+        <dia:point val="25.925,34.0075"/>
+        <dia:point val="25.925,28.65"/>

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


@@ -4381,15 +4381,15 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O40">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O40">
       <dia:attribute name="obj_pos">

-        <dia:point val="30.6,27.35"/>
+        <dia:point val="30.25,27.35"/>

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

-        <dia:rectangle val="30.55,26.55;34.215,29.3825"/>
+        <dia:rectangle val="30.2,26.55;34.215,29.3825"/>

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

-        <dia:point val="30.6,27.35"/>
-        <dia:point val="32.2325,27.35"/>
-        <dia:point val="32.2325,28.5825"/>
+        <dia:point val="30.25,27.35"/>
+        <dia:point val="32.0575,27.35"/>
+        <dia:point val="32.0575,28.5825"/>

         <dia:point val="33.865,28.5825"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:point val="33.865,28.5825"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">