Se actualiza a los nuevos nombres normalizados.

diff --git a/doc/servicios/bandas/bandas.xmi b/doc/servicios/bandas/bandas.xmi
index 61b4fa8f4042b509e7e006918057a4c9736483bb..99ab9212355830bace94090c50df58b630ddec35 100644 (file)
--- a/doc/servicios/bandas/bandas.xmi
+++ b/doc/servicios/bandas/bandas.xmi
@@ -6,18 +6,18 @@
    <XMI.exporterVersion>1.1.5</XMI.exporterVersion>
    <XMI.exporterEncoding>UnicodeUTF8</XMI.exporterEncoding>
   </XMI.documentation>
-  <XMI.model xmi.name="bandas" href="/home/matias/sistemas/php/intranet/doc/servicios/bandas/bandas.xmi" />
+  <XMI.model xmi.name="bandas" href="/home/martin/public_html/intranet/doc/servicios/bandas/bandas.xmi" />
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
   <docsettings viewid="181" documentation="" uniqueid="219" />
   <umlobjects>
    <UML:Class stereotype="" package="" xmi.id="182" abstract="0" documentation="x2c:extern
-x2c:include:MECON/Agente.php" name="Agente" static="0" scope="200" >
+x2c:include:MECON/Agente.php" name="MECON_Agente" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="186" type="void" abstract="0" documentation="Método que devuelve el código de la dependencia en la que trabaja el agente" name="getDependencia" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="188" type="void" abstract="0" documentation="Método que devuelve el tipo de agente. Este puede ser de planta permanente (PER), de planta transitoria (TRA), en gabinete (GAB), pasante (BEC), etc.
 En el caso de los contratados devuelve el string &quot;CON &quot; concatenado con el marco legal de contratación" name="getTipo" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="189" type="void" abstract="0" documentation="Constructor" name="Agente" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="189" type="void" abstract="0" documentation="Constructor" name="MECON_Agente" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="agente" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="190" type="void" abstract="0" documentation="Método que devuelve el nombre y apellido del agente" name="getNombre" static="0" scope="200" />
@@ -49,8 +49,8 @@ En el caso de los contratados devuelve el string &quot;CON &quot; concatenado co
     <UML:Attribute stereotype="" package="" xmi.id="215" value="" type="int" abstract="0" documentation="" name="credencial" static="0" scope="201" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="199" abstract="0" documentation="x2c:extern
-x2c:include:MECON/Dependencia.php" name="Dependencia" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="216" type="void" abstract="0" documentation="Constructor" name="Dependencia" static="0" scope="200" >
+x2c:include:MECON/Dependencia.php" name="MECON_Dependencia" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="216" type="void" abstract="0" documentation="Constructor" name="MECON_Dependencia" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="null" type="string" abstract="0" documentation="El código de la dependencia a instanciar" name="codep" static="0" scope="201" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="217" type="void" abstract="0" documentation="Devuelve el nombre de la dependencia" name="getNombre" static="0" scope="200" />
@@ -70,37 +70,37 @@ x2c:include:MECON/Dependencia.php" name="Dependencia" static="0" scope="200" >
     </UML:Operation>
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="206" abstract="0" documentation="x2c:extern
-x2c:include:MECON/NovedadesDia.php" name="NovedadesDia" static="0" scope="200" />
+x2c:include:MECON/NovedadesDia.php" name="MECON_NovedadesDia" static="0" scope="200" />
    <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="200" roleb="199" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
    <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>
-   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="545" 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" >
     <widgets>
-     <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="254" linecolour="#ff0000" y="120" 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="78" linecolour="#ff0000" y="212" 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="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" />
     </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" >
-      <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="1" linecolour="none" y="0" 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" />
       <linepath>
-       <startpoint startx="397" starty="120" />
-       <endpoint endx="397" endy="88" />
+       <startpoint startx="502" starty="174" />
+       <endpoint endx="502" endy="104" />
       </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" >
-      <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="123" linecolour="none" y="6" 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" />
       <linepath>
-       <startpoint startx="270" starty="212" />
-       <endpoint endx="122" endy="160" />
+       <startpoint startx="252" starty="274" />
+       <endpoint endx="137" endy="190" />
       </linepath>
      </UML:AssocWidget>
     </associations>
@@ -110,23 +110,7 @@ x2c:include:MECON/NovedadesDia.php" name="NovedadesDia" static="0" scope="200" /
    <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="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="183" label="Intranet_Servicios_Bandas_Agente" >
+     <listitem open="0" type="813" id="183" label="Intranet_Servicios_Bandas_Agente" >
       <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" />
