dniAuditor -> nroLegajoAuditor

Nuevo metodo en Autorizaciones:
Constructor: Autorizacion(codigo,fechaSolicitud)
y como es abstracta... hijos con mismo argumento de construct.

diff --git a/carpeta/diagramas/clases.dia b/carpeta/diagramas/clases.dia
index 81f029804521ad9749804674fa3caedab665aad7..f74bd072313de158050d97051057d3df4275485b 100644 (file)
--- a/carpeta/diagramas/clases.dia
+++ b/carpeta/diagramas/clases.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.41439446806907654"/>
+          <dia:real val="0.40737679600715637"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -1465,13 +1465,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="24.15,18.55"/>
+        <dia:point val="24.75,22.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.1,18.5;31.8,22.6"/>
+        <dia:rectangle val="24.7,22.25;32.4,26.35"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="24.15,18.55"/>
+        <dia:point val="24.75,22.3"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -1636,19 +1636,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.95,0.65"/>
+        <dia:point val="15.95,-0.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.9,0.6;48.15,10.5"/>
+        <dia:rectangle val="15.9,-0.5;49.15,10.2"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="14.95,0.65"/>
+        <dia:point val="15.95,-0.45"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="33.149999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="9.7999999999999989"/>
+        <dia:real val="10.6"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>
@@ -2035,6 +2035,71 @@
             </dia:composite>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#Autorizacion#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </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="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <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>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#fechaSolicitud#</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>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
+        </dia:composite>
       </dia:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
@@ -2043,13 +2108,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="16.5,27.3"/>
+        <dia:point val="33.65,27.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.45,27.25;24.15,30.55"/>
+        <dia:rectangle val="33.6,27.25;41.3,30.55"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="16.5,27.3"/>
+        <dia:point val="33.65,27.3"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -2191,13 +2256,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.2,21"/>
+        <dia:point val="14.85,22.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.15,20.95;22.9,26.25"/>
+        <dia:rectangle val="14.8,22.35;23.55,27.65"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="14.2,21"/>
+        <dia:point val="14.85,22.4"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -2385,19 +2450,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="35.6,15.65"/>
+        <dia:point val="26.95,13"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="35.55,15.6;44.3,20.1"/>
+        <dia:rectangle val="26.9,12.95;46.85,18.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="35.6,15.65"/>
+        <dia:point val="26.95,13"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="8.6500000000000004"/>
+        <dia:real val="19.850000000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4.4000000000000004"/>
+        <dia:real val="5"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionManual#</dia:string>
@@ -2526,29 +2591,95 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#dniAuditor#</dia:string>
+            <dia:string>#nroLegajo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
+            <dia:string>#Se graba el nro de legajo de quien estaba logeado al momento de autorizar/rechazar#</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 name="name">
+            <dia:string>#AutorizacionManual#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </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="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
           <dia:attribute name="class_scope">
             <dia:boolean val="false"/>
           </dia:attribute>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <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>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#fechaSolicitud#</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>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="0"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
         </dia:composite>
       </dia:attribute>
-      <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
@@ -2556,19 +2687,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="23.2,15.65"/>
+        <dia:point val="20.4,18.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="23.15,15.6;33.6,17.5"/>
+        <dia:rectangle val="20.35,18.6;42.75,21.5"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="23.2,15.65"/>
+        <dia:point val="20.4,18.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="10.35"/>
+        <dia:real val="22.300000000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="1.7999999999999998"/>
+        <dia:real val="2.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionAutomatica#</dia:string>
@@ -2592,7 +2723,7 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_comments">
         <dia:boolean val="false"/>
@@ -2649,7 +2780,73 @@
         <dia:real val="1"/>
       </dia:attribute>
       <dia:attribute name="attributes"/>
