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 0ee0507..aa33f5b 100644 Binary files a/bin/AnalyseCalc/Classeur2$feuille$colonne.class and b/bin/AnalyseCalc/Classeur2$feuille$colonne.class differ diff --git a/bin/AnalyseCalc/Classeur2$feuille$graphic.class b/bin/AnalyseCalc/Classeur2$feuille$graphic.class index 1154791..ec4cc0a 100644 Binary files a/bin/AnalyseCalc/Classeur2$feuille$graphic.class and b/bin/AnalyseCalc/Classeur2$feuille$graphic.class differ diff --git a/bin/AnalyseCalc/Classeur2$feuille$ligne$cellule$validation.class b/bin/AnalyseCalc/Classeur2$feuille$ligne$cellule$validation.class index 5f23707..a5e067a 100644 Binary files a/bin/AnalyseCalc/Classeur2$feuille$ligne$cellule$validation.class and b/bin/AnalyseCalc/Classeur2$feuille$ligne$cellule$validation.class differ diff --git a/bin/AnalyseCalc/Classeur2$feuille$ligne$cellule.class b/bin/AnalyseCalc/Classeur2$feuille$ligne$cellule.class index b4098df..d606db3 100644 Binary files a/bin/AnalyseCalc/Classeur2$feuille$ligne$cellule.class and b/bin/AnalyseCalc/Classeur2$feuille$ligne$cellule.class differ diff --git a/bin/AnalyseCalc/Classeur2$feuille$ligne.class b/bin/AnalyseCalc/Classeur2$feuille$ligne.class index 2282483..fea291a 100644 Binary files a/bin/AnalyseCalc/Classeur2$feuille$ligne.class and b/bin/AnalyseCalc/Classeur2$feuille$ligne.class differ diff --git a/bin/AnalyseCalc/Classeur2$feuille.class b/bin/AnalyseCalc/Classeur2$feuille.class index 3c6be0d..e6a7ff0 100644 Binary files a/bin/AnalyseCalc/Classeur2$feuille.class and b/bin/AnalyseCalc/Classeur2$feuille.class differ diff --git a/bin/AnalyseCalc/Classeur2$historique.class b/bin/AnalyseCalc/Classeur2$historique.class index 98fc390..c76090a 100644 Binary files a/bin/AnalyseCalc/Classeur2$historique.class and b/bin/AnalyseCalc/Classeur2$historique.class differ diff --git a/bin/AnalyseCalc/Classeur2$modification.class b/bin/AnalyseCalc/Classeur2$modification.class index 8bfb0ac..e12d5b5 100644 Binary files a/bin/AnalyseCalc/Classeur2$modification.class and b/bin/AnalyseCalc/Classeur2$modification.class differ diff --git a/bin/AnalyseCalc/Classeur2.class b/bin/AnalyseCalc/Classeur2.class index 625ee79..bd328ea 100644 Binary files a/bin/AnalyseCalc/Classeur2.class and b/bin/AnalyseCalc/Classeur2.class differ diff --git a/bin/calc/chargementParametresFichierAnalyse.class b/bin/calc/chargementParametresFichierAnalyse.class index 8124d5c..237b6be 100644 Binary files a/bin/calc/chargementParametresFichierAnalyse.class and b/bin/calc/chargementParametresFichierAnalyse.class differ diff --git a/bin/calcul/formatDateWriter.class b/bin/calcul/formatDateWriter.class index 9a483c9..b4e3d7b 100644 Binary files a/bin/calcul/formatDateWriter.class and b/bin/calcul/formatDateWriter.class differ diff --git a/bin/fenetres/create$1.class b/bin/fenetres/create$1.class index bf3b533..1c1e913 100644 Binary files a/bin/fenetres/create$1.class and b/bin/fenetres/create$1.class differ diff --git a/bin/fenetres/create$2.class b/bin/fenetres/create$2.class index f58c03b..7779106 100644 Binary files a/bin/fenetres/create$2.class and b/bin/fenetres/create$2.class differ diff --git a/bin/fenetres/create.class b/bin/fenetres/create.class index 02569fa..482d536 100644 Binary files a/bin/fenetres/create.class and b/bin/fenetres/create.class differ diff --git a/bin/fenetres/proprieteFichierAnalyse.class b/bin/fenetres/proprieteFichierAnalyse.class index 0acea36..414e6aa 100644 Binary files a/bin/fenetres/proprieteFichierAnalyse.class and b/bin/fenetres/proprieteFichierAnalyse.class differ 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