arreglo copete....1 mas

[mecon/intranet.git] / doc / servicios / bandas / bandas.xmi

diff --git a/doc/servicios/bandas/bandas.xmi b/doc/servicios/bandas/bandas.xmi
index 99ab9212355830bace94090c50df58b630ddec35..5cb76a159898ac12f68a84c343a3fce1113b0bda 100644 (file)
--- a/doc/servicios/bandas/bandas.xmi
+++ b/doc/servicios/bandas/bandas.xmi
@@ -10,7 +10,7 @@
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>

-  <docsettings viewid="181" documentation="" uniqueid="219" />
+  <docsettings viewid="181" documentation="" uniqueid="227" />

   <umlobjects>
    <UML:Class stereotype="" package="" xmi.id="182" abstract="0" documentation="x2c:extern
 x2c:include:MECON/Agente.php" name="MECON_Agente" static="0" scope="200" >
   <umlobjects>
    <UML:Class stereotype="" package="" xmi.id="182" abstract="0" documentation="x2c:extern
 x2c:include:MECON/Agente.php" name="MECON_Agente" static="0" scope="200" >


@@ -26,27 +26,23 @@ En el caso de los contratados devuelve el string &quot;CON &quot; concatenado co
     <UML:Attribute stereotype="" package="" xmi.id="184" value="" type="int" abstract="0" documentation="Número de documento del agente" name="agente" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="185" value="" type="int" abstract="0" documentation="Array que contiene todos los otros datos del agente" name="datos" static="0" scope="201" />
    </UML:Class>
     <UML:Attribute stereotype="" package="" xmi.id="184" value="" type="int" abstract="0" documentation="Número de documento del agente" name="agente" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="185" value="" type="int" abstract="0" documentation="Array que contiene todos los otros datos del agente" name="datos" static="0" scope="201" />
    </UML:Class>

-   <UML:Class stereotype="" package="" xmi.id="183" abstract="0" documentation="" name="Intranet_Servicios_Bandas_Agente" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="213" type="void" abstract="0" documentation="Constructor de la clase" name="Intranet_Servicios_Bandas_Agente" static="0" scope="200" >
+   <UML:Class stereotype="" package="" xmi.id="183" abstract="0" documentation="" name="Servicios_Bandas_Agente" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="213" type="void" abstract="0" documentation="Constructor de la clase" name="Servicios_Bandas_Agente" static="0" scope="200" >

      <UML:Parameter stereotype="" package="" xmi.id="1" value="null" type="int" abstract="0" documentation="Número de documento del agente a instanciar" name="agente" static="0" scope="201" />
      <UML:Parameter stereotype="" package="" xmi.id="2" value="null" type="date" abstract="0" documentation="Fecha utilizada para determinar el mes a mostrar" name="fecha" static="0" scope="201" />
     </UML:Operation>
      <UML:Parameter stereotype="" package="" xmi.id="1" value="null" type="int" abstract="0" documentation="Número de documento del agente a instanciar" name="agente" static="0" scope="201" />
      <UML:Parameter stereotype="" package="" xmi.id="2" value="null" type="date" abstract="0" documentation="Fecha utilizada para determinar el mes a mostrar" name="fecha" static="0" scope="201" />
     </UML:Operation>

