From 47527dcd567b1e2a71cb6231325921adee50cc50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Math=C3=A9o=20Hersan?= 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 --- app | Bin 0 -> 34224 bytes donnee/panier.txt | 4 ++++ src/app/core_logic/client.c | 24 ++------------------- src/app/core_logic/client.h | 2 +- src/app/core_logic/responsable.h | 2 -- src/app/core_logic/testResponsable.c | 9 -------- src/app/interface/interface_client.c | 30 ++++++++++++++++++++++----- src/main.c | 2 +- 8 files changed, 33 insertions(+), 40 deletions(-) create mode 100755 app create mode 100644 donnee/panier.txt diff --git a/app b/app new file mode 100755 index 0000000000000000000000000000000000000000..d63c7bbbd32e1cf3bb664966930adf92e59f9179 GIT binary patch literal 34224 zcmeI5e{fXQ702(}B_<>yH zwP_bETHEGLosmDJE(+r=W5-n6adDE8cBd8@wt)$coa` zaN~+^uDEqAwdN;2Ilt*ViS+EoKt*X@v7tG?o6mRWw=q*LLNjG7i6=#gsM{l^fTB>} z$}0_HcDal(B$HjaG>&!W>ZmA6I1+6M=b8%j9lhGnM+_*DY}Z#}>H|Zb6vZ2kgtWls zoSbj(w0c9|Psk`FlI_W^o7xp68u*qLXjQa;FUaM5eTnM~eH%NWY%dU*WsR>qbv)=ldpFZZHYY|6cm&p;+NUqnuQm$7n` za*VMdl;e?`knM?lO1aqHSWwS=kFkjbZ6r=YmXT?GZ8RLJ^=mD)t)2c>$dtZ>OzWsG zi^irra?RT0>~}7kddsS_i_j(`8#a-aNxV+%S@FM}^HFg7NJgrHeWa%cacNKV+&X0H zGvc8R#H7)+U_I+P!x6Q;=K30}OKUM^e-#DkkAn}*ooC9#i_%PF>X&!nnZ_ciStLO~ z5D)|e0YN|z5CjAPK|l}?1Ox#=KoAfF1OY)n5D)|e0YN|z5CjAPK|l}?1Ox#=KoAfF z1OY)n5D)|e0YN|z5CjAPK|m1rKO!)aX2*tiI+DXNrpMEjDJ;E*HC5?@#VqS{u!p$3 z0kV^2TP!(Vr7NfpI^EfgR2I9lcUXPzV(fU9z1@H|*YwY+u5Du?zpR;J>OO6usy$isZii5h(= z<|Jau&?zU=t0b1??PqHA#c0Q$Ku@E-63Kn2L}FVr&ptY%%E6XVJL!4Ore`+B^SS@6 z(Pv#iX9e0%kBm&uTVqTD+oI%fqogOw*|7|`5aYyGP@jx?tg4(ubymLizBqp5~ z4~Juwsl$i|_AaX(ENA_Llaa@>{(Uhe6^9?T!nX-pYcV@iQUu>me{@EM8NSaHBOY8v zTLNu(zhD~Ho?41I_}hFQ8-wNU{)g`k0Ph5RXUP)D@TVnP{%~P$IEvV?jC4;q`b#5_i zEPixGo6W`~`s_B+Si6muY}shZA7|qN*ogNcrdjJFI}=#%tFW^KucF|5$TDQ~_sqKT zYW*$jq3M`Id#1wVGraTbIG4;gwC(vk9*q^L{mzQiVfdOq3%*P?Zp!(yZJf!%xyfLW z&S!DNJe$bhN%Rqm_f3D3%sMr`zsTPtyU=g##rg2B4F6WS%rmh2YW*L~h*4`T+-|Jx z&9Ut6gWWiz{){<@{p=vhyuJ4+ZC+{j@8@9CbEZuRu(j-Y=OXqTFztD=(4O>#V>+Im z*>^Z*?$?rfoyWz7di}>-7t7Llitm$uW)Qze%rk}W=evwC#G5j4q;oRy3_C{OO_^u# z9aV%9-*4on%;P90G9&J`*X!Sg{*p4BOVGR9jFot7V;_5C)~0=Fl=7?!>Vq!6r_PJr zM7^#-2lscQx!+=YQ&pYwQ-ihcemXajkXh%vzQM(iDUK|;n)*lOM9kz14!;LqtRt1b z2k74v62A9v*3-Wy2J7{8cs8%Qzos`?^|Iyq%~t)$a{U{qb0#>Wi3uN%@9P`UPUkha zZp}O~dRFr`I=_E+5xeo7U5)wNZaVYFk8$RYA3gKQXLtqCILn)^(dS@p?rdk*>a$E; zap)S}*?{jK^WP(}QJW9rJN_`f6G}=sI?*oIkx~m*AXnRKCXR zrMCJcTYajneyOcK!>E_C>IL>xEtj&cF8TUkU`sF>l4r?XU4=vJ!#`=gnrpo!s><7f zQNOxl0gABf^JpPezD{=K{==hbq-&vEFE{vnnzv02$$nK1rITJyhZc$YJrT_(w?^d- zPe4;cHGHNuYZ1-Dx+9nr4alBQMDt>D!Dtt3GM=&+5QBNSEMbb&Rb?$|pXg%#J%)K?8)B;*W^Z2!}VVT_y;=o6*CpzA?pcdA`VRc8n z%;vPR^=ee}gPp7fA|YeFG-SKH4cb~&_^OogiJom3WX#60Jm&-PK`U&)2ES9YL)%{OPpK@r|W$ThJeE{~XsB z0>~&_!$a~@S-m>P$s@ODYCujWDKI!8D(%pNnpeA6T!UgML$KuhP%qDEMN<>U2*Jml z%@LSVQ=SFpc;yqNQs$CZYj{Bv4hmb_CM=gyJ02^~safQ+f1;zo+*=xAF&N$EY4NMZ zU_N$ED~2@s0U;vWN3;e50adLv<0)Jd!Ry^2<_mVH0Yo@i#s9~eNgo08t6G3H@+jv% zfigAZ^LSO_v#>_K$&%%{AvN3)41{Us+Th>kb@n&x~>7$arZ;a9yRMw5}F5Ygwv)#=_@gWEZ z0)l`bAP5Kof`A|(2nYg#fFK|U2m*qDARq_`0)l`bAP5Kof`A|(2nYg#fFK|U2m*qD zARq_`0)l`bAP5Kof`A|(2nYg#fFK|U2m*qDARq_`0)l`bAP5Kof`A|(2nYg#fFK|U z2m+rQ0U4Tbmk#Sdrr$a@?gBss$#zKq|2=S{)%b02=EiLRZmY$ZC*cAC2|pYz;fKVf zI^>ne8<5+~akzXU9BEZUp$?`PmpmvwT(%O3_#lV9o&d@YbO%Ey&32>NP#`I+pB6|L z6*yV%W_;|{@bO?fKK9%#h1qoGFmIw@Q;o|U*yT=kl0RgC);*fJ;E z?}bW!xeQxwT#llcH&U?mPIe*y<&SK|5Km~c+KwwMa+)HzZ6$Z(1nYFN9v{Z`gz?ec zLKARV#Q{kTMA<=!6)Ej)in?9(;yN0oP4$2Sb9vYu-Zpm6W`D57ZCYmT=1t65+TMc`_=!_`!RU>37^o-o3<-mznaOs|*=; zA@TkPml`r$#AUimg65OEX#W0%hTLh&cR~^M|Im~lAs?f@*Obf5=i@FcKA(Pk~SJQ4CFvNpO@bJBW23*m$aP|=Kk{6AE*Db q_P6cb@#2XJe`MW^uG25PcliU8{`IW4@~8DRk3W0z?35c8toa`~r9TM( literal 0 HcmV?d00001 diff --git a/donnee/panier.txt b/donnee/panier.txt new file mode 100644 index 0000000..4997cb6 --- /dev/null +++ b/donnee/panier.txt @@ -0,0 +1,4 @@ +32 +660 +5079 +8043 \ No newline at end of file diff --git a/src/app/core_logic/client.c b/src/app/core_logic/client.c index d5e75e2..5366f5f 100644 --- a/src/app/core_logic/client.c +++ b/src/app/core_logic/client.c @@ -1,23 +1,3 @@ -// -// Created by Mathéo Hersan on 16/10/2023. -// +#include -#include "client.h" - -void chargerClient(int tNumClient[], float tCagnotte[], int tSus[], int *tLogique) -{ - FILE *fic; - int i; - fic = fopen("donnee/client.txt", "r"); - if (fic == NULL) - { - perror("fopen"); - exit(EXIT_FAILURE); - } - - while (fscanf(fic, "%d %f %d", &tNumClient[*tLogique], &tCagnotte[*tLogique], &tSus[*tLogique]) != EOF) - { - (*tLogique)++; - } - fclose(fic); -} \ No newline at end of file +//fonction ajouter un article au panier. 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 #include -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 8bee266..e7b2f67 100644 --- a/src/app/core_logic/responsable.h +++ b/src/app/core_logic/responsable.h @@ -1,3 +1 @@ - - int chargementArticles(int tRef[], float tPoids[], float tVol[], float tPrix[], float tPhysique); \ No newline at end of file diff --git a/src/app/core_logic/testResponsable.c b/src/app/core_logic/testResponsable.c index 9759553..0b38a9a 100644 --- a/src/app/core_logic/testResponsable.c +++ b/src/app/core_logic/testResponsable.c @@ -1,12 +1,3 @@ #include #include "responsable.h" #include "../interface/interface_resp.h" - -int main (void) -{ - int tPhysique = 10, tRef[10], tLogique = 0; - float tPoids[10], tVol[10], tPrix[10]; - tLogique = chargementArticles( tRef, tPoids, tVol, tPrix, tPhysique); - affichArticles( tRef, tPoids, tVol, tPrix, tLogique); - return 0; -} \ No newline at end of file diff --git a/src/app/interface/interface_client.c b/src/app/interface/interface_client.c index 193c266..dfbe7a9 100644 --- a/src/app/interface/interface_client.c +++ b/src/app/interface/interface_client.c @@ -17,9 +17,6 @@ void affiche_client(int a){ printf("+-----------------------------------------------------------------+\n"); } -/* -* Sert à lancer le menu et faire choisir l'utilisateur -*/ void menu(int *choix, int jour) { affiche_client(jour); printf("Vous choisissez: "); @@ -34,12 +31,35 @@ void menu(int *choix, int jour) { } } +void ajouter_article(int reference, float poids, float volume, int prixUnitaire){ + + printf("Vous avez choisi d'ajouter un article au panier.\n"); + printf("Veuillez entrer la référence de l'article que vous souhaitez ajouter au panier : "); + scanf("%d", &reference); + printf("Veuillez entrer le poids de l'article que vous souhaitez ajouter au panier : "); + scanf("%f", &poids); + printf("Veuillez entrer le volume de l'article que vous souhaitez ajouter au panier : "); + scanf("%f", &volume); + printf("Veuillez entrer le prix unitaire de l'article que vous souhaitez ajouter au panier : "); + scanf("%d", &prixUnitaire); + printf("L'article a bien été ajouté au panier.\n"); + printf("Voici le récapitulatif du panier : \n"); + printf("Référence : %d \n", reference); + printf("Poids : %f \n", poids); + printf("Volume : %f \n", volume); + printf("Prix unitaire : %d \n", prixUnitaire); +} + void global_client(){ - int choix, jour; + int choix, jour = 0, reference = 0; + float poids = 0.0, volume = 0.0, prixUnitaire = 0.0; menu(&choix, jour); switch (choix) { case 1: - afficherDonneesClient(); + affiche_client(jour); + break; + case 2: + ajouter_article(reference, poids, volume, prixUnitaire); break; default: printf("Veuillez entrer un choix valide ! \n"); diff --git a/src/main.c b/src/main.c index d65ed5f..e08f01c 100644 --- a/src/main.c +++ b/src/main.c @@ -3,6 +3,7 @@ #include "app/interface/interface_client.h" #include "app/interface/interface_resp.h" #include "app/core_logic/client.h" +#include "app/core_logic/responsable.h" int choixInterface(void) { int choix; @@ -27,6 +28,5 @@ int main(){ case 2: global_client(); } - chargerClient(); return 0; }