From 2e5f4fcfb0e5d068b5e45741bd44408b9c999ed6 Mon Sep 17 00:00:00 2001 From: DevHents Date: Mon, 3 May 2021 10:52:48 +0300 Subject: [PATCH] delete and edit functionnality --- pom.xml | 11 +- src/main/webapp/assets/img/against.png | Bin 1516 -> 0 bytes src/main/webapp/assets/img/calendar.png | Bin 0 -> 1406 bytes src/main/webapp/assets/img/cancel.png | Bin 0 -> 2746 bytes src/main/webapp/assets/img/delete.png | Bin 0 -> 542 bytes src/main/webapp/assets/img/edit.png | Bin 0 -> 1236 bytes src/main/webapp/assets/img/for.png | Bin 745 -> 0 bytes src/main/webapp/assets/img/neutral.png | Bin 720 -> 0 bytes src/main/webapp/assets/js/views/agenda.vue | 174 +++++++++++++++++++- src/main/webapp/assets/js/views/home.vue | 2 +- src/main/webapp/assets/js/views/sondage.vue | 8 +- 11 files changed, 181 insertions(+), 14 deletions(-) delete mode 100644 src/main/webapp/assets/img/against.png create mode 100644 src/main/webapp/assets/img/calendar.png create mode 100644 src/main/webapp/assets/img/cancel.png create mode 100644 src/main/webapp/assets/img/delete.png create mode 100644 src/main/webapp/assets/img/edit.png delete mode 100644 src/main/webapp/assets/img/for.png delete mode 100644 src/main/webapp/assets/img/neutral.png diff --git a/pom.xml b/pom.xml index 60d38c7..0d5853a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,4 @@ - + 4.0.0 fr.lirmm @@ -225,6 +224,14 @@ jsoup 1.13.1 + + + org.apache.commons + commons-digester3 + 3.2 + with-deps + + diff --git a/src/main/webapp/assets/img/against.png b/src/main/webapp/assets/img/against.png deleted file mode 100644 index 067ea5411e1421e64ad3b49265bd34771baadbbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1516 zcmVo6+m5|0bH8CzqMXT*XLQx7zSJD^>(zFvS z+C?8ET1vn`jk&dw{ z_sl(a8ga`1H|L&n&-eenb02f>q(M;mS2+TeBTzX4l_Rink3dzLrR8$DM*O!1L9hij z!Uk9kS~GOc!f6}Rh-rlZ7zdj!GT7njn`k}>_rpAxnq=T0)Fw(m zFdlNN^wCa%sW}GrGA(_Ps23K&)F1;*zAL~p14Cd+YUuHu?>0X&cEbXg`slWaDRfBq zD$IhGTxB~_NEZZT*#I+OlU!oiR1zyw5^n>u26=QnqNXL^BuNeY2vI86qB|%;a?up^ zJzLeuSDJUg>109!@;jK*4rRNi$<++=P>{TVx&NFbdKYModlIE|`OYnBpX ziRiyUYmJ-3t=X7_o#~fv%_@Bh|NB5|!r6`J>!4NRY@z}%N^Q}2*MinHl{(%g(dL4y z<3)zg!gD9cL&UebT*oUyhs@$#i*ONMvYneMX9 zUv3P)O`sL}r4{uY{@F z^o-SK(O)o87B^2@&|PeNz@lBxbQ^J6=E>6g?As)L5wu3^Gn0*yAPcrHvaYz!#E*iO z``aAR_k+BM)7;PkpAW??!et)5?O=N&lPe(7inw)P)>+y+14g5uH4vFS!A_E7!TC%R z^A>0gms|!e2SDpjI`@=pxJ)44&w=eszhnz#?rN9-t-ZFnvBq#|f-9hPAXadRlSq_> zIna`qlkKJ@6U;yH$p3ZKoAaFdm>vc#F@3r!m`9k9Fl^Buv(Hq2gq7PaoNM3*(3+*Q&CSVu zHaWUs4x;oOJFDH@BO)+-7%qX#X6{qmcgp)Zc{m1sLSh&oPw{c#d=0oA{d9kwp+WN}0%Xx{%OM9ZX z{L66Q1eZ6$=PKIfQ>a#jDrc7S5>I9V2$D}}=}LN9+m=#8UgF720Oq)rvo4M38d9v! zMLbywkRr?fuj@kG&=)KFCWH`&NHn*ParU#Fvo?LDZD}>sCZCY4Qa0BF;`x(58VKjh(6*KyH<1LWEtF33vWxu1a$_~@ z5eCss1Dl>s3=L9@=h^zGcib?HrkSw-%{^bz%gtU9E)8BT)7R#E_L%-{o*Egv1=5a( z-v_TP9^C&(&k6r)U@U+q#H-wgml|Iqq}hdlf*ZZJ#oF=;%~fj=JjXN5ARb>(_=;(C z#sWw|2Th%>x4XW$wEnhh`TF0>UE7mr%p{(MFlJ>e03RCdhy$R0bJe(85W&{i=?240 z;t_P;hGDh0#sWy9VXYUFhGqRq5KDCv56Rl38&9`i*=_SM7ND(HgqtnJLetut{-ODQ zr;GPvtF1KHvh8G(R9)WUNnL>Pku6Pjg%3X<3W8?2?ZS2bN8HAhciqvlBA(%M7mV1Zzv(iLK?b{L=biM& zUjgU(f4>XV%1}@J-J>NwR$;@8Ql8?;L;%Ir@;-h;`d#rdZ7GhTYKK@+k#8*23t^qFypv_0CA`#*are62s4f= z2oQ%_f_)%Bf-vK_f&g)-CD;c7BnUH(E2A@O~1JE5I6|odXD9$IrSq1h7VE=KuoO@w4s?0jv?)Ie-9m{H%LJ0BeMH z4saG^$4}cEXF*yt`D(xx;4CO5ut~ec7L+v6i2fizL|{pqM-V^+Ne{k>{Vkf#ErI~@7gMKw zZzsr@m1hb|N^!>2w(spEeQwIYSO6+CPP5Zh&Pd$}tcJpWzq`p=tFZu&@7gs(QoOg; z6(tRU6$zoKcot=d=s)iVqh-jYOTRT;S>fiu*eX6CZy*bB9hMtK@afC7+P!H{3Qmr%n#yK z*$`*d`?0x2Z~kdxh9Cd}AOHd&00JNY0w4eaAOHd&00JNY0u}`R0SdNOV literal 0 HcmV?d00001 diff --git a/src/main/webapp/assets/img/cancel.png b/src/main/webapp/assets/img/cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..5325e776c7593117f7467990403bc3f128c473c6 GIT binary patch literal 2746 zcmV;r3PtsaP)36@+M`R-l4}1W5Gq0^H@C%Y`JBsuI!Cl!O44_);mnC`pwj(56xW zQA$FaBbU2de$RI8Td#NRU3+&uw#WMa{mjhH&hyOk_spzqrOeA@z+}K=z+}K=puP-P z_1%`;UAAp^LHHFm{+6jUH zSCg&P@J6@_eh7BKBrwGwe}vD$-@|7S=yj}tHv@=}gEzx*I03W5MI4R6)iCFcsUyoI z;ad0zd>J+yFA>1QaDK;$!K9bK{csxUhDib%g^Sx>7$*5XD3iU6)g2I(QnD3ipr6eMPeeO_A#L+WpVFTz&G3ryfMX^WEDV=uwW_k-bPt1To}G+ySCp0^1SCnbe(#avGZ`5`Xqaj5S0kU%HlH+Z8LA*dLhd&Dcbds2~J* zFVX!1z7w`P-o*re$(%Q16GLKx5ZE@Ql$;rPY^Olxx|6v-kko_|5rlvqB%p_2DrXYo z>I|9lqvYV5Ndzf_H8c)^e2oFV2Mv_^DhK`d8%ab%f*{5q&VK?M8i)Ja1vV2IM3fO# z=d12SBF3ljc?iyd2D2HsL~#wG9L2^)U4kG+AD*6vo$xfpG-E^lWBD+m{59^KxwtnV zMi2M=92zl5LI|#=eIL1sy?ewK1V`V6E1^O4419#k--fXeYs*6Mn;88tjCCLVI~6lb zyq~S>7&a2DNWJKU7;`ayf!9NW=ovUo*X4*JhdssWh_hvVouP~vBq1hlp#N83Bt%*v ztd0*b+Ml2t=oo{T8JM8|GFC~=r>>|g*C32=v3`UeBe}h}2^rM?Wl?>#$_5iGksw;%mv4Fcp(K%Ry#xrn#mVyr@<2 zO1*=;ex7q-in78^Q(sSc68;a~N1J?ip;$UIWM#-IbJ{d}yUHI=kRbE?oiwUTV&x~D z%_M$C;u4D}ntRM!klyJZ=hb$i8h^ZfM7O}__8yDttwBu1NYh{ zDhHv?sK|Az39_5)-c7=%unrJH{^;3HMSlB|GDRhi#IkzUQ5l80;(|Z0oWFs3MJL*H zfFxZWcfBhkPhcX_=df#`{DLcO6dh5d?pSorM+~|{#@!Nu*YFkNZ-;yFH&)%{98C| z>+xDDF;yjT_P`0)OpM_??+sMyP}(uEu!r73W63YWTxuGk{e>$@AjHG4S$GV`mc&sc z^=>Gic1&G3$X))GV$n7Pn}w%~^YhxEGeoW*mA58v2%lRygl((?vL%TOJHVYj5#Da2 z&$v4lMdy)Nd~Bg2J~5f&NMw%${!y4UevHGQl_8&QE+qmPO9U?Ef>C9q$f~56DOQ$( zs8t{=*&@zkv%)Bjg7*0W?MXw%%*t0-?EmIMSq!x_QQYt|m<8mETv>29&BFpr3t=CC z18F(*jk~j^0R9dP&=0e~e6MdD=3xP*jZqxi8fNc?u&+sr4{z+=GK*+qT6gMF*u=oLV|>e^W~R4hAAr5T0~qxMK{aja?)~KAF8Z zlBcQl*sLI;$kSKR|MmUKpRm6NwxWT02*^Ds21F9X}iVNEe) z=twI>I1S zM21C_Yp}96z87mynF0Aiy#g`*S$U~?i+tLv_XxO(qkqu60Zu}L@(f&}`UP?nTMX`t zcZSFfMdDDF%Iu*VpX0m;Sflx=_~&DSE>3la#kY1Ep+|Fi1`gVe3Xif{0fF z*ol1zb~?UAE((n%p{_$c$SDW?fKqA~lrNB&j)81bn-F6(i5Vv*hy;Tuw_?ZPT-XVi zV3O+)L$+>;jU(6i5VIo?*b~&&!q;KD<25FDD|3Dln-~%mM4}?Vr?89RuVB04X(qOm zxjutU6p0HW(GjRTgRh}{KfDav1u_?z(=F~CTW?;RD>uSF!&b*}Ch)P=Qy?H>CX$2q z!vDZl!@mf415ES*C?HMQH!-ONa1>sKx?_?6hi%*L%|25Zdt{Q=z(?VmP&b?>pl$Fy z8K=c@*VJXmq^~84FT(Zk{jixhgYz-Codf$-Z07=DEGUQn4(w|%E6DjUgtJx9(m??& zg77DT!s=C0N zm#3+pgs0#Mcm@%sum&arCIcn|CIcn|ZI^-n0|Rh#*16qj`~Uy|07*qoM6N<$f-DRW Ap8x;= literal 0 HcmV?d00001 diff --git a/src/main/webapp/assets/img/delete.png b/src/main/webapp/assets/img/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..577e11bfe4b60f448723246acf34e42049768b16 GIT binary patch literal 542 zcmV+(0^$9MP)Lvq0Y~;|XyZWj@DtB%Q1gn}GOZ;6SYT96nc6o~5Yh zBDh@)e@Fl5TyXUQCfN#;2jC3!ZL@!(GV*}6z&9AQbtxHwHo%~LanY2<|I3fWd*A`2 zX7>>4j9ZLLtys9ZA@0E_HDWubPc~w(L-YXqXQ%I-p@~WngyjMD&rjSnG1OWv8mb^!&|N6W9OrLCwImBV4<(u7e2|L^ zk>TZg3!ffn15LZ3_!ck!KN-hbP$3e05ZwVjA%lutQ*|FM6BmPz+)%0sj=&Xo2eUR` gqeqcLuqPx#07*qoM6N<$g7{zcYXATM literal 0 HcmV?d00001 diff --git a/src/main/webapp/assets/img/edit.png b/src/main/webapp/assets/img/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..f3552b79146b166301b83791e1dfa6b5def65a5b GIT binary patch literal 1236 zcmeAS@N?(olHy`uVBq!ia0vp^DImVO4ZM7;G6+O2NGDi4)*<=B9yT;D&C-+=l#*yAJ~6L)-~imn%})B;z3sLWCq8a zqx&DmMI{{OuSlA6|NN?b<^|s$R^I79^}#Oc>Vsn+4^KYe_(zC;QM|>I?cIT_%x8>x zRM)MNRO5TtTfzKKWd0%ljjw*J*f&44R(?fT>&7#GI;{-W)Hc0;yrN#?+V!~~YnYiB z)^I&G{e1t6)wy~7g_2Cu`}VyqJ@?v_#UVnJ?ef~)HYUHG9NG8jy7=_Ib=S9iE-`0% zu$sGh>9%zrZWxPvdvheP`0lT&wM`6Ps#*_D+gA5zW46Yc^@juXwW6w4^)Wn|)pqdO zwq0$9`p#OsdcW)5JaMLg*XBHZTS{jhKNZgPxxMhpnk}V~t_(@dZ3i!I({fIH%GYNV ze)WEFBg2+9-sb2nrJcvmX}5m#l-cUDQG3g`08WM%9CfYkOIP2?5XzSD*}5*X{(2)r z3*UoP_3Z|>Q%>y`VtFzpmHJi(LJD z%^SYAwmmEjj}4S2oY{Ez#1j3zvTY0}b!6StYG1xJVDU(MX<+oyJHK7g!N|LPqGx=S zH4o#YNUI*7Uzctta!fdLDKX{J^m}~H4Jp(3lqc`|QYOKqvbjWJ=9i`04+|*FTska_ zJT&8w_m9|&iE6)%>+gNvWnRE#(|*5IhV6Wt=N;eqn|JW`NB_U{z#&j%e{t;9SuZ|b ze*b!-T~}(mpvE_@C#N@*%Q&}RoT8O4CI9Gu!IkwJC5qmB?^%{O<#$7D-L6NMF5bEQ zbMxGp2iebC?%KU){@n=-2hKfQ(XH)1)25ky>fs2+o99JuZMJxoVRQbF!a|E4j*TxR zZp{9Wy=PI;p1|{)E2PY)9u8>m&E}9l8o0SM{pJ-Fk@i6L4JU0T)E^0a{`%a;Os4qb zrJt6sw5srZuJ~KMZ&p`&vh7sitR)~v4f4KgGsjg-A ziNr75`?Ktq>^~Z~USnE;ebtF)wxQp@$CNWo7Cjw*@=nys)u&k1(!2 z(kQV%|7QP;+fBPOXCAfxV6w0Ez2G75b=M}atcp|YHvL|6riODr&qFiDGr`f1)edN< y*w;0kHh(G|v;X+~-reip=QF7#fRTYrqxsUV^-fziPB#D+Qw*N2elF{r5}E*rM^pR& literal 0 HcmV?d00001 diff --git a/src/main/webapp/assets/img/for.png b/src/main/webapp/assets/img/for.png deleted file mode 100644 index ee6b9da37e212adb2e91a6611f5d837a2d00ebb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 745 zcmVgxHC-O*l(MW9vT<1wljw6$_21MC1Cc%rkSFyKwK^yg0bw_hoK&_s#rv z-@D{UIy%x*aVq!VcW1hV!oE$2$-ocA~+-R@*r=H#`lz(&R)*9BYd#Vzjl zf!1f4vJ-IM3ok)y+RhHdDefmhYnEiYOxp+;-V345*>Eo|alZy$fYu|Dm9oS}!0=_z z`a!bOhI?^|;oUF?T4OS8BjCITo`IIndu;4LT;l#bX#FJFBhxklh6f>hq^{U-FD}`@ zDtH1~&q-Fx5*q=-qoCyE$|dVyQp}ePej~ha26WrB7^>s zdQa54OR~I=RI}5=*h%nrf>5W|b(wRs0zuIeogkt9f1*a`fLMA(QcXvCRY}sPD)pYBYw&rNBy$aK#qV7bO z76`N`a5@%DyufiUL2y~-tGDHcKkvH#{QJLsaliBq*8b`LU;N(ke);*o-8SA!zjz9J zAi*F1)gR1R-Jo@Yb@ET?jp?r{>!Yu?Xg5nPxW&i3A@kKjb1wAC0Gt#an8SO z`EZ$IM1Dkw2ut3pPp&Ups+kVWO1-$ypdfgfyU)=LJ>lJD0$uWjFALXiu<%Ngq2P7qHgpmnhUMX+~>@t?%YY z2T1H#dAdC7x$EQvaU1rp`a-rR=B+#}UN&zh=RSr|-lAAJp#1fa=c)G_Ux}&|b6#6E z&z|MKzzW8zVo%y?J}3q-uj;1lYLho)--rVczuk?EyIl@agx7A+{uA5cW zb4LAKj=(3?->Lb_#A6q&tM)IEY5#IxIJ)5e=l{k(y?^|5vi-#x)L_zx4DE$~u+Hx0 VKF3|h%L7cJ44$rjF6*2Ung9zHL;(N* diff --git a/src/main/webapp/assets/js/views/agenda.vue b/src/main/webapp/assets/js/views/agenda.vue index a8f5444..fbd0f0e 100644 --- a/src/main/webapp/assets/js/views/agenda.vue +++ b/src/main/webapp/assets/js/views/agenda.vue @@ -3,33 +3,100 @@
- {{ program.title }} + {{ program.title }} + - {{ program.description }} + {{ program.description }} + - {{ + {{ new Date(program.date).toLocaleString() }} + {{ + editionProgram.date.toISOString() + }} - {{ program.url }} + + {{ program.url }} + +
+
+ +
@@ -48,6 +115,51 @@ .block { display: block; } + +#modifySondage { + background-color: #b84000; + padding: 1rem; + border-radius: 0.5rem; + color: white; + border-color: transparent; + box-shadow: 0.1rem 0.1rem 1rem #b84000; + margin-bottom: 2rem; + cursor: pointer; +} +.edit-btn { + background-color: #808080; + padding: 1rem; + border-radius: 0.5rem; + color: white; + border-color: transparent; + box-shadow: 0.1rem 0.1rem 1rem #808080; + margin-bottom: 2rem; + cursor: pointer; + width: 50px; + height: 50px; +} +.delete-btn { + background-color: #dd2034; + padding: 1rem; + border-radius: 0.5rem; + color: white; + border-color: transparent; + box-shadow: 0.1rem 0.1rem 1rem #dd2034; + margin-bottom: 2rem; + cursor: pointer; + width: 50px; + height: 50px; +} +.cancel-btn { + background-color: #b84000; + padding: 1rem; + border-radius: 0.5rem; + color: white; + border-color: transparent; + box-shadow: 0.1rem 0.1rem 1rem #b84000; + margin-bottom: 2rem; + cursor: pointer; +} \ No newline at end of file + diff --git a/src/main/webapp/assets/js/views/home.vue b/src/main/webapp/assets/js/views/home.vue index e15826f..03b77eb 100644 --- a/src/main/webapp/assets/js/views/home.vue +++ b/src/main/webapp/assets/js/views/home.vue @@ -56,7 +56,7 @@ image
diff --git a/src/main/webapp/assets/js/views/sondage.vue b/src/main/webapp/assets/js/views/sondage.vue index f6fd2b0..b8ae382 100644 --- a/src/main/webapp/assets/js/views/sondage.vue +++ b/src/main/webapp/assets/js/views/sondage.vue @@ -54,7 +54,7 @@ @click="vote(subtheme, `FOR`)" v-if="checkVoteAvalaibility(subtheme.id)" > - Intervenir | {{ subtheme.for }} + Participation certaine | {{ subtheme.for }} @@ -66,7 +66,7 @@ v-if="checkVoteAvalaibility(subtheme.id)" > Intervenir selon son évolution | {{ subtheme.neutral }}Participation possible | {{ subtheme.neutral }} @@ -78,7 +78,7 @@ @click="vote(subtheme, `AGAINST`)" v-if="checkVoteAvalaibility(subtheme.id)" > - Observer | {{ subtheme.against }} + Simple observateur | {{ subtheme.against }} @@ -88,7 +88,7 @@ :key="subtheme.id" class="text-centered" > - {{ subtheme.for }} + {{ subtheme.for }} participant(s)