-    <UML:Operation stereotype="" package="" xmi.id="194" type="void" abstract="0" documentation="" name="getCredencial" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="null" type="date" abstract="0" documentation="" name="fecha" static="0" scope="200" />
-    </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="197" type="void" abstract="0" documentation="" name="getPromedioMensual" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="198" type="void" abstract="0" documentation="" name="getHoras" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="null" type="date" abstract="0" documentation="La fecha que se desea consultar" name="dia" static="0" scope="200" />
-    </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="205" type="void" abstract="0" documentation="Método que devuelve todos los accesos de una persona en un rango de fechas" name="getAccesos" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="date" abstract="0" documentation="" name="fecha_desde" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="3" value="" type="date" abstract="0" documentation="" name="fecha_hasta" static="0" scope="200" />
-    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="197" type="void" abstract="0" documentation="Devuelve el promedio de horas del agente en el mes pedido" name="getPromedioMensual" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="198" type="void" abstract="0" documentation="Devuelve un array con las horas de cada día" name="getHoras" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="205" type="void" abstract="0" documentation="Método que devuelve todos los accesos de una persona en un rango de fechas" name="getAccesos" static="0" scope="200" />

     <UML:Operation stereotype="" package="" xmi.id="207" type="void" abstract="0" documentation="Devuelve la cantidad de días laborales trabajados por el agente en el mes considerado" name="getDiasLaborablesTrabajados" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="208" type="void" abstract="0" documentation="Devuelve la cantidad de días trabajados por el agente en el mes considerado" name="getDiasTrabajados" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="212" type="int" abstract="0" documentation="Devuelve la cantidad de ausentes sin aviso del agente en el mes considerado" name="getNASA" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="214" value="null" type="int" abstract="0" documentation="Todos los accesos del agente en el mes pedido" name="accesos" static="0" scope="201" />
     <UML:Operation stereotype="" package="" xmi.id="207" type="void" abstract="0" documentation="Devuelve la cantidad de días laborales trabajados por el agente en el mes considerado" name="getDiasLaborablesTrabajados" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="208" type="void" abstract="0" documentation="Devuelve la cantidad de días trabajados por el agente en el mes considerado" name="getDiasTrabajados" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="212" type="int" abstract="0" documentation="Devuelve la cantidad de ausentes sin aviso del agente en el mes considerado" name="getNASA" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="214" value="null" type="int" abstract="0" documentation="Todos los accesos del agente en el mes pedido" name="accesos" static="0" scope="201" />

-    <UML:Attribute stereotype="" package="" xmi.id="215" value="" type="int" abstract="0" documentation="" name="credencial" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="221" value="" type="int" abstract="0" documentation="Número de ausentes sin aviso en el mes pedido" name="NASA" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="222" value="" type="int" abstract="0" documentation="Promedio horario del agente en el mes pedido" name="promedio" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="223" value="" type="int" abstract="0" documentation="Array con las horas por día trabajadas por el agente" name="horas" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="226" value="0" type="int" abstract="0" documentation="Cantidad de días trabajados por el agente en el mes pedido" name="diasTrabajados" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="227" value="0" type="int" abstract="0" documentation="Cantidad de días laborables trabajados por el agente en el mes pedido" name="diasLaborablesTrabajados" static="0" scope="201" />

    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="199" abstract="0" documentation="x2c:extern
 x2c:include:MECON/Dependencia.php" name="MECON_Dependencia" static="0" scope="200" >
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="199" abstract="0" documentation="x2c:extern
 x2c:include:MECON/Dependencia.php" name="MECON_Dependencia" static="0" scope="200" >


@@ -57,7 +53,7 @@ x2c:include:MECON/Dependencia.php" name="MECON_Dependencia" static="0" scope="20
     <UML:Attribute stereotype="" package="" xmi.id="218" value="null" type="int" abstract="0" documentation="El código de la dependencia" name="codep" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="219" value="null" type="int" abstract="0" documentation="" name="nombre" static="0" scope="201" />
    </UML:Class>
     <UML:Attribute stereotype="" package="" xmi.id="218" value="null" type="int" abstract="0" documentation="El código de la dependencia" name="codep" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="219" value="null" type="int" abstract="0" documentation="" name="nombre" static="0" scope="201" />
    </UML:Class>

-   <UML:Class stereotype="" package="" xmi.id="200" abstract="0" documentation="Clase que representa una dependencia con bandas horarias" name="Intranet_Servicios_Bandas_Dependencia" static="0" scope="200" >
+   <UML:Class stereotype="" package="" xmi.id="200" abstract="0" documentation="Clase que representa una dependencia con bandas horarias" name="Servicios_Bandas_Dependencia" static="0" scope="200" >

     <UML:Operation stereotype="" package="" xmi.id="202" type="void" abstract="0" documentation="Devuelve todos los agentes de la dependencia" name="getAgentes" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="codep" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="3" value="" type="Tipo_Agente" abstract="0" documentation="" name="Tipo_agente" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="202" type="void" abstract="0" documentation="Devuelve todos los agentes de la dependencia" name="getAgentes" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="codep" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="3" value="" type="Tipo_Agente" abstract="0" documentation="" name="Tipo_agente" static="0" scope="200" />