-      <dia:attribute name="operations"/>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#AutorizacionAutomatica#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </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="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <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>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#fechaSolicitud#</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>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
@@ -2657,13 +2854,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="32.9,21.1"/>
+        <dia:point val="33.65,21.9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.85,21.05;46.15,25.95"/>
+        <dia:rectangle val="33.6,21.85;46.9,26.75"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="32.9,21.1"/>
+        <dia:point val="33.65,21.9"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="13.199999999999999"/>
@@ -3022,13 +3219,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="24.2,23.2"/>
+        <dia:point val="24.85,27.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.15,23.15;31.85,26.45"/>
+        <dia:rectangle val="24.8,27.25;32.5,30.55"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="24.2,23.2"/>
+        <dia:point val="24.85,27.3"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -3170,13 +3367,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="11,11.05"/>
+        <dia:point val="10.55,11.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.95,11;22.15,18.3"/>
+        <dia:rectangle val="10.5,11.05;21.7,18.35"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="11,11.05"/>
+        <dia:point val="10.55,11.1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.1"/>
@@ -3433,16 +3630,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="31.525,10.45"/>
+        <dia:point val="32.525,10.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.675,10.4;39.975,15.7"/>
+        <dia:rectangle val="31.675,10.1;36.925,13.211"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="31.525,10.45"/>
-        <dia:point val="31.525,13.05"/>
-        <dia:point val="39.925,13.05"/>
-        <dia:point val="39.925,15.65"/>
+        <dia:point val="32.525,10.15"/>
+        <dia:point val="32.525,12.411"/>
+        <dia:point val="36.875,12.411"/>
+        <dia:point val="36.875,13"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3450,7 +3647,7 @@
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_autoroute">
-        <dia:boolean val="true"/>
+        <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -3468,16 +3665,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="31.525,10.45"/>
+        <dia:point val="32.525,10.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.325,10.4;32.375,15.7"/>
+        <dia:rectangle val="24.9525,10.1;33.375,18.711"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="31.525,10.45"/>
-        <dia:point val="31.525,13.05"/>
-        <dia:point val="28.375,13.05"/>
-        <dia:point val="28.375,15.65"/>
+        <dia:point val="32.525,10.15"/>
+        <dia:point val="32.525,12.411"/>
+        <dia:point val="25.0025,12.411"/>
+        <dia:point val="25.0025,18.661"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3485,7 +3682,7 @@
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_autoroute">
-        <dia:boolean val="true"/>
+        <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -3498,7 +3695,6 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O7" connection="6"/>
-        <dia:connection handle="1" to="O11" connection="1"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O18">
@@ -3541,13 +3737,13 @@
         <dia:point val="3.6,18.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.75,18.25;18.575,21.05"/>
+        <dia:rectangle val="2.75,18.25;19.225,22.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="3.6,18.3"/>
         <dia:point val="3.6,19.6506"/>
-        <dia:point val="18.525,19.6506"/>
-        <dia:point val="18.525,21"/>
+        <dia:point val="19.175,19.6506"/>
+        <dia:point val="19.175,22.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3608,19 +3804,19 @@
     </dia:object>
     <dia:object type="UML - Note" version="0" id="O21">
       <dia:attribute name="obj_pos">
-        <dia:point val="-3.5,-1.44999"/>
+        <dia:point val="-8.7,-3.54999"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.55,-1.49999;23,0.30001"/>
+        <dia:rectangle val="-8.75,-3.59999;13.6,-0.19999"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-3.5,-1.44999"/>
+        <dia:point val="-8.7,-3.54999"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="26.450000000000003"/>
+        <dia:real val="22.250000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="1.7000000000000002"/>
+        <dia:real val="3.3000000000000003"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -3631,7 +3827,9 @@
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#Todas las clases tienen geters y seters, no se muestran por simplcididad.#</dia:string>
+            <dia:string>#
+Se accede a los atributos de clase a traves de propertys, con
+mismo nombre que el atributo, salvo 1er letra en mayuscula.#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="monospace" style="0" name="Courier"/>
@@ -3640,7 +3838,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="-3.15,-0.24999"/>
+            <dia:point val="-8.35,-2.34999"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>