diff --git a/analyseWriter.exe b/analyseWriter.exe index aca0136..a5071b3 100644 Binary files a/analyseWriter.exe and b/analyseWriter.exe differ diff --git a/analyseWriter.jar b/analyseWriter.jar index 8b9cbc3..9055418 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore index 4d1304e..4dfbd87 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -9,3 +9,22 @@ /sousmenuEvaluation/ /sousmenuRecherche/ /sousmenuRepresentation/ +/verifhistoriquemini.png +/verifhistoriquestudent.png +/verifhistoriquestudent.svg +/verifhistoriquestudentmini.png +/versevaluate.png +/versevaluate.svg +/versevaluatemini.png +/versfichierAnalyse.png +/versfichierAnalyseModifmax.svg +/voir.svg +/voirmini.png +/what.svg +/whatmini.png +/zip.png +/zip.svg +/zipmini.png +/zipstudent.png +/zipstudent.svg +/zipstudentmini.png diff --git a/bin/MEPTL/meptl.class b/bin/MEPTL/meptl.class index 6a2c88a..ebcdb21 100644 Binary files a/bin/MEPTL/meptl.class and b/bin/MEPTL/meptl.class differ diff --git a/bin/action/actNewFichierAnalyse.class b/bin/action/actNewFichierAnalyse.class index 74488cb..0981840 100644 Binary files a/bin/action/actNewFichierAnalyse.class and b/bin/action/actNewFichierAnalyse.class differ diff --git a/bin/calcul/formatDateWriter.class b/bin/calcul/formatDateWriter.class index 991d9db..6f7ecbd 100644 Binary files a/bin/calcul/formatDateWriter.class and b/bin/calcul/formatDateWriter.class differ diff --git a/bin/fenetres/ChargeFichierXML.class b/bin/fenetres/ChargeFichierXML.class index a48f88e..8f63110 100644 Binary files a/bin/fenetres/ChargeFichierXML.class and b/bin/fenetres/ChargeFichierXML.class differ diff --git a/bin/fenetres/evaluate$1.class b/bin/fenetres/evaluate$1.class index d7a2aeb..1331cf5 100644 Binary files a/bin/fenetres/evaluate$1.class and b/bin/fenetres/evaluate$1.class differ diff --git a/bin/fenetres/evaluate$10.class b/bin/fenetres/evaluate$10.class index 0cc6786..e83bea6 100644 Binary files a/bin/fenetres/evaluate$10.class and b/bin/fenetres/evaluate$10.class differ diff --git a/bin/fenetres/evaluate$11.class b/bin/fenetres/evaluate$11.class index de4aaaf..1e992d8 100644 Binary files a/bin/fenetres/evaluate$11.class and b/bin/fenetres/evaluate$11.class differ diff --git a/bin/fenetres/evaluate$12.class b/bin/fenetres/evaluate$12.class index 28f5079..aa686a1 100644 Binary files a/bin/fenetres/evaluate$12.class and b/bin/fenetres/evaluate$12.class differ diff --git a/bin/fenetres/evaluate$13.class b/bin/fenetres/evaluate$13.class index 46987fc..3857c28 100644 Binary files a/bin/fenetres/evaluate$13.class and b/bin/fenetres/evaluate$13.class differ diff --git a/bin/fenetres/evaluate$14.class b/bin/fenetres/evaluate$14.class index 2cc9862..d3c320f 100644 Binary files a/bin/fenetres/evaluate$14.class and b/bin/fenetres/evaluate$14.class differ diff --git a/bin/fenetres/evaluate$15.class b/bin/fenetres/evaluate$15.class index d7671db..393f5e0 100644 Binary files a/bin/fenetres/evaluate$15.class and b/bin/fenetres/evaluate$15.class differ diff --git a/bin/fenetres/evaluate$2.class b/bin/fenetres/evaluate$2.class index bc899e4..402add3 100644 Binary files a/bin/fenetres/evaluate$2.class and b/bin/fenetres/evaluate$2.class differ diff --git a/bin/fenetres/evaluate$3.class b/bin/fenetres/evaluate$3.class index f47a288..fa054f5 100644 Binary files a/bin/fenetres/evaluate$3.class and b/bin/fenetres/evaluate$3.class differ diff --git a/bin/fenetres/evaluate$4.class b/bin/fenetres/evaluate$4.class index 67d1a05..1d69a5f 100644 Binary files a/bin/fenetres/evaluate$4.class and b/bin/fenetres/evaluate$4.class differ diff --git a/bin/fenetres/evaluate$5.class b/bin/fenetres/evaluate$5.class index 23982dc..72b92dd 100644 Binary files a/bin/fenetres/evaluate$5.class and b/bin/fenetres/evaluate$5.class differ diff --git a/bin/fenetres/evaluate$6.class b/bin/fenetres/evaluate$6.class index eada314..a792b34 100644 Binary files a/bin/fenetres/evaluate$6.class and b/bin/fenetres/evaluate$6.class differ diff --git a/bin/fenetres/evaluate$7.class b/bin/fenetres/evaluate$7.class index 18929f2..bfe7244 100644 Binary files a/bin/fenetres/evaluate$7.class and b/bin/fenetres/evaluate$7.class differ diff --git a/bin/fenetres/evaluate$8.class b/bin/fenetres/evaluate$8.class index 55800cc..8a723b0 100644 Binary files a/bin/fenetres/evaluate$8.class and b/bin/fenetres/evaluate$8.class differ diff --git a/bin/fenetres/evaluate$9.class b/bin/fenetres/evaluate$9.class index 10487f5..c24ebc3 100644 Binary files a/bin/fenetres/evaluate$9.class and b/bin/fenetres/evaluate$9.class differ diff --git a/bin/fenetres/evaluate.class b/bin/fenetres/evaluate.class index f412809..c8eb485 100644 Binary files a/bin/fenetres/evaluate.class and b/bin/fenetres/evaluate.class differ diff --git a/src/MEPTL/meptl.java b/src/MEPTL/meptl.java index e579a87..78d872b 100644 --- a/src/MEPTL/meptl.java +++ b/src/MEPTL/meptl.java @@ -559,9 +559,11 @@ public class meptl { for(int v = 0 ; v <= indexBreak; v++) { if(!nodstructure.getNodes().get(j).getContenu().isEmpty()) { - if(nodstructure.getNodes().get(j).getContenu().get(v)!=null) { - if(!nodstructure.getNodes().get(j).getContenu().get(v).isEmpty()) { - ContenusVidesAvantBreak=false; + if(nodstructure.getNodes().get(j).getContenu().size()>v) { + if(nodstructure.getNodes().get(j).getContenu().get(v)!=null) { + if(!nodstructure.getNodes().get(j).getContenu().get(v).isEmpty()) { + ContenusVidesAvantBreak=false; + } } } } diff --git a/src/action/actNewFichierAnalyse.java b/src/action/actNewFichierAnalyse.java index 67ddf57..3e9e080 100644 --- a/src/action/actNewFichierAnalyse.java +++ b/src/action/actNewFichierAnalyse.java @@ -89,9 +89,9 @@ public class actNewFichierAnalyse extends AbstractAction{ commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:deletion"); commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change-start"); commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change-end"); - commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:tracked-changes"); commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change"); - + commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:bookmark-start"); + commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:bookmark-end"); commandes.sujet = meptl.LectureFichierEtudiantSousFormeDeNode(commandes.sujet,b,0); diff --git a/src/calcul/formatDateWriter.java b/src/calcul/formatDateWriter.java index d637803..7a167c8 100644 --- a/src/calcul/formatDateWriter.java +++ b/src/calcul/formatDateWriter.java @@ -52,14 +52,26 @@ public class formatDateWriter { } /** - * Retourne une String à partir d'une date composé de YYYY-MM-JJTHH:MM:SS.
+ * Retourne une String au format dd/MM/yyy HH:mm:ss à partir d'une date.
+ * @param date + * @return + */ + public static String DateEnClairFR(Date date) { + SimpleDateFormat simpledateformat = new SimpleDateFormat("EEEE dd MMM yyy' à 'HH:mm:ss"); + String d1 = simpledateformat.format(date); + + return d1; + } + + /** + * Retourne une String au format YYYY-MM-JJTHH:MM:SS à partir d'une date.
* @param d * @return * @throws ParseException */ - public static String DateLibreOffice(Date d) throws ParseException { + public static String DateLibreOffice(Date date) throws ParseException { SimpleDateFormat simpledateformat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); - String d1 = simpledateformat.format(d); + String d1 = simpledateformat.format(date); return d1; } diff --git a/src/evaluer/evaluerLesFichiersEtudiants.java b/src/evaluer/evaluerLesFichiersEtudiants.java index e10eb3a..585e11a 100644 --- a/src/evaluer/evaluerLesFichiersEtudiants.java +++ b/src/evaluer/evaluerLesFichiersEtudiants.java @@ -162,9 +162,13 @@ public class evaluerLesFichiersEtudiants implements Runnable{ //Supprime l'historique des modifications nodStudent.supprimeTousLesNodesEnfantWithThisName("text:tracked-changes"); + nodStudent.supprimeTousLesNodesEnfantWithThisName("text:change"); nodStudent.supprimeTousLesNodesEnfantWithThisName("text:change-start"); nodStudent.supprimeTousLesNodesEnfantWithThisName("text:change-end"); nodStudent.supprimeTousLesNodesEnfantWithThisName("text:deletion"); + nodStudent.supprimeTousLesNodesEnfantWithThisName("text:bookmark-start"); + nodStudent.supprimeTousLesNodesEnfantWithThisName("text:bookmark-end"); + } catch (IOException e1) { e1.printStackTrace(); diff --git a/src/fenetres/ChargeFichierXML.java b/src/fenetres/ChargeFichierXML.java index e5d175c..0e802f3 100644 --- a/src/fenetres/ChargeFichierXML.java +++ b/src/fenetres/ChargeFichierXML.java @@ -105,9 +105,9 @@ public class ChargeFichierXML extends JFileChooser { sujetLoad.supprimeTousLesNodesEnfantWithThisName("text:deletion"); sujetLoad.supprimeTousLesNodesEnfantWithThisName("text:change-start"); sujetLoad.supprimeTousLesNodesEnfantWithThisName("text:change-end"); - sujetLoad.supprimeTousLesNodesEnfantWithThisName("text:tracked-changes"); sujetLoad.supprimeTousLesNodesEnfantWithThisName("text:change"); - + sujetLoad.supprimeTousLesNodesEnfantWithThisName("text:bookmark-start"); + sujetLoad.supprimeTousLesNodesEnfantWithThisName("text:bookmark-end"); // Vérification de la conformité du fichier d'analyse if(!fichierSujetValide(sujetLoad)) { diff --git a/src/fenetres/chargeEvaluations.java b/src/fenetres/chargeEvaluations.java index 6646a11..e8a457b 100644 --- a/src/fenetres/chargeEvaluations.java +++ b/src/fenetres/chargeEvaluations.java @@ -48,12 +48,14 @@ public class chargeEvaluations extends JFrame { */ private static final long serialVersionUID = 1L; private static chargeEvaluations instance; - private JPanel contentPane; + private JPanel contentPane = new JPanel(); + JPanel panelCentre = new JPanel(); ArrayList LeslabelsTitre = new ArrayList(); ArrayList LeslabelsMeta = new ArrayList(); ArrayList LeslabelsDate = new ArrayList(); ArrayList LeslabelsFileNameAnalysis = new ArrayList(); ArrayList LesRadioButtons = new ArrayList(); + JLabel lblInformationBaseEvluation = new JLabel(""); public static boolean isDispose = true; int indexSelect=0; @@ -76,7 +78,7 @@ public class chargeEvaluations extends JFrame { public chargeEvaluations() { setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - setBounds(100, 100, 1200, 600); + setBounds(100, 100, 1300, 600); int screenWidth = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getWidth(); int screenHeight = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getHeight(); setLocation(( (screenWidth) - getWidth()) / 2, (screenHeight - getHeight()) / 2); @@ -89,21 +91,22 @@ public class chargeEvaluations extends JFrame { contentPane = new JPanel(); contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); setContentPane(contentPane); - contentPane.setLayout(new BorderLayout(0, 0)); + contentPane.setLayout(new BorderLayout(2, 2)); JPanel panelGauche = new JPanel(); contentPane.add(panelGauche, BorderLayout.WEST); + panelGauche.setLayout(new FlowLayout(FlowLayout.LEFT, 2, 2)); JPanel panelHaut = new JPanel(); contentPane.add(panelHaut, BorderLayout.NORTH); - JLabel lblInformationBaseEvluation = new JLabel(""); + lblInformationBaseEvluation.setFont(new Font("Tahoma", Font.BOLD, 14)); panelHaut.add(lblInformationBaseEvluation); JPanel panelBas = new JPanel(); contentPane.add(panelBas, BorderLayout.SOUTH); - panelBas.setLayout(new FlowLayout(FlowLayout.RIGHT, 5, 5)); + panelBas.setLayout(new FlowLayout(FlowLayout.RIGHT, 10, 10)); JButton btnSupprimeEvaluation = new JButton("Supprimer une évaluation"); btnSupprimeEvaluation.addActionListener(new ActionListener() { @@ -138,40 +141,45 @@ public class chargeEvaluations extends JFrame { JScrollPane scrollPaneCentre = new JScrollPane(); contentPane.add(scrollPaneCentre, BorderLayout.CENTER); - JPanel panelCentre = new JPanel(); + scrollPaneCentre.setViewportView(panelCentre); panelCentre.setLayout(new MigLayout("gap rel 4", "[100px:n,grow][50px:n,grow][150px:n,grow 150][150px:n,grow 150][150px:n,grow 150]", "[20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0]")); JLabel lblNewLabel = new JLabel("Nom de l'évaluation"); - lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 12)); + lblNewLabel.setForeground(new Color(0, 0, 255)); + lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 14)); panelCentre.add(lblNewLabel, "cell 0 0"); JLabel lblNewLabel_1 = new JLabel("Date d'enregistrement"); - lblNewLabel_1.setFont(new Font("Tahoma", Font.BOLD, 12)); + lblNewLabel_1.setForeground(new Color(0, 0, 255)); + lblNewLabel_1.setFont(new Font("Tahoma", Font.BOLD, 14)); panelCentre.add(lblNewLabel_1, "cell 1 0"); JLabel lblNewLabel_2 = new JLabel("Nom du fichier d'analyse"); - lblNewLabel_2.setFont(new Font("Tahoma", Font.BOLD, 12)); + lblNewLabel_2.setForeground(new Color(0, 0, 255)); + lblNewLabel_2.setFont(new Font("Tahoma", Font.BOLD, 14)); panelCentre.add(lblNewLabel_2, "cell 2 0"); JLabel lblNewLabel_3 = new JLabel("Titre de l'exercice"); - lblNewLabel_3.setFont(new Font("Tahoma", Font.BOLD, 12)); + lblNewLabel_3.setForeground(new Color(0, 0, 255)); + lblNewLabel_3.setFont(new Font("Tahoma", Font.BOLD, 14)); panelCentre.add(lblNewLabel_3, "cell 3 0"); JLabel lblNewLabel_4 = new JLabel("Propriété personnalisé Sujet"); - lblNewLabel_4.setFont(new Font("Tahoma", Font.BOLD, 12)); + lblNewLabel_4.setForeground(new Color(0, 0, 255)); + lblNewLabel_4.setFont(new Font("Tahoma", Font.BOLD, 14)); panelCentre.add(lblNewLabel_4, "cell 4 0"); - String dateDernierEnregistrement = commandes.evaluationsBase.getAttributs().get("date"); +// String dateDernierEnregistrement = commandes.evaluationsBase.getAttributs().get("date"); String nombreEvluation = String.valueOf(commandes.evaluationsBase.getNodes().size()); - lblInformationBaseEvluation.setText("Date dernier enregistrement : " + dateDernierEnregistrement + " -- Nombre d'évaluation : " + nombreEvluation); + lblInformationBaseEvluation.setText("Date dernier enregistrement : " +calcul.formatDateWriter.DateEnClairFR( calcul.formatDateWriter.DateLibreOffice(commandes.evaluationsBase.getAttributs().get("date"))) + " -- Nombre d'évaluation : " + nombreEvluation); for(int i = 0 ; i + */ btnSaveEvaluation.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if(commandes.fichierAnalyseValide) { + int compteur = 0; + String name ="Nom de l'évaluation"; + for(int i = 0; i < LesRadioButtons.size();i++) { + if(LesRadioButtons.get(i).isSelected()) compteur++; + } + if(compteur>1) { + for(int i = 0; i < LesRadioButtons.size();i++) { + LesRadioButtons.get(i).setSelected(false); + } + }else { + for(int i = 0; i < LesRadioButtons.size();i++) { + if(LesRadioButtons.get(i).isSelected()) { + name = LesRadioButtons.get(i).getText(); + } + } + } - String name = JOptionPane.showInputDialog(null,"Donner un nom à cette évaluation ?","Nom de l'évaluation"); + + name = JOptionPane.showInputDialog(null,"Donner un nom à cette évaluation ?",name); if(!name.isBlank()) { if(!isEvaluationExist(name)) { @@ -272,9 +298,7 @@ public class chargeEvaluations extends JFrame { try { commandes.evaluationsBase.getAttributs().put("date", calcul.formatDateWriter.DateLibreOffice(aujourdhui)); ecritureBaseEvaluation(commandes.evaluationsBase); - isDispose=true; - dispose(); - getInstance(); + actualise(); } catch (ParseException | IOException e1) { e1.printStackTrace(); } @@ -286,6 +310,7 @@ public class chargeEvaluations extends JFrame { ListenerAction(); } + //Quitte la fenêtre.
private void ListenerAction() { addWindowListener(new java.awt.event.WindowAdapter() { @Override @@ -482,7 +507,12 @@ public class chargeEvaluations extends JFrame { evaluation.getAttributs().put("newLogo", String.valueOf(commandes.newLogo) ); evaluation.getAttributs().put("noLogo", String.valueOf(commandes.noLogo) ); + //Supprime le node fichier s'il existe. + node nodremove = evaluation.retourneFirstEnfantsByName("fichier"); + if(!nodremove.isVide()) evaluation.getNodes().remove(nodremove); + evaluation.getNodes().add(commandes.sujet); + if(commandes.sujet.getAttributs().get("analysis_filename").contains(".xml")) { evaluation.getAttributs().put("analysis_filename",commandes.sujet.getAttributs().get("analysis_filename")); }else { @@ -505,6 +535,9 @@ public class chargeEvaluations extends JFrame { } + //Supprime le node fichier s'il existe. + nodremove = evaluation.retourneFirstEnfantsByName("fileCSV"); + if(!nodremove.isVide()) evaluation.getNodes().remove(nodremove); evaluation.getNodes().add(commandes.nodeCSV); @@ -528,4 +561,77 @@ public class chargeEvaluations extends JFrame { } + private void actualise() { + + LesRadioButtons.clear(); + LeslabelsDate.clear(); + LeslabelsTitre.clear(); + LeslabelsFileNameAnalysis.clear(); + LeslabelsMeta.clear(); + + panelCentre.setLayout(new MigLayout("gap rel 4", "[100px:n,grow][50px:n,grow][150px:n,grow 150][150px:n,grow 150][150px:n,grow 150]", "[20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0][20px:20px:20px,shrinkprio 0,shrink 0]")); + + JLabel lblNewLabel = new JLabel("Nom de l'évaluation"); + lblNewLabel.setForeground(new Color(0, 0, 255)); + lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 14)); + panelCentre.add(lblNewLabel, "cell 0 0"); + + JLabel lblNewLabel_1 = new JLabel("Date d'enregistrement"); + lblNewLabel_1.setForeground(new Color(0, 0, 255)); + lblNewLabel_1.setFont(new Font("Tahoma", Font.BOLD, 14)); + panelCentre.add(lblNewLabel_1, "cell 1 0"); + + JLabel lblNewLabel_2 = new JLabel("Nom du fichier d'analyse"); + lblNewLabel_2.setForeground(new Color(0, 0, 255)); + lblNewLabel_2.setFont(new Font("Tahoma", Font.BOLD, 14)); + panelCentre.add(lblNewLabel_2, "cell 2 0"); + + JLabel lblNewLabel_3 = new JLabel("Titre de l'exercice"); + lblNewLabel_3.setForeground(new Color(0, 0, 255)); + lblNewLabel_3.setFont(new Font("Tahoma", Font.BOLD, 14)); + panelCentre.add(lblNewLabel_3, "cell 3 0"); + + JLabel lblNewLabel_4 = new JLabel("Propriété personnalisé Sujet"); + lblNewLabel_4.setForeground(new Color(0, 0, 255)); + lblNewLabel_4.setFont(new Font("Tahoma", Font.BOLD, 14)); + panelCentre.add(lblNewLabel_4, "cell 4 0"); + + + String dateDernierEnregistrement = commandes.evaluationsBase.getAttributs().get("date"); + + String nombreEvluation = String.valueOf(commandes.evaluationsBase.getNodes().size()); + + lblInformationBaseEvluation.setText("Date dernier enregistrement : " + dateDernierEnregistrement + " -- Nombre d'évaluation : " + nombreEvluation); + + for(int i = 0 ; iFichier CSV"); + } + txtpnmessages.afficheChargementFichierAnalyse(); } @@ -1203,8 +1211,10 @@ public class evaluate extends JFrame { } @Override public void actionPerformed( ActionEvent e ) { + txtpnmessages.setContentType("text/plain"); if(commandes.fourniCSV) { - txtpnmessages.setText(Run.ecritureNode(commandes.nodeCSV, 0).toString()); + String texte = Run.ecritureNode(commandes.nodeCSV, 0).toString(); + txtpnmessages.setText(texte); System.out.println( "Affiche la liste des étudiants déjà en mémoire." ); }else { txtpnmessages.setText("*** Veuillez sélectionner un fichier CSV contenant la liste des étudiants. ***");