- Se agrego a la Dependencia los atributos nombre y nombre_breve.

- Se agrego a la Dependencia los metodos getNombre() y getNombreBreve().

diff --git a/doc/meconlib.xmi b/doc/meconlib.xmi
index e824ee27fca5efa9cc348254e4c2efd2d3b34377..9ad1a8e7edcf2dc572bcbdb291bea2a8f4f0b1ee 100644 (file)
--- a/doc/meconlib.xmi
+++ b/doc/meconlib.xmi
@@ -5,12 +5,12 @@
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
    <XMI.exporterVersion>1.1</XMI.exporterVersion>
   </XMI.documentation>
-  <XMI.model xmi.name="meconlib" href="/home/luca/public_html/meconlib/doc/meconlib.xmi" />
+  <XMI.model xmi.name="meconlib" href="/home/matias/sistemas/meconlib/tronco/doc/meconlib.xmi" />
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
   <docsettings viewid="1" documentation="x2e:extern
-" uniqueid="162" />
+" uniqueid="166" />
   <umlobjects>
    <UML:Actor stereotype="" package="" xmi.id="3" abstract="0" documentation="Beatriz o alguien tan poderoso" name="Beti" static="0" scope="200" />
    <UML:UseCase stereotype="" package="" xmi.id="4" abstract="0" documentation="" name="Cambiar Credencial" static="0" scope="200" />
@@ -48,16 +48,20 @@
     <UML:Operation stereotype="" package="" xmi.id="147" type="void" abstract="0" documentation="" name="dependencia" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="codep" static="0" scope="200" />
     </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="165" type="void" abstract="0" documentation="" name="getNombre" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="166" type="void" abstract="0" documentation="" name="getNombreBreve" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="148" type="void" abstract="0" documentation="" name="getAgentes" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="150" type="dependencia" abstract="0" documentation="" name="getDependencias" static="1" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="146" value="" type="int" abstract="0" documentation="" name="codep" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="163" value="" type="int" abstract="0" documentation="" name="nombre" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="164" value="" type="int" abstract="0" documentation="" name="nombre_breve" static="0" scope="200" />
    </UML:Class>
   </umlobjects>
   <diagrams>
    <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" snapy="10" showatts="1" xmi.id="1" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" font="Helvetica,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" >
     <widgets>
      <UML:ConceptWidget usesdiagramfillcolour="0" width="188" showattsigs="601" usesdiagramusefillcolour="0" x="279" linecolour="#ff0000" y="137" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="168" usefillcolor="1" showattributes="1" xmi.id="131" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="190" showattsigs="601" usesdiagramusefillcolour="0" x="27" linecolour="#ff0000" y="137" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="70" usefillcolor="1" showattributes="1" xmi.id="145" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="190" showattsigs="601" usesdiagramusefillcolour="0" x="27" linecolour="#ff0000" y="137" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="126" usefillcolor="1" showattributes="1" xmi.id="145" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="1" width="46" showattsigs="601" usesdiagramusefillcolour="1" x="284" linecolour="none" y="40" showopsigs="601" usesdiagramlinecolour="1" fillcolour="none" height="28" usefillcolor="1" showattributes="1" xmi.id="125" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="1" width="46" showattsigs="601" usesdiagramusefillcolour="1" x="149" linecolour="none" y="45" showopsigs="601" usesdiagramlinecolour="1" fillcolour="none" height="28" usefillcolor="1" showattributes="1" xmi.id="39" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
     </widgets>
@@ -196,8 +200,8 @@ El proceso puede ser muy largo." font="Helvetica,11,-1,5,50,0,0,0,0,0" />
    <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="131" label="Agente" >
-      <listitem open="0" type="814" id="132" label="agente" />
       <listitem open="0" type="815" id="135" label="Agente" />
+      <listitem open="0" type="814" id="132" label="agente" />
       <listitem open="0" type="815" id="154" label="buscarAgente" />
       <listitem open="0" type="814" id="137" label="datos" />
       <listitem open="0" type="815" id="149" label="getCuil" />
@@ -208,29 +212,33 @@ El proceso puede ser muy largo." font="Helvetica,11,-1,5,50,0,0,0,0,0" />
       <listitem open="0" type="815" id="151" label="getOtrosDatos" />
       <listitem open="0" type="815" id="134" label="getTipo" />
      </listitem>
-     <listitem open="0" type="807" id="1" label="class diagram" />
      <listitem open="1" type="813" id="125" label="DB" />
      <listitem open="0" type="813" id="145" label="Dependencia" >
       <listitem open="0" type="814" id="146" label="codep" />
       <listitem open="0" type="815" id="147" label="dependencia" />
       <listitem open="0" type="815" id="148" label="getAgentes" />
       <listitem open="0" type="815" id="150" label="getDependencias" />
