diff --git a/analyseWriter.exe b/analyseWriter.exe index 1aecc8e..0d77fa0 100644 Binary files a/analyseWriter.exe and b/analyseWriter.exe differ diff --git a/analyseWriter.jar b/analyseWriter.jar index 7079983..f19709f 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore index 16f90ab..75cdcb7 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1 +1 @@ -/MEPTL/ +/fenetres/ diff --git a/bin/fenetres/create$1.class b/bin/fenetres/create$1.class index 2d7b7e3..2b631ba 100644 Binary files a/bin/fenetres/create$1.class and b/bin/fenetres/create$1.class differ diff --git a/bin/fenetres/create$10.class b/bin/fenetres/create$10.class index be0e747..d0b33c9 100644 Binary files a/bin/fenetres/create$10.class and b/bin/fenetres/create$10.class differ diff --git a/bin/fenetres/create$11.class b/bin/fenetres/create$11.class index 56beced..199c039 100644 Binary files a/bin/fenetres/create$11.class and b/bin/fenetres/create$11.class differ diff --git a/bin/fenetres/create$12.class b/bin/fenetres/create$12.class index 2686ecc..391f6a7 100644 Binary files a/bin/fenetres/create$12.class and b/bin/fenetres/create$12.class differ diff --git a/bin/fenetres/create$13.class b/bin/fenetres/create$13.class index 6566cea..f84a9cc 100644 Binary files a/bin/fenetres/create$13.class and b/bin/fenetres/create$13.class differ diff --git a/bin/fenetres/create$2.class b/bin/fenetres/create$2.class index 2fb7f43..a922f67 100644 Binary files a/bin/fenetres/create$2.class and b/bin/fenetres/create$2.class differ diff --git a/bin/fenetres/create$3.class b/bin/fenetres/create$3.class index 91f0cc4..eca9116 100644 Binary files a/bin/fenetres/create$3.class and b/bin/fenetres/create$3.class differ diff --git a/bin/fenetres/create$7.class b/bin/fenetres/create$7.class index 30c4429..c239a8f 100644 Binary files a/bin/fenetres/create$7.class and b/bin/fenetres/create$7.class differ diff --git a/bin/fenetres/create$8.class b/bin/fenetres/create$8.class index 75c20db..5e4b791 100644 Binary files a/bin/fenetres/create$8.class and b/bin/fenetres/create$8.class differ diff --git a/bin/fenetres/create$9.class b/bin/fenetres/create$9.class index 1aa8d7e..636dcb5 100644 Binary files a/bin/fenetres/create$9.class and b/bin/fenetres/create$9.class differ diff --git a/bin/fenetres/create.class b/bin/fenetres/create.class index 6271ede..d72845c 100644 Binary files a/bin/fenetres/create.class and b/bin/fenetres/create.class differ diff --git a/bin/fenetres/evaluate$1.class b/bin/fenetres/evaluate$1.class index 2492baf..4bf2cd1 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 3fef7fb..5e481a7 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 eaf7477..9b9a5e8 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 9bb54d5..07390d2 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 5921a39..a1e6325 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 8c984d8..eaaad15 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 a2f9f59..d804ab8 100644 Binary files a/bin/fenetres/evaluate$15.class and b/bin/fenetres/evaluate$15.class differ diff --git a/bin/fenetres/evaluate$16.class b/bin/fenetres/evaluate$16.class index 023cf6a..ef77465 100644 Binary files a/bin/fenetres/evaluate$16.class and b/bin/fenetres/evaluate$16.class differ diff --git a/bin/fenetres/evaluate$18.class b/bin/fenetres/evaluate$18.class index 2c3882c..f8d02e7 100644 Binary files a/bin/fenetres/evaluate$18.class and b/bin/fenetres/evaluate$18.class differ diff --git a/bin/fenetres/evaluate$19.class b/bin/fenetres/evaluate$19.class index d39844e..b91173c 100644 Binary files a/bin/fenetres/evaluate$19.class and b/bin/fenetres/evaluate$19.class differ diff --git a/bin/fenetres/evaluate$2.class b/bin/fenetres/evaluate$2.class index 288a866..7532d61 100644 Binary files a/bin/fenetres/evaluate$2.class and b/bin/fenetres/evaluate$2.class differ diff --git a/bin/fenetres/evaluate$20.class b/bin/fenetres/evaluate$20.class index 007c273..3690cb2 100644 Binary files a/bin/fenetres/evaluate$20.class and b/bin/fenetres/evaluate$20.class differ diff --git a/bin/fenetres/evaluate$21.class b/bin/fenetres/evaluate$21.class index d82ce6f..f8a441f 100644 Binary files a/bin/fenetres/evaluate$21.class and b/bin/fenetres/evaluate$21.class differ diff --git a/bin/fenetres/evaluate$22.class b/bin/fenetres/evaluate$22.class index 34c8a9e..4e089f1 100644 Binary files a/bin/fenetres/evaluate$22.class and b/bin/fenetres/evaluate$22.class differ diff --git a/bin/fenetres/evaluate$23.class b/bin/fenetres/evaluate$23.class index f14165b..0bb4b46 100644 Binary files a/bin/fenetres/evaluate$23.class and b/bin/fenetres/evaluate$23.class differ diff --git a/bin/fenetres/evaluate$24.class b/bin/fenetres/evaluate$24.class index 0ad1ab6..e088ba9 100644 Binary files a/bin/fenetres/evaluate$24.class and b/bin/fenetres/evaluate$24.class differ diff --git a/bin/fenetres/evaluate$25.class b/bin/fenetres/evaluate$25.class index 654fdf4..095677b 100644 Binary files a/bin/fenetres/evaluate$25.class and b/bin/fenetres/evaluate$25.class differ diff --git a/bin/fenetres/evaluate$26.class b/bin/fenetres/evaluate$26.class index f8474dd..1d362be 100644 Binary files a/bin/fenetres/evaluate$26.class and b/bin/fenetres/evaluate$26.class differ diff --git a/bin/fenetres/evaluate$27.class b/bin/fenetres/evaluate$27.class index a60e8de..c59533c 100644 Binary files a/bin/fenetres/evaluate$27.class and b/bin/fenetres/evaluate$27.class differ diff --git a/bin/fenetres/evaluate$28.class b/bin/fenetres/evaluate$28.class index f871b30..441b677 100644 Binary files a/bin/fenetres/evaluate$28.class and b/bin/fenetres/evaluate$28.class differ diff --git a/bin/fenetres/evaluate$29.class b/bin/fenetres/evaluate$29.class index 4b9fa2f..cce6449 100644 Binary files a/bin/fenetres/evaluate$29.class and b/bin/fenetres/evaluate$29.class differ diff --git a/bin/fenetres/evaluate$3.class b/bin/fenetres/evaluate$3.class index 49331de..300418f 100644 Binary files a/bin/fenetres/evaluate$3.class and b/bin/fenetres/evaluate$3.class differ diff --git a/bin/fenetres/evaluate$30.class b/bin/fenetres/evaluate$30.class index bdeafd6..d2767e9 100644 Binary files a/bin/fenetres/evaluate$30.class and b/bin/fenetres/evaluate$30.class differ diff --git a/bin/fenetres/evaluate$31.class b/bin/fenetres/evaluate$31.class index 19e471d..d6db16a 100644 Binary files a/bin/fenetres/evaluate$31.class and b/bin/fenetres/evaluate$31.class differ diff --git a/bin/fenetres/evaluate$4.class b/bin/fenetres/evaluate$4.class index 4ab2302..6f90570 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 5035ac1..b202711 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 0002b8a..b7427dc 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 d1d473f..9b952ea 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 a72389e..0e49a8d 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 4640206..7579a8a 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 57a748b..a5a273c 100644 Binary files a/bin/fenetres/evaluate.class and b/bin/fenetres/evaluate.class differ diff --git a/src/fenetres/create.java b/src/fenetres/create.java index f6e9812..fa0a709 100644 --- a/src/fenetres/create.java +++ b/src/fenetres/create.java @@ -685,6 +685,10 @@ public final class create extends JFrame { toolBarPrincipal.addSeparator(); buttonEvaluate = toolBarPrincipal.add( new actEvaluer() ); + buttonEvaluate.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + } + }); buttonEvaluate.setIcon(new ImageIcon(create.class.getResource("/resources/evaluate.png"))); toolBarPrincipal.addSeparator(); diff --git a/src/fenetres/evaluate.java b/src/fenetres/evaluate.java index ec30b36..b163e95 100644 --- a/src/fenetres/evaluate.java +++ b/src/fenetres/evaluate.java @@ -130,6 +130,8 @@ public class evaluate extends JFrame { chckbxfichiersEtudiants.setFont(new Font("Tahoma", Font.PLAIN, 12)); chckbxfichiersEtudiants.setToolTipText("Cochez si les fichiers des étudiants ne sont pas dans des dossier nominatifs"); panelWest.add(chckbxfichiersEtudiants, "flowy,cell 0 2,grow"); + chckbxfichiersEtudiants.setSelected(commandes.fichierStudentMoodle); + lblChargementFichierCSV = new JLabel(" Chargement de la liste des étudiants"); panelWest.add(lblChargementFichierCSV, "cell 0 3,alignx left,aligny center"); @@ -154,6 +156,8 @@ public class evaluate extends JFrame { }); chckCSVNotes.setToolTipText("Cochez si vous voulez importer les notes dans un fichier CSV."); panelWest.add(chckCSVNotes, "cell 0 5,grow"); + chckCSVNotes.setSelected(commandes.ecritNoteCSV); + lblPath = new JLabel(); lblPath.setHorizontalAlignment(SwingConstants.LEFT); @@ -174,6 +178,9 @@ public class evaluate extends JFrame { chckbxnoFeedback.setToolTipText("Cochez si vous ne voulez pas générer des feedbacks"); chckbxnoFeedback.setFont(new Font("Tahoma", Font.PLAIN, 12)); panelWest.add(chckbxnoFeedback, "cell 0 2,grow"); + chckbxnoFeedback.setSelected(commandes.sansFeeback); + + chckbxZipfeedback = new JCheckBox("Zip les feedbacks"); chckbxZipfeedback.addChangeListener(new ChangeListener() { @@ -188,6 +195,8 @@ public class evaluate extends JFrame { chckbxZipfeedback.setToolTipText("Cochez si vous voulez placer tous les feedbacks dans une archive ZIP"); chckbxZipfeedback.setFont(new Font("Tahoma", Font.PLAIN, 12)); panelWest.add(chckbxZipfeedback, "cell 0 2,grow"); + chckbxZipfeedback.setSelected(commandes.zipfeedback); + chckbxNoNote = new JCheckBox("Pas de note dans les feedbacks"); chckbxNoNote.addChangeListener(new ChangeListener() { @@ -199,10 +208,12 @@ public class evaluate extends JFrame { } } }); - chckbxNoNote.setToolTipText("Cochez si vous voulez pas faire apparaître les notes dans les feedbacks"); chckbxNoNote.setFont(new Font("Tahoma", Font.PLAIN, 12)); panelWest.add(chckbxNoNote, "cell 0 2,grow"); + chckbxNoNote.setSelected(commandes.noNote); + + chckbxVerif = new JCheckBox("Vérification des historiques avant analyse"); chckbxVerif.addChangeListener(new ChangeListener() { @@ -214,6 +225,10 @@ public class evaluate extends JFrame { } } }); + chckbxVerif.setToolTipText("Cochez si vous voulez vérifier les échanges de fichiers entre les étudiants."); + chckbxVerif.setFont(new Font("Tahoma", Font.PLAIN, 12)); + panelWest.add(chckbxVerif, "cell 0 2,grow"); + chckbxVerif.setSelected(commandes.verifHisto2); chckbxNoDetail = new JCheckBox("Pas de détails dans les feedbacks"); @@ -229,9 +244,8 @@ public class evaluate extends JFrame { chckbxNoDetail.setToolTipText("Cochez si vous voulez que la table synthèse dans les feedbacks"); chckbxNoDetail.setFont(new Font("Tahoma", Font.PLAIN, 12)); panelWest.add(chckbxNoDetail, "cell 0 2"); - chckbxVerif.setToolTipText("Cochez si vous voulez vérifier les échanges de fichiers entre les étudiants."); - chckbxVerif.setFont(new Font("Tahoma", Font.PLAIN, 12)); - panelWest.add(chckbxVerif, "cell 0 2,grow"); + chckbxNoDetail.setSelected(commandes.noDetail); + chckbxNewLogo = new JCheckBox("Nouveau logo"); chckbxNewLogo.addChangeListener(new ChangeListener() { @@ -246,6 +260,8 @@ public class evaluate extends JFrame { chckbxNewLogo.setToolTipText("Cochez si vous voulez remplacer le logo par celui au-dessus."); chckbxNewLogo.setFont(new Font("Tahoma", Font.PLAIN, 12)); panelWest.add(chckbxNewLogo, "cell 0 7"); + chckbxNewLogo.setSelected(commandes.newLogo); + chckbxNoLogo = new JCheckBox("Pas de logo"); chckbxNoLogo.addChangeListener(new ChangeListener() { @@ -260,7 +276,7 @@ public class evaluate extends JFrame { chckbxNoLogo.setToolTipText("Cochez si vous voulez pas de logo dans les feedbacks."); chckbxNoLogo.setFont(new Font("Tahoma", Font.PLAIN, 12)); panelWest.add(chckbxNoLogo, "cell 0 7"); - + chckbxNoLogo.setSelected(commandes.noLogo); JPanel panelCentre = new JPanel(); contentPane.add(panelCentre, BorderLayout.CENTER); @@ -276,6 +292,17 @@ public class evaluate extends JFrame { txtpnmessages.setText(baliseStyle.balise() + "

*** Charger un fichier d'analyse. ***

"); scrollPane.setViewportView(txtpnmessages); + + if(commandes.fourniCSV) { + lblChargementFichierCSV.setBackground(new Color(40,180,40)); + lblChargementFichierCSV.setOpaque(true); + lblFichierCSV.setText("Fichier CSV : " + commandes.nameCSV + ""); + }else { + lblChargementFichierCSV.setOpaque(false); + lblFichierCSV.setText("Fichier CSV"); + } + + this.setExtendedState(MAXIMIZED_BOTH); @@ -284,7 +311,7 @@ public class evaluate extends JFrame { refreshLabel(); setVisible(true); -// Pro(); + } @@ -405,6 +432,10 @@ public class evaluate extends JFrame { toolBar.add(btnFichierCSV); JButton btnInfoListeEtudiant = toolBar.add(actAfficheListeEtudiant); + btnInfoListeEtudiant.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + } + }); btnInfoListeEtudiant.setIcon(new ImageIcon(evaluate.class.getResource("/resources/fichierCSVInfo.png"))); btnInfoListeEtudiant.setHideActionText(true); toolBar.add(btnInfoListeEtudiant); @@ -1019,7 +1050,7 @@ public class evaluate extends JFrame { /** - * Charge la liste des étudiants sous la frome d'un fichier XML. + * Charge la liste des étudiants sous la forme d'un fichier XML. */ private AbstractAction actChargeListeEtudiantCSV = new AbstractAction() { @@ -1098,10 +1129,10 @@ public class evaluate extends JFrame { @Override public void actionPerformed( ActionEvent e ) { if(commandes.fourniCSV) { txtpnmessages.setText(Run.ecritureNode(commandes.nodeCSV, 0).toString()); + System.out.println( "Affiche la liste des étudaints déjà en mémoire." ); }else { txtpnmessages.setText("*** Veuillez sélectionner un fichier CSV contenant la liste des étudiants. ***"); } - System.out.println( "Affiche la liste des étudaints déjà en mémoire." ); } };