BugFix

[mecon/meconlib.git] / lib / MECON / Agente.php

diff --git a/lib/MECON/Agente.php b/lib/MECON/Agente.php
index fff7cbd5220d838de6e192a8bfa59ea016f2f8a5..255b15e495a9ee22c6eb2bf3991ef51ee5d3a415 100644 (file)
--- a/lib/MECON/Agente.php
+++ b/lib/MECON/Agente.php
@@ -4,12 +4,12 @@
                                     meconlib
 -------------------------------------------------------------------------------
 This file is part of meconlib.
                                     meconlib
 -------------------------------------------------------------------------------
 This file is part of meconlib.

-
+ 

 meconlib is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 Software Foundation; either version 2 of the License, or (at your option)
 any later version.
 meconlib is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 Software Foundation; either version 2 of the License, or (at your option)
 any later version.

-
+ 

 meconlib is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 meconlib is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.


@@ -28,11 +28,11 @@ $Id$
 require_once 'DB.php';
 require_once 'MECON/Tiempo/Hora.php';
 
 require_once 'DB.php';
 require_once 'MECON/Tiempo/Hora.php';
 

-// +X2C Class 131 :Agente
+// +X2C Class 131 :MECON_Agente

 /**
  * @access public
  */
 /**
  * @access public
  */

