From 0dbaeeefa522036ca5aa24b5cac3fd650e313161 Mon Sep 17 00:00:00 2001 From: pablo rodriguez <58742538+1-pablo-rodriguez@users.noreply.github.com> Date: Tue, 17 Dec 2024 16:46:28 +0100 Subject: [PATCH] maj --- ana.xml | 2 +- base_evaluations_analyseCalc.xml | 2 +- .../Classeur2$feuille$colonne.class | Bin 3657 -> 3657 bytes .../Classeur2$feuille$graphic.class | Bin 25656 -> 25656 bytes ...ur2$feuille$ligne$cellule$validation.class | Bin 3748 -> 3748 bytes .../Classeur2$feuille$ligne$cellule.class | Bin 15317 -> 15317 bytes bin/AnalyseCalc/Classeur2$feuille$ligne.class | Bin 6461 -> 6461 bytes bin/AnalyseCalc/Classeur2$feuille.class | Bin 12878 -> 13743 bytes bin/AnalyseCalc/Classeur2$historique.class | Bin 7565 -> 7565 bytes bin/AnalyseCalc/Classeur2$modification.class | Bin 2498 -> 2498 bytes bin/AnalyseCalc/Classeur2.class | Bin 21356 -> 23228 bytes .../chargementParametresFichierAnalyse.class | Bin 5585 -> 5651 bytes bin/calcul/formatDateWriter.class | Bin 2781 -> 2826 bytes bin/fenetres/create$1.class | Bin 1288 -> 1288 bytes bin/fenetres/create$2.class | Bin 1521 -> 1521 bytes bin/fenetres/create.class | Bin 18242 -> 18242 bytes bin/fenetres/proprieteFichierAnalyse.class | Bin 18850 -> 18850 bytes ensembleResultats.csv | 87 ++++++++++ src/AnalyseCalc/Classeur2.java | 159 +++++++++++++++++- .../chargementParametresFichierAnalyse.java | 2 + src/calcul/formatDateWriter.java | 4 +- src/evaluer/evaluerNodesClasseurStudent.java | 2 + src/fenetres/create.java | 5 +- src/fenetres/proprieteFichierAnalyse.java | 1 + src/xml/node.java | 18 ++ sujet.xml | 2 +- 26 files changed, 270 insertions(+), 14 deletions(-) create mode 100644 ensembleResultats.csv diff --git a/ana.xml b/ana.xml index 45cc51f..d7a6611 100644 --- a/ana.xml +++ b/ana.xml @@ -1 +1 @@ -Alex Marechal;20.0;1.0Alexandre Berthelin;7.142857142857143;0.35714285714285715Alexis Legrand;20.0;1.0Alexy Lefebvre;19.870129870129873;0.9935064935064936Amelie Bruniaux;20.0;1.0Anais Blondel;18.571428571428573;0.9285714285714286Anais Najdecki;6.753246753246753;0.33766233766233766Antoine Duponchelle;12.467532467532468;0.6233766233766234Antoine Ponchel;13.506493506493506;0.6753246753246753Apolline Michel;19.870129870129873;0.9935064935064936Arthur Willart;12.077922077922079;0.6038961038961039Aurelien Ben Yahia;19.870129870129873;0.9935064935064936Axel Aoumat;11.03896103896104;0.551948051948052Axel Cadart;13.506493506493506;0.6753246753246753Aymeric Grenier;20.0;1.0Baptiste Fynnaert;7.272727272727273;0.36363636363636365Charles Carron;12.077922077922079;0.6038961038961039Chloe Mazur;20.0;1.0Clara Bruneau;10.649350649350648;0.5324675324675324Clement Legrand;19.870129870129873;0.9935064935064936Cyril Massart;12.077922077922079;0.6038961038961039Doriane Bernard;19.74025974025974;0.987012987012987Elliot Pilawa;2.207792207792208;0.11038961038961038Elodie Vaesken;12.337662337662339;0.6168831168831169Enora-Lou Deplanque;10.38961038961039;0.5194805194805194Esteban Devos Devulder;9.35064935064935;0.4675324675324675Gabriel Humain;20.0;1.0Helene Adjal;12.467532467532468;0.6233766233766234Hugo Guffroy;19.48051948051948;0.974025974025974Imen Belaiche;13.506493506493506;0.6753246753246753Ines Aubier;8.441558441558442;0.42207792207792205Ines El Karami;20.0;1.0Issam Benzemra--Petit;20.0;1.0Jane Gosset;19.870129870129873;0.9935064935064936Jeremy Legros;11.03896103896104;0.551948051948052Julie Rohart;12.207792207792208;0.6103896103896104Justine Bertin;10.779220779220779;0.538961038961039Justine Mikolajczak;12.077922077922079;0.6038961038961039Lali Vin;19.870129870129873;0.9935064935064936Lea Denys;19.870129870129873;0.9935064935064936Leo Marin;13.506493506493506;0.6753246753246753Lilian Lamorille;16.883116883116884;0.8441558441558441Lisa Baran;20.0;1.0Lucas Canon;20.0;1.0Lucie Delong;18.7012987012987;0.935064935064935Luna Hemery;13.506493506493506;0.6753246753246753Maeline Humez;19.870129870129873;0.9935064935064936Manon Cassel;13.506493506493506;0.6753246753246753Martin Pilot;18.7012987012987;0.935064935064935Mateo Darras;12.077922077922079;0.6038961038961039Matheo Guerineau;19.870129870129873;0.9935064935064936Matheo Normand;20.0;1.0Mathilde Carlier;6.883116883116883;0.34415584415584416Mathilde Konury;13.376623376623375;0.6688311688311688Mathis Carlier;19.870129870129873;0.9935064935064936Mathys Calesse;12.207792207792208;0.6103896103896104Mehdi Boutchich;11.948051948051948;0.5974025974025974Melanie Bouchoir;13.376623376623375;0.6688311688311688Melusine Miletti;12.727272727272727;0.6363636363636364Mickael Lenclud;6.233766233766234;0.3116883116883117Noah Desfachelles;7.142857142857143;0.35714285714285715Noah Halluin;1.8181818181818183;0.09090909090909091Oceane Decroix;9.61038961038961;0.4805194805194805Pablo Rodriguez;18.571428571428573;0.9285714285714286Quentin Stautemas;13.506493506493506;0.6753246753246753Raphael Rivaux;10.0;0.5Remi Delaval;11.948051948051948;0.5974025974025974Remi Delvalle;13.376623376623375;0.6688311688311688Remy Maeght;10.51948051948052;0.525974025974026Romain Bruni;19.870129870129873;0.9935064935064936Romain Delrue;13.376623376623375;0.6688311688311688Ronan Bourdrel;13.376623376623375;0.6688311688311688Simon Ducrocq;20.0;1.0Solene Marien;20.0;1.0Stefan Gaudin;10.0;0.5Tanguy Delavier;18.7012987012987;0.935064935064935Theo Duprez;12.077922077922079;0.6038961038961039Theo Justin;12.207792207792208;0.6103896103896104Theo Rouze;20.0;1.0Theo Verlet;13.376623376623375;0.6688311688311688Thomas Renard;12.207792207792208;0.6103896103896104Thomas Thevenin;11.948051948051948;0.5974025974025974Tristan Quesson;6.883116883116883;0.34415584415584416Tyffene Viseur;13.506493506493506;0.6753246753246753Vytto Scilironi;11.03896103896104;0.551948051948052Yvonnick Levis;20.0;1.0 \ No newline at end of file +Alex Marechal;8.0;1.0Alexandre Berthelin;6.331623931623931;0.7914529914529914Alexis Legrand;7.2615384615384615;0.9076923076923077Alexy Lefebvre;7.288888888888889;0.9111111111111111Amelie Bruniaux;7.726495726495727;0.9658119658119658Anais Blondel;6.714529914529915;0.8393162393162393Anais Najdecki;6.2905982905982905;0.7863247863247863Antoine Duponchelle;6.276923076923077;0.7846153846153846Antoine Ponchel;7.589743589743589;0.9487179487179487Apolline Michel;7.07008547008547;0.8837606837606837Arthur Willart;6.413675213675214;0.8017094017094017Aurelien Ben Yahia;7.1521367521367525;0.8940170940170941Axel Aoumat;4.4854700854700855;0.5606837606837607Axel Cadart;7.2615384615384615;0.9076923076923077Aymeric Grenier;7.726495726495727;0.9658119658119658Baptiste Fynnaert;7.2615384615384615;0.9076923076923077Charles Carron;6.55042735042735;0.8188034188034188Chloe Mazur;7.589743589743589;0.9487179487179487Clara Bruneau;5.2786324786324785;0.6598290598290598Clement Legrand;7.042735042735043;0.8803418803418803Cyril Massart;6.017094017094017;0.7521367521367521Doriane Bernard;6.878632478632479;0.8598290598290599Elliot Pilawa;4.658407079646017;0.5823008849557522Elodie Vaesken;6.441025641025641;0.8051282051282052Enora-Lou Deplanque;4.581196581196581;0.5726495726495726Esteban Devos Devulder;6.536752136752137;0.8170940170940171Gabriel Humain;7.288888888888889;0.9111111111111111Helene Adjal;6.276923076923077;0.7846153846153846Hugo Guffroy;6.427350427350428;0.8034188034188035Imen Belaiche;7.726495726495727;0.9658119658119658Ines Aubier;7.617094017094017;0.9521367521367521Ines El Karami;7.589743589743589;0.9487179487179487Issam Benzemra--Petit;7.671794871794872;0.958974358974359Jane Gosset;7.17948717948718;0.8974358974358975Jeremy Legros;5.032478632478632;0.629059829059829Julie Rohart;6.823931623931624;0.852991452991453Justine Bertin;6.933333333333334;0.8666666666666667Justine Mikolajczak;6.988034188034188;0.8735042735042735Lali Vin;7.562393162393162;0.9452991452991453Lea Denys;7.17948717948718;0.8974358974358975Leo Marin;7.097435897435897;0.8871794871794871Lilian Lamorille;5.264957264957265;0.6581196581196581Lisa Baran;6.960683760683761;0.8700854700854701Lucas Canon;7.671794871794872;0.958974358974359Lucie Delong;7.17948717948718;0.8974358974358975Luna Hemery;7.671794871794872;0.958974358974359Maeline Humez;7.562393162393162;0.9452991452991453Manon Cassel;7.726495726495727;0.9658119658119658Martin Pilot;6.851282051282051;0.8564102564102564Mateo Darras;6.358974358974359;0.7948717948717948Matheo Guerineau;7.206837606837607;0.9008547008547009Matheo Normand;7.671794871794872;0.958974358974359Mathilde Carlier;6.4683760683760685;0.8085470085470086Mathilde Konury;7.4393162393162395;0.9299145299145299Mathis Carlier;7.398290598290599;0.9247863247863248Mathys Calesse;7.124786324786324;0.8905982905982905Mehdi Boutchich;5.880341880341881;0.7350427350427351Melanie Bouchoir;7.220512820512821;0.9025641025641026Melusine Miletti;6.140170940170941;0.7675213675213676Mickael Lenclud;2.9168141592920356;0.36460176991150445Noah Desfachelles;5.798290598290598;0.7247863247863248Noah Halluin;3.157522123893805;0.39469026548672564Oceane Decroix;7.124786324786324;0.8905982905982905Pablo Rodriguez;6.769230769230769;0.8461538461538461Quentin Stautemas;6.5777777777777775;0.8222222222222222Raphael Rivaux;2.8034188034188032;0.3504273504273504Remi Delaval;6.65982905982906;0.8324786324786325Remi Delvalle;7.425641025641026;0.9282051282051282Remy Maeght;4.772649572649573;0.5965811965811966Romain Bruni;7.206837606837607;0.9008547008547009Romain Delrue;7.015384615384615;0.8769230769230769Ronan Bourdrel;7.617094017094017;0.9521367521367521Simon Ducrocq;7.316239316239316;0.9145299145299145Solene Marien;7.671794871794872;0.958974358974359Stefan Gaudin;4.3076923076923075;0.5384615384615384Tanguy Delavier;6.905982905982906;0.8632478632478633Theo Duprez;6.769230769230769;0.8461538461538461Theo Justin;7.124786324786324;0.8905982905982905Theo Rouze;7.671794871794872;0.958974358974359Theo Verlet;7.617094017094017;0.9521367521367521Thomas Renard;6.714529914529915;0.8393162393162393Thomas Thevenin;5.948717948717949;0.7435897435897436Tristan Quesson;6.208547008547009;0.7760683760683761Tyffene Viseur;7.288888888888889;0.9111111111111111Vytto Scilironi;5.894017094017094;0.7367521367521368Yvonnick Levis;7.17948717948718;0.8974358974358975 \ No newline at end of file diff --git a/base_evaluations_analyseCalc.xml b/base_evaluations_analyseCalc.xml index 620fbfd..52f35e1 100644 --- a/base_evaluations_analyseCalc.xml +++ b/base_evaluations_analyseCalc.xml @@ -1 +1 @@ - EJ €- €???Page 1(???)???, 00/00/000000:00:00Page 1/ 99 \ No newline at end of file + EJ €- € €- €???Page 1(???)???, 00/00/000000:00:00Page 1/ 99 \ No newline at end of file diff --git a/bin/AnalyseCalc/Classeur2$feuille$colonne.class b/bin/AnalyseCalc/Classeur2$feuille$colonne.class index 0ee05070d24b2887117b8c1c68a7f8cfd25ea2b3..aa33f5bd13bccedd3bd19220b0d1f809114f0226 100644 GIT binary patch delta 176 zcmX>pb5dplE0=By11C#013ya*gD6Wag91w{gDOiKg9%GJLl{d3Lj_AG!z`9AhCM9Z z4EI=iHXCtOF%R+|NEQ=WVS(Z+I z%DtR%<>X!-Th?_9tSsv%f8-UP{ESDRar0y`UR%~3K(U=*v3y>0#=Vo5^SZJg0*W05 HibVhbg;FuT delta 176 zcmX>pb5dplE0=CA11C!g13ybDgD6WHg91w)gDOitg9%FkLl{dTLj_9_!z`9!hCM7L z4EI<{Hyd$PFbUh&D#c=Q?POcvv{WnBmqTLc!%=QU?sHhDR(E9+{Y*czZ% F1OQjy%n* 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 RE=%gA#{|z_PAxR3>R)B1E9L+I diff --git a/bin/AnalyseCalc/Classeur2$feuille$ligne$cellule$validation.class b/bin/AnalyseCalc/Classeur2$feuille$ligne$cellule$validation.class index 5f23707179509667df5447ee8dd8ef21a22e66df..a5e067a7cc7ce51a2ae3d242346dd09a13cc2bd9 100644 GIT binary patch delta 221 zcmW;Ay-LGi97gfy|AwMDCb9Oz??kP(v7jgv3Q9l`-Na4k;N;-o=;-3=Aar;g9Sd%v zH{dl0-JBfV1ib*2E{7jykPg!4$B7%p)L>kPgt`FT5~)wD7ZMGb)H`K;QqdPxo1$hN z>UPSsoiSsV%-bCc_QaySk=i$ztFh#|EV~{n?wW>sVAZ{{=00c!j#iM72m7>xBQ|s; z$+x2WxlM)PuM(sxrdgaa0=3!l!>F*1FUN&-|6BLx@p@@TC3by3KCxo-e&XErM%qqt JJMg{a_z%HVCu{%! delta 221 zcmW;AD@%i69ES1x|2)3xeeZqW&BJ7Zn=sK$EP`NKFlZB-uwXJ6j7E#qAS^sa QQnBhl%W1`yLOtF50|`qtPXGV_ diff --git a/bin/AnalyseCalc/Classeur2$feuille$ligne$cellule.class b/bin/AnalyseCalc/Classeur2$feuille$ligne$cellule.class index b4098df8694e9447a139ee72afadb0818cec544b..d606db35ab115a8eadb84d03907ad516d8769517 100644 GIT binary patch delta 1214 zcma))=~LBp7{$Nq@19dJriPfkATzwA6Q;&q7ovZqJUzcAl?*QF*L4Q zRF+sl5n~fG>5P-wf*XljjH$U0*`zIMmNshGZ|+~V#n6GyD@R~Y2Z7^-cyhIOW*n)M2yJf*R)v-tlzD7Ei=ryyr>BR*w(0 zo^9CX*^duB9ry?qb?A+HB;sRa;8WzF5vBONsZUs;_3ge#X?t90dtGT?xzfINr8T?K z_KW2>C_cd<(TWyv9pA|i9F}otl^Hl9%W+iJ;h1c}ad`zNYiM*Wt!|{Fn+W|4sSofzJ@O>) z*XQ|wzRVzfm0k2*K4?7bYPzwT>B)zTm%%22JxnY^%ut4!QGC>7v$rW@m|4!grjlOs zKKnJD>Hn>KI8p?0fat|%gqP2XC=L|E7$wGVP}9z*=<&siFg`C*I8>xDK}_HotU?3kD6K)T?d8?Zz$zy@+%NVb0 z3(&2Y2ze?%Lt?}2S$B6XaKAJ*Qnm;31F>Ft(SJ2I-u~vczq@USKRGT!Uh^-EoBThq Cf<&GG delta 1214 zcma))`%l$%9L7J_?|I&BWXTA{iW%uaP@v>?xMYZdTmr>FxftRB$w0&_0m2b6ZBlBS zBB!k>wSh9!Nr7ovc|nE3OEEXm(2=!Vibi2+LEoLfz~5ebp6Bz+>+|j{>n%Gt?Bkfl z2mx#irZW!&GcSZNZ-lbv5yt#rW1)y-F^FPuc!eb)j?G0pvtu?ZLLys^BvyuGwhOPa zuaUwAFo#=^#{Dsmr{Xof3hDeKWbmVy&-<}JNMs5tvP2TH#d72bCl-nh2VNI_$Q7el zBz=%4QJH%pj7>U73w}#>Iqn_XJC!C zW3AqdGTnl5eI6Bh2$hB>))|qgGICLE)MCBSgc_q8wZO1#;i9;XOX5DxNrgV?hO2TcuE~k` zNd}=`hU2=7#SNK&0hx)PffM`)%H z6e}jvERjg@B8_H?3`!6clqf!-B=HR;i<^`pZd0nb=b$;#gXT&brO6nYC-W&?7E^{S zrTMao7RWu6DNj?D{Ef1e8|A1MXrW4{T(yuEsXWS4CA3)8lU=n_zPdsMYJ`^P=crJ} zQISreVx30I^ja#>J86YJPAhdMtasCg-h?b5rUb?KbH>=he_CzTJ5t%)=QFX5}BasK}%pE^0RE zW0RuwZl-CEGtc&v(>FYbf97gS!mWI-i(0~c^?q}4z_qwzE)Kc!V4JUQH}eiNkK;#N z*)f}yA9v9MTOdE-q8Smsy3^d9alPLV5yZP(`Pm37?{VIZh}J)vZLisSIujxT`4wk* GWX}I=<~;8J diff --git a/bin/AnalyseCalc/Classeur2$feuille$ligne.class b/bin/AnalyseCalc/Classeur2$feuille$ligne.class index 228248377fcdce0435395b256f8852e11bcf770e..fea291aff3c4acad541a9e4b5e607b3527362846 100644 GIT binary patch delta 394 zcmajYyGufG7{>AU{hj178nWSJ2MZ%Y!y!tDL|lTFBBcI;XlSaYwidURpolX>(EYL$ zl_dt1(v`LnO6WrA64`CY?l-L;=O1W#KfKTIjk=@mpvTfaPq`SQe2kNd39@05N-;$a zOj9*x$cF{0!y+|ciMkM^K`c`kD|ChsWe{c)R$0Ru*I=Dnu)*Dk@BlV>2wOagZ9bAW ziQUksr79bD6QsS)J@Kl#+58 aDlc+!rJ*({x1lkqT7AFB$0NF;dH(?0Ep^)f delta 394 zcmajYJ4=FL7{>AYe%|ad95ljI9CC<^rV;`Xm!PGHs80|LP1)4e;?&VH;*HEogG#7q z2&4m~5FM<|GJ~|#4wij|f})4_3pCw7?rZobT}juz+cdODHJBtLrpSzGvSWrE2v8Gd zsSR`F#S(QOL|s^>5rk<0D|CQW%3+Ou5M>?K*@g{n$0qk6-XXGtm zFCHJWgEgO*GTHJ9j zvaI5sACTiB@?6HFU_1#M3Zel;(c?i$4C7gh;YIlIDgt;DL6pTA-bET8qJ)b0#;5p2 zL9rvRwBSn_Kt}Q5H$Gu@GYhrPVpg;D%{m?F^wla`dRZ@joovvSU5k^AnkrItni{Q6 WwrCoZvTKS;In#hy@=oNe*FPG81MdylQ>4 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 literal 12878 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 UsqSX`TKS4RAB@NzwI99z3l;?uumAu6 diff --git a/bin/AnalyseCalc/Classeur2$historique.class b/bin/AnalyseCalc/Classeur2$historique.class index 98fc3909e5526b17c25c0a81be2aed62bb49ceb6..c76090a075dabbce5465c006d737d20dc5c6c7d8 100644 GIT binary patch delta 456 zcmW;CZ)nT`0LJm>`)o7QZFbwP-MAIT&P_9WrFQCyD=zfw@7TvnPZ%5YVi7|>Pv~O$=!P!)j+ltGKOg+)+Pwm1R_U?rD_! zD)B%wJS4;;VmxLUPv~Kc4A0oWb9xzPJ4JT$g8jVYAQK$p6@yH2i`T*XU9i4qiVu{6 z{N2GvSM$luOgq76C;8%yeDw~#c`w60M9C-k?vwm19FFARS0UWIhh2YUW>m>v&E}s% zMhRCa`)p&&ZQR+~VJoiLIhx~*7k9E+mz>xenl}nBq^77TUWqq~7xzM^ zl=pM~Tdo*qn8^P>$E?VolaUvum3Nr@x_6)F>3Q+w(z*1|c(`jw4GgM@)0#&?9h^~; zvr2JJ-JDm33(9g)y>_R4`|~d%XmbJ$7FfN2A99jO>PDS#lTLcJZaAzbj;QRpnshUbju5qo z1z(msT6`NFqbsI5cPQ+|TIo*pIIeYGqJ2*2RN%p&zwDSsoYYgV$iJIE#j5nzb#HrRfRxntC|S3zN$s-aeDLF_RN1S26A!$ diff --git a/bin/AnalyseCalc/Classeur2$modification.class b/bin/AnalyseCalc/Classeur2$modification.class index 8bfb0acc41aa531ad9860a08b9bab61d0efeecb5..e12d5b57a8b0ca2f8137d5c25438762a313b3ea9 100644 GIT binary patch delta 96 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 CjfiOg delta 5003 zcmb_gd0bW17G8UubGYZOb8!MhLK49N6-7-25pf`~Ow>d$93SEhF}xr{N~YHw$`@(s zDd*BgeU(0oLNl|B>X|vDMuVEu^Qo1oS-sL6-a6-84wnc2yx;Hf$6eq4_V=x|Icx8I z5A1wLTzpkD*?VipE&%8!wQ&Fn2+_OAA#b*w+Omy`lLSyw+=K4Yy!?E3vWk-hXi0H7 z`Ps$A?$V-U2R^8;j%ca5af%D>!aMM@gW!HS6qll zMIv|%A9cYYoUI>sM0wLoit;?UeN^-c2ujK=$}XIemlNqJm^OUURCh_=D8h;Om<#8@ z2V6PVT{6r!qv8SqYE)!NS)tofJ?_FM43&dbqnK6kuL7DyMUKiVDRK`s6HhPoY0F*s zl%Z`JW{B$uxS%+!;?w&5t;6JHE?lmAT8GQe7>{LQ$B+UQR|p75Dlt69+E%%6wP?Xh zsY#^bS^>`Fq&QQ;kL)?)5f&Ge7TccnF5F;vT4%m^z8xcHujIiL&fT6}Q=mYFSS7F0ayDP_a9wz%$uct+Ar_T)0!e z8Py_e7q`h*zgEG%5A`n5%_BZ?VUyXvq zsDNN+16x(a;{v3pzC2Mik77JAI3U4N! zwYQFnSGjxq8{14WtA1sUResw=#eeHxbPV?5AG|Y+DgQm7;`Q3j*ljiv-LTcQjaKoN zt*&KREde*rm)oy-65ljIzP5X7dBY&v2LEnL0k*-9HuNetn+sUoRVCt^qPE#Q@3Q8t zR;p4XYu?vco^PU`=`>BB96LzdslOK6PPEn!#r`bX>s6f-1KUFY#DE4JpfPl;pe}!+ zcOb}cCpe)MQ;`q?tsxwu_%j;XLmTK0Z6N{LK{9lLArK2ApfhAb7Z?X|FbTTC6zB#X zR+YhBun%&0-SC9i3yZ~JSR#(W)8Zm56<1*y2EkH{gl91ZR$y0HiM?PI4ujR$coeL` zbqwBSayM+KXx4p;NPFe~_)s?Lfj#<&E&9DZx{FHvN@9qz3m1K}bKmAc257M{ucqot4^vgU>*E=O9DPws&PR~zF6**?M zJ&EnbR7Oc+x;Y-$r@feIA}=GaiFPu2+(g&<#EHcwN=};4bOo6seNf zhPm5u>Q;VPka-(}$b<|4N&uC5Llf!)cTf@}P+!QTWGJD2u$=nCRvG{YXdqmq6hU;i zh@n9ul~ToI8Z73~Jz@jhD|XR+!h4*CitChyEoc~q({N0r5tv2y<4hWfD=8f-X%tq| zX#ABPz+03hwWKjp8yYWlp$Sqink0>+9BC29<&-OJp(%1O<;gASA$b7h%ViwrQ=z9ojE&hc4#((xQU<+x6Z)o5Cxj^*g4rRp?VuFfW1T}CU^ z)ih6iiB_wxQJ*OU}=hYuM{zfmTH_4mpbkNJr#`LN)oHp?d0k8xb8C`TSM+L6v=2_vT(ZKI>m)Uv=$UPU2jzOtou*@x}2rFPjFcG*(9>`YL6 zWtp?eVwtaM>k=%r%Nock`-pKEd8^$6;T2c!=`QqkLy~&V+9vu1;T+zZv6VQNLlDll z1`Ex>B5UxZF%So>!D4;okjN0rxr8a+(EK@?6D-yD4Ve(78>3F|i5^*br*D;e89z=xxZLO7PG&D5vdE#c@CF zfNI(am*{<=(Jqm~F^xVH8T66xP?adBk3|*7{q(7*raj^keTEwC#T1Tdv=1}r0D9;k zmeUtl#c@9!=F8(tyhPQKMqf!O9Mk9 zSgD`R82(?jpBl7X_P0IXfbHi7ZNK>2UTMJgTZ6XW{cUeFV7u0!?N5JOMFX~*4ccz| z+ji8qNunW}B>CHRH(*m5v^o53dm6Ag8?x$kqpLZJ>?uNUe47LWUtm+UZ*9>M>u|`CCO*CWch;DPXVpJ5}^%H zMsb{=r6_JKRhg{~u6^53=G44xD09#wH8tJzCQ3yzT} zxSGIz7%APsPb;1E;T)%MY{_wf6d|?hA11a*ky2EEQ;O!i&G+j5j^UF zw)LorwkT>_4=CPZQe&$1s#ZK|4{z&zl_F}@Y88vx_x>}Jok6rsKA-HqdEfv0zyEvh z|Nj5XV_)8NFMwHMMiMcB>a>wb*QVQyT&tNiZFh;0GqR?eGxLXA={C#E&9RNl+Ps-W zT%g}dW3^G6G3?gbqncKlX;&aI-Lfrrrhry6ez`!r-f1>Vp`n*V2@<`~8-0?H0)4%C zoNU&xo6WpLUz7=y467`lBL=asfSfCNTg51!Sw~&T-wG)l_iv z0z+%YHz@Sd9ZDb1OQ7wD8>zfU`>kXrzjz_J;0XUGRYF4I} zvk8^9dF=K<5>s%nKt?R{eRl@wC5{EJ0FW_y*HCu8{mX*^bX0Wnv zp!CKiW>2BYqaPh}D4pq?X}GlBd4{V@)=SLe$PEZag#jIhlP2plTP;?)XV@YtzET{4 zg-I-+1aplQGPNyEE^D}K_UN4DnmLIh(I8O9Pa3SI97T?d(Bj90lO2toDk>gO#|v64 zaTJya3=3S_nu%gaWw6M3>9%oZ3$+Nl~}=S zdB7IcI=(N^OUZ3!rk&{@NTitVAE8;R!=TWm9ox-08I%30_ak45G-zix)2QOkp6d{0 z*j#ERs*7J;KN}R=mdQ#P+)p54KpkN`X1=LzC zBa>43a&kQOM-o5gu_FU-zX{fHF3n4=ytvZyB`%1RNRL*>g%tQ%IxeP7ZWLUzpeDOS z;!+;avyVNMj-OKn@5Q;xBra#ZGH`AWM#mL&L^M+c@=~sn_yyB4pjn~gSA?`tA7|tm ziEASWD|Bq?iJg^CwOAR`rZbEAUrTJlX#RG+#0`AH3^ut}s)kXo4!QaEA~Wk)IhyGv zZbJFhDJlu7FT0hGo?9et#ci}?D^G_>=(riUw~e6c`gVz%Fj_|^HGMXhH{0nDrCMP> z?vUtY<(<@8t!%rKb5mKzY0j7_Giz8GMt&=CCnI;$R*xdVvhI<%n~D1@n`&nyAnMq?)-&3@skqU@Dx?pLLJZele5!0o}>22-&R2J01?=+QC0@jKa(RJ{9Tc3RH?FxxZT+1RJ8-a$_o#~OLbl1wrRda2tGfNC#CzDT z<3rlbS?X7*00{Llp5A2Roez*yVK($SQs@+h8hdCF0?kZ}$B!5hf>8rAqdmH31Q z?V=N-J!7<5M$XD-xp@C0v73vxoSTAS+4XH!rg`q##S~yxe<|@5tq2u4({&0t+dQ1B zXTIHH*mUz5zPAD|-ph1Bx5b|G&s>wv6mn*YbC*)*v?_NImm&sR7YTu?U|V}lBNYrO zcF0l;7doX)^xESh<6SNz_b&f*rl5)5QY5HIL?621rJanE(*`x?BF%%Gt04cDOy*m9~ymi>oum+~zzzTyA;KckKclx+F& zj800rK8>!CUPV`Y-+XB!6>^#inH{L+wSD`)F_SnCsG?1vshcQo2l_vS{wC>K`YvMh zi^PlxcS7$#X&3sH@6&}r52G?9-H+j&7`X*{`55~272_1PZ%87n8#P^+)QQPkkSwDQ zUprN?Q$kXRowoPKbz4w205dx=P5rI&so4?lSW@22^}U6c)seCFNaH7g{^9iX7DF z!)Kic%TkCv(PK~aSvSJ66k=C<>}sD~8(~=rv8Qn$kvp-R6P--j@+lliyTtB5xAG;`mv81r|epJ`{*v}#uOA6cIV;g*IV+3PKVORRt zl|J^%2*#4auJ*C3eeAjj#*)G|``G3VY$?C73pa1X0Q$=NizJWP%DRq-jwDa_8`gD2 zbR>DYZr0ru(UIioe#g3dBRY~i-TkcleMCo+r+bKX4=WvQ8s#TRtn0=jU3j7se`Vt7 z$mnN-(a*E)Z;{a?d81$I!t0%Qn~8r!2$DRaMzxH0n0PlrkQBD@J`*2A2$I6YM@)Pi zAxH`n|E9E+f7XT1H{v$`>lY0ZIW0Wd!x+@_T`k>n{(be3=L=T!ht6##oq%Rq$? ziWpoJ)Ff)#3(b34qL7NB&@GakqLh5C5K{SlX7Jr}yh8L1TVy6EQ_Di0$pgpdIq zvX4T>6on8nXbXBbbci7nyTr&2F|JdL@4(xgV!sZ&(F+pHU?M7UCJxVJUiUN)l7tmXgi?B#silyQjdQ;JjMsYWmiTiMjcml_Yx3EHN$8lmO zQeqcQi1mXJt3Xq%5-qW@XpK!rTWl7rSUs|_rLbddaAK>_9&_NvPD3GfAy&uMD<9RC=v#J|9+CByMr$t=8Hasu8cS%)`EuEvg%oAD0S=gyKB@NUU&yq6e( z4-%vCVPXP4O&oyF5>v4&F&$rsgDLwHDEoA=5L3k=09m{ayHEx}<1NvLztPB~m?jQ| z5Qhpk)Q4pl!@L#y~_H>M=ff8@wfpJUi= ZOr!6kzQS0~ph$|zWSEKr^bUCXe*uejLf`-Z literal 5585 zcma)=378bc703V8J-gE^1q-_%_p#iEupXf3s>r2+%b_R|5;OG9_U<;!bT2(U1W==R z#3S(vQ8B~|4?Ktmt1F^W(9+)VRyjR`5(~W2{^L^9(`u*zFt9q|q z)%26!Y`Gu6WN~mBn!w1cnakE@TTHLn%3F><&-Bc^<$G4)2s_(iTiz7M%&ja~X`}?Y zEispywK>yiuASSk#LD^t<%igg?H?wfj~cx|AT`Zxv?`#ZlSCQHJE1eWq#*^m2K~7C zyy-Mr1&OYx6euecmsn(_qJBj_SL;yQx(akhbsALyM)XXg2YL#~X3L-A`<~rU^a}$0 zMvbml{uF&XS6gp8ORdJE%tFg-v$f7ZFEZ}iG>!`NLBBNm3iSF8TB1J&&;ZE1z=%`83&6lgfzGX-+f0*Q zuwADDqcJv(F^LYQyTyi_C9yZg38a^sxuP|p5WQOG=opD(d5o2jp-^YwI7;;#Woky{J+liWPGGhwVoPcRKM?4oDN;!v z(v(JvK{?ojW{PY>V4{>qi`YY3VhNVUCUH+LQ9>;;kS8jxogIri$DGZ%60K}*STx}8 zYhb{mLAKH|vYf0n+w#r%Twd6YFHvMWeIh&Gq73|m8n@U5-}UTeMQffiqZ+T2Sfv^l zEZ?VPp7|DK;A9F_usWtpoyI->RN_=_)DfxWpM&0I#s%k{YJ84_o5 z+rg2y-vt}^8TCu`x-`;rB+gBwNQc(I&uQW(8#tdF*Qm2VW#E^T z!FzD-R}z;n-z(yGV+>qI`#>XQAP?noiC;4CPWl(;H^u)@GK9dl{#uD^FqH4Em$-qqkv$&^j*)hWI~mzbOFfB1!`dRTnTh*oYLi5h?G^k8yIJxnz45oM86%r{tGhIXB-%G(nbu?kT}b zhc5%WVx`+!kn!mE(TX`w^iT-p-a*H&1J%gR!c5CO+Y0oEb zEi+$NAqI-UX+h_~YL%`@wG=gC2<3k(x5znUBp!ii4i>O8!=xC_budlG8=vN#pN*7a z6hEtsww{=7j1*%zdppi6rOC;5EG9NGPKxn-R@*BIRte-hPm6sb-_>fLu_9}=@|lgg zrDL@;KO`6LqxY$W}O?$xcbvWxj7_m(n>t zG+!~F5;;qW%npp?v3>u4mGK-0)PUlqPNLKs{~4j*G#yJHg+^bL4;*thj7_L$N4KiI z+R=L}dc~v%F|ZATH^8VGM%Pd=LSX}95@DM$svYCou-^uxE9nwy4@j^q#n?$3(5VON z+At}k4^240l5${j=)mLIw89(!Lk%%3jtdQ z+2skAr5L*+U{{3fNePyv7<)>z-^IO*4me7$D=mEqxND6enXWhd}M~g=JNfPTe`%HY8AV`Ya_?U^mCkT?_#3xMrGeM9PCqARFRejNpFE0m8zq-iD5JP%yKz?8>;A_HI#lwpc-S*3kRV$ z=Fy9$`RGf3=Lf>VAe@ZB^bfEGXJI(j5P2O&Vgp8DBOPJ4U>u&tcsz?*yny}jF1>vD z924;+4xrQ9!J-0nq8|7O;v{VyPS&o*Y1*w=tv!I#wTEzq_889A zUcfopdpKA75a(&zae=lI7wTPbk=_j#>pgLaJ`|Vg6L6V+AlB-K;41w{T&*v}dOeG4 zbsyL3r{V_vBHXC2!%g}|+@jx&jr!xbReuh*>D#bb{{;6?Fz!ut$9<_Gcr-N*TT|2V zcxo=5NHyV^)G|DqItS0C*5LWn&3G|&7hXy|g;!HA;kDFTc)d*Ejj|zlvuqmPDr>~s zWvlUi+4=aO>@s{*@+2hbRRr;@K@-+6O-tE$S%qwWl*F=Eg2S*s3T1r^j{)KF;V~k diff --git a/bin/calcul/formatDateWriter.class b/bin/calcul/formatDateWriter.class index 9a483c9a717fd52b439f11adf38cfa6703c36f5d..b4e3d7bc938eb8f7be63c29520c398fa6d62f8b3 100644 GIT binary patch delta 1025 zcma)4%TE(=5dMDM?QU6?hc!SzD{Vz3g{BG>p+!L{So%OqQNahewv|^~kOG2=_5Hwj z+7lkUa_~|$DMS%*cim|%n|ZVn$X6;1~h`C8jihOLYAIKyFQJZ>Eu^Q2OqOh$qay)ujls6oD_KExpX z%F=>;GLE5%!8onVWD*i0h>GY}AM+MApg!YQ*@zl723SmeYP6etNXWPdMg3s3unG0E z(O)u*A_)vrGWL<*E4X`SF)w0{p){r>W3Jd#Dy5|3iHwZPSRkIv+(crQ+6XPAlCJbr zJV8Ubf@>nKGMF}fGL~>%T^E{!o476Fmik55&fURXwM=Yg_g{92RV@1z9O(igj`uLK zoFk9s70uw<9p=_NJS!+A!+a=@&LH3Z8onWO&l>z;*0=2mO7wG3J2w(C+_wtJ!&mcp z9CzkOPY1f;r(tlAh@u50^xXjgwJ3uPTVO}F20Q7k!!GQG3wua^J;53X*oXj}G*%ai z3Fa^79ctG8t>px_{4P{gD+ zLl=`UqtvQ_XlSMMAEP)=Y>_|svIWBNe-L(4*&ZtB|8K%cB>y7xl7~?Xw6fu$HKc-$ zb)<91ZiRup|$D%o#$BlQW`t9@BhKXi;5Vz-Psfx_|FTr4mV%cKH*v(sall!|&ZX!pz&s~d^*=*Yb)`2_Y*+OVnVZnZFR9attKtNgG;}3`ZiG+d>x>R(dO29G|o1RH3h@e+SkM>9^ z76-ML(xNz~r7WG|xVCKZlIw(uI7YPhmSU08K3h5pqOdCvm{75k^&V@@#xt0aF)iST z$0p)|_+&aA%OsLBDrRw3duVmL&S62uynt;!JrT%ECXy=7AYIZtauR zZBcO**R)c(THJUtAiG8OBh0h{w3r)x&gvX?-G_sLGnm7kE~)W3LPO5h73>R($c6_f zF!ByPuk_{68CitVAQeeDg#AmLc?U18o`%g($hjS>_}&B)N*H;t2AknRDWfuYv4!aJ zEE~2V2p^i^H{dn-ac~F~Y&NmphkjCf*m4+0Sn)C*z#v6}#17#oBvOI&(igbIR}{$z z$%uByh*)9AFhAq#_Y&ok`?`~;y;+mmNAvXobzH1mtMpDTlNaI uI{oz}p$p_!?xcBeCk}3<7*XzOI4?xjV(Q#9wyJN-4B>^a;TB^PZhr?X36?Yf diff --git a/bin/fenetres/create$1.class b/bin/fenetres/create$1.class index bf3b53329fd10c7b52ee706f9d72f8a53d067465..1c1e91371e9e92f8cb219ef1ead55faaa42a8688 100644 GIT binary patch delta 43 ycmeC+>fqWS!NPcPvLs8o8Ll&^0cmxH8w~mkwfqWS!NPccvLs8ood+7U;4ta5AzoNHDT7C^51#Xfkpz7%*}&m@{%Q*fH`j_%iY` UL^AR*#4z$RWH5?N?qf{`0EWv7ApigX delta 64 zcmey!{gHdaeikN%|C0~0EYM|Q;ACWGkYHqCP-0|d&}3v|Fkob7FlXdouw&$6@MYv? Uh-Bnph+*Vq$Y2zi+{c;>0J@zE1^@s6 diff --git a/bin/fenetres/create.class b/bin/fenetres/create.class index 02569fa495c3a79857cb46b4b0034e6cd2ed20ae..482d536add1867f33462b4b4cb7fc933368940fd 100644 GIT binary patch delta 1307 zcmWNP2~gHm6vfXy4^cpb1TmIRWD^lXR*_0&6*sI@2qjcZ1@{edQuK4lvO=={Xcjt* zX^xt?eJ+_WD5TSd$&3pwlT1kwu4$rSR(IaaoA>5-=G}MCJ$2<$S1t$YqkPB0731NJ z3Fw812uB{`kdH)6wys4L*rve=Iq<-1@WTvM6e1W!=!02^#B6Kg0K07-oG~AsScslj zq^iZRp%}eUf>69+wGYU2U#^N3TE(uaRgRI-PiTKn3%;++i?~983c!n z#$g$cBT|TCvH-_rDNe{+sFC${)XFBDl-;Nk2kNB;r{y%x$TfT`E%;9E;0Jk%AK4WR z^u}5G;U@;+93#-kWc#kG^sN@p2J^}Xvh-YtPs$ruUjBJKt8pE)JeNf79tW^`s7>P>u z$38v>2cuBUXw)+n=NYF4Ca7VF0w#$!pBF#AAfX&A@f<3{nJiC0ROasnfm$0X)6i<3Bxll4@< zX}XFzou!&D(^Y+-&U_ zGQy=2PMV)C-0El_5-8cbK<+^|et{kur2y_j2=}8O4 zSflRNVn0u!mZxxrbsFP(b@vRe@_YQw25VOG&Y+80=n|aSr1QIsU|vBiuOgM#baqWT zw`MCQWv;YXRVguY%WBm9zGYHlKs1t=p-e z`MM}|RqCd+t5SERu1Ydi+xt9O1 kqGzVS!xSLYOhveP9nogGRWWRoOJA)M0WZ_fY8^K5e^gl#8A;7H*8VrvoeQLvHZJ? zqQj_-Ynu3tI_847HKyrUD&|@yg*tAzHImtzH*;t1`<;3B-E;4uG9D`9_QRdShQl8t z5Q0%?g>1y)4Rpn5^gyn2xpSUt9DI<8CdffJ@~vV#+F}CQqX6-k%VBjRhEhG7QBc z`<1VehsE~Rv1b{|u>zG?i9J}2gQ&m}tidU)MGe-W78`IE8}SUAX|RRC*vd$3V<&89 zPgHUUb}$oOPQ*@5#cs~R9?r#HF7#kOm*D_6;UK-J=6)RJQ5@lA9Ahnh;9VT&bNr~r zIH3@nR5*T86iz7)r z)*zD?FqRiFiC0j}tC+>#@ENb8jDKJ`>#&YDZRfXax3^Jcn>fLHxWN0U7Ifp`Hv;FNW(C#;7;lO6CCd;V`8zTd6Ei8cUSUc^+kO zp$2fZ2C-6uxm!b6tzkT);jGnbysZ&@tW5c8q{1{xt(C1f<*1k5)KKN>b&auctn&4? zift^>czvY_TB!o9(PUMsPb^kD0AGW|2NIOZBO#&|I@#^UN-lntht@EqpbefexBzi8XI2LbcraCV8OW zO8BT8jkL=9B)K)SHbB~hAZWoa^?h3aw!qP}f zU6!`8G{Vw0NHbARbibLt?a|0|bXNDvjY>oVlY~Ii6-|vBEloGLOm{?^Otd#yNHC+E mh>U_}Z=s19ix`uKSThb?Oun-uW3XSWtWAW3x4RrQV2U8k;hY zscCC8r(v}9LR2=J)sR=n943uSDp}+#?swOAeRf@q0o52#O%dr8Vb)ouSd=*nOVy!cq zJZB;K&PocL0@gWuD0Ir%;MB0mX<)N+lPyjMTb);IcLpeO6+2v)oo+mScPYEwJWAXx z?01VObN!SzkEJK7;0kd$DB&EE=~PNIhXZLDN8*o*O|^tjBN3eNnv*hzfW&c1e4LiW z)Jh6C(rIB~iLZ7tqUheTh9@8)Ve3U^3WRxKl#3vQWu!`cdn#YJr;)}}RtIB0m74lvA z`JpQKsVe!UYV!G`8u+VjGNx|xPjzagx;1K8Yc-;S)IU8ATaPDJPr#=qvP4g2mA2TX b4aM4KuXZ`0gQ?XaoY7Obq(hs_vVH15#DAD3 delta 612 zcmWN~T}+N~9LDkA|NAGF=YQXKtalF=fGOZisY_M*TWeu>=8Y0`8WRvYrjy;df z_7ZaKOt#v24_?!N*t;sltU81VTt0XZ&k*zxRYXWN&=~sFzVdqw9My>#Nv~9&dM^* zNecCnN`r4C<3eP!t1r9yimO{(ebv?1Tz%cut-j`UH39A7M~C~=DIs)8B;CF=@1Ed$ zZt9V_Jdgw)N+P|IL|@x&?=aQ8+&!mv&Qp!u&$1AB}P)_h# ze7uz=-bn}VrHdiC%LnP_qYN`FBYct{jHqdhs&KxjNXAq&UsV$0Dw}UAhwrL@302Nd zRn0GTgx{)e3zMpmKdPO-s*@>oUyB;hN{wmMxYp{Qo{pvch|x2M*E3nE{aLSPQLH_b ZYQtV_Q>7j1bpQ=IkQN=(R+$yA{sR{2my`ei diff --git a/ensembleResultats.csv b/ensembleResultats.csv new file mode 100644 index 0000000..d8575c5 --- /dev/null +++ b/ensembleResultats.csv @@ -0,0 +1,87 @@ +nomEtudiant;note;pourcentage +Alex Marechal;8.0;1.0 +Alexandre Berthelin;6.331623931623931;0.7914529914529914 +Alexis Legrand;7.2615384615384615;0.9076923076923077 +Alexy Lefebvre;7.288888888888889;0.9111111111111111 +Amelie Bruniaux;7.726495726495727;0.9658119658119658 +Anais Blondel;6.714529914529915;0.8393162393162393 +Anais Najdecki;6.2905982905982905;0.7863247863247863 +Antoine Duponchelle;6.276923076923077;0.7846153846153846 +Antoine Ponchel;7.589743589743589;0.9487179487179487 +Apolline Michel;7.07008547008547;0.8837606837606837 +Arthur Willart;6.413675213675214;0.8017094017094017 +Aurelien Ben Yahia;7.1521367521367525;0.8940170940170941 +Axel Aoumat;4.4854700854700855;0.5606837606837607 +Axel Cadart;7.2615384615384615;0.9076923076923077 +Aymeric Grenier;7.726495726495727;0.9658119658119658 +Baptiste Fynnaert;7.2615384615384615;0.9076923076923077 +Charles Carron;6.55042735042735;0.8188034188034188 +Chloe Mazur;7.589743589743589;0.9487179487179487 +Clara Bruneau;5.2786324786324785;0.6598290598290598 +Clement Legrand;7.042735042735043;0.8803418803418803 +Cyril Massart;6.017094017094017;0.7521367521367521 +Doriane Bernard;6.878632478632479;0.8598290598290599 +Elliot Pilawa;4.658407079646017;0.5823008849557522 +Elodie Vaesken;6.441025641025641;0.8051282051282052 +Enora-Lou Deplanque;4.581196581196581;0.5726495726495726 +Esteban Devos Devulder;6.536752136752137;0.8170940170940171 +Gabriel Humain;7.288888888888889;0.9111111111111111 +Helene Adjal;6.276923076923077;0.7846153846153846 +Hugo Guffroy;6.427350427350428;0.8034188034188035 +Imen Belaiche;7.726495726495727;0.9658119658119658 +Ines Aubier;7.617094017094017;0.9521367521367521 +Ines El Karami;7.589743589743589;0.9487179487179487 +Issam Benzemra--Petit;7.671794871794872;0.958974358974359 +Jane Gosset;7.17948717948718;0.8974358974358975 +Jeremy Legros;5.032478632478632;0.629059829059829 +Julie Rohart;6.823931623931624;0.852991452991453 +Justine Bertin;6.933333333333334;0.8666666666666667 +Justine Mikolajczak;6.988034188034188;0.8735042735042735 +Lali Vin;7.562393162393162;0.9452991452991453 +Lea Denys;7.17948717948718;0.8974358974358975 +Leo Marin;7.097435897435897;0.8871794871794871 +Lilian Lamorille;5.264957264957265;0.6581196581196581 +Lisa Baran;6.960683760683761;0.8700854700854701 +Lucas Canon;7.671794871794872;0.958974358974359 +Lucie Delong;7.17948717948718;0.8974358974358975 +Luna Hemery;7.671794871794872;0.958974358974359 +Maeline Humez;7.562393162393162;0.9452991452991453 +Manon Cassel;7.726495726495727;0.9658119658119658 +Martin Pilot;6.851282051282051;0.8564102564102564 +Mateo Darras;6.358974358974359;0.7948717948717948 +Matheo Guerineau;7.206837606837607;0.9008547008547009 +Matheo Normand;7.671794871794872;0.958974358974359 +Mathilde Carlier;6.4683760683760685;0.8085470085470086 +Mathilde Konury;7.4393162393162395;0.9299145299145299 +Mathis Carlier;7.398290598290599;0.9247863247863248 +Mathys Calesse;7.124786324786324;0.8905982905982905 +Mehdi Boutchich;5.880341880341881;0.7350427350427351 +Melanie Bouchoir;7.220512820512821;0.9025641025641026 +Melusine Miletti;6.140170940170941;0.7675213675213676 +Mickael Lenclud;2.9168141592920356;0.36460176991150445 +Noah Desfachelles;5.798290598290598;0.7247863247863248 +Noah Halluin;3.157522123893805;0.39469026548672564 +Oceane Decroix;7.124786324786324;0.8905982905982905 +Pablo Rodriguez;6.769230769230769;0.8461538461538461 +Quentin Stautemas;6.5777777777777775;0.8222222222222222 +Raphael Rivaux;2.8034188034188032;0.3504273504273504 +Remi Delaval;6.65982905982906;0.8324786324786325 +Remi Delvalle;7.425641025641026;0.9282051282051282 +Remy Maeght;4.772649572649573;0.5965811965811966 +Romain Bruni;7.206837606837607;0.9008547008547009 +Romain Delrue;7.015384615384615;0.8769230769230769 +Ronan Bourdrel;7.617094017094017;0.9521367521367521 +Simon Ducrocq;7.316239316239316;0.9145299145299145 +Solene Marien;7.671794871794872;0.958974358974359 +Stefan Gaudin;4.3076923076923075;0.5384615384615384 +Tanguy Delavier;6.905982905982906;0.8632478632478633 +Theo Duprez;6.769230769230769;0.8461538461538461 +Theo Justin;7.124786324786324;0.8905982905982905 +Theo Rouze;7.671794871794872;0.958974358974359 +Theo Verlet;7.617094017094017;0.9521367521367521 +Thomas Renard;6.714529914529915;0.8393162393162393 +Thomas Thevenin;5.948717948717949;0.7435897435897436 +Tristan Quesson;6.208547008547009;0.7760683760683761 +Tyffene Viseur;7.288888888888889;0.9111111111111111 +Vytto Scilironi;5.894017094017094;0.7367521367521368 +Yvonnick Levis;7.17948717948718;0.8974358974358975 diff --git a/src/AnalyseCalc/Classeur2.java b/src/AnalyseCalc/Classeur2.java index 7362579..1d15cd8 100644 --- a/src/AnalyseCalc/Classeur2.java +++ b/src/AnalyseCalc/Classeur2.java @@ -12,6 +12,7 @@ import java.util.Map.Entry; import java.util.TreeMap; import AnalyseCalc.Classeur2.feuille.colonne; +import AnalyseCalc.Classeur2.feuille.formatConditionnel; import AnalyseCalc.Classeur2.feuille.graphic; import AnalyseCalc.Classeur2.feuille.ligne; import AnalyseCalc.Classeur2.feuille.ligne.cellule; @@ -664,6 +665,7 @@ public class Classeur2 { private TreeMap colonnes = new TreeMap(); private TreeMap lignes = new TreeMap(); private TreeMap graphics = new TreeMap(); + private TreeMap formatConditionnel = new TreeMap(); private TreeMap nommageCellulesFeuille = new TreeMap(); /** @@ -710,6 +712,13 @@ public class Classeur2 { for(int i=0 ; i < nods.size();i++) { graphics.put(i, new graphic(nods.get(i))); } + + //format conditionnel + nods= fe.retourneAllEnfants("formatConditionnel"); + for(int i=0 ; i < nods.size();i++) { + formatConditionnel.put(i, new formatConditionnel(nods.get(i))); + } + } @@ -727,9 +736,6 @@ public class Classeur2 { fe.getAttributs().put("evaluer","false"); //Variable de nommage -// for (Entry j : nommageCellules.entrySet()) { -// nommageCellulesFeuille.put(j.getKey(), j.getValue()); -// } ArrayList nommage = fe.retourneAllEnfants("table:named-expressions"); if(nommage.size()>0) { nommage = nommage.get(0).getEnfants(); @@ -762,17 +768,18 @@ public class Classeur2 { } - //lignes chargement + //lignes chargement nbre limite de ligne défini par commandes.analysis_nbr_Ligne_maxi nods=fe.retourneAllEnfants("table:table-row"); System.out.println("Nbre de ligne = " + nods.size()); int nombreRepetitionLigne = 0; for(int i=0 ; i < nods.size();i++) { - if(i>0) if(lignes.get(i-1).getPropertiesRow().get("Repetition")!=null) { + if(i>0 && i A = LesFormatsConditionnels.retourneAllEnfants("calcext:conditional-format"); + System.out.println("Nbr de format conditionnels = " + A.size()); + for(int i = 0 ; i < A.size();i++) { + formatConditionnel.put(i, new formatConditionnel(A.get(i), nod, indexStudent)); + } + }else { + System.out.println("Il n'y a pas de graphique"); + } + } @@ -842,6 +861,10 @@ public class Classeur2 { public TreeMap getGraphics() { return graphics; } + + public TreeMap getFormatsConditionnels() { + return formatConditionnel; + } /** * Retourne la communication sur cette feuille * @return @@ -1353,7 +1376,7 @@ public class Classeur2 { } - //Chargement + //Chargement depuis le classeur de l'étudiant. public graphic(node nodeGraphic,node nod, Integer indexStudent ) throws IOException { if(nodeGraphic.getAttributs().get("draw:style-name")!=null) propertiesGraphic.put("Style", nodeGraphic.getAttributs().get("draw:style-name")); if(nodeGraphic.getAttributs().get("svg:y")!=null) propertiesGraphic.put("positionY", nodeGraphic.getAttributs().get("svg:y")); @@ -2607,8 +2630,47 @@ public class Classeur2 { } //validation } //cellule + } // ligne -} // feuille + + /******************************************* + * Class ligne + * @author Pablo + * + *******************************************/ + public class formatConditionnel{ + private String Refdata ; + private String evaluer = "false"; + private String communication =""; + private String titre=""; + private boolean saut = false; + private String styletitrePrincipale = "H1"; + private TreeMap conditionalformat = new TreeMap(); + + // chargement dans le node sujet. + public formatConditionnel(node nodeFormatsConditionnels ) { + + } + + // Chargement depuis le classeur de l'étudiant. + public formatConditionnel(node nodeFormatConditionnel,node nod, Integer indexStudent ) { + if(nodeFormatConditionnel.getAttributs().get("calcext:target-range-address")!=null) conditionalformat.put("target-range-address", nodeFormatConditionnel.getAttributs().get("calcext:target-range-address")); + for (node condition : nodeFormatConditionnel.getEnfants()) { + if(condition.getAttributs().get("calcext:apply-style-name")!=null) conditionalformat.put("styleName", condition.getAttributs().get("calcext:apply-style-name")); + if(condition.getAttributs().get("calcext:value")!=null) conditionalformat.put("condition", condition.getAttributs().get("calcext:value")); + if(condition.getAttributs().get("calcext:base-cell-address")!=null) conditionalformat.put("base-cell-address", condition.getAttributs().get("calcext:base-cell-address")); + } + + } + + + + + + } // formatConditionnel + + + } // feuille public node convertClasseurToNode(typeFichier type) throws IOException { @@ -2713,11 +2775,16 @@ public class Classeur2 { fichier.append(""); } - //graphic + //graphics for (Entry k1 : k.getValue().getGraphics().entrySet()) { ecritureGraphique(fichier,k1.getValue(),""); } + // formats conditionnels + for (Entry k1 : k.getValue().getFormatsConditionnels().entrySet()) { + ecritureFormatsConditionnels(fichier,k1.getValue(),""); + } + fichier.append(""); } @@ -2803,6 +2870,82 @@ public class Classeur2 { fichier.append(prefix+""); } + /** + * + * @param fichier + * @param k1 + * @param prefix + * @throws IOException + */ + private void ecritureFormatsConditionnels(StringBuilder fichier, formatConditionnel k1, String prefix ) throws IOException { + fichier.append(prefix+""); + + fichier.append("" ) ; + + fichier.append(prefix+" k2 : k1.getPropertiesGraphic().entrySet()) { + fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ; + } + fichier.append(">"); + + fichier.append(prefix+" k2 : k1.getTitre().entrySet()) { + fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ; + } + fichier.append(">"); + + fichier.append(prefix+" k2 : k1.getSoustitre().entrySet()) { + fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ; + } + fichier.append(">"); + + fichier.append(prefix+" k2 : k1.getAiregraphic().entrySet()) { + fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ; + } + fichier.append(">"); + + fichier.append(prefix+" k2 : k1.getAxeXprincipal().entrySet()) { + fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ; + } + fichier.append(">"); + + fichier.append(prefix+" k2 : k1.getAxeYprincipal().entrySet()) { + fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ; + } + fichier.append(">"); + + fichier.append(prefix+" k2 : k1.getAxeXsecondaire().entrySet()) { + fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ; + } + fichier.append(">"); + + fichier.append(prefix+" k2 : k1.getAxeYsecondaire().entrySet()) { + fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ; + } + fichier.append(">"); + + fichier.append(prefix+" k2 : k1.getLegend().entrySet()) { + fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ; + } + fichier.append(">"); + + fichier.append(prefix+" k2 : k1.getSeries().entrySet()) { + fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ; + } + fichier.append(">"); + + + fichier.append(prefix+""); + } + @SuppressWarnings("unused") private void ecritureGraphique(BufferedWriter fichier, graphic k1, String prefix ) throws IOException { diff --git a/src/calc/chargementParametresFichierAnalyse.java b/src/calc/chargementParametresFichierAnalyse.java index 944574b..0513ca0 100644 --- a/src/calc/chargementParametresFichierAnalyse.java +++ b/src/calc/chargementParametresFichierAnalyse.java @@ -29,8 +29,10 @@ public class chargementParametresFichierAnalyse { // Chargement de la notefrom if(commandes.sujet.getAttributs().get("bareme")!=null) { commandes.analyse_notefrom= Double.valueOf(commandes.sujet.getAttributs().get("bareme")); + commandes.analyse_bareme= Double.valueOf(commandes.sujet.getAttributs().get("bareme")); }else { commandes.analyse_notefrom = 20.0; + commandes.analyse_bareme = 20.0; } // Chargement de la date de creation diff --git a/src/calcul/formatDateWriter.java b/src/calcul/formatDateWriter.java index 65d4eaf..101574e 100644 --- a/src/calcul/formatDateWriter.java +++ b/src/calcul/formatDateWriter.java @@ -27,6 +27,9 @@ public class formatDateWriter { * @return */ public static Date DateLibreOffice(String libreoffice_date){ + if(libreoffice_date==null) return null ; + if(libreoffice_date.isBlank()) return null ; + boolean contientHeure = false; if(libreoffice_date.contains("T")) { libreoffice_date=libreoffice_date.replace("T", " "); @@ -41,7 +44,6 @@ public class formatDateWriter { }catch(ParseException e) { e.printStackTrace(); } - return d; } diff --git a/src/evaluer/evaluerNodesClasseurStudent.java b/src/evaluer/evaluerNodesClasseurStudent.java index f93b47e..2db96f1 100644 --- a/src/evaluer/evaluerNodesClasseurStudent.java +++ b/src/evaluer/evaluerNodesClasseurStudent.java @@ -34,6 +34,7 @@ public class evaluerNodesClasseurStudent { nAna.addEnfant(anaFeuille); evaluerLesColonnes(feuilleSujet, anaFeuille); evaluerLesLignes(feuilleSujet, anaFeuille); + anaFeuille.calculPoints(); } } } @@ -49,6 +50,7 @@ public class evaluerNodesClasseurStudent { anaGraphic.getAttributs().put("nomObjet", graphicSujet.getAttributs().get("nomObjet")); nAna.addEnfant(anaGraphic); new evaluerAttributs(graphicSujet, graphicEtudiant , nAna); + anaGraphic.calculPoints(); } } } diff --git a/src/fenetres/create.java b/src/fenetres/create.java index 9fa2e05..5ebd17d 100644 --- a/src/fenetres/create.java +++ b/src/fenetres/create.java @@ -65,6 +65,8 @@ import calc.commandes; import menu.CreatePopupMenu; import net.miginfocom.swing.MigLayout; import xml.node; +import java.awt.event.ActionListener; +import java.awt.event.ActionEvent; @@ -250,7 +252,7 @@ public final class create extends JFrame { private void ListenerAction() { /** - * Selection d'un nodeAC dans le JTree. + * Selection d'un node dans le JTree. */ tree.addMouseListener(new MouseAdapter() { @Override @@ -551,7 +553,6 @@ public final class create extends JFrame { toolBarPrincipal.addSeparator(); JButton btnNewFichierAnalyse = toolBarPrincipal.add( new actNewFichierAnalyse() ); - btnNewFichierAnalyse.setIcon(new ImageIcon(create.class.getResource("/resources/fichierODF.png"))); btnNewFichierAnalyse.setHideActionText(true); toolBarPrincipal.add(btnNewFichierAnalyse); diff --git a/src/fenetres/proprieteFichierAnalyse.java b/src/fenetres/proprieteFichierAnalyse.java index 9340896..143921a 100644 --- a/src/fenetres/proprieteFichierAnalyse.java +++ b/src/fenetres/proprieteFichierAnalyse.java @@ -502,6 +502,7 @@ public final class proprieteFichierAnalyse extends JFrame { commandes.sujet.getAttributs().put("presenceMetaSujet", comboBoxPresenceMetaSujet.getSelectedItem().toString() ); commandes.sujet.getAttributs().put("baremeABC", comboBoxBaremeABC.getSelectedItem().toString() ); commandes.sujet.getAttributs().put("notefrom", textFieldNoteFrom.getText() ); + commandes.sujet.getAttributs().put("bareme", textFieldNoteFrom.getText() ); commandes.sujet.getAttributs().put("progression", textFieldProgression.getText() ); commandes.sujet.getAttributs().put("historiquePresent", comboBoxhistoriquePresent.getSelectedItem().toString() ); commandes.sujet.getAttributs().put("creationDate", textFieldDateCreation.getText() ); diff --git a/src/xml/node.java b/src/xml/node.java index a96ce97..e64040d 100644 --- a/src/xml/node.java +++ b/src/xml/node.java @@ -667,6 +667,24 @@ protected boolean nodeClose = false; && Objects.equals(nameNode, other.nameNode) && Objects.equals(parent, other.parent); } + /** + * Calcul les points de ce node, à partir des nodes resultat.
+ * Ajoute les attributs total, point et pourcentage à ce node. + */ + public void calculPoints() { + int total= 0; + int point = 0 ; + double pourcentage = (double) 0; + for (node enfant : this.retourneAllEnfants("resultat")) { + total = total + Integer.valueOf(enfant.getAttributs().get("total")); + point = point + Integer.valueOf(enfant.getAttributs().get("point")); + } + pourcentage = (double) point/total; + this.getAttributs().put("nbrPointTotal", String.valueOf(total)); + this.getAttributs().put("pointGagner", String.valueOf(point)); + this.getAttributs().put("pourcentage", String.valueOf(pourcentage)); + } + /** * Nettoyage du node.
diff --git a/sujet.xml b/sujet.xml index f9ace53..499c137 100644 --- a/sujet.xml +++ b/sujet.xml @@ -1 +1 @@ - EJ €- €???Page 1(???)???, 00/00/000000:00:00Page 1/ 99 \ No newline at end of file + EJ €- € €- €???Page 1(???)???, 00/00/000000:00:00Page 1/ 99 \ No newline at end of file