@@ -68,6 +64,9 @@ x2c:include:MECON/Dependencia.php" name="MECON_Dependencia" static="0" scope="20
     <UML:Operation stereotype="" package="" xmi.id="209" type="void" abstract="0" documentation="Devuelve la cantidad de ausentes sin aviso de la dependencia en un mes." name="getNASA" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="todos" type="Tipo_Agente" abstract="0" documentation="" name="Tipo_agente" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="209" type="void" abstract="0" documentation="Devuelve la cantidad de ausentes sin aviso de la dependencia en un mes." name="getNASA" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="todos" type="Tipo_Agente" abstract="0" documentation="" name="Tipo_agente" static="0" scope="200" />
     </UML:Operation>

+    <UML:Operation stereotype="" package="" xmi.id="220" type="void" abstract="0" documentation="" name="Servicios_Bandas_Dependencia" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="null" type="date" abstract="0" documentation="La fecha para determinar el mes a mostrar" name="fecha" static="0" scope="201" />
+    </UML:Operation>

    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="206" abstract="0" documentation="x2c:extern
 x2c:include:MECON/NovedadesDia.php" name="MECON_NovedadesDia" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="206" abstract="0" documentation="x2c:extern
 x2c:include:MECON/NovedadesDia.php" name="MECON_NovedadesDia" static="0" scope="200" />


@@ -75,32 +74,66 @@ x2c:include:MECON/NovedadesDia.php" name="MECON_NovedadesDia" static="0" scope="
    <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="183" roleb="182" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
   </umlobjects>
   <diagrams>
    <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="183" roleb="182" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
   </umlobjects>
   <diagrams>

+<<<<<<< .mine
+   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="504" snapy="10" showatts="1" xmi.id="181" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="helvetica,-1,12,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="453" >
+=======

    <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="812" snapy="10" showatts="1" xmi.id="181" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="helvetica,-1,12,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="626" >
    <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="812" snapy="10" showatts="1" xmi.id="181" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="helvetica,-1,12,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="626" >

+>>>>>>> .r63

     <widgets>
     <widgets>

+<<<<<<< .mine
+     <UML:ClassWidget usesdiagramfillcolour="0" width="141" showattsigs="601" usesdiagramusefillcolour="0" x="52" linecolour="#ff0000" y="34" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="126" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="182" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="205" showattsigs="601" usesdiagramusefillcolour="0" x="295" linecolour="#ff0000" y="18" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="70" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="199" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="287" showattsigs="601" usesdiagramusefillcolour="0" x="209" linecolour="#ff0000" y="122" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="77" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="200" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="341" showattsigs="601" usesdiagramusefillcolour="0" x="12" linecolour="#ff0000" y="211" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="196" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="183" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="1" width="82" showattsigs="601" usesdiagramusefillcolour="1" x="203" linecolour="none" y="52" showopsigs="601" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="28" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="206" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
+=======

      <UML:ClassWidget usesdiagramfillcolour="0" width="187" showattsigs="601" usesdiagramusefillcolour="0" x="44" linecolour="#ff0000" y="64" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="126" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="182" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="0" width="205" showattsigs="601" usesdiagramusefillcolour="0" x="400" linecolour="#ff0000" y="34" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="70" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="199" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="0" width="287" showattsigs="601" usesdiagramusefillcolour="0" x="359" linecolour="#ff0000" y="174" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="63" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="200" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="0" width="384" showattsigs="601" usesdiagramusefillcolour="0" x="60" linecolour="#ff0000" y="274" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="154" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="183" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="1" width="128" showattsigs="601" usesdiagramusefillcolour="1" x="231" linecolour="none" y="19" showopsigs="601" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="28" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="206" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="0" width="187" showattsigs="601" usesdiagramusefillcolour="0" x="44" linecolour="#ff0000" y="64" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="126" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="182" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="0" width="205" showattsigs="601" usesdiagramusefillcolour="0" x="400" linecolour="#ff0000" y="34" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="70" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="199" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="0" width="287" showattsigs="601" usesdiagramusefillcolour="0" x="359" linecolour="#ff0000" y="174" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="63" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="200" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="0" width="384" showattsigs="601" usesdiagramusefillcolour="0" x="60" linecolour="#ff0000" y="274" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="154" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="183" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="1" width="128" showattsigs="601" usesdiagramusefillcolour="1" x="231" linecolour="none" y="19" showopsigs="601" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="28" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="206" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />

