scores/webservice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove ref to Metier_Util_Db

Browse Source
This commit is contained in:
Michael RICOIS 2017-02-07 16:57:38 +01:00
parent 7708d7e07f
commit d1b9bc1680
8 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/Metier/Insee/MInsee.php
View File

@ -86,21 +86,12 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
*/
protected $logger;
protected $iDb;
/**
* MInsee
*/
public function __construct($db = null)
{
if ($db === null) {
$this->iDb = new Metier_Util_Db();
} else {
$this->iDb = $db;
}
$this->conn = Zend_Registry::get('doctrine');
$this->iBodacc = new Metier_Bodacc_MBodacc();
}

2
library/Metier/Partenaires/MRnvp.php
View File

@ -32,7 +32,7 @@ class Metier_Partenaires_MRnvp
public function __construct()
{
$this->iDb = new Metier_Util_Db();
$this->iInsee = new Metier_Insee_MInsee($this->iDb);
$this->iInsee = new Metier_Insee_MInsee();
}
/**

6
library/Metier/Scores/MScores.php
View File

@ -703,7 +703,7 @@ function calculIndiScore($siren, $nic=0, $accesDist=false, $cycleClient=2, $mail
$iDb = $db;
}
$iInsee = new Metier_Insee_MInsee($iDb);
$iInsee = new Metier_Insee_MInsee();
/**
* Récupération des informations identitaire
@ -2193,7 +2193,7 @@ function calculIndiScore($siren, $nic=0, $accesDist=false, $cycleClient=2, $mail
$tabA = $lienM->getActionnaires(null, true);
if (count($tabA)>0) {
foreach ($tabA as $i=>$lien) {
$lienInsee = new Metier_Insee_MInsee($iDb);
$lienInsee = new Metier_Insee_MInsee();
if (intval($lien->siren)>100 && ($lien->MajMin=='+' || $lien->PDetention>50)) {
$tabIdentiteA=$lienInsee->getIdentiteLight($lien->siren);
if ($NICMERE*1==0) {
@ -2235,7 +2235,7 @@ function calculIndiScore($siren, $nic=0, $accesDist=false, $cycleClient=2, $mail
if (count($tabP)>0) {
foreach ($tabP as $i=>$lien) {
if ($lien->siren>100 && ($lien->MajMin=='+' || $lien->PDetention>50)) {
$lienInsee = new Metier_Insee_MInsee($iDb);
$lienInsee = new Metier_Insee_MInsee();
$NBFILLE++; // Nombre de participations à plus de 50%
if ($NBFILLE==1) {
$tabIdentiteP=$lienInsee->getIdentiteLight($lien->siren);

6
library/Metier/Scoring/Base.php
View File

@ -760,7 +760,7 @@ class Metier_Scoring_Base extends Metier_Scoring_Vars
$this->NIVEAU = $cycleClient; // 1, 2, 3 ou 5 Niveau de version des commentaires
$iInsee = new Metier_Insee_MInsee($this->db);
$iInsee = new Metier_Insee_MInsee();
if ($this->companyEvenDateStop !== null) {
$iInsee->setEvenLimit($this->companyEvenDateStop);
}
@ -2135,7 +2135,7 @@ class Metier_Scoring_Base extends Metier_Scoring_Vars
$tabA = $lienM->getActionnaires(null, true);
if (count($tabA)>0) {
foreach ($tabA as $i=>$lien) {
$lienInsee = new Metier_Insee_MInsee($this->db);
$lienInsee = new Metier_Insee_MInsee();
if (intval($lien->siren)>100 && ($lien->MajMin=='+' || $lien->PDetention>50)) {
$tabIdentiteA=$lienInsee->getIdentiteLight($lien->siren);
if ($this->NICMERE*1==0) {
@ -2177,7 +2177,7 @@ class Metier_Scoring_Base extends Metier_Scoring_Vars
if (count($tabP)>0) {
foreach ($tabP as $i=>$lien) {
if ($lien->siren>100 && ($lien->MajMin=='+' || $lien->PDetention>50)) {
$lienInsee = new Metier_Insee_MInsee($this->db);
$lienInsee = new Metier_Insee_MInsee();
$this->NBFILLE++; // Nombre de participations à plus de 50%
if ($this->NBFILLE==1) {
$tabIdentiteP=$lienInsee->getIdentiteLight($lien->siren);

5
library/WsScore/Entreprise/v0.8/Service.php
View File

@ -293,7 +293,6 @@ class Entreprise extends Scores_Ws_Server
$db = Zend_Db_Table_Abstract::getDefaultAdapter();
$output = new AvisRncs();
$iDb = new Metier_Util_Db();
$rncs = new Metier_Partenaires_MRncs();
//jo.etablissements => insee uniquement, rncs ?
@ -359,7 +358,7 @@ class Entreprise extends Scores_Ws_Server
$output->ConstitutionTribunalCode = '';
$output->ConstitutionTribunalLabel = '';
$iInsee = new Metier_Insee_MInsee($iDb);
$iInsee = new Metier_Insee_MInsee();
$dirs = $iInsee->getDirigeants($siren, false);
$liste = array();
foreach ($dirs as $nb => $dir)
@ -3483,7 +3482,7 @@ class Entreprise extends Scores_Ws_Server
elseif (strlen($siret) == 9) $nic = '';
$iDb = new Metier_Util_Db();
$iInsee = new Metier_Insee_MInsee($iDb);
$iInsee = new Metier_Insee_MInsee();
$rep = $iInsee->getEtablissements($siren, $nic, $deb, $nbRep, $maxRep, $dep, $actif, $siege);
if ( count($rep['reponses'])==0 && $dep>0 ) {

6
library/WsScore/Entreprise/v0.9/Service.php
View File

@ -35,7 +35,7 @@ class Entreprise extends Scores_Ws_Server
$db = new Metier_Util_Db();
$iInsee = new Metier_Insee_MInsee($db);
$iInsee = new Metier_Insee_MInsee();
$iInsee->setLogger();
$entrep = $iInsee->getIdentiteEntreprise($siren, $nic, $id, $forceVerif);
if (empty($entrep) || empty($entrep['id']) ) {
@ -359,7 +359,6 @@ class Entreprise extends Scores_Ws_Server
}
$output = new AvisRncs();
$iDb = new Metier_Util_Db();
$rncs = new Metier_Partenaires_MRncs();
//jo.etablissements => insee uniquement, rncs ?
@ -429,12 +428,11 @@ class Entreprise extends Scores_Ws_Server
$output->ConstitutionTribunalCode = '';
$output->ConstitutionTribunalLabel = '';
$iInsee = new Metier_Insee_MInsee($iDb);
$iInsee = new Metier_Insee_MInsee();
$dirs = $iInsee->getDirigeants($siren, false);
$liste = array();
foreach ($dirs as $nb => $dir) {
$dirigeant = new AvisRncsAdmin();
$dirigeant->Code = $dir['Fonction'];
$dirigeant->Label = $dir['Titre'];
$dirigeant->CompanyName = $dir['Societe'];

8
library/WsScore/Gestion/v0.3/Service.php
View File

@ -366,14 +366,6 @@ class Gestion extends Scores_Ws_Server
$tabUpdate['typeCompte'] = $typeCompte;
//@todo : See issue #0001209
/*
if ($this->User->profil=='SuperAdministrateur' && !empty($infos['filtre_ip'])) {
$tabUpdate['filtre_ip'] = $infos['filtre_ip'];
} else {
$rep = $iDbCrm->select('clients', 'filtre_ip', "id='$idClient'",false, MYSQL_ASSOC);
$tabUpdate['filtre_ip'] = $rep[0]['filtre_ip'];
}
*/
//$tabUpdate['civilite'] = 'M';
$tabUpdate['nom'] = stripslashes($infos['nom']);
$tabUpdate['prenom'] = stripslashes($infos['prenom']);

2
library/WsScore/Interne/v0.6/Service.php
View File

@ -2652,7 +2652,7 @@ class Interne extends Scores_Ws_Server
$iDb = new Metier_Util_Db();
$iInsee = new Metier_Insee_MInsee($iDb);
$iInsee = new Metier_Insee_MInsee();
$rep = $iInsee->getEtablissements($siren, '', $position, $nbRep, 200, $departement, $actif);
$etabs = $rep['reponses'];
$nbReponses = $rep['nbReponsesTotal'];