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

fusion parciel library enrichissement avec library

Browse Source
This commit is contained in:
benoitpotier 2017-04-03 10:44:37 +02:00
parent 0b5d5b4685
commit 7be909c101
3 changed files with 455 additions and 444 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Metier/Bodacc/MBodacc.php
View File

@ -1508,6 +1508,6 @@ class Metier_Bodacc_MBodacc
$tabCjBodacc = include 'Metier/Bodacc/BodaccCJ.php'; $tabCjBodacc = include 'Metier/Bodacc/BodaccCJ.php';
$strFJ = strtoupper(trim(preg_replace('/[^a-z]/i', '', $strFJ))); $strFJ = strtoupper(trim(preg_replace('/[^a-z]/i', '', $strFJ)));
return $tabCjBodacc[$strFJ]; return isset($tabCjBodacc[$strFJ])?$tabCjBodacc[$strFJ]:'';
} }
} }

31
src/Metier/Insee/MInsee.php
View File

@ -1482,7 +1482,7 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
'Capital' => $etab['capital'], 'Capital' => $etab['capital'],
'CapitalDev' => $etab['capitalDev'], 'CapitalDev' => $etab['capitalDev'],
'TrancheCA' => $etab['tca'], 'TrancheCA' => $etab['tca'],
'TrancheCALib' => self::$tabTCA[$etab['tca']], 'TrancheCALib' => isset(self::$tabTCA[$etab['tca']])?self::$tabTCA[$etab['tca']]:null,
'EffEnTr' => $etab['teff_entrep'], 'EffEnTr' => $etab['teff_entrep'],
'EffEnTrLib' => self::$tabEffectif[$etab['teff_entrep']], 'EffEnTrLib' => self::$tabEffectif[$etab['teff_entrep']],
'EffEtTr' => $etab['teff_etab'], 'EffEtTr' => $etab['teff_etab'],
@ -5591,6 +5591,11 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
try { try {
$stmt = $this->conn->executeQuery($sql); $stmt = $this->conn->executeQuery($sql);
} catch (\Doctrine\DBAL\DBALException $e) {
if ($this->logger !== null) {
$this->logger->error($e->getMessage());
}
}
// --- Traitement des resultats // --- Traitement des resultats
if ($stmt->rowCount() > 0) { if ($stmt->rowCount() > 0) {
@ -5850,8 +5855,11 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
$ann['codePostal'] = $this->Identite['CP']; $ann['codePostal'] = $this->Identite['CP'];
$ann['ville'] = $this->Identite['Ville']; $ann['ville'] = $this->Identite['Ville'];
} }
$adresse.= ucfirst(strtolower($ann['adresse'])).', '; $adresse.=ucfirst(strtolower($ann['adresse'])).', ';
$adresse = trim(preg_replace('/^0+/', '', preg_replace('/ +/', ' ', $adresse)));
$adresse=trim(preg_replace('/^0+/', '', preg_replace('/ +/', ' ', $adresse)));
if(!isset($ann['siren'])){$ann['siren']=null;}
if(!isset($ann['triNom'])){$ann['triNom']=null;}
if (preg_match('/(3100|3200|3300|3999)/', $ann['typeEven'].';'.$ann['strEven'])) { if (preg_match('/(3100|3200|3300|3999)/', $ann['typeEven'].';'.$ann['strEven'])) {
$depotComptes = true; $depotComptes = true;
$strRCS = 'Siren : '. $ann['siren'] . '. '; $strRCS = 'Siren : '. $ann['siren'] . '. ';
@ -5859,10 +5867,8 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
$strRCS = $ann['siren'] . ' RCS '. ucfirst(strtolower(strtr($ann['triNom'], array('TGIcc '=>'', 'TGI '=>'', 'TC '=>'', 'TI '=>'', )))).'. '; $strRCS = $ann['siren'] . ' RCS '. ucfirst(strtolower(strtr($ann['triNom'], array('TGIcc '=>'', 'TGI '=>'', 'TC '=>'', 'TI '=>'', )))).'. ';
} }
$texteAnnonce = 'Date : '.strtolower(Metier_Util_Date::dateT('Y-m-d', 'd M Y', $ann['dateJugement'])).'. '. $texteAnnonce = 'Date : '.strtolower(Metier_Util_Date::dateT('Y-m-d', 'd M Y', $ann['dateJugement'])) .'. '. $this->iBodacc->getEvenement($ann['typeEven']).'. '.
$this->iBodacc->getEvenement($ann['typeEven']).'. '. $strRCS . trim($ann['raisonSociale']). '. Adresse : '. $adresse.' '.$ann['codePostal'].' '.$ann['ville'].'. ';
$strRCS . trim($ann['raisonSociale']).'. Adresse : '.
$adresse.' '.$ann['codePostal'].' '.$ann['ville'].'. ';
if (trim($ann['numero']) != '') { if (trim($ann['numero']) != '') {
$texteAnnonce.='Jugement Numéro : '.trim($ann['numero']).'. '; $texteAnnonce.='Jugement Numéro : '.trim($ann['numero']).'. ';
@ -5877,9 +5883,9 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
&& ($ann['inter'.$mandNum.'id']>0 || trim($ann['inter'.$mandNum.'nom']) != '')) { && ($ann['inter'.$mandNum.'id']>0 || trim($ann['inter'.$mandNum.'nom']) != '')) {
$texteAnnonce.= $tabInter[$ann['inter'.$mandNum.'type']].' : '.$ann['inter'.$mandNum.'nom']; $texteAnnonce.= $tabInter[$ann['inter'.$mandNum.'type']].' : '.$ann['inter'.$mandNum.'nom'];
if ($ann['inter'.$mandNum.'id'] != 0) { if ($ann['inter'.$mandNum.'id'] != 0) {
$mandStmt = $this->conn->executeQuery( $mandStmt = $this->conn->executeQuery("SELECT sirenGrp, sirenMand,
"SELECT sirenGrp, sirenMand, tel, fax, email tel, fax, email FROM jo.tabMandataires
FROM jo.tabMandataires WHERE id=".$ann['inter'.$mandNum.'id']); WHERE id=".$ann['inter'.$mandNum.'id']);
$mand = $mandStmt->fetch(\PDO::FETCH_ASSOC); $mand = $mandStmt->fetch(\PDO::FETCH_ASSOC);
if ($mand['sirenGrp'] != 0) { if ($mand['sirenGrp'] != 0) {
$texteAnnonce.= ', Siren SCP '.$mand['sirenGrp']; $texteAnnonce.= ', Siren SCP '.$mand['sirenGrp'];
@ -6041,11 +6047,6 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
} }
} }
} }
} catch (\Doctrine\DBAL\DBALException $e) {
if ($this->logger !== null) {
$this->logger->error($e->getMessage());
}
}
return $tabRet; return $tabRet;
} }

10
src/Scores/Extract/Dict.php
View File

@ -558,6 +558,16 @@ class Scores_Extract_Dict
'help' => "", 'help' => "",
'columns' => array() 'columns' => array()
), ),
'nbContentieuxDE'=> array(
'lib' => 'Greffe Contentieux DE',
'help' => "Nbre de contentieux DE",
'columns' => array()
),
'nbContentieuxDF'=> array(
'lib' => 'Greffe Contentieux DF',
'help' => "Nbre de contentieux DF",
'columns' => array()
),
); );
public function __construct() public function __construct()