MAJ V1.0.1 (JRE1.8 with JDK1.8.0_271)
This commit is contained in:
pablo rodriguez
parent
86714bd941
commit
fcb98675d9
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -20,7 +20,7 @@ public class exportBaseToExcel {
|
||||
public static void exportBase() {
|
||||
|
||||
// Données
|
||||
Object[][] data = new Object[commandes.nBase.getChild(commandes.nBase.getAttributes("defaut_Year")).getNumberChildren()][29];
|
||||
Object[][] data = new Object[commandes.nBase.getChild(commandes.nBase.getAttributes("defaut_Year")).getNumberChildren()][30];
|
||||
|
||||
|
||||
|
||||
@ -44,21 +44,22 @@ public class exportBaseToExcel {
|
||||
data[indexFormation][12] = "Groupe_Langue";
|
||||
data[indexFormation][13] = "LV1";
|
||||
data[indexFormation][14] = "LV2";
|
||||
data[indexFormation][15] = "Groupe_Informatique";
|
||||
data[indexFormation][16] = "Atelier-rentree_horaire";
|
||||
data[indexFormation][17] = "Atelier_pre-rentree_enseignant";
|
||||
data[indexFormation][18] = "Atelier_pre-rentree_salle";
|
||||
data[indexFormation][19] = "UE_Libre";
|
||||
data[indexFormation][20] = "Covoiturage";
|
||||
data[indexFormation][21] = "Etudiant_Covoiturage";
|
||||
data[indexFormation][22] = "Stage_1";
|
||||
data[indexFormation][23] = "Num_convention_1";
|
||||
data[indexFormation][24] = "Periode_1";
|
||||
data[indexFormation][25] = "Stage_2";
|
||||
data[indexFormation][26] = "Num_convention_2";
|
||||
data[indexFormation][27] = "Periode_2";
|
||||
data[indexFormation][15] = "Regime";
|
||||
data[indexFormation][16] = "Groupe_Informatique";
|
||||
data[indexFormation][17] = "Atelier-rentree_horaire";
|
||||
data[indexFormation][18] = "Atelier_pre-rentree_enseignant";
|
||||
data[indexFormation][19] = "Atelier_pre-rentree_salle";
|
||||
data[indexFormation][20] = "UE_Libre";
|
||||
data[indexFormation][21] = "Covoiturage";
|
||||
data[indexFormation][22] = "Etudiant_Covoiturage";
|
||||
data[indexFormation][23] = "Stage_1";
|
||||
data[indexFormation][24] = "Num_convention_1";
|
||||
data[indexFormation][25] = "Periode_1";
|
||||
data[indexFormation][26] = "Stage_2";
|
||||
data[indexFormation][27] = "Num_convention_2";
|
||||
data[indexFormation][28] = "Periode_2";
|
||||
|
||||
String[][] data1 = new String[formation.getNumberChildren()][27];
|
||||
String[][] data1 = new String[formation.getNumberChildren()][28];
|
||||
|
||||
int indexStudent = 0;
|
||||
for(noeud nStudent : formation.getChildren()) {
|
||||
@ -76,22 +77,23 @@ public class exportBaseToExcel {
|
||||
data1[indexStudent][11] = nStudent.getAttributes("Groupe_Langue");
|
||||
data1[indexStudent][12] = nStudent.getAttributes("LV1");
|
||||
data1[indexStudent][13] = nStudent.getAttributes("LV2");
|
||||
data1[indexStudent][14] = nStudent.getAttributes("Groupe_Informatique");
|
||||
data1[indexStudent][15] = nStudent.getAttributes("Atelier-rentree_horaire");
|
||||
data1[indexStudent][16] = nStudent.getAttributes("Atelier_pre-rentree_enseignant");
|
||||
data1[indexStudent][17] = nStudent.getAttributes("Atelier_pre-rentree_salle");
|
||||
data1[indexStudent][18] = nStudent.getAttributes("UE_Libre");
|
||||
data1[indexStudent][19] = nStudent.getAttributes("Covoiturage");
|
||||
data1[indexStudent][20] = nStudent.getAttributes("Etudiant_Covoiturage");
|
||||
data1[indexStudent][21] = nStudent.getAttributes("Stage_1");
|
||||
data1[indexStudent][22] = nStudent.getAttributes("Num_convention_1");
|
||||
data1[indexStudent][23] = nStudent.getAttributes("Periode_1");
|
||||
data1[indexStudent][24] = nStudent.getAttributes("Stage_2");
|
||||
data1[indexStudent][25] = nStudent.getAttributes("Num_convention_2");
|
||||
data1[indexStudent][26] = nStudent.getAttributes("Periode_2");
|
||||
data1[indexStudent][14] = nStudent.getAttributes("Regime");
|
||||
data1[indexStudent][15] = nStudent.getAttributes("Groupe_Informatique");
|
||||
data1[indexStudent][16] = nStudent.getAttributes("Atelier-rentree_horaire");
|
||||
data1[indexStudent][17] = nStudent.getAttributes("Atelier_pre-rentree_enseignant");
|
||||
data1[indexStudent][18] = nStudent.getAttributes("Atelier_pre-rentree_salle");
|
||||
data1[indexStudent][19] = nStudent.getAttributes("UE_Libre");
|
||||
data1[indexStudent][20] = nStudent.getAttributes("Covoiturage");
|
||||
data1[indexStudent][21] = nStudent.getAttributes("Etudiant_Covoiturage");
|
||||
data1[indexStudent][22] = nStudent.getAttributes("Stage_1");
|
||||
data1[indexStudent][23] = nStudent.getAttributes("Num_convention_1");
|
||||
data1[indexStudent][24] = nStudent.getAttributes("Periode_1");
|
||||
data1[indexStudent][25] = nStudent.getAttributes("Stage_2");
|
||||
data1[indexStudent][26] = nStudent.getAttributes("Num_convention_2");
|
||||
data1[indexStudent][27] = nStudent.getAttributes("Periode_2");
|
||||
|
||||
|
||||
data[indexFormation][28] = data1;
|
||||
data[indexFormation][29] = data1;
|
||||
indexStudent++;
|
||||
}
|
||||
|
||||
@ -141,13 +143,13 @@ public class exportBaseToExcel {
|
||||
data[0][6] = "Individu_-_Tel._portable";
|
||||
data[0][7] = "Individu_-_Email_personnel";
|
||||
data[0][8] = "Individu_-_Email";
|
||||
data[0][9] = "Groupe";
|
||||
data[0][10] = "Groupe_Principal";
|
||||
data[0][11] = "Groupe_TD";
|
||||
data[0][12] = "Groupe_Langue";
|
||||
data[0][9] = "Groupe_Principal";
|
||||
data[0][10] = "Groupe_TD";
|
||||
data[0][11] = "Groupe_Langue";
|
||||
data[0][12] = "Groupe_Informatique";
|
||||
data[0][13] = "LV1";
|
||||
data[0][14] = "LV2";
|
||||
data[0][15] = "Groupe_Informatique";
|
||||
data[0][15] = "Regime";
|
||||
data[0][16] = "Atelier-rentree_horaire";
|
||||
data[0][17] = "Atelier_pre-rentree_enseignant";
|
||||
data[0][18] = "Atelier_pre-rentree_salle";
|
||||
@ -174,13 +176,13 @@ public class exportBaseToExcel {
|
||||
data1[indexStudent][5] = nStudent.getAttributes("Individu_-_Tel._portable");
|
||||
data1[indexStudent][6] = nStudent.getAttributes("Individu_-_Email_personnel");
|
||||
data1[indexStudent][7] = nStudent.getAttributes("Individu_-_Email");
|
||||
data1[indexStudent][8] = nStudent.getAttributes("Groupe");
|
||||
data1[indexStudent][9] = nStudent.getAttributes("Groupe_Principal");
|
||||
data1[indexStudent][10] = nStudent.getAttributes("Groupe_TD");
|
||||
data1[indexStudent][11] = nStudent.getAttributes("Groupe_Langue");
|
||||
data1[indexStudent][8] = nStudent.getAttributes("Groupe_Principal");
|
||||
data1[indexStudent][9] = nStudent.getAttributes("Groupe_TD");
|
||||
data1[indexStudent][10] = nStudent.getAttributes("Groupe_Langue");
|
||||
data1[indexStudent][11] = nStudent.getAttributes("Groupe_Informatique");
|
||||
data1[indexStudent][12] = nStudent.getAttributes("LV1");
|
||||
data1[indexStudent][13] = nStudent.getAttributes("LV2");
|
||||
data1[indexStudent][14] = nStudent.getAttributes("Groupe_Informatique");
|
||||
data1[indexStudent][14] = nStudent.getAttributes("Regime");
|
||||
data1[indexStudent][15] = nStudent.getAttributes("Atelier-rentree_horaire");
|
||||
data1[indexStudent][16] = nStudent.getAttributes("Atelier_pre-rentree_enseignant");
|
||||
data1[indexStudent][17] = nStudent.getAttributes("Atelier_pre-rentree_salle");
|
||||
|
||||
@ -35,6 +35,8 @@ import javax.swing.ListSelectionModel;
|
||||
import javax.swing.SwingConstants;
|
||||
import javax.swing.border.BevelBorder;
|
||||
import javax.swing.border.EmptyBorder;
|
||||
import javax.swing.event.DocumentEvent;
|
||||
import javax.swing.event.DocumentListener;
|
||||
import javax.swing.event.ListSelectionEvent;
|
||||
import javax.swing.event.ListSelectionListener;
|
||||
import javax.swing.table.DefaultTableCellRenderer;
|
||||
@ -46,6 +48,7 @@ import baseUFRHG.actions.exportEmargement;
|
||||
import baseUFRHG.actions.exportTable;
|
||||
import baseUFRHG.actions.saveTable;
|
||||
import javax.swing.JButton;
|
||||
import javax.swing.JTextPane;
|
||||
|
||||
public class gestionnaire extends JFrame {
|
||||
|
||||
@ -68,6 +71,7 @@ public class gestionnaire extends JFrame {
|
||||
private JComboBox<String> cProfil;
|
||||
private JComboBox<String> cGroupePrincipal;
|
||||
private JComboBox<String> cGroupeProjet;
|
||||
private JComboBox<String> cRegime;
|
||||
private JCheckBoxMenuItem chckToutesLesColonnes = new JCheckBoxMenuItem("Affiche toutes les colonnes");
|
||||
private JCheckBoxMenuItem chckGroupeTD = new JCheckBoxMenuItem("Groupe TD");
|
||||
private JCheckBoxMenuItem chckGroupeLangue = new JCheckBoxMenuItem("Groupe Langue");
|
||||
@ -75,9 +79,10 @@ public class gestionnaire extends JFrame {
|
||||
private JCheckBoxMenuItem chckGroupeDocumentation = new JCheckBoxMenuItem("Groupe Documentation");
|
||||
private JCheckBoxMenuItem chckLV1 = new JCheckBoxMenuItem("LV1 : Langue Vivante 1");
|
||||
private JCheckBoxMenuItem chckLV2 = new JCheckBoxMenuItem("LV2 : Langue Vivante 2");
|
||||
private JCheckBoxMenuItem chckGroupePrincipal= new JCheckBoxMenuItem("Groupe Principal");
|
||||
private JCheckBoxMenuItem chckGroupeProjet= new JCheckBoxMenuItem("Groupe Projet");
|
||||
|
||||
private JCheckBoxMenuItem chckGroupePrincipal = new JCheckBoxMenuItem("Groupe Principal");
|
||||
private JCheckBoxMenuItem chckGroupeProjet = new JCheckBoxMenuItem("Groupe Projet");
|
||||
private JCheckBoxMenuItem chckRegime = new JCheckBoxMenuItem("Régime");
|
||||
JTextPane textPaneNom = new JTextPane();
|
||||
|
||||
JLabel lblInformation = new JLabel("Information :");
|
||||
JLabel lblInformationStudent = new JLabel("");
|
||||
@ -235,6 +240,7 @@ public class gestionnaire extends JFrame {
|
||||
chckGroupeInformatique.setSelected(true);
|
||||
chckGroupeDocumentation.setSelected(true);
|
||||
chckGroupeProjet.setSelected(true);
|
||||
chckRegime.setSelected(true);
|
||||
}
|
||||
majTableFormation();
|
||||
}
|
||||
@ -310,6 +316,13 @@ public class gestionnaire extends JFrame {
|
||||
}
|
||||
});
|
||||
|
||||
chckRegime.setSelected(true);
|
||||
menuAffichage.add(chckRegime);
|
||||
chckRegime.addItemListener(new ItemListener() {
|
||||
public void itemStateChanged(ItemEvent e) {
|
||||
majTableFormation();
|
||||
}
|
||||
});
|
||||
|
||||
JMenu menuExport = new JMenu("Export");
|
||||
menuExport.setFont(new Font("Tahoma", Font.BOLD, 14));
|
||||
@ -398,6 +411,7 @@ public class gestionnaire extends JFrame {
|
||||
cLV1.setSelectedIndex(0);
|
||||
cLV2.setSelectedIndex(0);
|
||||
cLangue.setSelectedIndex(0);
|
||||
cRegime.setSelectedIndex(0);
|
||||
majTableGroupes();
|
||||
}
|
||||
});
|
||||
@ -414,6 +428,45 @@ public class gestionnaire extends JFrame {
|
||||
lblGroupeProjet.setBounds(677, 61, 152, 14);
|
||||
panelFiltre.add(lblGroupeProjet);
|
||||
|
||||
cRegime = new JComboBox<String>();
|
||||
cRegime.setBounds(1032, 77, 168, 32);
|
||||
panelFiltre.add(cRegime);
|
||||
|
||||
JLabel lblRegime = new JLabel("Régime");
|
||||
lblRegime.setFont(new Font("Tahoma", Font.BOLD, 12));
|
||||
lblRegime.setBounds(1032, 60, 101, 14);
|
||||
panelFiltre.add(lblRegime);
|
||||
textPaneNom.setFont(new Font("Tahoma", Font.BOLD, 12));
|
||||
|
||||
|
||||
textPaneNom.setBounds(1216, 25, 190, 32);
|
||||
panelFiltre.add(textPaneNom);
|
||||
|
||||
JLabel lblNewLabel = new JLabel("Nom de l'étudiant");
|
||||
lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 12));
|
||||
lblNewLabel.setBounds(1216, 11, 160, 14);
|
||||
panelFiltre.add(lblNewLabel);
|
||||
textPaneNom.getDocument().addDocumentListener(new DocumentListener() {
|
||||
|
||||
@Override
|
||||
public void insertUpdate(DocumentEvent e) {
|
||||
majTableGroupes();
|
||||
System.out.println("insertUpdate");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeUpdate(DocumentEvent e) {
|
||||
majTableGroupes();
|
||||
System.out.println("removeUpdate");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void changedUpdate(DocumentEvent e) {
|
||||
System.out.println("changedUpdate");
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
JPanel panelSouth = new JPanel();
|
||||
panelSouth.setPreferredSize(new Dimension(400, 90));
|
||||
panelSouth.setBackground(Color.gray);
|
||||
@ -501,6 +554,13 @@ public class gestionnaire extends JFrame {
|
||||
}
|
||||
});
|
||||
|
||||
cRegime.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
majTableGroupes();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// Ajout d'un ListSelectionListener pour détecter la sélection de la ligne
|
||||
ListSelectionModel selectionModel = table.getSelectionModel();
|
||||
@ -557,7 +617,8 @@ public class gestionnaire extends JFrame {
|
||||
String selectedDocumentation = null;
|
||||
String selectedProfil = null;
|
||||
String selectedGroupePrincipal = null;
|
||||
String selectedGroupeProjet= null;
|
||||
String selectedGroupeProjet = null;
|
||||
String selectedRegime = null;
|
||||
|
||||
if(cGroupeTD.getItemCount()>0) selectedGroupeTD = cGroupeTD.getSelectedItem().toString();
|
||||
if(cLV1.getItemCount()>0) selectedLV1 = cLV1.getSelectedItem().toString();
|
||||
@ -568,6 +629,8 @@ public class gestionnaire extends JFrame {
|
||||
if(cProfil.getItemCount()>0) selectedProfil = cProfil.getSelectedItem().toString();
|
||||
if(cGroupePrincipal.getItemCount()>0) selectedGroupePrincipal = cGroupePrincipal.getSelectedItem().toString();
|
||||
if(cGroupeProjet.getItemCount()>0) selectedGroupeProjet = cGroupeProjet.getSelectedItem().toString();
|
||||
if(cRegime.getItemCount()>0) selectedRegime = cRegime.getSelectedItem().toString();
|
||||
|
||||
|
||||
cGroupeTD.removeAllItems();
|
||||
cLV1.removeAllItems();
|
||||
@ -578,6 +641,7 @@ public class gestionnaire extends JFrame {
|
||||
cProfil.removeAllItems();
|
||||
cGroupePrincipal.removeAllItems();
|
||||
cGroupeProjet.removeAllItems();
|
||||
cRegime.removeAllItems();
|
||||
|
||||
List<String> lGroupeTD = new ArrayList<String>();
|
||||
List<String> lLV1 = new ArrayList<String>();
|
||||
@ -588,6 +652,7 @@ public class gestionnaire extends JFrame {
|
||||
List<String> lProfil = new ArrayList<String>();
|
||||
List<String> lGroupePrincipal = new ArrayList<String>();
|
||||
List<String> lGroupeProjet = new ArrayList<String>();
|
||||
List<String> lRegime = new ArrayList<String>();
|
||||
|
||||
String pasChoisi = " - ";
|
||||
|
||||
@ -604,6 +669,7 @@ public class gestionnaire extends JFrame {
|
||||
String Documentation = nStudent.getAttributes("Groupe_Doc");
|
||||
String GroupePrincipal = nStudent.getAttributes("Groupe_Principal");
|
||||
String GroupeProjet = nStudent.getAttributes("Groupe_Projet");
|
||||
String Regime = nStudent.getAttributes("Regime");
|
||||
|
||||
boolean isOnlySpaces = GroupeTD.matches("\\s+");
|
||||
if(!lGroupeTD.contains(GroupeTD) && !isOnlySpaces) {
|
||||
@ -641,6 +707,10 @@ public class gestionnaire extends JFrame {
|
||||
if(!lGroupeProjet.contains(GroupeProjet) && !isOnlySpaces) {
|
||||
lGroupeProjet.add(GroupeProjet);
|
||||
}
|
||||
isOnlySpaces = Regime.matches("\\s+");
|
||||
if(!lRegime.contains(Regime) && !isOnlySpaces) {
|
||||
lRegime.add(Regime);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -726,6 +796,15 @@ public class gestionnaire extends JFrame {
|
||||
cGroupeProjet.setSelectedItem(selectedGroupeProjet);
|
||||
}
|
||||
|
||||
Collections.sort(lRegime);
|
||||
cRegime.addItem(pasChoisi);
|
||||
for (String option : lRegime) {
|
||||
cRegime.addItem(option);
|
||||
}
|
||||
if(selectedRegime!=null)if(lRegime.contains(selectedRegime)) {
|
||||
cRegime.setSelectedItem(selectedRegime);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -748,6 +827,7 @@ public class gestionnaire extends JFrame {
|
||||
String GroupeDocumentation = (String) cDocumentation.getSelectedItem();
|
||||
String GroupePrincipal = (String) cGroupePrincipal.getSelectedItem();
|
||||
String GroupeProjet = (String) cGroupeProjet.getSelectedItem();
|
||||
String Regime = (String) cRegime.getSelectedItem();
|
||||
|
||||
nTable = new noeud("Table");
|
||||
nTable.setAttribut("defaut_Year", defautYear);
|
||||
@ -815,6 +895,13 @@ public class gestionnaire extends JFrame {
|
||||
GroupeProjet = pasChoisi;
|
||||
}
|
||||
|
||||
if(cRegime.getSelectedItem()!=null) {
|
||||
nTable.setAttribut("Regime", cRegime.getSelectedItem().toString());
|
||||
}else {
|
||||
nTable.setAttribut("Regime", pasChoisi);
|
||||
Regime = pasChoisi;
|
||||
}
|
||||
|
||||
|
||||
Map<String, Integer> dictionary = new HashMap<>();
|
||||
|
||||
@ -823,7 +910,7 @@ public class gestionnaire extends JFrame {
|
||||
|
||||
if(nYears!=null) {
|
||||
noeud nFormation = nYears.getChild(cFormations.getSelectedItem().toString());
|
||||
String[][] data = new String[nFormation.getChildren().size()][31] ;
|
||||
String[][] data = new String[nFormation.getChildren().size()][33] ;
|
||||
|
||||
// création de l'entête
|
||||
int indexCol = 0;
|
||||
@ -869,6 +956,10 @@ public class gestionnaire extends JFrame {
|
||||
}
|
||||
if(chckGroupeProjet.isSelected() && key.equals("Groupe_Projet") ) {
|
||||
dictionary.put(key, indexCol);
|
||||
indexCol++;
|
||||
}
|
||||
if(chckRegime.isSelected() && key.equals("Regime") ) {
|
||||
dictionary.put(key, indexCol);
|
||||
indexCol++;
|
||||
}
|
||||
}
|
||||
@ -879,55 +970,75 @@ public class gestionnaire extends JFrame {
|
||||
indexCol = 0;
|
||||
boolean trouve = false;
|
||||
for (Map.Entry<String, String> entry : nStudent.getAttributes().entrySet()) {
|
||||
String nameStudent = null;
|
||||
|
||||
if( ( nStudent.getAttributes("Groupe_Projet").equals(GroupeProjet) || GroupeProjet.equals(pasChoisi) )
|
||||
&& ( nStudent.getAttributes("Groupe_Principal").equals(GroupePrincipal) || GroupePrincipal.equals(pasChoisi) )
|
||||
&& ( nStudent.getAttributes("Groupe_Doc").equals(GroupeDocumentation) || GroupeDocumentation.equals(pasChoisi) )
|
||||
&& ( nStudent.getAttributes("Profil_etudiant_lib.").equals(Profil) || Profil.equals(pasChoisi) )
|
||||
&& ( nStudent.getAttributes("Groupe_Langue").equals(GroupeLangue) || GroupeLangue.equals(pasChoisi) )
|
||||
&& ( nStudent.getAttributes("LV2").equals(LV2) || LV2.equals(pasChoisi) )
|
||||
&& ( nStudent.getAttributes("Groupe_Informatique").equals(GroupeInformatique) || GroupeInformatique.equals(pasChoisi) )
|
||||
&& ( nStudent.getAttributes("Groupe_TD").equals(GroupeTD) || GroupeTD.equals(pasChoisi) )
|
||||
&& ( nStudent.getAttributes("LV1").equals(LV1) || LV1.equals(pasChoisi) ) ) {
|
||||
|
||||
if(dictionary.get(entry.getKey())!=null) {
|
||||
String key = entry.getKey();
|
||||
if(chckToutesLesColonnes.isSelected() ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}else {
|
||||
if(key.equals("Individu_-_Nom") || key.equals("Individu_-_Prenom") || key.equals("Individu_-_Code_Etudiant")) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
if(chckGroupePrincipal.isSelected() && key.equals("Groupe_Principal") ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
if(chckGroupeTD.isSelected() && key.equals("Groupe_TD") ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
if(chckGroupeLangue.isSelected() && key.equals("Groupe_Langue") ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
if(chckGroupeInformatique.isSelected() && key.equals("Groupe_Informatique") ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
if(chckGroupeDocumentation.isSelected() && key.equals("Groupe_Doc") ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
if(chckLV1.isSelected() && key.equals("LV1") ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
if(chckLV2.isSelected() && key.equals("LV2") ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
if(chckGroupeProjet.isSelected() && key.equals("Groupe_Projet") ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
}
|
||||
indexCol++;
|
||||
trouve=true;
|
||||
}
|
||||
|
||||
boolean containNameStudent = false;
|
||||
boolean searchStudent = false;
|
||||
|
||||
if(!textPaneNom.getText().isEmpty()) {
|
||||
searchStudent=true;
|
||||
nameStudent = nStudent.getAttributes("Individu_-_Nom").toLowerCase();
|
||||
String nameSearch = textPaneNom.getText().toLowerCase();
|
||||
boolean commencePar = nameStudent.matches("^"+nameSearch+".*");
|
||||
if(commencePar) containNameStudent=true;
|
||||
}
|
||||
|
||||
|
||||
if(!searchStudent || (searchStudent&&containNameStudent)) {
|
||||
if( ( nStudent.getAttributes("Regime").equals(Regime) || Regime.equals(pasChoisi) )
|
||||
&& ( nStudent.getAttributes("Groupe_Projet").equals(GroupeProjet) || GroupeProjet.equals(pasChoisi) )
|
||||
&& ( nStudent.getAttributes("Groupe_Principal").equals(GroupePrincipal) || GroupePrincipal.equals(pasChoisi) )
|
||||
&& ( nStudent.getAttributes("Groupe_Doc").equals(GroupeDocumentation) || GroupeDocumentation.equals(pasChoisi) )
|
||||
&& ( nStudent.getAttributes("Profil_etudiant_lib.").equals(Profil) || Profil.equals(pasChoisi) )
|
||||
&& ( nStudent.getAttributes("Groupe_Langue").equals(GroupeLangue) || GroupeLangue.equals(pasChoisi) )
|
||||
&& ( nStudent.getAttributes("LV2").equals(LV2) || LV2.equals(pasChoisi) )
|
||||
&& ( nStudent.getAttributes("Groupe_Informatique").equals(GroupeInformatique) || GroupeInformatique.equals(pasChoisi) )
|
||||
&& ( nStudent.getAttributes("Groupe_TD").equals(GroupeTD) || GroupeTD.equals(pasChoisi) )
|
||||
&& ( nStudent.getAttributes("LV1").equals(LV1) || LV1.equals(pasChoisi) ) ){
|
||||
|
||||
if(dictionary.get(entry.getKey())!=null) {
|
||||
String key = entry.getKey();
|
||||
if(chckToutesLesColonnes.isSelected() ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}else {
|
||||
if(key.equals("Individu_-_Nom") || key.equals("Individu_-_Prenom") || key.equals("Individu_-_Code_Etudiant")) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
if(chckGroupePrincipal.isSelected() && key.equals("Groupe_Principal") ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
if(chckGroupeTD.isSelected() && key.equals("Groupe_TD") ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
if(chckGroupeLangue.isSelected() && key.equals("Groupe_Langue") ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
if(chckGroupeInformatique.isSelected() && key.equals("Groupe_Informatique") ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
if(chckGroupeDocumentation.isSelected() && key.equals("Groupe_Doc") ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
if(chckLV1.isSelected() && key.equals("LV1") ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
if(chckLV2.isSelected() && key.equals("LV2") ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
if(chckGroupeProjet.isSelected() && key.equals("Groupe_Projet") ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
if(chckRegime.isSelected() && key.equals("Regime") ) {
|
||||
data[indexRow][dictionary.get(key)] = entry.getValue();
|
||||
}
|
||||
}
|
||||
indexCol++;
|
||||
trouve=true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if(trouve) {
|
||||
|
||||
@ -107,12 +107,13 @@ public class importAllBaseToExcel {
|
||||
// Autres types de cellules (formules, vides, etc.)
|
||||
String cellValue = (String) cell.getStringCellValue();
|
||||
String value = nStudent.getAttributes(sheet.getRow(0).getCell(indexCol).getStringCellValue());
|
||||
boolean isOnlySpaces = value.matches("\\s+");
|
||||
if(!isOnlySpaces)if(!cellValue.equals(value)) {
|
||||
nStudent.setAttribut(sheet.getRow(0).getCell(indexCol).getStringCellValue(), cellValue);
|
||||
compteur++;
|
||||
if(value!=null) {
|
||||
boolean isOnlySpaces = value.matches("\\s+");
|
||||
if(!isOnlySpaces)if(!cellValue.equals(value)) {
|
||||
nStudent.setAttribut(sheet.getRow(0).getCell(indexCol).getStringCellValue(), cellValue);
|
||||
compteur++;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -123,7 +123,8 @@ public class importInscriptionXLS {
|
||||
if(nStudent.getAttributes("Atelier-rentree_horaire")==null) nStudent.setAttribut("Atelier-rentree_horaire","");
|
||||
if(nStudent.getAttributes("Atelier_pre-rentree_enseignant")==null) nStudent.setAttribut("Atelier_pre-rentree_enseignant","");
|
||||
if(nStudent.getAttributes("Atelier_pre-rentree_salle")==null) nStudent.setAttribut("Atelier_pre-rentree_salle","");
|
||||
|
||||
if(nStudent.getAttributes("Regime")==null) nStudent.setAttribut("Regime","");
|
||||
|
||||
|
||||
System.out.println( nStudent.toWrite()); // Nouvelle ligne après chaque ligne du tableau
|
||||
}
|
||||
@ -136,7 +137,7 @@ public class importInscriptionXLS {
|
||||
}
|
||||
|
||||
sauvegardeXMLBase.save(commandes.nBase,sauvegardeXMLBase.saveType.SANS_MESSAGE);
|
||||
JOptionPane.showMessageDialog(null, "Importation des inscription et les mises à jour sont réussies.");
|
||||
JOptionPane.showMessageDialog(null, "Importation des inscriptions et les mises à jour sont réussies.");
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -101,6 +101,7 @@ public class majBase {
|
||||
n.setAttribut("Atelier-rentree_horaire","");
|
||||
n.setAttribut("Atelier_pre-rentree_enseignant","");
|
||||
n.setAttribut("Atelier_pre-rentree_salle","");
|
||||
n.setAttribut("Regime","");
|
||||
|
||||
// nBase.getChild(defaut_Year).getChild(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(nStudent.getAttributes("IAE_-_Etape_lib."))).addChild(n);
|
||||
nBF.addChild(n);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user