@@ -138,12 +122,28 @@ x2c:include:MECON/NovedadesDia.php" name="NovedadesDia" static="0" scope="200" /
       <listitem open="0" type="815" id="212" label="getNASA" />
       <listitem open="0" type="815" id="197" label="getPromedioMensual" />
      </listitem>
-     <listitem open="1" type="813" id="200" label="Intranet_Servicios_Bandas_Dependencia" >
+     <listitem open="0" type="813" id="200" label="Intranet_Servicios_Bandas_Dependencia" >
       <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="1" type="813" id="206" label="NovedadesDia" />
+     <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="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="MECON_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="MECON_Dependencia" />
+      <listitem open="0" type="815" id="217" label="getNombre" />
+     </listitem>
+     <listitem open="1" type="813" id="206" label="MECON_NovedadesDia" />
     </listitem>
     <listitem open="1" type="802" id="-1" label="Use Case View" />
     <listitem open="1" type="821" id="-1" label="Component View" />

diff --git a/doc/servicios/legajos/legajos.xmi b/doc/servicios/legajos/legajos.xmi
index 9c56533cfae75e86f9af563f85f59d00aeeef165..9d7e7c705e7e8e31583aae66e2314240bc7a02b1 100644 (file)
--- a/doc/servicios/legajos/legajos.xmi
+++ b/doc/servicios/legajos/legajos.xmi
@@ -3,16 +3,17 @@
  <XMI.header>
   <XMI.documentation>
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
-   <XMI.exporterVersion>1.1</XMI.exporterVersion>
+   <XMI.exporterVersion>1.1.5</XMI.exporterVersion>
+   <XMI.exporterEncoding>UnicodeUTF8</XMI.exporterEncoding>
   </XMI.documentation>
-  <XMI.model xmi.name="legajos" href="/home/matias/sistemas/intranet/doc/legajos/legajos.xmi" />
+  <XMI.model xmi.name="legajos" href="/home/martin/public_html/intranet/doc/servicios/legajos/legajos.xmi" />
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
   <docsettings viewid="152" documentation="Familiares a cargo del agente" uniqueid="172" />
   <umlobjects>
    <UML:Class stereotype="" package="" xmi.id="153" abstract="0" documentation="x2c:extern
-x2c:include:/home/matias/sistemas/meconlib/tronco/lib/MECON" name="Agente" static="0" scope="200" />
+x2c:include:/home/matias/sistemas/meconlib/tronco/lib/MECON" name="MECON_Agente" static="0" scope="200" />
    <UML:Class stereotype="" package="" xmi.id="154" abstract="0" documentation="" name="Servicios_Legajos_Familiares" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="169" type="void" abstract="0" documentation="" name="Intranet_Legajos_Familiares" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="agente" static="0" scope="200" />
@@ -22,7 +23,7 @@ x2c:include:/home/matias/sistemas/meconlib/tronco/lib/MECON" name="Agente" stati
     <UML:Attribute stereotype="" package="" xmi.id="167" value="" type="int" abstract="0" documentation="" name="agente" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="168" value="" type="int" abstract="0" documentation="" name="datos" static="0" scope="200" />
    </UML:Class>
-   <UML:Class stereotype="" package="" xmi.id="155" abstract="0" documentation="Antigüedad laboral del agente" name="Servicios_Legajos_ExperienciaLaboral" static="0" scope="200" >
+   <UML:Class stereotype="" package="" xmi.id="155" abstract="0" documentation="Antigüedad laboral del agente" name="Servicios_Legajos_ExperienciaLaboral" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="159" type="void" abstract="0" documentation="" name="Intranet_Legajos_ExperienciaLaboral" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="agente" static="0" scope="200" />
     </UML:Operation>
@@ -41,33 +42,45 @@ x2c:include:/home/matias/sistemas/meconlib/tronco/lib/MECON" name="Agente" stati
     <UML:Attribute stereotype="" package="" xmi.id="164" value="" type="int" abstract="0" documentation="" name="agente" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="165" value="" type="int" abstract="0" documentation="" name="datos" static="0" scope="200" />
    </UML:Class>
+   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="155" roleb="156" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
+   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="154" roleb="156" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
+   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="163" roleb="156" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
   </umlobjects>
   <diagrams>
-   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" snapy="10" showatts="1" xmi.id="152" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" font="helvetica,-1,12,0,50,0,0,0,0,0" linecolor="#ff0000" >
+   <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="152" 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" >
     <widgets>
