From ba466154033d54821e07ab851bccc42e8e344fe9 Mon Sep 17 00:00:00 2001
From: Leandro Lucarella <llucax@gmail.com>
Date: Thu, 24 Jun 2004 20:45:39 +0000
Subject: [PATCH] - Pase los objetos para obtener la informacion del legajo a
 meconlib

---
 .../local_lib/Servicios/Legajos/Estudios.php  |  97 -------------
 .../Servicios/Legajos/ExperienciaLaboral.php  | 125 -----------------
 .../Servicios/Legajos/Familiares.php          | 132 ------------------
 sistema/www/servicios/legajos/legajo.php      |  12 +-
 4 files changed, 6 insertions(+), 360 deletions(-)
 delete mode 100644 sistema/local_lib/Servicios/Legajos/Estudios.php
 delete mode 100644 sistema/local_lib/Servicios/Legajos/ExperienciaLaboral.php
 delete mode 100644 sistema/local_lib/Servicios/Legajos/Familiares.php

diff --git a/sistema/local_lib/Servicios/Legajos/Estudios.php b/sistema/local_lib/Servicios/Legajos/Estudios.php
deleted file mode 100644
index 8024202..0000000
--- a/sistema/local_lib/Servicios/Legajos/Estudios.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-// vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
-// +--------------------------------------------------------------------+
-// |                      Ministerio de Economía                        |
-// |                             Intranet                               |
-// +--------------------------------------------------------------------+
-// | This file is part of Intranet.                                     |
-// |                                                                    |
-// | Intranet 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.                             |
-// |                                                                    |
-// | Intranet 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.                           |
-// |                                                                    |
-// | You should have received a copy of the GNU General Public License  |
-// | along with Hooks; if not, write to the Free Software Foundation,   |
-// | Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA      |
-// +--------------------------------------------------------------------+
-// | Creado: Mon Jul 7 17:22:10 2003                                    |
-// | Autor:  Matías Sklar <msklar@mecon.gov.ar>                         |
-// +--------------------------------------------------------------------+
-//
-// $Id: Intranet_Legajos_Estudios.php 23 2003-07-15 18:56:42Z msklar $
-//
-
-
-
-// +X2C includes
-require_once 'DB.php';
-// ~X2C
-require_once 'intranetdb.php';
-
-// +X2C Class 163 :Servicios_Legajos_Estudios
-/**
- * Estudios del agente
- *
- * @access public
- */
-// XXX - Pregunta llucar: POR QUE CATSO HEREDA DE DB???
-class Servicios_Legajos_Estudios extends DB {
-    /**
-     * @var    int $agente
-     * @access public
-     */
-    var $agente;
-
-    /**
-     * @var    int $datos
-     * @access public
-     */
-    var $datos;
-
-    // ~X2C
-
-    // +X2C Operation 166
-    /**
-     * @param  int $agente 
-     *
-     * @return void
-     * @access public
-     */
-    function Servicios_Legajos_Estudios($agente) // ~X2C
-    {
-        $this->agente = $agente;
-        $db = IntranetDB::connect();
-        if (DB::isError($db)) 
-            trigger_error($db->getMessage('No pudo conectarse a la base'), E_USER_ERROR);
-        $sql = "SELECT * 
-                FROM novedades.web005
-                WHERE documento = $agente";
-        $result = $db->query($sql);
-        if (DB::isError($result))
-            trigger_error($result->getMessage('Query mal hecho'), E_USER_ERROR);
-
-        for ($fila = 0; $fila < $result->numRows(); $fila++) {
-            $this->datos[$fila] = $result->fetchRow(DB_FETCHMODE_ASSOC);
-        }
-    }
-    // -X2C
-
-    // +X2C Operation 172
-    /**
-     * @return void
-     * @access public
-     */
-    function getEstudios() // ~X2C
-    {
-        return $this->datos;
-    }
-    // -X2C
-
-} // -X2C Class :Servicios_Legajos_Estudios
-?>
diff --git a/sistema/local_lib/Servicios/Legajos/ExperienciaLaboral.php b/sistema/local_lib/Servicios/Legajos/ExperienciaLaboral.php
deleted file mode 100644
index ea1ef93..0000000
--- a/sistema/local_lib/Servicios/Legajos/ExperienciaLaboral.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-// vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
-// +--------------------------------------------------------------------+
-// |                      Ministerio de Economía                        |
-// |                             Intranet                               |
-// +--------------------------------------------------------------------+
-// | This file is part of Intranet.                                     |
-// |                                                                    |
-// | Intranet 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.                             |
-// |                                                                    |
-// | Intranet 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.                           |
-// |                                                                    |
-// | You should have received a copy of the GNU General Public License  |
-// | along with Hooks; if not, write to the Free Software Foundation,   |
-// | Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA      |
-// +--------------------------------------------------------------------+
-// | Creado: Mon Jul 7 17:22:10 2003                                    |
-// | Autor:  Matías Sklar <msklar@mecon.gov.ar>                         |
-// +--------------------------------------------------------------------+
-//
-// $Id: Intranet_Legajos_ExperienciaLaboral.php 23 2003-07-15 18:56:42Z msklar $
-//
-
-// +X2C includes
-require_once 'DB.php';
-// ~X2C
-require_once 'intranetdb.php';
-
-// +X2C Class 155 :Servicios_Legajos_ExperienciaLaboral
-/**
- * Antigüedad laboral del agente
- *
- * @access public
- */
-// XXX - Pregunta llucar: POR QUE CATSO HEREDA DE DB???
-class Servicios_Legajos_ExperienciaLaboral extends DB {
-    /**
-     * @var    int $agente
-     * @access public
-     */
-    var $agente;
-
-    /**
-     * @var    int $antiguedad
-     * @access public
-     */
-    var $antiguedad;
-
-    /**
-     * @var    int $experiencia
-     * @access public
-     */
-    var $experiencia;
-
-    // ~X2C
-
-    // +X2C Operation 159
-    /**
-     * @param  int $agente 
-     *
-     * @return void
-     * @access public
-     */
-    function Servicios_Legajos_ExperienciaLaboral($agente) // ~X2C
-    {
-        $this->agente = $agente;
-        $db = IntranetDB::connect();
-        if (DB::isError($db)) 
-            trigger_error($db->getMessage('No pudo conectarse a la base'), E_USER_ERROR);
-        $sql = "SELECT * 
-                FROM novedades.web032
-                WHERE nrodoc = $agente
-                ORDER BY desde";
-        $result_exp = $db->query($sql);
-        if (DB::isError($result_exp))
-            trigger_error($result_exp->getMessage('Query mal hecho'), E_USER_ERROR);
-
-        for ($fila = 0; $fila < $result_exp->numRows(); $fila++) {
-            $this->experiencia[$fila] = $result_exp->fetchRow(DB_FETCHMODE_ASSOC);
-        }
-
-        $sql = "SELECT *
-                FROM novedades.web031
-                WHERE nrodoc = $agente";
-        $result_ant = $db->query($sql);
-        if (DB::isError($result_ant))
-            trigger_error($result_ant->getMessage('Query mal hecho'), E_USER_ERROR);
-
-        if ($result_ant->numRows() > 0) {
-            $this->antiguedad = $result_ant->fetchRow(DB_FETCHMODE_ASSOC);
-        }
-
-    }
-    // -X2C
-
-    // +X2C Operation 160
-    /**
-     * @return void
-     * @access public
-     */
-    function getAntiguedad() // ~X2C
-    {
-        return $this->antiguedad;
-    }
-    // -X2C
-
-    // +X2C Operation 161
-    /**
-     * @return void
-     * @access public
-     */
-    function getExperiencia() // ~X2C
-    {
-        return $this->experiencia;
-    }
-    // -X2C
-
-} // -X2C Class :Servicios_Legajos_ExperienciaLaboral
-?>
diff --git a/sistema/local_lib/Servicios/Legajos/Familiares.php b/sistema/local_lib/Servicios/Legajos/Familiares.php
deleted file mode 100644
index 1e2bcea..0000000
--- a/sistema/local_lib/Servicios/Legajos/Familiares.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-// vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4:
-// +--------------------------------------------------------------------+
-// |                      Ministerio de Economía                        |
-// |                             Intranet                               |
-// +--------------------------------------------------------------------+
-// | This file is part of Intranet.                                     |
-// |                                                                    |
-// | Intranet 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.                             |
-// |                                                                    |
-// | Intranet 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.                           |
-// |                                                                    |
-// | You should have received a copy of the GNU General Public License  |
-// | along with Hooks; if not, write to the Free Software Foundation,   |
-// | Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA      |
-// +--------------------------------------------------------------------+
-// | Creado: Mon Jul 7 17:22:10 2003                                    |
-// | Autor:  Matías Sklar <msklar@mecon.gov.ar>                         |
-// +--------------------------------------------------------------------+
-//
-// $Id: Intranet_Legajos_Familiares.php 23 2003-07-15 18:56:42Z msklar $
-//
-
-// +X2C includes
-require_once 'DB.php';
-// ~X2C
-require_once 'intranetdb.php';
-
-// +X2C Class 154 :Servicios_Legajos_Familiares
-/**
- * @access public
- */
-// XXX - Pregunta llucar: POR QUE CATSO HEREDA DE DB???
-class Servicios_Legajos_Familiares extends DB {
-    /**
-     * @var    int $agente
-     * @access public
-     */
-    var $agente;
-
-    /**
-     * @var    int $datos
-     * @access public
-     */
-    var $datos;
-
-    // ~X2C
-
-    // +X2C Operation 169
-    /**
-     * @param  int $agente 
-     *
-     * @return void
-     * @access public
-     */
-    function Servicios_Legajos_Familiares($agente) // ~X2C
-    {
-        $this->agente = $agente;
-        $db = IntranetDB::connect();
-        if (DB::isError($db)) 
-            trigger_error($db->getMessage('No pudo conectarse a la base'), E_USER_ERROR);
-        $sql = "SELECT * 
-                FROM novedades.web004
-                WHERE documento = $agente";
-        $result = $db->query($sql);
-        if (DB::isError($result))
-            trigger_error($result->getMessage('Query mal hecho'), E_USER_ERROR);
-
-        for ($fila = 0; $fila < $result->numRows(); $fila++) {
-            $this->datos[$fila] = $result->fetchRow(DB_FETCHMODE_ASSOC);
-        }
-    }
-    // -X2C
-
-    // +X2C Operation 170
-    /**
-     * @return void
-     * @access public
-     */
-    function getHijos() // ~X2C
-    {
-        $aux = array();
-        $fila = 0;
-        if(is_array($this->datos)) {
-            foreach (array_keys($this->datos) as $key) {
-                if($this->datos[$key]['parentesco']=='H') {
-                 $aux[$fila]['nombre'] = $this->datos[$key]['nombre'];
-                 $aux[$fila]['tipo_doc'] = $this->datos[$key]['tipodoc'];
-                 $aux[$fila]['nro_doc'] = $this->datos[$key]['nrodoc'];
-                 $aux[$fila]['fecha_nac'] = $this->datos[$key]['fecha_nac'];
-                 $aux[$fila]['parentesco'] = $this->datos[$key]['parentesco'];
-                 $fila++;
-                }
-            }
-        }
-        return $aux;
-    }
-    // -X2C
-
-    // +X2C Operation 171
-    /**
-     * @return void
-     * @access public
-     */
-    function getFamiliares() // ~X2C
-    {
-        $aux = array();
-        $fila = 0;
-        if(is_array($this->datos)) {
-            foreach (array_keys($this->datos) as $key) {
-                if($this->datos[$key]['parentesco']!="H") {
-                    $aux[$fila]['nombre'] = $this->datos[$key]['nombre'];
-                    $aux[$fila]['tipo_doc'] = $this->datos[$key]['tipodoc'];
-                    $aux[$fila]['nro_doc'] = $this->datos[$key]['nrodoc'];
-                    $aux[$fila]['fecha_nac'] = $this->datos[$key]['fecha_nac'];
-                    $aux[$fila]['parentesco'] = $this->datos[$key]['parentesco'];
-                    $fila++;
-                }
-            }
-        }
-        return $aux;
-    }
-    // -X2C
-
-} // -X2C Class :Servicios_Legajos_Familiares
-?>
diff --git a/sistema/www/servicios/legajos/legajo.php b/sistema/www/servicios/legajos/legajo.php
index f79897f..49ec420 100755
--- a/sistema/www/servicios/legajos/legajo.php
+++ b/sistema/www/servicios/legajos/legajo.php
@@ -1,9 +1,9 @@
 <?php
 require_once 'MECON/Dependencia.php';
 require_once 'MECON/Agente.php';
