From b2e0966f5f90ab071cb112506bc74bc719953463 Mon Sep 17 00:00:00 2001
From: pablo rodriguez <58742538+1-pablo-rodriguez@users.noreply.github.com>
Date: Tue, 25 Jun 2024 16:12:41 +0200
Subject: [PATCH] MAJ V2.0.1

---
 bin/fenetres/evaluate$1.class                 | Bin 1370 -> 1370 bytes
 bin/fenetres/evaluate$10.class                | Bin 1732 -> 1732 bytes
 bin/fenetres/evaluate$11.class                | Bin 1518 -> 1518 bytes
 bin/fenetres/evaluate$12.class                | Bin 891 -> 887 bytes
 bin/fenetres/evaluate$13.class                | Bin 872 -> 868 bytes
 bin/fenetres/evaluate$14.class                | Bin 875 -> 871 bytes
 bin/fenetres/evaluate$15.class                | Bin 876 -> 872 bytes
 bin/fenetres/evaluate$16.class                | Bin 866 -> 862 bytes
 bin/fenetres/evaluate$17.class                | Bin 870 -> 866 bytes
 bin/fenetres/evaluate$18.class                | Bin 868 -> 898 bytes
 bin/fenetres/evaluate$19.class                | Bin 866 -> 0 bytes
 bin/fenetres/evaluate$2.class                 | Bin 1666 -> 1662 bytes
 bin/fenetres/evaluate$20.class                | Bin 898 -> 0 bytes
 bin/fenetres/evaluate$3.class                 | Bin 2559 -> 2555 bytes
 bin/fenetres/evaluate$4.class                 | Bin 1828 -> 1824 bytes
 bin/fenetres/evaluate$5.class                 | Bin 2138 -> 2130 bytes
 bin/fenetres/evaluate$6.class                 | Bin 1572 -> 1572 bytes
 bin/fenetres/evaluate$7.class                 | Bin 1306 -> 1306 bytes
 bin/fenetres/evaluate$8.class                 | Bin 1054 -> 1054 bytes
 bin/fenetres/evaluate$9.class                 | Bin 1810 -> 1810 bytes
 bin/fenetres/evaluate.class                   | Bin 11089 -> 14200 bytes
 bin/fenetres/mainApp$1.class                  | Bin 709 -> 709 bytes
 bin/fenetres/mainApp$2.class                  | Bin 1281 -> 1268 bytes
 bin/fenetres/mainApp.class                    | Bin 6947 -> 6797 bytes
 src/baseEvaluation/chargeEvaluation.java      |   9 +-
 .../validatorBaseEvaluation.java              |  15 +
 .../chargeListeEtudiants.java                 |  31 ++
 src/fenetres/chargeBaseAuDemarrage.java       |   1 +
 src/fenetres/evaluate.java                    | 335 ++++++++----------
 src/fenetres/mainApp.java                     |  49 ++-
 30 files changed, 226 insertions(+), 214 deletions(-)
 delete mode 100644 bin/fenetres/evaluate$19.class
 delete mode 100644 bin/fenetres/evaluate$20.class
 create mode 100644 src/baseEvaluation/validatorBaseEvaluation.java
 create mode 100644 src/baseListesEtudiants/chargeListeEtudiants.java

diff --git a/bin/fenetres/evaluate$1.class b/bin/fenetres/evaluate$1.class
index 9fffc4269b8ccffced74d248b7ef4a42f19f8163..ba7b04ee7c25c693cc3d2b1adf06e3427acbf543 100644
GIT binary patch
delta 47
zcmV+~0MP&13fc;=yaXNJ00{x)038A403`wD0678Y07L=k089bt09paxli36~0q~O&
F1xR~54|@Or

delta 47
zcmV+~0MP&13fc;=yaXM?00{xe0389z03`v+0678607L=I089bR09paVli36~0o0Qc
F1xRGj4u1du

diff --git a/bin/fenetres/evaluate$10.class b/bin/fenetres/evaluate$10.class
index 576c88cd7acd348ace3aa78bf9df3358a0cfaa4a..ec1ed8a6ee1b23a6353efd66c8054408f135d586 100644
GIT binary patch
delta 61
zcmX@YdxUqxRaP;kvkaU}mly<@E;FbyU16|fy2{|lbawJ<)+jNiTMW!hw;6bu?l1^2
R-32PS#~{u0U~)8DCIC4;5ySuh

delta 61
zcmX@YdxUqxRaP-(CI(Jsb_PLa4hB_bP6kV6E(S+trpd2aqr{l`8JL*`7<icl83dSx
QfJ%fJq?tu0N3&%D04rYzOaK4?

diff --git a/bin/fenetres/evaluate$11.class b/bin/fenetres/evaluate$11.class
index fa31d9e6416805cc8f435a649c4c00efe0d6fa3e..4df4a7628f3e363663d862b87637bf455dd93290 100644
GIT binary patch
delta 57
zcmV-90LK6B3+@ZBJOv&C>HrA>?*I`3@Bk$O@c=mj@&H5v^8ic&^Z;4{>XTXpLJ9)-
P00aX001E>8lcoho1Kbg{

delta 57
zcmaFI{f>Ks4XYfpJOd}Q3WFfCDuXJs8iOUXI)e+d27?c?CPNgn{NyNBCoX1P1{P*L
M25x5k$;((h02k^B2LJ#7

diff --git a/bin/fenetres/evaluate$12.class b/bin/fenetres/evaluate$12.class
index 5a45db149c8c0de63b8de4cd758fb11e5cadce3e..c80b0d45c35eecfb971952f09d9fd0e6fffa610a 100644
GIT binary patch
delta 95
zcmey(_ML4*F(XrE;^tDuAV$XW$tRfPxsn+e8JHLt7(_Qs{>r3mR>{E0P{qK@P|YB~
oP{Sa?P{$wyloW#~VGst2fPg52CW97Gqc)Ju!oVaj*^gNl0N>^hJOBUy

delta 99
zcmey)_M2@(F(XrA=H^nyAV$Wl$tRfP`O+B}8JHLt7$mi}Fz{@d{E<o7EQf)YA(ugr
sA&)_XA)i5lp^!lcs6Y&&j6oPE3IdW0nhaV%&DuaV3j>qLWG`l205a4M`Tzg`

diff --git a/bin/fenetres/evaluate$13.class b/bin/fenetres/evaluate$13.class
index 93e312c371c1e3df39e2dab4e2df596ff1ef0b40..7d57c45e2492acac04c5bdffbe3101a2b1aa5459 100644
GIT binary patch
delta 87
zcmaFC_JnQ27AD5t$y=G^xsn+e8JHLt7(_Qse#E3~*3ZDnFoA)WVIqS7!z2a~hA9j}
gKuIx(5(Z(Q2ndKWXfkL4HEILdEDTHnldYL`0UtRHTL1t6

delta 91
zcmaFD_JVE07AD4q$y=G^`O+B}8JHLt7$mi}Fz{@de2+=ltcih_p_xIDp@l(&p_M^`
kp`Aeps6Y&&j6oPE3IdW0nhaV%&DuaV3j>qLWOHU+0BL*<82|tP

diff --git a/bin/fenetres/evaluate$14.class b/bin/fenetres/evaluate$14.class
index 39329e9a1f7f8cfe2b5f4ef372eb130ca85a39c8..2044c93e84947686112233b12e208855980fb0aa 100644
GIT binary patch
delta 87
zcmaFO_MC0Qb|%IJlXo!5b0sq{GB7bPFo<rN{FF)AY!L$|!(s+rh9wLF3`-eA7?v{#
h0VTyCN*IKJA|N2jpvj;G)Tj+)voJ6TOtxdz1pquq4c`C&

delta 91
zcmaFP_L^<Ob|%KjlXo!5^QAK|GB7bPFi2``Vc^*^`5}|C*;EEzhG`6f4AU7z7-ld?
lFw9~Q0xA%LC}R)?ih_V7gC>I(P_s6W&BDMWGTDk*7XXI`4xIo1