-     <UML:ConceptWidget usesdiagramfillcolour="1" width="50" showattsigs="601" usesdiagramusefillcolour="1" x="417" linecolour="none" y="99" showopsigs="601" usesdiagramlinecolour="1" fillcolour="none" height="28" usefillcolor="1" showattributes="1" xmi.id="153" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="260" showattsigs="601" usesdiagramusefillcolour="0" x="266" linecolour="#ff0000" y="172" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="84" usefillcolor="1" showattributes="1" xmi.id="154" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="302" showattsigs="601" usesdiagramusefillcolour="0" x="81" linecolour="#ff0000" y="269" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="98" usefillcolor="1" showattributes="1" xmi.id="155" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="1" width="46" showattsigs="601" usesdiagramusefillcolour="1" x="279" linecolour="none" y="15" showopsigs="601" usesdiagramlinecolour="1" fillcolour="none" height="28" usefillcolor="1" showattributes="1" xmi.id="156" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="252" showattsigs="601" usesdiagramusefillcolour="0" x="0" linecolour="#ff0000" y="104" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="70" usefillcolor="1" showattributes="1" xmi.id="163" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="1" width="91" showattsigs="601" usesdiagramusefillcolour="1" x="445" linecolour="none" y="89" showopsigs="601" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="28" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="153" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="236" showattsigs="601" usesdiagramusefillcolour="0" x="373" linecolour="#ff0000" y="196" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="84" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="154" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="279" showattsigs="601" usesdiagramusefillcolour="0" x="115" linecolour="#ff0000" y="328" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="98" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="155" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="1" width="35" showattsigs="601" usesdiagramusefillcolour="1" x="279" linecolour="none" y="15" showopsigs="601" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="28" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="156" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="232" showattsigs="601" usesdiagramusefillcolour="0" x="39" linecolour="#ff0000" y="115" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="70" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="163" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
     </widgets>
     <messages/>
     <associations>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="156" widgetaid="155" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="3" indexb="1" widgetbid="156" roleBdoc="" widgetaid="155" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" 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="34" linecolour="none" y="59" 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="0" linecolour="none" y="0" 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" />
       <linepath>
-       <startpoint startx="232" starty="269" />
-       <endpoint endx="294" endy="43" />
+       <startpoint startx="254" starty="328" />
+       <endpoint endx="290" endy="43" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="156" widgetaid="154" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="3" indexb="2" widgetbid="156" roleBdoc="" widgetaid="154" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" 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="107" linecolour="none" y="24" 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="0" linecolour="none" y="0" 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" />
       <linepath>
-       <startpoint startx="396" starty="172" />
-       <endpoint endx="309" endy="43" />
+       <startpoint startx="491" starty="196" />
+       <endpoint endx="302" endy="43" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="156" widgetaid="163" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="156" roleBdoc="" widgetaid="163" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" 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="39" linecolour="none" y="11" 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="0" linecolour="none" y="0" 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" />
       <linepath>
-       <startpoint startx="126" starty="104" />
+       <startpoint startx="155" starty="115" />
        <endpoint endx="279" endy="29" />
       </linepath>
      </UML:AssocWidget>
@@ -77,32 +90,35 @@ x2c:include:/home/matias/sistemas/meconlib/tronco/lib/MECON" name="Agente" stati
   <listview>
    <listitem open="1" type="800" id="-1" label="Views" >
     <listitem open="1" type="801" id="-1" label="Logical View" >
-     <listitem open="1" type="813" id="153" label="Agente" />
+     <listitem open="0" type="807" id="152" label="class diagram" />
      <listitem open="1" type="813" id="156" label="DB" />
-     <listitem open="1" type="813" id="163" label="Servicios_Legajos_Estudios" >
-      <listitem open="0" type="815" id="166" label="Intranet_Legajos_Estudios" />
+     <listitem open="1" type="813" id="153" label="MECON_Agente" />
+     <listitem open="0" type="813" id="163" label="Servicios_Legajos_Estudios" >
       <listitem open="0" type="814" id="164" label="agente" />
       <listitem open="0" type="814" id="165" label="datos" />
+      <listitem open="0" type="815" id="166" label="Intranet_Legajos_Estudios" />
       <listitem open="0" type="815" id="172" label="getEstudios" />
      </listitem>
-     <listitem open="1" type="813" id="155" label="Servicios_Legajos_ExperienciaLaboral" >
-      <listitem open="0" type="815" id="159" label="Intranet_Legajos_ExperienciaLaboral" />
+     <listitem open="0" type="813" id="155" label="Servicios_Legajos_ExperienciaLaboral" >
       <listitem open="0" type="814" id="158" label="agente" />
       <listitem open="0" type="814" id="157" label="antiguedad" />
       <listitem open="0" type="814" id="162" label="experiencia" />
+      <listitem open="0" type="815" id="159" label="Intranet_Legajos_ExperienciaLaboral" />
       <listitem open="0" type="815" id="160" label="getAntiguedad" />
       <listitem open="0" type="815" id="161" label="getExperiencia" />
      </listitem>
