%$5ui
O%vKCC%r=wr*`fhXr3wE4
delta 59
zcmX@bdy03%M^;%?22N%z23clp232Mq21{mL1{Y>M1|Md9hA3v$$$V@fye156%%%(y
O%w`NS%odaL*`fhSRSC}k
diff --git a/bin/fenetres/evaluate$10.class b/bin/fenetres/evaluate$10.class
index ec1fe024632a5faf055865fa6cca22e9133f022f..16427ad87344219bb54848f7831b694a7756fd08 100644
GIT binary patch
delta 59
zcmV-B0L1^X46zKbc?BK500{)c01*Vl03`&)067H407L}G089kP09pjTla>WW4a@)p
R1kC^n1kL~s1kaP{1xWab5eWbQ
delta 59
zcmV-B0L1^X46zKbc?BJ|00{)U01*Vd03`&y067G{07L}8089kH09pjLla>WW4a5Kh
R1jPUf1jYak1jm!<1xW4b5UBtF
diff --git a/bin/fenetres/evaluate$11.class b/bin/fenetres/evaluate$11.class
index eb985f157c7286be5a7bf6660b5cfe089b5de9b8..aca2db755121ab91bb9e2ad69e5f3ed02058da37 100644
GIT binary patch
delta 1028
zcmZ8gU2IfU5dLO&&fdLuZ(?j+qG3HpdwZ94+`4yr~G3JrBMEhv(yLT$<54n=9`%_
zGv}U<%g4%%;hBLQ0G_1acH<5IL#^mHk;Rt;ttItzBA#p`cq5ff20p={iLdarv&COL
zcL+N*d_xF4x9o+6SahA$VJA%Na)$h+W#5|k4&M{>=Ju}6WJ^tbBY~Q9l;H;xdok?X
z_Ae;@NqF1pwxet9bqNFe@r#C^358BbFPvxMSJV@NDa)>DPuf<}ZrIRa`SH7x(4UX(
z$3YV#IR{M~8YGEcAr_CZw*`_^a_~
ze7zm5X-~9w8W_hV6DB6*j7V*5ZDpf@DO}ZXg%Hm9c1Kg|TaqtFpN+-WSTd(+Tyrvk
zh`J#K$KIVRDw)E;T*z$`chD`9k-q9W;;(c`&v!HVW`;^fpz|p5c?|RU2&(xgmhv&g
z_&Az)#5s}op#DBID1bIOdT^a~3=9
z(F5EIjWgIiyDQ=k@jx1T!aus$m(#zwIM9ccY3$yLNADvB@#d;54rMXckGHcp=JsHV
zi(WS;52Ud%{I`qu`cQCRNchx$)ES}fC9F*2+#tqRg(CU*A{6PzMHiRF7QXJ{rf7C?
zs}Es8UO_oxMu_e54|}mpuMgorAn||s;!#6GpxWf
zvXk4Bw;~_>w2?gIg$GsiA~7lHZZme0k2Em(#kClL8En(AQbRL^3bat^k~ue_EeHy)
b3-2L=$^!yeULMF4WJqEXEsOF*cu@8)5=Sd}
delta 978
zcmYk5U2IfU5XXPBJ-2u7-OExITT{|X8&k7QqZ>o9F+`1lf|Uv+B{lG%*_yj_v9zVT
zNE1K$U{s!r=K7)ui5Qc{7){uc+d{Q`sc4nT_m@SW$Y-Io1youno-Hq&hnYF&KQm{}
zf6fe+epPDsPwnUfo)dek{Z6pzYq}kJ*e=XitT6BS
z>6^S*sL=b;E|4Lw*M437CCv5u0*{2A$QFLl;S!gNXi?#6vSMxN^4R3!aYTVKfuKjo{
zzi5<$*^vJnZqu%r(GOeR8ehM`4KmqP;dDvy0G2w;EOmr3b(E*oF&3%g)T$G#Rs-JT
zjJeiZm>3}Iy+^}~0*rgfaJ>|HyTSz>{!^-l9T_@(e6hT&
zMo3;Z9C^hEOWc?#jYgid8naof3$48036}7J-nHtcaEH4HK}j;jJpxq9GkPraJh6#y
zBp^8`QQG-o>?t;zEHz0;o|#u%HFE;9BCKKET>_FTrq)XTN+hT)Tc;JR^%6^q044te
Dvq&FG
diff --git a/bin/fenetres/evaluate$12.class b/bin/fenetres/evaluate$12.class
index 286eb0dfdd32509eefb5d99ba5cbeb5f285d4fd9..66501fdf5cf74ef14cffdd29bc04f0461877704d 100644
GIT binary patch
delta 75
zcmdllxLOW231yV21`~Q1{YRc1|L?H$=BJ-6pa{oS&bQlSxp$k
fSxp(_SOu231xi21{0D1{YQp1|L@G$=BJ-6g3%mS+y91S+yC&
fS#=oXS#=rIS@jt7S@jvrSPdBLSdAy=aRdSY-LeaI
diff --git a/bin/fenetres/evaluate$13.class b/bin/fenetres/evaluate$13.class
index ab2c0e36971f4f0f2ad63d7a172d44b7a0866f00..1fe79221244b99483609f0fefcba7977f0f8c21e 100644
GIT binary patch
delta 128
zcmca9byI4?Q!Yto22NHF20>O&231xs21{0N1{YQz1|L@E&HuO@7()XYI9P)i_*jD(
z#92caR9Hh9j99}M99Y8{{8%FyLRq62l38OIGFW37I#}Zv7O}=N>|sq{xC!LnVNGIq
g#hSwKi8YnsD{C6VU)Bsp2G&eQ4%Y0+lX;E-0Lqvh5&!@I
delta 128
zcmWN^I}QO+0EW^37GE+ZB2kH{*?`V8u1Dc9CWK1_AvBhvpB-3%M60%kn`kvkiIQ--
z<0BuPA7MFGj)sa@RcWeDOC8!uh%evJ8rM}oPX+oaF;Im>HHNaJN*T#9)}DzDOm)QR
e#7tM_^8epi=*dzqR(iA6hm8?i6R^v&{Ot#esvHdf
diff --git a/bin/fenetres/evaluate$14.class b/bin/fenetres/evaluate$14.class
index c34df8e09ffdca6d8a5d1eed9ad81e3ea5b15ad6..a7cb6a336a73a02a8b8bc299f9aaa00d0164d47c 100644
GIT binary patch
delta 75
zcmdliv{`6_I)`it11D=GgCJ`agDPt^gC%PXg9~ddgAZ#RLlkStWEYMG*(L@y)@BAi
e))od`)>Z~n);0zU)^-L5)(!>_)~?A9If4LbrVyzB
delta 75
zcmdliv{`6_I)`jF11D<%gCJ`mgDPtggC%P*g9~d3gAZ#dLlkTFWEYMG*-8dB)+z=*
e)@lY_)*1#=)>;M&);b0U)_MjH*2c*XIf4LHW)K+w
diff --git a/bin/fenetres/evaluate$2.class b/bin/fenetres/evaluate$2.class
index d73bf876ada8d61b917f584091f1cfd36b5006da..1e4d367cc5a119cdbfab666427092aed58818a51 100644
GIT binary patch
delta 55
zcmaFP{hWJ)1*@zJ11Ga5gDkTbgDSH(gC(;MgA21SgAcPGLlm>ie&R_;M<`AH&
J(8=>zJpeTN3Wfjx
delta 55
zcmaFP{hWJ)1*@zB11Ga9gDkTfgDSH-gC(;EgA21KgAcP8Llm>aePJaeA<^Z6o
Jz{&GjJpeFn3R(aF
diff --git a/bin/fenetres/evaluate$3.class b/bin/fenetres/evaluate$3.class
index 015ccdeadd034f119994de521ec0a7418b63ddd6..f3a00cdb3cb27b2964cea7037dd683deaae55f83 100644
GIT binary patch
delta 123
zcmWN{y9$8;0D#f2zQv`?1_pySuvkno@d8qEUC1r>TTv#1;a`=-q70Nb@eDQ(!I{rH
z{*FIRkz|FiHImjz+aPO`ye*2hDO(Bdk#DI($SyH^BtKt;DoAER?av$
a=jejKC1+P$Tyu59%`H!Nyxa$$XzvG{jvZtG
delta 123
zcmWN{s}6wy0D#eN`-;mZ3k1O%D2ikf-E6Lfxy}7Lnj{E+wJC~CVDl!PLGuuteBSYQ
z{BepT%Y?0xv_{%GSsUbSQnW?Ia&V7)OKn1Sh}k7!kCc5f4*qjU&JhL2)Sa+(%E1{&
Y=L9Y|yX4}Et7~pu(fQ7{-6o)7{yfju5sDE)pRTnn18wBOipH`Qrw8UI~wb8h5X1?Xd=|lw;+(QqL7~Ijh65A6>mY%z4dZAN3j$
z&$nFPke+XtyvbX^{>TGM-sXVLI~sLcnzyA}Q+;;7@0h$RBW^_=TN>ki4a2vKeyZQG
zvN?kxhIKyBXb6r)8X_hi5(I~$P0^1`4)bv^8(r0Sgim#jil#e?+I%;g>w2P)bvkX=
z9r(bh1BSN$JoXNLg
z>cW2M@3;9@rZ??c87UeGi@w)b7Bt0|)ft=$&p&7+gKhC-BF1Trc=f%y{XQo~IrvN8
zs+|ee$JQ>dNLJqMN)`K@lxG!FZ5wv{H&16W7>*^isbC~#FZLhQNc_+Ebhm3;o#S=!
zc5VA8adnz|)fkPc%)@G&C)F8R)me6_Q8vowV4}(1P79j^HJ;*W*%t^MCQ7ZuhHA&z
zES1leNmtl$6el=u+%q^$e&;m)&N2fN?497{XPPR!I?3yk?3Y;Ly$S~f%N(lkNrf-&
zukclgHCqIamskJbTB@TXXkN(!P^(-s(~JH
zIy}4Lu%cN+?_x2ibJVISVrrU2>VjA>!y0vwb?Oou)MZ-K6}GCYw5x0EROZ+Uc-YUB+%&W31!mdi61d+e#&^ghfGa~DhzEJM3$xRKjToz=;1rX%KToOlyE{ow#(7rcG^39otoc_Q|RMEVpW-d!cyl^Pq!y*5A~>l
z!}h(7c2x^@HFyHP9c4`>^6EF^49@bHvCJytyZ}Y>g*AJp-=hW;4B(Q4i~OgU&n{z-
z{}H!{LuOpXHC`!|iZ^ge!cE>L6|!M)-X|4T4B(C#cQGhH3i&iQSt)44eKQ`wBEabN
z2SYvuqj)6YA^$E}H$B$Rb2_`!fObIhc#pZeJYI?z(<7b=DB>|wk*r``|9;NPW!t)!
z0!*12k7yl!8ByLW*9)(CRNf{`@E@|RU`l{R@7b;f?X~reu$N|{1_Kge++y-2hfN0s
zTNEZX0UMh{37f)pHjP~@1}BT-5Q}m#dt-qL5sc>EYe=GwC9y97cM8oTXyVn`1^sDg
zX@nCvop&yU3&aGjq;Nfj+Z8F?i=f;^9Eo7F&LJ!P5x#=}
diff --git a/bin/fenetres/evaluate$6.class b/bin/fenetres/evaluate$6.class
index c3829febbfd091e7c6d7f4dbeb1ab0c640f4ccfe..198db4400cfd086a4763aa9e0824d8565f4d126c 100644
GIT binary patch
delta 209
zcmV~$J4-?V00rQ4I;T?Z?LlFZb-9p4gJU2#1=1Keo4=sFXbD0J8im?|{y|U>(c;?R
zD6~0fkEOJC6h%_sSBIm-w^-2~R@FMogdEtu$B-Tns*99*
znAIa4ePcsE*wHU)>f=a%I5*HVab=-rGvPr7
z9%j}FE;-4f1C||f-6P!e7`Hsm-8oNi&y%b<#eGll&}klfnkUZi!ZU0*I;f9c{sT;6
BGcEuC
delta 209
zcmV~$O)J9z00!{q@jPt&XPULkvi@bs!BMStQp-^}&pv@WxhO5lam7vf25L%jadmK9
zQ}eQmcV-b;h&8`oIV^|!-5^uPpc=^N922@gUYD5F73S2$g6aq982i?)F`yg7bc>Yk
zFs6HidO%i>nA8)d^o(h>kkbnaYGYonDCrH0ddIRpu&z&3)WNR4aHwz8^n)|~qOCth
z)n%X_vj%5O7AzKRF1ep8j&RjcZj5_~n+{mz12#z&22K`D20<1r22~bq1_Kry1`8Hl1~(R!$v@eW1PvM3Sd18WSd1C?
PSxgwTSj;Equm=GEPSpx0
delta 59
zcmdnTzmI>z12#z+22K`520<1j22~bi1_Krq1`8Hd1~(R&$v@eW1T`7hShN^;ShN}V
PS#%h*SoA07um=GEL`4b5
diff --git a/bin/fenetres/evaluate$8.class b/bin/fenetres/evaluate$8.class
index 2d24aa5756e1ec98aa6a9f6388f7dd4e9a51cc89..ddfceca3b5e56f270b127bfe41da597ce61c79f5 100644
GIT binary patch
delta 59
zcmbQtH<@pP51VWg11C#6gCI)>gDOiWgC$EBg9}SHgAYp&LljHXX8T3Sk`Wkf2w<6`QNP7_U<|1@f&rioT&(+{(=4$18QlH*ened(ZjYbI*PA
z?mNCwtk@(hM{geJCZbFPJ1r-ZVM2~J;emmcQE3)ri{Vk2q+Lu-%*+>bPpaS3SU=xi
z;b}~D`~3C3`os$`;PUw(pi#5$o!;wu7VG#4MPZ1PDq^O~eOcw?syUfvr+%VKQ^&l0M#R?lHY8M_IC-Stx
zS))XOHaRP0K#>kj)*PQi5POdKz+qD;CdE*6I{
zLpn2W5KVYeItw2cnet`YDH?XVgr}ra(Lh@;OS*p8NmZCFU4NXBFMW=5RyoH-nX;+z
zL^7{+=U8XCZKw*PCJ1ksmWL78OxB?I
zT{LHI$yj~1(pMzMkOo6Sh8#1b*AUH+GF`NNxno-v1@T;gBaG)`Tsz2lkZQ^th;fCn
zY(F)0QIicT!?f5D@nvf*@AO+lIAaysXTT*2oq*?=0lJyO1-+r6acr6}AMS
z70KmpFYmg0mMg}kBe!N1$)0;CAt<2tYr{s_s6%#U!)r!=VG$>L>O%$^$YzN+`;a&8
zK(wC8dYM>**(w>=U1i#OXmn5*K&d)`6OBS6by`Ycu<&2P#(#@J
z{ExVwZ-^w2Z~!6&ikOW^`H`E%E|^6JEaDtgCiLS(^ygeyxdpL(XD&gWr4%s*?~;#5
zGzl|yNhd@HoxpqAn7kCU<9)3Y>M%;uF6Z@{^)oIn6ltI3k1=&hn=dn_g0a?Y6mbJD;6=QITY1&LB;MFg
delta 1649
zcmZXUeNa?Y7{=f8J_{_%H5gYjR18A}c2{sTY;*{95S6bIK@&A~krmKoS(a5)Ow|0!
zvdoi8np$Q>h#I@i)zPf6W}HTcru?cTHME-S!yHrV57W->HEqV3JNJ3cdw%yl&$)BY
zUAhbl9Vu3(8K9IS6$6K-z-;My3^~c@z&I(c|8?o
z`;cwT3dx
zlDAS5g-a&b5{FcvDhic?tYNUKCVjlG%HuEg`&>@N&Y^{ZqP(G!+Y=2pJW;5YUR!_E
zz$=?fl#URb5WC*ROD-q)xGj-k7hUUW^oEsdM>rJkBz=tK1^4VWEaa@*i7@
zX|aaqWU9SSe4~b?)FLR-?ebLkD=p;1at+U8g`8omNKS7e*rW_ne_26@5$hTBku(^S
zDGMto56v_QC#lTTn>?mPw8*rDR+)6#VETf#NA#kWh~cD1%nk0&?1AVQil8_m+zB2Z
z;eeS6OS=jyMoTSwxELeHW)BhLWJ7jZx4cr@eiZ1?;$sipg$m{2>?BN}lHjH6E~4>C
zZbdflK_Tx$3Adq~16aU8Ea4BahIKUYezfud=zI`|`6IORVVvb7xWb>}I)8@S{5g$Q
zU))Y34-X=T8tp|9o~Be1bOHl0UO5&qd>uu~K@_O|6O=OvcO^>{D;ptNcp^%aixlU%
zFD5D%#l6KPOj6Fwe3TLc0-?NCNEOtkl3B6Q$ft{Vl_`vL
zH;~N=v4@e@|3gX?vp&ppHJGi6aXipw+ff=C5JwE;O@#!oO
z3cg6|_!4d6A7}^vNX`5cwein%fG^W0{0klBU#Xpcqf`7lb?_Cs$bZmfzDig58r>}C
zKZS*_3oG9cJ^7|c;J-vaz9npYN2Gzo46vvNL^C2pD
zb$Zgo1neR&k*F8Zct<%QTIm$tl@+;Zcn{68DK{y$dzfc+7NhY#TI8|ZeyIs$LZ5J5
zQzw(uKV$$UD+P9|JEIkQRM(!ABzxp_iaaUupNQJ4X2z+?i2Pw)^0=1ga|18smAv*}
DSS85N
diff --git a/src/MEPTL/VerificationHistorique.java b/src/MEPTL/VerificationHistorique.java
index 29edf04..6397825 100644
--- a/src/MEPTL/VerificationHistorique.java
+++ b/src/MEPTL/VerificationHistorique.java
@@ -61,8 +61,10 @@ public class VerificationHistorique {
int compteurnombreCorrespondancesconsecutive = 0;
// Affichage
- txt.setText("Analyse du fichier " + i + " / " + nbFichier +"\n"
- +LesFichiers.get(i).getAttributs().get("dossier") + " - number of modifications : " + nombreModifications);
+ String AffichageMessageEcran = "Analyse du fichier " + i + " / " + nbFichier +"\n" + LesFichiers.get(i).getAttributs().get("dossier") + " - number of modifications : " + nombreModifications;
+
+ txt.setText(AffichageMessageEcran);
+
commandes.message.append("\n"+LesFichiers.get(i).getAttributs().get("dossier") + " - number of modifications : " + nombreModifications);
@SuppressWarnings("unchecked")
@@ -185,6 +187,8 @@ public class VerificationHistorique {
// Rechercher les correspondances
for(int i2 = 0 ; i2 < LesFichiers2.size(); i2++) {
String nameStudent2 = LesFichiers2.get(i2).getAttributs().get("dossier");
+
+
ArrayList HitoriqueDuFichier2 = LesFichiers2.get(i2).retourneEnfantsByName("text:changed-region", new ArrayList());
for(int j2 = 0 ; j2 Dossier contenant les fichiers des étudiants.
");
commandes.message.append("" + commandes.path + "
");
commandes.message.append("
");
+
if(commandes.analyse_baremeABC) {
commandes.message.append("Barème alphabétique ABCDE.
");
commandes.message.append("
progression=" + String.valueOf(commandes.analyse_progression) + "
");
@@ -49,14 +50,17 @@ public class evaluerLesFichiersEtudiants implements Runnable{
commandes.message.append("
" + C.getMessageLigne() +"
");
commandes.message.append("
");
}
+
if(commandes.zipfeedback) {
commandes.message.append("Les feedbacks sont dans une archive ou des archives ZIP dans le dossier contenant les fichiers des étudiants.
");
commandes.message.append("
");
}
+
if(commandes.ecritNoteCSV) {
commandes.message.append("Un fichiers CSV contenant les notes a été créé dans le dossier contenant les fichiers des étudiants.
");
commandes.message.append("
");
}
+
commandes.message.append("
");
Run a = null;
diff --git a/src/fenetres/evaluate.java b/src/fenetres/evaluate.java
index d379a06..65341a3 100644
--- a/src/fenetres/evaluate.java
+++ b/src/fenetres/evaluate.java
@@ -680,6 +680,10 @@ public class evaluate extends JFrame {
toolBar.add(btnEvaluerLesFichiers);
JButton btnVerifHistorique = toolBar.add(actVerifHistorique);
+ btnVerifHistorique.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ }
+ });
btnVerifHistorique.setIcon(new ImageIcon(evaluate.class.getResource("/resources/verifhistorique.png")));
btnVerifHistorique.setHideActionText(true);
toolBar.add(btnVerifHistorique);
@@ -952,6 +956,10 @@ private AbstractAction actOpen = new AbstractAction() {
try {
msgBox V = new msgBox("Je travaille dure.",false,false,"Attendez");
Thread.sleep(100);
+
+ Thread t2 = new Thread(new evaluerLesFichiersEtudiants(txtpnmessages));
+ t2.start();
+
meptl.analyseVerifieHistoriqueLesFichiersEtudiantsEtExportNoteCSV(fenetres.evaluate.getTxtpnmessages());
txtpnmessages.setContentType("text/plain");
txtpnmessages.setText(commandes.message.toString());
@@ -1260,6 +1268,7 @@ private AbstractAction actOpen = new AbstractAction() {
commandes.nodeCSV = new node("fileCSV");
}else {
if(commandes.nodeCSV.getNomElt()==null) commandes.nodeCSV.setNomElt("fileCSV");
+ if(commandes.nodeCSV.getNomElt().isBlank()) commandes.nodeCSV.setNomElt("fileCSV");
nbrStudent = commandes.nodeCSV.getNbrEnfants();
}