From d6157c8d1674ec7a1da53b6e7747b11daee1ed22 Mon Sep 17 00:00:00 2001
From: "louis.germain" <louis.germain@etu.uca.fr>
Date: Fri, 10 Nov 2023 09:24:49 +0100
Subject: [PATCH] fix de divers erreurs

---
 src/decalage.c |  20 ++++++++++++++------
 src/display.c  |  17 ++++++++---------
 src/exe        | Bin 26096 -> 39560 bytes
 src/login.c    |  23 ++++++++++++-----------
 src/main.c     |  18 ++++++++----------
 src/main.h     |  17 ++++++++++-------
 src/menu.c     |   6 +++---
 src/modif.c    |   8 ++++----
 src/panier.c   |   8 ++++----
 9 files changed, 63 insertions(+), 54 deletions(-)
 mode change 100644 => 100755 src/exe

diff --git a/src/decalage.c b/src/decalage.c
index 59ac7b5..483a0cd 100644
--- a/src/decalage.c
+++ b/src/decalage.c
@@ -8,18 +8,26 @@
 
 #include "main.h"
 
-void decalageADroite(int tab[], int index, int tlog)
+void decalageADroiteInt(int tab[], int index, int tlog)
 {
     for (int i = tlog; i > index; i--)
-    {
         tab[i] = tab[i-1];
-    }
 }
 
-void decalageAGauche(int tab[], int index, int tlog)
+void decalageAGaucheInt(int tab[], int index, int tlog)
+{
+    for (int i = index; i < tlog; i++)
+        tab[i] = tab[i+1];
+}
+
+void decalageADroiteFloat(float tab[], int index, int tlog)
+{
+    for (int i = tlog; i > index; i--)
+        tab[i] = tab[i-1];
+}
+
+void decalageAGaucheFloat(float tab[], int index, int tlog)
 {
     for (int i = index; i < tlog; i++)
-    {
         tab[i] = tab[i+1];
-    }
 }