+>>>>>>> .r63

     </widgets>
     <messages/>
     <associations>
      <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="199" roleBdoc="" widgetaid="200" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
     </widgets>
     <messages/>
     <associations>
      <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="199" roleBdoc="" widgetaid="200" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >

+<<<<<<< .mine
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="2" linecolour="none" y="12" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="-32" linecolour="none" y="2" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="4" linecolour="none" y="25" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+=======

       <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="55" linecolour="none" y="20" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
       <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="106" linecolour="none" y="54" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
       <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="109" linecolour="none" y="41" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
       <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="55" linecolour="none" y="20" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
       <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="106" linecolour="none" y="54" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
       <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="109" linecolour="none" y="41" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />

+>>>>>>> .r63

       <linepath>
       <linepath>

+<<<<<<< .mine
+       <startpoint startx="352" starty="122" />
+       <endpoint endx="397" endy="88" />
+=======

        <startpoint startx="502" starty="174" />
        <endpoint endx="502" endy="104" />
        <startpoint startx="502" starty="174" />
        <endpoint endx="502" endy="104" />

+>>>>>>> .r63

       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="182" roleBdoc="" widgetaid="183" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="182" roleBdoc="" widgetaid="183" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >

+<<<<<<< .mine
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="-15" linecolour="none" y="11" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="35" linecolour="none" y="5" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="40" linecolour="none" y="86" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+=======

       <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="-8" linecolour="none" y="26" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
       <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="105" linecolour="none" y="68" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
       <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="55" linecolour="none" y="116" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
       <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="-8" linecolour="none" y="26" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
       <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="105" linecolour="none" y="68" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
       <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="55" linecolour="none" y="116" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />

+>>>>>>> .r63

       <linepath>
       <linepath>

+<<<<<<< .mine
+       <startpoint startx="182" starty="211" />
+       <endpoint endx="122" endy="160" />
+=======

        <startpoint startx="252" starty="274" />
        <endpoint endx="137" endy="190" />
        <startpoint startx="252" starty="274" />
        <endpoint endx="137" endy="190" />

+>>>>>>> .r63

       </linepath>
      </UML:AssocWidget>
     </associations>
       </linepath>
      </UML:AssocWidget>
     </associations>


@@ -110,23 +143,54 @@ x2c:include:MECON/NovedadesDia.php" name="MECON_NovedadesDia" static="0" scope="
    <listitem open="1" type="800" id="-1" label="Views" >
     <listitem open="1" type="801" id="-1" label="Logical View" >
      <listitem open="0" type="807" id="181" label="class diagram" />
    <listitem open="1" type="800" id="-1" label="Views" >
     <listitem open="1" type="801" id="-1" label="Logical View" >
      <listitem open="0" type="807" id="181" label="class diagram" />

+<<<<<<< .mine
+     <listitem open="1" type="813" id="182" label="Agente" >
+      <listitem open="0" type="814" id="184" label="agente" />
+      <listitem open="0" type="814" id="185" label="datos" />
+      <listitem open="0" type="815" id="189" label="Agente" />
+      <listitem open="0" type="815" id="186" label="getDependencia" />
+      <listitem open="0" type="815" id="192" label="getHoraDesde" />
+      <listitem open="0" type="815" id="193" label="getHoraHasta" />
+      <listitem open="0" type="815" id="190" label="getNombre" />
+      <listitem open="0" type="815" id="188" label="getTipo" />
+     </listitem>
+     <listitem open="1" type="813" id="199" label="Dependencia" >
+      <listitem open="0" type="814" id="218" label="codep" />
+      <listitem open="0" type="814" id="219" label="nombre" />
+      <listitem open="0" type="815" id="216" label="Dependencia" />
+      <listitem open="0" type="815" id="217" label="getNombre" />
+     </listitem>
+     <listitem open="1" type="813" id="206" label="NovedadesDia" />
+     <listitem open="1" type="813" id="183" label="Servicios_Bandas_Agente" >
+      <listitem open="0" type="814" id="221" label="NASA" />
+=======

      <listitem open="0" type="813" id="183" label="Intranet_Servicios_Bandas_Agente" >
      <listitem open="0" type="813" id="183" label="Intranet_Servicios_Bandas_Agente" >