diff --git a/bin/fenetres/evaluate$15.class b/bin/fenetres/evaluate$15.class
index 23cf0b63e08641693232b811174f68d84c8a161f..926af18de34e8374bdd138e7aeef2355e9489cb2 100644
GIT binary patch
delta 87
zcmaFE_JVE04kpHRlXo)7b0sq{GB7bPFo<rN{ESK2Yy$%)!$t;PhD{6t44WB57`8G9
h0VTyCN*IKJA|N2jpvj;G)Tj+)voJ6TOtxp%1prUd4mkh-

delta 91
zcmaFC_J(c44kpHhlXo)7^QAK|GB7bPFi2``Vc^*^`4N+{*<uD>h9wMw3`-eA7?v?e
lFsxt@0xA%LC}R)?ih_V7gC>I(P_s6W&BDMWGTEA07XX^s4)*{6

diff --git a/bin/fenetres/evaluate$16.class b/bin/fenetres/evaluate$16.class
index f30a48d2cdbda0e5fb9ad71754fda735d5c9eb83..05d1ad84df54e990e3b35a5aeab96abcbf1df8fc 100644
GIT binary patch
delta 87
zcmaFFc8_htIwr<Flh-rJb0sq{GB7bPFo<rNe1}QdY##$B!+r){h64-&3<nuR7!ETC
h0VTyCN*IKJA|N2jpvj;G)Tj+)voJ6TOg3fK1prc54p9IA

delta 91
zcmcb|_K0o6Iwr>Tlh-rJ^QAK|GB7bPFi2``Vc^*^`394+*+vFlhD{8D44WB57`8A-
lFl=KG0xA%LC}R)?ih_V7gC>I(P_s6W&BDMWGTD$>7XY014-WtU

diff --git a/bin/fenetres/evaluate$17.class b/bin/fenetres/evaluate$17.class
index 37725d053d2d9288c54d16fd9df5f1c7b4613cd5..8cc3e6d1d3d174129cf0f82f01df81817400f75e 100644
GIT binary patch
delta 113
zcmaFH_K0o6CMK;@3_=VH3_J{sK$43=m_Y<cGct%Whyh7%AUhdIGXZJQO_LumDVv>P
t;AA+<z{_xsL4e^rQ1L~ub}@(&sCJ-Y22BPnphj(=MivGpfytK4x&WjI4gCNB

delta 117
zcmaFF_Ka=ACMLbT3_=VH3_J{sK$43=m_Y<cGct%Whyh7%AUhpMGXZHytt|{ZTPELO
yQa0Pqz{_xeL6G4fQ1KxK35FwJBg7!ephf^SFlaJp0X1s_HM1}<iA*+S)&&6TO%A&N

diff --git a/bin/fenetres/evaluate$18.class b/bin/fenetres/evaluate$18.class
index 2550b6633f6f497181b6c60158f7cd6b772a1f0b..6e1611a54788aa54cf4078b5cd242dcef51dd5dc 100644
GIT binary patch
literal 898
zcmaJ<>uwT36#fQ~rQ4+!q}0}Gv7$n2izfasL2VkW5kp%|4Nd$vz_d(VW^iW!^-+8a
z6L0Z{58y)?&j2QxHf}OI=QiK@&gJK??>_)+W6MK~A$u&8u#qrjG2mgJTT!@s-$R07
z<&+P2nGY>_gtFx$soHwD)8;)ZB8H^xNK?4OaIt;{qC)NmQc3%WAy+)dUurNUs=6(v
zz%U))0+K%BNC)sR!w@gJfZ4iKV!z*Qis&V8hJqne*DW44cqE-ZF(w=l%5ydiRYFYC
z!x8ansEt%746DWZxs~m@Dl4T%3OR<ghVF;r{pLXTP5w<^TB<qE6%XGTaTH0?wo|yo
z;Jq08d@N(d!)1m=2mZEfDC<f2*+I`rt)6ow0$jmWhI!M`!>U%tGU`5-Jk-SK;a`lZ
zy4%yrF&VQAIl&w>Petn=%b|@3zf!A}YCiH<^Kgx@&kQ2Kb=Oa?Elp1w>frRa8KYWh
z#Q*CAb?(se*6Tgqn{?Vg)cvR>o=7)~^q+m%as|`0c2#TK;yqzIx*cG{rJkuvV`;^r
zotEnaLr_zsRYPu!ps}U)g|Sbyu~Y>Oo;H)s&AELbDMrUbitJM)-6P#u{Pm5`^!tk7
z<0xj9{z-}f%VCb>z{&72j||<kpU6%SUJ<TCSYVlj%wjzG4ND&g=@a}fSao1=IItN<
zgDoM=mXT#EBhcLV;RKW*P{0j>y*YZtvPj?-i7^yWqB}v=tm8IGJ_R{G?%SjjL;g1#
C9n;JJ

literal 868
zcmZ`%U2hUW6g|TtTh^t}7Af_sSg8WlZkzaEg3&}$qh^Z_7#{jIEK}IB>>6gE{1tzJ
z&&H~W5B>m+AMpnn?*KJz&`oCM-aB{CJ?Gx}^83?g0FSV1BF2zC6roT9AssQ|!H_Fa
z+`Vri&X76cBklw|>^Lu4N5WGk5)1_$9Xs;ar??o2P&u_O<p|f8il7Dz3Dxywafe~W
zodd7Z^#ecj)kB6{=^yvyCPTaywM7yPDH|phEEq`JNFu{vlypMc^+Qn~_FH1`lD7iE
zu<S-251M@7YkwAuYa&!<z6@z3Cbm?hcS^s_uu*dVCvHy*t(Kcf<Z;==8pG0@G#giN
zl{kA{uh$ya#jzW8B8Js-pwDYv;q@Lz<En-0D41AhxOBGa-vk>su)$#YvLOQMz95FA
z{ve4WZkgC*SR}=s<3;^G58Fc8xQ!Bn8J<>V2MmmQvwn`j*_lmc5$A^DUT>ejnl;X9
zM8kn6p7^@8sndtCt$9-O_d+j-B+Y+csBT2G>}Mejz7}vP1@(KOE~I)INreK<(4chz
zER)frq=y%ym4rpni)7s+Uq`IU)_d5Mk63&=$yuU3K{>!zEYogJYzr&Ml1Dv5ZidjI
zQzNWZPGFy4^#iWGh82H@n{QwmbZ9^W8ZbvhfNx0QJNZ8d>L<<f*Q7vh3NkA|a44ff
j&|CCJ9I>oH`yH}lxQp#cERQrCva}RURDV0PV#xmi(@ex!

