From 0647448c3c3db8f529cad6f6943f55e9cccb1665 Mon Sep 17 00:00:00 2001
From: Boris <boris.ouya@gmail.com>
Date: Tue, 26 Apr 2022 11:50:59 +0200
Subject: [PATCH] =?UTF-8?q?Modification=20des=20=C3=A9l=C3=A8ves=20possibl?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executionHistory/executionHistory.bin     | Bin 250894 -> 250894 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .../.gradle/7.4.1/fileHashes/fileHashes.bin   | Bin 39547 -> 39647 bytes
 .../.gradle/7.4.1/fileHashes/fileHashes.lock  | Bin 17 -> 17 bytes
 .../7.4.1/fileHashes/resourceHashesCache.bin  | Bin 31689 -> 32607 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 bin/default/.gradle/file-system.probe         | Bin 8 -> 8 bytes
 .../build/resources/main/views/eleves.ftl     |  32 +++++++++++-
 .../build/resources/main/views/gommettes.ftl  |  33 ++++++++++++
 .../build/resources/main/views/login.ftl      |   4 +-
 .../build/resources/main/views/profsRoot.ftl  |   2 +-
 .../build/resources/main/views/welcome.ftl    |   1 +
 .../compileJava/previous-compilation-data.bin | Bin 9958 -> 10040 bytes
 bin/default/src/com/uca/StartServer.class     | Bin 4635 -> 4837 bytes
 bin/default/src/com/uca/core/EleveCore.class  | Bin 1770 -> 2848 bytes
 .../src/main/resources/views/eleves.ftl       |  32 +++++++++++-
 .../src/main/resources/views/gommettes.ftl    |  33 ++++++++++++
 .../src/main/resources/views/login.ftl        |   4 +-
 .../src/main/resources/views/profsRoot.ftl    |   2 +-
 .../src/main/resources/views/welcome.ftl      |   1 +
 .../java/main/com/uca/StartServer.class       | Bin 6696 -> 7149 bytes
 .../java/main/com/uca/core/EleveCore.class    | Bin 1238 -> 2144 bytes
 build/resources/main/views/eleves.ftl         |  34 +++++++++++-
 build/resources/main/views/welcome.ftl        |   2 +-
 .../compileJava/previous-compilation-data.bin | Bin 10040 -> 10040 bytes
 src/com/uca/StartServer.java                  |  14 +++++
 src/com/uca/core/EleveCore.java               |  49 ++++++++++++++++++
 src/main/resources/views/eleves.ftl           |  34 +++++++++++-
 src/main/resources/views/welcome.ftl          |   2 +-
 29 files changed, 265 insertions(+), 14 deletions(-)

