From 45f1b99a1060ee43deb6055faef1f8b16b5d80a2 Mon Sep 17 00:00:00 2001
From: polo <ordipolo@gmx.fr>
Date: Fri, 1 Sep 2023 12:00:23 +0200
Subject: =?UTF-8?q?section=203=20bient=C3=B4t=20termin=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sections/2_service.php | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

(limited to 'src/sections/2_service.php')

diff --git a/src/sections/2_service.php b/src/sections/2_service.php
index 2680db6..1d58606 100644
--- a/src/sections/2_service.php
+++ b/src/sections/2_service.php
@@ -7,14 +7,13 @@ function newService($Client): array // $Client est un Client ou null
 {
     // fenêtres
     $MenuEnregistrement = new ZenityList(ZenitySetup::$menu_enregistrement_text, ZenitySetup::$menu_enregistrement_entrees);
-    $Calendrier = new ZenityCalendar(ZenitySetup::$calendar_text);
+    $Calendrier = new ZenityCalendar(ZenitySetup::$calendar['section2']);
     $FormulaireDevis = new ZenityForms(ZenitySetup::$formulaire_text, ZenitySetup::$formulaire_devis_entrees);
     $FormulaireFacture = new ZenityForms(ZenitySetup::$formulaire_text, ZenitySetup::$formulaire_facture_entrees);
     $FormulaireCesu = new ZenityForms(ZenitySetup::$formulaire_text, ZenitySetup::$formulaire_cesu_entrees);
     $FormulaireLocation = new ZenityForms(ZenitySetup::$formulaire_text, ZenitySetup::$formulaire_location_entrees);
     $CommentairePrestation = new ZenityEntry(ZenitySetup::$commentaire_prestation_text);
     //$Recapitulatif = new ZenityList(ZenitySetup::$recapitulatif_text, ZenitySetup::$recapitulatif_entrees); // tableau à multiples colonnes
-    //$QuestionModifierPrestation = new ZenityQuestion(ZenitySetup::$question_modification_text);
     $FinSection2 = new ZenityList(ZenitySetup::$fin_section_2_text, ZenitySetup::$fin_section_2_entrees);
     
     
@@ -178,31 +177,15 @@ function newService($Client): array // $Client est un Client ou null
     // fabrique d'objets (sans connaître les noms des classes)
     $EnveloppeRecto = Latex::makeInstance('enveloppe_recto');
     $EnveloppeVerso = Latex::makeInstance('enveloppe_verso');
-    $DocumentPresta = Latex::makeInstance($Presta->getTypePresta()); // $type = facture, devis, location
+    $DocumentPresta = Latex::makeInstance($Presta->getTypePresta()); // retourne objet ou null
     
     // génération du latex
     $EnveloppeRecto->setData($Client);
-    //~ $EnveloppeRecto->setFileName($Client->getCodeClient() . '.tex');
-    //~ $EnveloppeRecto->setLatexPath(Config::$latex_path . 'enveloppes_recto/');
-    //~ $EnveloppeRecto->setPdfPath(Config::$pdf_path . 'enveloppes_recto/');
-    //~ $EnveloppeRecto->spacesInPostCode();
     $EnveloppeRecto->makeLatex();
-    
-    //~ $EnveloppeVerso->setFileName('enveloppe_verso.tex');
-    //~ $EnveloppeVerso->setLatexPath(Config::$latex_path);
-    //~ $EnveloppeVerso->setPdfPath(Config::$pdf_path);
     $EnveloppeVerso->makeLatex();
-    
     if($DocumentPresta !== null)
     {
         $DocumentPresta->setData($Client)->setData($Presta)->setData($PrestaDetails);
-        //~ $DocumentPresta->setData($Client);
-        //~ $DocumentPresta->setData($Presta);
-        //~ $DocumentPresta->makeDateInstance($Presta->getDate()); // paramètre = int
-        //~ $DocumentPresta->setFileName($Presta->getCodePresta() . '.tex');
-        //~ $DocumentPresta->setLatexPath(Config::$latex_path . $DocumentPresta->getYear() . '/');
-        //~ $DocumentPresta->setPdfPath(Config::$pdf_path . $DocumentPresta->getYear() . '/');
-        //~ $DocumentPresta->setData($PrestaDetails);
         $DocumentPresta->makeLatex();
     }
     
@@ -236,7 +219,7 @@ function newService($Client): array // $Client est un Client ou null
     }
     elseif($choix_niv2 === ZenitySetup::$fin_section_2_entrees[1])
     {
-        return [3, null]; // section 3: modifyData()
+        return [3, $Client]; // section 3: modifyData()
     }
     elseif($choix_niv2 === ZenitySetup::$fin_section_2_entrees[2])
     {
-- 
cgit v1.2.3