From 29f703f82a2a73c5a5cd9c6ceadf33cc545afeed Mon Sep 17 00:00:00 2001 From: Yannis Doumir Fernandes Date: Mon, 16 Oct 2023 09:13:18 +0200 Subject: [PATCH 01/13] MODIFY README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9f70f83..2b2d3d4 100644 --- a/README.md +++ b/README.md @@ -37,4 +37,5 @@ Cette commande nettoie, construit et exécute l'application. chmod +x build.sh - Si vous ne spécifiez aucune option lors de l'exécution du script, il affichera un message d'erreur vous indiquant d'utiliser --help pour afficher l'aide : ```bash - ./build.sh --help \ No newline at end of file + ./build.sh --help + -- 2.36.3 From a2a2577bafb921145dc5d993c8dfc51a41679fde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A9o=20Hersan?= Date: Mon, 16 Oct 2023 09:49:39 +0200 Subject: [PATCH 02/13] start of client fonctions --- .idea/.gitignore | 8 ++++++++ .idea/misc.xml | 18 ++++++++++++++++++ .idea/vcs.xml | 6 ++++++ build/APP | Bin 16608 -> 0 bytes src/app/interface/client/interface_client.c | 2 ++ src/app/interface/client/interface_client.h | 14 ++++++++++++++ src/app/interface/resp/interface_resp.c | 1 + src/main.c | 2 ++ 8 files changed, 51 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml delete mode 100755 build/APP diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..53624c9 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build/APP b/build/APP deleted file mode 100755 index adb216275c0c462cfeb48615c2dddacfc30aa1e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16608 zcmeHOU2Ggz6~60@W9M(Z`2#0`W+xZy>^f^_Tx}BLI&A_?CTs87yRbj* z?kur`pdoHiSHUF@JRk%T2p-x#6_EPUN+e2D;GrlHqC`R!Zq*7mqQwD%Qb@C$bLW2R znb|cU9)O3rlIOeUJ3sf%nLD$0Joi2^5Fc#v`2>nzJSbS23R+A=DNgQD6@rN96>I2t zm-whyN%9KGS^9_tq_s-A$%(Cs_Y<<;vr6yAk0?7JddSFr%axPOmIf%)d9a^UDH%NQ zRn-6xe62lAwdlfOlSUidZb8~ zTQ=T4{@Wu`Em{aLrYy!gdKvIC;AOzefR_O;16~Ha40sv%|H*(p`-fKjT=VO@gwUV5 zU^Z2+=(CqwFV#9&-Tfx1s`tD_$F}VesJ9*xg6-%rzYeQw>aNUhKHz05H;4^qs(v~7<` zszQQ3*L;>?&n=xBP~~QHG+McRM4#)NBKqO@&JQ?e z3#B{Ns($eUzqzgJw{6=+yz-}b<-J(t_tEO6-|4fLeEOc(%hx%VpF19XEP6b8B5F{Z zg0Ga!x#Ox4=@l;nUIx4jcp30A;AOzefR_O;16~Ha40svvGGNPqkG@vvscg2OJz6Mc zlft*n{{VmMjs~VdIf`ftfhuYShYCR+NZGGUApWY!q zd$K>hzKdzH!?!>-XZ|tznn*n^8S6B+ zDH-ovTa}FUn(|$bIOuQQsTSCzRV}{6n#yZR##+j-l2@yEXBDnd*shS*&)SP}qnA{R z#Trc5<2{qtXL6D6goL{42>7R0NOi5>7c5cGVpUlX@9$OXe2A2%NMCQ|`K6UVeFc^> z@=ULZQvR&czpvz4zg7JIHeg-3yWJiv)Kvq$(d)`5>-}`sX$|>xBGQl#h~b8Oo4|eQY?q8R zJ7d-TVtsABzg_F6mFmL{?KcYC_fGpw0{6R<-z*x9E5G=V!1`>bJ>88FJ7d-TqFrbW z`7I*ckjGPKDHh*>+`={|Gy*cH;DMh5Mc=$o$vEfy|L~(z9i$+U&qVJ z-aQ_EBl-GqbzR1(zrH`Dgf!7EqPqKn_zjeY3+i_Vc?(iSlWjN;Ny*oblY5D8wC|#i z_#lld_xM@O_D%KoQEZtwV=9h&d=`jr)X%RFzrLwm;5mx3ILACEK{=_P2k~v~M<3(~mijZno_(#jtDw(vjJ=ZR-~_xZl4?D0Io@8L_tb3fhoKO7)xZ0q**AIj6``_j2CiK z*_4?|hQf_4cuz~lNEC~S86%Z9i!)-Pn8>A!WI30cAs3rukfrG`HH^WL=)nPF;84t< z9V||Rq%dN~4n+?R?RRSArWvAW^N=y1s|b2*L>LF+hx?;(E5Myb(j?>6sBWoiLnL2mn7|Bw>NGI}1-mx=un5>eS zyiqQt==7F)#+e~`tW;8AS+p>XS|(2$ zil#&;Uocal$$U99R?g6-u1r!<(f*-MGchToE}bZ)MJPFwr+5~cMN9L=RI!vP|9zSGMkckeZ(rUz{lN1D!L^C@qeYcF8Yu88W8Q{eLzm8Z7~l~o#+1W$Gi^stg^*^ zFZg4g{s`%Ljtzgz|A1$eKY(*>FDFRgxjg(aPXq>(G5QZX;1@{G?*@=Dp9E^k-`#&j zi_=u$oWdXTPT&P)i1yv*|D^KoS9W;c0U}TA&%Xg~|7VEfoZ$V8f2w3rh~Evx){UPE zDeV55@~a^n6}rNUZ@T;=$^eM|A`E2UcU}JYy#qe(y5MLZ@qXa)$2=Q|_d?k7wX&Dz zNZ=-L{e-5p3f=9w{eMK}cK;y!6z(Oxy}12$gb9Ch*7m z$F*JTB}9h>wIlq2*8FwJUqqB?*g{Q-0Qdp_ObUDZTEw!{lt23E_J{mFRX7&G z`J)}!t8_pVcc{jkGOzLQ$NztzfWIAUV;4q*M-fmZo_~k + +void affiche_client() +{ + printf("\n"); + printf("--------------- \n"); + printf("|| Bonjour ! ||\n") ; + printf("--------------- \n"); + printf("\n"); + printf("-------------------------------------------------------------------\n"); + printf("|| Que voulez-vous faire ? \t \t \t \t \t || \n") ; + printf("||\t1 : Afficher le récapitulatif de votre panier. \t \t \t \t || \n") ; + printf("-------------------------------------------------------------------\n"); +} \ No newline at end of file diff --git a/src/app/interface/resp/interface_resp.c b/src/app/interface/resp/interface_resp.c index e69de29..b62b362 100644 --- a/src/app/interface/resp/interface_resp.c +++ b/src/app/interface/resp/interface_resp.c @@ -0,0 +1 @@ +#include "interface_resp.h" \ No newline at end of file diff --git a/src/main.c b/src/main.c index 953296e..78fcf98 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,7 @@ #include #include +#include "app/interface/client/interface_client.h" +#include "app/interface/resp/interface_resp.h" int main(){ printf("Hello World\n"); -- 2.36.3 From 275a0c651a66fdba54ce9311e20dad37474e1fbd Mon Sep 17 00:00:00 2001 From: Matheo HERSAN Date: Mon, 16 Oct 2023 09:50:42 +0200 Subject: [PATCH 03/13] Update '.gitignore' --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5099263..4b38715 100644 --- a/.gitignore +++ b/.gitignore @@ -85,6 +85,7 @@ dkms.conf # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # User-specific stuff +.idea/ .idea/**/workspace.xml .idea/**/tasks.xml .idea/**/usage.statistics.xml -- 2.36.3 From ece23d11f2e168f22d5ebb685f73bda010122deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A9o=20Hersan?= Date: Mon, 16 Oct 2023 22:41:51 +0200 Subject: [PATCH 04/13] resolved conficts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mathéo Hersan --- app | Bin 0 -> 33488 bytes build.sh | 15 +++--- makefile | 50 +++++------------- src/app/interface/client/interface_client.c | 2 - .../interface_client.h => interface_client.c} | 7 ++- src/app/interface/interface_client.h | 3 ++ src/app/interface/interface_resp.c | 1 + src/app/interface/{resp => }/interface_resp.h | 0 src/app/interface/resp/interface_resp.c | 1 - src/main.c | 7 +-- 10 files changed, 33 insertions(+), 53 deletions(-) create mode 100755 app delete mode 100644 src/app/interface/client/interface_client.c rename src/app/interface/{client/interface_client.h => interface_client.c} (74%) create mode 100644 src/app/interface/interface_client.h create mode 100644 src/app/interface/interface_resp.c rename src/app/interface/{resp => }/interface_resp.h (100%) delete mode 100644 src/app/interface/resp/interface_resp.c diff --git a/app b/app new file mode 100755 index 0000000000000000000000000000000000000000..41458aedae7281c655a582d46f75879c25366930 GIT binary patch literal 33488 zcmeI5YfM~46vu~MD9=**h^@AUTR#v~x@c{clwubwwvDwQ#YpO7x-56$D(r6dp-{FF zq;14U!nPQVX=0mJEb)Q)axgRy<;)jI}*po)s_EFQqpe2^s!&YkX$B3s$^Ot$x;av&ZIk zDWm?U41b$6{JwzF>HJP@G1uE-1!0{T!|GB6zlT@IrQBNETr2Ns*tOey8*Xb8P^m1V zbW$TbzpD~*Dcb|K*YJ<=@@T9ww>jTZVi8sB`(}Qh?cA~JzWS{@QhTH?BQMfyXRSqY z411gnLiBNd{FXbYxWm#Nq1-p-wwj#t=z0HK`E$!Rwv1l<<(+$vS7ooKHjUg|6Gtglb`gl#8&an<38<5ilRL=C)jncE@<4$>gruW0q8K;PU zJv;j{9f56{>HX*wx6|3w(H|?-domF1)c38UBCPp5Mo8DTX!&!0^k^QLf4jCxtM&N|Z-*YzI(02{X4LBm8j)zH zCt~=twx|~L_zgYeQZv;o^E~hx>z&(6KHJM@+}%{N^Z9f(xB8v`;q${qbpE%*I$2Co z9e=h)^jRee5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X009sH z0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X009sHfonuS zqvtk~w~+Id-u7#~?H>u?yTntb>TbHl-JNQ&<~l4bgCWBo@y+#SNwJaz_dCT{jD8aP zsVciVq~5K2qY+(p=$$(g1(2qx`Lcat}092?XJthBsUO{r9NVo#hDzMPBm4^0J58OI{nz32t;SZ%FZrCuD;C}P zo43?AwYV^G?xz!V&K3UH_rYFFtl;*$b}0 O6>t9Bf23^e(Z2w /dev/null || show_error "Error during cleaning." @@ -50,7 +51,7 @@ function clean { # Build function build { - local command="gcc $GCC_OPTIONS -o $OBJ_DIR/main.o $SRC_DIR/main.c" + local command="make" echo -e "➔ Building..." show_command "$command" make > /dev/null || show_error "Error during compilation." @@ -59,7 +60,7 @@ function build { # Execute the executable function execute { - local executable="$BUILD_DIR/$APP_NAME" + local executable="$APP_NAME" local command="./$executable" echo -e "➔ Executing the executable..." show_command "$command" @@ -118,4 +119,4 @@ while [ "$#" -gt 0 ]; do ;; esac shift -done +done \ No newline at end of file diff --git a/makefile b/makefile index 6de9008..67fa35b 100644 --- a/makefile +++ b/makefile @@ -1,43 +1,21 @@ -CC = gcc -SRC_DIR = src -OBJ_DIR = obj -SOURCES = $(wildcard $(SRC_DIR)/*.c) -OBJECTS = $(patsubst $(SRC_DIR)/%.c, $(OBJ_DIR)/%.o, $(SOURCES)) -EXECUTABLE = APP +GCCFLAGS = -Wall -Wextra -I src -Wno-unused-parameter -Wno-unused-but-set-variable BUILD_DIR = build -LDFLAGS = -CFLAGS_RELEASE = -O3 -CFLAGS_DEBUG = -g -O0 +SOURCES = $(shell find src -name '*.c') +TARGETS = $(patsubst %.c, %.o, $(SOURCES)) +TARGETS := $(addprefix $(BUILD_DIR)/, $(TARGETS)) +APP_NAME = app -# Generate dependency files -DEPS = $(OBJECTS:.o=.d) --include $(DEPS) +all: $(APP_NAME) -# Commands -all: build +$(APP_NAME): $(TARGETS) + @gcc $(GCCFLAGS) -o $(APP_NAME) $(TARGETS) + @echo -e $(GREEN)build done.$(RESET) -build: $(BUILD_DIR)/$(EXECUTABLE) +$(TARGETS): $(SOURCES) + @mkdir -p $(@D) + @gcc $(GCCFLAGS) -c $(patsubst %.o, %.c, $(@:$(BUILD_DIR)/%=%)) -o $@ -$(BUILD_DIR)/$(EXECUTABLE): $(OBJECTS) - @mkdir -p $(BUILD_DIR) - $(CC) $(LDFLAGS) -o $@ $^ - -$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c - @mkdir -p $(OBJ_DIR) - $(CC) -c $(CFLAGS_RELEASE) -MMD -MP -o $@ $< - -debug: - $(MAKE) CFLAGS_RELEASE="$(CFLAGS_DEBUG)" build clean: - rm -rf $(OBJ_DIR) $(BUILD_DIR) - -run: build - $< - -doc_doxygen: - @echo "Doxygen build started" - @$(MAKE) -C docs - -.PHONY: all build debug clean run doc_doxygen - + @rm -r $(BUILD_DIR) $(APP_NAME) + @echo -e $(GREEN)clean done.$(RESET) \ No newline at end of file diff --git a/src/app/interface/client/interface_client.c b/src/app/interface/client/interface_client.c deleted file mode 100644 index 5398fcf..0000000 --- a/src/app/interface/client/interface_client.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "interface_client.h" - diff --git a/src/app/interface/client/interface_client.h b/src/app/interface/interface_client.c similarity index 74% rename from src/app/interface/client/interface_client.h rename to src/app/interface/interface_client.c index 89a5f92..74fffb7 100644 --- a/src/app/interface/client/interface_client.h +++ b/src/app/interface/interface_client.c @@ -1,7 +1,6 @@ -#include +#include "interface_client.h" -void affiche_client() -{ +void affiche_client(){ printf("\n"); printf("--------------- \n"); printf("|| Bonjour ! ||\n") ; @@ -9,6 +8,6 @@ void affiche_client() printf("\n"); printf("-------------------------------------------------------------------\n"); printf("|| Que voulez-vous faire ? \t \t \t \t \t || \n") ; - printf("||\t1 : Afficher le récapitulatif de votre panier. \t \t \t \t || \n") ; + printf("||\t1 : Afficher le récapitulatif du panier. \t \t || \n") ; printf("-------------------------------------------------------------------\n"); } \ No newline at end of file diff --git a/src/app/interface/interface_client.h b/src/app/interface/interface_client.h new file mode 100644 index 0000000..c7e8589 --- /dev/null +++ b/src/app/interface/interface_client.h @@ -0,0 +1,3 @@ +#include + +void affiche_client(); \ No newline at end of file diff --git a/src/app/interface/interface_resp.c b/src/app/interface/interface_resp.c new file mode 100644 index 0000000..f1afd34 --- /dev/null +++ b/src/app/interface/interface_resp.c @@ -0,0 +1 @@ +#include "interface_resp.h" diff --git a/src/app/interface/resp/interface_resp.h b/src/app/interface/interface_resp.h similarity index 100% rename from src/app/interface/resp/interface_resp.h rename to src/app/interface/interface_resp.h diff --git a/src/app/interface/resp/interface_resp.c b/src/app/interface/resp/interface_resp.c deleted file mode 100644 index b62b362..0000000 --- a/src/app/interface/resp/interface_resp.c +++ /dev/null @@ -1 +0,0 @@ -#include "interface_resp.h" \ No newline at end of file diff --git a/src/main.c b/src/main.c index 78fcf98..5a5f8fd 100644 --- a/src/main.c +++ b/src/main.c @@ -1,8 +1,9 @@ #include #include -#include "app/interface/client/interface_client.h" -#include "app/interface/resp/interface_resp.h" +#include "app/interface/interface_client.h" +#include "app/interface/interface_resp.h" int main(){ - printf("Hello World\n"); + + affiche_client(); } -- 2.36.3 From 0a4981396f3eb4af1707b2f094e7b44cf0d67e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A9o=20Hersan?= Date: Mon, 16 Oct 2023 22:53:33 +0200 Subject: [PATCH 05/13] start sae MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mathéo Hersan --- app | Bin 33488 -> 33712 bytes donnee/client.txt | 6 +++--- src/app/core_logic/client.c | 26 ++++++++++++++++++++++++++ src/app/core_logic/client.h | 13 +++++++++++++ src/main.c | 2 ++ 5 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 src/app/core_logic/client.c create mode 100644 src/app/core_logic/client.h diff --git a/app b/app index 41458aedae7281c655a582d46f75879c25366930..491da50d731277ccdbc41593d2a6eb2b70a8c4a4 100755 GIT binary patch delta 1469 zcma)6Z)jUp6hAMoY15{)Ni5B})b%+?&B{#c*0Qcm(sY?f=Wyw&ZWQKAOkS2~nq)7D zZmVn3uEotU%;N=&|7bxN={`uHh(*L^6r}rPt5}Cl9NP!CfuIaAvBr4rOM-EqJn(zJ z^Sk$+d+xdSzPmmr%e*N|tZPyx015z7BK(EU`4c%44d`D+|Nfl<2< zBs0lG>@ft<%nYuES{kky?-zS5>R4vKa7zh!KR^;?|5lwf?;@X?-D zhDpHPOgzq*g<&bEBbUZN1qHv|t()Jz2CxtNTcoiDvw$a%>_Sc2NP>Gb2ba>H^Jv4%wYM(yK2mW71Q1we#DR z6lm~>61y&21l-Vs;+#czl>%O&zW5$V*oDa$ITT0|X<;|bf)111EEct7QH|)61r{c4 zi&(K#d0}#8v4FAj#o{|F2mtX*OKTUNOGZ^|&4a9CQ}P?C{70&Mjksx9kGX?^0LOK^ z{5~!aF-A^DfQP4fo{RE~Kgfp}H^=y&2u5Gy_(+uJ7Gj z^oScneL7Vft3^}A$t5RDm$_z%vfdeLVo=%j~mgkisr!zyoZE4 z1BbE`UY0w}xuOyAQd}Ja?S#`8fIVcY)R|c-hgFa%n<+dAG*VP6q8XjaGtpVr?dDQH zlGNW)ej043aX1N;>{!bhbL(%~JYyLCf<%hKN3}9O=q7H%gvGg=lw~2*#*8!)8 zoHh4Q?W|Pe|Jzw{|FpSwhGAsTh!0PvkxF3_Vw5u!g6ndR<%^#khkK`5+s0oH%s#kt z^jL)3ichW8*PhLPJ1VYETdl#h?oBVHY=2+zd+x%EKg@iSW!LQ5XQtjBvp;xubZqMv z?_ai8l1+baX_FU6=Gxxs|J0bhcIC$Hk4;yueeE2X6YVn&=KEF0rC!Sp2fyq){QOtF W+roc(p8Ro^Gxq7P*6R5ChJOH|mV4p= delta 779 zcmdnc&UB%bX~G2|6FUY5Mg|6kIY0~oCUz4a*$G~Nit<1N87@pVWV9E&0~I|56}>aL zk?}qw$K*sNX-3A$wM^Db7nmmRVp4L=04gwMU}z8k(isg53?4w535X?tcn6Tr0;Cxl z85k^p6gLnDfcQv&8OUay=qS(nqXDRKVxaKk2xbj|%B@#4x`a(5RzCZ%&TXLu%j5~n z7K}S4pJet|+W=I@0o0@k#2`ySmVkgP5QF#*K+7gDZgyk|x7ZxOGM{ns3>(4v0_%wn zxEX#bGB8X5Dw)7g0pznY`~>QO@DEr|lmfCJusi$&I(*6lZik;@FgX^Ri3^(Le+a?& z61EfhVeA986M^A2WkGZN4=y16x7umt|HBLu4=~4H`&+$#G zuOto31`&+$4B{Xf6wb^HTWWyBj@rq`8srk=lXEgt^GXcDz|OrRw|Jb7)SmJrx*6h}>#Y_er*bWmVo z;F;{mqOJ=|VvLCe1q>WN?+B}frwhzq=3`JPBb}R&yVR$Z +#include + +void afficherDonneesClient(); + +#endif //SAE_101_CLIENT_H diff --git a/src/main.c b/src/main.c index 5a5f8fd..d69e8b2 100644 --- a/src/main.c +++ b/src/main.c @@ -2,8 +2,10 @@ #include #include "app/interface/interface_client.h" #include "app/interface/interface_resp.h" +#include "app/core_logic/client.h" int main(){ affiche_client(); + afficherDonneesClient(); } -- 2.36.3 From 9ff160e40db696e2d58306e509182df961aa9669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A9o=20Hersan?= Date: Mon, 16 Oct 2023 22:57:04 +0200 Subject: [PATCH 06/13] delete useless things MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mathéo Hersan --- app | Bin 33712 -> 33808 bytes src/app/core_logic/client.c | 2 -- 2 files changed, 2 deletions(-) diff --git a/app b/app index 491da50d731277ccdbc41593d2a6eb2b70a8c4a4..1bcce0cfb2f58b634da496cc93811cb1ec0b7123 100755 GIT binary patch delta 1093 zcmbVLZAepL6h800(=By5D@?LbW0+!OWu(=nn+bh@Wl>O+U2RTTjWy=5%$3&<%7SFK zcTixUKSZ?8#fm;54FWBKBIu8i*$*-L5z!wNWIeC8A4$JD@Z9q}=bZO!=e+lZFG|4< zDfli$wGc5P>J<-|s*RVVn2YCwJLh9$j%;B0j1}=}DV@dhbJ8}+q~lMe)wy9*6yTHz zKCBW|!An4zKnqbKJhh^L$H^H?&+WSOxM9SN+P{Mfx# z9+Zoifse?0vrVWo;CL<|`ip+TRslk*=o@4ayRNi|U$>-H`iMdZ2kG$^?TenKJuyvN zwUgjq^tNf2@QJqRx>&AktJc$&G3AKqL))~f7$=KX3EtDDOda7yYo2AtoXVK$N5sJB z=cK-S#ZE?rjA$ADY1qJQ(*!^VvvRB&))>kpbw4%~;x*Q_tbl7)M=k~keTqhxi^hw= zXPdSUL}jK8%F4&trWXUVGHExW(QD6nR`D`!FV0(nal@umG?y|y&hZtI+Tvr(C~nV& znFY-JeaXQ@lNtw(1*!3oEZc_?Vd=koY#LFygV9{4|c{x~s(3I&w_nbbx++Rs8N4!6tc z@srV4#viCA*1=z?d3Lq2owcJ>R3|eG2E*U7&H-f92f^w10sX3ylZ#fOsDl0SSN(KrZ#4N#b`}b`<{SHhFrhB~Hzh zCe(-)m zd8d*x`o`6iwC3RuU*A@h>2@_gF*IA8yPnyXJo;wnliwDyD`TO7*I&E8Pb59K`x|IL B3w!_o delta 921 zcma)4ZAg<*6u$R;U1}iPG2ky^LD30m6J(JEYtv65IA85WRpOal{P$$e%=c@Xsd2ziCz zgI1LI}lFHub=~p#}W^ettak4@5 zg#_6;EG7%=k+ScQp9A^j0Q!CUJ!)G4lq>vD6Gt1f^mW9LB_m#qw08iZ5J*8ZbC6%o zMv1-*NA zB#Zc)snnHO0Ni4G(ldXXYS3Op$Z!e7$jMG!RdhhtjSJ|gI4DS=CeQSp(F5FLJ+v+? zP{5V}0PP|H5qX;pTVR3;fEvJ|bu-zm1I|GkGTEIjn*-dS)#9)tlgs9IJKf;j{f;3! zB$!Yw&7gy1QFs`Z>*SGFjzi>=x1upTJc{Gc4V4Qq{3;kwR17GDAoHZk{_;}ox(+U_ zi;2-E(H;f{hiPKk+F{+uVFLf~6B{{M@=3_DPkh1^Vqkq84E=ZsY@_TjwJYdNd& z@ndiOFXl`!gQR8TQioyXssyQ=x+2Ym(4J>sZN!x_hd*`Ki|*?rNsypIchT pNHAblym@H8SgqS;cF**;9eq+Q9sFtEw=`-~)$F>nN#_2l`~w5a_3r=x diff --git a/src/app/core_logic/client.c b/src/app/core_logic/client.c index 4db5f35..04040fd 100644 --- a/src/app/core_logic/client.c +++ b/src/app/core_logic/client.c @@ -5,7 +5,6 @@ #include "client.h" void afficherDonneesClient() { - // Ouverture du fichier en mode lecture FILE *fichier = fopen("donnee/client.txt", "r"); int numeroClient; float cagnotte; @@ -21,6 +20,5 @@ void afficherDonneesClient() { numeroClient, cagnotte, (suspendu == 0) ? "Non" : "Oui"); } - // Fermeture du fichier fclose(fichier); } \ No newline at end of file -- 2.36.3 From 68b48c0b7baa60ded3f232d922e42dc8d534cf65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A9o=20Hersan?= Date: Mon, 16 Oct 2023 23:06:42 +0200 Subject: [PATCH 07/13] added client menu with case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mathéo Hersan --- app | Bin 33808 -> 33904 bytes src/app/interface/interface_client.c | 17 +++++++++++++++++ src/app/interface/interface_client.h | 3 ++- src/main.c | 3 ++- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app b/app index 1bcce0cfb2f58b634da496cc93811cb1ec0b7123..4aff6eaa5927ff443fbfedc43816396c5eacb10e 100755 GIT binary patch delta 1318 zcmZ`&UrbwN6hHUgmRl@HJ5Y?9GkvdA7fABB!=iKkyd*T!P!wEjVxFKN&-~gb5#|KKnPVPE4q~xskK-LKrQ9ZJ;+X= z?4(id4yRBTzmXH^ao)}a=v98pt|Z3l0aOd>qzVu~&FVjcXp90BqwW|3h@&o3Gi)F-%^;X7>dkH5{aMzv3W6=*Nkdv6zWdu9}Q+bVWS-tciyP=3jWMMla^- z=k_>=_kZfS(f_NaiRGDa>#P=|e>=*HmK+32#Vf01@+z&AYl~`S(u#Q!sQYd7kX&o{ zRwgz&DK{1pCoy5FDM}aQiuRODB+OgVv~qS~E83ZG`>ZB#|GDr?Dcm@P@A`%QzUuyL zdmvPD?kT_zblI|*_Ba=92m3=o=}2$CFX#&fy`#+%Z1uoFZ^+lz=N*;2{=ot7fE4oU zDI?O5tIy~0N|m&}WsqKI+4Lm)r4^h31OB)-TRehA73X#+-?bD==-Y<~AWYP%9_G10 z>Q^0A-N7R+e-C=I!gWIjvv`C6iD7(PIY#Hz&1K0j+MkYK$mR1xo!1|N2D+?D5pZOW zCWgnk1UJr3>cWf?4zGuTBZj9DC1~U}uX>$d!SgJRtEb14>pR%K&Nr>ccOl0-mZ}Te zQ6w}HEsS(!?SEtLJnqZm19^NjkB{Z?0^}kBzdsZroo>crRADz@}% zuK5>ln@jkm9c`=B5>u2*6Z5yZ7ly98A02SN)?0t;^tsLp(`B76-#7k7w%s}2CG6cE z`2Ng$vGPZko=>j5r9C)$Qv7IcrRj59K=gcK` delta 972 zcmZ8fZAg<*6u$3=ZRX5Pp#n80i5ZE3Mw@Q$Hd9C=WlE4?GG~db##my;+|+j;ga*o9 z@4&!7e~7t06^jysX8kdv$bLlNXzCA1{GrhwCyaIOHbXqT&pr1!_c`z3-gCD5XfJ%< z(s?yP6hdg6EMUA^Skt8EY2wkUco5}ja51HknG<1ELTtuPDnu!AO5k5o@KZcO&ERRkaRMhoDd3R{1mMVC57=)k5CRb{XET!)AR|?%%fJmxfppdQ z`{SKUvzz## zO4d77Dy*cSa63XiP;35>Z>~T~k+=l&%NEbE{pP~!5?VVMY31jY@of~_+K_xWr z?U7n&g8i7=u+s=WV!z;zendimG5m-!)KbLG_#?n^K%FG{sTL@xoh#>ri+D+0C@J6s zcxj&;@%1G*nJZ)ioKS*GIc4&IMt~c7#of4z%TWY50q*7tMx)0_p(C+E6@DlXD-^N6 z_eU5cJc>q#-vQtS>Ld2~NgU)Z<8zuttkB-UkG0uH$Pnn@`UKGG@7kL*;$!bLqi64m zQ{@mRJ+cBsSjIQf2w@Aa&H_%1G9U%<5Jn8*ZLoN{@K^o>)8{}#PI-&bWI@G5!P`8P z2V_KelJz?oa;OT3tV1uqpHp=^e{wp0u_F(rWHmnr;~;9J_rP zpKKd>4;(tC=UFJV^UCg7@AToCL4$1hv&k+w^?Dv}yPM@^Q}3*}SKV4YSDyZ6Lp;HJ SQBVURpMP;}baP$u>cv0gcL06> diff --git a/src/app/interface/interface_client.c b/src/app/interface/interface_client.c index 74fffb7..6108c1a 100644 --- a/src/app/interface/interface_client.c +++ b/src/app/interface/interface_client.c @@ -10,4 +10,21 @@ void affiche_client(){ printf("|| Que voulez-vous faire ? \t \t \t \t \t || \n") ; printf("||\t1 : Afficher le récapitulatif du panier. \t \t || \n") ; printf("-------------------------------------------------------------------\n"); +} + +/* +* Sert à lancer le menu et faire choisir l'utilisateur +*/ +void menu(int *choix) { + affiche_client(); + printf("Vous choisissez: "); + scanf("%d", choix); + + while (*choix == 1) + { + affiche_client(); + printf("Vous choisissez: "); + printf("Veuillez entrer un choix valide ! \n"); + scanf("%d", choix); + } } \ No newline at end of file diff --git a/src/app/interface/interface_client.h b/src/app/interface/interface_client.h index c7e8589..3d755a0 100644 --- a/src/app/interface/interface_client.h +++ b/src/app/interface/interface_client.h @@ -1,3 +1,4 @@ #include -void affiche_client(); \ No newline at end of file +void affiche_client(); +void menu(int *choix); \ No newline at end of file diff --git a/src/main.c b/src/main.c index d69e8b2..f97bc5c 100644 --- a/src/main.c +++ b/src/main.c @@ -5,7 +5,8 @@ #include "app/core_logic/client.h" int main(){ + int choix; - affiche_client(); + menu(&choix); afficherDonneesClient(); } -- 2.36.3 From be690231900cbacb86cf2dd6432f227736b411ee Mon Sep 17 00:00:00 2001 From: Matheo HERSAN Date: Tue, 17 Oct 2023 12:53:57 +0200 Subject: [PATCH 08/13] Update 'build.sh' --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 5797bd4..53a92fe 100755 --- a/build.sh +++ b/build.sh @@ -27,7 +27,7 @@ function show_command { tput sgr0 } -# Function to display arrows with a jumping effect +# Display arrows function show_arrows_jump { for _ in {1}; do echo -e "\n\t⬇ ⬇ ⬇ \n" @@ -58,7 +58,7 @@ function build { show_success "Compilation completed." } -# Execute the executable +# Execute function execute { local executable="$APP_NAME" local command="./$executable" @@ -72,7 +72,7 @@ function execute { fi } -# Display help +# --help function show_help { echo "Usage: $SCRIPT_NAME [options]" echo "Options:" -- 2.36.3 From 0cf6f26a3ad4c265bfd0c3e82f52c2d421a60a77 Mon Sep 17 00:00:00 2001 From: Matheo HERSAN Date: Tue, 17 Oct 2023 12:54:19 +0200 Subject: [PATCH 09/13] Update 'build.sh' --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 53a92fe..3b8e860 100755 --- a/build.sh +++ b/build.sh @@ -40,7 +40,7 @@ if [ ! -d "$BUILD_DIR" ] && [ "$#" -gt 0 ] && [ "$1" != "--help" ]; then mkdir "$BUILD_DIR" || show_error "Unable to create directory $BUILD_DIR." fi -# Clean generated files +# Clean function clean { local command="rm -r $BUILD_DIR $APP_NAME" echo -e "➔ Cleaning..." -- 2.36.3 From 5c31c3d23bf082ecab9273746514230f1f752b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A9o=20Hersan?= Date: Tue, 17 Oct 2023 15:30:54 +0200 Subject: [PATCH 10/13] options working MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mathéo Hersan --- app | Bin 33904 -> 33904 bytes src/app/core_logic/.gitkeep | 0 src/app/interface/interface_client.c | 11 ++++++----- 3 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 src/app/core_logic/.gitkeep diff --git a/app b/app index 4aff6eaa5927ff443fbfedc43816396c5eacb10e..9cde43a3cea7f5bd1de02d7072b18e3822667f6c 100755 GIT binary patch delta 657 zcmey+!StbnX~G4;9BT#!Mg|6k7$zVA1UVBQ+6$hrg$RZ~#28LYHe|FHl(B<|c7oIc zfz0Mc#{Y~0SN_*6O0qEQ*!wA9Wog;bCzB^ITQDxze3E&w`Q#baf++nV+u`R_m>i4c#0AarKPJNX5>^xYVC(}{ z6T5-z1&JIcmXu%B{RcB4Mv8aU<)5uPpqCCXd@oDf{DQ#=ynk? zs47lIhn+8&Iai^meq%i`17?MT&BRn3CMJQzCoi>8;Jjcn5oqWHMTyDhZ1fowCjYZB zXWTK_%+{K-)ovmOP==#)a+R$-b8H~72aH-Ue*rX(ouT{>)|;Ce z4>Ib;0Qn%mm{?H2VBR!Y&*9_Lpz7ZXHVDs`kW3VQRet_x*M)qm;s`$1(gl+XnjIA8 z$xT+{EIr2~HnseENshgq*{gu_>F^~B1_g*GCV4mK0ZfHFX*io5`t%E9QclY^C^@CEyP zDGnwEbCCF{|Nnsw0J;XKDFbGr&*VHCaSovFB%sLK$-OoToOf&{0+mltRGGZZMxRk< z@-rKA#v_yEY^^mX+D+sD%5XH=P0VIwDB=+8ob{5KVWJiz!%qcPhQAt|3_rmZJeb^M ztH(HX@|G@Po}4?Y}v&%_wJJX4o?M zY=b=ej%pxtPQ~QU4W_I!%3By`OxA5wHiAW*8c+{E(0yBMAh83CIxv3+G!C7id>Na~ zO^pW`bv=N55MWF!C}23s>-Q$|lG@|^o_(EZJ>7>6$}8vpPdui3mz$sIj-k_=$py_0 z3hO$K-DT7&JDT(*B*{0!_}1)&ek-Pk`02l7eK%3_er?p`3(XA*A01c(HqY--P8nkn*`9X4T5Ry#C=>t@j>jSZ diff --git a/src/app/core_logic/.gitkeep b/src/app/core_logic/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/interface/interface_client.c b/src/app/interface/interface_client.c index 6108c1a..16e3cc3 100644 --- a/src/app/interface/interface_client.c +++ b/src/app/interface/interface_client.c @@ -1,4 +1,5 @@ #include "interface_client.h" +#include "app/core_logic/client.h" void affiche_client(){ printf("\n"); @@ -6,10 +7,10 @@ void affiche_client(){ printf("|| Bonjour ! ||\n") ; printf("--------------- \n"); printf("\n"); - printf("-------------------------------------------------------------------\n"); + printf("+-----------------------------------------------------------------+\n"); printf("|| Que voulez-vous faire ? \t \t \t \t \t || \n") ; printf("||\t1 : Afficher le récapitulatif du panier. \t \t || \n") ; - printf("-------------------------------------------------------------------\n"); + printf("+-----------------------------------------------------------------+\n"); } /* @@ -22,9 +23,9 @@ void menu(int *choix) { while (*choix == 1) { - affiche_client(); - printf("Vous choisissez: "); + afficherDonneesClient(); + printf("Vous choisissez: %d ", *choix); printf("Veuillez entrer un choix valide ! \n"); scanf("%d", choix); } -} \ No newline at end of file +} -- 2.36.3 From 9d84f7f6e8f856b0e1d86ee510f6fea01c3013c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A9o=20Hersan?= Date: Tue, 17 Oct 2023 17:24:32 +0200 Subject: [PATCH 11/13] main work with interfaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mathéo Hersan --- app | Bin 33904 -> 34000 bytes src/app/interface/interface_client.c | 29 +++++++++++++++++++-------- src/app/interface/interface_client.h | 5 +++-- src/main.c | 22 +++++++++++++++++--- 4 files changed, 43 insertions(+), 13 deletions(-) diff --git a/app b/app index 9cde43a3cea7f5bd1de02d7072b18e3822667f6c..5f4c8d918381394ff85eca57f978c6915da47f97 100755 GIT binary patch delta 1932 zcmZ8ieN0bKma+n(6bJ$aMak86gfKG^T|Q$efwpI+P!@D%KXoh=NvWKX)j9RyEIP6#J}o zBE(g5+_W^QsXF)$7@1=`jMjdHa$t^xfEs24jAj_Ak`5qUD%KWp%~FH5K6mQ1qaXed zulXw$?;Ew;omh|}TC=9nDt)7EDrpA3T!=4&!DhzKWG4)UZDGj8O*Etp9gsY=S%GN0 zC=wirxWzUTaI-W^=kN@oUnz2(bo~SV-cP19U#A zM-S4USiHfO_z~vSzQf~daYV0Z9pA$om|5-9jIV|fjfRU>M(jngsNE5pTU&cu-b8OT zy#|ZM!j6^OT11T;O33yr)%07i!+AW!e0t6{sprtyrB8GRGHvHJHw{aA-qjTvemTFtZ-7;eIrqtJ(A60O@2kdtEzg*&NK9JJ75 zN&W8{+LY99*3zew`o~uKBKQD&^ANL)WFe`U?SjN0+-7w-f9sb$dnPbMa16gEP^s z;6?mY(tt~SMCk7F3VfS~lw#xK6}X%C;r95ri}#CVHMp7hI*G_=#4f*xUA)^zDsYdR z$9^yFBwjz3$$6*fc5NaLKssD%_qd5yEX9f#_m!!dJf*T{q87#vNqq!+yE@xo5_q@Z z7I9~M%uB$7opMDf`>V`E&v*F+*&(}g2v{qmz4tc37A;A8}hF{LA^Kk;D?5wJ)EQK-z6M(c4ldpB)xCD{mCCvMdLX3IYgy8Hra(cD?2MYE!G zEx0Q%*8}=F5k6n_!e`zGLA=|Gtk6Q#fOL+|4hQKaPQOST9fWTuK9s?`TyAFvK?QQ* z>t}}cpYe3H@g9d$ZZ0x)qN6M+>bYG*vp6l^85a;w(u6&R@j{af(B7EHI` z!7X?s6-(Pf1-flu$(AxgJ5;S9bY%OM_BoR6lLDcW(tN1;fv^p0P?pq?R#K@Q0|F)- z-`$NqyR)$Sk;r2`?|PoQ|NcL37S&!B7XNizBH6`;$tQdsPU?oG`DovW`EGgBuK!l% zjY}if5!Uf977tn$FTNzE_wIRJnhpo?3tr7(gXyhjx(6e{~xejDP;fv delta 1107 zcmZWoZ%9*76hH61sWa!FoT&Nt`5`edQL{O>y}22I7KK?Kq6E>h6ijDpS`Pg4rl1wE z%grp1d<0QOA0oeG6bK=hfzFctP{fD=6HDupBW#^Jov0l+@0{Q7{O-B$Ue5LO@k_nD z+Y{Sh1mFOmlE)8PgOPkO$4*GA?6Fl6CM25AnPXGTt8^b*ftF$(kvSd5+2|<0XRi$z z)+G^L-vtnfu~Y_dV~jvAN8e~62tsIvkj|;8RVa>`^|#-t(dYF(|6M-pXc_-X-GZK1 zBswV^&dkDoF{s~#&LZp2EESz$FWZM3v8o0NM#@zKJbka%bRh2ro1SiR~=uWfWdAqZ5{l^S;r zOl%FHzMFfD#` zwqU&DP4)U!Y+i40ev6=O3zoOwP{d*Mkem?CUd%e8SLG7=Lq1B2TvDj)6?xE5t12^x zuS69yuG(gULYd}Re)U&4|0s{NLy0@8wezjhv@^?^Pb)N#;db>2I?lW7M~sY L92ZqYb9?>);fovX diff --git a/src/app/interface/interface_client.c b/src/app/interface/interface_client.c index 16e3cc3..53af7f0 100644 --- a/src/app/interface/interface_client.c +++ b/src/app/interface/interface_client.c @@ -1,11 +1,11 @@ #include "interface_client.h" #include "app/core_logic/client.h" -void affiche_client(){ +void affiche_client(int a){ printf("\n"); - printf("--------------- \n"); + printf("+-------------+ \n"); printf("|| Bonjour ! ||\n") ; - printf("--------------- \n"); + printf("+-------------+ \n"); printf("\n"); printf("+-----------------------------------------------------------------+\n"); printf("|| Que voulez-vous faire ? \t \t \t \t \t || \n") ; @@ -16,16 +16,29 @@ void affiche_client(){ /* * Sert à lancer le menu et faire choisir l'utilisateur */ -void menu(int *choix) { - affiche_client(); +void menu(int *choix, int jour) { + affiche_client(jour); printf("Vous choisissez: "); scanf("%d", choix); - while (*choix == 1) + while (*choix < 0) { - afficherDonneesClient(); - printf("Vous choisissez: %d ", *choix); + affiche_client(jour); + printf("Vous choisissez: "); printf("Veuillez entrer un choix valide ! \n"); scanf("%d", choix); } } + +void global_client(){ + int choix, jour; + menu(&choix, jour); + switch (choix) { + case 1: + afficherDonneesClient(); + break; + default: + printf("Veuillez entrer un choix valide ! \n"); + break; + } +} \ No newline at end of file diff --git a/src/app/interface/interface_client.h b/src/app/interface/interface_client.h index 3d755a0..a361055 100644 --- a/src/app/interface/interface_client.h +++ b/src/app/interface/interface_client.h @@ -1,4 +1,5 @@ #include -void affiche_client(); -void menu(int *choix); \ No newline at end of file +void affiche_client(int a); +void menu(int *choix, int a); +void global_client(); \ No newline at end of file diff --git a/src/main.c b/src/main.c index f97bc5c..57b51b4 100644 --- a/src/main.c +++ b/src/main.c @@ -4,9 +4,25 @@ #include "app/interface/interface_resp.h" #include "app/core_logic/client.h" -int main(){ +int choixInterface(void) { int choix; + printf("Choix de l'interface: \n"); + printf("• Interface 'responsable' (0, par défaut): Permet de tout faire, via un menu interactif \n"); + printf("• Interface 'Client' (1) : Permet de \n"); + printf("Tout autre nombre saisit mène au choix par défaut.\n"); + printf("Vous choisissez l'interface n°: "); + scanf("%d", &choix); + if (choix < 0 || choix > 1) choix = 0; + switch (choix) { + case 0: printf("Vous avez choisit l'interface par défaut.\n"); break; + case 1: printf("Vous avez choisit d'effectuer les tests.\n"); + } + return choix; +} - menu(&choix); - afficherDonneesClient(); +int main(){ + switch (choixInterface()) { + case 1: global_client(); + } + return 0; } -- 2.36.3 From 6cb6842c7a61ab70a9adebfb75bb869fbd31733a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A9o=20Hersan?= Date: Fri, 20 Oct 2023 15:47:02 +0200 Subject: [PATCH 12/13] case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mathéo Hersan --- .idea/.gitignore | 8 -------- .idea/misc.xml | 18 ------------------ .idea/vcs.xml | 6 ------ 3 files changed, 32 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 53624c9..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file -- 2.36.3 From 241358283acb7708edc76bca765e3a2452954da9 Mon Sep 17 00:00:00 2001 From: mahersan Date: Fri, 20 Oct 2023 16:19:23 +0200 Subject: [PATCH 13/13] Added all the menu fonctions --- app | Bin 34000 -> 17368 bytes src/app/interface/interface_client.c | 8 ++++++-- src/main.c | 16 +++++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app b/app index 5f4c8d918381394ff85eca57f978c6915da47f97..e161241db88cf7787c41ca6f988dcac08199ec06 100755 GIT binary patch literal 17368 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 G$bSI^U(`AP diff --git a/src/app/interface/interface_client.c b/src/app/interface/interface_client.c index 53af7f0..193c266 100644 --- a/src/app/interface/interface_client.c +++ b/src/app/interface/interface_client.c @@ -8,8 +8,12 @@ void affiche_client(int a){ printf("+-------------+ \n"); printf("\n"); printf("+-----------------------------------------------------------------+\n"); - printf("|| Que voulez-vous faire ? \t \t \t \t \t || \n") ; - printf("||\t1 : Afficher le récapitulatif du panier. \t \t || \n") ; + printf("|| Que voulez-vous faire ? \t \t \t \t \t || \n"); + printf("||\t1 : Afficher le récapitulatif du panier. \t \t || \n"); + printf("||\t2 : Ajouter un article du panier. \t \t \t || \n"); + printf("||\t3 : Supprimer un article du panier. \t \t \t || \n"); + printf("||\t4 : Modifier la quantité d'un article du panier. \t || \n"); + printf("||\t5 : Réinitialiser le panier. \t \t \t \t || \n"); printf("+-----------------------------------------------------------------+\n"); } diff --git a/src/main.c b/src/main.c index 57b51b4..106da06 100644 --- a/src/main.c +++ b/src/main.c @@ -7,22 +7,24 @@ int choixInterface(void) { int choix; printf("Choix de l'interface: \n"); - printf("• Interface 'responsable' (0, par défaut): Permet de tout faire, via un menu interactif \n"); - printf("• Interface 'Client' (1) : Permet de \n"); - printf("Tout autre nombre saisit mène au choix par défaut.\n"); + printf("1. Interface 'responsable': Pour les responsables \n"); + printf("2. Interface 'Client' : Pour les clients\n"); printf("Vous choisissez l'interface n°: "); scanf("%d", &choix); - if (choix < 0 || choix > 1) choix = 0; + if (choix < 0 || choix > 1) { + fprintf(stderr,"Veuillez entrer un choix valide ! \n"); + } switch (choix) { - case 0: printf("Vous avez choisit l'interface par défaut.\n"); break; - case 1: printf("Vous avez choisit d'effectuer les tests.\n"); + case 1: printf("Vous avez choisit l'interface responsable.\n"); break; + case 2: printf("Vous avez choisit l'interface client.\n"); } return choix; } int main(){ switch (choixInterface()) { - case 1: global_client(); + //case 1: global_resp(); + case 2: global_client(); } return 0; } -- 2.36.3