X-Git-Url: https://git.llucax.com/z.facultad/75.43/tp1.git/blobdiff_plain/e2fecf7f807a9bedde70743f9271ecdb0fe0dcc9..7b3fa52abead49b2e38ec5f003d51370c6f6a4dc:/docs/clases.dia?ds=sidebyside

diff --git a/docs/clases.dia b/docs/clases.dia
index 2625d2e..f44423a 100644
--- a/docs/clases.dia
+++ b/docs/clases.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="true"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.67113828659057617"/>
+          <dia:real val="0.68082475662231445"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -71,19 +71,19 @@
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - Class" version="0" id="O0">
       <dia:attribute name="obj_pos">
-        <dia:point val="18,16"/>
+        <dia:point val="8.15,15.9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.95,15.95;23.55,18.85"/>
+        <dia:rectangle val="8.1,15.85;16.85,19.55"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="18,16"/>
+        <dia:point val="8.15,15.9"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="5.5"/>
+        <dia:real val="8.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="2.7999999999999998"/>
+        <dia:real val="3.6000000000000001"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Socio#</dia:string>
@@ -187,6 +187,29 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#faltanteParaBonus#</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>#Cantidad de preguntas con 2 o más puntos para obtener el bonus de 5 créditos#</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">
@@ -199,16 +222,16 @@
         <dia:point val="12,5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.95,4.95;18.6,10.25"/>
+        <dia:rectangle val="11.95,4.95;20.55,11.65"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="12,5"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="6.5499999999999998"/>
+        <dia:real val="8.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="5.2000000000000011"/>
+        <dia:real val="6.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Usuario#</dia:string>
@@ -220,7 +243,7 @@
         <dia:string>#Usuario del sistema#</dia:string>
       </dia:attribute>
       <dia:attribute name="abstract">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="suppress_attributes">
         <dia:boolean val="false"/>
@@ -381,8 +404,62 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#ultimoLogin#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#timestamp#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Fecha de último login#</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>#toHTML#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Devuelve el ítem en formato HTML#</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>
       </dia:attribute>
-      <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
@@ -390,16 +467,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="15.275,10.2"/>
+        <dia:point val="16.25,11.6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.425,10.15;20.8,16.05"/>
+        <dia:rectangle val="12.425,11.55;17.1,15.95"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="15.275,10.2"/>
-        <dia:point val="15.275,13.1"/>
-        <dia:point val="20.75,13.1"/>
-        <dia:point val="20.75,16"/>
+        <dia:point val="16.25,11.6"/>
+        <dia:point val="16.25,13.75"/>
+        <dia:point val="12.475,13.75"/>
+        <dia:point val="12.475,15.9"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -425,13 +502,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O3">
       <dia:attribute name="obj_pos">
-        <dia:point val="8,16"/>
+        <dia:point val="19.1,15.9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.95,15.95;11.45,18.25"/>
+        <dia:rectangle val="19.05,15.85;22.55,18.15"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="8,16"/>
+        <dia:point val="19.1,15.9"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="3.3999999999999999"/>
@@ -526,16 +603,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O4">
       <dia:attribute name="obj_pos">
-        <dia:point val="15.275,10.2"/>
+        <dia:point val="16.25,11.6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.65,10.15;16.125,16.05"/>
+        <dia:rectangle val="15.4,11.55;20.85,15.95"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="15.275,10.2"/>
-        <dia:point val="15.275,13.1"/>
-        <dia:point val="9.7,13.1"/>
-        <dia:point val="9.7,16"/>
+        <dia:point val="16.25,11.6"/>
+        <dia:point val="16.25,13.75"/>
+        <dia:point val="20.8,13.75"/>
+        <dia:point val="20.8,15.9"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -561,13 +638,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="21,32"/>
+        <dia:point val="19.6,32.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.95,31.95;32.4,36.45"/>
+        <dia:rectangle val="19.55,32.9;31,37.4"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="21,32"/>
+        <dia:point val="19.6,32.95"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.35"/>
@@ -732,13 +809,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="8,32"/>
+        <dia:point val="8.8,32.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.95,31.95;13.4,34.25"/>
+        <dia:rectangle val="8.75,32.9;14.2,35.2"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="8,32"/>
+        <dia:point val="8.8,32.95"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.3499999999999996"/>
@@ -833,13 +910,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="17,23"/>
+        <dia:point val="16.5,22.9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.95,22.95;27.8,26.65"/>
+        <dia:rectangle val="16.45,22.85;27.3,26.55"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="17,23"/>
+        <dia:point val="16.5,22.9"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="10.75"/>
@@ -981,16 +1058,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="28.225,19.4"/>
+        <dia:point val="27.825,16.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="22.325,19.35;29.075,23.05"/>
+        <dia:rectangle val="21.825,16.45;28.675,22.95"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="28.225,19.4"/>
-        <dia:point val="28.225,21"/>
-        <dia:point val="22.375,21"/>
-        <dia:point val="22.375,23"/>
+        <dia:point val="27.825,16.5"/>
+        <dia:point val="27.825,21"/>
+        <dia:point val="21.875,21"/>
+        <dia:point val="21.875,22.9"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -1141,14 +1218,14 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="28.225,19.4"/>
+        <dia:point val="27.825,16.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.7,19.35;29.075,23.05"/>
+        <dia:rectangle val="10.7,16.45;28.675,23.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="28.225,19.4"/>
-        <dia:point val="28.225,21"/>
+        <dia:point val="27.825,16.5"/>
+        <dia:point val="27.825,21"/>
         <dia:point val="10.75,21"/>
         <dia:point val="10.75,23"/>
       </dia:attribute>
