From 9cd95e4b3318f52b333e9bf946f6ddc7f171a6e8 Mon Sep 17 00:00:00 2001
From: "julien.abadie" <julien.abadie@etu.uca.fr>
Date: Tue, 7 Nov 2023 16:22:09 +0100
Subject: [PATCH] correction sur basket add(ajout de l'appel de basket_display)

---
 src/display.c | 45 ++++++++++++++++++++++-----------------------
 src/main.h    |  2 +-
 src/panier.c  | 40 ++++++++++++++++++++--------------------
 3 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/src/display.c b/src/display.c
index 5127a09..fb28a71 100644
--- a/src/display.c
+++ b/src/display.c
@@ -106,13 +106,11 @@ void displayClientList(int clientID[], float cagnotte[], int suspended[], int is
  * @param volume: tableau du volume des articles
  * @param unitPrice: tableau du prix unitaire des articles
  * @param cagnotte: pointeur indiquant la valeur de la cagnotte
- * @param weight_constraint: var float contenant la contrainte de la charge maximale du véicule
- * @param volume_constraint: var float contenant la contrainte du volume maximal du véicule
  * @param tlog: taille logique du tableau `tab_reference`
  * @param tlog_basket: taille logique du panier
  * @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)
+void display_basket(int basket_tab_ref[], int basket_qte[], float weight[], float volume[], float unitPrice[], float *cagnotte, int tlog, int tlog_basket)
 {
 	float total_weight_line[tlog_basket], total_volume_line[tlog_basket], total_price_line[tlog_basket], cagnotte_line[tlog_basket], total_weight, total_volume, total_price;
 	int i;
@@ -137,26 +135,27 @@ void display_basket(int basket_tab_ref[], int basket_qte[], float weight[], floa
 	printf("\t\t\t\t\tPrix total à payer: %f\t euros\n", total_price);
 	printf("\t\t\t\t\tCagnotte totale: %f\t euros\n", *cagnotte);
 
+	//constraintExceeded( weightConstraint,  volumeConstraint,  *priceConstraint,  *cagnotte,  tabWeight[],  tabVolume[],  tabPrice[],  tabItemRef[],  tabBasketRef[],  tabBasketQuantity[],  tlogItem, int tlogBasket)
 	
-	if (volume_constraint<total_volume)
-	{
-		printf("Volume actuel:%.2f\n", total_volume);
-		printf("Volume restant: Attention, dépasssement du volume autorisé de %2.f, veuillez suprimer des articles",total_volume - volume_constraint);
-	}
-	else
-	{
-		printf("Volume actuel:%.2f\n", total_volume);
-		printf("Volume restant:%2.f\n", volume_constraint - total_volume);
-	}
+	// if (volume_constraint<total_volume)
+	// {
+	// 	printf("Volume actuel:%.2f\n", total_volume);
+	// 	printf("Volume restant: Attention, dépasssement du volume autorisé de %2.f, veuillez suprimer des articles",total_volume - volume_constraint);
+	// }
+	// else
+	// {
+	// 	printf("Volume actuel:%.2f\n", total_volume);
+	// 	printf("Volume restant:%2.f\n", volume_constraint - total_volume);
+	// }
 
-	if (weight_constraint<total_weight)
-	{
-		printf("Charge actuelle:\t%2.f",total_weight);
-		printf("Attention, dépasssement de la charge autorisée de %2.f, veuillez suprimer des articles", total_weight - weight_constraint);
-	}
-	else
-	{
-		printf("Charge actuelle:\t%2.f",total_weight);
-		printf("Charge restante:\t%2.f", volume_constraint - total_volume);
-	}
+	// if (weight_constraint<total_weight)
+	// {
+	// 	printf("Charge actuelle:\t%2.f",total_weight);
+	// 	printf("Attention, dépasssement de la charge autorisée de %2.f, veuillez suprimer des articles", total_weight - weight_constraint);
+	// }
+	// else
+	// {
+	// 	printf("Charge actuelle:\t%2.f",total_weight);
+	// 	printf("Charge restante:\t%2.f", volume_constraint - total_volume);
+	// }
 }
diff --git a/src/main.h b/src/main.h
index 0e69b01..9d27a05 100644
--- a/src/main.h
+++ b/src/main.h
@@ -49,7 +49,7 @@ int searchTab(int targetTab[], int valSearched, int tLog, int *found);
 void clientConstraint(float *weight, float *volume, float *price);
 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 basket_add (int tab_reference[], float weight[], float volume[], float unitPrice[], float *cagnotte, int  basket_tab_ref[], int basket_tab_qte[],int tlog, int tlog_basket);
-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);
+void display_basket(int basket_tab_ref[], int basket_qte[], float weight[], float volume[], float unitPrice[], float *cagnotte, int tlog, int tlog_basket);
 int reinit_basket(int tlog_basket);
 int basket_del_article( int basket_tab_ref[], int basket_tab_qte[], int tlog_basket);
 
diff --git a/src/panier.c b/src/panier.c
index 6264c19..3762247 100644
--- a/src/panier.c
+++ b/src/panier.c
@@ -30,27 +30,29 @@ void clientConstraint(float *weight, float *volume, float *price)
 	}
 }
 