-require_once 'Servicios/Legajos/Estudios.php';
-require_once 'Servicios/Legajos/ExperienciaLaboral.php';
-require_once 'Servicios/Legajos/Familiares.php';
+require_once 'MECON/Legajos/Estudios.php';
+require_once 'MECON/Legajos/ExperienciaLaboral.php';
+require_once 'MECON/Legajos/Familiares.php';
 require_once 'HTML/Table.php';
 require_once 'MECON/HTML/Tabla.php';
 require_once 'MECON/HTML/Image.php';
@@ -46,9 +46,9 @@ if(!($agente->buscarAgente($nrodoc)) or ($agente->buscarAgente($nrodoc) and preg
 	exit;
 }
 
-$estudios = new Servicios_Legajos_Estudios($nrodoc); 
-$antiguedad = new Servicios_Legajos_ExperienciaLaboral($nrodoc); 
-$familiares = new Servicios_Legajos_Familiares($nrodoc); 
+$estudios = new MECON_Legajos_Estudios($DB,$nrodoc); 
+$antiguedad = new MECON_Legajos_ExperienciaLaboral($DB,$nrodoc); 
+$familiares = new MECON_Legajos_Familiares($DB,$nrodoc); 
 
 if(!preg_match('/^CON/',$agente->getTipo()))
 {
-- 
2.43.0