diff --git a/bin/fenetres/evaluate$19.class b/bin/fenetres/evaluate$19.class
deleted file mode 100644
index 2327a1d8e58086896bf945e74908eb1151d4788f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 866
zcmZ`%-EI;=7(K(TY+08=Tcp&#Vnqe2-8S*YU^J1`sM+ELhKt?}%LrSRUBe8>tM~+7
z8>=Q>_yE3v@h3is@f$$X2Hj--zWMfi=bUdo|N8g|z<umlNHFA{i%6)Ukggc>aKx1;
z?cK3pGGveVn7bj5y6)5Vk?@s;Btub0C$4-MP+W{fq}+Osa)cL1MNmVAr0NB-w9ByO
zEr8eP`fd;f>K;SB{Ez!ei@~hN9gzY<+JS{78wN5CQphqGWu1`mf=Dz*gSHqx<Lyu|
zta`D}!xkR~`aBPsnh4cdEJGTJi6a&1ozd?wY?ZzLiQCsgYn4_C1)R6A!LYI*&A|m+
zBv8NS_uG?3?8V)fVf_^5lX_41{Ri=+X5%u77B(5qoh<q{!NC=5G1!4@ijd3~M3BTE
zrclCl3)dKyNwDww@nFECj*t#+piJ&Y^TO<qfsr$trwE+v*i00;+*I7}AMh7*+w5jM
z8v5d4pp8xcc@{gGCRx89`C%-n`v*exVq)byj;QVRkV`4Z?WKm0>QO8eiqt`a#u>0|
zRyUHKU4ljmHbu|U?lzru#IA0?gH!#0<u}uu6`GTj1AM_M&CYahV+}bvk!8rw5xTT$
zgpKMkoMWuN$E8=W&9}Jv8kRwe1~i}n^F##riZs5_`8z@Vpl<%07Rb*)<^>226;ug&
ioBlA7$Qd->q<sRnurrMnkbz4(EkzU6-!6>=3cmr4Xv5P0

diff --git a/bin/fenetres/evaluate$2.class b/bin/fenetres/evaluate$2.class
index 08f432180dcdacfc4d72e6465bc48d6236db098a..3d220dc927f95ab1b3b63bc68a515df29a6ac438 100644
GIT binary patch
delta 123
zcmZqT{l~N6Fstl$22RF546=-W8B`hnF<3JGXK-O+VDMpLWQbz?KKTKwyl)T#6A&^m
z2<>L@-Ok{@gCSrOL$FZfHiqbpKv5<JcaR(d3y{giz{bSRz{$kHAjrhY-~kjDgXm=N
PWbgv=fa)d(uo(dW?bj9d

delta 107
zcmeyz)5N>sFstls22REY46=+58B`e`F<3G_W^iGA!r;UBlp%`o_T&ew@*-gjOhCxM
zAhw&qcRPc>))of-ZIk)gBvlw+F|aYdX5eLf!ywA|mcaw02BMO|lfetf1M(;Puo(dW
D9i<p*

diff --git a/bin/fenetres/evaluate$20.class b/bin/fenetres/evaluate$20.class
deleted file mode 100644
index 37a1a37908260def78ed95fc97bab5505555ae28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 898
zcmaJ<>uwT36#fP%OP8e=q|{5bSW%(1r7`|PZ5phRhPIj-n)q*kX_>m6!JPrrNAWF8
zyu}|rfDdIn1DI&qxXJ9C+kEFcm!H4B{{XOs4G%Gf+_6x?M#5CYfQNl<Me+WohXljY
zDIf3(A6oJVWh+Ngb@Xt%!+Tal3`yISrnt#)sc{aXO74eJN&A=~U%J3wZZaflx+A8+
zkPa|~q>nf<0X)nw#7iz<wjq_+@1M0q^pdwi!H{j}HV>OTl1`r(6OIVwIiH3qAtssO
zh<Gj3MyeBr<x=Cq%643p)p9e1Ji|&;_e1f1eW3fM@TM;<)m-3;hwqFyiX>@UDO_go
zUW|P{u42i<HHJk8{<dN$>q%wzpl794&$$u-uHy#7yy@y;O{-%Wojs8})Wqn~UyN${
ztf!S@GG-Zaf;niNiuOO2LmLr(wO%jReH5_b;U;098$^IxuAg2<nw~b)!SuKpqgrXi
z|LX*G?$Gk~>pk9^blN}E{irRTN;iwlpMBYI1=F;4RD0awJz=}L6JX7yo@q#9X~m-L
zw(A5#P*<eYLT-$pv8DEfvCp)zR0R#5Hj~ZGxqTohM#n>n?9(JYAl+H~)wR#``-<S>
zC}x)aNs0lR!W_wgli_0?S-NRIk((gAB3y^Cz_JV3#dz`?u6!V*Pw>BB*@4C3z-Al`
zmO_S2BgfJs(ERw}1e739#BGATGkV2xNZ>AsF_ciIJ3-Z~;vPvp1vx(MTc;C4;WyPQ
B(|P~^

diff --git a/bin/fenetres/evaluate$3.class b/bin/fenetres/evaluate$3.class
index 11a3fe4e56cef033777cdc9d811e77b6e5c81cd5..5970bd7bd26a0603229f9865985dbdb2338322f9 100644
GIT binary patch
delta 161
zcmXAhI}QP100zfL@o%BAiT7*6ig#!vN(ols1X@~&LLuQ6TM#ZmBPvI64^i+Znn|XZ
z`MMwXdNM^NaFn8;G`=znm1V3PbLCkm5#CM7c@rZF9Kx5`tsWe2R-#NS2gE@hMir8(
ul9!LC8a37FszIP8OSM?5%|;z|>aka!scp;uDFHKUcF&m$5e(b#>5P6RCm1pS

delta 165
zcmXAizYf7r9EHF8D{-%=l4A0AU@#aZMhR;01XhbhV(i8{bRfJ0iFEKV9-~W9H?f@L
ze98Gv>SzA#tlKKVsFap^(^nrR>dQ=JtOV97iDKO`A96UrF?#86JAB~9obDDl%x#Ww
zLGoxR&=5^i3_U3_kP;(t38c(MJa$rHFI7URagaI-yY2qP1T1Z{7hJfa(1g*`On=az
B9pV50

diff --git a/bin/fenetres/evaluate$4.class b/bin/fenetres/evaluate$4.class
index 25be4aadcb0dd2422f0f30b60e53785062d2868a..8957f1888e939932851be76e3afc29d90eae5038 100644
GIT binary patch
delta 173
zcmXAi%?g455QINh(IOD)5Exje9>PPvl#1FR=nx$`L|yvx5qbzu-8%FDrQq|m5Cgk2
zyTi=eeYv05_5+$S!j~~anGnd7h0Mrg&Q5~jWDg!WqJX|tk(w3jl1<I_NvmYvIn*5W
zn10n^veenb1_`kwq9HMDN$@1ojuoN)yZ<yIVpW>UnF|J2<tB!Q#Z9SjC)Zs#j{gIz
CvKTr5

delta 140
zcmXAhu@1pd07Xx4n-`Wg7K^+zEj3gljLbq47KuUZ7HmGHlZn9xh&H~=2Y89x<=o+%
zNB9h1rLmT_60A}(^_gkFLKzzkImlK=6USHN25C^U_G`9pb|3aPqP!t$s=MjUa{`TM
hsi32=t4&BWW$CQ$-(^MVo~v-;jK{^Xk7ui|DSi~46p;V`

diff --git a/bin/fenetres/evaluate$5.class b/bin/fenetres/evaluate$5.class
index b75989f70f54be07a1cec619a5174040176ed2ba..2de7cac97fab7591636f38fa5f2f5c23eed7045b 100644
GIT binary patch
delta 131
zcmca5a7kc82D@Yk11D1?gCJ8BgDO)rg8@?vg9TG8gBw%G<VJRR$yNpy1||ju2IEZ(
z?lT#9HZk~aV+dT%Ah&7qL3ShSL<TmdBnBR)WCnhw6b3D(3<e{nOa>>QdNGJD24@Br
aAP=aYp`M|EfsvsR$Of9oFEv?@Lk9qrwH7Y`

delta 139
zcmca4a7$oA2D@Y@11D1-gCJ8sgDTSm1_P#v3>Hk27~GgTCpWUoEA}$5FfcJNFj#M5
zaG%K_ptXg8e+z@}Hip3E3`$_m<eltB*3%f+n5HubFwI~PW}3-h#59+|ifJB$6HuQR
gL^p#ogA0%cG>4&{p@D&sp%KUink+0gS&c&n0D{39{r~^~

diff --git a/bin/fenetres/evaluate$6.class b/bin/fenetres/evaluate$6.class
index 473633974165a37844e9fa8bdc2205abefb283e7..df121fa058dc93c21eb75a3cff3b077e0fb9c581 100644
GIT binary patch
delta 55
zcmZ3&vxH|uBCBjZ11D1ngCJ8WgDO)QgC$crg9}pygAY?BLljf~<T_R#&RPauraA@@
KriRIvSpxx6t_*Mh

delta 55
zcmV-70LcHO45SROVFewe00{!A01*PJ03`ye067Az07L?<089d|09pd1lYRwE39<kU
N0<!=V0=1LV1yPUf4z~aR

diff --git a/bin/fenetres/evaluate$7.class b/bin/fenetres/evaluate$7.class
index 7bfa83ebf2daa05c3c52de1570693b9aaf00696f..032f9f260244644fa9a7fab29c8ad77b5145768e 100644
GIT binary patch
delta 43
zcmbQmHH&LQ1B+xE11D2AgCJ86gDO)mg8@??g9TGRgBw%Z<e4lMjMFAxV(|a~=Fkfa

delta 43
zcmV+`0M!4Q3YrSAfCL%400{!X01*Pg03`y#05Af>05}4~07e44lbHlK0n3xp1V{-z
B4730M

diff --git a/bin/fenetres/evaluate$8.class b/bin/fenetres/evaluate$8.class
index 9e14542bc0f17f2579f1fcb4c748e09637af69c7..324dff53e9dba8018effe1238645dcfdcdfa8375 100644
GIT binary patch
delta 35
rcmbQoF^^+I53}GL22Q4h41!FH7*v@SGw3qSnLL--f^pU4Ys?-1tTPGu

delta 35
rcmbQoF^^+I53}G!22Q4H41!G88C02WFz7N}oIID=g7N<3Ys?-1z~>7$

diff --git a/bin/fenetres/evaluate$9.class b/bin/fenetres/evaluate$9.class
index a91c84e333a49f7ea2c0a65035077bc874855fd5..a6613d2fb890e487a933c991516d4a78250d78ff 100644
GIT binary patch
delta 59
zcmV-B0L1^24w4SAO9maW00{!N01*PW03`yr067A=07L@1089eA09pdElV}D^4Zi>e
R0>S_c0>l6m0>zWT22smj55E8a

delta 59
zcmV-B0L1^24w4SAO9mb000{!?01*Q003`zL067Bg07L@s089e#09pd(lV}D^4fFs8
R0`~w60{H+G0{WA|22l~x5<36@

diff --git a/bin/fenetres/evaluate.class b/bin/fenetres/evaluate.class
index cbf9d8a6e4dcfae24eeaf9555a0e2e188afebbca..621ab5660fda5fc2ffdc3577a3c9d17f75e71af6 100644
GIT binary patch
literal 14200
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
DoWFrL

literal 11089
zcmaJ{34B!5)j#LWOlBA#5Hf57hy$XA1PGf52}VLlNH75;AsA8cW#%Oroh6-_K!W;N
z)V4|yt=8H_DcTjWwo)@uV{I#4)Gk)5t=+7(t=igFYptzcwS50`-+Qyb_{}ewyPbRP
zxo5lQ+&fSH_u)s0=sd06OB&OpUNd24Qf9iw+-1ZDjg09fH&exB#x7&1CcQhF=&RY#
zoHF7jQ+e7<MU7aOnMy~KiLI^cn0N!z_{L-+oiP%bE+8;HKrSC<@@A6B*jgjSG_|b=
zU#Hby$8<_KnaG%l%w{8j1tu4RNoNc|-dIm;vytgP382mBQ2-MF&>W4K4GAMQoCc!t
zsw3PVHB*fpT}ADVuJugQ!u{dPdxm<W3MAc>8H^awL?(@qViFqr&G6-GlS80lk~Qa|
z=s>S&MtY3!<=}|bmq<3}x^$~+V{&6M14>jAG)N2RbE9p^zNBnl(E*M|dqJf=)!c23
zj?WBb1`=^Ioi_Sp^3=ARu#8@z-Rv}nGQve8oN2Pf$26;G3k^N#ObX)-;S7W(+(cv3
zfSF*Lh+2mkGsBtYWGrGrP8H};#I!`ynPe*ZfkA9xDmoi_l7pFMi(NS`3#O)_XvV_X
zVeA6%IKhdU0eUCd_01`>*G!p-u<!$Yor8kgi~%HwW_vOc?S-UHL|?W#nuuoVnOv3g
zAwzd#GGhA4MT>N*qG~TKW(wpO;%M)@C4Q=*r2?`Hq*vxy=0McV?;1x;XX`YZPV>?^
zC9y2^(+XNDaJ4#x1a5UnxMhB-v*6CtX^y}(l!ROEr!^MbI-TYUTysgdv;EX$!L{mi
zy1<=Z5^jZ`Hdt^Qb($w|n@hr-<EKp)T!&6)2;A0^a4Y@PX~A8n)0qNyQAxN}e(JX1
zF45^Mf!hhIEFp!(e%fIH_UKe8fRWOGkXP6O?9*w!07jXn6uOJnIMlxtj>1b~a=FFg
zFxiHI0UyO-wl#2J$-z|Ec4T2A7G5-v=<`#OKH#MRD7&Dni5c)`jWHvg)+t3$z*G9n
z%ockp)7(mBI~G_+CI#<TH{a@lm#o>krLE3S{WK`*wF?SvgF9pMyJU1or(xQ|<O6C&
zJM5~`#$xQw)Tln-VY*VMtLT4V6lp+WgEn-)Mw<to-{qwbVwd?nSj4RzjEdooqig6o
zFI~$tK{j3!PR8R#B4T2bAEFO4c{-zT@gU>m-TCQy+UKPkz}OR!>-16D58D>UVs3(e
zI<t^Fn|dyT<8Zj6_-ZrEPgm0c;m}PGWZ@Ktp<O=u7_2(9FeIS2>hy8Cjj7BSfLDT+
zEG#wWB+Bir*U8>**Xfh8Pwy`4X!6mgaWsWw=nkFkl%cYol#vMc%YvWP=@8uo`DBt7
zMNmvfKE?ZB`kYRmmwoskAuurp2gLM6oxVh0W}1%9b!M+I7|S%ql4%oOHD!pGg|n(`
z6=h($N2eonFZ?24*Cq!O5$K$^vK1d0zmLA=rLV$eE8dH|*Qbnu{%APel-LzbCE@%N
z8J+H@qf9fQPHjoZw*&}N$l1aBAc4N!M-S*ULRq*)plUaUqVd7_wrC=f-0e^{wGhh|
z$QR}kGcor;de}=3*>ORQtdSelX^bARw0&DNBBwO`^*WjIs7~LMp>bHQ#f<j#XM`i)
zmI;q3s8(rzN1z^)+V^z&K0OYb1g~VL7ArmAmc`2_b@~BSGx@_Q6M;&*nHZF5Kho*P
z(mmelwu1{V{lq3W7sjY~!cR}pB5~|L)k&xEUV4scwy@s;>q(|yQZ-HSfz0q)Rrk}g
z^m9?@du8%3bowRz%8{tR0)eHnC!nxq<Gc|nf1}e2^jlacHiv*IAM{MK)m@k>1Mq5Q
z3X{C_JKGT|ep|@ejA0zaetMC9F9ba<1pQH`m+2LYAZr}TQh?OzYc~>bqk>pA|0kXN
zbc&B&gLBxJOl4pgPtjj>`Ww9t$rurs;rs#=jmh{xG67wzE3iYy1HhdB4vpVtrZZmp
z2bdx5FdprTCVG?bM0OC_9__OT@zFn-$VdMI#oL!HUNtau$@WWp^bS+y_GK#<Ena-d
z_H&j<r}bS>E?0wq_S2j6AKCxAOsi}%3oW;RNZaR}+#?MB?}-|s0!klz2hCpH(%Ift
zzj|x^=7uc|?M<CqnmSh3Y^`5iqx${y9vv9RF7|lY4WZ`jw=o$@rgSc2FZj5nX&wBk
zwYDW*48oe;<8eCs`4s3Zw4phfGW$~E8*t<nF<qcRCyxhUZiQy(h>s`2rF9zp$++QX
zohN}AT!90k1T!q_d5<USJcXyi`=})oh}tR&789&WQ{Ut1ItRtQO$A^J0<}G&l(B|b
zv`@JsAJ4==88&0F(BjbI1%~twg<@uJ#;Om8!cY`5<>OPCmfCDwE1a|gyimjp#m<5{
zN~~`2bZvd8He|CF>dB|+R8A9pJO_@gH<sKzyue;>Nzr=X+U{X5pMFBXu)&GieS8K2
zy*4u)l4uzrW;&EGLuu?MG+?Ad5hH;wj7E~_v^AQHM-%Wny=gzsg@8dyrA`5w?B%M`
z;mcA#&nJA%<%K#g;u?v1Bay~_I8L(-K{T=}_=htrPCNd=+yxHR6axwKfn~Cfmol|C
zCK28538kZ8YytH`?6JehR-#C^{{PK{5`}x=<vO1&2bs7Z@sOR-0ZATwtm5B77B5{O
zZ1wRfrgKY456Mg@COcEC%Twb>(iUT=R=8KE(<Bk(xe`qluCm--<vf^usa24sIS50w
z1)9;IQ-vUG6mb+HT%iyS`M8Pcw8qr2!)7Wpm~aFi5~_uJ3CY8Rvh_Mm7rC~Umg_P<
zx6o1_w}A_JVeCo{rbGCOK{ipi#1!;gNl2l!6sma9MLymrN0VhP)~>~Q$PvUB=rln#
z)4^0-$b@y4KE9u!Ag<x9I(JE2;~qd_?BfgJvo1y~#~10moiD~2iWoQ3iWqQ6BDa!Z
z7*5~od56wB<uopfnTb9*2CipA=N=Brc`_)uBVu4lq~JzQcA`E;RO!w8MDEkMU(`&T
zjHO?f<#)ftmU#@(_-3&`GvuVw!i|JZQ$->O)=Om+%l(`bi6DSleu6|`)V5H>tox1~
zP8>U&f@DPC&I)NC59Ud6lzcbr6&bx{Wp)m))MHquDMHK@rHMJ)&wGRz1n=ukAjY92
zW`sdPMl?p*u!G&v5;J6^;FNZmp^I8K`}l)6b8M!FGFebX6NN|D=rm2px~?=?EBt(|
zko6I!miHkG4C*zaDXcy)V5E#=_aQSlQH6_^^)Zrz>Mn2;S-KUJDaQ8at_ad0gir9P
zwo4Z}KdRFVq4UPlbe`kq{X*x>Oq)v6xyxG5Hm_rc!^)#tI^+0qI8mGSycdGK-GYQ_
zV{#C85QCu@u33bhkLxs3==nrxdRF@RHlgQJOsh-NlQQE2mPBJ<7qH?4N#Uf64Ms!8
z;6i9xdN7T}KZ8ivHue=hz7vLM3)P_n*+)<)xvMlKtNeUODET}NuF{l<ipvQqG^i7-
zNLnD_i?HTKbp(4E$GA!wos(xnM>v&?;WjN{`uR(=2w@)|LD<JgQK|~UfqcMMkhtbM
zy?kFG`31L8e*TK(+wRwC7M+Tw9BB{0n`Cg@)bwZKG3m?dJn9@rb~M~MJOG*=;xR8j
zT!_2}5k}hV$PC9!ogb0Jt<383@uN&@SNEstSNAUog(az<8;)j%=hjzMRfTZ6rV#HI
zo&gaj=vWj2#Oj*<C77A27kc`@4gR*ykMS`$CpfRJsJUDGyOjC3$_nC~SXc%2{9T>D
zC*cxqM{yg513zL$Ix@&l5cTupIzJ(~$pj}BXi(R1GV}wTe<(vbZpUzW(XV1p8Thfz
zPcf1gzak?Y?TNw3x+^b|OR$M;$PP9R#(T_Er=bQaR8H7s;AR$WyVIS4b>he^ar=d^
zG#ZCTFTUu^-Lce3`h`TwOxVes9FV%zW94uV<$zqwO1uwc$4zTzE23k}Q{AF@a@XL;
z99z?H&8Loz5=vO-<rfQu?Of8$Te{fKzeQjLe*9kNKky%|z{*Nj9cJb)Y(y|tR8<V2
z!sl18LScrtK{7|&OZ)j{g1!71yXY|cl4fXYE4p~HEc#cS|HiKiGt7(wk9`!!an68R
z1v${9lUDID5+bi1`1<(`I)E>JTjziAzb)kL2{WEdL~-7_D;p&Se3}1O4Dvq+j7qF#
zU%2F0DO;%%obSmbBsBKzi34EiTd7&C88a?3HPZ18Ac}~<wZoJ{0oSuW&4vBggokpL
z<I_A~rsBUk1oDp8r+Kl3Hh3kUHV&L>vhJgC8*&mL@*cev$zdw4Qv9@6LxNL|n_vK^
zYf!4&X1}J>A}|kEAR;WpAjL{#3lR!CE}qzE?v}Qw{7EtZ#DsW4hIiWgK|o}8sGaPT
z`+te3ArYq^`@sI~R(>y7!0s#FK=4Ervu`2%+H^QsZMrrK;?a;0RTs;&w0PDIW-_>|
z_iLwVbG%vzixzFl8rHSB;w2_QL0h5`)54@;E^QvusRb9Jy+!x->RJ?-&(yWEv`Q;f
zlgr0kl<26AbV9Rz8d9G*?~6|OV4<AOM||2s*yQ`ds+)crSR<dd7&|KfPU8MgMtvGm
zpc8L&<!Q<qT#iVoU>5HDqP_WG#DZA?bt!-`22#m^WZD{AS&TemzeZStwZ$Zvc;1i!
zh_@$`updhbUz(;A>zge(+~@(k!Fr^TcMDtb8k`5JAco)X-D3*Il*XB<HZyI{gg2j<
zr@(oxLC;CgH9mAI1A>*ITJYH7MN{5ukUwb6y0%_x!M2K(15bF+B_tCU!Gm|G3w3!|
zL*VRq=0&24%7BsCs+)9qnmT18PJ?z+&ZRWX!TpH~Pk=KK1A3?oEiYOSIR0_#r0TeO
zQzh~rRU+M2C9*|TBFR%Fa&J{47*{1S1XUsmRwZ&cRU)QRC8ADMBHB|WVh~m0tw)u3
z%TXoXYE+507**n}MU{9<Q6=6=REf6`RpPBfm3YcfC0;5}dayUVMd5n^k@s@!(}&KT
zRim`9YK&^SQCTuV%TZq;^_3&E3iUdvpF2YJsIQUw+7W6*y-DipN2mq$4N`9#p?1_a
zN&SKm+Jbtg)VoG#8|vLs-#$VYqrOAxmyVEudRXe_2=$Ipe|N=Y6|pQOMk&))Rh^~X
zS-JusS9c$!y${kyM(M_io3nJwQThbFD?X*FpTT#Q4rb}@Dp!`iP*ol&k4$nsJ4t&a
zONSq%uVm@#SsFcXu2cQSf%>XhRayF0#1lIe<uR05`Yviu;QxnM?y2rkdU}MOsd|8(
z8KY;refW&h&$9G<m2_q4*Vf33-7eQCy_BUtNE`pJR{S|jf3XqNx}`Vhu6P4|LH8KF
z*<JBg#oHDC9;N@qlreg*yW;pLbFC-nIm%j=eL>F{>)ipK;4Uv8<?<{Cf*x0vrv=?X
zPk?6t4TyUW0JAV{glAVhz_UFVmohhVf;|(f^XveJ)GVHhS@TBu%n?2d{b!Bwd~lts
zv%J7+s%2f}x|+OL`U1Qp%gcg-2K5#B#aF7uYtdg@a?#oVug*i)E9f<VUQ-f!O@P<t
zNnEE$YzB1m7`F(C8!Qr=1AM+i4(jdB0;9ZXgf|0zv(1RjC$1u6qCo-P0`)n{o%jpz
zwk&tMFGV%Wmt^@;s8E0-wjyz_+V$oDNAr|jt|*HGTYQX@LfHo_%Hjb|fii2Ln2ibz
z#xr>|yA+xsKo5=a9zk=Zg=Q$gS6OH<Py!9c3(#Dx(Ch`8y<>c>p!tx6W^aH$Y@xwG
z2{aflKy$r9vkz$Yjq!d#bHGBgFTgihXfRL$4aN)5d`zLa6=-f9<J$zy?G~C_1N=z~
z4F*b}!T6{1ytzZ6IS4cd$M}$-x!Xc>Fu<R)&|shh8jK4X$L`9M-IWFS3+N1%jZxlC
z$M{R#qkOp58!QWYvwRQy5`P6fUmfAEVcoCg&|CI*RQdw^^(>F5QK->_{GjEC0{jg}
zU%nai%5avyRaIV=<?mEw`TO{PvdW$1AKfnwn4iW^Ozy^OD^VkUuyTyb`ByZH-=<3K
zR9ddxKx?$mQ=2wM7iv#aM0=SATpC^JIt|aAO>{do(`RWtJwdH_I@&<Lrt|3)YQw8S
zJD1TW_Tx2u0&T%Hcn4QgCoiL|+(;MlX1t1b({_%~#k`Al@Ls%r-$0l0XUO2YsE3c>
zk^3Ps`P<aX&ru)$4sY47(`Ec$N^2FA(Pq)0R!O_H6*Q!6pkb|xuFxWMr8Y!YY1h%!
z+AZ`!?Jl}OJ3{-kQQEIPMmK6t(gE!Sy2({RH@jxjEv^N0tE-Oga5d4Lu5LQ$GU<>j
zO?SDjp?h5W>4@tP-RruS?sGj%Uv)h}54wIz54m2Uhh6`mN8C)`aF^5f+%xF=?nU&t
zyOy4Gx6lvV+vr)hLC?7d>1Xb}^t}5f`i1)-z2yEf{oefu{lWb>z2bhFUUmP5{^Wj*
zUUR=ie{sJ{uY0`ohG!=I-E#)L=~+wv@SIQo^jtvic(&4iJl*uJX9peUXCR?1*0IPx
z<!8~l-TgQ}$3MfN`HFjpf6mV%EO^r$=U<@af)gp@Um`eg^Iq2rkm*G7VC@6^YxI?2
z<;(du`~nVIO%iMC;Kffc+^7+ahw}Ya)cki@ekrFWh&ePUi-&YPqzE~>1#FX}$)lo$
zNSlCY1t&Pq7~_|r#ILqhTl)Jace!;6yoNKB|1!pJ!27*9%5SwVC~wa4KdTpH`JHX>
z{In&@@2U#?Au3ruF1_v2P_r}*vo=;Q6!?W0StTQA9hXLnYM|1ahj#<M)?FQh=D)K|
zzK>gY%B0^@9fX&D$42dwuCnSNEC!%rwDp2V+Q(IMd2zEbzlvX`daK2RF%`x~hJr==
zc+fkh>D{B+1nJ3hbsv7mLL49;Po^MGq1il*=JRx_f!UnRGpL?t(t4hSAF!MX6AHmp
z=D;-OQi4yX6wjk8_)NNvE9quDpxh2KyMq_w8f6Kd!<W+-9xEQ>74$<sho0t@cy3)q
zFLEvYnOD=>d@df)>hZvK9$voIaF84FO2#v6srtA=o2ZpTuJh^d+9a5tMmuRt3!vtr
zn_*y+QFGImDWy$8&4Wkjo!V5?%IIyHr%gi*N+vJMwr;!y7(aIWld3UoI@mE|gkA-o
z<bPFGo7q<F&T6x(RmjBw?Q|>V%4%oWFfD*-Um!3G9GLk<FblF;^)?&07r+}AI&cee
za0_L=z$|otv)Uqi&T`DDbqC!Jh&_@As22c)Mh@DV9NM7AnFMtL6%tz^a>O>4<X~hK
zs9&DOMnP95r-22!EC(7a%b_cCCfH;+nuMud=#@S7?EF-3ZmQRrij@sn%NO)H6VAy^
zP-OWWP<s`0w#$rh!Ew%vRk<0#ak(YN$-KNqe-XMu+)StNdYXpkpIO`rZN7l&cnhuJ
z4jcxZaQt1=&)cBA7vdK=-T2|mc4+V=bSLki&*6dM9vlq!^AJ7C!}JW^2%hIF=q0`i
zT8pOwT=I|Sy*!7n;j{Q!Ucw*ZmAI>K;p_2aa|2#o_Hm5&^DwT>Z{!1fJMPC1;yU{X
z-^$<QkMno=Hrxz;LTP)irHi(<PveKQI&C#HwT^Go&P7cFmHk>hYA(>WOgj%XH>j%6
z)}ZF$@pMdUK&=e>yk1+2nimvr(;89p;UGIhTZh^>xLI6MS{6XdP>P%N9Mzf%*k-xc
zJK?cETi{+jHfb)c6;m{AgLXd3yOEaFpp?%JtH95{)CX?BDqHL_X_tHK@>;vxZ<n{(
z<sqxY5BAgt*M`=o&Mw#3Ws_ZQu**$$*=d*ER;jh2tWtFDpfJyec#^ya;@S`PAEFh&
RUxy#_H6d=;gdfdy{~s3y2vz_9

diff --git a/bin/fenetres/mainApp$1.class b/bin/fenetres/mainApp$1.class
index e6a675522189c35a94637273b47eb70e8d3390c9..b2472f26c72ce3a12e9d07d64b292da3ec9a3a49 100644
GIT binary patch
delta 23
fcmX@gdX#m8H5231$u>+jtkW4-7-meaW%2+3S55}E

delta 23
fcmX@gdX#m8H4|gsWE&<M)(H$O3==2UGI;<1R)Yqj

diff --git a/bin/fenetres/mainApp$2.class b/bin/fenetres/mainApp$2.class
index 775bcd51bf81df1f4844a6717168b4fc9c85e0db..099610bfef7823c892ca94088fb21106ca1d6c1f 100644
GIT binary patch
delta 93
zcmZqV`og)vl2J!Hqokyu*h*i&II|?RST8+4KRqW^FF8L~zbrGgTt6`{F{iRPHM|HY
wTeP`|aU~Pug2^&0$&!m1m>HHZ@G>lA5MWrwAjq(sL7HJDgEGUa$un3o0phkDi~s-t

delta 106
zcmeyu*~qoQlF`y4qokyu*h*i&yu4hmGQYH>G$~atIX_oFIU_MIFEvL$)Y;v*#4EfY
zK0m6=zckmwG&?-h%hWV|b1LIXCdQeQ`B{=B=P)oc%w^zZn8zT%FrPt?VF80Q!y*P{
KhQ*V+Suz2Lydd2G

diff --git a/bin/fenetres/mainApp.class b/bin/fenetres/mainApp.class
index f226724ef94232d11a4108e4306393bde2bc13b2..c72d908a5e4339cfdc3bbed38cf19b526decb183 100644
GIT binary patch
literal 6797
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

literal 6947
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

diff --git a/src/baseEvaluation/chargeEvaluation.java b/src/baseEvaluation/chargeEvaluation.java
index 566e2de..3e22ab3 100644
--- a/src/baseEvaluation/chargeEvaluation.java
+++ b/src/baseEvaluation/chargeEvaluation.java
@@ -13,6 +13,9 @@ import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 
+import baseListesEtudiants.chargeListeEtudiants;
+import calc.chargementParametresFichierAnalyse;
+import fenetres.ChargeFichierXML;
 import xml.node;
 
 /**
@@ -120,7 +123,7 @@ public class chargeEvaluation {
 		}
 		
 		//Chargement des paramètres du fichier d'analyse
-		meptl.chargementParametresFichierAnalyse();
+		 new chargementParametresFichierAnalyse();
 		
 		//** Remise à zéro de la base dans la mémoire de l'application
 		calc.commandes.evaluationsBase = null;
@@ -251,11 +254,11 @@ public class chargeEvaluation {
 					
 					//Chargement des paramètres du fichier d'analyse
 					System.out.println( "Chargement des paramètres du fichier d'analyse");
-					meptl.chargementParametresFichierAnalyse();
+					new chargementParametresFichierAnalyse();
 					
 					// Rechercher des erreurs dans le fichier d'analyse
 					System.out.println( "Vérification du fichier d'analyse" );
-					new verificationFichierAnalyse_node_commandesSujet();
+//					new verificationFichierAnalyse_node_commandesSujet();
 				}
 				
 			} catch (UnsupportedEncodingException e1) {
diff --git a/src/baseEvaluation/validatorBaseEvaluation.java b/src/baseEvaluation/validatorBaseEvaluation.java
new file mode 100644
index 0000000..4653cd4
--- /dev/null
+++ b/src/baseEvaluation/validatorBaseEvaluation.java
@@ -0,0 +1,15 @@
+package baseEvaluation;
+
+import calc.*;
+
+public class validatorBaseEvaluation {
+
+	public static Boolean isVide() {
+		if(commandes.evaluationsBase==null) return true;
+		if(commandes.evaluationsBase.isVide()) return true;
+		if(commandes.evaluationsBase.getEnfants().size()==0) return true;
+		if(!commandes.evaluationsBase.getEnfants().get(0).getNameNode().equals("evaluation")) return true;
+		return false;
+	}
+	
+}
diff --git a/src/baseListesEtudiants/chargeListeEtudiants.java b/src/baseListesEtudiants/chargeListeEtudiants.java
new file mode 100644
index 0000000..d3ef12d
--- /dev/null
+++ b/src/baseListesEtudiants/chargeListeEtudiants.java
@@ -0,0 +1,31 @@
+package baseListesEtudiants;
+
+import calc.*;
+public class chargeListeEtudiants {
+
+	public static void chargeDansleNodeCSVListeEtudiants(Integer index) {
+		if(commandes.listesEtudiants!=null) {
+			if(commandes.listesEtudiants.getEnfants().size()>index && index >= 0 ) {
+				commandes.nodeCSV = commandes.listesEtudiants.getEnfants().get(index);
+				commandes.fourniCSV=true;
+			}else {
+				commandes.nodeCSV = null;
+				commandes.fourniCSV=false;
+			}
+		}
+	}
+	
+	public static void chargeDansLeNodeCSVListeEtudiants(String nameListe) {
+		if(commandes.listesEtudiants!=null) {
+			if(commandes.listesEtudiants.getEnfants().size()>0) {
+				commandes.nodeCSV = commandes.listesEtudiants.retourneFirstEnfant("fileCSV", "nameListStudent", nameListe);
+				if(commandes.nodeCSV!=null) {
+					commandes.fourniCSV=true;
+				}else {
+					commandes.fourniCSV=true;
+				}
+			}
+		}
+	}
+	
+}
diff --git a/src/fenetres/chargeBaseAuDemarrage.java b/src/fenetres/chargeBaseAuDemarrage.java
index b0b7019..8437206 100644
--- a/src/fenetres/chargeBaseAuDemarrage.java
+++ b/src/fenetres/chargeBaseAuDemarrage.java
@@ -22,6 +22,7 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
 import actions.actOpenBaseEvaluation;
+import baseEvaluation.chargeEvaluation;
 import baseEvaluation.myTableBaseEvaluation;
 import net.miginfocom.swing.MigLayout;
 
diff --git a/src/fenetres/evaluate.java b/src/fenetres/evaluate.java
index a82f955..8ba6902 100644
--- a/src/fenetres/evaluate.java
+++ b/src/fenetres/evaluate.java
@@ -19,17 +19,19 @@ import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JScrollBar;
 import javax.swing.JScrollPane;
 import javax.swing.JToolBar;
 import javax.swing.KeyStroke;
 import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
 import javax.swing.border.EmptyBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
 import actions.actAbout;
 import net.miginfocom.swing.MigLayout;
-
+import calc.*;
 
 
 public class evaluate extends JFrame {
@@ -45,21 +47,32 @@ public class evaluate extends JFrame {
 	 */
 	private JToolBar toolBar;
 	private  JPanel contentPane;
-	private  JLabel lblPath;
-	private  JLabel lblFileAnalyse;
-	private  JLabel lblFichierCSV;
-	private  JLabel lblFichierSVG;
-	private  JCheckBox chckbxfichiersEtudaints;
-	private  JCheckBox chckbxZipfeedback;
-	private  JCheckBox chckbxnoFeedback;
-	private  JCheckBox chckbxNoNote;
-	private  JCheckBox chckCSVNotes;
-	private  JCheckBox chckbxNoLogo;
-	private  JCheckBox chckbxVerif;
-	private  JCheckBox chckbxNewLogo;
-	private  afficheText txtpnmessages;
-
-
+	private static JLabel lblPath;
+	private static JLabel lblFileAnalyse;
+	private static JLabel lblListe;
+	private static JLabel lblFichierCSV;
+	private static JLabel lblFichierSVG;
+	private static JLabel lblImageDossierEtudiant;
+	private static JLabel lblNoFeedBack;
+	private static JLabel lblNoDeatail;
+	private static JLabel lblnonote;
+	private static JLabel lblnozip;
+	private static JLabel lblVerifHistorique;
+	private static JLabel lblCsvNote;
+	private static JLabel lblNameEvaluation;
+	private static  JCheckBox chckbxfichiersEtudiants;
+	private  static JCheckBox chckbxZipfeedback;
+	private  static JCheckBox chckbxnoFeedback;
+	private  static JCheckBox chckbxNoNote;
+	private  static JCheckBox chckCSVNotes;
+	private  static JCheckBox chckbxVerif;
+	private static JCheckBox chckbxNoDetail;
+	private static JCheckBox chckPasDeProgression ;
+	private static afficheText txtpnmessages;
+	private static evaluate instance;
+	private static JScrollPane scrollPane = new JScrollPane();
+	private static JScrollBar verticalScrollBar = scrollPane.getVerticalScrollBar();
+	public static boolean isDispose = true;
 	
 	/**
 	 * Create the frame.
@@ -102,19 +115,19 @@ public class evaluate extends JFrame {
 		lblFileAnalyse.setFont(new Font("Tahoma", Font.BOLD, 14));
 		panelWest.add(lblFileAnalyse, "flowy,cell 0 1,alignx left,growy");
 		
-		chckbxfichiersEtudaints = new JCheckBox("Les fichiers ne sont pas dans des dossiers nominatifs");
-		chckbxfichiersEtudaints.addChangeListener(new ChangeListener() {
+		chckbxfichiersEtudiants = new JCheckBox("Les fichiers ne sont pas dans des dossiers nominatifs");
+		chckbxfichiersEtudiants.addChangeListener(new ChangeListener() {
 			public void stateChanged(ChangeEvent e) {
-				if(chckbxfichiersEtudaints.isSelected()) {
+				if(chckbxfichiersEtudiants.isSelected()) {
 					calc.commandes.fichierStudentMoodle=true;
 				}else {
 					calc.commandes.fichierStudentMoodle=false;
 				}
 			}
 		});
-		chckbxfichiersEtudaints.setFont(new Font("Tahoma", Font.PLAIN, 12));
-		chckbxfichiersEtudaints.setToolTipText("Cochez si les fichiers des étudiants ne sont pas dans des dossier nominatifs");
-		panelWest.add(chckbxfichiersEtudaints, "flowy,cell 0 2,grow");
+		chckbxfichiersEtudiants.setFont(new Font("Tahoma", Font.PLAIN, 12));
+		chckbxfichiersEtudiants.setToolTipText("Cochez si les fichiers des étudiants ne sont pas dans des dossier nominatifs");
+		panelWest.add(chckbxfichiersEtudiants, "flowy,cell 0 2,grow");
 		
 		lblFichierCSV = new JLabel("<HTML><B><U>Fichier CSV liste des étudiants</U></B></HTML> :");
 		lblFichierCSV.setFont(new Font("Tahoma", Font.BOLD, 14));
@@ -199,33 +212,6 @@ public class evaluate extends JFrame {
 		chckbxVerif.setFont(new Font("Tahoma", Font.PLAIN, 12));
 		panelWest.add(chckbxVerif, "cell 0 2,grow");
 		
-		chckbxNewLogo = new JCheckBox("Nouveau logo");
-		chckbxNewLogo.addChangeListener(new ChangeListener() {
-			public void stateChanged(ChangeEvent e) {
-				if(chckbxNewLogo.isSelected()) {
-					calc.commandes.newLogo=true;
-				}else {
-					calc.commandes.newLogo=false;
-				}
-			}
-		});
-		chckbxNewLogo.setToolTipText("Cochez si vous voulez remplacer le logo par celui au-dessus.");
-		chckbxNewLogo.setFont(new Font("Tahoma", Font.PLAIN, 12));
-		panelWest.add(chckbxNewLogo, "cell 0 6");
-		
-		chckbxNoLogo = new JCheckBox("Pas de logo");
-		chckbxNoLogo.addChangeListener(new ChangeListener() {
-			public void stateChanged(ChangeEvent e) {
-				if(chckbxNoLogo.isSelected()) {
-					calc.commandes.noLogo=true;
-				}else {
-					calc.commandes.noLogo=false;
-				}
-			}
-		});
-		chckbxNoLogo.setToolTipText("Cochez si vous voulez pas de logo dans les feedbacks.");
-		chckbxNoLogo.setFont(new Font("Tahoma", Font.PLAIN, 12));
-		panelWest.add(chckbxNoLogo, "cell 0 6");
 
 		
 		JPanel panelCentre = new JPanel();
@@ -254,7 +240,38 @@ public class evaluate extends JFrame {
 
 	}
 	
+	
+	/**
+	 * Affichage de la fenêtre.
+	 * @return
+	 */
+	public static evaluate getInstance() {
+        if (instance == null) {
+            instance = new evaluate();
+        }else {
+        	instance.setVisible(true);
+        }
+       
+        if(commandes.fichierAnalyseValide) {
+       		refreshLabel();
+       	}else {
+       		txtpnmessages.setText(baliseStyle.balise() + "<hr class=\"city\"><h1>*** Veuillez charger une évaluation ***</h1><hr>");
+       	}
+        positionScrollDebut();
+        isDispose=false;
+        return instance;
+    }
 
+	
+	public static void positionScrollDebut() {
+		// Positionne le curseur au début du texte pour que le JScrollPane affiche le haut
+        SwingUtilities.invokeLater(() -> {
+        	txtpnmessages.setCaretPosition(0);
+            verticalScrollBar.setValue(verticalScrollBar.getMinimum());
+        });
+	}
+	
+	
 	private void ListenerAction() {
 		
 		/*Some piece of code*/
@@ -290,20 +307,19 @@ public class evaluate extends JFrame {
 		mnMenu_Fichier.add( actOpen );
 		mnMenu_Fichier.addSeparator();
 		mnMenu_Fichier.add( actAboutFichierAnalyse );
-//		mnMenu_Fichier.add( actCodeFichierAnalyse );
+
 		mnMenu_Fichier.add( actModifierFichierAnalyse );
 		
 		JMenu mnMenu_Liste_Etudiant = new JMenu("Liste des étudiants");
 		menuBar.add(mnMenu_Liste_Etudiant);
-//		mnMenu_Liste_Etudiant.add(actChargeListeEtudiantCSV);
+
 		mnMenu_Liste_Etudiant.addSeparator();
-//		mnMenu_Liste_Etudiant.add(actAfficheListeEtudiant );
-//		mnMenu_Liste_Etudiant.add(actVerifCSV );
+
 		
 		
 		JMenu mnMenu_Logo = new JMenu("Logo");
 		menuBar.add(mnMenu_Logo);
-//		mnMenu_Logo.add(actChargeLogo);
+
 		
 		JMenu mnMenu_Evaluation = new JMenu("Evaluation des étudiants");
 		menuBar.add(mnMenu_Evaluation);
@@ -327,11 +343,6 @@ public class evaluate extends JFrame {
 		JButton btnSelectFileAnalyse = toolBar.add( actOpen );
 		btnSelectFileAnalyse.setHideActionText( true );
 		btnSelectFileAnalyse.setIcon(new ImageIcon(evaluate.class.getResource("/resources/fichierAnalyse.png")));
-		
-				
-//		JButton btnInformationAnalyse = toolBar.add( actCodeFichierAnalyse );
-//		btnInformationAnalyse.setHideActionText(true);
-//		btnInformationAnalyse.setIcon(new ImageIcon(evaluate.class.getResource("/resources/fichierAnalyseInfo2.png")));
 				
 		
 		JButton btnAfficheCodeFichierAnalyse = toolBar.add( actAboutFichierAnalyse );
@@ -349,27 +360,11 @@ public class evaluate extends JFrame {
 		JButton btnEvaluerLesFichiers = toolBar.add(actEvaluate); 
 		btnEvaluerLesFichiers.setHideActionText(true);
 		
-//		JButton btnFichierCSV = toolBar.add(actChargeListeEtudiantCSV );
-//		btnFichierCSV.setHideActionText(true);
-//		btnFichierCSV.setIcon(new ImageIcon(evaluate.class.getResource("/resources/fichierCSV.png")));
-//		toolBar.add(btnFichierCSV);
-		
-//		JButton btnInfoListeEtudiant = toolBar.add(actAfficheListeEtudiant);
-//		btnInfoListeEtudiant.setIcon(new ImageIcon(evaluate.class.getResource("/resources/fichierCSVInfo.png")));
-//		btnInfoListeEtudiant.setHideActionText(true);
-//		toolBar.add(btnInfoListeEtudiant);
-		
-//		JButton btnVerificationCSVavecFichierAnalyse = toolBar.add( actVerifCSV );
-//		btnVerificationCSVavecFichierAnalyse.setIcon(new ImageIcon(evaluate.class.getResource("/resources/fichierCSVInfoXML.png")));
-//		btnVerificationCSVavecFichierAnalyse.setHideActionText(true);
-//		toolBar.add(btnVerificationCSVavecFichierAnalyse);
+
 		
 		toolBar.addSeparator();
 		
-//		JButton btnFichierSVG = toolBar.add(actChargeLogo);
-//		btnFichierSVG.setHideActionText(true);
-//		btnFichierSVG.setIcon(new ImageIcon(evaluate.class.getResource("/resources/fichierSVG.png")));
-//		toolBar.add(btnFichierSVG);
+
 		
 		toolBar.addSeparator();
 		
@@ -406,43 +401,76 @@ public class evaluate extends JFrame {
 	}
 	
 	
-	/**
-	 * Raffraichi les informations
-	 */
-	private void refreshLabel() {
-		if(!calc.commandes.fichierAnalyseValide) {
-		}
-		}
-//			if(!verificationFichierAnalyse.messageErreur.toString().isEmpty())
-//				txtpnmessages.setText(MEPTL.verificationFichierAnalyse.messageErreur.toString());
-//			
-//			chckbxfichiersEtudaints.setEnabled(false);
-//			chckbxZipfeedback.setEnabled(false);
-//			chckbxnoFeedback.setEnabled(false);
-//			chckbxNoNote.setEnabled(false);
-//			chckCSVNotes.setEnabled(false);
-//			chckbxNewLogo.setEnabled(false);
-//			chckbxNoLogo.setEnabled(false);
-//			chckbxVerif.setEnabled(false);
-//		}else {
-//			chckbxfichiersEtudaints.setEnabled(true);
-//			chckbxZipfeedback.setEnabled(true);
-//			chckbxnoFeedback.setEnabled(true);
-//			chckbxNoNote.setEnabled(true);
-//			chckCSVNotes.setEnabled(true);
-//			chckbxNewLogo.setEnabled(true);
-//			chckbxNoLogo.setEnabled(true);
-//			chckbxVerif.setEnabled(true);
-//			
-//			txtpnmessages.afficheChargementFichierAnalyse();
-//		}
-//		
-//		lblPath.setText("<HTML><B><U>Dossier de l'analyse</U></B> : " + calc.commandes.path.substring(calc.commandes.path.lastIndexOf("\\")+1,calc.commandes.path.length()) + "</HTML>");
-//		lblFileAnalyse.setText("<HTML><B><U>Fichier de l'analyse</U></B> : " + calc.commandes.analysis_filename + "</HTML>");
-//		lblFichierSVG.setText("<HTML><B><U>Fichier SVG</U></B> : " + calc.commandes.nameSVG.substring(calc.commandes.nameSVG.lastIndexOf("\\")+1,calc.commandes.nameSVG.length()) + "</HTML>");
-//		lblFichierCSV.setText("<HTML><B><U>Fichier CSV</U></B> : " + calc.commandes.nameCSV + "</HTML>");
-		
 
+
+	
+	 /**
+	 * Raffraichissement des informationss.</br>
+	 * Activation des chckBoxs.</br>
+	 */
+	private static void refreshLabel() {
+		if(!commandes.fichierAnalyseValide) {
+			System.out.println( "Erreur du fichier d'analyse" );
+//			if(!verificationFichierAnalyse_node_commandesSujet.messageErreur.toString().isEmpty()) {
+//				txtpnmessages.setText(verificationFichierAnalyse_node_commandesSujet.messageErreur.toString());
+//			}
+			chckbxfichiersEtudiants.setEnabled(false);
+			chckbxZipfeedback.setEnabled(false);
+			chckbxnoFeedback.setEnabled(false);
+			chckbxNoNote.setEnabled(false);
+			chckCSVNotes.setEnabled(false);
+			chckbxVerif.setEnabled(false);
+			chckbxNoDetail.setEnabled(false);
+			chckPasDeProgression.setEnabled(false);
+		}else {
+			chckbxfichiersEtudiants.setSelected(commandes.fichierStudentMoodle);
+			chckbxZipfeedback.setSelected(commandes.zipfeedback);
+			chckbxnoFeedback.setSelected(commandes.sansFeeback);
+			chckCSVNotes.setSelected(commandes.ecritNoteCSV);
+			chckbxNoNote.setSelected(commandes.noNote);
+			chckbxVerif.setSelected(commandes.verifHisto2);
+			chckbxNoDetail.setSelected(commandes.noDetail);
+			chckPasDeProgression.setSelected(commandes.noAfficheProgression);
+			chckbxfichiersEtudiants.setEnabled(true);
+			chckbxZipfeedback.setEnabled(true);
+			chckbxnoFeedback.setEnabled(true);
+			chckbxNoNote.setEnabled(true);
+			chckCSVNotes.setEnabled(true);
+			chckbxVerif.setEnabled(true);
+			chckbxNoDetail.setEnabled(true);
+			chckPasDeProgression.setEnabled(true);
+			
+			if(commandes.nodeCSV!=null) {
+				if(commandes.nodeCSV.getAttributs().get("nameListStudent")==null) {
+					commandes.nodeCSV.getAttributs().put("nameListStudent","?");
+					commandes.nodeCSV.getAttributs().put("year", "?");
+					lblListe.setText("<html><b>Liste ???</b></html>");
+				}else {
+					lblListe.setText("<html><b>"+commandes.nodeCSV.getAttributs().get("nameListStudent")+"</b></html>");
+				}
+			}else {
+				lblListe.setText("<html><b>Liste ???</b></html>");
+			}
+			
+			txtpnmessages.afficheChargementFichierAnalyse();
+		}
+		
+		String  nameEvaluation = commandes.NameEvaluationCharger;
+		if(nameEvaluation.length()>44) nameEvaluation = nameEvaluation.substring(0, 44) + "<br>" + nameEvaluation.substring(44, nameEvaluation.length());
+		
+		String nameDossierAnalyse = commandes.path.substring(commandes.path.lastIndexOf("\\")+1,commandes.path.length());
+		if(nameDossierAnalyse.length()>44) nameDossierAnalyse = nameDossierAnalyse.substring(0, 44) + "<br>" + nameDossierAnalyse.substring(44, nameDossierAnalyse.length());
+		
+		String nameFichierAnalyse = commandes.analysis_filename;
+		if(nameFichierAnalyse.length()>44) nameFichierAnalyse = nameFichierAnalyse.substring(0, 44) + "<br>" + nameFichierAnalyse.substring(44, nameFichierAnalyse.length());
+		
+		if(commandes.NameEvaluationCharger!=null) lblNameEvaluation.setText("<html>Évalution :<br><b>  "+ nameEvaluation +"</b></html>");
+		if(commandes.path!=null) lblPath.setText("<html><p>Dossier de l'analyse :<br><b>  " + nameDossierAnalyse + "</b></p><hr></html>");
+		if(commandes.analysis_filename!=null)  lblFileAnalyse.setText("<html>Fichier de l'analyse :<br><b>  " + nameFichierAnalyse + "</b></html>");
+		
+	}
+	
+	
 	
 	/**
 	 * 
@@ -561,87 +589,6 @@ public class evaluate extends JFrame {
 		       }
 		   };
 		   
-		   
-			   
-		   
-		   
-		   
-//	   /**
-//	    * Gènère un nouveau fichier d'analyse à partir d'un fichier ODF
-//	    */
-//	   private AbstractAction actNewFichierAnalyse = new AbstractAction() {  
-//
-//		private static final long serialVersionUID = 1L;
-//
-//		{
-//			putValue(Action.LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/fichierODF.png")));
-//			putValue( Action.NAME, "Génère un nouveau fichier d'analyse" );
-//	        putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierODFmini.png")) );
-//	        putValue( Action.MNEMONIC_KEY, KeyEvent.VK_N );
-//	        putValue( Action.SHORT_DESCRIPTION, "Générer un nouveau fichier d'analyse (CTRL+N)" );
-//	        putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_N, InputEvent.CTRL_DOWN_MASK) ); 
-//	       }
-//	       
-//	       @Override
-//	       public void actionPerformed( ActionEvent e ) {
-//	    	   JFileChooser chooser = new JFileChooser();
-//				chooser.setDialogTitle("Choisir un fichier ODF");
-//				
-//			    chooser.setCurrentDirectory(new java.io.File(calc.commandes.path));
-//			    chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
-//			    FileNameExtensionFilter filter = new FileNameExtensionFilter("Format ODF", "odt");
-//			    chooser.setFileFilter(filter);
-//			    chooser.setAcceptAllFileFilterUsed(true);
-//
-//			    if (chooser.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
-//			      System.out.println("getCurrentDirectory(): " + chooser.getCurrentDirectory());
-//			      System.out.println("getSelectedFile() : " + chooser.getSelectedFile().getAbsolutePath());
-//			      	calc.commandes.path = chooser.getCurrentDirectory().getAbsolutePath();
-//					calc.commandes.PathFilenameAnalysis =  chooser.getSelectedFile().getAbsolutePath();
-//					calc.commandes.nameSujet = chooser.getSelectedFile().getName();
-//					
-//					Run b = null;
-//					try {
-//						b = new Run(calc.commandes.PathFilenameAnalysis);
-//						nodeAC nodSujet = Run.XMLContent(b.getLectDossiers().getEC().getListeContentWriter().get(0));
-//						
-//						nodSujet.supprimeTousLesNodesEnfantWithThisName("text:change-start"); //historique des modification
-//						nodSujet.supprimeTousLesNodesEnfantWithThisName("text:change-end");
-//						
-//						calc.commandes.sujetSauvegarde = nodSujet.clone();
-//						
-//						nodSujet = meptl.LectureFichierEtudiantSousFormeDeNode(nodSujet,b,0);
-//						nodSujet.getAttributs().put("analysis_filename","sujet.xml");
-//						nodSujet = ecritureSujet.nodePourEcritureSujet(nodSujet,b,0);
-//						Run.ecritureNodeEnXML(nodSujet, "sujet",calc.commandes.path,"Sujet");
-//						txtpnmessages.setContentType("text/plain");
-//						txtpnmessages.setText(Run.ecritureNode(nodSujet, 0).toString()
-//								+ "\n\n"
-//								+"\n*************************"
-//								+"\nLe fichier sujet.xml a été généré dans le dossier :"
-//								+"\n" +	calc.commandes.path
-//								+"\n*************************");
-//						calc.commandes.sujet = nodSujet;
-//						new verificationFichierAnalyse();
-//
-//					} catch (ParserConfigurationException | SAXException | IOException | CloneNotSupportedException e1) {
-//						e1.printStackTrace();
-//					}
-//					
-//			    } else {
-//				      calc.commandes.nameSujet = "";
-//				      calc.commandes.PathFilenameAnalysis =  "";
-//				      System.out.println("No Selection ");
-//				      calc.commandes.fichierAnalyseValide=false;
-//				      refreshLabel();
-//			    }
-//				
-//			
-//				calc.commandes.ecritCode = true;
-//	       }
-//	   };
-	   
-	   
 	
 	   /**
 	    * Information sur le fichier d'analyse	   
diff --git a/src/fenetres/mainApp.java b/src/fenetres/mainApp.java
index 8d17ded..84ec792 100644
--- a/src/fenetres/mainApp.java
+++ b/src/fenetres/mainApp.java
@@ -18,10 +18,13 @@ import javax.swing.UIManager;
 
 import actions.actExit;
 import baseEvaluation.CreerBaseParDefautEvaluation;
+import baseEvaluation.recupeNodeBaseEvaluations;
+import baseEvaluation.validatorBaseEvaluation;
 import baseListesEtudiants.CreerBaseParDefautListesEtudiants;
 import onLine.verificationNewVersion;
+import calc.*;
 
-public class mainApp extends JFrame implements ActionListener{
+public class mainApp extends JFrame {
 
 	 
 	/**
@@ -112,7 +115,6 @@ public class mainApp extends JFrame implements ActionListener{
 			btnCreate.setHorizontalAlignment(SwingConstants.LEFT);
 			btnCreate.setIcon(new ImageIcon(mainApp.class.getResource("/resources/fichierAnalyseModif.png")));
 			btnCreate.setFont(new Font("Arial", Font.BOLD, 16));
-			btnCreate.addActionListener(this);
 				
 			btnCreate.setBounds(10, 208, 494, 60);
 			getContentPane().add(btnCreate);
@@ -122,10 +124,15 @@ public class mainApp extends JFrame implements ActionListener{
 			actCharge.setHorizontalAlignment(SwingConstants.LEFT);
 			actCharge.setIcon(new ImageIcon(mainApp.class.getResource("/resources/evaluate.png")));
 			actCharge.setBackground(SystemColor.inactiveCaption);
-			actCharge.addActionListener(this);
 			actCharge.setFont(new Font("Arial", Font.BOLD, 16));
 			actCharge.setBounds(10, 137, 494, 60);
 			getContentPane().add(actCharge);
+			if(LaBaseEvaluationsExiste) {
+				actCharge.setEnabled(!validatorBaseEvaluation.isVide());
+			}else {
+				actCharge.setEnabled(LaBaseEvaluationsExiste);
+			}
+			
 			
 			JLabel lblNewLabel = new JLabel();
 			lblNewLabel.setIcon(new ImageIcon(mainApp.class.getResource("/resources/accueilanalysecalc.png")));
@@ -153,7 +160,7 @@ public class mainApp extends JFrame implements ActionListener{
 			btnTutoriels.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
 					 try { 
-				         String url = "https://www.youtube.com/channel/UCG3tJWp_oZvOumH5kWUJ55g";
+				         String url = "https://sites.google.com/view/analyseWriter";
 				         java.awt.Desktop.getDesktop().browse(java.net.URI.create(url));
 				       }
 				       catch (java.io.IOException e1) {
@@ -173,6 +180,27 @@ public class mainApp extends JFrame implements ActionListener{
 			lblpath.setBounds(10, 340, 494, 30);
 			getContentPane().add(lblpath);
 			
+			
+			actCharge.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					new recupeNodeBaseEvaluations();
+					if(commandes.evaluationsBase!=null) {
+						new chargeBaseAuDemarrage();
+						dispose();
+					}else {
+						evaluate.getInstance();
+						dispose();
+					}
+				}
+			});
+			
+			btnCreate.addActionListener(new ActionListener(){
+				public void actionPerformed(ActionEvent e) {
+					create.getInstance();
+					dispose();
+				}
+			});
+			
 			addWindowListener(new java.awt.event.WindowAdapter() {
 			    @Override
 			    public void windowClosing(java.awt.event.WindowEvent windowEvent) {
@@ -184,19 +212,6 @@ public class mainApp extends JFrame implements ActionListener{
 		}
 
 
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			 if(e.getSource()==btnCreate) {
-				create.getInstance();
-				dispose();
-			 }
-			 
-			 if(e.getSource()==actCharge) {
-		        new evaluate();
-		        dispose();
-		     }
-			 
-		}
 
 
 }