From c3c36815a4a6e2645124c9b16050f024cd634102 Mon Sep 17 00:00:00 2001
From: "matheo.thierry" <matheo.thierry@etu.uca.fr>
Date: Fri, 13 Jan 2023 15:03:50 +0100
Subject: [PATCH] MODIF fonction marche dans utilisateur

---
 candidature.txt |  74 +++++++++++++++---------------
 donneesIUT.don  |  26 ++++++-----
 mainsae1-02.c   |   4 +-
 sae             | Bin 31656 -> 36264 bytes
 sae1-02.c       | 117 +++++++++++++++++++++++++++++++++---------------
 sae1-02.h       |   6 +--
 6 files changed, 139 insertions(+), 88 deletions(-)

diff --git a/candidature.txt b/candidature.txt
index 05e5df8..506b697 100644
--- a/candidature.txt
+++ b/candidature.txt
@@ -4,15 +4,15 @@ cheval
 blanc
 10 12 13 16
 3
-clermont-ferrand
+Clermont-Ferrand
 informatique
 0
 0
-grenoble
+Grenoble
 informatique
 0
 0
-aurillac
+Aurillac
 bio-informatique
 0
 0
@@ -21,15 +21,15 @@ fou
 blanc
 10 12 13 16
 3
-clermont-ferrand
+Clermont-Ferrand
 informatique
 0
 0
-grenoble
+Grenoble
 informatique
 0
 0
-aurillac
+Aurillac
 bio-informatique
 0
 0
@@ -38,15 +38,15 @@ roi
 blanc
 10 12 13 16
 3
-clermont-ferrand
+Clermont-Ferrand
 informatique
 0
 0
-grenoble
+Grenoble
 informatique
 0
 0
-aurillac
+Aurillac
 bio-informatique
 0
 0
@@ -55,15 +55,15 @@ reine
 blanc
 10 12 13 16
 3
-clermont-ferrand
-informatique
+Clermont-Ferrand
+Biologie
 0
 0
-grenoble
+Grenoble
 informatique
 0
 0
-aurillac
+Aurillac
 bio-informatique
 0
 0
@@ -72,15 +72,15 @@ tour
 blanc
 10 12 13 16
 3
-clermont-ferrand
+Clermont-Ferrand
 informatique
 0
 0
-grenoble
+Grenoble
 informatique
 0
 0
-aurillac
+Aurillac
 bio-informatique
 0
 0
@@ -89,15 +89,15 @@ pion
 blanc
 10 12 13 16
 3
-clermont-ferrand
+Clermont-Ferrand
 informatique
 0
 0
-grenoble
+Grenoble
 informatique
 0
 0
-aurillac
+Aurillac
 bio-informatique
 0
 0
@@ -106,15 +106,15 @@ cheval
 noir
 10 12 13 16
 3
-clermont-ferrand
+Clermont-Ferrand
 informatique
 0
 0
-grenoble
+Grenoble
 informatique
 0
 0
-aurillac
+Aurillac
 bio-informatique
 0
 0
@@ -123,15 +123,15 @@ fou
 noir
 10 12 13 16
 3
-clermont-ferrand
+Clermont-Ferrand
 informatique
 0
 0
-grenoble
+Grenoble
 informatique
 0
 0
-aurillac
+Aurillac
 bio-informatique
 0
 0
@@ -140,15 +140,15 @@ roi
 noir
 10 12 13 16
 3
-clermont-ferrand
+Clermont-Ferrand
 informatique
 0
 0
-grenoble
+Grenoble
 informatique
 0
 0
-aurillac
+Aurillac
 bio-informatique
 0
 0
@@ -157,15 +157,15 @@ reine
 noir
 10 12 13 16
 3
-clermont-ferrand
+Clermont-Ferrand
 informatique
 0
 0
-grenoble
+Grenoble
 informatique
 0
 0
-aurillac
+Aurillac
 bio-informatique
 0
 0
@@ -174,15 +174,15 @@ tour
 noir
 10 12 13 16
 3
-clermont-ferrand
+Clermont-Ferrand
 informatique
 0
 0
-grenoble
+Grenoble
 informatique
 0
 0
-aurillac
+Aurillac
 bio-informatique
 0
 0
@@ -191,15 +191,15 @@ pion
 noir
 10 12 13 16
 3
-clermont-ferrand
+Clermont-Ferrand
 informatique
 0
 0
-grenoble
+Grenoble
 informatique
 0
 0
-aurillac
+Aurillac
 bio-informatique
 0
 0