@@ -1179,13 +1256,13 @@
         <dia:point val="13.5,23.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.45,23.65;17.75,27.3"/>
+        <dia:rectangle val="13.45,23.65;17.25,27.2"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="13.5,23.7"/>
-        <dia:point val="15.25,23.7"/>
-        <dia:point val="15.25,25.7"/>
-        <dia:point val="17,25.7"/>
+        <dia:point val="15,23.7"/>
+        <dia:point val="15,25.6"/>
+        <dia:point val="16.5,25.6"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -1235,16 +1312,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="31.45,16.9"/>
+        <dia:point val="31.1,13.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="18.5,5.65;32.55,18.5"/>
+        <dia:rectangle val="20.45,5.65;32.2,15"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="31.45,16.9"/>
-        <dia:point val="32.45,16.9"/>
-        <dia:point val="32.45,5.7"/>
-        <dia:point val="18.55,5.7"/>
+        <dia:point val="31.1,13.4"/>
+        <dia:point val="32.1,13.4"/>
+        <dia:point val="32.1,5.7"/>
+        <dia:point val="20.5,5.7"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -1294,19 +1371,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="25,15"/>
+        <dia:point val="24.55,11.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="24.95,14.95;31.5,19.45"/>
+        <dia:rectangle val="24.5,11.45;31.15,16.55"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="25,15"/>
+        <dia:point val="24.55,11.5"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="6.4499999999999993"/>
+        <dia:real val="6.5499999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4.4000000000000004"/>
+        <dia:real val="5"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Item#</dia:string>
@@ -1457,7 +1534,38 @@
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
-      <dia:attribute name="operations"/>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#toHTML#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Devuelve el ítem en formato HTML#</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>
+      </dia:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
@@ -1465,16 +1573,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.35,32.7"/>
+        <dia:point val="14.15,33.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.3,32.65;21.75,37.1"/>
+        <dia:rectangle val="14.1,33.6;20.35,38.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="13.35,32.7"/>
-        <dia:point val="17.175,32.7"/>
-        <dia:point val="17.175,35.5"/>
-        <dia:point val="21,35.5"/>
+        <dia:point val="14.15,33.65"/>
+        <dia:point val="16.875,33.65"/>
+        <dia:point val="16.875,36.45"/>
+        <dia:point val="19.6,36.45"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -1524,16 +1632,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="28.225,19.4"/>
+        <dia:point val="27.825,16.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.625,19.35;29.075,32.05"/>
+        <dia:rectangle val="25.225,16.45;28.675,33"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="28.225,19.4"/>
-        <dia:point val="28.225,29"/>
-        <dia:point val="26.675,29"/>
-        <dia:point val="26.675,32"/>
+        <dia:point val="27.825,16.5"/>
+        <dia:point val="27.825,29"/>
+        <dia:point val="25.275,29"/>
+        <dia:point val="25.275,32.95"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -1559,16 +1667,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="28.225,19.4"/>
+        <dia:point val="27.825,16.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.625,19.35;29.075,32.05"/>
+        <dia:rectangle val="11.425,16.45;28.675,33"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="28.225,19.4"/>
-        <dia:point val="28.225,29"/>
-        <dia:point val="10.675,29"/>
-        <dia:point val="10.675,32"/>
+        <dia:point val="27.825,16.5"/>
+        <dia:point val="27.825,29"/>
+        <dia:point val="11.475,29"/>
+        <dia:point val="11.475,32.95"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>