From 24c3342ec10cd46b4e4a386d1beec6744519255a Mon Sep 17 00:00:00 2001
From: tibo <tibo@topisto.net>
Date: Tue, 3 Mar 2020 11:58:42 +0000
Subject: [PATCH] correction gestion correcte progressBar

---
 bin/import_01_collectivites.php | 6 ++++++
 bin/import_02_budgets.php       | 2 +-
 bin/import_03_services.php      | 2 +-
 bin/import_07_programmes.php    | 2 +-
 bin/import_08_enveloppes.php    | 1 +
 bin/import_09_marches.php       | 1 +
 bin/import_11_nomenclatures.php | 2 ++
 7 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/bin/import_01_collectivites.php b/bin/import_01_collectivites.php
index aaa9e03..93bc474 100644
--- a/bin/import_01_collectivites.php
+++ b/bin/import_01_collectivites.php
@@ -31,9 +31,15 @@ SMETI_db::$item = SMETI_db::$pdo->lastInsertId();
 SMETI_db::$parent = SMETI_db::$item;
 echo 'OK'.PHP_EOL;
 
+$counter = 0;
 $shipments = json_decode(file_get_contents("../data/json/BMO/01_COLLECTIVITES.json"), true);
 foreach($shipments as $element)
 {
+    // Gestion d'une barre de progression
+    progressBar($counter, $nb_shipments);
+    $counter += 1;
+    // Gestion d'une barre de progression
+    
     // Ajouter un item
     SMETI_db::$code = $element['collcod'];
     SMETI_db::$libelle = $element['collnom'];
diff --git a/bin/import_02_budgets.php b/bin/import_02_budgets.php
index 4c9e78f..3e2f461 100644
--- a/bin/import_02_budgets.php
+++ b/bin/import_02_budgets.php
@@ -54,7 +54,7 @@ foreach($shipments as $element)
 {
     // Gestion d'une barre de progression
     progressBar($counter, $nb_shipments);
-    if (5000 == $counter++) break;
+    $counter += 1;
     // Gestion d'une barre de progression
 
     // A-t-on changé de collectivité ?
diff --git a/bin/import_03_services.php b/bin/import_03_services.php
index 20a33b0..c9cd60f 100644
--- a/bin/import_03_services.php
+++ b/bin/import_03_services.php
@@ -54,7 +54,7 @@ foreach($shipments as $element)
 {
     // Gestion d'une barre de progression
     progressBar($counter, $nb_shipments);
-    if (5000 == $counter++) break;
+    $counter += 1;
     // Gestion d'une barre de progression
 
     // A-t-on changé de collectivité ?
diff --git a/bin/import_07_programmes.php b/bin/import_07_programmes.php
index c924efb..f100a3e 100644
--- a/bin/import_07_programmes.php
+++ b/bin/import_07_programmes.php
@@ -54,7 +54,7 @@ foreach($shipments as $element)
 {
     // Gestion d'une barre de progression
     progressBar($counter, $nb_shipments);
-    if (5000 == $counter++) break;
+    $counter += 1;    
     // Gestion d'une barre de progression
 
     // A-t-on changé de collectivité ?
diff --git a/bin/import_08_enveloppes.php b/bin/import_08_enveloppes.php
index e268ee5..3573552 100644
--- a/bin/import_08_enveloppes.php
+++ b/bin/import_08_enveloppes.php
@@ -58,6 +58,7 @@ foreach($shipments as $element)
 {
     // Gestion d'une barre de progression
     progressBar($counter, $nb_shipments);
+    $counter += 1;
     // Gestion d'une barre de progression
 
     // A-t-on changé de collectivité ?
diff --git a/bin/import_09_marches.php b/bin/import_09_marches.php
index 49356a7..033e222 100644
--- a/bin/import_09_marches.php
+++ b/bin/import_09_marches.php
@@ -58,6 +58,7 @@ foreach($shipments as $element)
 {
     // Gestion d'une barre de progression
     progressBar($counter, $nb_shipments);
+    $counter += 1;
     // Gestion d'une barre de progression
 
     // On ne reprend pas les vieux marchés
diff --git a/bin/import_11_nomenclatures.php b/bin/import_11_nomenclatures.php
index af04ed7..f819b52 100644
--- a/bin/import_11_nomenclatures.php
+++ b/bin/import_11_nomenclatures.php
@@ -103,6 +103,7 @@ foreach($shipments as $element)
 {
     // Gestion d'une barre de progression
     progressBar($counter, $nb_shipments);
+    $counter += 1;
     // Gestion d'une barre de progression
 
     // On ne tient pas compte des données incorrectes
@@ -156,6 +157,7 @@ foreach($shipments as $element)
 {
     // Gestion d'une barre de progression
     progressBar($counter, $nb_shipments);
+    $counter += 1;
     // Gestion d'une barre de progression
 
     if (!isset($element['code'])) continue;