From c729d548cc9ce90994413a4883fb48efc00919fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20LAVERGNE?= Date: Mon, 6 Nov 2023 09:24:46 +0100 Subject: [PATCH] N/A --- src/display.c | 15 --------------- src/exe | Bin 0 -> 26096 bytes src/login.c | 1 + src/main.h | 2 +- src/panier.c | 4 +++- 5 files changed, 5 insertions(+), 17 deletions(-) create mode 100644 src/exe create mode 100644 src/login.c diff --git a/src/display.c b/src/display.c index 2e25067..53548af 100644 --- a/src/display.c +++ b/src/display.c @@ -2,20 +2,6 @@ void displayItem(int tabReference[], float weight[], float volume[], float unitPrice[], int tlog) { - /* - Affichage des données d'un article choisi par sa référence sous forme: - référence poids volume prix - Avec la référence unique du produit, le poids du produit, le volume du produit et son prix à l'unité. - - +param tabReference: tableau des références des articles - +param weight: tableau des poids des articles - +param volume: tableau des volumes des articles - +param unitPrice: tableau des prix à l'unité des articles - +param tlog: taille logique des tableaux des articles - - +var reference: référence de l'article recherché - +var index: index de l'article recherché dans le tableau - */ int reference, index; printf("Entrez la référence de l'article cherché: "); scanf("%d", &reference); @@ -127,7 +113,6 @@ void displayClientList(int clientID[], float cagnotte[], int suspended[], int is * @return Rien */ void display_basket(int basket_tab_ref[], int basket_qte[], float weight[], float volume[], float unitPrice[], float *cagnotte,float weight_constraint, float volume_constraint, int tlog, int tlog_basket) - { float total_weight_line[], total_volume_line[], total_price_line[], cagnotte_line[], total_weight, total_volume, total_price; int i; diff --git a/src/exe b/src/exe new file mode 100644 index 0000000000000000000000000000000000000000..91811c85ed3f5bc96c0c4b06c0ab642770ae1a84 GIT binary patch literal 26096 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 literal 0 HcmV?d00001 diff --git a/src/login.c b/src/login.c new file mode 100644 index 0000000..46015fa --- /dev/null +++ b/src/login.c @@ -0,0 +1 @@ +#include "main.h" diff --git a/src/main.h b/src/main.h index f4c767f..611c6ba 100644 --- a/src/main.h +++ b/src/main.h @@ -30,7 +30,7 @@ void inputItem(int tabReference[], float tabWeight[], float tabVolume[], float u void deleteItem(int tabReference[], float tabWeight[], float tabVolume[], float unitPrice[], int *tlog); //! AFFICHAGE DES DONNEES -void displayAItem(int reference[], float weight[], float volume[], float unitPrice[], int tlog); +void displayItem(int tabReference[], float weight[], float volume[], float unitPrice[], int tlog); void displayItemList(int reference[], float weight[], float volume[], float unitPrice[], int log); void displayClient(int clientID[], float cagnotte[], int suspended[], int isAdmin[], int tlog); void displayClientList(int clientID[], float cagnotte[], int suspended[], int isAdmin[], int tlog); diff --git a/src/panier.c b/src/panier.c index 2a5c0f6..8dfb8c0 100644 --- a/src/panier.c +++ b/src/panier.c @@ -51,6 +51,7 @@ void clientConstraint(float *weight, float *volume, float *price) * @return an integer value. */ // TODO réécrire cette documentation +//! ERREUR à corriger !! int constraintExceeded(float weightConstraint, float volumeConstraint, float *priceConstraint, float *cagnotte, float tabWeight[], float tabVolume[], float tabPrice[], int tabItemRef[], int tabBasketRef[], int tabBasketQuantity[], int tlogItem, int tlogBasket) { int index, found, i; @@ -87,7 +88,8 @@ int constraintExceeded(float weightConstraint, float volumeConstraint, float *pr printf("Vous pouvez utiliser votre cagnotte, dont le montant est de %.2f, entrez le montant à utiliser ou -1 si vous voulez retirer un article: ", *cagnotte); scanf("%f", &cagnotteUse); if (cagnotteUse == -1) - return -1; + return -1; + while (cagnotteUse > *cagnotte || totalPrice-cagnotteUse > *priceConstraint) { if (cagnotteUse > *cagnotte)