From e4d1670166d98abe1fb99ec9f7b3a81e230a53f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Math=C3=A9o=20Hersan?=
 <matheohersan@MacBook-Pro-de-Matheo.local>
Date: Tue, 24 Oct 2023 09:59:58 +0200
Subject: [PATCH] some modifications
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mathéo Hersan <matheohersan@MacBook-Pro-de-Matheo.local>
---
 src/app/core_logic/client.h          | 2 +-
 src/app/core_logic/responsable.h     | 1 -
 src/app/interface/interface_client.h | 8 +-------
 src/app/interface/interface_resp.c   | 2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/app/core_logic/client.h b/src/app/core_logic/client.h
index e173a26..c5616b7 100644
--- a/src/app/core_logic/client.h
+++ b/src/app/core_logic/client.h
@@ -8,6 +8,6 @@
 #include<stdio.h>
 #include<stdlib.h>
 
-void chargerClient(int tNumClient[], float tCagnotte[], int tSus[], int *tLogique);
+void ajouter_article(int reference, float poids, float volume, int prixUnitaire);
 
 #endif //SAE_101_CLIENT_H
diff --git a/src/app/core_logic/responsable.h b/src/app/core_logic/responsable.h
index 4230671..50a38c8 100644
--- a/src/app/core_logic/responsable.h
+++ b/src/app/core_logic/responsable.h
@@ -2,4 +2,3 @@
 
 int chargementArticles(int tRef[], float tPoids[], float tVol[], float tPrix[], int tPhysique);
 void sauvegardArticles(int tRef[], float tPoids[], float tVol[], float tPrix[], int tLogique);
-int ajouterArticle( int tRef[], float tPoids[], float tVol[], float tPrix[], int *tLogique, int tPhysique, int ref, float poids, float volume, float prix);
\ No newline at end of file
diff --git a/src/app/interface/interface_client.h b/src/app/interface/interface_client.h
index 4503034..f091e36 100644
--- a/src/app/interface/interface_client.h
+++ b/src/app/interface/interface_client.h
@@ -1,11 +1,5 @@
 #include<stdio.h>
 
 void affiche_client(int a);
-<<<<<<< HEAD
-void menu(int *choix, int a);
-void global_client();
-void demander_article(int reference, float poids, float volume, int prixUnitaire);
-=======
 void menu_client(int *choix, int a);
-void global_client();
->>>>>>> 91542d8 (fixed some bugs on resp. Added global_resp and added error handling for char)
+void global_client();
\ No newline at end of file
diff --git a/src/app/interface/interface_resp.c b/src/app/interface/interface_resp.c
index 1b98df7..b73d932 100644
--- a/src/app/interface/interface_resp.c
+++ b/src/app/interface/interface_resp.c
@@ -123,7 +123,7 @@ void menu_resp(int *choix, int jour) {
 }
 
 void global_resp(){
-    int choix, a, tRef[100], tLogique = 0;
+    int choix, a = 0, tRef[100], tLogique = 0;
     float tPoids[100], tVol[100], tPrix[100];
     menu_resp(&choix, a);
     switch (choix) {