-class Agente {
+class MECON_Agente {

     /**
      * @var    int $agente
      * @access public
     /**
      * @var    int $agente
      * @access public


@@ -53,10 +53,10 @@ class Agente {
      * @access public
      */
     function getDependencia() // ~X2C
      * @access public
      */
     function getDependencia() // ~X2C

-  {
-      return $this->datos['codep'];//TODO esta no es la columna correcta
-  }
-  // -X2C
+    {
+        return $this->datos['codep'];//TODO esta no es la columna correcta
+    }
+    // -X2C

 
     // +X2C Operation 134
     /**
 
     // +X2C Operation 134
     /**


@@ -64,14 +64,14 @@ class Agente {
      * @access public
      */
     function getTipo() // ~X2C
      * @access public
      */
     function getTipo() // ~X2C

-  {
-      if(!in_array('tipo_agente',array_keys($this->datos)))
-        return 'CON '.$this->datos['marco_legal'];
-      else
-        return $this->datos['tipo_agente'];
-      
-  }
-  // -X2C
+    {
+        if(!in_array('tipo_agente',array_keys($this->datos)))
+            return 'CON '.$this->datos['marco_legal'];
+        else
+            return $this->datos['tipo_agente'];
+
+    }
+    // -X2C

 
     // +X2C Operation 135
     /**
 
     // +X2C Operation 135
     /**


@@ -80,12 +80,12 @@ class Agente {
      * @return void
      * @access public
      */
      * @return void
      * @access public
      */

-    function Agente($agente) // ~X2C
-  {
-      if(! is_null($agente))
-        $this->buscarAgente($agente);
-  }
-  // -X2C
+    function MECON_Agente($agente) // ~X2C
+    {
+        if(! is_null($agente))
+            $this->buscarAgente($agente);
+    }
+    // -X2C

 
     // +X2C Operation 138
     /**
 
     // +X2C Operation 138
     /**


@@ -93,10 +93,10 @@ class Agente {
      * @access public
      */
     function getNombre() // ~X2C
      * @access public
      */
     function getNombre() // ~X2C

-  {
-      return $this->datos['nombre'];
-  }
-  // -X2C
+    {
+        return $this->datos['nombre'];
+    }
+    // -X2C

 
     // +X2C Operation 139
     /**
 
     // +X2C Operation 139
     /**


@@ -104,13 +104,13 @@ class Agente {
      * @access public
      */
     function getHoraDesde() // ~X2C
      * @access public
      */
     function getHoraDesde() // ~X2C

-  {
-      if(is_null($this->datos['hentra']))
-          return new Hora($this->datos['hora_desde']);
-      else
-          return new Hora($this->datos['hentra']);
-  }
-  // -X2C
+    {
+        if(is_null($this->datos['hentra']))
+            return new MECON_Tiempo_Hora($this->datos['hora_desde']);
+        else
+            return new MECON_Tiempo_Hora($this->datos['hentra']);
+    }
+    // -X2C

 
     // +X2C Operation 140
     /**
 
     // +X2C Operation 140
     /**


@@ -118,13 +118,13 @@ class Agente {
      * @access public
      */
     function getHoraHasta() // ~X2C
      * @access public
      */
     function getHoraHasta() // ~X2C

-  {
-      if(is_null($this->datos['hsale']))
-          return new Hora($this->datos['hora_hasta']);
-      else
-          return new Hora($this->datos['hsale']);
-  }
-  // -X2C
+    {
+        if(is_null($this->datos['hsale']))
+            return new MECON_Tiempo_Hora($this->datos['hora_hasta']);
+        else
+            return new MECON_Tiempo_Hora($this->datos['hsale']);
+    }
+    // -X2C

 
     // +X2C Operation 149
     /**
 
     // +X2C Operation 149
     /**


@@ -147,33 +147,32 @@ class Agente {
     function getOtrosDatos() // ~X2C
     {
         if(!is_null($this->datos['tipo_agente'])) {
     function getOtrosDatos() // ~X2C
     {
         if(!is_null($this->datos['tipo_agente'])) {

-            $aux['tipo_doc'] = $this->datos['tipodoc']; 
-            $aux['fecha_nac'] = $this->datos['fecha_nac']; 
-            $aux['edad'] = $this->datos['edad']; 
-            $aux['estado_civil'] = $this->datos['estado_civil']; 
-            $aux['domicilio'] = $this->datos['domicilio']; 
-            $aux['puerta'] = $this->datos['num_puerta']; 
-            $aux['piso'] = $this->datos['piso']; 
-            $aux['depto'] = $this->datos['depto']; 
-            $aux['localidad'] = $this->datos['localidad']; 
-            $aux['provincia'] = $this->datos['provincia']; 
-            $aux['calle1'] = $this->datos['calle1']; 
-            $aux['calle2'] = $this->datos['calle2']; 
-            $aux['cp'] = $this->datos['cp']; 
-            $aux['telefono'] = $this->datos['telefono']; 
-            $aux['cargo'] = $this->datos['cargo']; 
-            $aux['nivel'] = $this->datos['nivel']; 
-            $aux['grado'] = $this->datos['grado']; 
-            $aux['func_ejec'] = $this->datos['func_ejec']; 
-            $aux['obra_social'] = $this->datos['obra_social']; 
-            $aux['afiliado'] = $this->datos['afiliado']; 
-            $aux['conyuge'] = $this->datos['conyuge']; 
-            $aux['fecha_nac_conyuge'] = $this->datos['fecha_nac_cony']; 
-            $aux['tipo_doc_conyuge'] = $this->datos['tipodoc_cony']; 
-            $aux['nro_doc_cony'] = $this->datos['nrodoc_cony']; 
+            $aux['tipo_doc'] = $this->datos['tipodoc'];
+            $aux['fecha_nac'] = $this->datos['fecha_nac'];
+            $aux['edad'] = $this->datos['edad'];
+            $aux['estado_civil'] = $this->datos['estado_civil'];
+            $aux['domicilio'] = $this->datos['domicilio'];
+            $aux['puerta'] = $this->datos['num_puerta'];
+            $aux['piso'] = $this->datos['piso'];
+            $aux['depto'] = $this->datos['depto'];
+            $aux['localidad'] = $this->datos['localidad'];
+            $aux['provincia'] = $this->datos['provincia'];
+            $aux['calle1'] = $this->datos['calle1'];
+            $aux['calle2'] = $this->datos['calle2'];
+            $aux['cp'] = $this->datos['cp'];
+            $aux['telefono'] = $this->datos['telefono'];
+            $aux['cargo'] = $this->datos['cargo'];
+            $aux['nivel'] = $this->datos['nivel'];
+            $aux['grado'] = $this->datos['grado'];
+            $aux['func_ejec'] = $this->datos['func_ejec'];
+            $aux['obra_social'] = $this->datos['obra_social'];
+            $aux['afiliado'] = $this->datos['afiliado'];
+            $aux['conyuge'] = $this->datos['conyuge'];
+            $aux['fecha_nac_conyuge'] = $this->datos['fecha_nac_cony'];
+            $aux['tipo_doc_conyuge'] = $this->datos['tipodoc_cony'];
+            $aux['nro_doc_cony'] = $this->datos['nrodoc_cony'];

             return $aux;
             return $aux;

-        }else
-        {
+        } else {

             return false;
         }
     }
             return false;
         }
     }


@@ -188,41 +187,38 @@ class Agente {
      */
     function buscarAgente($agente) // ~X2C
     {
      */
     function buscarAgente($agente) // ~X2C
     {

-      $this->agente = $agente;
-      $dsn = '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 * 
-              FROM web003
-             WHERE nrodoc = $agente";
-      $result = $db->query($sql);
-      if(DB::isError($result))
-        die($result->getMessage("query mal hecho"));
-      if($result->numRows() > 0)
-      {
-          $this->datos = $result->fetchRow(DB_FETCHMODE_ASSOC); 
-      }
-      else
-      {
-          $dsn = 'mysql://intranet:intranet@intranet-db/Contratados';
-          $db = DB::connect($dsn);
-          if (DB::isError($db)) die ($db->getMessage("No pudo conectarse a la base"));
-          $sql = "SELECT * 
-                  FROM Contratados
-                 WHERE nrodoc = $agente";
-          $result = $db->query($sql);
-          if(DB::isError($result))
+        $this->agente = $agente;
+        $dsn = 'mysql://intranet:intranet@intranet-db.mecon.ar/novedades';
+        $db = DB::connect($dsn);
+        if (DB::isError($db))
+            die ($db->getMessage("No pudo conectarse a la base"));
+        $sql = "SELECT *
+               FROM web003
+               WHERE nrodoc = $agente";
+        $result = $db->query($sql);
+        if(DB::isError($result))

             die($result->getMessage("query mal hecho"));
             die($result->getMessage("query mal hecho"));

-          if($result->numRows() > 0)
-          {
+        if($result->numRows() > 0) {

             $this->datos = $result->fetchRow(DB_FETCHMODE_ASSOC);
             $this->datos = $result->fetchRow(DB_FETCHMODE_ASSOC);

-          }
-         else
-            return false;
-      }
-      return true;
+        } else {
+            $dsn = 'mysql://intranet:intranet@intranet-db.mecon.ar/Contratados';
+            $db = DB::connect($dsn);
+            if (DB::isError($db))
+                die ($db->getMessage("No pudo conectarse a la base"));
+            $sql = "SELECT *
+                   FROM Contratados
+                   WHERE nrodoc = $agente";
+            $result = $db->query($sql);
+            if(DB::isError($result))
+                die($result->getMessage("query mal hecho"));
+            if($result->numRows() > 0) {
+                $this->datos = $result->fetchRow(DB_FETCHMODE_ASSOC);
+            } else
+                return false;
+        }
+        return true;

     }
     // -X2C
 
     }
     // -X2C
 

-} // -X2C Class :Agente
+} // -X2C Class :MECON_Agente

 ?>
\ No newline at end of file
 ?>
\ No newline at end of file