From 966b93a150412638d9fd03336ae2e384afa23b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A9o=20Hersan?= Date: Sat, 28 Oct 2023 19:20:21 +0200 Subject: [PATCH] all function are working MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mathéo Hersan --- app | Bin 34928 -> 35008 bytes donnee/panier.txt | 4 -- src/app/core_logic/client.c | 63 +++++++++++++++++++++++++-- src/app/core_logic/client.h | 5 ++- src/app/interface/interface_client.c | 47 ++++++++++++-------- 5 files changed, 91 insertions(+), 28 deletions(-) delete mode 100644 donnee/panier.txt diff --git a/app b/app index 2b48d8b2c56ce7f88f817e511b55c34ac032504c..f78c2934cff643fc1d6fa56749e480efa4e67313 100755 GIT binary patch delta 5690 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 5) { - while (getchar() != '\n'); // Nettoie le tampon d'entrée en cas de saisie invalide + while (scanf("%d", choix) != 1 || *choix < 0 || *choix > 9) { + while (getchar() != '\n'); affiche_client(jour); printf("Veuillez entrer un choix valide : "); } @@ -42,10 +43,13 @@ void global_client() { float prixUnitaire[MAX_ARTICLES]; int numeros[MAX_CLIENTS]; float cagnottes[MAX_CLIENTS]; - int suspendus[MAX_CLIENTS]; // Ajout du tableau des clients suspendus + int suspendus[MAX_CLIENTS]; int nombreArticles, nombreClients; float volumeCoffre, chargeMaximale; int numeroClient; + int quantites[MAX_ARTICLES]; + int panier[MAX_ARTICLES]; + int taillePanier = 0; nombreArticles = chargementArticles(references, poids, volume, prixUnitaire, MAX_ARTICLES); nombreClients = charger_clients(numeros, cagnottes, suspendus, MAX_CLIENTS); @@ -77,21 +81,26 @@ void global_client() { return; } - menu_client(&choix, jour); + do{ + menu_client(&choix, jour); - switch (choix) { - case 1: - affiche_client(jour); - break; - case 2: - ajouter_article_au_panier(numeroClient, references, poids, volume, prixUnitaire, numeros, cagnottes, - suspendus, nombreArticles, nombreClients, volumeCoffre, chargeMaximale); - break; - case 3: - //supprimer_article_du_panier(panier, &taillePanier); - break; - default: - printf("Veuillez entrer un choix valide !\n"); - break; - } + switch (choix) { + case 1: + affiche_recap_panier(panier, taillePanier, references, poids, volume, prixUnitaire, quantites); + break; + case 2: + ajouter_article_au_panier(numeroClient, references, poids, volume, prixUnitaire, numeros, cagnottes, + suspendus, nombreArticles, nombreClients, volumeCoffre, chargeMaximale, panier, quantites, &taillePanier); + break; + case 3: + supprimer_article_du_panier(panier, &taillePanier); + break; + case 9: + printf("Au revoir !\n"); + return; + default: + printf("Veuillez entrer un choix valide !\n"); + break; + } + }while(choix != 9); }