SD-29 parties 1 à 4

composer.lock

@@ -285,20 +285,20 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "v2.5.5",
+            "version": "v2.5.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "9f8c05cd5225a320d56d4bfdb4772f10d045a0c9"
+                "reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/9f8c05cd5225a320d56d4bfdb4772f10d045a0c9",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/7b9e911f9d8b30d43b96853dab26898c710d8f44",
-                "reference": "9f8c05cd5225a320d56d4bfdb4772f10d045a0c9",
+                "reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44",
                 "shasum": ""
             },
             "require": {
-                "doctrine/common": ">=2.4,<2.7-dev",
+                "doctrine/common": ">=2.4,<2.8-dev",
                 "php": ">=5.3.2"
             },
             "require-dev": {
@@ -352,7 +352,7 @@
                 "persistence",
                 "queryobject"
             ],
-            "time": "2016-09-09T19:13:33+00:00"
+            "time": "2017-02-08T12:53:47+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -477,21 +477,21 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.2.2",
+            "version": "6.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "ebf29dee597f02f09f4d5bbecc68230ea9b08f60"
+                "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ebf29dee597f02f09f4d5bbecc68230ea9b08f60",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/8d6c6cc55186db87b7dc5009827429ba4e9dc006",
-                "reference": "ebf29dee597f02f09f4d5bbecc68230ea9b08f60",
+                "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006",
                 "shasum": ""
             },
             "require": {
                 "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.3.1",
+                "guzzlehttp/psr7": "^1.4",
                 "php": ">=5.5"
             },
             "require-dev": {
@@ -535,7 +535,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2016-10-08T15:01:37+00:00"
+            "time": "2017-02-28T22:50:30+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -590,16 +590,16 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.3.1",
+            "version": "1.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b"
+                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
-                "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
+                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
                 "shasum": ""
             },
             "require": {
@@ -635,16 +635,23 @@
                     "name": "Michael Dowling",
                     "email": "mtdowling@gmail.com",
                     "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "homepage": "https://github.com/Tobion"
                 }
             ],
-            "description": "PSR-7 message implementation",
+            "description": "PSR-7 message implementation that also provides common utility methods",
             "keywords": [
                 "http",
                 "message",
+                "request",
+                "response",
                 "stream",
-                "uri"
+                "uri",
+                "url"
             ],
-            "time": "2016-06-24T23:00:38+00:00"
+            "time": "2017-03-20T17:10:46+00:00"
         },
         {
             "name": "psr/http-message",

library/Metier/Bodacc/MBodacc.php

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

library/Metier/Insee/MInsee.php

@@ -1482,7 +1482,7 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
                 'Capital'        => $etab['capital'],
                 'CapitalDev'     => $etab['capitalDev'],
                 'TrancheCA'      => $etab['tca'],
-                'TrancheCALib'   => self::$tabTCA[$etab['tca']],
+                'TrancheCALib'   => isset(self::$tabTCA[$etab['tca']])?self::$tabTCA[$etab['tca']]:null,
                 'EffEnTr'        => $etab['teff_entrep'],
                 'EffEnTrLib'     => self::$tabEffectif[$etab['teff_entrep']],
                 'EffEtTr'        => $etab['teff_etab'],
@@ -5858,6 +5858,8 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
                     $adresse.=ucfirst(strtolower($ann['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'])) {
                         $depotComptes = true;
                         $strRCS = 'Siren : '. $ann['siren'] . '. ';

library/Scores/Extract/Dict.php

@@ -558,6 +558,16 @@ class Scores_Extract_Dict
             'help' => "",
             '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()

scripts/jobs/enrichissement.php

@@ -227,7 +227,15 @@ $tabDico = array(
 		),
 		'where' => ' WHERE siren=$siren',
 	),
-	'data' => array(
+    'contentieuxDE' => array(
+        'db' => 'jo.greffes_affaires_siren',
+        'cle' => array(
+            'nbContentieuxDE' 	=> 'SUM(IF(qualite="DE",1,0)) as nbContentieuxDE',
+            'nbContentieuxDF' 	=> 'SUM(IF(qualite="DF",1,0)) as nbContentieuxDF',
+        ),
+        'where' => ' WHERE entSiren=$siren',
+    ),
+    'data' => array(
 		'nicSiege',
 		'tva',
 		'dateFermetureEn',
@@ -259,7 +267,7 @@ $tabDico = array(
 	    'participations',
 	    'annoncetxt',
 	    'groupes',
-	    'etablissementliste'
+	    'etablissementliste',
 	),
 );