From 27df011b47f46b612f34c8c2d0f1a9c1e9887c2c Mon Sep 17 00:00:00 2001 From: pablo rodriguez <58742538+1-pablo-rodriguez@users.noreply.github.com> Date: Mon, 29 Apr 2024 11:33:14 +0200 Subject: [PATCH] MAJ V4.5.0 --- base_listes_etudiants.xml | 252 +--------- bin/.gitignore | 433 +++++++++++++++++- bin/baselisteetudiant.png | Bin 2865 -> 3606 bytes bin/baselisteetudiant.svg | 67 ++- bin/baselisteetudiantmini.png | Bin 1243 -> 1604 bytes bin/defautBaseEvaluation.svg | 56 ++- bin/fusionneBaseEvaluation.png | Bin 3326 -> 3793 bytes bin/fusionneBaseEvaluation.svg | 108 ++++- bin/fusionneBaseEvaluationmini.png | Bin 1358 -> 1498 bytes bin/quitteEvaluation.png | Bin 2470 -> 4089 bytes bin/quitteEvaluation.svg | 60 ++- bin/quitteEvaluationmini.png | Bin 1191 -> 1757 bytes bin/removeEvaluation.svg | 94 ++-- bin/removeEvaluaton.png | Bin 3135 -> 2809 bytes bin/removeEvaluatonmini.png | Bin 1450 -> 1295 bytes bin/renommeEvaluation.svg | 48 +- bin/renommeEvaluaton.png | Bin 2865 -> 2286 bytes bin/renommeEvaluatonmini.png | Bin 1289 -> 1122 bytes bin/sauvegardeHistoriqueEvaluation.svg | 106 +++-- bin/sauvegardehistoriqueevaluation.png | Bin 1962 -> 3856 bytes bin/sauvegardehistoriqueevaluationmini.png | Bin 983 -> 1712 bytes bin/saveEvaluation.png | Bin 3321 -> 3681 bytes bin/saveEvaluation.svg | 37 +- bin/saveEvaluationmini.png | Bin 1475 -> 1614 bytes bin/saveZipEvaluation.png | Bin 2780 -> 3928 bytes bin/saveZipEvaluation.svg | 146 +++++- bin/saveZipEvaluationmini.png | Bin 1338 -> 1595 bytes src/MEPTL/meptl.java | 124 ++++- .../actAddStudentBaseListesEtudiants.java | 28 -- .../CreerBaseParDefautListesEtudiants.java | 7 +- .../ecritureBaseListesEtudiants.java | 104 +++++ .../myTableBaseListesEtudiants.java | 1 + .../CustomInputDialogListeEtudiant.java | 140 +++++- src/fenetres/baseDonneesListesEtudiants.java | 13 +- 34 files changed, 1388 insertions(+), 436 deletions(-) delete mode 100644 src/action/actAddStudentBaseListesEtudiants.java create mode 100644 src/baseListesEtudiants/ecritureBaseListesEtudiants.java diff --git a/base_listes_etudiants.xml b/base_listes_etudiants.xml index 2570562..93e06b0 100644 --- a/base_listes_etudiants.xml +++ b/base_listes_etudiants.xml @@ -1,251 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/bin/.gitignore b/bin/.gitignore index 8449d37..aa1138d 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,12 +1,438 @@ +/resources/ +/BaseEvaluations.png +/BaseEvaluations.svg +/BaseEvaluationsmini.png +/EvalTabDefautStyleLeaderfalse.png +/EvalTabDefautStyleLeaderfalsemini.png +/EvalTabDefautStyleLeadertrue.png +/EvalTabDefautStyleLeadertruemini.png +/OU.svg +/Verifhistorique.svg +/about.png +/accueil evaluation.png +/accueil fichier anlyse.png +/accueil.png +/accueilBaseListesEtudiants.png +/accueilChargeEvaluation.png +/accueilChargeListesEtudiants.svg +/accueil_new_version.png +/accueilanalyseCalcl.svg +/accueilanalysecalc.png +/accueill evaluation étudiant.svg +/accueill fichier analyset.svg +/accueill new version.svg +/accueill.svg +/accueillChargeEvaluation.svg +/actEvalEnteteActivefalse.png +/actEvalEnteteActivefalsemini.png +/actEvalEnteteActivetrue.png +/actEvalEnteteActivetruemini.png +/actEvalEntetePasActivefalse.png +/actEvalEntetePasActivefalsemini.png +/actEvalEntetePasActivetrue.png +/actEvalEntetePasActivetruemini.png +/addStudentbaselisteetudiant.png +/addStudentbaselisteetudiant.svg +/addStudentbaselisteetudiantmini.png +/addmenu.png +/addmenu.svg +/addmenumini.png +/ajoutetitretouteslespages.png +/ajoutetitretouteslespages.svg +/ajoutetitretouteslespagesmini.png +/allContent.svg +/allContentChild.svg +/allcontent.png +/allcontentchilds.png +/allcontentchildsmini.png +/allcontentmini.png +/analyseWriter.bmp +/analyseWriter.ico +/apropos.png +/apropos.svg +/apropos_new.png +/apropos_new.svg +/aproposmax.png +/aproposmini.png +/atraversanalysestyle.png +/atraversanalysestyle.svg +/atraversanalysestylefalse.png +/atraversanalysestylefalsemini.png +/atraversanalysestylemini.png +/atraversanalysestyletrue.png +/atraversanalysestyletruemini.png +/attribut.png +/attribut.svg +/attributanalysewriter.png +/attributanalysewriter.svg +/attributanalysewritermini.png +/attributmini.png +/auteurcreateur.png +/auteurcreateur.svg +/auteurcreateurmini.png +/auteurediteur.png +/auteurediteur.svg +/auteurediteurmini.png +/baselisteetudiant.png +/baselisteetudiant.svg +/baselisteetudiantmini.png +/biblio.png +/biblio.svg +/chargehistoriqueevaluation.png +/chargehistoriqueevaluationmini.png +/collapseAll.svg +/collapseNode.svg +/collapseallmini.png +/collapsenodemini.png +/configuration.png +/configuration.svg +/content.png +/content.svg +/copy.png +/couleur.png +/couleur.svg +/couleurmini.png +/csvstudent.png +/csvstudent.svg +/csvstudentmini.png +/cut.png +/defautBaseEvaluation.png +/defautBaseEvaluation.svg +/dernierenfant.png +/dernierenfant.svg /MEPTL/ /OnLineVersions/ /action/ /baseEvaluations/ +/baseListesEtudiants/ /calcul/ +/dernierenfantmini.png +/dessin.svgparamètres évaluation et feedback.svg +/detailfeedback.png +/detailfeedbackmini.png +/documentation.png +/documentation.svg +/documentationmax.png +/documentationmini.png +/dossieretudiant.png +/dossieretudiant.svg +/dossieretudiantmin.png +/dossieretudiantmini.png +/downnode.png +/downnode.svg +/downnodemini.png +/entetenon.png +/entetenon.svg +/entetenonmini.png +/enteteoui.png +/enteteoui.svg +/enteteouimini.png +/et.png +/et.svg +/etmini.png +/evalLastChildfalse.png +/evalLastChildfalsemini.png +/evalLastChildtrue.png +/evalLastChildtruemini.png +/evalPiedPageActivefalse.png +/evalPiedPageActivefalsemini.png +/evalPiedPageActiveoui.png +/evalPiedPageActiveouimini.png +/evalPiedPageActivetrue.png +/evalPiedPageActivetruemini.png +/evalPiedPagePasActivefalse.png +/evalPiedPagePasActivefalsemini.png +/evalPiedPagePasActivetrue.png +/evalPiedPagePasActivetruemini.png +/evalcalc.png +/evalformatagedirect.png +/evalformatagedirect.svg +/evalformatagedirectfalse.png +/evalformatagedirectfalsemini.png +/evalformatagedirectmini.png +/evalformatagedirecttrue.png +/evalformatagedirecttruemini.png +/evalnamepage.png +/evalnamepage.svg +/evalnamepagefalse.png +/evalnamepagefalsemini.png +/evalnamepagemini.png +/evalnamepagetrue.png +/evalnamepagetruemini.png +/evalnamesequence.png +/evalnamesequence.svg +/evalnamesequencemini.png +/evalnode.png +/evalnode.svg +/evalnodemini.png +/evalnombredepagemaxi.png +/evalnombredepagemaxi.svg +/evalnombredepagemaximini.png +/evalnombredepagemini.png +/evalnombredepageminimini.png +/evalnumeroabsoluepage.png +/evalnumeroabsoluepage.svg +/evalnumeroabsoluepagefalse.png +/evalnumeroabsoluepagefalsemini.png +/evalnumeroabsoluepagemini.png +/evalnumeroabsoluepagetrue.png +/evalnumeroabsoluepagetruemini.png +/evalnumeropage.png +/evalnumeropage.svg +/evalnumeropageancrage.png +/evalnumeropageancrage.svg +/evalnumeropageancragefalse.png +/evalnumeropageancragefalsemini.png +/evalnumeropageancragemini.png +/evalnumeropageancragetrue.png +/evalnumeropageancragetruemini.png +/evalnumeropagefalse.png +/evalnumeropagefalsemini.png +/evalnumeropagemini.png +/evalnumeropagetrue.png +/evalnumeropagetruemini.png +/evalpasparagraphevide.png +/evalpasparagraphevide.svg +/evalpasparagraphevidefalse.png +/evalpasparagraphevidefalsemini.png +/evalpasparagraphevidemini.png +/evalpasparagraphevidetrue.png +/evalpasparagraphevidetruemini.png +/evalplacementparagraphefalse.png +/evalplacementparagraphefalsemini.png +/evalplacementparagraphetrue.png +/evalplacementparagraphetruemini.png +/evaltabalgngauche.png +/evaltabalgngauchefalse.png +/evaltabalgngauchefalsemini.png +/evaltabalgngauchemini.png +/evaltabalgngauchetrue.png +/evaltabalgngauchetruemini.png +/evaltabaligngauche.svg +/evaltabstyleleader.png +/evaltabstyleleader.svg +/evaltabstyleleadermini.png +/evaltextuserdefined.png +/evaltextuserdefined.svg +/evaltextuserdefinedmini.png +/evaluate.png +/evaluate.svg +/evaluatemax.png +/evaluatemini.png +/evaluatemultiple.png +/evaluatemultiple.svg +/evaluatemultiplemax.png +/evaluatemultiplemini.png +/evaluer.png +/evaluer.svg /evaluer/ +/evaluerFalse.svg +/evaluerTrue.svg +/evaluerfalse.png +/evaluerfalsemini.png +/evaluermini.png +/evaluerspan.png +/evaluerspan.svg +/evaluerspanmini.png +/evaluerstyle.png +/evaluerstyle.svg +/evaluerstylefalse.png +/evaluerstylefalsemini.png +/evaluerstylemini.png +/evaluerstyletrue.png +/evaluerstyletruemini.png +/evaluertouslesenfants.png +/evaluertouslesenfants.svg +/evaluertouslesenfantsfaux.png +/evaluertouslesenfantsfaux.svg +/evaluertouslesenfantsfauxmini.png +/evaluertouslesenfantsmaxi.png +/evaluertouslesenfantsmini.png +/evaluertouslesstylesparagraphes.png +/evaluertouslesstylesparagraphes.svg +/evaluertouslesstylesparagraphesmini.png +/evaluertrue.png +/evaluertruemini.png +/evalwriter.ico +/evalwriter.png +/evalwriter.svg +/evalwriter32.png +/exit.png +/exit.svg +/exitmini.png +/expandAll.svg +/expandNode.svg +/expandall.png +/expandallmini.png +/expandnode.png +/expandnodemini.png +/extraireFichierAnalyse.png +/extraireFichierAnalyseXML.svg +/extraireFichierAnalysemini.png +/false.png +/false.svg +/falsemini.png +/feedback.png +/feedback.svg +/feedbackmini.png +/feedbackstudent.png +/feedbackstudentmini.png /fenetres/ +/fichierAnalyse.png +/fichierAnalyseInfo.png +/fichierAnalyseInfo2.png +/fichierAnalyseInfo2max.png +/fichierAnalyseInfo2mini.png +/fichierAnalyseInfomax.png +/fichierAnalyseInfomini.png +/fichierAnalyseModif.png +/fichierAnalyseModifmax.png +/fichierAnalyseModifmini.png +/fichierAnalyseRenomme.png +/fichierAnalyseRenommemini.png +/fichierAnalysemax.png +/fichierAnalysemini.png +/fichierCSV.png +/fichierCSVInfo.png +/fichierCSVInfoXML.png +/fichierCSVInfoXMLmax.png +/fichierCSVInfoXMLmini.png +/fichierCSVInfomax.png +/fichierCSVInfomini.png +/fichierCSV_delete.png +/fichierCSV_deletemini.png +/fichierCSVmax.png +/fichierCSVmini.png +/fichierODF.png +/fichierODFmax.png +/fichierODFmini.png +/fichierSVG.png +/fichierSVGmax.png +/fichierSVGmini.png +/fichier_analyse.svg +/fichier_analyseXML info.svg +/fichier_analyseXML info1.svg +/fichier_analyseXML.svg +/fichier_analyse_ODF.svg +/fichier_csv_studen_delete.svg +/fichier_csv_studen_modif.png +/fichier_csv_studen_modif.svg +/fichier_csv_studen_modifmini.png +/fichier_csv_studen_suppr.svg +/fichier_csv_student.svg +/fichier_csv_student_info.svg +/fichier_csv_student_xml.svg +/fichier_svg.svg +/fichieretudiant.png +/fichieretudiant.svg +/fichieretudiantmini.png +/fichiergestion.png +/fichiergestion.svg +/fusionneBaseEvaluation.png +/fusionneBaseEvaluation.svg +/fusionneBaseEvaluationmini.png +/heritagestyle.png +/heritagestyle.svg +/heritagestylefalse.png +/heritagestylefalsemini.png +/heritagestylemini.png +/heritagestyletouslesnodes.png +/heritagestyletouslesnodes.svg +/heritagestyletouslesnodesmini.png +/heritagestyletrue.png +/heritagestyletruemini.png +/indexfigure.png +/indexfigure.svg +/indexmatiere.png +/indexmatiere.svg +/information.png +/information.svg +/informationmaxi.png +/informationmini.png +/informationmultiple.png +/informationmultiple.svg +/informationmultiplemini.png +/intervalle.png +/intervalle.svg +/intervallemini.png +/legacystyleparentpresent.svg +/lesnodesevaluer.png +/lesnodesevaluer.svg +/lesnodesevaluermaxi.png +/lesnodesevaluermini.png /list/ +/loadpreference.svg +/loadpreferencemini.png +/loadpreferences.png +/logo analyseWriter accueill.svg +/logo.png +/logo.svg +/marquenode.png +/marquenode.svg +/marquenodemini.png +/menuEvalTousParagraphe.png +/menuEvalTousParagraphe.svg +/menuEvalTousParagraphemini.png /menucontextuel/ +/menulegacystyleparentpresent.png +/menulegacystyleparentpresentmini.png +/meta.png +/meta.svg +/new.png +/newlogo.png +/newlogo.svg +/newlogomini.png +/nocsvstudent.png +/nocsvstudentmini.png +/nodeFichier.png +/nodeFichier_FichierAnalyse.svg +/nodeFichiermax.png +/nodeFichiermini.png +/nodetail.png +/nodetail.svg +/nodetailfeedback.png +/nodetailfeedbackmini.png +/nodetailmini.png +/nofeedback.png +/nofeedbackmini.png +/nofeedbackstudent.png +/nofeedbackstudent.svg +/nofeedbackstudentmini.png +/nologo.png +/nonewlogo.png +/nonewlogomini.png +/nonotestudent.png +/nonotestudentl.svg +/nonotestudentmini.png +/notestudent.png +/notestudentmini.png +/noverifhistoriquestudent.png +/noverifhistoriquestudentmini.png +/nozipstudent.png +/nozipstudentmini.png +/numerotationchapitre.png +/numerotationchapitre.svg +/objet.png +/objet.svg +/odreparagraphe.png +/odreparagraphemini.png +/open.png +/open.svg +/open2.png +/openmax.png +/openmini.png +/ordreparagraphe.png +/ordreparagraphe.svg +/ordreparagraphemini.png +/ou.png +/ouenviron.png +/ouenviron.svg +/ouenvironmini.png +/ouenvironsimilitude.png +/ouenvironsimilitude.svg +/ouenvironsimilitudemini.png +/oumini.png +/oustrict.png /oustrict.svg /oustrictmini.png /oustrictseps.png @@ -172,10 +598,3 @@ /zipstudent.png /zipstudent.svg /zipstudentmini.png -/baseListesEtudiants/ -/resources/ -/BaseEvaluations.png -/BaseEvaluations.svg -/BaseEvaluationsmini.png -/accueilBaseListesEtudiants.png -/accueilChargeListesEtudiants.svg diff --git a/bin/baselisteetudiant.png b/bin/baselisteetudiant.png index abda3abfa8ebc87587e6d668013579f26c27cc08..0d28ef846ce537475a272e1348d46859916a566a 100644 GIT binary patch delta 3547 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 delta 2800 zcmV*`9I+OVU4II`Nkl9W2^<27f!%^seeLnD1hhgaU<5E3m;m%{1oz*H4SWU^0jr2O(L5j# zY4Sp7h45>H&yjECSBfwPA?xzEQiIhI9!9wEErCt^RU-TXLBAr<2ptf%{hz=l{ys$L zl!(z2)2c?bBY#8x2%%fk0i^)B{Jk_j#_AM^G}cAyX{<}o!PPg?r<9O=gQUxuSZ@#L zaN2rAZi*Q41b)PLtaKq$#0QIljOlnhaQWq`yBrU3*(ibFm?Y4uA$>TacBE!3l{J;j zR1$mces28)LZWK!84=<{0cbK@TGa0ZFk+oe->@Xl6MxGlnMlQ4BI8Yn8`$NP#cMO!9?YIPWng_Ejd5>U{=7jf#T&JoArs6(I* zAZ$lht2t1-O>Pq#K$YZYVrfsH0uN!M$GuJjZRsXK2i~ZF-L>sFQ2%PvXs%Gg0;bfk zr#_Qi!GACzumh#aaO`8)Ee^`SJ!VWdAAi)bz8$Dl51;}+1+trZ!CmubgsBe0_F6a_ z2K(#pXo%2J3~T|mB78`>Sp|gnP1*A@Pqrm?P)CMdMT0p3)Fi~11d`@Sr_qUVoD`r< ze;uuLc(r%r*%GKU;anKbh2VVSeOa)MQ=tYb!+wHJCWbnSBO7tp3~UvVN~Kf}B7f<$ zLaF$Nh}t_S7fbR`+O=rfU_^$1Dg;AsF5nSjD`GrP|6XZ~9d;0<@?*N&zk)-x(B2=p zas!bv(})lVHh?xBopfI} zY`q&*R^<6B$B*Mn5u=IUCrOJ?2;m+^Y&jRLis$J~*AIuRqd5L?*v41b1~?i%Lr2pR z*abg&fEDR{UzGXA1c_#)(8gxvW&n!nu(m#J4{1%D<|p0kdv zBd12kh%+r(I^ocBGU{JU7;_QzOfu79%|zEh zn3$VoA4s2o8vQ)2-?!ah#s{!qy2!+p^=^P13p8KsVshLEgN1?KF{wk7wy+6GbX3hPeJ%*!YrXs}^9%&}x5S_D73nLH=dtb7CJ-TAq z4g>P9j@9+d>quQgi2gmV_UNj5yPDnQt7OvZnN81$OaGl)`XVv|O`nMvtx{;D01aU* zBi2@(o57k7_A&jFL)dyubaEG$Kb{sX?xs z`W-Yi7)M5eng~W$0PN;cpc{03`YC)?HApK^FscU^KR(OIS&#G4>rXPQpnFr}dt}?b z!%TYQDU4QW$N2N)(`xx0cc8Q^l*$38E28pH(hH0nY?@9Yp2Y@G@@X>Yv=#7dFI;LCa9MdJ%ZqkUJEm8B@krd2n0kB> ziIs-8^ll(FVd}3E3J*^PZE3C1vfki}x?f`Z=HU41uzwBc(-k_lVcO#_ak*n*5#h&w zSOOi}K;hM{Emb1GRAm&P=62A;G!~=Meuu5UfE~|banQCejHyo|_o|iDrM*PZ-wR7y zhWLW!JvXvt-(l`s^a_@3CjmAso4X(X3)>EUPUzlIk$qom8|L$F$?OEcwl8rh4`caO zVy6{i>wg~*lJ~KFZL#8!9KQ?cCYl1pWOVx@MBT^zOJ~x#{oC9>evmWsrrX|JwxQs& zl9T-Eu1Sm@T!2!rB+n8>QaG3@*d( z3nR`#FlNPxO_e>w7mj`SpE}>4U57s=%^&1+MSnVvy?GLtVh!jXK6;_%_1ot^H^{Lf z^W_Wpum|+SnfoKSSPctTz@-{!mj#1*!hjx-(>4xR!~s=?;s7F_p=o=t*dh=A>5^J9 zw*#mLFx7)7)!uUoWv2pd>n3IAVAUo#c{Un4>5Z*y z9{b5&G@}q03=Bc3A&B^rPnTR0VSBvHeSdmAG%~G}`W`T=nL#6B+ZyE+-QaQu?I5tn1yAC+LN6sf{nY%fvr75NSz;eLHH!ZdUE8l|#;-^biLT--L#ZIki zZ~}MALl1>wpn+*Xmv0)$!X!k z&1pC&^*5l8ELgB7vC$y%uj{uf7cMl_atU|~+g>71JaMoorQ}`ow;{Ej@BUJh+JHzA zP$UZ$)Hm1N0IF#|UHz}62Dll&f4|I|*Cg#t$$tRgISz~%IXE@|0000 + gradientTransform="matrix(0.10627944,0,0,0.10627944,10.850063,-7.2293936)" /> @@ -65,10 +68,10 @@ + d="M 5.9479504,6.2960517e-7 C 5.633436,-6.0660395e-5 5.320154,0.0062319 5.1420977,0.01907143 3.3291496,0.14981644 1.8105882,0.67646771 1.0926723,1.4237284 0.89800097,1.6263578 0.74632487,1.8716083 0.69655667,2.0639423 c -0.03848,0.1487142 -0.040365,0.413496 -0.00382,0.5503123 0.1530623,0.572917 0.77810513,1.1075967 1.73975023,1.4885676 0.7682842,0.3043697 1.5493632,0.4685664 2.7303098,0.5742857 0.3253365,0.029126 1.3024376,0.025033 1.6585638,-0.00707 C 7.5221198,4.6068419 8.0271375,4.5282367 8.5376811,4.4030529 8.790698,4.3410159 9.3376539,4.166547 9.4862883,4.1006535 9.5427683,4.0756165 9.6214653,4.0425345 9.6606433,4.0270975 9.8159083,3.9659225 10.161897,3.7785942 10.348805,3.6549555 11.279461,3.0393344 11.49855,2.2605427 10.938347,1.5577705 10.295344,0.75112681 8.6763944,0.15527091 6.7603356,0.0196221 6.5779604,0.00671197 6.262458,6.7589605e-5 5.9479437,7.3396052e-6 Z M 0.69546687,3.2877053 0.73742137,5.198544 c 0.74747223,2.5594279 9.55426863,2.5779714 10.50060763,0 V 3.2877053 c -1.2554297,2.680569 -9.3607815,2.8637563 -10.54256213,0 z m 0.018525,2.5041928 0.041955,1.9108351 c 0.74747213,2.5594288 9.55372413,2.5779728 10.50006013,0 V 5.7918981 c -1.255427,2.6805666 -9.3602342,2.8637576 -10.54201513,0 z m -0.063749,2.2775296 0.041954,1.910292 c 0.74747233,2.5594273 9.55372213,2.5779693 10.50006013,0 v -1.910292 c -1.2554277,2.6805663 -9.3602341,2.8637573 -10.54201413,0 z" /> + transform="matrix(0.39169427,0.29001939,-0.56402708,0.23265069,6.9503388,-1.2737445)"> + + + + + + + + + + + + + + + + diff --git a/bin/baselisteetudiantmini.png b/bin/baselisteetudiantmini.png index 57dff5ef6cd59d8be8a2e568f5a594693798039b..e3f849e76a78c81db2481da9cdb81e0a519b30ec 100644 GIT binary patch delta 1529 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 diff --git a/bin/defautBaseEvaluation.svg b/bin/defautBaseEvaluation.svg index 8cc8780..b221bdd 100644 --- a/bin/defautBaseEvaluation.svg +++ b/bin/defautBaseEvaluation.svg @@ -85,7 +85,7 @@ x2="-28.613434" y2="168.68048" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.84635001,0,0,0.84635001,22.541417,-4.1659876)" /> + sodipodi:nodetypes="ccccccc" /> diff --git a/bin/fusionneBaseEvaluation.png b/bin/fusionneBaseEvaluation.png index 38670cc992e4341875143fa3035de140664164d9..6d651c1e0e7666123d553a5bbf0845d02d07a088 100644 GIT binary patch delta 3736 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 diff --git a/bin/fusionneBaseEvaluation.svg b/bin/fusionneBaseEvaluation.svg index 57bc361..f29d2b6 100644 --- a/bin/fusionneBaseEvaluation.svg +++ b/bin/fusionneBaseEvaluation.svg @@ -8,11 +8,11 @@ version="1.1" id="svg5" xml:space="preserve" - inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" + inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" sodipodi:docname="fusionneBaseEvaluation.svg" - inkscape:export-filename="..\..\..\..\eclipse-workspace\baseStudentUFRHG\resources\majInscriptionToBase_mini.png" - inkscape:export-xdpi="55.466667" - inkscape:export-ydpi="55.466667" + inkscape:export-filename="fusionneBaseEvaluationmini.png" + inkscape:export-xdpi="51.200001" + inkscape:export-ydpi="51.200001" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -30,7 +30,7 @@ showgrid="false" inkscape:zoom="4.7298324" inkscape:cx="23.679486" - inkscape:cy="18.922446" + inkscape:cy="19.028158" inkscape:window-width="1920" inkscape:window-height="1009" inkscape:window-x="-8" @@ -85,7 +85,7 @@ x2="-28.613434" y2="168.68048" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.84635001,0,0,0.84635001,-14.746056,27.664725)" />XLSXXLSX diff --git a/bin/fusionneBaseEvaluationmini.png b/bin/fusionneBaseEvaluationmini.png index 5a4272645d3a24807a521b0c3c18e40ab676d9c5..e493e7ad83b610add0192850a21df03c526e61e4 100644 GIT binary patch delta 1423 zcmV;A1#tS#3fc>hU4I23$w6o%h(x0yRL?Q|a~18rGLfwq`}RwGhU z6bOliA|`~W;fGNnBp{I}XaLb@Tw*jaDiYBshP6~BCZMt?AjnnJAp=1Z7jbdd%0( z-N(O9v_5|Z0BA4{))5uC8yi0@oiJfkNEe6nWfkXnYZZN8zYs0)CFr)#LOp$to!S$K z44DqjrgG+$lb=QRzP|Kd0qclLs%Fgi_P(`iYueVo+S}!Sj6zjbTfjs**jt#&rQrPMyW1)?m)D_j`9w+;f=pC5BFR&dQR*l!+%KK(t*S6Ue)l_Qzd(rEcq3^ zy{*E;AxkA!^-A4)d1LzLtslwdwH#LL<)71zGr#g$2)51QZK4gf^9v6;@VUy}>Q zj)!b-64l}%Ah}dv01QB9n6d7D&ZG|JLR}X`wQ&4RJy=I1jc;jbU$A3G4FCi>JMqo3 zWv9~N@VT8qd+NAr))R*2`$|vy_vq2Cq@)z51b=IZU}!$l)1e|u;Y6#T7R{E_vRQhf z_njMn2OliWTliRN;mAtm-m4!MHaD+2) z_J5#j_p_L`p&#M2ka=Ov(2KiT%YG7-($Pe6EeV!lA{oqCu$c)n=gu0rP>{$zl*rsi z%#0t7cc-J#+);+!ZWz%t zC}#x}Q=)ta1bGUPtyUmW%;fr(O8}rHW`B;3guer`iOXF&B+W$Lq)Ra93S140i)SQM zRLcM}g8pjQM41zs-UP@^5=w3wZ$>0yAh9Wl#Cs9|^!3>UtMwUZ+7~D&?S)V#!jsNI z%@g2sOHcvycpQ+V*@(qNG~9Rg$+j(NiJ;U1a-jgS1Ds^&ejS;1M(VpHcU=Siynm+o zd7Wx7a2hVxVnjkVl(}peHr5Lw0?a)40%_RP48ox{sA>mXLmT>Id}QCPmh`$L0Ek5= zYN~a+t;h2s0Qw_axd4J7B9{xmrY4XO2}D3NG6fdP=>EY3zX6EHBSKN}dL&|p5%8aY zBKu()vFimzAmN0wpcc-;d!cFP5q}ssQ4ZkTpaHo|zjD6)WsIn7LEYqaNTw9XvJ4_1 znMxwx0eHQq(An`mzyTyvqmA2g5D1oM&CCURNB9$ToZ1Y4U>FQ$g7mjzVw!|>t{N6w zW$$ePV&P6}#mITES*-{LF2Fa?4NZ%H*?_F%qo{Z|ic7~K9El( z@&CAa9ElF2a^w_@tC=fWtodLDQppgm^>y>lM_QSUl)!>L6_2L}1`8l&#+Wfw_g>D%PDHLkV1nKftCj!& delta 1281 zcmV+c1^)Wl3(g9VU4I1INklYiv|i5XXOW@3zafwqk)26l<}7CGxQNK%qnh z6EL8SRz);|CW0{$j7BgqCY49@gE7VuG)Cps(29u>!6;}2MM5zs@=z(tVkxciu&piI z+V1W>e?PPZYNFlwa*}&z<~Q>{bI-XZiBxQvSx#iopxe?jGJmpNBGKM?>eTKBChctx z6uCi3m*@MI9t6Q3q1Z>_KQnxj#jJy@Hh z#ScZAFSk7IBpe!eao9mKmWtEp37p~xaJWYNw5~pYRc7HuQWwC=NMyt<&pb18 z(CE?rx8>zcXZG)3P$tCz{!~ZI!6M1s9iT}V*+Fq%e8%ze)i)>RZrwVg_4ft6WOuZ2=6Ra7T#B z{^N1z}y)* z0)KhRchU?QAtxPkan*%5msx>nE=Cv$nek(&j_u_u`TD0VRNmLfiIo5u&~ag-)1$eY zV#J-`dPEV157s2pHea@_wW(!oW8>Q$Ms(z}NC$wW7WWC2ad09_i4@A}Q`Ug|!AX0+a3&?K7RDyKrMcK0d<(~lUMD`uV%v3rE z(U}=Wt{m)B&>}oLi}NnS+#mwW1bVuFW(dH%Y@oEeAT_22h()&GF&8llm__#u+6**d z)&{x^7z&noK|+DplnS8xG+n;D1Zg=iK82Vgz{`}CZ4~tTOVa1kw`I%nfMVbpq#Qgi r3n>P);M^~yrR~*=FaDZJ<-PU~2L@@@H(WF?00000NkvXXu0mjfznx|S diff --git a/bin/quitteEvaluation.png b/bin/quitteEvaluation.png index f5e6e41eafb7bdbec87db1dceaf0b852365523f6..4a9b116294af5ee3579cde2dbfbeffa79092ccc8 100644 GIT binary patch delta 4034 zcmV;z4?Xav6Zs#IU4IXTNkl)_!kw^_otnJ9|R9vo9nNzyN|Qf$*`5 z_yzd@0Tmf>c@O~+#%%zV8FX9*k+|X@j-W7tMuW-@Q3#PBNLT_PBq1Ri3Ek=RR@1uNm zu1uf)??kOWBY*kLkBhX;t?fulh>?~*Hq{!U)%-=LRlog*K*zIbt)D4T{qiZBw;R&9G{7C53GYAioWrXU=25x`6+QyM>E8`HIhmvm8=+d0 zKTV!Dak4y&VS3i9yCNaB7lRwk1AxOpv1OAB(`PH8(|-}Pn-5{&)OS%`*Ak#RWAZS% ze$~9~5uv&nJ=waUPfwbpT>j#!poO#NDvdXW;+D-HIG_;(Xd+qs&lEM1QaaIJz9iv5 zkrR@IM@ZDL7eaL+j&0-cEyp4#oCVh|B1|S=c#;Gu8n8eKQKSF`C>5Ym z%HeeJ0oRWR)j_4M37b46{hgw3xP{&410Lwu@rnh{zNns`5Kq(`N5OFvJV(Lt0MEhq zpXZ6^2qdJ)P}d9)0_3DpOvvIfEYg87sT}$zNq+!<@+yKsBNX5{0-gs%aUUMcAKBwh zE}l0UdVL{zWsT-fBS*__4w?|cfypU5oP-wxI0ILoCS251=x3{7an>38SsLL-z)hO2I0dsMSrl{ z=YZo*`mXhJsc@E3dd*)qAP~#Tg}3(Z;hTNF?D0YO58zxB7tTxA{;3l|D&W9r1}B>a z!zRzg{O3NoEx-V<j$D7VFi<$be1?Nd|{zsK^6zZFUeSl4|;c%SU1l#G4 zu)^nCSqzFq$r)DSxH>okQfp z*zshO)5$b{{4qCT*)r!#AAaEcwYgcMzSPIN-Gt`|bo!U^r?cY|5`Rec;K4FeY^;n44V{Fum3EZ;auEQKnh=ADxoKGZ*d`1g zrG!ca1P9N>yIX#|B~XQ&1;+~j08x}M^|3cJCkj_;MDdgh_^yj?0AYIK3Dt#Z)8wfH zz@;k5_W9@B?lWhEm5q(`Gyo7n)QO3*u|^{q^YNy$4^MmY1MR7EHGcqruismUP}L{6 zbm?=1=m|I%gAt=nB75>0T)S?)A>fgNd*js=bIM20TG`vl2|icIOo_w3PnS`Slbuzm zR4xEes}#-v&oz2f@d;1X%l${XF$4co>7cL0jR#Zq^s5|q=RMs?>r{*mR1%N@> z$@uEsr|U)!H!X5-9Dmj6pkBQA_1+Ptp-b<5{EeWS?ef>}EpfHgZ*Cetaj9wc(k(bp za>h3o7afME@DShsgIiZQdTuw6TS5znl_J0jimf8PhI$vIjt?LSL z*L`bIb)^XaP}kUsy2j3U5Jf5m?DW_?`InDBuE+-=@XmR&UFXsLw$d9WA~j46rgWD`F}}A0BD_#488Av<(tQiV^ctg8)$dJLH(aZ=M(WCOUqb}uZvUh()zD& z2v{L!QB(YP962}$E|=LuoG7BA^U$aNyC^QLk}9fO#g;a!yrr!jbq#I!=A#vX?x9qY zb^8y|2b?Zp(}Zzs8icS^=;z{(9btW3P})PuRWT)7DTF;sC;v=kSMKU}C3 zpFUFZ$Ga5Cz()o_&6+93BUXzRaMtWN2+VZ4ULVo zBr{#MWZXFBd0jB0?Y=fJdx%s_Fv&tEjwLS-=zquF(b$MZ4GqFfLWusSpP2ijW5`_w z14$3nBQ8E(78xD}h7juWM}R<~h(trP`KF-TI~+JtRw-IK=It*ic>mMddT|G()MhY{ zggXbaU)?*E9UC3RXd0UWgE$a0F9|#+LrgT$&796Y*ejL{%*c@K1n}CWYOw%70RRv} zbbn!C!eG6g84{#KM39bzC|GC+1MNLiGopf-j%gHr zYfuh*w4q7dS6`29o)^qs&#${Y`ttfOyMHuWo_%84^@f(~vXL`Z>b+y7rz&ygVs+x4 z!qsI{Crb$_NwQFeA>euHtBM5SH-L7zsEg;kl{b7@B4>asIj298tsTsq3zgEU(IeSv ztCiNYSy1bAk_*?aiKlrUR{`+t9k%%TrZ$DY-4LxxO{m6^(S%WD)a!Pp7@XeLeSA6aiR#v4M7t^w23CB%-TVRsg#|imA8VS6i_J%`erim0OGyb z!)6DpRwA0)Vdi-%{8+prxS{2`&#qdffXivtlpI{9dFiRenEXiRLpV@!26iqVF)>3? zTT|j!+PS6ph_ScDa(|?998LORkF?Kj_f#t`>Z789my+^uw-r3RTES9; z8Hg-7frMqGkf`8bm8P+!GZ2k2VX#;lP=4wgWTu28E46F?XVv;$7&z=XPpiUR$doGI!}avRwyH1Q@xM z#K(r9v91oy*C=cqXg_^^bJG_)SH{Ohhbg?YQxqkvUcXZ{XZn=C3)U~>pl+A!Ddlx{ z51w;T!5avKP?DWN27fPF_`vG*o4$?Ob@0S(HKkJ%;vDCz)PMbMzchOHVX4oNQfInS zss77zkKgO`*V|H9Oj0t2$wNX+zLuOM-5Rvr?tsJB?{HBFJi&-D^YHfO-M0leDm(;z zGZMwZo!gs2b(oxJ!kVl!ayWmIap9D_ELCJ!XH~)rB3}FOJAaJ5`&m!lkb>h85QyD7 zOtyqxi7@1#>n);eIT_~!jOX;v%AxWZ#`FT5+o%0|BYPA+`eRvLi?|uQ- zEjAy9r4LWSkfe4jS@Kj-eG~F2rCk_EkDo6>HN>PdU~8%gL*;VZmRtN*nf1_1xNJ?q z%C~p=#)33TRP1?^x3smGGBYz9yRYf-D@mK3*4A7_?tiZr@JdZRF7_0`|1J4;$3HOt z|8fx=r1p*3>@K{wWj~FMH7@UI%`Lxf5kfR!A$U@+!vw7cnUSH0WdHEj$4;@@!7o@; z&~dggIArbng}zPHY1ODcyuoY;(Ix`uLe78JcSJ%+xL$|Z!5R!uC}32uFsfAu*QlUZ zDnJzSo`2U#65!$hrwdM-6Ri#>8UzVf9Cp-N?D*>Z`RWRtKKyJ--jn(^bLV%_SDv2f zTsU{aTOq-k=WZKx4>v&oM62a6DHX_MRK_}8 o9LF$(DCBYkX_QL<{L`!WA6u?=H)G(xOaK4?07*qoM6N<$f_de@9{>OV delta 2402 zcmV-o37z)&AEpzKU4IEPNklN9fqz606PO5G0h9w}z!;ze zurd^LfG>bOz$d^KU>(q`Xgsa{id(9ocQ(j4T)GfhL$3Z&H#Z&)<;ess$S`0Ua1C%J zFl4~i4Ni^$Zv!s_FHv#RB$StcJfGb_+9t0^6WHGQAxQ#On46tcvenwyb(c8n+CV(KLfWHCNX9O;jbPw1s zMPW))kV4=ez=fxqX+RkrI?lYZB}{1mzvQa`1{ix7zS*8R-_YNNs)6Ze2x)M#5QL5Ts`XB@6SQJ`rUY#9oLHeAxaPk+n1M`toOfscU6r|sn{%i!4x z*j)gztp4o{O+W$+i9_AzaN|xm%Wmqgn4nw_ynb4s7gfXWs!pwr(xWiF1w;FcrtEL!>G$3Rx`184 z9_puD&ekD6ACRx69X>0B&cL#<4~(mEvJNFUZ0lWAzn$j63JC2W&w;MSbpGuR+ySKW z#(xR8#(IzHC@z({v++QmjfhZo({`Y8K%u>suO9Ahs9*A~%jc3el z#PEM)^FAINUyLVo_KMI^SdU?>PNovzsef)4QoWvRh_AE)ODb*Fo@Y?jWAn(SD0xmE zNKT*4yo+GXhyj^-a2wpbC)s)KkGbU9(TF}84y~m*96ItVMCSQ&f{>w^{XBP>P(K;$ z&<;BxxxMh(dr;5|!ecmx9@XL6BjwZX2Ob4-yyhlt@t^9*_J^dc_%N^lG!dEi^?$Ip zyFK?bmG4uebZbTo3=A;k5JaR0$C|4n_Aiysi&EDy};wFi5?S0T=S< z_hsJxc?dS@)Q{^05ox{PLDXtM`VS{e>}(s<1XjqlZ(KnnHdo79TYv|E2V`5-1*p^k z6A;FuT8&6fz+=2$0TSR{p`k;%ICMzMxGJ2gr$N3O=$ugKxS5)N1>r8@1%E$~P2(4l zZ!Xia=EFL6>keRtw~%b89EO=Y0+nJ!3vo3Y!_0$T5TgrMU0NbhjvIpsd288F@G)bf zW^lR+7ooXkH6rzaUQ#^*tRhQZqgUV5n&#*r08Ug4!n z87%=C#o#R~QNABBu_HE#6Vejk4Ow;TDli_?n^(>U=F4-_M}LvkTZd>32jx;eajS`u zSn6EhxQ8m1oPiwRpl_*+h>b=T6Q`LR^Pl?g@`JKs+K0rMm}b``Fgeoi$)xb?j1FL^ zFO~+8w-H%R{MZ{hv++suGsoQ-B(4 zP$u=Y9@4|irXJWFJ&}&P;k88!PYmvnbF<*Ovmp`^TYo69yd63M8~sj(0N2DGUkMFPUYc{6|p3`S<&YK6RX zPv04GVv~p&dwGRp{rNgaP!M_=QFWEK?fSK zV1WUYU>L=?ZZU>20@Yj~A5CtEMLJPcM7}_^4O_$5Pj~k&ef;sBek%v0?B;tBT@sRY zkG3{GeNxb8TBNqtWY4e-1b+?gC6@}_+!%)pCpce~=-Raoi65^UeOaT4G9#7vAJ;&+ UNQtjvh5!Hn07*qoM6N<$f?|b%Z2$lO diff --git a/bin/quitteEvaluation.svg b/bin/quitteEvaluation.svg index 94a0aac..976976b 100644 --- a/bin/quitteEvaluation.svg +++ b/bin/quitteEvaluation.svg @@ -8,7 +8,7 @@ version="1.1" id="svg5" xml:space="preserve" - inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" + inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" sodipodi:docname="quitteEvaluation.svg" inkscape:export-filename="quitteEvaluationmini.png" inkscape:export-xdpi="51.200001" @@ -29,8 +29,8 @@ inkscape:document-units="mm" showgrid="false" inkscape:zoom="9.4596648" - inkscape:cx="21.723814" - inkscape:cy="17.495335" + inkscape:cx="21.77667" + inkscape:cy="17.548191" inkscape:window-width="1920" inkscape:window-height="1009" inkscape:window-x="-8" @@ -76,16 +76,54 @@ y1="79.43959" x2="-28.613434" y2="168.68048" - gradientUnits="userSpaceOnUse" /> diff --git a/bin/quitteEvaluationmini.png b/bin/quitteEvaluationmini.png index 7c484fda435177d2d396ac3f24a1e6916cbd4aa0..72e14f6941a8614c98690f1ff1b02eaa690f91e1 100644 GIT binary patch delta 1684 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 fM&u=J-?{EDv&NOZm + style="opacity:0.73251;mix-blend-mode:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter5476)" + d="M 2.3250513,18.968908 V 3.0548142 L 3.6458567,1.2507872 H 21.009615 l 1.610738,1.804027 V 20.193069 l -1.610738,1.449665 H 5.1599507 Z" + id="path5438" + sodipodi:nodetypes="ccccccccc" /> diff --git a/bin/removeEvaluaton.png b/bin/removeEvaluaton.png index fd23199ada86dcc40bc69f27b33b25e6b91c2aac..0c9098b98f4955e0cbce1faef89a1837f6579b41 100644 GIT binary patch delta 2744 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 + sodipodi:nodetypes="ccsscc" />? diff --git a/bin/renommeEvaluaton.png b/bin/renommeEvaluaton.png index 08689b1e8d383fbbfb67caee9d7919256e0818b7..87893b9b11695c15c8fe5d507677c1d905801f9d 100644 GIT binary patch delta 2217 zcmV;a2v+y87VZ&{U4ICBNklC`^{BB(lbZ{gY$q9s-EsPIR3H^;4X>w(JmsdJSCG=y5FixR> zlq7n@#<1AcIb04M7t4x?3G@Q!ri1|zOcX+NcV!NjLaS6lH+m2gl*)&`)Coi<#qp*q z^SBgxcz>2Zn}0~}<~|=!hz@765JI>rkISHaeT8;pJju8{Gnk)#1KX~0lcgk*7!e{8U6Icv&_kp7_=ORKJJQ5P zqKb`Tp)2w|Hnb2zJu04LHz&5K;c<)(4i-;5ZqCPso_{cmjORzt$0_Yl^aI0r=W%mB z@;3gUg@u1OkCf(BuBn6HOi+6l+`EBR4Iz3E0u%xUN0Tgs@R3s1K5}kHM^hn$pO+UA z;UPS&Q4y~3N2m5i=i`Oe%M)F%Kr{)l_yKG^0NW44rEAbSq*?_ji7P;Stvt z?a&y)f;99wT|&OWC=V$Bq?Fdfzc6F@CU(?!;)1mOu)VLF5>~$n$G?JYYamEtugN>@ ze18srqEc!;&17}%Y56fUYk5*i%iesZt=ddZLu1E*tP;*#u=l5qhv!Gw4oZD{!-#?Q zn%a7}-{2hZ`ODl{x0Tg-r{szzUyGI}rECyF{6VQ?&--&2?Py!JT4D8DV61>^Cb(W< zdq&1T)ZDIyykG6->ixmPy<_0h#Z(41E`K?wH0vjs{L46D!eh(-Y*dxI6t0XKO^Sa!rQw0X@^tdMvnnBNLh(Ov4Pao zCGGZUyo!f4UGnwR#oS&JzF`KiU0se0(%v{zsa6&A6v9xVqt5k5JY%qGy zvvntb+P5XDZy(Kj8UIu+&e>))R#rC20#GR4a@dzkuS>(8ADQvZ9*Ug-Hd`QlEmYOm zk4+i_UoN#R(6+4D_#}1r+-26@(tmG8jd?D0`pg9iH#axZ{`#TfogcESrs`^ddZaAv za5K4RkcGRB@yeF{ly#)dKLgip+WY_fEM%nF+F@H(-{8ryk_2n{Z^e6)`rjR|^A{dX zWA5(myq^A%A}#xC3sN3Hi1uHP=2loHf8LYNtev@z!P{DNdVg3nv;8?%sed5z=Lro} z)wNgq=?j8CUsNA4A@W=H@BHHbnj6;*+^MNN&eW+dF=dLy=~LdB5}7~iIdS5}k%YCU zaq9-5fh~Q5pMv&Urw&EtI^fPz119qMx>YA~a?cHK zn&3I)AX^r9(Jb8cCxm^V<4%&7sOxzkBvEuZFc*y$W*+isGC5 zovySH!XqP%P)C|izk~CaTKY6<+qT}8S5#(QhVU5H)!0r{qE-6f}*t6^PGkb z)DRcbhhRsVk}L4jxt6{VecRf5_u*>U8U8-Ueu0)(U|Fz+Z};X)JAdF#L5Bx3HY~(7 zA1oWqusa{#pJTtBn<}x)U&+?pdCX~VzSHODkRZa^YgwH!vjx7-fwy0V?yZ1tRUy+> zk-a;QS<=B`bGmXmH9a34)n-;JWaZdeppRF}vFcjnyyg5S`zX_;lvYP^oQC%Ev3&`3 zWJ_L!1=Cvk+}s`jOMl4x0n%sK?u^Z?t{&#CAUFFcQ>B#Vj`BG5dI%wUgoV(-1qpfu zLGNHFILo;`Ka#KY!yMVu){nDtY=2OIU&}dn??J{UC^V4e3@|uZ>6i${MTg_(NYiMB zU3pwMe1hzwr}zlCci{^2h7I8L02Q(GUV@;2mU9{!Va+!%b$=bl}mN@DExkzY7)@HmU4l-13K*C!{40beemUxU5?SAnXK74dyRrdsT=54HfafI{%uvlT?C)`O%#M|5RVfB4H z32ZM;YwK_!3L!kT58BYb>ZT`iuzzn7I?^{iF)=YK z)6>(X$z+mJN|`o0x$5N!cV-UY?Tqe!U1rnCI70ts00000NkvXXu0mjf^)+7U delta 2800 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 O00001uYd+XV4fvu%2RH2lDKqx2$mWF}_ zK|)9oDUAd)!5bJakQj|2)RdqB0Wpz8Ff~Slf*=MYV&qn^(o!f?`lA?uf{}8GZPV># zd-l?0KY#3QcUy%B`cCGY$v-FbkLnWPbsJ07VSVz*V3gI0_sU zq?J2CL_lyLtV3uo50v;+O_Xv4c8>wFdkUlvgPR5j23G?vw)ilaky*lg38KfhB04&4vA z7SeF-cX4v@Nq!RK28paENfWA`eMU6W16zz#BZ+gbVIIws^k zMn-Od+FE(Q3v{4VQ&eCR@I3GgaPHrb>mD7~0T*rRILk8J(&oMnz=%;3Rr`Q}wwi{^ zJ1H*y5Wox!jS#;D0RA_WqR3Eaw}DR&;AjHUXP)N@Y=y^2SW!#=b`c- zWzw7cMyrySesR>*&mNqQVSXErZ8u$x#CWr6cz^9y{Eox;6IRh>-zvi!a!>=3@g&T_ z=U9eee`EB%&i!B9ZZT$N$H<%8=wAD=Y^*5ET8LpS!rT8mUV9c^J)R%MX;&>UAyO|x zh@3%bM-VxWsK)%V3*$FT>s+5dj`ZkHZV#cSzjyw6w0NWjjEO`**sP(TOY+XvMCY3E z*?)H;@@UwtN(1r`$wMhp8(MiaFF^jd*oxepPta6Asu zA6S5>VJK!3kg2mOYez3#xmOgi=FF!U>Q z*_Pu^+=HQyp-Ts!vzLGwLoWwa2q+YD5Se3pz=_kD%#xK=sU_Q{1upqbt$QaHwtr*N zHq%8KO47h$B|t1G!=A3AyyZGedI{K7Tq&=5SUb$BQe&deNtK)q7PL3tpY%ml{Hzobt{+fts)&rj&uQ9BN1{Fr~&Gvv^2 + style="stroke-width:13.7079"> diff --git a/bin/sauvegardehistoriqueevaluation.png b/bin/sauvegardehistoriqueevaluation.png index f5559bcc4df749fffc019b31770d36116d1c8e09..3d0b95377df18c86e35492aefacf255cf1ac464a 100644 GIT binary patch delta 3799 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 diff --git a/bin/sauvegardehistoriqueevaluationmini.png b/bin/sauvegardehistoriqueevaluationmini.png index 399e6aca1cff133d834915d24da802b66d9199bc..6eb531861c03d5b6ac92054059cb7288d5ddc354 100644 GIT binary patch delta 1638 zcmV-s2ATQS2e1v0U4I5WNklYL)i#xi(Zd?mpTXn@0FjkV? zu^-mjGSFHJopw5%@45HgKc<~hAnQp^?#VsxIluQj&-*eW!hcT<#u%@26y>QF*@9S< zV`@AU|L*(%5ygJ;?41CnH5)RO{D*dG>?_xjWG&)EDTlMknT*#ma6F(Sp!ly%P-JR^ z!jt{%wAp(bfEE92vFYKu_k`t@C15kVGwfx9N6}dL zJX)`;h97opy{iMQSJ&blx&4-W3CeJfFWGr&&-B?N9RQ$7%i`W~Sjbyff@nB(F#|vZ zFoyB45t2?tjjIbl7XYBYHy?gz>5|`{R0laV%1OV}QvvJ()LK*z(V}zy%;ZQ2GXav&G$0&>c86(pf zxG-o>U+($FjZ;^)gA+5L8@-&0k4(>eLr{jj|GLcsp^nZ86@Ww*g*%)Ba3!BBI8ek*bIg=e*{&6{*tu772uGdq|d<#zFgD-0jTq; zi04dIG4JW$BzzaYL?|#*5vi&`B!qNzg+o9zjKvlXW-fu<4><7Rj%=*U7(~;))ySIo z_wy^4IE%M$-<~~BBJ=8BeL$SfnH;(FTYpt2E)}8=}5Tw*il1$eLed6`VdTL$BPQ=HjRcKOOrmc^gv2#0vMn~M*V6c)C)@fpsL9rpibrIW$Qj~so(YN zzCDu1#wBI5e)7z0(;ICcs$^F9(8qfaJ$_&e*8E(JAXT2Hk(miUJd}JG(a@0SfWgicq5_VF9dDQ4vj8r zDHuPmSu5@gsA#R#rZl z1|X4)i^8%!$>iwe#PoN^qZ6Hjg3ejUIK$lx!XhxvY|$6wc)i~2#>U32$*D^+HuuSS%I{4-Z3< zq{q@PAR>s!D>uUZX$Brrtk_IPSY~P7Y&tV+8+y|zXpP-)6pa=6O%NTZ8PV#=k#Jf zb(?Nd?F$EXnW_qk7s2xm}HrC-CP?vBh9$pnnXFn=WHa1;k5H7RV1KDL!j zbzC<{5#g0j^lv(?6bmr8yUE?48EXpLEP4I`zn&*hz9~j2^Z|KcH6To6Se;x+Y9d$+sAt@p4yzlNf~82lTag-yzj9+u91Ox;#@` zS)!$D%5zq_HVYFXnLCA2JQty&=8$FuMh2zWmCv>()TQJenTZX}o~oXo zNNJpu3eHQQxI9`T6r^NJWGeR6`h4zP2Dao(OpKCqWrU%TWH^z+ABDWVzQnO}Ea@4% zit!@8?|&pPt}OOqTnFFp*pZT*GCQ-J6RAx@Mk}-y*uTF#HKJ1cu3ClHa649DjrN_i zUc@_TaGfQqs$rd4cSRj(MjcnC^ zi7e|7`T|SwV}9I%<&cy_8`f*Fu=r|2WM)OqRDWTtE_Xv=a@DT#)PPx-hsoMMGxv%J zDGfp`hT>gpO-iB_1!%xJVWU2_#~T{QFH+RXm^O-1CiX7!nUp5ss}8#5A{Lz;rL+ap z&s35;9vg+3UAobR-KfKH)Jy&nR>#WJgh_Z3Gw>bm6md#QBd|yNxmkjZNl6TrY!+_q zsek`@Y}9IAtkxi<`|x4jUzZn}mTzkdibR~uMWthgnJig=ofi>!NTJ*E&o6ZFUx!DW zduM%6204f_t+B$2sC2WW7z^>1WIK+a9zWrL(3~gvI4?4yLnVu~|Anl>mmnhkzwty6 e!3|ww{{YoWep{?{{Luga002ovPDHLkU;%>mA+iVn diff --git a/bin/saveEvaluation.png b/bin/saveEvaluation.png index 2685188f4abb58449bfce90cd612507396207e64..844f49ad159bef3cd218bc81bb27521112bb5358 100644 GIT binary patch delta 3623 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 delta 3260 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 + transform="matrix(2.78223,1.8513827,-2.7408571,2.3502383,185.65469,297.95409)" /> diff --git a/bin/saveEvaluationmini.png b/bin/saveEvaluationmini.png index bb9943b8847d8a2751f6d0a99c95720308d0e127..3d0a8d1596ff35ab1953996d78c2d52b3a52f466 100644 GIT binary patch delta 1538 zcmV+d2L1WN3(gFXUVqz3L_t(YiG@~aY+ThDJ>PwA-t1dqJ9a!-9GhWc;|&zZLen5e zsE(~b5@^*{iAqY5_z^{-YNZObswzl@gw!ICAcd+aNh?}aN|O`|TAGCjXR`w&spV~K zw@w^8G4|LqZ*uRmTqw(BB3>FO>z_niAJ@7+txjIS~xa({2xqSZ(#ODq5$Rop#) z-bgZY;Vbw4KY{jk@49U*%AV?K@o+eT+DKSbtc;0hI7|S5nHk2-QF}U_=CP?M?j7vs zi|5W*$2&Um$t7gWTx_ka-q`Pt`H%DuMN$SYYi3tDcn3oq~28P3_ zBk%g(dHQKj)qg_Hq6g1Dt3AB`2i~I(KBUA!wCE83crOdLZou@bP!zzGF)^#S(7G?+ zkifw+7+1UP-gl2$-#z?>eiZ=JIg;&QA3{0B} zviiMK67Kbc^$8`h^-=x>fc8ZKE*C1Y`a)u7z4w{{Wq;ZLN*9MVlqsP5yg;H^b)W<= zOArW}#;fLVVs7whxBd4_8p!I5Y}V;de_&wrvpg&ln4EDGB?J8v0y!aYYskdt2t(H; z^o&GK2hwSY?#uQEbG$_l&Ym@eY09_S+qM0{5HtX&Z&pC$2Q%Z-3nn6V9-oaWsBiH> zD1_Db!he&~9S^3bW#Rn}=dq{FyV>UtavFvtInr9(znZP9#n})FckxAEyQ(s7T89xQPgrvF-Rg zbp%spu>c`$(?OEQmh3JN8=9sB(m&aQ9~A`-Jn!zbZMH6UnJ+}6+I_JKds8r=HU|81 zeJCtS{XT*a41d)%ynZ2$C)UrOe(d_|fPXZwvhj!TdH_WNr+a|9b&y5>^EqkVSEGC_ z9Cm&5pHchd;2=6WFBN_a0A4T3V&&@EV2Deee4+BK%+fk_LZC~#+zZ&p??+$x1@s>I%!wY0asjwW>-{g#ah%jQ{WBMr`b06+Tsdw=oA zw-2B+a2HLh{{>aCarmWrOw269?tQ-ouwikMuU(TqkH(*`i7Aav+!-N1Naf^ED`8)hBT9_BeI+_VKHi($-k4 zLe%;^sB@{ZjD!f0;Be^{rAnG`4GlTlW~OeVqdcd(B^n7bMXwlM|r22qh8 z#A|JYE6H70?w`hn#3}&a1OPm9ybpugip4qTP4XWGhVbpN3BFh`z?Q|ZEWozl^fq8w z^Y=Fq(EIOkygc(1{yOYm6npoDxBSBY0ETYyDI)q?tQ_A62eH|!p;1*(t0-8exe#)> zpj3Oi(0q3dQuy-M$lN=^#b5HO_+KL;4ZyNc2y0?xD~ oBdUH;#82^B1fp>qcpOLn3np^P1n(87HUIzs07*qoM6N<$f(iTcy#N3J delta 1398 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 V5>M1_U&{ah002ovPDHLkV1h7m3^V`$ diff --git a/bin/saveZipEvaluation.svg b/bin/saveZipEvaluation.svg index 91f98ad..4e26f30 100644 --- a/bin/saveZipEvaluation.svg +++ b/bin/saveZipEvaluation.svg @@ -8,13 +8,14 @@ version="1.1" id="svg5" xml:space="preserve" - inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" + inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" sodipodi:docname="saveZipEvaluation.svg" - inkscape:export-filename="saveZipEvaluation.png" - inkscape:export-xdpi="96" - inkscape:export-ydpi="96" + inkscape:export-filename="saveZipEvaluationmini.png" + inkscape:export-xdpi="51.200001" + inkscape:export-ydpi="51.200001" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">ZIP diff --git a/bin/saveZipEvaluationmini.png b/bin/saveZipEvaluationmini.png index 881f5e69eb5ac0aee4cdbb1218b11f147bbf69c8..2872497970bef1eaaf54b083246da6a20eb8229e 100644 GIT binary patch delta 1520 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 XP`dS*<8(a+00000NkvXXu0mjfy~AV- diff --git a/src/MEPTL/meptl.java b/src/MEPTL/meptl.java index c4d1fb1..0ab0431 100644 --- a/src/MEPTL/meptl.java +++ b/src/MEPTL/meptl.java @@ -18,6 +18,7 @@ import java.util.regex.Pattern; import javax.swing.JOptionPane; +import baseListesEtudiants.ecritureBaseListesEtudiants; import cXML.Run; import cXML.Run.UserStatus; import cXML.node; @@ -1915,14 +1916,12 @@ public class meptl { /** - * Chargement et ajoute dans le node fileCSV la liste des étudiants.
- * Par défaut :
- * La liste des étudiants doit contenir les champs Prénom, Nom, identification, adresse
- * Le séparateur doit être le point-virgule et l'encodage UTF-8.
- * @param a - * @param nameCSV - * @return - * @throws IOException + * Charge et ajoute dans le node commandes.nodeCSV la liste des étudiants.
+ * Par défaut : + * La liste des étudiants doit contenir les champs prenom, nom, identification, adresse
+ * Le séparateur doit être le point-virgule et l'encodage UTF-8.
+ * @param nameListStudent : le nom de la liste des étudiants.
+ * @param Year : Année sous la forme d'une chaine de caractère.
*/ public static void chargementFichierCSV(String nameListStudent, String Year) { @@ -1985,7 +1984,7 @@ public class meptl { } - String[] line1 = target[0].split(";"); + String[] line1 = target[0].split(separator); for(int i = 1 ; i < target.length ; i++) { @@ -2010,6 +2009,113 @@ public class meptl { } + /** + * Ajoute ou cré dans la base, la liste des étudiants.
+ * L'ajout se fait depuis un fichier au format CSV.
+ * Par défaut : + * La liste des étudiants doit contenir les champs prenom, nom, identification, adresse
+ * Le séparateur doit être le point-virgule et l'encodage UTF-8.
+ * @param cheminVersLeFichierCSV : le chemin vers le fichier CSV.
+ * @param nameListStudent : le nom de la liste des étudiants.
+ * @param Year : Année sous la forme d'une chaine de caractère.
+ * @return + * 1- True lorsque les étudiants ont été ajouté.
+ * 2 - False lorsque les étudiants n'ont pas été ajouté.
+ */ + public static Boolean ecritureListeEtudiantsBaseFichierCSV(String cheminVersLeFichierCSV, String nameListStudent, String Year) { + + //Recupère la liste des étudiants nommée : nameListStudent + //Si la liste existe alors place les étudiants dans le node commandes.nodeCSV ou bien null + commandes.nodeCSV = null; + if(commandes.listesEtudiants!=null) { + commandes.nodeCSV = commandes.listesEtudiants.retourneFirstNodeByNameAndAttributValueExactStrict("fileCSV", "nameListStudent", nameListStudent); + commandes.nameCSV = cheminVersLeFichierCSV; + } + + // Le node csv contient les paramètres importations et la liste des étudiants. + node csv = null; + String separator = ";"; + String encoding = "UTF-8"; + String nameid = "id"; + String nameemail = "email"; + String nameStudent = "name"; + String firstnameStudent = "firstname"; + + if(commandes.nodeCSV!=null) { + csv = commandes.nodeCSV; + }else { + csv = commandes.sujet.retourneFirstEnfantsByName("csv"); + csv.getAttributs().put("nameListStudent", nameListStudent); + csv.getAttributs().put("year", Year); + + separator = csv.getAttributs().get("separator"); + encoding = csv.getAttributs().get("encoding"); + node import_csv = csv.retourneFirstEnfantsByName("import_moodle"); + nameid = import_csv.getAttributs().get("id"); + nameemail = import_csv.getAttributs().get("email"); + nameStudent = import_csv.getAttributs().get("name"); + firstnameStudent = import_csv.getAttributs().get("firstname"); + csv.getNodes().remove(import_csv); + csv.getAttributs().put("name", nameStudent); + csv.getAttributs().put("firstname", firstnameStudent); + csv.getAttributs().put("email", nameemail); + csv.getAttributs().put("id", nameid); + csv.setNomElt("fileCSV"); + csv.getContenu().clear(); + } + + // Lecture du fichier CSV + String targetString = ""; + try { + BufferedReader br = new BufferedReader( + new InputStreamReader( + new FileInputStream(cheminVersLeFichierCSV), encoding)); + + String line; + while ((line = br.readLine()) != null) { + targetString = targetString + line + "\n"; + } + br.close(); + } catch (IOException e) { + commandes.ErrorFile(cheminVersLeFichierCSV); + e.printStackTrace(); + return false; + } + + String[] target = targetString.split("\\n"); + + if(!target[0].contains(separator)||!target[0].contains(nameid) + ||!target[0].contains(nameemail)||!target[0].contains(nameStudent) + ||!target[0].contains(firstnameStudent)) { + JOptionPane.showMessageDialog(null, "Le fichier CSV ne correspond pas\nà la définition des paramètres d'importation", "Erreur CSV", JOptionPane.INFORMATION_MESSAGE); + return false; + } + + String[] line1 = target[0].split(separator); + + for(int i = 1 ; i < target.length ; i++) { + node nodeEtudiant = new node(); + nodeEtudiant.setNomElt("student"); + for(int j = 0 ; j < line1.length; j++) { + nodeEtudiant.getAttributs().put(line1[j], target[i].split(separator)[j]); + } + + if(nodeEtudiant.getAttributs().get(nameemail)!=null + && nodeEtudiant.getAttributs().get(nameid)!=null + && nodeEtudiant.getNbrAttributs()==4) { + + node n1 = csv.retourneFirstNodeByNameAndAttributValueExactStrict("student", nameid, nodeEtudiant.getAttributs().get(nameid)); + node n2 = csv.retourneFirstNodeByNameAndAttributValueExactStrict("student", nameemail, nodeEtudiant.getAttributs().get(nameemail)); + + if(n1==null && n2==null) csv.getNodes().add(nodeEtudiant); + } + } + + new ecritureBaseListesEtudiants(csv); + return true; + + } + /** * Supprime le node du fichier CSV de la liste des étudiants.
* @param a diff --git a/src/action/actAddStudentBaseListesEtudiants.java b/src/action/actAddStudentBaseListesEtudiants.java deleted file mode 100644 index d1b69c6..0000000 --- a/src/action/actAddStudentBaseListesEtudiants.java +++ /dev/null @@ -1,28 +0,0 @@ -package action; - -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.ImageIcon; - -import MEPTL.commandes; -import baseListesEtudiants.recupeNodeBaseListesEtudiants; -import fenetres.baseDonneesListesEtudiants; -import fenetres.create; - -public class actAddStudentBaseListesEtudiants extends AbstractAction{ - private static final long serialVersionUID = 1L; - { - putValue( Action.NAME, "Charger une liste d'étudiants" ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/addStudentbaselisteetudiant.png")) ); - putValue( Action.SHORT_DESCRIPTION, "Charger une liste d'étudiants" ); - } - @Override - public void actionPerformed(ActionEvent e) { - new recupeNodeBaseListesEtudiants(); - if(commandes.listesEtudiants!=null) { - baseDonneesListesEtudiants.getInstance(); - } - } -} diff --git a/src/baseListesEtudiants/CreerBaseParDefautListesEtudiants.java b/src/baseListesEtudiants/CreerBaseParDefautListesEtudiants.java index 08df89f..55aba96 100644 --- a/src/baseListesEtudiants/CreerBaseParDefautListesEtudiants.java +++ b/src/baseListesEtudiants/CreerBaseParDefautListesEtudiants.java @@ -12,7 +12,12 @@ import java.util.Date; import MEPTL.commandes; - +/** + * Création de la base de données des listes des étudiants.
+ * Et/Ou vérification de la présence de de la base de données. + * @author pabr6 + * + */ public class CreerBaseParDefautListesEtudiants { public Boolean isExist() throws IOException { File file = null; diff --git a/src/baseListesEtudiants/ecritureBaseListesEtudiants.java b/src/baseListesEtudiants/ecritureBaseListesEtudiants.java new file mode 100644 index 0000000..1aa9a55 --- /dev/null +++ b/src/baseListesEtudiants/ecritureBaseListesEtudiants.java @@ -0,0 +1,104 @@ +package baseListesEtudiants; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JOptionPane; + +import MEPTL.commandes; +import cXML.Run; +import cXML.node; + +public class ecritureBaseListesEtudiants { + + public ecritureBaseListesEtudiants(node csv) { + + if(csv==null) return; + if(csv.isVide()) return ; + + File file = null; + String directoryName = Paths.get("").toAbsolutePath().toString(); + + if(commandes.os.contains("Win")) { + file = new File(directoryName + "\\" + "base_listes_etudiants.xml"); + }else { + file = new File(directoryName + "/" + "base_listes_etudiants.xml"); + } + + + String debut=""; + String fin=""; + String XMLBase=""; + + if(file!=null) { + //Lecture de la base de données + BufferedReader br; + try { + br = new BufferedReader( + new InputStreamReader( + new FileInputStream(file.getAbsoluteFile()), "UTF-8")); + String line; + StringBuilder targetString = new StringBuilder(); + while ((line = br.readLine()) != null) { + targetString.append(line); + } + String baseToString = targetString.toString().replace("\t","").replace("\r", "").replace("\n", "").replaceAll(">/{1,}<","><"); + + Pattern p = Pattern.compile("<\\bfileCSV\\b.{1,100}\\bnameListStudent\\b=\\\""+ csv.getAttributs().get("nameListStudent") +"\\\".*?<\\/\\bfileCSV\\b>"); + Matcher m = p.matcher(baseToString); + + if(m.find()) { + //Supprime le node fileCSV pour le remplacer par le nouveau. + debut = baseToString.substring(0,m.start()); + fin = baseToString.substring(m.end()); + String codeXMLEvaluation = Run.ecritureNode(csv, 0).toString().replace("\t","").replace("\r", "").replace("\n", "").replaceAll(">/{1,}<","><"); + XMLBase = debut + codeXMLEvaluation + fin; + }else { + //Ajoute une nouvelle liste (fileCSV) au début de la base + p = Pattern.compile(""); + m = p.matcher(baseToString); + if(m.find()) { + debut = baseToString.substring(0,m.end()); + fin = baseToString.substring(m.end()); + String codeXMLEvaluation = Run.ecritureNode(csv, 0).toString().replace("\t","").replace("\r", "").replace("\n", "").replaceAll(">/{1,}<","><"); + XMLBase = debut + codeXMLEvaluation + fin; + } + + } + + try { + + // écriture du node + Path outputFilePath = file.toPath(); + BufferedWriter fichier = Files.newBufferedWriter(outputFilePath, StandardCharsets.UTF_8); + fichier.write(XMLBase); + fichier.close(); + + JFrame frame = new JFrame(); + JLabel texte = new JLabel("

Enregistrement réussi

La liste "+csv.getAttributs().get("nameListStudent")+ " a été enregistrée dans la base de données.

" + + "

"+ file.getAbsolutePath() +"

"); + JOptionPane.showMessageDialog(frame, texte); + + } catch (IOException e) { + e.printStackTrace(); + } + + }catch (Exception e) { + + } + } + } +} + diff --git a/src/baseListesEtudiants/myTableBaseListesEtudiants.java b/src/baseListesEtudiants/myTableBaseListesEtudiants.java index 16ad009..3e240a1 100644 --- a/src/baseListesEtudiants/myTableBaseListesEtudiants.java +++ b/src/baseListesEtudiants/myTableBaseListesEtudiants.java @@ -50,6 +50,7 @@ public class myTableBaseListesEtudiants extends AbstractTableModel{ } public void addOrUpdate() { + new recupeNodeBaseListesEtudiants(); listes = new String[commandes.listesEtudiants.getNodes().size()][columNames.size()]; for(int i = 0 ; i + * boite de dialogue pour charger une liste d'étudiants
+ * dans le node commandes.NodeCSV.

+ * Cette méthode fait appel à la méthode,
+ * meptl.chargementFichierCSV(nameListStudent, textFieldYear.getText())
+ *
* @author pabr6 * */ public class CustomInputDialogListeEtudiant { + /** + * Class permettant de générer une
+ * boite de dialogue pour charger une liste d'étudiants
+ * dans le node commandes.NodeCSV.

+ * Cette méthode fait appel à la méthode,
+ * meptl.chargementFichierCSV(nameListStudent, textFieldYear.getText())
+ *
+ * @return + * 1- Le nom de la liste des étudiants (la liste est chargé).
+ * 2- Code_Annule (ce qui signifie que la liste n'a pas été chargé).
+ */ public static String showCustominputDialog() { String separateur =""; String encodage =""; @@ -129,5 +145,125 @@ public class CustomInputDialogListeEtudiant { return "Code_Annule"; } } - } + + /** + * Class permettant de générer une
+ * boite de dialogue pour écrire ou ajouter une liste d'étudiants
+ * dans le node csv pour l'écriture.

+ * Cette méthode fait appel à la méthode,
+ * meptl.ecritureListeEtudiantsBaseFichierCSV(chemin vers fichier CSV, nameListStudent , year)
+ *
+ * @return + * 1- true lorsque le fichier est écrit.
+ * 2- false lorsque le fichier n'a pas été écrit.
+ */ + public static boolean showCustomDialogInputStudentBase() { + String separateur =""; + String encodage =""; + String email ="inconnu"; + String name = "inconnu"; + String firstname = "inconnu"; + String id = "inconnu"; + String nameListStudent = ""; + if(commandes.fichierAnalyseValide) { + if(commandes.fourniCSV) { + node CSV = commandes.sujet.retourneFirstEnfantsByName("csv"); + separateur = CSV.getAttributs().get("separator"); + encodage = CSV.getAttributs().get("encoding"); + node importCSV = CSV.retourneFirstEnfantsByName("import_moodle"); + if(CSV.isHasAttributs()) { + if(importCSV.getAttributs().get("email")!=null) { + email = importCSV.getAttributs().get("email"); + } + if(importCSV.getAttributs().get("name")!=null) { + name = importCSV.getAttributs().get("name"); + } + if(importCSV.getAttributs().get("firstname")!=null) { + firstname = importCSV.getAttributs().get("firstname"); + } + if(importCSV.getAttributs().get("id")!=null) { + id = importCSV.getAttributs().get("id"); + } + } + } + if(commandes.evaluationChargeEnMemoire.retourneFirstEnfantsByName("fileCSV")!=null) { + if(commandes.evaluationChargeEnMemoire.retourneFirstEnfantsByName("fileCSV").getAttributs().get("nameListStudent")!=null) { + nameListStudent = commandes.evaluationChargeEnMemoire.retourneFirstEnfantsByName("fileCSV").getAttributs().get("nameListStudent"); + } + } + } + + JLabel lblTitre = new JLabel("

Ajouter une liste d'étudiant à l'évaluation

"); + lblTitre.setForeground(new Color(50,50,200)); + + JLabel lblExpliaction = new JLabel("

Le fichier au format CSV pour importer une liste d'étudiant doit avoir
" + + "les caractéristiques suivantes :


" + + "

Séparateur : " + separateur +"
" + + "Encodage : " + encodage + "
" + + "Nom des étudiants, la colonne : " + name + "
" + + "Prénom des étudiants, la colonne : " + firstname + "
" + + "Numéro des étudiants, la colonne : " + id +"
" + + "Courriel des étudiants, la colonne : " + email + "


" + + ""); + lblExpliaction.setFont(new Font("Tahoma", Font.BOLD, 12)); + lblExpliaction.setForeground(Color.blue); + + JTextField textField = new JTextField(String.valueOf(nameListStudent)); + textField.setFont(new Font("Tahoma", Font.BOLD, 14)); + textField.setHorizontalAlignment(SwingConstants.LEFT); + ImageIcon icon = new ImageIcon(create.class.getResource("/resources/fichierCSV.png")); + JTextField textFieldYear = new JTextField("2024"); + + Object[] message = { + lblTitre, + lblExpliaction, + "

Le nom d'une liste d'étudiant doit être unique.
" + + "Sinon, les étudiants seront ajoutés à la liste existante du même nom.


" + + "

Quel doit être le nom de cette liste ?

", + textField, + "

Quel est l'année ?

", + textFieldYear + }; + + String[] options = {"Importer la liste", "Annuler"}; + + int optionSelected = JOptionPane.showOptionDialog( + null, + message, + "Importer une liste d'étudiant.", + JOptionPane.DEFAULT_OPTION, + JOptionPane.INFORMATION_MESSAGE, + icon, + options, + options[0]); + + if (optionSelected == 0) { // Bouton "Importer la liste" sélectionné + JFileChooser chooser = new JFileChooser(); + chooser.setDialogTitle("Choisir un fichier CSV"); + + chooser.setCurrentDirectory(new java.io.File(commandes.path)); + chooser.setFileSelectionMode(JFileChooser.FILES_ONLY); + FileNameExtensionFilter filter = new FileNameExtensionFilter("Format CSV", "csv"); + chooser.setFileFilter(filter); + chooser.setAcceptAllFileFilterUsed(true); + + if (chooser.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) { + + commandes.nameCSV = chooser.getSelectedFile().getAbsolutePath(); + nameListStudent = textField.getText().toLowerCase().trim(); + String year = textFieldYear.getText().toLowerCase().trim(); + + return meptl.ecritureListeEtudiantsBaseFichierCSV(chooser.getSelectedFile().getAbsolutePath(), nameListStudent , year); + + } + + return false; + } else if (optionSelected == 1) { // Bouton "Désactivé" sélectionné + return false; + } else { // Si la boîte de dialogue est annulée ou fermée + return false; + } + + } +} diff --git a/src/fenetres/baseDonneesListesEtudiants.java b/src/fenetres/baseDonneesListesEtudiants.java index 58a26c0..13f76bc 100644 --- a/src/fenetres/baseDonneesListesEtudiants.java +++ b/src/fenetres/baseDonneesListesEtudiants.java @@ -33,6 +33,7 @@ public class baseDonneesListesEtudiants extends JFrame{ private static JTable table; private myTableBaseListesEtudiants model = new myTableBaseListesEtudiants(); private final JButton btnFermer = new JButton("Femer"); + private JButton btnAddListeEtudiants = new JButton(); JScrollPane scrollPaneTable = new JScrollPane(); JScrollPane scrollPaneBoutons = new JScrollPane(); int indexSelect=0; @@ -101,10 +102,10 @@ public class baseDonneesListesEtudiants extends JFrame{ } }); - JButton btnAddListeEtudiants = new JButton(new actAddStudentBaseListesEtudiants()); btnAddListeEtudiants.setFont(new Font("Tahoma", Font.BOLD, 15)); btnAddListeEtudiants.setHorizontalAlignment(SwingConstants.LEFT); btnAddListeEtudiants.setText("

Charger une liste d'étudiant
depuis un fichier CSV

"); + btnAddListeEtudiants.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/addStudentbaselisteetudiant.png"))); panelGauche.add(btnAddListeEtudiants, "cell 0 1"); btnFermer.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/quitteEvaluation.png"))); @@ -147,6 +148,16 @@ public class baseDonneesListesEtudiants extends JFrame{ }); + btnAddListeEtudiants.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + CustomInputDialogListeEtudiant.showCustomDialogInputStudentBase(); + model.addOrUpdate(); + table = new JTable(model); + } + }); + + } }