MAJ V1.0.1 (JRE 1.8 with JDK 1.8.0_271)
This commit is contained in:
parent
f5071e2541
commit
95ee1fe999
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
resources/logo.png
Normal file
BIN
resources/logo.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 809 B |
63
resources/logo.svg
Normal file
63
resources/logo.svg
Normal file
@ -0,0 +1,63 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
width="24"
|
||||
height="24"
|
||||
viewBox="0 0 6.35 6.3500001"
|
||||
version="1.1"
|
||||
id="svg359"
|
||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||
sodipodi:docname="logo.svg"
|
||||
inkscape:export-filename="logo.png"
|
||||
inkscape:export-xdpi="96"
|
||||
inkscape:export-ydpi="96"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg">
|
||||
<sodipodi:namedview
|
||||
id="namedview361"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
inkscape:document-units="mm"
|
||||
showgrid="false"
|
||||
inkscape:zoom="6.5899774"
|
||||
inkscape:cx="21.472001"
|
||||
inkscape:cy="23.748185"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1009"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="layer1" />
|
||||
<defs
|
||||
id="defs356" />
|
||||
<g
|
||||
inkscape:label="Calque 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(-64.391907,-33.792385)">
|
||||
<g
|
||||
id="g528"
|
||||
transform="matrix(0.60819933,0,0,0.60819933,25.228792,13.239879)">
|
||||
<rect
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
|
||||
id="rect1446"
|
||||
width="6.6498156"
|
||||
height="6.4167376"
|
||||
x="64.641907"
|
||||
y="34.042385"
|
||||
ry="1.3043859" />
|
||||
<path
|
||||
style="fill:#03b7ea;fill-opacity:1;stroke:#000000;stroke-width:0.465;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 67.465163,43.468795 -0.02333,-7.326466 5.78651,5.249857 -3.803231,-0.863312 z"
|
||||
id="path633" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
After Width: | Height: | Size: 2.1 KiB |
@ -49,6 +49,7 @@ public class gestionnaire extends JFrame {
|
||||
private JComboBox<String> cFormations;
|
||||
private JComboBox<String> cGroupeTD;
|
||||
private JComboBox<String> cLV1;
|
||||
private JComboBox<String> cLV2;
|
||||
private JComboBox<String> cInformatique;
|
||||
private JTable table;
|
||||
private JScrollPane scrollPane_1;
|
||||
@ -134,7 +135,7 @@ public class gestionnaire extends JFrame {
|
||||
JPanel panelFiltre = new JPanel();
|
||||
// contentPane.add(panelFiltre, BorderLayout.CENTER);
|
||||
panelFiltre.setLayout(null);
|
||||
panelFiltre.setPreferredSize(new Dimension(400, 80));
|
||||
panelFiltre.setPreferredSize(new Dimension(400, 90));
|
||||
panelFiltre.setBackground(Color.gray);
|
||||
panelFiltre.add(cYears);
|
||||
panelFiltre.add(cFormations);
|
||||
@ -201,14 +202,23 @@ public class gestionnaire extends JFrame {
|
||||
panelFiltre.add(lblNewLabel_1);
|
||||
|
||||
cInformatique = new JComboBox<String>();
|
||||
cInformatique.setBounds(853, 25, 146, 32);
|
||||
cInformatique.setBounds(1031, 25, 146, 32);
|
||||
panelFiltre.add(cInformatique);
|
||||
|
||||
lblNewLabel_2 = new JLabel("Groupe Informatique");
|
||||
lblNewLabel_2.setFont(new Font("Tahoma", Font.BOLD, 12));
|
||||
lblNewLabel_2.setBounds(853, 11, 146, 14);
|
||||
lblNewLabel_2.setBounds(1031, 11, 146, 14);
|
||||
panelFiltre.add(lblNewLabel_2);
|
||||
|
||||
cLV2 = new JComboBox<String>();
|
||||
cLV2.setBounds(853, 25, 168, 32);
|
||||
panelFiltre.add(cLV2);
|
||||
|
||||
JLabel lblNewLabel_3 = new JLabel("LV2");
|
||||
lblNewLabel_3.setFont(new Font("Tahoma", Font.BOLD, 12));
|
||||
lblNewLabel_3.setBounds(853, 11, 46, 14);
|
||||
panelFiltre.add(lblNewLabel_3);
|
||||
|
||||
|
||||
// Ajout d'un ActionListener à la JComboBox
|
||||
cFormations.addActionListener(new ActionListener() {
|
||||
@ -233,6 +243,13 @@ public class gestionnaire extends JFrame {
|
||||
}
|
||||
});
|
||||
|
||||
cLV2.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
majTableGroupes();
|
||||
}
|
||||
});
|
||||
|
||||
cInformatique.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
@ -256,14 +273,17 @@ public class gestionnaire extends JFrame {
|
||||
|
||||
cGroupeTD.removeAllItems();
|
||||
cLV1.removeAllItems();
|
||||
cLV2.removeAllItems();
|
||||
cInformatique.removeAllItems();
|
||||
|
||||
List<String> lGroupeTD = new ArrayList<String>();
|
||||
List<String> lLV1 = new ArrayList<String>();
|
||||
List<String> lLV2 = new ArrayList<String>();
|
||||
List<String> lGroupeInformatique = new ArrayList<String>();
|
||||
|
||||
lGroupeTD.add(" - ");
|
||||
lLV1.add(" - ");
|
||||
lLV2.add(" - ");
|
||||
lGroupeInformatique.add(" -");
|
||||
|
||||
if(nFormation!=null) {
|
||||
@ -271,6 +291,7 @@ public class gestionnaire extends JFrame {
|
||||
if(nStudent.getAttributes("Groupe_TD")!=null) {
|
||||
String GroupeTD = nStudent.getAttributes("Groupe_TD");
|
||||
String LV1 = nStudent.getAttributes("LV1");
|
||||
String LV2 = nStudent.getAttributes("LV2");
|
||||
String GroupeInformatique = nStudent.getAttributes("Groupe_Informatique");
|
||||
if(GroupeTD!=null) {
|
||||
if(supprimeCaracatresSpeciaux.TousLesCaracatresSpeciaux(GroupeTD).length()>0) {
|
||||
@ -280,6 +301,9 @@ public class gestionnaire extends JFrame {
|
||||
if(!lLV1.contains(LV1)) {
|
||||
lLV1.add(LV1);
|
||||
}
|
||||
if(!lLV2.contains(LV2)) {
|
||||
lLV2.add(LV2);
|
||||
}
|
||||
if(!lGroupeInformatique.contains(GroupeInformatique)) {
|
||||
lGroupeInformatique.add(GroupeInformatique);
|
||||
}
|
||||
@ -294,6 +318,9 @@ public class gestionnaire extends JFrame {
|
||||
}
|
||||
for (String option : lLV1) {
|
||||
cLV1.addItem(option);
|
||||
}
|
||||
for (String option : lLV2) {
|
||||
cLV2.addItem(option);
|
||||
}
|
||||
for (String option : lGroupeInformatique) {
|
||||
cInformatique.addItem(option);
|
||||
@ -314,6 +341,7 @@ public class gestionnaire extends JFrame {
|
||||
|
||||
String GroupeTD = (String) cGroupeTD.getSelectedItem();
|
||||
String LV1 = (String) cLV1.getSelectedItem();
|
||||
String LV2 = (String) cLV2.getSelectedItem();
|
||||
String GroupeInformatique = (String) cInformatique.getSelectedItem();
|
||||
|
||||
nTable = new noeud("Table");
|
||||
@ -333,6 +361,13 @@ public class gestionnaire extends JFrame {
|
||||
LV1 = " - ";
|
||||
}
|
||||
|
||||
if(cLV2.getSelectedItem()!=null) {
|
||||
nTable.setAttribut("LV2", cLV2.getSelectedItem().toString());
|
||||
}else {
|
||||
nTable.setAttribut("LV2", " - ");
|
||||
LV2 = " - ";
|
||||
}
|
||||
|
||||
if(cInformatique.getSelectedItem()!=null) {
|
||||
nTable.setAttribut("Groupe_Informatique", cInformatique.getSelectedItem().toString());
|
||||
}else {
|
||||
@ -369,7 +404,7 @@ public class gestionnaire extends JFrame {
|
||||
for (Map.Entry<String, String> entry : nStudent.getAttributes().entrySet()) {
|
||||
String value = entry.getValue();
|
||||
|
||||
if( GroupeInformatique.equals(" -") && (GroupeTD.equals(" - ") || nStudent.getAttributes("Groupe_TD").equals(GroupeTD))
|
||||
if( LV2.equals(" - ") && ( nStudent.getAttributes("Groupe_Informatique").equals(GroupeInformatique) || GroupeInformatique.equals(" -") ) && (GroupeTD.equals(" - ") || nStudent.getAttributes("Groupe_TD").equals(GroupeTD))
|
||||
&& ( nStudent.getAttributes("LV1").equals(LV1) || LV1.equals(" - ")) ) {
|
||||
|
||||
if(dictionary.get(entry.getKey())!=null) {
|
||||
@ -380,7 +415,7 @@ public class gestionnaire extends JFrame {
|
||||
|
||||
}
|
||||
|
||||
if( nStudent.getAttributes("Groupe_Informatique").equals(GroupeInformatique) && (GroupeTD.equals(" - ") || nStudent.getAttributes("Groupe_TD").equals(GroupeTD))
|
||||
if( nStudent.getAttributes("LV2").equals(LV2) && ( nStudent.getAttributes("Groupe_Informatique").equals(GroupeInformatique) || GroupeInformatique.equals(" -") ) && (GroupeTD.equals(" - ") || nStudent.getAttributes("Groupe_TD").equals(GroupeTD))
|
||||
&& ( nStudent.getAttributes("LV1").equals(LV1) || LV1.equals(" - ")) ) {
|
||||
|
||||
if(dictionary.get(entry.getKey())!=null) {
|
||||
|
Loading…
Reference in New Issue
Block a user