-     <listitem open="1" type="813" id="154" label="Servicios_Legajos_Familiares" >
-      <listitem open="0" type="815" id="169" label="Intranet_Legajos_Familiares" />
+     <listitem open="0" type="813" id="154" label="Servicios_Legajos_Familiares" >
       <listitem open="0" type="814" id="167" label="agente" />
       <listitem open="0" type="814" id="168" label="datos" />
+      <listitem open="0" type="815" id="169" label="Intranet_Legajos_Familiares" />
       <listitem open="0" type="815" id="171" label="getFamiliares" />
       <listitem open="0" type="815" id="170" label="getHijos" />
      </listitem>
-     <listitem open="0" type="807" id="152" label="class diagram" />
     </listitem>
     <listitem open="1" type="802" id="-1" label="Use Case View" />
+    <listitem open="1" type="821" id="-1" label="Component View" />
+    <listitem open="0" type="823" id="-1" label="Diagrams" />
+    <listitem open="1" type="827" id="-1" label="Deployment View" />
    </listitem>
   </listview>
  </XMI.content>

diff --git a/sistema/local_lib/Servicios/Bandas/Agente.php b/sistema/local_lib/Servicios/Bandas/Agente.php
index 389436f731c7bca63a7dc74eed4dcc4e6aa726d8..16a65a507f2126c848bdee03e5597dfb8df4075d 100644 (file)
--- a/sistema/local_lib/Servicios/Bandas/Agente.php
+++ b/sistema/local_lib/Servicios/Bandas/Agente.php
@@ -37,7 +37,7 @@ require_once 'MECON/Agente.php';
 /**
  * @access public
  */
-class Servicios_Bandas_Agente extends Agente {
+class Servicios_Bandas_Agente extends MECON_Agente {
     /**
      * Todos los accesos del agente en el mes pedido
      *

diff --git a/sistema/local_lib/Servicios/Bandas/Dependencia.php b/sistema/local_lib/Servicios/Bandas/Dependencia.php
index 8c629b98e94e34c78b6dc490e3e93ab444dac962..be39ca1ec0b62652dbae71335700025be6e0404f 100644 (file)
--- a/sistema/local_lib/Servicios/Bandas/Dependencia.php
+++ b/sistema/local_lib/Servicios/Bandas/Dependencia.php
@@ -39,7 +39,7 @@ require_once 'MECON/Dependencia.php';
  *
  * @access public
  */
-class Servicios_Bandas_Dependencia extends Dependencia {
+class Servicios_Bandas_Dependencia extends MECON_Dependencia {
     // ~X2C
 
     // +X2C Operation 202

diff --git a/sistema/www/servicios/legajos/legajo.php b/sistema/www/servicios/legajos/legajo.php
index 915a72b449a2a0e6a9820b7b9ef4b8155b6c129b..93d21f7fa2d8613dabe4a9633f111396376f60a1 100755 (executable)
--- a/sistema/www/servicios/legajos/legajo.php
+++ b/sistema/www/servicios/legajos/legajo.php
@@ -37,7 +37,7 @@ $T = new HTML_Table(array (   'width'=>'750',
 
 $row_T = array();
 
-$agente = new Agente(NULL);
+$agente = new MECON_Agente(NULL);
 if(!($agente->buscarAgente($nrodoc)))
 {
        $t = new HTML_Table(array('width'=>'600'));
@@ -59,8 +59,8 @@ $familiares = new Servicios_Legajos_Familiares($nrodoc);
 
 if(!preg_match('/^CON/',$agente->getTipo()))
 {
-       $datos_hora_desde = new Hora($agente->datos['hora_desde']);
-       $datos_hora_hasta = new Hora($agente->datos['hora_hasta']);
+       $datos_hora_desde = new MECON_Tiempo_Hora($agente->datos['hora_desde']);
+       $datos_hora_hasta = new MECON_Tiempo_Hora($agente->datos['hora_hasta']);
        $datos = $agente->getOtrosDatos();
        $datos['cuil'] = $agente->getCuil();
        $datos_estudios = $estudios->getEstudios();
@@ -68,7 +68,7 @@ if(!preg_match('/^CON/',$agente->getTipo()))
        $datos_experiencia = $antiguedad->getExperiencia();
        $datos_familiares = $familiares->getFamiliares();
        $datos_hijos = $familiares->getHijos();
-       $dep = new Dependencia($agente->getDependencia());
+       $dep = new MECON_Dependencia($agente->getDependencia());
 }
 
 if(in_array('mostrar',array_keys($_GET)) and !(preg_match('/^CON/',$agente->getTipo()))) {