diff --git a/donneesIUT.don b/donneesIUT.don
index 90fc23a..29498c0 100644
--- a/donneesIUT.don
+++ b/donneesIUT.don
@@ -1,17 +1,21 @@
-Grenoble			1
-Informatique		112 Dupont Jean
+Grenoble	1
+Informatique	112 Dupont Jean
 
 Clermont-Ferrand	2
-Informatique		136 Simon Carine
-Biologie			120 Giroud Olivier
+Informatique	136 Simon Carine
 
-Aurillac			1
+Biologie	120 Giroud Olivier
+
+Aurillac	1
 Bio-informatique	120 Mbappe Kylian
 
-Valence				2
-Chimie				97	Pogba Paul
-Physique			130 Depay Memphis
+Valence	2
+Chimie	97	Pogba Paul
+
+Physique	130 Depay Memphis
+
+Lyon	2
+Géosciences	122	Santan Dave
+
+Economie	135	Jean-Michel Aulas
 
-Lyon				2
-Géosciences			122	Santan Dave
-Economie			135	Jean-Michel Aulas
diff --git a/mainsae1-02.c b/mainsae1-02.c
index e677cea..0a21eb1 100644
--- a/mainsae1-02.c
+++ b/mainsae1-02.c
@@ -5,6 +5,6 @@
 
 int main(void){
 
-	test1();
+	test();
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/sae b/sae
index 997352908a0d26723848f4c42e9a25f3f3a60ed3..eab7bb98a49e9433d8108c17496ec0009915e540 100755
GIT binary patch
literal 36264
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

delta 8876
zcmZu%3s_Xu_CMzU@`waR-XIJwK~x?ZnJEeC)M%ji!04uk2EIZh7}DzEsHi!Pljyda
zUs;#DJ;?7?6g};hXeMb^h?-<&XlgTRT{63&S?B-Tk29R1|M|W-Ywh1}t-bbMd+mJ=
zGc-S~H2)?y4wWri(@$GpNs-v4Nhz4OWe9Jo=FuCjJa%`>#t`1tq~31;DCb<xJC}LN
zHifslxFnCsh7e)eD@=Qrk==4>Vwss+_LoQK&~P1*NxCvkbMA{nHYrm=Uvcajo!PYE
ztqD)weysWH|E+&*(>q&RoyvSgu5O*;vs|`{Sbn@O$!Oq8Pd~g{OtYz)^P0WZ?pn@q
zI%O}evU|4<576OGfm^9VkdEllIfUx)UL78$!&}6Fe1L`P@JNCC0uza1tWk#}^;Wk_
znvP%#E|@GGPJ?LIZ91GzLc8*GI1R2{W*x3&kHs(25&oJrWQh*HNr#u|@IW2DScl)N
z!>e`pKpno4;wF6PD1&vxYMp~vcE)bh;i60!-dNpw-EW|;b)F=d*SA>|wZq(S!0#h>
zk7~|YP-@CK+=JrtpwaeX%DcK%Tq&n$o34_pgS9(pn{EtO8*3k?ZCX~Y7S`TR+jNm!
zO{~3#wykt^T#XEPg93C_T&r1oH*M2-x~f@w7j4s3aFwz4Q?yN!?<!*LZM046)s@HE
zn`oOZf-8%)*U~mkzRSqkkDzT`OtbC^W<U)!pxJgwti6=BX`Q=z{sfS+zf_VIHloe0
z>>nrFj+UBjXUz@gdWvQhIDDogBbknyzfYnfcOR_Ou!rDtH7I@(gR;?~+2NB;#h6}8
znAz^-Gqsd#42kt)OwRRE^6!w?N${bI;-_{mWUe0t#jmC@SLYrDCDmmXn;UWmP}OWZ
zZwWNpb9bTP9DzYP7vpx&=jBooXoypq63KAG7<mL)XmH?u)v(5II2}Un*5Ran&=7ez
zd45n1?xzOLl!v!wgbtA9VI(Ik1NZW<#d13NENmF=*TQme&kT=<N|&T}=}4R(Tvt`I
z!_;B69YlBUq?38!OXQ*CQ1}p7_JmvdEHke$%QkMgbttKi7(QSqy4c%Gf``PD&m%J7
z_-8~6?$MEVM1kTV#`fw%Jd;KqjJ$`2h#Z5vSJYBDjZ{TN$f;yQRQC8Z&Fh>0!OL#y
zF*mdsdB`8#T-I;2$J{e+;5BCK^X_aS$A^=^=%?ir(i}a@kb>b={;I03*JzF%xm~Gb
zV9W?PrFC3PxhxMM&&5W_$*u3jo|V(F=6txlKkJA4w?qvux<Uu!<C@N5d>xk}Q|)2d
zNFI%!DkqV{@ekpiZ(M}?%f>tW;E0Iv@#Me8a5<3-NVpI81qt_&7t#z?FzGOGKJgQq
z$wI2zxW1O^^<00E>JM_glj;>*_d;np?}grYX;nl04gVD@?WP-MN9cOGrl`y-u(f+D
z<{f57*ahfjxkK%?7oS5yowhH{w)ySO&oCVw((a7;r5{lDM?b*P-(noL6T(YDTUMf4
zp?L>AUIneO@epZBi=eX{m4J~x`y-p>3Oa*rTyLWK2ClzB^+&k=KGmzZev;}7xGqtB
zHuOf<KQTu->7d7+faW>z4wz{ZKVU_p|IFK+JNssVy4s83s?G}3h}lud^0TL$=Fs-J
z+1Bp7PV36S^Jb=rYj<u(HGAZ(0XxV82t(djRzkMigU)$c3ZXSNl6Mj^73XE*OvnuS
z9hpIgyy&7YlOc&~gC5djwoBxl#O-%I7tQRP_DdLx&D3pfsPC5Q!japfM&#t&MOA&5
zPQtZDhM}YQI2O6v?8qsJ)%E}CMY1g^CGs_Rh<y(?W{4?my-2=DO7}fMA)6O@FgYfA
zeOp~3B2>}{sXEhP7fDX?2TG-jTuojjuOhW66+vIc=>i>ck{?o170HP+A;WC1&Z9vJ
z9C=xMR4b#nG<#EN560bTZn*3>yU@08vaJ`xF4Xsy<;0L04g`~DhlI<&k++7VPXAe?
z!$2t;Js;|Ocse9_Iv@B!ONR~1XfHm32tDX_puXD|VbpHA0R!pMbTThGl9*Br%JDx*
zV^mCRyR+p2R?T!nMrn;T9r^o9tPAAHd4V*h4jy0wed!_6nwl1P_h2obuU{ZPq#ENB
zkhDA9;2K!Mxz}vZGt=66fW)Uol}EVwLhyD|9y@w(cB7*iI;kI;z)*e?`nzp!VrT)g
z^>U-Xo+mrgVwHi{$ey$rfjdzMe9<31PnIXd#$YVS3C#<}WX2xGpzC1dG@K{XhE7xl
zpC{XgKA^OmBXas?CGi~Dk{+e_o+G={^DAlDVFjF(-_xmuy)Y4LZ#Q*)7>``C?ZI$U
z7u6S2-BCnS(1m??5EhQyozy#ndoSYN9d7U0+#64$c4zwcWc9ElD?MXurW>w*&;X9y
zTdDievn+T(|KQgc&VzqO_5Q(S>P@)!kqK<*eZk-7-YobQ&6_+nELMJwj31s+_%y|A
zSj~p|US4r)qR^c;;Jw&-l5;oj0Lxw6El!K}GjyczaTLX~G+?D{C!H;4$e!UDV^H~J
zW?Ox;t?qe{CA4#UF;$!SS@U}jokL*@c6EoH*)-G4oce=UM}^&bH_jQG>1sp$RjF<;
zOkh^n!GiI_>l$5Iba^QddD|C>0U9wHQZzh*uHpg;{LxK^7j|ntOGUSP9a8wPF^hKR
zHEP2X+3jA%5!8Dx_wLPO-hDOj1H<_;yx&clGLo#zZ+NU?dj#AUaQCOVdtdNP+?@q4
zrF#G1+o*Rk_nzB7cmelj1!&Z~$x9ir%JJVxS>}kWa(MIY(D@yk{nz9B&HgaMafo8}
z&wfWf$V?j7f<qovcxf&&=i~06mUr;?{vAA^>tH<VK$(7><Y(O$R?Qh&BG`TGf%3;`
z@_1I1a`rTNIV&q5?=&3~7A>88pOsERvf~3^!K*AE@Tk*dT=tm27W@syfuFu5YqCSV
zSAL6itu}^Q>7KS1_lll70plPag#Or8U#H@1q?LL}I`mO7UO7>J)u_K6wz}=Gq4noJ
z7OMG^uL(8P#{Jm?(SUUnC#P#IdZJHXykvxa3|%rK{tlFg8Rxpg)Fwtzf~Ypr<%asp
za@|CGAtDvSqYgb&lXmAIl(D@Ya3SDgz;!HOKAr|(JHhsi%T&UO`A+<C>U`lF-6_32
zXmbs6Fm-s872C5*ste#-G8QSo@VgMyDaP|M{E(F~4CdPsE6tYTaZbf?4|-<Pvzr(4
z*{{XI@O^AAGGoNuV9_s2O*Q5Thp}Dm+?LV34GVnSeX&W&>~-TW8}?sh)u?c5B=4uU
zQS`Isa`jH+*0H|vegydN{`pnqOUmb4%zNu<Dl#l9Et1)mWwx#KGdmnD)PfuC**FMJ
zd}Q%BMo_%=V!R@*r#5`Ht1t=#S(p(Nzm6^+{yvoQ?-^R)$o=PSl9WGtvhB<K;>osO
z^JnGTZWNmxBN_qEEExI+ePBDusn+*RrT}8}FM6Zsx))h+kICQtB?EEYlPXJOXvr}8
zccCPa2TO9isC=(vY;J&LG#bYkM;K>RSeDn-NRkDM6pv39KKb~}z=vY`&;4k#o)YHV
zf}WSm8I1eub3$>yHpe(ei;SLg&~xGP@+AwGRMZ$ND~wgkml?}b>#B@36}8pNt7_*j
zsH|Y-t>{t<w-EX&e7534aqY7UI=MbGnHXnvk>6(x^A14oB&FC!T8fj&H^noo_=Y3K
zYb^af2-%U^+Eq1Dk))1KR5cH>8`25x<3p-ig7yi>l@y2E0XgHas{RM^Psnc|_Z`7B
zktyS6s%nH>519w~CS)1pQ=hBqYRK7NsA?1Bc`KAQC@VTtwHq?I6CHR<Qt2^OO@=%Q
zIf=>>s!IQAzwxE2ZiF0nQdOHF?U0{94(h@{AuW)8ShRb;Qq?rbqEjd-$Q3C6#gJ<u
zH$wVht29GeyPzC_@&OL69?0VFR5ciX{hxr$f}D>txCrugJW{G5k3u#=PQ}Br1=4^=
zeh1_t$R0@lbMVKv1#2L)AWxo$KjdP(=~P4h0@(<8C*J>Be5ILEk_#OGI1AYWnTXfb
zV0^vs0Av>AOOQp7R=ht~Lxx>O2ar{eEs))i9gulHV(IAD5E2<uo~ZO3BvZ;Wl%|i#
zBjrP)Hy%V<C?_twElG3msc0vA%Hx#cc5(_Lubo_n>*MVtt|Cr}{)F67k!XDnOFfUe
z<qr(rpiI1ZfbzFMU-U)0NJeS&g0Jx4%iR1V@VO|BOg+Dp(agUbd;$0idR{r>_FpIC
zOE$x&s4)+NciaZgqk~t$Z}H$ax%mU&2csspdGHQ5e-8W>@UK9+C+O8IQv)L)Zv{0K
z`#D*#Fi{!#1=+ALPFep2c@eGoN6BHdDm%$Vh|QfOU{Rd%ekVzXNIFKQK$IUNOBcmW
z7<yb)fAffc#T~x@B`=}0aoXtOC$ji7!Ij{Bza*O$MGx2v^~wpd8|uHImV8MLFNzz`
z0oD5?`Dsy{^(xelQT{tTVi9+&P)sEk+hVl`|EQb41^hGMH+%4px%pY({jr_C^5Bna
zyj8NmU_T6=^f1__8A#i~kHP+{_uyB$`8UD;1N;FGey^K94*qs**J2O8NboqxuEJnB
z40d@KJmc;l6#M&U@GCv|S~q_S_{lgiXM3#1boXk^0&m4RvDL$WGxtY)$pV8O7}z}w
zHn;<92Y(+9mYE&_rn&>X3I1^$INy5sce(wKgTEUG&|VLI590%9y<COC#WN_$Xlp1A
zqW~OIlRa!Fx%;{W{3!6_^!y4&v%NVB{50@gdR{r^_P2od#i2+4uyJo4Wvj;DC2fa6
zJq+&kFqowoNN<9F8+?Ta&kv7Dz>b6WJ4g0cPVkS#xoE_JD!0mas{XA;|8j*mm)$n<
z`5fviN%%X4UD^*AF`}&<dHA!5T|LXlj4CUBzUZvVl;ve4UkN9X)iwaTs-KmuT6e;l
z2`~EfcAg&Lx|b9pX}_xISue>TWlhl|n*AV28=ju^l0qf%g9)vmzRODrleAxR`cV1{
zNw}o_V&aM8y<U9F?ukcAJN{ohO45D+;r8T?+J-1$Neh%-6Y-JR5Xq_9Or$KpQmSm8
zPL^6SwV!{O9d7%X>0bx^DKq%%>`ycNuUY(=_4C)sSg^Yl316gRLFh#y>(Z2_95SJ<
zG+`!t!r=8zjQc)FgEUZT$mX_t$-cVyfOR+_jS@`<xmZ_Y3PIgy8PF=_l5kv{%pE(p
zkbV((b~*>x8Aerd^r48!0eJPH;a(N&0pUeorGgQ#xnKU%Fc4~g2H%3yiyb(S@g#di
zgmt9o?YmKol-Le~Y8Lp}B#v+3LYg7)Jn_Q{UP;+CN8n3D6n5-^G19pxK~n#6uVnTT
z8NDLJY8Aep-@^N1n-uDLfxnl)arR(?`lP^f(m2i@B2ae={6n!NYdJ0L5qPbU1M>y`
zFP0gJ-1TsX^%G%pUHmr3UIJiuOyHkna3^-!Lj7LgPvNV3da>sa<Q0K`I+DQ>JMo|n
z5UbFV$Z_@%h8n~1bZM<{U`Hs34B-$e26Tb@Nq3R_ha=<)c3(jrd^jR%EiCE6_uqJ1
zn9VMFk9u45_BKkLUhEwP@*rh>PJ%V!fEr}IAnf*u)UxL<?EVBEqC`qf{fg@*?2{1P
zsf8xHqM^{Ddohc**+T{@ea)tLomgsiUIWkIIB9<*#5z{k?2PBW)3}iC7I^zG4(t;6
zeFD!hZ~(iOT}uU?Cl2np0)Ir{rbrHK6S$4x5}BxkOx`JMYD6sd8UVXD1nw)g3wvMz
z{{Ww0Z1J{!`PoQbe>B2+KzL=-$0of{B=kBV@Pshlp2vlBUf`wpyOdrZVH45ozrbmf
z{#*QaVV@#05X{Xb2~TKb+aSG_%8}KA2qn`Wjffh;X=#Eey*$B=qO4p%?}O*UhAw>n
zkV}BGk|}Huy^Iz+guSq!r$&Jf7O{7T-k%ltZ7Cc$FDCaY@I+dK_Z|`!CzH5^wxFE?
zUnd^1w+qj&1-@FOu|h<;BJlG9&uq<J)h&nATFRGH<=s^<dBVhbBQr*3<dB)GpYX9%
z)LOEM&zfnZe9eChwU(OumsRVHT1(c>lMNMBH5H4NfUQ_oQDwP*evO6v&~Q5`Shs+*
zt()B%v%WxXUA&>pOPQZc4%;#Uv}5o29HML*9g-(TCS<7}nX)Ovpgr0(iGP&X1Xz2r
zYqHFj9Nv`aFaF`dIhQE*(ORo#E}78R>YYp0qP3hy>zYUQqoq}58BsR7TRY0gguYgD
w8Ckn|yk8mjOC@W(29a+zr}zuN97qBjxB5ql5qOiyj?n?J;*|Bppf|+*AGzIOcmMzZ

diff --git a/sae1-02.c b/sae1-02.c
index d0bc3fc..51219c4 100644
--- a/sae1-02.c
+++ b/sae1-02.c
@@ -356,7 +356,7 @@ void enregistrementinfo(FILE *fe, listetuinfo *etu){
 	Listchoixdept b;
 	int i=0;
 	b = etu->carte;
-	fprintf(fe, "%d\n%s\n%s\n%d %d %d %d\n%d\n", etu->numeroetu, etu->nometu, etu->prenometu, etu->notes, etu->nbchoix);
+	fprintf(fe, "%d\n%s\n%s\n%d %d %d %d\n%d\n", etu->numeroetu, etu->nometu, etu->prenometu, etu->notes[0], etu->notes[1], etu->notes[2], etu->notes[3], etu->nbchoix);
 	enregistrementcarte(fe, b, etu->nbchoix);
 }
 
@@ -450,9 +450,10 @@ int correspondcarte(char choixville[], char choixdep[], Listchoixdept carte){
 //ajouter =============================================================================================================================================
 
 void choix(VilleIUT *tville[], int nbville, char choixville[], char choixdep[]){
-	int i, ok=0;
+	int i, ok=1;
 	printf("ville : ");
 	fgets(choixville, 31, stdin);
+	fgets(choixville, 31, stdin);
 	choixville[strlen(choixville)-1]='\0';
 	printf("departement : ");
 	fgets(choixdep, 31, stdin);
@@ -482,18 +483,21 @@ Listchoixdept ajoutercarte(Maillonchoix* a, char choixville[], char choixdep[]){
 	return carte;
 }
 
-void allajoutprocess(VilleIUT *tville[], listetuinfo etu, int nbville){
+listetuinfo allajoutprocess(VilleIUT *tville[], listetuinfo etu, int nbville){
 	int i, ok;
 	Listchoixdept b;
 	b = etu.carte;
 	char choixville[31], choixdep[31];
 	affichageville(tville, nbville);
 	choix(tville, nbville, choixville, choixdep);
+	printf("%s %s \n", choixville, choixdep);
 	ok = correspondcarte(choixville, choixdep, b);
+	printf("%d\n", ok);
 	if(ok==0){b = ajoutercarte(b, choixville, choixdep);}
 	else{printf("\t< choix deja existant >\n");}
 	etu.carte=b;
-}// possible de devoir rerajouter b dans etu ??????????? et return nb+1
+	return etu;
+}
 
 //modifier ==============================================================================================================================================================
 
@@ -501,6 +505,7 @@ void choix2(Listchoixdept lcarte, char choixville[], char choixdep[]){
 	int ok;
 	printf("ville : \n");
 	fgets(choixville, 31, stdin);
+	fgets(choixville, 31, stdin);
 	choixville[strlen(choixville)-1]='\0';
 	printf("departement : \n");
 	fgets(choixdep, 31, stdin);
@@ -541,6 +546,7 @@ Listchoixdept choixmodifcarte(Listchoixdept dep, char choixville[], char choixde
 		}
 	}
 	dep->suivant = choixmodifcarte(dep->suivant, choixville, choixdep, tville, nbville);
+	return dep;
 }
 
 void affichagedep(MaillonDept* carte){
@@ -558,35 +564,33 @@ void affichervillechoix(VilleIUT *villechoix){
 	printf("\n");
 }
 
-int correspondvilleonly(char choixville[], VilleIUT *ville){
-	Listdept b;
-	if(strcmp(ville->Ville,choixville)==0){
-		affichervillechoix(ville);
-		return 1;
+int correspondvilleonly(char choixville[], VilleIUT *ville[], int nbville){
+	int i;
+	for(i=0; i<nbville; i++){
+		if(strcmp(ville[i]->Ville,choixville)==0){
+			return 1;
+		}
 	}
 }
 
 void modificationcarte(listetuinfo etu, VilleIUT *tville[], int nbville){
-	int i, ok;
+	int ok;
 	char choixville[31], choixdep[31];
 	Listchoixdept lcarte;
 	lcarte=etu.carte;
 	affichagecarte(lcarte);
 	choix2(lcarte, choixville, choixdep);
-	for(i=0; i<nbville; i++){
-		ok = correspondvilleonly(choixville, tville[i]);
-		if(ok==1){
-			fchoixdep(choixville, choixdep, tville, nbville);
-			lcarte = choixmodifcarte(lcarte, choixville, choixdep, tville, nbville);
-			etu.carte=lcarte;
-		}
-		else{printf("\t< choix deja existant >\n");}
+	ok = correspondvilleonly(choixville, tville, nbville);
+	if(ok==1){
+		lcarte = choixmodifcarte(lcarte, choixville, choixdep, tville, nbville);
+		etu.carte=lcarte;
 	}
+	else{printf("\t< choix pas existant >\n");}
 }
 
 //supprimer ==========================================================================================================================================
 
-Maillonchoix* supptete(Listchoixdept carte){
+Maillonchoix* supp(Listchoixdept carte){
 	Maillonchoix *tmp;
 	tmp=carte->suivant;
 	free(carte);
@@ -597,11 +601,12 @@ Maillonchoix* suppressioncartechoix(char choixville[], char choixdep[], Listchoi
 	if(carte==NULL){exit(1);}
 	if(strcmp(carte->Ville,choixville)==0){
 		if(strcmp(choixdep,carte->dep)==0){
-			supptete(carte);
-			exit(1);
+			carte = supp(carte);
+			return carte;
 		}
 	}
-	carte = suppressioncartechoix(choixville, choixdep, carte->suivant);
+	carte->suivant = suppressioncartechoix(choixville, choixdep, carte->suivant);
+	return carte;
 }
 
 void suppcarte(listetuinfo etu){
@@ -613,6 +618,9 @@ void suppcarte(listetuinfo etu){
 	choix2(lcarte, choixville, choixdep);
 	lcarte = suppressioncartechoix(choixville, choixdep, lcarte);
 	etu.carte=lcarte;
+	affichageetu(etu);
+				lcarte=etu.carte;
+				affichagecarte(lcarte);
 }
 
 //==========================================================================================================
@@ -725,7 +733,7 @@ void affichagedepresultat(Maillonchoix* carte, int *suite){
 
 // validation 
 
-void validation(char choixville[], char choixdep[], Maillonchoix* carte, int *ok, Maillonatt lplace, int nbplace, listetuinfo etu){
+void validation(char choixville[], char choixdep[], Maillonchoix* carte, int *ok){
 	if(carte==NULL){return;}
 	if(strcmp(carte->Ville,choixville)==0){
 		if(strcmp(carte->dep,choixdep)==0){
@@ -736,18 +744,41 @@ void validation(char choixville[], char choixdep[], Maillonchoix* carte, int *ok
 		}
 	}
 	validation(choixville, choixdep, carte->suivant, ok);
-	if(ok==1){
+	if(*ok==1){
 		if(carte->decision==1);
 	}
 }
 
+void afficheroneetu(listetuinfo *tetu[], char choixnom[], char choixprenom[], int nbEtu){
+	int i;
+	listetuinfo etu;
+	for(i=0; i<nbEtu; i++){
+		if(strcmp(tetu[i]->nometu,choixnom)==0){
+			if(strcmp(tetu[i]->prenometu,choixprenom)==0){
+				etu = *tetu[i];
+				affichageetu(etu);
+			}
+		}
+	}printf("<! mauvaise saisie !>");
+}
+
+
 // MENU PARTIE 1
 
-void menuValidation(){}
+void menuValidation(listetuinfo etu){
+	int ok;
+	char choixville[31], choixdep[31];
+	Listchoixdept lcarte;
+	lcarte=etu.carte;
+	choix2(lcarte, choixville, choixdep);
+	validation(choixville, choixdep, lcarte, &ok);
+}
 
-void menuP1Utilisateur(listetuinfo etu, VilleIUT *tabVille[], int nb) {
+void menuP1Utilisateur(listetuinfo etu, VilleIUT *tabVille[], int nb, listetuinfo *tetu[], int nbEtu, DepartementVille *departementVille, char nomFich[]) {
 	int choixP1U;
 	int suite=0;
+	int reponse;
+	Maillonchoix* lcarte;
 	while (choixP1U >= 1 || choixP1U <= 4) {
 		printf("\n");
 		printf("---------------------- MENU UTILISATEUR -----------------------\n");
@@ -761,9 +792,6 @@ void menuP1Utilisateur(listetuinfo etu, VilleIUT *tabVille[], int nb) {
 		printf("|   7 - Supprimer un souhait                                  |\n");
 		printf("|   8 - Consulter ses informations                            |\n");
 		printf("|   9 -	Consulter où l'on est admis                           |\n");
-		printf("|   10 -                                                      |\n");
-		printf("|   11 -                                                      |\n");
-		printf("|   12 -                                                      |\n");
 		printf("|                                                             |\n");
 		printf("|   15 - Retour                                               |\n");
 		printf("|   Votre choix => ");
@@ -784,7 +812,7 @@ void menuP1Utilisateur(listetuinfo etu, VilleIUT *tabVille[], int nb) {
 				afficheIUTdepParticulier(tabVille, nb);
 				break;
 			case 5:
-				allajoutprocess(tabVille, etu, nb);
+				etu=allajoutprocess(tabVille, etu, nb);
 				etu.nbchoix = etu.nbchoix+1;
 				break;
 			case 6:
@@ -796,17 +824,23 @@ void menuP1Utilisateur(listetuinfo etu, VilleIUT *tabVille[], int nb) {
 				break;
 			case 8:
 				affichageetu(etu);
+				lcarte=etu.carte;
+				affichagecarte(lcarte);
 				break;
 			case 9:
-				affichagedepresultat(etu->lcarte, &suite);
+				lcarte=etu.carte;
+				affichagedepresultat(lcarte, &suite);
 				if(suite==1){
-					int reponse;
 					printf("|   1 - valider un veux               	  		       		  |\n");
 					printf("|   autre chiffre pour sortir     					          |\n");
 					printf("|	=>");
 					scanf("%d", &reponse);
 					//le menu de validation avec choix pour ce que l'on peux valider et apres -> validation et enregistrement
-					if(reponse==1){menuValidation();}
+					if(reponse==1){
+						menuValidation(etu);
+						enregistrementetudiants(nomFich, tetu, nbEtu);
+						departementVille = useAllFunctionsCandidature(tetu, nbEtu);
+					}
 				}
 				break;
 			case 15:
@@ -817,6 +851,7 @@ void menuP1Utilisateur(listetuinfo etu, VilleIUT *tabVille[], int nb) {
 
 void menuP1Administrateur(VilleIUT *tabVille[], int nb, listetuinfo *tetu[], int nbEtu, DepartementVille *departementVille) {
 	int choixP1A = 0;
+	char choixnom[21], choixprenom[21];
 	while (choixP1A >= 1 || choixP1A <= 4) {
 		printf("\n");
 		printf("---------------------- MENU ADMINISTRATEUR -----------------------\n");
@@ -828,7 +863,8 @@ void menuP1Administrateur(VilleIUT *tabVille[], int nb, listetuinfo *tetu[], int
 		printf("|   5 - Modifier nom responsable                                 |\n");
 		printf("|   6 - Lancer analyse candidature                               |\n");
 		printf("|   7 - Afficher liste DES candidatures                          |\n");
-		printf("|   8 - Afficher liste des candidats par départements            |\n");
+		printf("|   8 - Afficher une seul etudiant                               |\n");
+		printf("|   9 - Afficher candidats par odre alphabétique                 |\n");
 		printf("|                                                                |\n");
 		printf("|   15 - Retour                                                  |\n");
 		printf("|   Votre choix => ");
@@ -859,6 +895,17 @@ void menuP1Administrateur(VilleIUT *tabVille[], int nb, listetuinfo *tetu[], int
 				affichealletu(tetu, nbEtu);
 				break;
 			case 8:
+				printf("|   quel est le nom recherché ?                               |\n");
+				printf("|	=>");
+				fgets(choixnom, 21, stdin);
+				choixnom[strlen(choixnom)-1]='\0';
+				printf("|   quel est le prénom recherché ?                            |\n");
+				printf("|	=>");
+				fgets(choixprenom, 21, stdin);
+				choixprenom[strlen(choixprenom)-1]='\0';
+				afficheroneetu(tetu, choixnom, choixprenom, nbEtu);
+				break;
+			case 9:
 				break;
 			case 15:
 				sauvegarde(tabVille, nb);// mettre menu général
@@ -889,7 +936,7 @@ void menuPrincipal(VilleIUT *tabVille[], int nb, listetuinfo *tetu[], int nbEtu,
 				scanf("%d", &num);
 				ligneetu = recherdicoetu(tetu, nbEtu, num);
 				etu = *tetu[ligneetu];
-				menuP1Utilisateur(etu, tabVille, nb);
+				menuP1Utilisateur(etu, tabVille, nb, tetu, nbEtu, departementVille, nomFich);
 				break;
 			case 2:
 				menuP1Administrateur(tabVille, nb, tetu, nbEtu, departementVille);
diff --git a/sae1-02.h b/sae1-02.h
index 8cebf5c..69cc772 100644
--- a/sae1-02.h
+++ b/sae1-02.h
@@ -91,13 +91,13 @@ int correspondville(char choixville[], char choixdep[], VilleIUT *tville[], int
 int correspondcarte(char choixville[], char choixdep[], Listchoixdept carte);
 void choix(VilleIUT *tville[], int nbville, char choixville[], char choixdep[]);
 Listchoixdept ajoutercarte(Maillonchoix* a, char choixville[], char choixdep[]);
-void allajoutprocess(VilleIUT *tville[], listetuinfo etu, int nbville);
+listetuinfo allajoutprocess(VilleIUT *tville[], listetuinfo etu, int nbville);
 void choix2(Listchoixdept lcarte, char choixville[], char choixdep[]);
 void fchoixdep(char choixville[], char choixdep[], VilleIUT *tville[], int nbville);
 Listchoixdept choixmodifcarte(Listchoixdept dep, char choixville[], char choixdep[], VilleIUT *tville[], int nbville);
 void affichagedep(MaillonDept* carte);
 void affichervillechoix(VilleIUT *villechoix);
-int correspondvilleonly(char choixville[], VilleIUT *ville);
+int correspondvilleonly(char choixville[], VilleIUT *ville[], int nbville);
 void modificationcarte(listetuinfo etu, VilleIUT *tville[], int nbville);
 Maillonchoix* suppressioncartechoix(char choixville[], char choixdep[], Listchoixdept carte);
 void suppcarte(listetuinfo etu);
@@ -134,6 +134,6 @@ typedef struct listatt{
 
 void test(void);
 
-void menuP1Utilisateur(listetuinfo etu, VilleIUT *v[], int nb);
+void menuP1Utilisateur(listetuinfo etu, VilleIUT *tabVille[], int nb, listetuinfo *tetu[], int nbEtu, DepartementVille *departementVille, char nomFich[]);
 void menuP1Administrateur(VilleIUT *tabVille[], int nb, listetuinfo *tetu[], int nbEtu, DepartementVille* departementVille);
 void menuPrincipal(VilleIUT *tabVille[], int nb, listetuinfo *tetu[], int nbEtu, DepartementVille* departementVille, char nomFich[]);
\ No newline at end of file