+      <listitem open="0" type="815" id="165" label="getNombre" />
+      <listitem open="0" type="815" id="166" label="getNombreBreve" />
+      <listitem open="0" type="814" id="163" label="nombre" />
+      <listitem open="0" type="814" id="164" label="nombre_breve" />
      </listitem>
      <listitem open="1" type="813" id="39" label="Hora" />
+     <listitem open="0" type="807" id="1" label="class diagram" />
     </listitem>
     <listitem open="1" type="802" id="-1" label="Use Case View" >
      <listitem open="1" type="811" id="76" label="Agente" />
      <listitem open="1" type="805" id="2" label="Bandas2" />
      <listitem open="1" type="811" id="3" label="Beti" />
-     <listitem open="1" type="805" id="115" label="Cambiar Credencial" />
      <listitem open="1" type="812" id="4" label="Cambiar Credencial" />
+     <listitem open="1" type="805" id="115" label="Cambiar Credencial" />
      <listitem open="1" type="811" id="74" label="Control de Accesos" />
      <listitem open="1" type="812" id="77" label="Imprimir Banda" />
      <listitem open="1" type="805" id="119" label="Mostrar Banda" />
      <listitem open="1" type="812" id="75" label="Mostrar Banda" />
      <listitem open="1" type="812" id="79" label="Mostrar Semaforo" />
-     <listitem open="1" type="812" id="6" label="Procesar Periodo" />
      <listitem open="1" type="805" id="117" label="Procesar Periodo" />
+     <listitem open="1" type="812" id="6" label="Procesar Periodo" />
      <listitem open="1" type="811" id="78" label="RRHH" />
     </listitem>
    </listitem>

diff --git a/lib/MECON/Agente.php b/lib/MECON/Agente.php
index 691efd3e9c4d6ae519226701bfedc77607f3ff9f..9a7b19df8a095fc86e8dfadd35f7351446d0e553 100644 (file)
--- a/lib/MECON/Agente.php
+++ b/lib/MECON/Agente.php
@@ -30,7 +30,6 @@ require_once 'MECON/Tiempo/Hora.php';
 
 // +X2C Class 131 :Agente
 /**
- * @package
  * @access public
  */
 class Agente {
@@ -223,4 +222,4 @@ class Agente {
     // -X2C
 
 } // -X2C Class :Agente
-?>
+?>
\ No newline at end of file

diff --git a/lib/MECON/Dependencia.php b/lib/MECON/Dependencia.php
index 020f102f39c948342eb3299ee7016fc4b54e1e63..2bcffa49f00ab9976a50bd5a080a9546f4b92fec 100644 (file)
--- a/lib/MECON/Dependencia.php
+++ b/lib/MECON/Dependencia.php
@@ -30,7 +30,6 @@ require_once 'DB.php';
 
 // +X2C Class 145 :Dependencia
 /**
- * @package
  * @access protected
  */
 class Dependencia {
@@ -40,6 +39,18 @@ class Dependencia {
      */
     var $codep;
 
+    /**
+     * @var    int $nombre
+     * @access public
+     */
+    var $nombre;
+
+    /**
+     * @var    int $nombre_breve
+     * @access public
+     */
+    var $nombre_breve;
+
     // ~X2C
 
     // +X2C Operation 147
@@ -52,6 +63,22 @@ class Dependencia {
     function dependencia($codep) // ~X2C
   {
     $this->codep = $codep;
+    $dns = 'mysql://intranet:intranet@intranet-db/novedades';
+    $db = DB::connect($dsn);
+    if (DB::isError($db)) die ($db->getMessage("No pudo conectarse a la base"));
+    $sql = "SELECT nombre, nombre_breve
+            FROM Dependencias
+            WHERE codigo_actual = '$this->codep' AND
+                dependencia_esta_activa = 1";
+    $result = $db->query($sql);
+    if(DB::isError($result))
+        die($result->getMessage("query mal hecho"));
+    if($result->numRows() > 0)
+    {
+        $row = $result->fetchRow(DB_FETCHMODE_ASSOC);
+        $this->nombre = $row['nombre'];
+        $this->nombre_breve = $row['nombre_breve'];
+    }
   }
   // -X2C
 
@@ -115,5 +142,27 @@ class Dependencia {
     }
     // -X2C
 
+    // +X2C Operation 165
+    /**
+     * @return void
+     * @access public
+     */
+    function getNombre() // ~X2C
+    {
+        return $this->nombre;
+    }
+    // -X2C
+
+    // +X2C Operation 166
+    /**
+     * @return void
+     * @access public
+     */
+    function getNombreBreve() // ~X2C
+    {
+        return $this->nombre_breve;
+    }
+    // -X2C
+
 } // -X2C Class :Dependencia
 ?>
\ No newline at end of file