+
+// TODO réécrire cette documentation
 /**
- * The function checks if the weight, volume, and price constraints are exceeded and allows the user to
- * use their cagnotte (a type of credit) to stay within the price constraint.
+ * The function checks if the weight, volume, and price constraints are exceeded based on the items in
+ * the basket and the given constraints.
  * 
- * @param weightConstraint The weight constraint for the vehicle `float`.
- * @param volumeConstraint The volume constraint is the maximum volume that the vehicle can hold. It is
- * a float value.
+ * @param weightConstraint The maximum weight constraint for the vehicle.
+ * @param volumeConstraint The volume constraint is the maximum volume that the vehicle can hold.
  * @param priceConstraint A pointer to a float variable representing the maximum budget constraint.
- * @param tabWeight An array containing the weights of each item in the inventory.
- * @param tabVolume tabVolume is an array that stores the volume of each item in the inventory.
- * @param tabUnitPrice tabUnitPrice is an array that stores the unit price of each item in the
- * inventory.
- * @param tabQuantity tabQuantity is an array that stores the quantity of each item in the shopping
- * cart.
- * @param tlog The parameter "tlog" represents the number of items in the inventory or the number of
- * items in the transaction log.
- * @param cagnotte A pointer to a float variable representing the amount of money available for use.
- * 
- * @return an integer value.
+ * @param cagnotte A pointer to a float variable representing the amount of money in the user's
+ * account.
+ * @param tabWeight An array containing the weights of each item in the log.
+ * @param tabVolume tabVolume is an array that stores the volume of each item in the shopping basket.
+ * @param tabPrice tabPrice is an array that stores the prices of items in a shopping basket.
+ * @param tabItemRef An array containing the reference numbers of the items in the inventory.
+ * @param tabBasketRef tabBasketRef is an array that contains the references of the items in the
+ * basket.
+ * @param tabBasketQuantity An array that stores the quantity of each item in the basket.
+ * @param tlogItem The parameter "tlogItem" represents the number of items in the log.
+ * @param tlogBasket The parameter "tlogBasket" represents the number of items in the shopping basket.
+ * @return an integer value. If the constraints for weight, volume, or price are exceeded, the function
+ * returns -1. Otherwise, it returns 0.
  */
-// TODO réécrire cette documentation
 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;
@@ -154,9 +156,7 @@ int basket_add (int tab_reference[], float weight[], float volume[], float unitP
 	*cagnotte = *cagnotte + *cagnotte*0.10;
 	tlog_basket = tlog_basket+1;
 
-	//! A corriger
-	//display_basket(basket_tab_ref, basket_tab_qte, weight, volume, unitPrice, *cagnotte, weight_constraint,  volume_constraint,  tlog,  tlog_basket);
-	
+	display_basket( basket_tab_ref, basket_tab_qte, weight, volume, unitPrice, *cagnotte, tlog,  tlog_basket);
 	return tlog_basket;
 }