\ No newline at end of file
diff --git a/src/display.c b/src/display.c
index 8a155df..7925d39 100644
--- a/src/display.c
+++ b/src/display.c
@@ -117,7 +117,7 @@ void display_basket(int basket_tab_ref[], int tabItemRef[], int basket_qte[], fl
 {
 	float total_weight_line[tlog_basket], total_volume_line[tlog_basket], total_price_line[tlog_basket];
 	float totalWeight = 0, totalVol = 0, total_price = 0, weight[tmaxArticles], volume[tmaxArticles], unitPrice[tmaxArticles];
-	int i, found, index, j = 0;
+	int i, found, index;
 
 		
 	printf("Récapitulatif de votre panier:\n");
@@ -128,14 +128,13 @@ void display_basket(int basket_tab_ref[], int tabItemRef[], int basket_qte[], fl
 		index = searchTab(tabItemRef, basket_tab_ref[i], tlogItem, &found);
 		if (found == 1)
 		{
-			weight[j] = tabWeight[index];
-			volume[j] = tabVolume[index];
-			unitPrice[j] = tabUnitPrice[index];
-			j++;
+			weight[i] = tabWeight[index];
+			volume[i] = tabVolume[index];
+			unitPrice[i] = tabUnitPrice[index];
 		}
-		total_weight_line[i] = basket_qte[i]*weight;
-		total_volume_line[i] = basket_qte[i]*volume;
-		total_price_line[i] = basket_qte[i]*unitPrice;
+		total_weight_line[i] = basket_qte[i]*weight[i];
+		total_volume_line[i] = basket_qte[i]*volume[i];
+		total_price_line[i] = basket_qte[i]*unitPrice[i];
 		totalWeight += total_weight_line[i];
 		totalVol += total_volume_line [i];
 		total_price += total_price_line[i];
@@ -145,5 +144,5 @@ void display_basket(int basket_tab_ref[], int tabItemRef[], int basket_qte[], fl
 	printf("Prix total: %f€\n", total_price);
 	printf("Poids total: %fkg\n", totalWeight);
 	printf("Volume total: %fm³\n", totalVol);
-	printf("Cagnotte:%.2f€", cagnotte)
+	printf("Cagnotte:%.2f€", cagnotte);
 }
diff --git a/src/exe b/src/exe
old mode 100644
new mode 100755
index 91811c85ed3f5bc96c0c4b06c0ab642770ae1a84..d10b2c6427893daf04aa4c048adbcbb61f103793
GIT binary patch
literal 39560
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

literal 26096
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

diff --git a/src/login.c b/src/login.c
index 0232656..3e53c34 100644
--- a/src/login.c
+++ b/src/login.c
@@ -12,9 +12,9 @@
  * @param tlog: Taille logique des Tableaux
  * @return Est Admin ? (1 > Oui, 0 > Non, -1 > Quitter)
 */
-int login(int clientID[], int clientPassword[], int isAdmin[], int tlog)
+int login(int clientID[], int clientPassword[], int isAdmin[], int tlog, int *index)
 {
-    int id, password, index, found, tentative=3;
+    int id, password, found, tentative=3;
     printf("Entrez votre identifiant: ");
     scanf("%d%*c", &id);
     while (id < 0)
@@ -22,7 +22,7 @@ int login(int clientID[], int clientPassword[], int isAdmin[], int tlog)
         printf("Erreur, l'identifiant doit être positif, entrez votre identifiant: ");
         scanf("%d%*c", &id);
     }
-    index = searchTab(clientID, id, tlog, &found);
+    *index = searchTab(clientID, id, tlog, &found);
     while(found == 0)
     {
         printf("Erreur, l'identifiant n'existe pas, entrez votre identifiant: ");
@@ -39,7 +39,7 @@ int login(int clientID[], int clientPassword[], int isAdmin[], int tlog)
         }
         printf("Il vous reste %d tentatives.\n", tentative);
 
-        index = searchTab(clientID, id, tlog, &found);
+        *index = searchTab(clientID, id, tlog, &found);
     }
 
     printf("Entrez votre mot de passe: ");
@@ -50,9 +50,9 @@ int login(int clientID[], int clientPassword[], int isAdmin[], int tlog)
         scanf("%d%*c", &password);
     }
 
-    if (password == decrypt(clientPassword[index]))
+    if (password == decrypt(clientPassword[*index]))
     {
-        if (isAdmin[index] == 1)
+        if (isAdmin[*index] == 1)
         {
             return 1;
         }
@@ -78,20 +78,20 @@ int login(int clientID[], int clientPassword[], int isAdmin[], int tlog)
  * @param tlog: Taille logique des Tableaux
  * @return 0 > Tout s'est bien passé, -1 > L'utilisateur a quitté, -2 > La taille physique du tableau est dépassée
 */
-void signup(int clientID[], int clientPassword[], float cagnotte[], int suspended[], int isAdmin[], int *tlog)
+int signup(int clientID[], int clientPassword[], float cagnotte[], int suspended[], int isAdmin[], int *tlog)
 {
-    int id, password, index, found, status;
-    printf("Entrez votre identifiant: ");
+    int id, password, index, found;
+    printf("Entrez votre identifiant ou 0 si vous souhaitez quitter: ");
     scanf("%d%*c", &id);
     while (id < 0)
     {
-        printf("Erreur, l'identifiant doit être positif, entrez votre identifiant: ");
+        printf("Erreur, l'identifiant doit être positif, entrez votre identifiant ou 0 si vous souhaitez quitter: ");
         scanf("%d%*c", &id);
     }
     index = searchTab(clientID, id, *tlog, &found);
     while(found == 1)
     {
-        printf("Erreur, l'identifiant existe déjà, entrez votre identifiant: ");
+        printf("Erreur, l'identifiant existe déjà, entrez votre identifiant ou 0 si vous souhaitez quitter: ");
         scanf("%d%*c", &id);
         if (id == 0)
         {
@@ -110,4 +110,5 @@ void signup(int clientID[], int clientPassword[], float cagnotte[], int suspende
     }
 
     inputClient(id, password, index, clientID, clientPassword, cagnotte, suspended, isAdmin, tlog);
+    return 0;
 }
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index a94bbc0..73224b8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -50,11 +50,11 @@ int displayMenu(void)
 void global(void)
 {
     // Déclaration des variables
-    int tLogArticle, tLogClient, choice, status, currentUser;
-    int reference[tmaxArticles], clientID[tmaxClients], clientPassword[tmaxClients], suspended[tmaxClients], isAdmin[tmaxClients];
+    int tLogItem, tLogClient, tlogBasket, choice, status, currentUser, index;
+    int reference[tmaxArticles], clientID[tmaxClients], clientPassword[tmaxClients], suspended[tmaxClients], isAdmin[tmaxClients], basket_tab_ref[tmaxArticles], basket_tab_qte[tmaxArticles];
     float weight[tmaxArticles], volume[tmaxArticles], unitPrice[tmaxArticles], cagnotte[tmaxClients];
     // Chargement de toute les données
-    chargeDonnees(&tLogArticle, &tLogClient, reference, weight, volume, unitPrice, clientID, clientPassword, cagnotte, suspended, isAdmin);
+    chargeDonnees(&tLogItem, &tLogClient, reference, weight, volume, unitPrice, clientID, clientPassword, cagnotte, suspended, isAdmin);
     // Affichage du menu
     choice = displayMenu();
 
@@ -63,16 +63,14 @@ void global(void)
         switch(choice)
         {
             case 1:
-                status = login(clientID, clientPassword, isAdmin, tLogClient);
+                status = login(clientID, clientPassword, isAdmin, tLogClient, &index);
                 if(status == 1)
                 {
-                    //TODO > Menu Admin
-                    //adminMenu();
+                    adminMenu(clientID, clientPassword, cagnotte, suspended, isAdmin, reference, weight, volume, unitPrice, &tLogItem, &tLogClient);
                 }
                 else if(status == 0)
                 {
-                    //TODO > Menu Client
-                    //clientMenu();
+                    clientMenu(&weight[index], &volume[index], &unitPrice[index], reference, unitPrice, &cagnotte[index], basket_tab_ref, basket_tab_qte, weight, volume, tLogItem, &tlogBasket);
                 }
                 else
                 {
@@ -98,10 +96,10 @@ void global(void)
                 //opposition();
                 break;
             case 4:
-                sauvegardeDonnees(tLogArticle, tLogClient, reference, weight, volume, unitPrice, clientID, clientPassword, cagnotte, isAdmin, suspended);
+                sauvegardeDonnees(tLogItem, tLogClient, reference, weight, volume, unitPrice, clientID, clientPassword, cagnotte, isAdmin, suspended);
                 return;
             case 9:
-                debugMenu(reference, weight, volume, unitPrice, clientID, cagnotte, suspended, isAdmin, tLogArticle, tLogClient);
+                debugMenu(reference, weight, volume, unitPrice, clientID, cagnotte, suspended, isAdmin, tLogItem, tLogClient);
                 break;
             default:
                 printf("Erreur, veuillez entrer un choix valide.\n");
diff --git a/src/main.h b/src/main.h
index 0d8c399..3cfefa9 100644
--- a/src/main.h
+++ b/src/main.h
@@ -28,8 +28,10 @@ void sauvegardeArticles(int reference[], float weight[], float volume[], float u
 void sauvegardeClients(int clientID[], int clientPassword[], float cagnotte[], int suspended[], int isAdmin[], int tLogClient);
 
 //! DECALAGES TABLEAUX
-void decalageADroite(int tab[], int index, int tlog);
-void decalageAGauche(int tab[], int index, int tlog);
+void decalageADroiteInt(int tab[], int index, int tlog);
+void decalageAGaucheInt(int tab[], int index, int tlog);
+void decalageADroiteFloat(float tab[], int index, int tlog);
+void decalageAGaucheFloat(float tab[], int index, int tlog);
 
 //! GESTION CLIENTS
 void inputClient(int id, int passwd, int index, int clientID[], int clientPassword[], float cagnotte[], int suspended[], int isAdmin[], int *tlog);
@@ -53,12 +55,13 @@ 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);
 void basket_add(int tab_reference[], float unitPrice[], float *cagnotte, int  basket_tab_ref[], int basket_tab_qte[], int tlogItem, int *tlog_basket);
-void display_basket(int basket_tab_ref[], int basket_qte[], float weight[], float volume[], float cagnotte[], float unitPrice[], int tlog, int tlog_basket);
-void basket_del_article(int basket_tab_ref[], int basket_tab_qte[], int *tlog_basket)
+void display_basket(int basket_tab_ref[], int tabItemRef[], int basket_qte[], float tabWeight[], float tabVolume[], float cagnotte, float tabUnitPrice[], int tlogItem, int tlog_basket);
+void reinit_basket(int *tlog_basket);
+void basket_del_article(int basket_tab_ref[], int basket_tab_qte[], int *tlog_basket);
 
 //! LOGIN
-int login(int clientID[], int clientPassword[], int isAdmin[], int tlog);
-void signup(int clientID[], int clientPassword[], float cagnotte[], int suspended[], int isAdmin[], int *tlog);
+int login(int clientID[], int clientPassword[], int isAdmin[], int tlog, int *index);
+int signup(int clientID[], int clientPassword[], float cagnotte[], int suspended[], int isAdmin[], int *tlog);
 
 //! MOT DE PASSE
 int encrypt(int password);
@@ -66,4 +69,4 @@ int decrypt(int password);
 
 //! MENUS
 void adminMenu(int clientID[], int clientPassword[], float cagnotte[], int suspended[], int isAdmin[], int tabReference[], float tabWeight[], float tabVolume[], float unitPrice[], int *tlogItem, int *tlogClient);
-void clientMenu(float *weight, float *volume, float *price, int tabItemRef[], float unitPrice[], float *cagnotte, int basket_tab_ref[], int basket_tab_qte[], float tabWeight[], float tabVolume[], float tabPrice[], int tlogItem, int *tlogBasket);
\ No newline at end of file
+void clientMenu(float *weight, float *volume, float *price, int tabItemRef[], float unitPrice[], float *cagnotte, int basket_tab_ref[], int basket_tab_qte[], float tabWeight[], float tabVolume[], int tlogItem, int *tlogBasket);
\ No newline at end of file
diff --git a/src/menu.c b/src/menu.c
index 1b62717..c37aeb3 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -5,7 +5,7 @@
 
 #include "main.h"
 
-void clientMenu(float *weight, float *volume, float *price, int tabItemRef[], float unitPrice[], float *cagnotte, int basket_tab_ref[], int basket_tab_qte[], float tabWeight[], float tabVolume[], float tabPrice[], int tlogItem, int *tlogBasket)
+void clientMenu(float *weight, float *volume, float *price, int tabItemRef[], float unitPrice[], float *cagnotte, int basket_tab_ref[], int basket_tab_qte[], float tabWeight[], float tabVolume[], int tlogItem, int *tlogBasket)
 {
 	int choice = 0, constraint;
     while (choice != 6)
@@ -29,12 +29,12 @@ void clientMenu(float *weight, float *volume, float *price, int tabItemRef[], fl
     			break;
     		case 2:
 				basket_add(tabItemRef, unitPrice, cagnotte, basket_tab_ref, basket_tab_qte, tlogItem, tlogBasket);
-				constraint = constraintExceeded(*weight, *volume, price, cagnotte, tabWeight, tabVolume, tabPrice, tabItemRef, basket_tab_ref, basket_tab_qte, tlogItem, *tlogBasket);
+				constraint = constraintExceeded(*weight, *volume, price, cagnotte, tabWeight, tabVolume, unitPrice, tabItemRef, basket_tab_ref, basket_tab_qte, tlogItem, *tlogBasket);
 				if (constraint == -1)
 					basket_del_article(basket_tab_ref, basket_tab_qte, tlogBasket);
     			break;
     		case 3:
-				display_basket(basket_tab_ref[], tabItemRef[], basket_tab_qte[], tabWeight[], tabVolume[], *cagnotte, tabPrice[], tlogItem, *tlogBasket);
+				display_basket(basket_tab_ref, tabItemRef, basket_tab_qte, tabWeight, tabVolume, *cagnotte, unitPrice, tlogItem, *tlogBasket);
     			break;
     		case 4:
 				reinit_basket(tlogBasket);
diff --git a/src/modif.c b/src/modif.c
index 686486d..c442074 100644
--- a/src/modif.c
+++ b/src/modif.c
@@ -28,10 +28,10 @@ void inputClient(int id, int passwd, int index, int clientID[], int clientPasswo
     }
     
     // Décalage
-    decalageADroite(clientID, index, *tlog);
-    decalageADroite(cagnotte, index, *tlog);
-    decalageADroite(suspended, index, *tlog);
-    decalageADroite(isAdmin, index, *tlog);
+    decalageADroiteInt(clientID, index, *tlog);
+    decalageADroiteFloat(cagnotte, index, *tlog);
+    decalageADroiteInt(suspended, index, *tlog);
+    decalageADroiteInt(isAdmin, index, *tlog);
 
     clientID[index] = id;
     clientPassword[index] = encrypt(passwd);
diff --git a/src/panier.c b/src/panier.c
index 8768f3b..bc97423 100644
--- a/src/panier.c
+++ b/src/panier.c
@@ -106,7 +106,7 @@ int constraintExceeded(float weightConstraint, float volumeConstraint, float *pr
 void basket_add(int tab_reference[], float unitPrice[], float *cagnotte, int  basket_tab_ref[], int basket_tab_qte[], int tlogItem, int *tlog_basket)
 {
 	int ref_to_add, qte_to_add, trouve, index_ajout;
-	float total_weight[tlog_basket], total_volume[tlog_basket], total_price[tlog_basket], total_cagnotte[tlog_basket];
+	float total_weight[tmaxArticles], total_volume[tmaxArticles], total_price[tmaxArticles], total_cagnotte[tmaxArticles];
 	printf("Quelle référence souhaitez-vous ajouter au panier?");
 	scanf("%d", &ref_to_add);
 	index_ajout = searchTab(tab_reference, ref_to_add, tlogItem, &trouve);
@@ -155,12 +155,12 @@ void basket_del_article(int basket_tab_ref[], int basket_tab_qte[], int *tlog_ba
 
 	printf("Quelle référence voulez vous supprimer de votre panier?\n");
 	scanf("%d",&ref_to_del);
-	index_to_del = searchTab(basket_tab_ref, ref_to_del, tlog_basket, &trouve);
+	index_to_del = searchTab(basket_tab_ref, ref_to_del, *tlog_basket, &trouve);
 	while (trouve == 0)
 	{
 		printf("Erreur, la valeur que vous voulez supprimer n'existe pas, réssayez");
 		scanf("%d",&ref_to_del);
-		index_to_del = searchTab(basket_tab_ref, ref_to_del, tlog_basket, &trouve);
+		index_to_del = searchTab(basket_tab_ref, ref_to_del, *tlog_basket, &trouve);
 	}
 	if (basket_tab_qte[index_to_del]>1)
 	{
@@ -184,7 +184,7 @@ void basket_del_article(int basket_tab_ref[], int basket_tab_qte[], int *tlog_ba
 		}
 		else if (qte_to_del==basket_tab_qte[index_to_del])
 		{
-			for (i=tlog_basket; i>index_to_del; i--)
+			for (i=*tlog_basket; i>index_to_del; i--)
 			{
 				basket_tab_ref[i]=basket_tab_ref[i+1];
 				basket_tab_qte[i]=basket_tab_qte[i+1];