From 6f4cc3afffde36a13618458ffda72e6104624f36 Mon Sep 17 00:00:00 2001
From: polo <ordipolo@gmx.fr>
Date: Wed, 30 Aug 2023 12:20:39 +0200
Subject: =?UTF-8?q?section=20client=20=C3=A0=20part,=20section=20modif=20e?=
 =?UTF-8?q?n=20cours,=20bug=20dans=20Dates,?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sections/main_loop.php | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'src/sections/main_loop.php')

diff --git a/src/sections/main_loop.php b/src/sections/main_loop.php
index 7dd1af0..f68c251 100644
--- a/src/sections/main_loop.php
+++ b/src/sections/main_loop.php
@@ -6,14 +6,15 @@
 require('sections/1_customer.php');
 require('sections/2_service.php');
 require('sections/3_modify_data.php');
+require('sections/4_get_document.php');
 
 $main_loop = true;
-$returned = [0, null]; // [code de retour, éventuelles données]
+$section = [0, null]; // [code de retour, éventuelles données]
 
 while($main_loop)
 {
     // -- MENU PRINCIPAL (niveau 1) --
-	if($returned[0] === 0)
+	if($section[0] === 0)
 	{
         echo("Menu principal\n");
 		$MenuPrincipal = new ZenityList(ZenitySetup::$menu_principal_text, ZenitySetup::$menu_principal_entrees);
@@ -24,44 +25,45 @@ while($main_loop)
 		$choix_niv1 = '';
 	}
 	
-
+    // comparaison du retour de $MenuPrincipal->get() avec les noms des entrées du même menu
+    
 	// -- SECTION 1: Clients et prospects --
-	if($choix_niv1 === ZenitySetup::$menu_principal_entrees[0] || $returned[0] === 1)
+	if($choix_niv1 === ZenitySetup::$menu_principal_entrees[0] || $section[0] === 1)
 	{
 		echo("choix: ". ZenitySetup::$menu_principal_entrees[0] . "\n");
-		$returned = newCustomer();
+		$section = newCustomer();
 	}
     
     // -- SECTION 2: Prestations et devis --
-    elseif($choix_niv1 === ZenitySetup::$menu_principal_entrees[1] || $returned[0] === 2)
+    elseif($choix_niv1 === ZenitySetup::$menu_principal_entrees[1] || $section[0] === 2)
 	{
 		echo("choix: ". ZenitySetup::$menu_principal_entrees[1] . "\n");
-		$returned = newService($returned[1]); // $returned[1] vaut un type Clients ou null
+		$section = newService($section[1]); // $section[1] vaut un type Clients ou null
 	}
     
     // -- SECTION 3: Modifier un enregistrement --
-    elseif($choix_niv1 === ZenitySetup::$menu_principal_entrees[2] || $returned[0] === 3)
+    elseif($choix_niv1 === ZenitySetup::$menu_principal_entrees[2] || $section[0] === 3)
 	{
 		echo("choix: " . ZenitySetup::$menu_principal_entrees[2] . "\n");
-		$returned = modifyData();
+		$section = modifyData($section[1]); // $section[1] vaut un type Clients ou null
 	}
 	
 	// -- SECTION 4: Consulter, Imprimer un document --
-	elseif($choix_niv1 === ZenitySetup::$menu_principal_entrees[3] || $returned[0] === 4) // = Imprimer un document
+	elseif($choix_niv1 === ZenitySetup::$menu_principal_entrees[3] || $section[0] === 4) // = Imprimer un document
 	{
 		echo("choix: ". ZenitySetup::$menu_principal_entrees[3] . "\n");
-        $returned = getDocument();
+        $section = getOrPrintDocument();
 	}
     
     // -- SECTION 5: Consulter/analyser les données --
-	elseif($choix_niv1 === ZenitySetup::$menu_principal_entrees[4] || $returned[0] === 5)
+	elseif($choix_niv1 === ZenitySetup::$menu_principal_entrees[4] || $section[0] === 5)
 	{
 		echo("choix: ". ZenitySetup::$menu_principal_entrees[4] . "\n");
 		// quel affichage? des tableaux avec zenity? LaTeX? une page web? un autre outil servant à faire des tableaux et graphiques
 	}
 
 	// -- SECTION 6: Supports de communication --
-	elseif($choix_niv1 === ZenitySetup::$menu_principal_entrees[5] || $returned[0] === 6) // = Communication
+	elseif($choix_niv1 === ZenitySetup::$menu_principal_entrees[5] || $section[0] === 6) // = Communication
 	{
 		echo("choix: ". ZenitySetup::$menu_principal_entrees[5] . "\n");
 		$MenuCommunication = new ZenityList(ZenitySetup::$menu_communication_text, ZenitySetup::$menu_communication_entrees);
@@ -85,7 +87,7 @@ while($main_loop)
 	}
 
 	// -- SECTION 7: BDD --
-	elseif($choix_niv1 === ZenitySetup::$menu_principal_entrees[6] || $returned[0] === 7) // = Base de données
+	elseif($choix_niv1 === ZenitySetup::$menu_principal_entrees[6] || $section[0] === 7) // = Base de données
 	{
 		echo("choix: ". ZenitySetup::$menu_principal_entrees[6] . "\n");
 		if($sqlitebrowser_enable)
-- 
cgit v1.2.3