diff --git a/bin/default/.gradle/7.4.1/executionHistory/executionHistory.bin b/bin/default/.gradle/7.4.1/executionHistory/executionHistory.bin
index 1c2a061fe0cf27160708d97fc09284c3800b9585..fef1b0ec9952c97f229a7f48dd675e92d9007400 100644
GIT binary patch
delta 1469
zcmeBM!QZ!ne}lh=Qo2cEL6%W^S+Z$Hc1oJLQASQ~c4?+jT4gQ+7%;8cT<GzLNnpn1
z>S-Ul($;>wGSfG8qu`Or$==TevL38X_d1_CgO~e8&-U|SMU$g^k_Gln4V1i@Z&)b7
zmbvj@o6GLWXMG+B+*;|SI**Tg!g<~ucZ2^j$4%brdqp7e<>xPlD)mo4;fg!)wo9UQ
z@<P7=fqk(@d{&-3wdF>Udf-f_3vH7b{aaW!p1ruDZE}~tmIS&x&YrorqRn73@8mQ7
z>S17I2FsWj`_l7sb5l!7Qj7J{N^%%59J&@{p22et#;%<F^vpbnB6NpO1smPPJlQiq
z#b70vvzv*rub?PDtvDz@zXYNS-DeO79hf{fKrVDD*qTp_j6LP4Im!9CsSqvb{)T8-
z#Kg=XFx@uzynRrkz4-&hnXy)POqm%l0;E|Wuw5XKv0WgLX}drm^J+7dm$Ng>N~=;!
zvrN*H(u#AkGb&Be3yQ0fbIo%K!I8+o&^^7ejd9=hxgE^s4VdIlPY>9`Y&HE=ACutr
zojaNLvk2U~S}n6{=^}{+>1SJytP$BWU2ZCq{PyMhm=`k%h_x@zmHF9lZGq><8|5?i
zoSc5pmq~Ve`9bDei~`=9`5)gomX-Xq*#FJ$ns3b86Av@bVVb^hKeL%ldTFM<J2W2L
zLp}Af63Y^q1(;9QDz(26URA7C(NsL);6%o`$@#hZrOAo<$m*vz9%XjgZhnk8jZxtL
z=Bl|_Zy$LsD7~$2YE*f7`owx>>FFnqGwTXyJA}6j`<&TyFFhmd?5fBW(*+xtHKyyH
zU@m9b`f>4z=_^h!E3xbavCf@fR_6e*nhmaTPM^4tNoKm_NoE07kh13KiH*#X)7?RQ
zu##zJ%%UQiJ4GLTKA&Hc5RvGAStNSRPLMIJCz;h)z^wHrnH@O5x((K_PhaqwNpw2T
zDP{qdxgcc<r<m1P7k*rPqIvpzGiFJNwh!z|F>?cRw%9dzM(jO#d?`rEpi6Fg%_(Lj
zj*Vbmx9D^)b7pA~pIV)hvfJt+UD)5halhPWyAovJ)l<xxENek5rqj%-5KFXAGpkBN
zOqwLj%ph=WYw%Y2Wr|-LZ>)MdJ1hObbbbqFNr@fuMTS;iFTS!-W8=%nvfeNeY}rqq
z=?)gmq9Vm@6}{bJ{q`R+UEGS5ztw_dryo7dtit;61IYD?EzFA3`Oh#5aP)%p9p;`M
z6Tu`Q{)RO-%PBqQK(U2%(c0OnX%N}<(-Q@lM5kw;VHRMy`(g2k>GfxrHKf5N89ZfW
zW)MgV-Jle<t6=@au2&X3-|s!1{O*A2^yg=o1z6vLtuu^d5*LXzeZD{R@B9g0)~?-C
z74zTrCCDW8v&?FyS3!ylezP-9LQYr7If=!^3<3|fwNF&_%CW3b%rI@AbzI@uo~0+6
z4W@BS4?WAQ!~!yZdi7amRhF9|<CdIdR;~XEHtrKUDBs=YJtx1WbxNPdgHww>a9A=<
z3NA@3DhW<4DoZWWgW7O#-Hgc1u6OJwXF6SzT=C><+g^|jD@>Rf1UlA>r`f67A3w%>
zet(Slj{nRI0?q!5rXSbSJh!M=Z3)-81_@>cfpu&qJ`wXwf{TM@9a6o*l)ZQQ!;8$C
z+l$XJ7c$Dp>iu}#aIdl7H+I{^m0HWo=YdV%;m5+rz~J$1y1;41gzcOcnOT_uU8|RG

delta 1323
zcmeBM!QZ!ne}lh=l1Xued2&{Aj&V|2N=166xlvYnMoOu1VoE9l1O#m^^mxQ1a5}cM
zEdJ&%lPB+0T`Kw~224)&elE}?_D|*g%$fr4^IJ~%?u?i`Im#zlU`LN_=W><(YYl%b
zNr-=wkT?0P&jW#n>FZ<unB83<z3t`CGA5Cb$$NdT2>8@X-Z`-2;EQhlV9Tb^L*FJZ
z^a~I;KHF3O(F!(+@8+xKEjn~jYcivM3v2KG7yFtgclm2cpt}PsV{n3f@)>{iFbHQE
z6JuX`er|4RNl9w4URp^G1BOE(3hyy8cID)!XXZf^p*tL+=m*ne&j1wz2xm7FV_!j0
zep+!*etro=7rM_N3b#+58z2`7VSi#|>?u#pNzTtrg=j(dH$>TUMrH<qS<TDM!w)FF
z-z0cq|DuHbr<fTq0;E|Wuw5XKv0WgLX}drm^J+5{r`ZH!v2J=}8{@w1b32&N8!*Y8
zo*uA=*=qW$J|@BKJ9jegXAxLCEp_jQxlcm3O{zR`qBSXSy4+MI`R&X1F)wDCerg7j
z?)LJ7%(ob)=gwv_+1`4Xxq@kW=TT;>?Hi9Vr!fj-if6s&DqixZtS@rPof({2(<jz5
zOHX$?!K^EAp?_!4ruCh|TT-X|J@73hc)DN%v&Qu0Cz#7wmh67AZ@SV+W+j$2AeP5T
zW_1n_tJ&Zh=k$pSnPfz()^&tEpT6V6vHjA&zRYr%4ARj&J+YBlQnWBl;6(Hh{qU$#
z3p1~i_B+8Er<pN}PJexpS%75)$i)9AnbjaH%~Q+{EDJzlxu=*lS^n&LvTypVQ_O0t
z4ZEN0Yo7kzj9F5GSM0rdrT%@rCmq^q4pk<JYxlj_*KF`fcKWwd%t{c=GN+mKStfvt
z@juP1$ub4RsyWT9%JKtb;L_8~s?r@G0}Un#GcyRNcx<}P=G4DqR@L`w{0#Scr}JAd
zOG>a-HMC^^aar^s<N1c|rV+d^c0JkGZ19$Ax`PF?=ydHf%mOSRq3QN#m{nMJfF!3Y
zwlFJB?*z#_0ogP646}^HUh}60msPr!35qT}V=`Ge8YI(f(8w|U;u&TY4zNChcdXM3
zPBMyUEByIgSeMQ3>sZ-V+#>ey8$|XgD>H+@Pv*8p{Y65*#D2dyTCL_BKKb1NRZ)h#
zi;2INeVzKCuW6}fLH6e(U{@GMGKo*`J<BY>0^(0!c$Qg>V*^OW;5Ym9KWCYhSWbXk
zr*w{4l?7zObnkP_s`Y2UDn79@GYC9%yYVC3?)@8?7at8<o42wsP6{qbEGh|3Eh<Yb
z(o4=sEG}jc=qbN@(BiA+<v2@u$E@7M7fZph(5TDIAaG7Kr(TwuAtqg*V(O`uKt*N-
zf!4e`CmTXJj)-p4ckl1;?PF#T;BeY{Iq|o`&#?KuKdVfc-l%Q=c#e4%qg<w4W-jyA
zOX07#?+f9qc389(Z16K*7DfgJ5C7?bR?H=g&!#UlWmKDPc#&Cl>IX*u?VJ~xS(yRK
CuUvru

diff --git a/bin/default/.gradle/7.4.1/executionHistory/executionHistory.lock b/bin/default/.gradle/7.4.1/executionHistory/executionHistory.lock
index cd066d510f4420b0cea714d42ef912b62f1de66a..7a366603627bbe5c7d12599a521a65235e7ff999 100644
GIT binary patch
literal 17
VcmZRc=2h{WH~9S%1~6bc0RT3b1wa4*

literal 17
VcmZRc=2h{WH~9S%1~6cX0suBD1kwNi

diff --git a/bin/default/.gradle/7.4.1/fileHashes/fileHashes.bin b/bin/default/.gradle/7.4.1/fileHashes/fileHashes.bin
index c28706fd4cd98d04942534fcfde49136eb4561ad..c9761e7bd6a805a39535702acf22249e062da7e5 100644
GIT binary patch
delta 1334
zcmeyph3WoQrVS<%jLSEhN^D>enE&z9<VhQ@onQciS!*}nl{v}Je?746Y+&Louo%Ov
z>dkX?q=gxGZd8om*zD-R<E*fxU$5@|@*IDwHr?&}wpko!U|?*p_{h!;(I8|uIk$U-
zf|zsjo^|b4cI3VK8C-q*#5}N~pS!j~6fs?#Y}(@@p_+Nt#Np%GWvty-?fF@xmV*_2
z-xo7^Z;908)jcT+=AzCirW2x9TuLinI#*5q5Lm&x2WKIsaNgXk-@Ac{#p2I3=E=Ru
zQj`Doi?CR7{3x9)Izf-elH*4tL><ek$qPM%Cnrr12FYeluAHC;V&qP~SSdC6=mfBy
z#L0IjNGa@)FEX_HdhwNw8XI3mmh}dZeU=<QCPK_%tDG!8Q4OSZ;$+8(U^5aY*XBtn
zykX7Fa!SuRP;4Pxw05>?8dO^^L>tTc$!j6nVkcjRXzQIE+afhtc@o&_rIXJ#Nlgxg
zaJEi%jF+0+4&lt5Y}hO{c_)l>aT3_hg_AeNN==rX4A#7MvSWqRWPb=}<z)T}DTTHV
z>`F0n19P_6HF!qsJqeB<OO78)A+F))n!Io_*b^HkpPmdhaPQ>55XRQYiltJMJ*R+8
z-a0vP3RD^t9cv+?dne~-NKL*E;q08euu*EV;8c-%OO78qA?C9jU|?X-GiG35&}3j>
zPy}ItgX?BQZg#z6KRMIsn&gTnU%}zS8P^8UA*F$-Lssv{>xO%c{l2l=Ca%<4UJlhU
z528ce0!@c9gQCEU%hl69cBQTTcx9$<>PEpMAT6mvJEuUjuuYzPe5#8=)`QjQUguM1
z@N(bi*?vB(2&Bl8Gx!ul5li}H?P)6%u$m;2<_l2-Hc5>oRU~cd<d0LOuo{^vlC~D2
z8f+w3^~TAK(-T12HcoEzk(&H}dIcyY<xZ}iAyvO`YM|uJe8WNsw#<zO+gx^ooMrJ@
z+6Q6=V;7ot859Mu=|~kx6UD6~@#W_)hbr|?KjDfy@wQ8%6=X*$+tw%s1_pBm1_nkY
zOiQq8fd>Sm(&Y6s)h8FtlvTL3(o1z7ANPdwygTj&|7DH?nQieoOa$th1C!U!RI^JJ
zNdqMbkX_c8c40Fj6=Bzb$-=WDN-Q~kghI?@{*7rwILq<v{X#Q1CAKZ^j=J_I8srK~
oPR;)i9gMp%bv)SCK2g;x$FfE-!?b<YaRrEuxHO0k7BP?x05&kB<^TWy

delta 1095
zcmcb=mFf2urVS<%j7vA0N^D@+{8#26|K@8tLc)xl8x=b^HamLoI4fM%Pzu<&f63Kb
z50WGfw>#M}FfcZl-{gM600w+zlXJUQC<N|bY!R-{@V<c|__>B*O)p51k>;XDU^NU(
zj+0G$Toh`KDT~*fGI(^qVAJbY50BkMRm5mCSus?2@|vDx1=dA-iyB4#uL-}s;!)7X
zrcEG)=C?!zA*ONe+^pZbfr$lV{^Z_dsmXu)MOe&l%KA(eouJ2KepA*0qK@U&<b@u>
zlanS0gJfMMS5DA_FfLX~O+GpStjA*V-3d|>tW^yy*?(LXeaLveVY_JrFWA1DvKf=D
zE2SoDP6VsWnCv(atlwgCZJw0GUh}60msPr!35qT}V=`Ge8mc8_a(|1|<oysW7L%_-
zw4_XqZIPO+JPB-2$K<n3Qj<d=oCT8|<E19ILpU{)4V$GV?}TtFCSRNcwy$CG##pJz
zvXjA@r%ZONkecid;Y^s!Um>NyEB0Q!Qvbf*lMZb)hbogquuE>q>p}v7@6+Uklhr`}
zUNHIeWUzs2CjW&nmP}SGm74511#I$?$%#{-(i3~6Ca;Bvu9=*lAvO6vgtKDu!bYjd
zf>TB6&2P%CfSAv6fPsNQ&zOOML6d=jK@o%nddlw}wD_udInGkvF)KIm1=K~V5FKKT
zm^w1;GIN=?UJ8G`eP0M?wZkH)4pWE@wP$ELlo=ESPREv(#ozp8^5ng$OGW?00I-&u
z^UgxFFrS!we5#8=lh{9%_cLn>yw7hr;kz?pGDs09*+3LA+?%XDZG{3>lWxiPLKJ~b
zQe!c{CEq*w<5VfEMuH?Es=-D=RX0vgfM{#<k(&H}dIcyFJSJDqkW$#uW81l0W&c{k
zUrQ3=-z4OLoMrAdDHmb}W5wi&!NT&`)WBWESTQ*;O<2BO^3H)B2VZpa2U|9U9{L70
zr<LI=#2kj_IMu+-VR$}y{Y<sVg)`+Q=T9@596M8#8!pFaJvnxo8V|yAjN2y*&x#N*
OzbR_~v4QzFC}IF?nRl=N

diff --git a/bin/default/.gradle/7.4.1/fileHashes/fileHashes.lock b/bin/default/.gradle/7.4.1/fileHashes/fileHashes.lock
index 05d3f93b3b32433a08151032def88c45e5f307bc..c93855b0d4423664a89d054a4029e3eecf1482b5 100644
GIT binary patch
literal 17
VcmZR!zI=P>ku8N03}7Je2>?DU1=Rom

literal 17
VcmZR!zI=P>ku8N03}C>w5CA>b1%dzo

diff --git a/bin/default/.gradle/7.4.1/fileHashes/resourceHashesCache.bin b/bin/default/.gradle/7.4.1/fileHashes/resourceHashesCache.bin
index b3db32a1a9287415e0dab5d5f39a38d330e02fd7..872d10a5283c52631f3bd7ac95828e121a30e4dd 100644
GIT binary patch
delta 1421
zcmX^4o$>xZ#tkMCjPo~}N^E507Zr8V-&HNo00y;7H{X>MWaL}>+H>Ej8^K^PhPug5
zq#p5ivF}zlO!y5Es`<TnuXH9epZ8?@ioJU;LIo$w$j|2EXsmsgJ^?CHym_s>1e3t&
zcW<^PJ7uv$L~D<4-mCb6QR52dnuG0iU!ozRbwB?@!PQUF{>SwuJcNkXOK+a59Kk5?
z@I$ObPL1()h-lsQ$!}Ex`Jerp{jK%X0*F|x>||5bpZp7AGJBTxOoxiuZ&p=fWa5{(
zyMX&)T0TUu&VRD3hK0sg#htR+{eL5&f|H@v|NokL^S~5#(?byPdfUyu8XU|5Z1a!%
zbEePBf{4}?ZuZsoU=on{(ywXyh!y6u=E=Rfjr@+Eu9Q4-+z(Z`bu+8pOlE$E8_$ku
z+}i*Z)SW!l&_ckn-L<f_A`z;x=H}$1h8qNIPA$7Hdcx}`L}hK_<Xj_5{)G8H@vGO|
zg@{$3oIKa4LBnBg_LTQmD~ln5HTp33JDROn6q}v;2`bJzS=88)UwOHK-nq$3A!4;J
zH@g};GV<HoUVHdb>IX!y`t{~olSC$d(b9?R^RMoP2-a-heAR3tGymGT*S&Jspn+dA
zb#twi5)+f!&y9)_oSPjzI*cc`M)DhO@T%wztl`PpVRvqB?2D}o3=DF{3=9mC3=9l{
zAS}T5?B4Xc;QP1NSv{W^bWh1+^2Y?>dW)DhZBHyXTr^s@C#UZ?hpEdZQ}>;&Rl0oE
zY^N)-)(jSyDty9M^=<8%<vVS5?;&l~*?TcnDED?JY^`4K=+g%0t*Kx3<sekVz#ON@
zuuZUMYwR07-lU}6wh8YMN?<B}T#ig%tlre;=&W`}^TW1Vm@35Dm*>j-Y`C_-^W%;3
znR`x7RxB0fzgjJ`Yw0412I*&8kE{{dGg&c3xPEih+^n~cJQtMSRyQ@Oyo_nm+wS;f
z_Rj^HE2C@+T^G%^##E6Z|LkeV%a>mmy4inUm|Y@^sY0jG{6t2Se^O&Y?1TP^x3?fv
zOg^2*$-kNZ@ttE?$zO~8-|VjW#ynXuShzm^g@17q+w5ifrE_^JA09>MfQ13)?lUfr
z{A0Bv9tE7<v352n^Poj?o38NeEB`ifWH#@Ko0Vp|1JewKD`v$ROk9$aa|*7+O|86u
zP*D%FX6CBif3BhzPg!cTm3?$rg~j{9nE|OD(`=_NRD1hz&95Wv2t#0IST5|nFvD!}
z$L581@^ZS?Ps3DE&C4j{|IW$ZTEU{4!@f6x!5JgTKE5F^ciY1kY7?q!MP!fEVX>xw
zOLOtXg0g3ux80Us_H26k<iIdtzTVw-@{1+v8P|P`5w@_NTo555e7aVt{f+RdVzr8<
L;t2;Qf?NXta(BMS

delta 136
zcmccrkMZPp#tkMCj4hi@B{ni{{wK-7I9X2m#%4a51m?+Y@)I}fEATOG4pn-<xH(lN
zfN}C!RnN(KY9BV6ssCV{?53%|c&R4y=Dj)&Op`_RD>pCGpTIoX&scx*RO1zsLrn}P
t&oe2X>}qPbxzE&saq~U12&T<`mMfSy^Vv!=F{u=8R9wKl+0moJ7y#K<G9Lf{

diff --git a/bin/default/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/bin/default/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 0f5131080b0b4c673b6a11b44fee59f86ff839a7..ffda5eed1297d254b23d8f3039abde48b1e67b49 100644
GIT binary patch
literal 17
VcmZS1niFg`=cG_D0~oNG0{|-}1DXH;

literal 17
VcmZS1niFg`=cG_D0~oMY0{|;$1Kj`s

diff --git a/bin/default/.gradle/file-system.probe b/bin/default/.gradle/file-system.probe
index 9660c49a31f7c14a8abbe20880fbf8cf922772b8..9575bc58d52e7594d3a92664a1bd2ddeae68d395 100644
GIT binary patch
literal 8
PcmZQzU~EYFJc9!O2rmM8

literal 8
PcmZQzU~Dk2-|Pqg295$O

diff --git a/bin/default/build/resources/main/views/eleves.ftl b/bin/default/build/resources/main/views/eleves.ftl
index 99dea52..6dbd5ea 100644
--- a/bin/default/build/resources/main/views/eleves.ftl
+++ b/bin/default/build/resources/main/views/eleves.ftl
@@ -6,11 +6,12 @@
     <h1> Liste des élèves: </h1>
     <#list eleves as eleve>
         <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance}) </li>
-        <form action="eleves/delete" method="post"">
+        <form action="eleves/delete" method="post">
             <input type="hidden" name="id" value="${eleve.id}">
             <button type="submit" name="id">Supprimer</button>
         </form>
     </#list>
+
 </ul>
 
 
@@ -34,6 +35,35 @@
 </form>
 
 
+<h1>Modifier un élève</h1>
+
+<form action="/eleves/update" method="post" id="update_form">
+
+    <label for="firstName">Prenom</label>
+    <input name="firstName" type="text">
+
+    <label for="lastName">Nom</label>
+    <input name="lastName" type="text">
+
+    <label for="dateNaissance">Date de Naissance</label>
+    <input name="dateNaissance" type="text">
+
+    <label for="nomClasse">Nom de classe</label>
+    <input name="nomClasse" type="text">
+
+    <button type="submit">Creer</button>
+</form>
+
+<label for="id_selection">Selectionner l'identifiant</label>
+
+<select name="id_selection" form="update_form">
+    <#list eleves as eleve>
+        <option value="id">${eleve.id}</option
+    </#list>
+</select>
+    
+
+
 </body>
 
 </html>
diff --git a/bin/default/build/resources/main/views/gommettes.ftl b/bin/default/build/resources/main/views/gommettes.ftl
index 07c3774..adf8969 100644
--- a/bin/default/build/resources/main/views/gommettes.ftl
+++ b/bin/default/build/resources/main/views/gommettes.ftl
@@ -8,6 +8,39 @@
     </#list>
 </ul>
 
+
+
+<h2>Ajouter une gommette</h2>
+<form action="/gommettes/ajout" method="post">
+
+    <label for="nom">Nom</label>
+    <input type="text" name="nom" required>
+
+
+    <input type="radio" id="choixArcEnCiel" name="couleur" value="arcEnCiel">
+    <label for="choixArcEnCiel">Arc en ciel</label>
+
+    <input type="radio" id="choixRouge" name="couleur" value="rouge">
+    <label for="choixRouge">Rouge</label>
+
+    <input type="radio" id="choixVert" name="couleur" value="vert">
+    <label for="choixVert">Vert</label>
+
+    <input type="radio" id="choixBleu" name="couleur" value="blue">
+    <label for="choixBleu">Bleu</label>
+
+    <input type="radio" id="choixBlanc" name="couleur" value="blanc">
+    <label for="choixBlanc">Blanc</label>
+
+    <br>
+    <label for="description">Description</label>
+    <input type="text" name="description" required>
+
+    <br>
+    <button type="submit">Creer</button>
+</form>
+
+
 </body>
 
 </html>
diff --git a/bin/default/build/resources/main/views/login.ftl b/bin/default/build/resources/main/views/login.ftl
index c5e9459..709c68d 100644
--- a/bin/default/build/resources/main/views/login.ftl
+++ b/bin/default/build/resources/main/views/login.ftl
@@ -7,9 +7,9 @@
 
 <form method="post" action="/login">
     <label for="userName">Nom d'utilisateur</label>
-    <input name="userName">
+    <input name="userName" required>
     <label for="password">Mot de passe</label>
-    <input name="password" type="password">
+    <input name="password" type="password" required>
     <button type="submit" placeholder="Supprimer...">Envoyer</button>
 </form>
 
diff --git a/bin/default/build/resources/main/views/profsRoot.ftl b/bin/default/build/resources/main/views/profsRoot.ftl
index c4f1c13..e441c30 100644
--- a/bin/default/build/resources/main/views/profsRoot.ftl
+++ b/bin/default/build/resources/main/views/profsRoot.ftl
@@ -13,7 +13,7 @@
 
 <form method="post" action="profs/delete">
     <label for="id">id</label>
-    <input name="id">
+    <input name="id" required>
     <button type="submit" placeholder="Supprimer...">Envoyer</button>
 </form>
 
diff --git a/bin/default/build/resources/main/views/welcome.ftl b/bin/default/build/resources/main/views/welcome.ftl
index 79e250e..a5c5fa9 100644
--- a/bin/default/build/resources/main/views/welcome.ftl
+++ b/bin/default/build/resources/main/views/welcome.ftl
@@ -9,6 +9,7 @@
 
 <a href="/profs" >Consulter la liste des profs</a>
 <a href="/eleves" >Consulter la liste des eleves</a>
+<a href="/gommettes"> Consulter la liste des gommettes</a>
 
 </body>
 
diff --git a/bin/default/build/tmp/compileJava/previous-compilation-data.bin b/bin/default/build/tmp/compileJava/previous-compilation-data.bin
index 84d385c04d352c732af0bfed66ad3da5a73a0a13..ef41e9fabd46fdf4fb18451c2e73aa69e8a8ff6c 100644
GIT binary patch
delta 8242
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
Wa|E8UGIW+CmVm}_N*Ec_85jTr;W?uK

delta 8262
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
TR))@!#1hbGPYEMqG6Mqu3>rj_

diff --git a/bin/default/src/com/uca/StartServer.class b/bin/default/src/com/uca/StartServer.class
index 244c61e67ac5713bf0b2bd31df5dec91172befd5..21d599d5804c9dc8b3b0bd657f787f52bc143448 100644
GIT binary patch
delta 38
vcmbQO@>F%gEGAC7jdNr;HXq<uV%%KHsmjQ>X5t*>&HK30SvMcxk7fb@4ZjU-

delta 36
tcmaE=I$LGJEGCYdlem>P?*GX?`Mtp2&9^vJ85!L-ad)w9elPHi5db624^IF9

diff --git a/bin/default/src/com/uca/core/EleveCore.class b/bin/default/src/com/uca/core/EleveCore.class
index 83766c785cd3535c83e10ef8ae95eaa097aa5bb0..73b839d472647b624573d8195577f0e3d49cd101 100644
GIT binary patch
delta 243
zcmaFGyFiTV)W2Q(7#JAL8B`~7^)s<FZk&CbX>tLR_vBs{ugQNIwct2_HF&Z=Ysls#
zW@jcIw$g%>#FA7-1|JR2$rqW;CVyoXW)I_FkY;4OGjX=^<V`GII1Jb*q{zs??V6KX
zmg<^Ul37y8&Y(P5h|QFdd9nvvYdj-^1cM|4BLgP`1A_?zGXom~0|VD?2ChgUsqGAW
z`xzJ*m>2{Z7#P?X7#SECBpHMl7#MiKY%T_2uxe%o8L%o@201V-&!7TU&%~g>pacK_
CUNubs

delta 93
zcmZ1=_KKJ5)W2Q(7#JAL85AdS^)oRY-#Gg?(`Fe~XQs(BIirPS85y`;b5hGvUGqvZ
uODfqJ<R`OnnKCj>w&7}(WoD3IU|?WkkYtbo)6xtI3=9lx3``6%3~~VLwiEXN

diff --git a/bin/default/src/main/resources/views/eleves.ftl b/bin/default/src/main/resources/views/eleves.ftl
index 99dea52..ab066ce 100644
--- a/bin/default/src/main/resources/views/eleves.ftl
+++ b/bin/default/src/main/resources/views/eleves.ftl
@@ -6,11 +6,12 @@
     <h1> Liste des élèves: </h1>
     <#list eleves as eleve>
         <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance}) </li>
-        <form action="eleves/delete" method="post"">
+        <form action="eleves/delete" method="post">
             <input type="hidden" name="id" value="${eleve.id}">
             <button type="submit" name="id">Supprimer</button>
         </form>
     </#list>
+
 </ul>
 
 
@@ -18,6 +19,26 @@
 <h2>Ajouter un élève</h2>
 <form action="/eleves/ajout" method="post">
 
+    <label for="firstName">Prenom</label>
+    <input name="firstName" type="text" required>
+
+    <label for="lastName">Nom</label>
+    <input name="lastName" type="text">
+
+    <label for="dateNaissance">Date de Naissance</label>
+    <input name="dateNaissance" type="text" required>
+
+    <label for="nomClasse">Nom de classe</label>
+    <input name="nomClasse" type="text" required>
+
+    <button type="submit">Creer</button>
+</form>
+
+
+<h1>Modifier un élève</h1>
+
+<form action="/eleves/update" method="post" id="update_form">
+
     <label for="firstName">Prenom</label>
     <input name="firstName" type="text">
 
@@ -33,6 +54,15 @@
     <button type="submit">Creer</button>
 </form>
 
+<label for="id_selection">Selectionner l'identifiant</label>
+
+<select name="id_selection" form="update_form">
+    <#list eleves as eleve>
+        <option value="id">${eleve.id}</option
+    </#list>
+</select>
+    
+
 
 </body>
 
diff --git a/bin/default/src/main/resources/views/gommettes.ftl b/bin/default/src/main/resources/views/gommettes.ftl
index 07c3774..adf8969 100644
--- a/bin/default/src/main/resources/views/gommettes.ftl
+++ b/bin/default/src/main/resources/views/gommettes.ftl
@@ -8,6 +8,39 @@
     </#list>
 </ul>
 
+
+
+<h2>Ajouter une gommette</h2>
+<form action="/gommettes/ajout" method="post">
+
+    <label for="nom">Nom</label>
+    <input type="text" name="nom" required>
+
+
+    <input type="radio" id="choixArcEnCiel" name="couleur" value="arcEnCiel">
+    <label for="choixArcEnCiel">Arc en ciel</label>
+
+    <input type="radio" id="choixRouge" name="couleur" value="rouge">
+    <label for="choixRouge">Rouge</label>
+
+    <input type="radio" id="choixVert" name="couleur" value="vert">
+    <label for="choixVert">Vert</label>
+
+    <input type="radio" id="choixBleu" name="couleur" value="blue">
+    <label for="choixBleu">Bleu</label>
+
+    <input type="radio" id="choixBlanc" name="couleur" value="blanc">
+    <label for="choixBlanc">Blanc</label>
+
+    <br>
+    <label for="description">Description</label>
+    <input type="text" name="description" required>
+
+    <br>
+    <button type="submit">Creer</button>
+</form>
+
+
 </body>
 
 </html>
diff --git a/bin/default/src/main/resources/views/login.ftl b/bin/default/src/main/resources/views/login.ftl
index c5e9459..709c68d 100644
--- a/bin/default/src/main/resources/views/login.ftl
+++ b/bin/default/src/main/resources/views/login.ftl
@@ -7,9 +7,9 @@
 
 <form method="post" action="/login">
     <label for="userName">Nom d'utilisateur</label>
-    <input name="userName">
+    <input name="userName" required>
     <label for="password">Mot de passe</label>
-    <input name="password" type="password">
+    <input name="password" type="password" required>
     <button type="submit" placeholder="Supprimer...">Envoyer</button>
 </form>
 
diff --git a/bin/default/src/main/resources/views/profsRoot.ftl b/bin/default/src/main/resources/views/profsRoot.ftl
index c4f1c13..e441c30 100644
--- a/bin/default/src/main/resources/views/profsRoot.ftl
+++ b/bin/default/src/main/resources/views/profsRoot.ftl
@@ -13,7 +13,7 @@
 
 <form method="post" action="profs/delete">
     <label for="id">id</label>
-    <input name="id">
+    <input name="id" required>
     <button type="submit" placeholder="Supprimer...">Envoyer</button>
 </form>
 
diff --git a/bin/default/src/main/resources/views/welcome.ftl b/bin/default/src/main/resources/views/welcome.ftl
index 79e250e..a5c5fa9 100644
--- a/bin/default/src/main/resources/views/welcome.ftl
+++ b/bin/default/src/main/resources/views/welcome.ftl
@@ -9,6 +9,7 @@
 
 <a href="/profs" >Consulter la liste des profs</a>
 <a href="/eleves" >Consulter la liste des eleves</a>
+<a href="/gommettes"> Consulter la liste des gommettes</a>
 
 </body>
 
diff --git a/build/classes/java/main/com/uca/StartServer.class b/build/classes/java/main/com/uca/StartServer.class
index a2ac372db94bd974e37e7bfc38452cf9496c024a..8878afbb40590f136d850ab2c8a9a48c7b332c68 100644
GIT binary patch
delta 3567
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

delta 3115
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

diff --git a/build/classes/java/main/com/uca/core/EleveCore.class b/build/classes/java/main/com/uca/core/EleveCore.class
index 0e1c4fff1b7065cc57fe06d016e5a137e2def599..7b4cd18578057b5aa8a890c8a5986c4cd2509c67 100644
GIT binary patch
delta 1241
zcmcb{`9Prl)W2Q(7#JAL84B4MEVvjL87#RNq#3N(8LYV&SU?;W1{)B|7DU*A2zyQj
z2?hr)21f=bP6lTN7Y+tjE(SLScaVq&2ZJXUgBOE0NTCmi@C6ZmAi^I+1b|cpvNHs6
zF-S02ax$<<Fa)zRglzN;VB}#dEl5c$No8d4(eRx3LS^DFp^3kQRl^t=m@-os85lho
z88`}xQp+;)ON$v9c!Nt4le2vj3qlf;a#APHX6)jYW02=zkYfmCWRRMCkx{Ciharq1
zoQEL-L_~s!C=e0N5W~(8%fq0;5Xa6C&%=<wkjTiu4zb#hogs;bAsM7Bg&`F#Y{brx
z#>0@#kio-{$&kgvkPRYoKtwKx$YaRoVJKjTV`LCZ&d=2^O-|HL&M!)xT*bu0EW;qX
zxs!>Jv7V7ZAS<yfQ9ma!FI_*lvbZEQmyv-vzqEvrLDUB<lbNp{P?VWh5?oT0nwV?N
z$RLbGn2~|K0Hi1<kCA~rJ+;KC(ldpTK}y3@(+6gEYF<fZNu|Ckn6if2TMxCkq$o2l
zosoepCp9m<B!iKGSwqv4k%1>YwZtv6sJO&0F*lWwK}16n;v|S;!FsG28MxC^OMDVx
ziUiVAOI#95QvDJ$i;ENUl2akZ_~qw1=Oh*vr!q3I7N?egT*so}si_vm$iPxiTAab4
z$RNQW&A`CG$RNoe!ywDRz`(-5#308Y&%nr_FnI;DthOQp0|OTW69WSSF9SCNAA=GD
z0|O5OBbZbM>tJM1VNeCD|G@0Ps5se>MZO-S%8r4Jfq_Av0ip`TQe#jD>(pn^U{D8}
zsn4Lvpw7SyR;R_F&cMRJ$)Lud&7i};%D~8=%b*7`mw|z?n1P9bgMooz@ool|$n6ZQ
zR&1LXc!YSjG4N?^Vc?S9#=w7ofyIg)Bq*?rfv;X?8-w6H1|CT^oox(k%Nckj*(BMw
zF$isAVAF-k=x$?Rhsy|WV_=tL0ZW0@vTS4EfXj(&W8jcvh0C#SW8j3#iEd-ylw_0M
z#vlfAha}rJ2J!HX3=H)Q%nYD_^J5TZU|^7D;AD_x5M+=82do-{B7-i2GJ_d|I)ej)
z7K1y3HbVe|K0_3P5knG#2}2HpB|{m5EkhlHJwpeBGs7eXcZL}Zo(zi^yug7U1PKUu
zur6lMXD|Q<>tY5_0E42cela+NLE*X>9KtN1uwwv)Fe?Km!z^$JvoXjqv@#en=rFJ|
z7%?y~2r+Q{WiVrBU}0xq;pFEO<P_v&;9xL@qy+{B24!%JF)(oNW{`;7&LFv&L24s7
e>41F726h1`p_ni*FmN+5m@=3#FfcGNm;(U0t=tFz

delta 373
zcmaDLaE;UV)W2Q(7#JAL8SK~@)VLTJ8PvHL_!%_V88o>VSU?;W1}zXv8${@U2whGF
z9tJ%w27Lwtb_PQ(1|9}=kcbgGgYm}J0LICIOdT9T48lANLJTI8A2P|yn=+X3Fqne~
z3lL!mBCHs!*%@qj7$g{MC+9IsGYc>XZth`bWRzo2WZ+@oXJBApWRPSKU=U<rU|?oo
zVh~~wW?*CxnY@uzR$G*Tfq{#GiGhKEmw}ssk3o!qfq{pC5lo7MbucnWFi3*c|73Mw
z6rF6vCSMOyWyiqAz`&r-08s^ENij%+b?P(7Fi3;V)Mt=okY->8tCM4pW?*69WKd&}
zXHZ~ZW#C{?gt&u&fk7Fpnt_3PHv>=Pb_U+f4162G&IUP;4QwdLkxC2<3``8l4D2dk
GhAIHzLn00U

diff --git a/build/resources/main/views/eleves.ftl b/build/resources/main/views/eleves.ftl
index 99dea52..d4b2053 100644
--- a/build/resources/main/views/eleves.ftl
+++ b/build/resources/main/views/eleves.ftl
@@ -6,11 +6,12 @@
     <h1> Liste des élèves: </h1>
     <#list eleves as eleve>
         <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance}) </li>
-        <form action="eleves/delete" method="post"">
+        <form action="eleves/delete" method="post">
             <input type="hidden" name="id" value="${eleve.id}">
             <button type="submit" name="id">Supprimer</button>
         </form>
     </#list>
+
 </ul>
 
 
@@ -18,6 +19,26 @@
 <h2>Ajouter un élève</h2>
 <form action="/eleves/ajout" method="post">
 
+    <label for="firstName">Prenom</label>
+    <input name="firstName" type="text" required>
+
+    <label for="lastName">Nom</label>
+    <input name="lastName" type="text">
+
+    <label for="dateNaissance">Date de Naissance</label>
+    <input name="dateNaissance" type="text" required>
+
+    <label for="nomClasse">Nom de classe</label>
+    <input name="nomClasse" type="text" required>
+
+    <button type="submit">Creer</button>
+</form>
+
+
+<h1>Modifier un élève</h1>
+
+<form action="/eleves/update" method="post" id="update_form">
+
     <label for="firstName">Prenom</label>
     <input name="firstName" type="text">
 
@@ -30,9 +51,18 @@
     <label for="nomClasse">Nom de classe</label>
     <input name="nomClasse" type="text">
 
-    <button type="submit">Creer</button>
+    <button type="submit">Modifier</button>
 </form>
 
+<label for="id_selection">Selectionner l'identifiant</label>
+
+<select name="id_selection" form="update_form">
+    <#list eleves as eleve>
+        <option value="${eleve.id}">${eleve.id}</option>
+    </#list>
+</select>
+    
+
 
 </body>
 
diff --git a/build/resources/main/views/welcome.ftl b/build/resources/main/views/welcome.ftl
index 7fdb3ed..a5c5fa9 100644
--- a/build/resources/main/views/welcome.ftl
+++ b/build/resources/main/views/welcome.ftl
@@ -9,7 +9,7 @@
 
 <a href="/profs" >Consulter la liste des profs</a>
 <a href="/eleves" >Consulter la liste des eleves</a>
-<a href="/gommettes"> Consulter la liste des gomettes</a>
+<a href="/gommettes"> Consulter la liste des gommettes</a>
 
 </body>
 
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index ef41e9fabd46fdf4fb18451c2e73aa69e8a8ff6c..f2501bad7540451399cf5ae00781c1c415aca5a1 100644
GIT binary patch
delta 51
zcmdntx5ID4HYS0eAv+u22xZ%{Y?1HT<*(qf`52Qhqrh?%&N+QOj8?}vZ~ke!ptEfA
IOJ;v%06gy%!~g&Q

delta 51
zcmdntx5ID4HYNd1*@mB$igCY+6sqrh?Z5MI^D!o2MuCItW<+jwy<<N))9ISziYH$;
Jzhw4T1^|AX84&;g

diff --git a/src/com/uca/StartServer.java b/src/com/uca/StartServer.java
index ec5dd0c..f72f495 100644
--- a/src/com/uca/StartServer.java
+++ b/src/com/uca/StartServer.java
@@ -134,6 +134,20 @@ public class StartServer {
             return null;
         });
 
+
+        post("/eleves/update", (req,res) ->{
+
+            String firstName = req.queryParams("firstName");
+            String lastName = req.queryParams("lastName");
+            String dateNaissance = req.queryParams("dateNaissance");
+            String nomClasse = req.queryParams("nomClasse");
+            String id = req.queryParams("id_selection");
+
+            Core.Eleve.update(Integer.parseInt(id),firstName,lastName,dateNaissance,nomClasse);
+            res.redirect("/eleves");
+            return null;
+        });
+
         get("/gommettes", (req,res) ->{
             if (authentified) {
                 return GommetteGUI.getAllGommettes();
diff --git a/src/com/uca/core/EleveCore.java b/src/com/uca/core/EleveCore.java
index 224ce37..a2761a1 100644
--- a/src/com/uca/core/EleveCore.java
+++ b/src/com/uca/core/EleveCore.java
@@ -21,4 +21,53 @@ public class EleveCore extends _DefaultCore<EleveEntity> {
         entity.setNomClasse(nomDeClasse);
         return dao.create(entity);
     }
+
+    public void update(int id,String firstName, String lastName, String dateNaissance, String nomDeClasse)
+    {
+        EleveEntity entity = new EleveEntity();
+
+        EleveEntity previous = dao.getById(id);
+
+        if (firstName.length() > 0)
+        {
+            entity.setFirstName(firstName);
+        }
+            
+        else{
+            entity.setFirstName(previous.getFirstName());
+        }
+            
+        if (lastName.length() > 0){
+            entity.setLastName (lastName);
+        }
+        else
+        {
+            entity.setLastName(previous.getLastName());
+        }
+        
+        if (dateNaissance.length() > 0)
+        {
+            entity.setDateNaissance(dateNaissance);
+            
+        }
+        else
+        {
+            entity.setDateNaissance(previous.getDateNaissance());
+        }
+        
+
+        if (nomDeClasse.length() > 0)
+        {
+            entity.setNomClasse(nomDeClasse);
+        }
+        else
+        {
+            entity.setNomClasse(previous.getNomClasse());
+            
+        }
+        
+        entity.setId(id);
+
+        dao.push(entity);
+    }
 }
\ No newline at end of file
diff --git a/src/main/resources/views/eleves.ftl b/src/main/resources/views/eleves.ftl
index 99dea52..d4b2053 100644
--- a/src/main/resources/views/eleves.ftl
+++ b/src/main/resources/views/eleves.ftl
@@ -6,11 +6,12 @@
     <h1> Liste des élèves: </h1>
     <#list eleves as eleve>
         <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance}) </li>
-        <form action="eleves/delete" method="post"">
+        <form action="eleves/delete" method="post">
             <input type="hidden" name="id" value="${eleve.id}">
             <button type="submit" name="id">Supprimer</button>
         </form>
     </#list>
+
 </ul>
 
 
@@ -18,6 +19,26 @@
 <h2>Ajouter un élève</h2>
 <form action="/eleves/ajout" method="post">
 
+    <label for="firstName">Prenom</label>
+    <input name="firstName" type="text" required>
+
+    <label for="lastName">Nom</label>
+    <input name="lastName" type="text">
+
+    <label for="dateNaissance">Date de Naissance</label>
+    <input name="dateNaissance" type="text" required>
+
+    <label for="nomClasse">Nom de classe</label>
+    <input name="nomClasse" type="text" required>
+
+    <button type="submit">Creer</button>
+</form>
+
+
+<h1>Modifier un élève</h1>
+
+<form action="/eleves/update" method="post" id="update_form">
+
     <label for="firstName">Prenom</label>
     <input name="firstName" type="text">
 
@@ -30,9 +51,18 @@
     <label for="nomClasse">Nom de classe</label>
     <input name="nomClasse" type="text">
 
-    <button type="submit">Creer</button>
+    <button type="submit">Modifier</button>
 </form>
 
+<label for="id_selection">Selectionner l'identifiant</label>
+
+<select name="id_selection" form="update_form">
+    <#list eleves as eleve>
+        <option value="${eleve.id}">${eleve.id}</option>
+    </#list>
+</select>
+    
+
 
 </body>
 
diff --git a/src/main/resources/views/welcome.ftl b/src/main/resources/views/welcome.ftl
index 7fdb3ed..a5c5fa9 100644
--- a/src/main/resources/views/welcome.ftl
+++ b/src/main/resources/views/welcome.ftl
@@ -9,7 +9,7 @@
 
 <a href="/profs" >Consulter la liste des profs</a>
 <a href="/eleves" >Consulter la liste des eleves</a>
-<a href="/gommettes"> Consulter la liste des gomettes</a>
+<a href="/gommettes"> Consulter la liste des gommettes</a>
 
 </body>
 
-- 
GitLab