+>>>>>>> .r63

       <listitem open="0" type="814" id="214" label="accesos" />
       <listitem open="0" type="814" id="214" label="accesos" />

-      <listitem open="0" type="814" id="215" label="credencial" />
-      <listitem open="0" type="815" id="213" label="Intranet_Servicios_Bandas_Agente" />
+      <listitem open="0" type="814" id="227" label="diasLaborablesTrabajados" />
+      <listitem open="0" type="814" id="226" label="diasTrabajados" />
+      <listitem open="0" type="814" id="223" label="horas" />
+      <listitem open="0" type="814" id="222" label="promedio" />
+      <listitem open="0" type="815" id="213" label="Servicios_Bandas_Agente" />

       <listitem open="0" type="815" id="205" label="getAccesos" />
       <listitem open="0" type="815" id="205" label="getAccesos" />

-      <listitem open="0" type="815" id="194" label="getCredencial" />

       <listitem open="0" type="815" id="207" label="getDiasLaborablesTrabajados" />
       <listitem open="0" type="815" id="208" label="getDiasTrabajados" />
       <listitem open="0" type="815" id="198" label="getHoras" />
       <listitem open="0" type="815" id="212" label="getNASA" />
       <listitem open="0" type="815" id="197" label="getPromedioMensual" />
      </listitem>
       <listitem open="0" type="815" id="207" label="getDiasLaborablesTrabajados" />
       <listitem open="0" type="815" id="208" label="getDiasTrabajados" />
       <listitem open="0" type="815" id="198" label="getHoras" />
       <listitem open="0" type="815" id="212" label="getNASA" />
       <listitem open="0" type="815" id="197" label="getPromedioMensual" />
      </listitem>

+<<<<<<< .mine
+     <listitem open="1" type="813" id="200" label="Servicios_Bandas_Dependencia" >
+      <listitem open="0" type="815" id="220" label="Servicios_Bandas_Dependencia" />
+=======

      <listitem open="0" type="813" id="200" label="Intranet_Servicios_Bandas_Dependencia" >
      <listitem open="0" type="813" id="200" label="Intranet_Servicios_Bandas_Dependencia" >

+>>>>>>> .r63

       <listitem open="0" type="815" id="202" label="getAgentes" />
       <listitem open="0" type="815" id="209" label="getNASA" />
       <listitem open="0" type="815" id="203" label="getPromedio" />
      </listitem>
       <listitem open="0" type="815" id="202" label="getAgentes" />
       <listitem open="0" type="815" id="209" label="getNASA" />
       <listitem open="0" type="815" id="203" label="getPromedio" />
      </listitem>

+<<<<<<< .mine
+=======

      <listitem open="0" type="813" id="182" label="MECON_Agente" >
       <listitem open="0" type="814" id="184" label="agente" />
       <listitem open="0" type="814" id="185" label="datos" />
      <listitem open="0" type="813" id="182" label="MECON_Agente" >
       <listitem open="0" type="814" id="184" label="agente" />
       <listitem open="0" type="814" id="185" label="datos" />


@@ -144,6 +208,7 @@ x2c:include:MECON/NovedadesDia.php" name="MECON_NovedadesDia" static="0" scope="
       <listitem open="0" type="815" id="217" label="getNombre" />
      </listitem>
      <listitem open="1" type="813" id="206" label="MECON_NovedadesDia" />
       <listitem open="0" type="815" id="217" label="getNombre" />
      </listitem>
      <listitem open="1" type="813" id="206" label="MECON_NovedadesDia" />

+>>>>>>> .r63

     </listitem>
     <listitem open="1" type="802" id="-1" label="Use Case View" />
     <listitem open="1" type="821" id="-1" label="Component View" />
     </listitem>
     <listitem open="1" type="802" id="-1" label="Use Case View" />
     <listitem open="1" type="821" id="-1" label="Component View" />