From beeb3330bbf733c8c40e190ceb552631dd320789 Mon Sep 17 00:00:00 2001 From: Boris <boris.ouya@gmail.com> Date: Wed, 4 May 2022 10:25:08 +0200 Subject: [PATCH] Date en plus propre --- .../executionHistory/executionHistory.bin | Bin 250894 -> 250894 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/7.4.1/fileHashes/fileHashes.bin | Bin 39647 -> 39647 bytes .../.gradle/7.4.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../7.4.1/fileHashes/resourceHashesCache.bin | Bin 32607 -> 35497 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes bin/default/.gradle/file-system.probe | Bin 8 -> 8 bytes .../build/resources/main/views/eleves.ftl | 15 ++++--- .../build/resources/main/views/gommettes.ftl | 41 +++++++++++++++++- .../compileJava/previous-compilation-data.bin | Bin 10040 -> 10042 bytes bin/default/src/com/uca/StartServer.class | Bin 5039 -> 5080 bytes bin/default/src/com/uca/core/EleveCore.class | Bin 2848 -> 2895 bytes bin/default/src/com/uca/dao/EleveDAO.class | Bin 2900 -> 2954 bytes .../src/com/uca/dao/_Initializer.class | Bin 4677 -> 4627 bytes .../src/com/uca/entity/EleveEntity.class | Bin 1225 -> 1453 bytes .../src/main/resources/views/eleves.ftl | 11 ++--- .../src/main/resources/views/gommettes.ftl | 41 +++++++++++++++++- .../java/main/com/uca/StartServer.class | Bin 7460 -> 8210 bytes .../java/main/com/uca/core/EleveCore.class | Bin 1987 -> 2037 bytes .../java/main/com/uca/dao/EleveDAO.class | Bin 2699 -> 3027 bytes .../java/main/com/uca/dao/_Initializer.class | Bin 4218 -> 3953 bytes .../main/com/uca/entity/EleveEntity.class | Bin 775 -> 834 bytes build/resources/main/views/eleves.ftl | 7 +-- build/resources/main/views/gommettes.ftl | 2 +- .../compileJava/previous-compilation-data.bin | Bin 10043 -> 10042 bytes src/com/uca/StartServer.java | 32 +++++++++++--- src/com/uca/core/EleveCore.java | 7 +-- src/com/uca/dao/EleveDAO.java | 5 ++- src/com/uca/dao/_Initializer.java | 4 +- src/com/uca/entity/EleveEntity.java | 8 ++-- src/main/resources/views/eleves.ftl | 7 +-- 31 files changed, 144 insertions(+), 36 deletions(-) diff --git a/bin/default/.gradle/7.4.1/executionHistory/executionHistory.bin b/bin/default/.gradle/7.4.1/executionHistory/executionHistory.bin index fef1b0ec9952c97f229a7f48dd675e92d9007400..e318b8e34ea8588aee38e4e93e2e525153282b77 100644 GIT binary patch delta 1419 zcmeBM!QZ!ne?x$WqFGW(j%j(NNnTn>NkLL^T6T6xo=LKCvIzqOWNt3>c*G>|sd?T0 zIVDo7>&@?qUHMQVHaXe*xxn+MTh}@%o#;Nl;$7+Ix5wvgj`Eq#B*3{wX8&a2hhY-; zKKpR|jZB)%=-<M+=YGqFj>%pATH@#?Edj|GJeYjiUn3Z-%3v82V_$lHZf<HxNouiP zT1gHAhD|%bn!X7#cID)!XXZf^?VB1Xc{AUzP=YOU<H0tU-3=f`lidQ;S*L(mMFA?T z3&5<|0Sc@ez^nrSN_r3%EMj725O`Ydc4?~9$({e@x(|r$3YpBzfZ?5HfxvcwK*n}~ zK&I^ify`^oluYtWQ!7gHQWKNXGfcBGOik0Pax!vC^K&a9LC8=$y|ImP-}bp3%<M)2 zSAI2rIpv$L9#veeuz&f5lhZHmV3eJHaToIqftUj?1jOCApPqjGE`)u;mIc$#|7TR# zeseeTd?tY{C%eD@xVHX6OrrU9+4_G<)8(cz$xmOtkJ(coOl$t~sOBB+_Kf+>hie$; zPTSA?R^Z6)7tbYcZ!JBl%4Qn1yyf}yi!4lX+ocaM>oW?Ru3=Ywk@WvchV4?P$|R@% z(+~PG$xbgn$m}n$z3nu!b@Zz>3;!vfR$)l;na*gzsJQ+6LFOn%fjJsKR-J$Mb(2|B z#yrtV)8pF{4>NCL5h!6xEVw;4c;~yco6JAnURIhuv7T9ay3+|}U4EXl{<Ovd-dHhJ znKvp=cTC^d#Hcxa`3dH7*5y|YyziK<e3Dtwcr%D;aGi~Df@@A{S*mk>QL0{YPGWH} zgFvzRiM%qakAJ@`KGJuJWyPgc8>fEgF!;(ped0nU8PTeB9bwO>@Az<Rzx1y!vm7R` z1{pLxv5{F);*Ze019y&#RhIO>oY3bP{c}4=%3z<s^qVJ{l~}<Fr=4O}m0k}PU&+DD zAaKds&Rl%Kb{)n&427${uGv4`;S{qb)SY>!m^E0tL29SZKE<pGWxh9KmUJp`Yk4?% z$p@=RXDpfpHa}pT3{qwAQI4@6>>C$Hf0$<i-=;V$tX$c8HOoDyGWp!DWnj--7N4$g znpvB5Hb~#}fYZzp67{h^R!Szw>U#Y;9J8NE>%x4Hl)-+{=?$lu6<OOsyy?qMGpk5X z2QdvM2{SVYm@K`MdPirfbnXn*sb=E&*QWDZFiT1lD&BOMEc^Q8#t5;b4L$cK|Gs?S zeTP8@?{o(XW>H(iSJ6$6wI(wy3Q)|*d9C&yB72C9vDY=PB(tOv=5V9a8LbKT-9#tc z7e86<UGaG`$du`dEzFA3JI^o+uzm*f=bd5JX8#Ui8myn5D8M8-{plHI0S>TYgLkac z3r;eMXe<2rU09dR@9S9ER@@@?@Eb(-DJwIBz(?<WT#k<nep+RHJ5c<TbLQlC2UJBF z@-8O+UiNkBgTAJvng!XPTbq`D=$LL8$s|6#_bjsj>tc|7(-)lu#R-^s<}9-YYde_v z6C}DC%v3(dtisw4X8M4b5Yf_e%-VtPPkQoQ53)^~^zM}BAzK-#r63y&X4o+^2<(-P zOQ^lJ!lKpB@7;8xyHA)I1e8rfXB~IRDyXTSs%*VeiJO^0V8PP0QFqNZ%-C^$@{<5T zqhs4Yo@1WHC?~9(_O|S;Z9q?>%!5U(*Ge~n&E4h4!pOkj@ol=mX~u-@oEMo{nE_1# Bl>q<% delta 1421 zcmeBM!QZ!ne?x$WqDf*wmQi|HvS~(kN}9P*Mow;aX{J$HWiA64Fs<5L=<$e2V8-R@ zX&<}N)_%M)(>Haa;E~D6-p>WH9;{CHI-fd&m-|M~_VZyyo1=WDGYRaAJ>s+S<f$z; ziqr#VI$da+%;?|3y7BDA6>XEd{I$f<O*(t#;)*td$&*j}YXpN;87yOB>`Twj%}p&S zNiEh(E6HKNuxTyGID_XLj9oeT>6v*DMf;`(O5V&jER<l&+<36fW%pE&$&=jz)LB=8 zSw#UVtYF(F&kj&voeDBy@__&)J+PR;A|_@Af$6rv=k0?U?ad!3&WyFXW6I2c;hkoI zz;=N^#&&@~rtJcO%xle*GR#V=QcJT;(v#APbFwokP0|aBtCDlga|*#h$iUD&y|ImP z-}bp3%<M)2KfM~Ow|WSi>btCQ@{_!r%=C*p7-gql+{JuDz+-8)R58n}$G4WKJvy@M z(!A;C|1&CVzqy-vK9j(`tJN~QmM)TLkbbuH$QqG7)8(cz$xmOtkJ(dz)j|A+_cs1h z;tXjw>;$|Lr|oBcE0Fu*O74}r8<y^slugj?dE__!A`6q;cIgAm`iuf%?aOmzel}cN z;Q8@J`OG~hryulXlAT_Dkl9~gt!9wEB$HUOvA~}tX??H6rZZYFDsKONkU5G`z<V?Q z<2%Q)lD`)Fzu8^$jd^?GVdiZt0{=Hx&CPoI$a6vIZFN(l%FELy)-y{_cRInWE1>NV z-Y)EOX4Ad&jIgt-B3DcoY+%-yzWfApIqTMsi%&F9S3b$CXuKE1G`P;jIKee1wJg;+ zzbI8NIVZ8Wm_dM3w&7=`V%)DHh3Y$B`|mu2D80rxed0nU8PTeB9bwO>@Az<Rzx1y! zvm7Qv%uH-#mJ}^a6F3olL_a*L)WXc`r2S5?#%X5EqSIfWWENoE39@q9DP~n^Fw0;i z2Q!1f4+9t1(5IT6d4D|am*pO+o$hdoSrh8eyi?2?taCxSrq4dbtjf9&%zSUgEa}wt zfn6zPZeY$9y9UpQy(f<^1xXon$uahWz2oBO5A#j%`Q008n)SIRA2+ZlT%cdJ5v;OX zbh^T6W^LA$Al~$V)65bQUk+@3viRIa{iW^IRzJ?`ommT#GFT-%z2P*oBGehnPBW`W zL+qL)%*-HgZENsW`DKb<8*i+7J3A}=z;u2KW=V-1@<oPLUoXD0QDfuF$g<ur5p2>= zp6L!2%%Zl%Z56%UV*U0XGF{w?mA}<OWZT&odtLKNGD|994mUcT(VB4IO?1M2@ss7= z6`vn|07af+3$x<%&NIvcti2#pr_VdXtj!K)8myn5D8M8-{plHI0gk&M#Rl(Krx%=L z6wy}r^SiJvo8Q;5vaPs9?BO@CQ3g+0nHdDqLN_Rd?J8J5vFnuu&-Z(eC%-$OD$0;| zG4c1ZuTvlNH7(UF$o~8mWZHDYNG9>=y=R#PSYLwqi_S8uvR(x<&zxn}V12e{>51m) zKS81p4a(=3RakF=75IRdU%|}MbIjU-2iMJr-0XVCesZSMHOUoEzP9aMdZO82g$Xl* zK*xIVG&^<s<HvZ<?~gIx@t>JNpxJ-X^y7M(=N1*KE#W%XAi>Nau#U~dCt{vSaB<MA zL#kJ@_iq1qj(HZNoUGoD*A4d?`+Z}#O<bw9ynG(m+#P-_j0_AO-=+(kW=z=5d6Aiw F835ocjS~O> diff --git a/bin/default/.gradle/7.4.1/executionHistory/executionHistory.lock b/bin/default/.gradle/7.4.1/executionHistory/executionHistory.lock index 7a366603627bbe5c7d12599a521a65235e7ff999..69b5e1c6d112329c8febee13878f6253d3ebedbb 100644 GIT binary patch literal 17 VcmZRc=2h{WH~9S%1~6dW3jj8c1vUTx literal 17 VcmZRc=2h{WH~9S%1~6bc0RT3b1wa4* diff --git a/bin/default/.gradle/7.4.1/fileHashes/fileHashes.bin b/bin/default/.gradle/7.4.1/fileHashes/fileHashes.bin index c9761e7bd6a805a39535702acf22249e062da7e5..7936a7c2b2b59f368084dcde11cbf5c82ca9f80c 100644 GIT binary patch delta 1298 zcmcb=mFfOgrVYN`3i<yppN#cM=I`IsRu&x6c9VgDv7wK1b1DNENUWQj+r6TGOWL>k z!|^NDeA&GCL;UJC2auxFnQ!dCY8aT#F)%Rb88a|2XfiM`D1xwn`;t$uy+q53-!1g$ z`MX_845Xuv^~Y+c4qZ$g%b6@z&pLGLu*a_D3r{@I69MT+?Qh)0z`(%Dz`(%#W3pnX z@Z>c;$qK!`pYNI$ezZNY(dkV2zePnLmAy}1B|yyP3Yo0myCNv?$O?|D%HB!tFN)@^ zR+}^vq$qX690iCXmRXn%I6CPypU_;7gR>s(E%^3CJ{qK>kJbAYL<g(Q<d1#An{E2E z85I<}z6D=jZflWj`#@Kzq;Ee+W$y<CsOQ*aCb##yDE#us*;*O<Xz^XaMgO0t_<sZ` zN?oe`3Su0a&E(hpYAn4UG*?d+ouJ3l`$4lGBE#}(@<I>c$w?E0L9&Y{S5DAl>Ek@e zI{9Ly)a0WRL_ngGC*PeQ6;!Br(_ymg>ysNJ#F94j+@B1xq4$I4Z-_Z;9hhD;d==gF zSZgxVq5#E=oY!jaQFSmoP4=7!cGKj^wRuvLdnbY|`#yQ;L_LVD*CCA0lVe+?CM!<@ zNo$EuKHDTUITXTCpX?YfHMt$a;ht>REH!y2gu_1h;v|qMTHKR2#!4yF$NpF;nINm{ z_3LoVekQF85SM7lL)^}_e{x`&@Z^BWpfJ#qp3Gk%RbSxN@^JE!4_1@TSTqZ4e!vLT zAq>&MUx?}3z_%$53oBQ)Ud?h3s!Tq&3#6luHDVb=2lr)69mVP=^2)3}{{6D}NZ%=z z6_=noRzcGs``5{ZO~R8UrhuKLJz23-YO?1Pa44uxPMiYvp7G>~JyHsPgytQ%b6l*l zr2plFKF{c%AcJ~8XqiK-=CGT5b_yt<we%-1Y?PWTI8~&+_k)%;M3&_Mro-N!^yIr9 zWScbU-6_vQwlY#6^ZGasszP+gOJM2{R!)0c_SQC_r%~p?qSkArP#uO49qLwSI+Pg{ z1wJ*e+drp7YIVK&U9l@4N+5ZbQBeb;h3&!Q<5OJ}o<H5X)=B9^_xTm?N<Y6nJ`ZGW z>Q0S|5Jeo{CTmYyp@7{a{Us1ZV3X8X`WW>$O#V1k3agQQjQTqus=-ErRqvVHI6VQR zZO`OJAF0Xzr&oYd<?6}RGr*z^lkY<qOC}4>l$snnvjU`c%H*3f^+1dTleuRlfHZVZ T&YzVa(ECBN9by5C7$__NBAc>A delta 1237 zcmcb=mFfOgrVYN`3QPL+>h3Sk@waNz-M(*|#c>7(#s-Uz?A#1sAY?Z=w|j+`m~-=< zb?sMn<h}YCTz&k+Jg}mlyS9SWFfd(YU|`TQW?*2@WME)W1YrTU;Cl5Ohm98*vwU8! z_2no5=`dexT0A*6NJ>IA^Q?)($F<8?yRX{wvq&umNm_j07c+TpiPYrPJt+$2qRuI% z6QWmKN-JMFS55yASi!poXCd}+-khx8yCP^|RK|;Cdvvd9U%jTcnoU*!q{v8f(Ibc= z7FA3~&7LazFv!Sw`=2-e8~1!E-44=WzU0{+hz?fH$shZKH{0}SGb;3+`?Ntd{-Np@ z&Nr%+lQrIgRW9x+hNxs(FuA?oMM7}8cX7zRTuFy#%-1c=EJQ(yEdE?$p4^)(HTiG9 z2#Y1hkJ8Da6ZCj2IetV!w6eUKywF2<a?%80kZk7U$_aWPM(*T`l~R+BP5|pkoP2kJ zRL~CjB15aM7hl<^vGHYOS#JQDZprauBE%fFN=)w+w^j6Zi}l-o$aHZlR{mCts)Lz* zvgbrKkY$OJYxATg_f7;`);oFWM6eTLCtrs!dMC%WNKICr1eRVp`D~Na<WLA_>tx4x zsmbjS&fLj{%~F$h!Z;TvflXOBd1I`U#Fqn`pDaGNQGaQBwbhUFdS{?6Sv%RWLTa-A zWU$FAC-YZGDYSiHSBjY%n6t&M!82m-NpSMB<oK}^;!A$6$&Q7>f#-K`sA<;cnta^A zqHuwJ8Pv3m5H(!gm?6O_+wikeG45B9LiL@m{dXQhb?k-cV7WHAut|8b#1wEGY@MuF zDmB@23fNIwCnrt;`(rOCElL!o37m*Nq8}brYGLMe(tan*oXPnaQj_mPwCtR`uu*EV z;8c-%OO78qp*9@Abko6gGa@&;-m#yY>2ytU#gngKvpD10AUdQpFm=f4{dnDQud&}Z zcH6|2TFc9!I_5!is9T`vP-ajRm~pv!+Q+W6wI8p{^iAC;cm$*+RcPlFh!(cVlaEhz zQOJ6*I^FAh>I`1)8$H|4hZTVoS#k!Sf+%81pR7G?g#uQSMACdAiohnRv80NmO`ZI4 zsuWfuQ$^C&LR5o|1gqXSxp8^|NZZEAjXqM7|4**~CCJ>#)ic1NqLc4K7`~GQXG%?u noml}=t2z1ROg#|8cQW^^1dxW%$@#Mq1S~n@(x4WIfx-d+g{hgG diff --git a/bin/default/.gradle/7.4.1/fileHashes/fileHashes.lock b/bin/default/.gradle/7.4.1/fileHashes/fileHashes.lock index c93855b0d4423664a89d054a4029e3eecf1482b5..401e27a99dd2e17a9120401f134746b3bd6e8150 100644 GIT binary patch literal 17 VcmZR!zI=P>ku8N03}7I75dc0F1-SqK literal 17 VcmZR!zI=P>ku8N03}7Je2>?DU1=Rom diff --git a/bin/default/.gradle/7.4.1/fileHashes/resourceHashesCache.bin b/bin/default/.gradle/7.4.1/fileHashes/resourceHashesCache.bin index 872d10a5283c52631f3bd7ac95828e121a30e4dd..42f46a717f11d2b36cb8a5820d4e9e000781bf94 100644 GIT binary patch delta 4554 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 DqvpUG delta 301 zcmZ2EmFfOJ#tkMCjPoa(N+e9aD<LtNS2AI8t7PS7F{ygS$w#F>Zaybt&Nx|C?!e@) zat4!a<r6n=lNVr`d{1%3<atWslm99iOpaCdoV-stezK{`hsn089+S7Kewch!&2X}u zy20c$b@9nl)eR<pRi8L{o`%8Xe;V$SV>Klw_i29EJWY#(aq>3p8<UsmR7^J0ov`_y zu0P{sSN$84eGLvwRyCBI9A@agd8=Ut<787~&&kt_-%mbkB02e=iTLDL(}c-aO${cS zn%$VJYMwB8uKCKzaTd!rn_4O|PHwYu-~80df^o91jl|?y8-vM5Z44%>+Imc$YrA4| ztX%-(<fHZzH|IIbV4N)Hl(2c4(+|eU%UnD*v$^^+PR@0k!1Esp7#P%kZd8=u-0bKf GXAS^M@_e@d diff --git a/bin/default/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/bin/default/.gradle/buildOutputCleanup/buildOutputCleanup.lock index ffda5eed1297d254b23d8f3039abde48b1e67b49..49a38ee889f0ba6c4c8b7003b54df2aec4baa7a4 100644 GIT binary patch literal 17 VcmZS1niFg`=cG_D0~l~{0st!e18x8S literal 17 VcmZS1niFg`=cG_D0~oNG0{|-}1DXH; diff --git a/bin/default/.gradle/file-system.probe b/bin/default/.gradle/file-system.probe index 9575bc58d52e7594d3a92664a1bd2ddeae68d395..0844cde17e882bf26d052e9dfa5c8293b460fbdb 100644 GIT binary patch literal 8 PcmZQzU~K4p%C!^#2r2@j literal 8 PcmZQzU~EYFJc9!O2rmM8 diff --git a/bin/default/build/resources/main/views/eleves.ftl b/bin/default/build/resources/main/views/eleves.ftl index 6dbd5ea..b4ee37e 100644 --- a/bin/default/build/resources/main/views/eleves.ftl +++ b/bin/default/build/resources/main/views/eleves.ftl @@ -5,7 +5,8 @@ <ul> <h1> Liste des élèves: </h1> <#list eleves as eleve> - <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance}) </li> + <#assign naiss = eleve.dateNaissance?date> + <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${naiss}) </li> <form action="eleves/delete" method="post"> <input type="hidden" name="id" value="${eleve.id}"> <button type="submit" name="id">Supprimer</button> @@ -20,16 +21,16 @@ <form action="/eleves/ajout" method="post"> <label for="firstName">Prenom</label> - <input name="firstName" type="text"> + <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"> + <input name="dateNaissance" type="date" required> <label for="nomClasse">Nom de classe</label> - <input name="nomClasse" type="text"> + <input name="nomClasse" type="text" required> <button type="submit">Creer</button> </form> @@ -46,19 +47,19 @@ <input name="lastName" type="text"> <label for="dateNaissance">Date de Naissance</label> - <input name="dateNaissance" type="text"> + <input name="dateNaissance" type="date"> <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="id">${eleve.id}</option + <option value="${eleve.id}">${eleve.id}</option> </#list> </select> diff --git a/bin/default/build/resources/main/views/gommettes.ftl b/bin/default/build/resources/main/views/gommettes.ftl index adf8969..ad98634 100644 --- a/bin/default/build/resources/main/views/gommettes.ftl +++ b/bin/default/build/resources/main/views/gommettes.ftl @@ -4,7 +4,7 @@ <ul> <#list gommettes as gommette> - <li>${gommette.id} - ${gommette.nom} : ${gommette.description} </li> + <li>${gommette.id} - ${gommette.strCouleur} - ${gommette.nom} : ${gommette.description} </li> </#list> </ul> @@ -41,6 +41,45 @@ </form> + +<h1>Modifier une gommette</h1> + +<form action="/gommettes/update" method="post" id="update_form"> + + <label for="nom">Nom</label> + <input type="text" name="nom"> + + + <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"> + + <br> + <button type="submit">Modifier</button> +</form> + +<label for="id_selection">Selectionner l'identifiant</label> +<select name="id_selection" form="update_form"> + <#list gommettes as gommette> + <option value="${gommette.id}">${gommette.id}</option> + </#list> +</select> + </body> </html> diff --git a/bin/default/build/tmp/compileJava/previous-compilation-data.bin b/bin/default/build/tmp/compileJava/previous-compilation-data.bin index ef41e9fabd46fdf4fb18451c2e73aa69e8a8ff6c..67cb0b933018ab1daf383f456b348f29478b70a1 100644 GIT binary patch delta 194 zcmdntx65yWu0VlX%frb_K3GjUW6><I`2pibTO~$;`q&>UB@<+Iy?z~z+0UePVRAm> zTY*Bwn+}s@U!U9<A(phE=l<l$IZR#x#p);W%B(*A{j&H--zk<AmnI)$auG0m72Wh$ zYckWK0L6@)*J|%4OEISk1inpiSXjBT^=g)TP-XJDU6cEnl?46>%{y@CxL9RL|H}z| zp3y%iA7qvgdw<fC?|P7J(xi8%JP+B*NNM;nGV3!;e#<P*$TXRaWg-(Z!{!+*3zPu! C0#wle delta 192 zcmdnxx5ICOu0Y!dcBPoPfjL|38ayNRo;<$MR*6yI%Yn^L7N6UwzqGyD>c@G#Gn4Zf z-wN!IFEX_HdhwNw8XI3mmi30oIZR#xoU#o+D;48@6)9BT`PzTy;pAgXE&|1E6}{bJ z{q`R+UEGS5ztv8bVontZKEHcIO|w4N<l_bwg$wk{CigQd2^6LYoQOW6A0Aa|Vdizx ze&^(a%n~98*UgCB?0Uz3a;DQY$rVq&YWOiSPJYiU&cw_xnVn@KBh%(tEDMwXsZ>$? diff --git a/bin/default/src/com/uca/StartServer.class b/bin/default/src/com/uca/StartServer.class index 716c19ed24ee67dd7fcca0cdd1724ea6eb6c77df..6acfa03f4a40d6d8265ef1a09ff3ebf71d7d32c9 100644 GIT binary patch delta 39 vcmZ3lenWl2Y{oN_?{X<`+`o%)@&iV0&aA|;M7@&Kijv8V%%Ynsnal(MQ^gNd delta 21 dcmcbizFvL8Y{tct`?!@i?%&0@c@dMDAOL8Z2)zIR diff --git a/bin/default/src/com/uca/core/EleveCore.class b/bin/default/src/com/uca/core/EleveCore.class index 73b839d472647b624573d8195577f0e3d49cd101..882efcc1f08174c25217400ce40160a886e9e8c3 100644 GIT binary patch delta 237 zcmZ1=c3zC@)W2Q(7#JAL8Pq3oO<-KQake1i<OD`;j;zG8M7`p|oXH2-geR|JJkA0V zn0$~;ezGq|<>U_>A(PiKd%*=a`*L_OPL^SfW(v`m+|RBuc|9u|M{!|}zDr_B>f{CN zB9jlX3Nf}#oUJ_h2Wtsj8`P}e$+7I*%$^#a*tAM9-kQ9dJr}NLvoFUPMqzdaRYnG0 nkel@3)<|+qVHBLaj?0lzYVrpzRbDj)1_llWW(EZYB?c7$!TU=; delta 166 zcmX>vwm^*Q)W2Q(7#JAL8B`~7O<-)?I9rf$@)gFTlQ*!bPTs(FX7YMAH7FazubljV z<Kkoo)@Y`1jmhg-B_?lW6$0aHtn!Q<6K5+=mSih|s=v<cqv467=rFr5;~kKqU+i8` oMU|T$a0D|>cH^4DC@}dpmm{O(WLa)iZWRUw1~vvJ1_cHs040|=X#fBK diff --git a/bin/default/src/com/uca/dao/EleveDAO.class b/bin/default/src/com/uca/dao/EleveDAO.class index dcf3369a90882006136c6b3c98bf2866154fd21f..b98a538a01cfcd4c73873c9a1a3d890122915455 100644 GIT binary patch delta 72 zcmca2)+Ih6k8$zF{3*<A!Ii}&skxH{*@ZVVvP@!P%$k_5JlT>XaB>Zc#$*Hb&Fq{= UDju=xGc!t04&hRqY|O0)0BZLZCIA2c delta 47 zcmeAYzalmvkFjH8{uJiPm)HU)AK+NLS%`HGBcuQ3^=$r(n<Y8)m>H!ecX26B&g51E E0Hr?<g8%>k diff --git a/bin/default/src/com/uca/dao/_Initializer.class b/bin/default/src/com/uca/dao/_Initializer.class index 1a39a2eeb03d691341f9997b4b5f331bd5e0a833..228eb436b277fd8c73d24876ae61174c99f7a0c0 100644 GIT binary patch delta 42 xcmX@AGFfFp5o6-y0#4<P)5JL@pA%5u{FdVz6BEmKkl1Dpp0zBS&k2+>0svPg4}Smv delta 50 zcmbQNa#UqP5o6WlS}x^{)5JL@8*oT&UdtiN%)}}H65ITqdo2q{aPnFX_05L`0vG|M C&=3g# diff --git a/bin/default/src/com/uca/entity/EleveEntity.class b/bin/default/src/com/uca/entity/EleveEntity.class index 2920c2f27c2040a31d504dab68fd7f54b242e43f..34095e93a220a6bc1dc32112191a02f07dfc435f 100644 GIT binary patch delta 680 zcmX@fxt5#j)W2Q(7#JAL88jzyMN0GgWF?j*>K7O0=({AAq*^mFaOUObI_D%77f(!( za2H5VEdh!9C1w^EC*~!mGBOBiXkzGLan4UkWoO`JWZ(xImy?*6uJ2k@lwZWbz|Y8# zG4Y%-3rJ$J45J(?C&<9bGK>lwJPd+73_=XTlU*3wZG<$?jMWTdWZ+3pE%Af8CzX*w z1ZFqbg5Z*(%)E4K4hGqYr}L#58F-3O6f<jRhH)?`GBVmuJf}QajA`}cc}(1s8<}L` zPMQ3a$z5HQkwF0DHhm;B*%{Os8F;~>u#lPTz^qo!!N9=4%D~9L$-u?H$iU6Oz+l3_ z%)rRNz`(VefhSUkZ##p)eg*~xCI%4(1_m~W41*{G0|O6~Eyf_uz`(%BAi*GsWC9aj z6S!d})Ps~Uz>JV$kVY~B;RqQlj^KkCfntIjgD{c_2uENufuBK?Asy2nLJaaqMj#xa bfW;AvSRBE`pac#tWd;p!h%qs!FsK0lHTQ9L delta 555 zcmZ3>eUg*w)W2Q(7#JAL8I&e+MNVuK4dcwq&vnj8EG|xEWDrPCEpbUKN%c$2EG|yW zOHO5E5Yf=|$x19s)Xz!GOV<xBDay=Cw`OEuan4UkWoO`FWZ*~0x)v4X7jZD~F*4*# zysJFfg2|JMi-DU#fQLblL1?l+V>>TTdTNOu%)ZHuOyVpujEv$S#rv67PmX0$nH<BU zKKVAYf`|emg8;&0h`p1QSk&s-7#J8>85kKj7&sXi8Mqi27)%(L85kKD7`S#ba7PO9 zZfD@%&%nUI#30PTz`zEU;b0J9U|`?@v$+^V8N?VE7#JDE8HA8bV8UwxC(ML;kTSRt z5+pc+2WA9{36dl@f|o&rAr;dff(%kf{y>C;G?tKH#Nr4h23c@;$uTH0Ffgz%Ffzyk E0NhqiH2?qr diff --git a/bin/default/src/main/resources/views/eleves.ftl b/bin/default/src/main/resources/views/eleves.ftl index ab066ce..b4ee37e 100644 --- a/bin/default/src/main/resources/views/eleves.ftl +++ b/bin/default/src/main/resources/views/eleves.ftl @@ -5,7 +5,8 @@ <ul> <h1> Liste des élèves: </h1> <#list eleves as eleve> - <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance}) </li> + <#assign naiss = eleve.dateNaissance?date> + <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${naiss}) </li> <form action="eleves/delete" method="post"> <input type="hidden" name="id" value="${eleve.id}"> <button type="submit" name="id">Supprimer</button> @@ -26,7 +27,7 @@ <input name="lastName" type="text"> <label for="dateNaissance">Date de Naissance</label> - <input name="dateNaissance" type="text" required> + <input name="dateNaissance" type="date" required> <label for="nomClasse">Nom de classe</label> <input name="nomClasse" type="text" required> @@ -46,19 +47,19 @@ <input name="lastName" type="text"> <label for="dateNaissance">Date de Naissance</label> - <input name="dateNaissance" type="text"> + <input name="dateNaissance" type="date"> <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="id">${eleve.id}</option + <option value="${eleve.id}">${eleve.id}</option> </#list> </select> diff --git a/bin/default/src/main/resources/views/gommettes.ftl b/bin/default/src/main/resources/views/gommettes.ftl index adf8969..ad98634 100644 --- a/bin/default/src/main/resources/views/gommettes.ftl +++ b/bin/default/src/main/resources/views/gommettes.ftl @@ -4,7 +4,7 @@ <ul> <#list gommettes as gommette> - <li>${gommette.id} - ${gommette.nom} : ${gommette.description} </li> + <li>${gommette.id} - ${gommette.strCouleur} - ${gommette.nom} : ${gommette.description} </li> </#list> </ul> @@ -41,6 +41,45 @@ </form> + +<h1>Modifier une gommette</h1> + +<form action="/gommettes/update" method="post" id="update_form"> + + <label for="nom">Nom</label> + <input type="text" name="nom"> + + + <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"> + + <br> + <button type="submit">Modifier</button> +</form> + +<label for="id_selection">Selectionner l'identifiant</label> +<select name="id_selection" form="update_form"> + <#list gommettes as gommette> + <option value="${gommette.id}">${gommette.id}</option> + </#list> +</select> + </body> </html> diff --git a/build/classes/java/main/com/uca/StartServer.class b/build/classes/java/main/com/uca/StartServer.class index b9a288435f46c505f2f1a3a5031b26f849c300a8..9ab652f229c781d434ebae86d80d88ed444e0503 100644 GIT binary patch delta 4196 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 delta 3587 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 QaX9NFoOPOEJ=h@+04sZLbN~PV diff --git a/build/classes/java/main/com/uca/core/EleveCore.class b/build/classes/java/main/com/uca/core/EleveCore.class index 258fca1f7748c3a2cfa7e68e4a91cd30db03bfb9..eebb6f03f5bae7303fba4a772ad2699edc507776 100644 GIT binary patch delta 631 zcmX@i|CPV~)W2Q(7#JAL8B*C9Ot}~s8O*pC#2L)l87#OMSU?;W21^jj3Pf0g2pdiY z5e8c>20I3O5aGbZ;K<+vl5hqQE+E1cM7V(ncaRbfb_P!_1`!4`kWMdl25&|N4$r*e zlEl2^iS^k`$r_U{GHP)Y7v|`@B$lL3R%FZ*;P=T&EKAgfiCItXWprfpoP3^92U(rS zWGSX?j6RbuGRb@SGWhW@_=AW5hCm*MAP_5<A%vYFl!rlqA&iG1oFRgpA(Dq7iXobZ zA%-EAhanC`#4{xDFeHLlNesz63@Hp@ldYH+3kzwWxj-{)^KE7UMj=5BO*EOwFIlo! z`53qv_$NoOriltMa54xp@H2=oh%$&WNHd5rC^3jnzRaqttH!|0z`&r-pw6Joz{0@E zpvIuVpvl0>z{sG*pv}O@Aj81G7{S2Az`?-4Fk!MTn-Al$$+c`j^)d{c3~~%&3<?ag z3`z`Y3~CGp44Mq)3|b5h40;S+42BH;48{zR3>FN@3^oke40a5q3{DL73~mgq3?2;q z44w>f3=9lG5OW#i86+7%U;={<gDwLj$SwvY24w~&FiV9&8SKgl45|!j3@jiqGq8hM z88{i*!476)5M!uf&|}bKU}w;0U|<kp;P}g+#?HXP&cMRS&&kIr$jQLLU@*CbT}POk Tfr-J8fq{XE!HB^aOq&1zhGAn3 delta 592 zcmey$f0)1i)W2Q(7#JAL8Isr;Ot=^r8BDnt#2L)k8O*sDSU?;W1`80&5=2;m2y0FT z5e6GB23rO@5Mj^7;K1Mrl5heM&LF}CM7V+oH;@u{b_NeF1`!5RkWNo_1}{bi4$r*e zlEl2^iS^lxX_GfH3r`kcWSjhhQ3#58CMU57P5!{dHQATZe)2p<dq$th_ZW5HvZ_qm zS-cq;q$W2qN%`<F_%QhLF!+H8e-IG>A_5tL*cpO(7!(*nco;$%!q^$Yc^D!XB6%31 z7@~O?Vn9SJh=>Cb@eBz(42cXOliipXZ~n*3$2eJmHG`Fxft!JEaxZI|s2~F;gAfBh zgD`_Ag9w8(gD8U%gV<yaHeFq124)5Z27LxK24w~o22KVw26YAv237_}22BPn21W)M z1_s7x1||j$1_p-7lattdShg|n&YQfREvR0afs;X&L5xA3L6$+0L5)F`!GJ-7!JI*p z!GS@S!HdCwA&9|<A%?-6A&tSBA&<e9p@PAYp^3qjp@YGlVG@G}gB$|`LlDGh26+Za z1`wFcpv|DezzDLAL5V?`feFk~VSqSvGJ`7Ep$rU@&A@JEW#DA!0=t=wL5!i6L6<>; zft^8*fq_AYf#WZO8ao3EI|B<RKc^t4ASVL{gZ|`g>^j0+3``6L3=9lR42BFwVA>b} Dm6%n4 diff --git a/build/classes/java/main/com/uca/dao/EleveDAO.class b/build/classes/java/main/com/uca/dao/EleveDAO.class index 75aa4d8fcc45b09ef569c0e406dd857bc55885ca..5b045e9c840e44eda14d4ee53963d03e2b9557d2 100644 GIT binary patch delta 1444 zcmeAcy)0gT>ff$?3=9nB3@f=9R2f`27+g6SR2ba27*rVCg%}tZytx^C7<{=Hgc<y} z8T=UnK&(Iz5yZ(5%n$-%g$gk+GK6z6L@-2xlth8VqCu<}5E0AH5C;-*;b4g8W=LR2 z1aXo$7?MGp6eAEXm4hJ-M5l8wWPn67L7XfOhHMa>19D0(h{$7S$Y*CL*f>L$k+E>| zHb!MeF*OEtMh3RjoYb<^VjhMfhGHHDT?W0$@0r9ROE?%xc^JwV%Gntzco-@fs(2Wx z8T8m0YIqoG8R~c#>KXKS7#ct#jXVrZ49z?YEex$33~eAi?d%L4JPe%-T|5lk3_Uyy zy$pRk4E+ofco-%!^i6hTR>_>i!!Vg)3J=3nhG~opoN1Xw#U*)(xv4x1(;3Qn7-leZ zF*0!EB*Fw|g7~~Ci6yCiiJ8U4iFwJXJPflKX7e!2VVKLvz?qky>ztEVT%5|oFb`y@ zC4&_YgFb@+BZJ7q2O^X2GKVnFXIQY=ge8$NCo8cmQ9ma!FI_*lvbZEQmyv-vzqEvr zLDUB<lbNp{P?VWh5?oT0nwV?N$RLoOTH=CiGb4kbh9*RDabb==NY0v(fsv7sL0JP$ zcrrhusFE-ia~T=f3qZEy<S{acYD`XK6_aBxhS<Z%AgtkuW{zgq<fW_=rMQbzOMDWG zOZ*aZQyCf9p$-GtJ2{b6*bhw;BZC0cNO+(zG6<nNQ8SE@fu}gN#19sP><kM*QMhz+ z3!5h6^2zJiwz8~XWKf;l&n`E)m0dePg+Y}81lSlD8Ppim85kKf7#JAz85kKD85kH? zwYD=bZe(C!U}Df@U|;|#VqoB4&|+X<;DIP$&}PtKU|?VbB{Y!cNgN`^2&LReN}1tG z^%)Epn85bjV_;@rVPIe=n(WSDU%!cgTYDP=&n^aD28L}6d^)l%%#0v`oeccU3^1O+ zP6k0{2A!P@LW~UI2&ZW=a4|422rvjU2r`H=2r(!#2s0Qmh%neQh%)#wh%v-4h%;m{ zNH7#KNP^v@1+f?ECI*Hg2E%#=BL+qWVTO1HV+IojCI(T4SO!xDGX`b`a|Q+m76wKJ z3kF68O9m^b<L59iGcYqSFu3hz5RTl=AmXc|EhM^=L5zuE8-uuxwvfb521yWGN=I8r z8p@W@(H4^3$sh+3m)Fr2Qh<sp>TF=BhXu1713Lo)gB$|~gFJ%>g93vBgCc_tgA#)U zgEE5)g9_OF3J|N|?ssFbX0TykWZ+=1W3Xi~VqiizTELOPlEDt@Xi&&Afud4NdmDq& z2IQ!%XF!cxHmKon-wQZ0=rh<u4Kik6VgMP$sil2@L3kU3G9oT8lL;rfQ4A~$4q&?- r8JxhhGs6-k1_lN$21bTO49gf6Ge|OcFfcIiF)%TBGB7fDfypocB&Yes delta 1181 zcmcaC-Yr^x>ff$?3=9nB4E<aT3Jmrf3=W(O@(hk#4Dt+4LJSNHZrlv+3?5tz{0yGl z3|<W0AeIk^@C6ZmAi^Ic5db0r*%^XBBK8~%!Q2cX451)S7zaZ*h!X+gL~<}hf#_%s zh8Pen8Oy;C2V%s7Y)k+ViR=tX><q~pH_9?HrffdXsLYtH$e_f?z?PbmT9#VO!;s35 z#>1e&pvlM};FO<VQe0A$Sm2vll98WM%+JP<&cTqu!;s04#m<n;!;r&}%fpbzpvlgV z&%;o_P{_kj#GuK;Pz)kUKtw4+84p7_Lj?~*B|{k_gVbbSMyU)&2Bypuc7`e*hH8cy z9)?<mIz|T0w9KO7lDx#+R33(UhAbY228KpP29BIWm|zo#&zq81lIoY3SzMf$mz>JO z&<qmf%*)Sp&PgmTPUT@}VQA!GFkvv|VbEgGp3KOS&D_e+wmF|Akx?K$wZsKk_vGbl z6DJq4NtkgLr<V967MJ)X=B6?-2o$5KV`ShdPA&0+*}=}x4)TBZ<jw4wjJ=cZvTtSS zV`NaBypKa}@)i#5dU*x~1`uFlU}R8aP-0+YP-b9Y&}U#|U}RumVAa~rz_^itfq{uZ zg@J(qq=<omgF%&nfq@62fI*Exoq>UY5flYb&AL#{%tA~X(6n+RX=Mg!l>qD2V$fz_ z0$Y5Vfti7Yfq@};av7(6y^d@PGo$u42JW2<9Lx+b9?wn&US<ZJoeX@84B-gJsWEUe zFfa%(2r~#Wh%yK<C^HB%7&3@3*fWSS_%etwL^FspBr!;UU7!WA1mpsc=NXb2bQnO+ z7G?-w&|}bNU}6wu@MEYqU@&B0W-wx4U|?ZjWH4r61jQB9rE?gV8JIy?VmAYS<aP!D zUma~B!JQ03Obpu?gmtuqM0PTWg4kj@+Ct(`wuFwhkR+5XrK2q*4Q0#dAOcE`ft`VY zL6(7oL9U)bgaH&k3Jf|7iVPMEN(?Rx%3${^K&*zl-;KeH!JL7SfrG)0!Gb}TfeGPg z0Y?TC21}@;4H%dhm_QM!rM-<o7GWu7#IiA{G1P-%7VdiiM+PkhE2u%nP=h$Nv=1=w zZ)1={!~>>ToKSbdjbdP7um-0L8wOi2ZO72Xz`(%8z{t?S(8JKlAj#m&z`(%C!NADi J!obMj3IH)bs0IK4 diff --git a/build/classes/java/main/com/uca/dao/_Initializer.class b/build/classes/java/main/com/uca/dao/_Initializer.class index 34421e65dc7f3e338c8c3d30fb5d3095fed33ceb..8f87537cad96b2fbf81804c1b17fbb78103dce76 100644 GIT binary patch delta 842 zcmeyR@KLV*)W2Q(7#JAL87^`$*fWH1F@!RN2{AA*L~%1jGsJK+#4^OOGsJT;Brqg$ zF|aWtaWNz_q_8uj3NbJ;L~${2F{BGIFfl}NFl2Hu*fC^rFl2Ku<Zv+Laxmn91oAl; z3OE=FIT(sK7>YR=N*GEx7|J*p%DEUS7%Dj!s(3jVsyP^HI2dX<80t7CR;k&76!ma0 z^l~utaWM3AFihZLn8+}RgJCiU!xRpNsT>T`Kq{tlFwEd&n8`4UgJCuo!yJaW><shR z8Rl<hWz=P~a$s;|XIQ|)u#jO9BZGibett=DNl{{fZ)!<Keo8Sv8^dA_h9x`<OBt52 zGc4y}Si!K8onaLZ!)k^#lXI9PgxB>YcWu!?1y2BRj(;9)`^f9+Rgt$%}2_VQ^sZ z;9%Iw$iP}!oLW@O!{E-~G5HMBG&Vm54@QQ?llfSrCpR;9F)p0U$1<DK#WBQH)0&Z? z8!Ud6<rCXB9)|4<J0_oHRbbo6!?25C_vFv4lbQE0?48`nrpdMsB(#6>4mM-S0}KZl z8MvK_63bE*0#ZvdOV}9>@h}`_I5OFsU7zhJNa3-`IqZeZ#~Ds+e!za3X>tJf1GbYO zKb@Uy#-qu2esTiOR+bBl462hIdF3XX^J)j!G1xPJ01E>ng9C#j10#bI0|SFT10w?? z0|NuA)^-NQjSLJ7ObpHp3=C{wK@J8N1_lNmFq@UZmBEdHfq@g`X^`g0n|Qq#ohSe0 zl{W&Z5@TRukYJEt@MQ1;t2bouX7FKPVDM#NU|?rp3TJ0vlVIRv@MG`*Yxd)FjRRRE z#lXhEz#zrI&mhMj#30Qe%pk)c%OK03%^(l99AvC8lCe4r{>a7#L5&T7d5F=Affa23 ziOC=N_K9s`uokk}#$X$c@LC*$_~a}6;oi0k#~JLvc7Qx+!7zcrlOd3Sfq|JJ2pkN- o3}+Y^7`PZ18BQ^rV>rzq$q>%Kz#ziF%n-rA$Pfu8)4*f~0LuWQPXGV_ delta 988 zcmew;_e-Jv)W2Q(7#JAL86I&lxH3d>F+?-O2r)1)Byck%G9+;`Br~M2Go*4dq%ov( zF|aXYa4}>uWU(`33o$S<BycfsG2{v{Ffk->FywPFxG)rOFcfky6mc*Vb1;;E1WGv= z$~YLxIT$K97%Dj#su-#{7-~2eYPlHd80t9~8YWIuOyywc;b7?HVCdsu=;vUVz`-yP zq;L`k!(<MIDI5$_IT)sKF-&Ke!ND+-gJBj2!)y+QIUp5tIT+?~FwEy*Sir%skc(jv z!(x!=5)Ou?oD9ntmUA$y;9^+Gu!@~wH9Nzajqi0CQ{5Qc*%{XIFsx%(&&VL)l%HQx zTvC)+;G0^Kk)Kk`&&IHUgJB~N!zPB!><n9Y7`8HOV`tdT!?1&4CnJM!R$^JAeokUu zy1r{ga%w?IW_}(!!!90%-3)tp81^#kV`tdU!*GDXZ*n7(yx2h=1~&#j4u(UF46LQa zsYS&+489D0leaNVV-8{Po9xfLf^p^KIV{qXg;^SS$`Xr`GZKq53=Ir4H&15~Vq`na z!*GP*=;ZaR3T(%C7>+ZXn0%FWGV@7>Q<JmVG}%srgw9N!#b)etmf;*D1B+8;QYIq< zyH|cjUU7aNBLkO_vA&^!zL9~U1tSA%RANz5COgA<kgf|n3>O(LF*0yF6(yFXDg>mK zWR|cqT;^f8!f<u+Gd6v;YamtECrh&zGT&ghxw)VHG?N{xYffreDkFo0PjY^)era-| zesX?Msy<lMIlm~?nvp>ay9^^kn#Sa{+_IB*a0`L4DVGGqw8?>7FWGK^!usB12X0Nq z2a~h7w=zDQtia<V?84y600Jxwj0|oJ?hK3!9+T^N#MC_*7#P?X7#SECI2gPb7#MiK zY*q$u1|J3n22M~2gVpZg@nZCx%+4!s1X3l&z{DWIAi?0z5CB$h$Pma7#K6E1%)r3F z&cGDT&cG(Yz{wE8;0M+m!RyNCIe8whyd6xlFp_2+hEQb9K~T+M5LYrVFvc>lf^E4z z`8V%ARUvC38zI|m40hq080>`{HZeE~Ic;Nb4&TVYz`(=+@=p?j#N_jQ;r`YPCm3uQ zt})obeP+QhpTVCYoPmLXnIQtKK9b=s0|NsW10%z2hWiY67$g~D85kHu7?>I27#JDi K!DJ4Y%mV-woZvSA diff --git a/build/classes/java/main/com/uca/entity/EleveEntity.class b/build/classes/java/main/com/uca/entity/EleveEntity.class index 6b25116a596729d4f45d16a83009d441aaea2639..52e5c7f94b8312d30b03c73c0d96842f94585750 100644 GIT binary patch literal 834 zcmX^0Z`VEs1_pBmMNS451{n|`%f-OTAji%i&(5I0$iSPDSd!|Om|0w$n3tT&$iVND zl~|UjUtE}@?~+)OYR$;NnU|mIoRe5woXW@`1d+{2%uCk~E-A{)OSfiZ5J*og0jWhY zMNmT%q7um*7U%pFumzcUseYxoNvTC4iAgzNL-UgpbHWmfGC_Q(AWKO`W-%j!j8AfY zu6}89qJC;#NoGl<zH3fuS*k0T4YIlz!)hT7G@CWU7#Ud05_3vZ85wxeQ%n31-VuR0 z6V*dJ#VD#op(Y|L0vXC?lbM%UV#mn9tO4S31?QI*C8xS&g8U?a<W4<Mi1IM7F|hM6 za4>N4Fi0>+GBQZv_823BB${MsacU97(+r9XEDWp+3=B*ROdun{EDi=v1_lOJ21W)h z25tsM1|9|m27Lxb21bym))ofF4Pa%w3=9lxU_mYhJ_ZH`9x$7gfuBKufq{XML6AWR zs@V!`JOcxpmiAT##*JvYxxu={7?{B3L3D#m7G_`vTPngJ3N;7W5lrZg-~$_j?g%jk zaj0e#M=+r~f*-6Kn<F^Ej*wuGgqmXv<})y`YHep=Mi|2dcE2D43xhD&D0GKNfqg9v E0PE|P6#xJL literal 775 zcmX^0Z`VEs1_pBmIZg%^21yVh#l^tNAkEGo!_FYf$iSPDSd!|Om|0w$n3tT&$ROmC zl~|UjpOcuEt{+@dl$n=q&B(x+m!IpLlUQ7w%E%y)o?7C9sz*da6Pqp;=lqmZMh1SL z%)C^;(%hufqL9R-9Izev$%#2(iA9+pK2(sUBqOt!kwL~MIX_pwG&xZ}HLoPIq*C8C zC$%iq70k9~WDqFEuw7IG({jx)Mh4ch#GKMpMh2er)Dl00`+15{xNJ6=d6^}4j10^g zAWdAs`K3k4scxAdcM2fctp^Gg9tJiBb{+-}5FyGS#>gOr+p&xcl4z2l#i>OQk1!}Q zurRPPFfcGNFoBE&vp5*o85kH?85kKj8Mqi28Mql381xw!85lvLT3Z+xH-MG#FfcH% zfdx4jco`TNc))B{20jLU1_lO31_1^^sAem$@eB-XTH0F~7&oHn<^<~&V_*WC2hj~O zS%`rhY^g9-M=+r~f(L92x+6reJAw(_5xijCxE&$NAO`h}G1yTI46It)8JH2qaDm;= S&%nYU2sR4cA>v?PO8@}2QG|d1 diff --git a/build/resources/main/views/eleves.ftl b/build/resources/main/views/eleves.ftl index d4b2053..b4ee37e 100644 --- a/build/resources/main/views/eleves.ftl +++ b/build/resources/main/views/eleves.ftl @@ -5,7 +5,8 @@ <ul> <h1> Liste des élèves: </h1> <#list eleves as eleve> - <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance}) </li> + <#assign naiss = eleve.dateNaissance?date> + <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${naiss}) </li> <form action="eleves/delete" method="post"> <input type="hidden" name="id" value="${eleve.id}"> <button type="submit" name="id">Supprimer</button> @@ -26,7 +27,7 @@ <input name="lastName" type="text"> <label for="dateNaissance">Date de Naissance</label> - <input name="dateNaissance" type="text" required> + <input name="dateNaissance" type="date" required> <label for="nomClasse">Nom de classe</label> <input name="nomClasse" type="text" required> @@ -46,7 +47,7 @@ <input name="lastName" type="text"> <label for="dateNaissance">Date de Naissance</label> - <input name="dateNaissance" type="text"> + <input name="dateNaissance" type="date"> <label for="nomClasse">Nom de classe</label> <input name="nomClasse" type="text"> diff --git a/build/resources/main/views/gommettes.ftl b/build/resources/main/views/gommettes.ftl index 3eb2600..ad98634 100644 --- a/build/resources/main/views/gommettes.ftl +++ b/build/resources/main/views/gommettes.ftl @@ -4,7 +4,7 @@ <ul> <#list gommettes as gommette> - <li>${gommette.id} -${gommette.strCouleur} - ${gommette.nom} : ${gommette.description} </li> + <li>${gommette.id} - ${gommette.strCouleur} - ${gommette.nom} : ${gommette.description} </li> </#list> </ul> diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index ddeef7e307271564160bfa1d047b5e8f0e6fb6b4..62c2ad6b2a74eb60bf0bc8bbcc0235e887de8985 100644 GIT binary patch delta 118 zcmdn(x65yWu0VlX%frb_K3GjUW6><I`2pib+e#*ZV)YYwWmX^mep!5^?-a|5OOuZ= zxd<4(if($WHJNEqfMQ0@Yqj^2rI=F%0^g=MEUaAFdNs>Es51H7uF3t(UIH-<B|^&L awtJck%un@A`ut$>OJ-R{rp+8I#>xQOnlxDe delta 119 zcmdnxx7%-mu0U`;PxXiN3k%q?1q0{jY|YtdTgfD#c6q<6t-00|waJxR6F<y}oqUYR zMWDE?qPJVD-~L0Ui(9esx7x{4%&7vw=XY<YY1ZeOeB8jIaDjf=<bGx^feBM0dHQBZ aUhmV~p{QkMX*l^Mvn&%c!)A6CV`TuF;VxbP diff --git a/src/com/uca/StartServer.java b/src/com/uca/StartServer.java index dc1f23f..9b0e30e 100644 --- a/src/com/uca/StartServer.java +++ b/src/com/uca/StartServer.java @@ -4,10 +4,10 @@ import com.uca.dao._Initializer; import com.uca.gui.*; import com.uca.core.*; import com.uca.entity.*; -import java.sql.*; +import java.sql.Date; import java.util.*; import static spark.Spark.*; - +import java.text.*; public class StartServer { //.\gradlew run @@ -118,11 +118,20 @@ public class StartServer { String firstName = req.queryParams("firstName"); String lastName = req.queryParams("lastName"); String dateNaissance = req.queryParams("dateNaissance"); + + + + DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + java.util.Date d = format.parse(dateNaissance); + + java.sql.Date date = new java.sql.Date(d.getTime()); + + String nomClasse = req.queryParams("nomClasse"); - System.out.println(firstName + " " + lastName + " " + dateNaissance + " " + nomClasse); + System.out.println(firstName + " " + lastName + " " + date.toString() + " " + nomClasse); - Core.Eleve.create(firstName,lastName,dateNaissance,nomClasse); + Core.Eleve.create(firstName,lastName,date,nomClasse); res.redirect("/eleves"); return null; @@ -140,14 +149,24 @@ public class StartServer { String firstName = req.queryParams("firstName"); String lastName = req.queryParams("lastName"); String dateNaissance = req.queryParams("dateNaissance"); + + String[] tokens = dateNaissance.split("-"); + + DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + java.util.Date d = format.parse(dateNaissance); + + java.sql.Date date = new java.sql.Date(d.getTime()); + + String nomClasse = req.queryParams("nomClasse"); String id = req.queryParams("id_selection"); - Core.Eleve.update(Integer.parseInt(id),firstName,lastName,dateNaissance,nomClasse); + Core.Eleve.update(Integer.parseInt(id),firstName,lastName,date,nomClasse); res.redirect("/eleves"); return null; }); + get("/gommettes", (req,res) ->{ if (authentified) { return GommetteGUI.getAllGommettes(); @@ -194,5 +213,8 @@ public class StartServer { res.redirect("/gommettes"); return null; }); + + + } } \ No newline at end of file diff --git a/src/com/uca/core/EleveCore.java b/src/com/uca/core/EleveCore.java index a2761a1..c3f2cde 100644 --- a/src/com/uca/core/EleveCore.java +++ b/src/com/uca/core/EleveCore.java @@ -4,6 +4,7 @@ import com.uca.core.*; import com.uca.dao.*; import com.uca.entity.*; import java.util.*; +import java.sql.Date; public class EleveCore extends _DefaultCore<EleveEntity> { @@ -13,7 +14,7 @@ public class EleveCore extends _DefaultCore<EleveEntity> { super(new EleveDAO()); } - public EleveEntity create(String firstName, String lastName, String dateNaissance, String nomDeClasse) { + public EleveEntity create(String firstName, String lastName, java.sql.Date dateNaissance, String nomDeClasse) { EleveEntity entity = new EleveEntity(); entity.setFirstName(firstName); entity.setLastName (lastName); @@ -22,7 +23,7 @@ public class EleveCore extends _DefaultCore<EleveEntity> { return dao.create(entity); } - public void update(int id,String firstName, String lastName, String dateNaissance, String nomDeClasse) + public void update(int id,String firstName, String lastName, java.sql.Date dateNaissance, String nomDeClasse) { EleveEntity entity = new EleveEntity(); @@ -45,7 +46,7 @@ public class EleveCore extends _DefaultCore<EleveEntity> { entity.setLastName(previous.getLastName()); } - if (dateNaissance.length() > 0) + if (dateNaissance != null) { entity.setDateNaissance(dateNaissance); diff --git a/src/com/uca/dao/EleveDAO.java b/src/com/uca/dao/EleveDAO.java index 8a5d3fa..bb9fc6e 100644 --- a/src/com/uca/dao/EleveDAO.java +++ b/src/com/uca/dao/EleveDAO.java @@ -18,7 +18,8 @@ public class EleveDAO extends _DefaultDAO<EleveEntity> { stmt.setString(idx++, obj.getFirstName()); stmt.setString(idx++, obj.getLastName()); stmt.setString(idx++, obj.getNomClasse()); - stmt.setString(idx++, obj.getDateNaissance()); + System.out.println(""+obj.getDateNaissance()); + stmt.setDate(idx++, obj.getDateNaissance()); stmt.setInt (idx++, obj.getId()); stmt.executeUpdate(); } @@ -30,7 +31,7 @@ public class EleveDAO extends _DefaultDAO<EleveEntity> { entity.setId(resultSet.getInt("id")); entity.setFirstName(resultSet.getString("firstname")); entity.setLastName (resultSet.getString("lastname")); - entity.setDateNaissance(resultSet.getString("dateNaissance")); + entity.setDateNaissance(resultSet.getDate("dateNaissance")); entity.setNomClasse(resultSet.getString("nomClasse")); return entity; diff --git a/src/com/uca/dao/_Initializer.java b/src/com/uca/dao/_Initializer.java index 59e248c..cb96708 100644 --- a/src/com/uca/dao/_Initializer.java +++ b/src/com/uca/dao/_Initializer.java @@ -37,7 +37,7 @@ public class _Initializer { DropTable("gommettes"); CreateTable("CREATE TABLE IF NOT EXISTS users (id int primary key auto_increment, firstname varchar(100), lastname varchar(100));"); CreateTable("CREATE TABLE IF NOT EXISTS profs (id int primary key auto_increment, firstname varchar(100), lastname varchar(100), username varchar(100), password varchar(100));"); - CreateTable("CREATE TABLE IF NOT EXISTS eleves (id int primary key auto_increment, firstname varchar(100), lastname varchar(100), nomClasse varchar(100), dateNaissance varchar(100));"); + CreateTable("CREATE TABLE IF NOT EXISTS eleves (id int primary key auto_increment, firstname varchar(100), lastname varchar(100), nomClasse varchar(100), dateNaissance DATE);"); CreateTable("CREATE TABLE IF NOT EXISTS gommettes (id int primary key auto_increment, nom varchar(100), description varchar(100), couleur varchar(100));"); CreateTable("CREATE TABLE IF NOT EXISTS gommetteAttribs (id int primary key auto_increment, idEleve int, idProf int, raison varchar(500));"); @@ -56,7 +56,7 @@ public class _Initializer { Core.Prof.create("Boris", "OUYA", "DaWarudo","KonoDioDa!"); Core.Prof.create("Thomas", "TAMAGNAUD", "CéMoiLul","BlockusMaster"); - Core.Eleve.create("Bibi","Johnson","23/10/2018","Zarbi"); + //Core.Eleve.create("Bibi","Johnson","23/10/2018","Zarbi"); Core.Gommette.create("Brave Petit",Couleur.Vert,"S'est montré obéissant devant le prêtre"); } diff --git a/src/com/uca/entity/EleveEntity.java b/src/com/uca/entity/EleveEntity.java index 26529d9..12cb1d0 100644 --- a/src/com/uca/entity/EleveEntity.java +++ b/src/com/uca/entity/EleveEntity.java @@ -1,12 +1,14 @@ package com.uca.entity; import java.sql.Timestamp; import com.uca.entity.*; +import java.sql.Date; public class EleveEntity extends UserEntity { - private String dateNaissance; - public String getDateNaissance() { return dateNaissance; } - public void setDateNaissance(String value) { dateNaissance = value; } + private java.sql.Date dateNaissance; + + public java.sql.Date getDateNaissance() { return dateNaissance; } + public void setDateNaissance(java.sql.Date value) { dateNaissance = value; } private String nomClasse; public String getNomClasse() { return nomClasse; } diff --git a/src/main/resources/views/eleves.ftl b/src/main/resources/views/eleves.ftl index d4b2053..b4ee37e 100644 --- a/src/main/resources/views/eleves.ftl +++ b/src/main/resources/views/eleves.ftl @@ -5,7 +5,8 @@ <ul> <h1> Liste des élèves: </h1> <#list eleves as eleve> - <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance}) </li> + <#assign naiss = eleve.dateNaissance?date> + <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${naiss}) </li> <form action="eleves/delete" method="post"> <input type="hidden" name="id" value="${eleve.id}"> <button type="submit" name="id">Supprimer</button> @@ -26,7 +27,7 @@ <input name="lastName" type="text"> <label for="dateNaissance">Date de Naissance</label> - <input name="dateNaissance" type="text" required> + <input name="dateNaissance" type="date" required> <label for="nomClasse">Nom de classe</label> <input name="nomClasse" type="text" required> @@ -46,7 +47,7 @@ <input name="lastName" type="text"> <label for="dateNaissance">Date de Naissance</label> - <input name="dateNaissance" type="text"> + <input name="dateNaissance" type="date"> <label for="nomClasse">Nom de classe</label> <input name="nomClasse" type="text"> -- GitLab