diff --git a/data/2223_S2/version.txt b/data/2223_S2/version.txt index 8a6472bc60d5c37222eae8ba3bdd29d44c819e2b..695b2a5b01395c399d8ef73f70ad2109442c2a1f 100644 --- a/data/2223_S2/version.txt +++ b/data/2223_S2/version.txt @@ -1,2 +1,2 @@ -15 -230522 +17 +230524 diff --git a/shukan/Shukan.java b/shukan/Shukan.java index 865f6c2460dbe8d0d7330b13158617af105c64ff..55e5c5a575dd5dd13f506125c4fe109a65f6072c 100644 --- a/shukan/Shukan.java +++ b/shukan/Shukan.java @@ -61,6 +61,7 @@ public class Shukan int choix = JOptionPane.showConfirmDialog(frame, "Êtes-vous sûr de vouloir quitter sans sauvegarder ?", "Quitter", JOptionPane.YES_NO_OPTION); if (choix == JOptionPane.YES_OPTION) { frame.dispose(); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); } else { frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); } diff --git a/shukan/ShukanController.java b/shukan/ShukanController.java index 3ede2575b1676c765632f7a8e78452512ecbc8c5..202d135f8565043c81b85d92e80ff2892b4a382a 100644 --- a/shukan/ShukanController.java +++ b/shukan/ShukanController.java @@ -160,7 +160,6 @@ public class ShukanController // Manage the double click to open a new window if (e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1) { canvas.SpecWeekModuleWindow(); - } if (e.getButton () == MouseEvent.BUTTON3) diff --git a/shukan/ShukanData.java b/shukan/ShukanData.java index e4fb9d48d282c7478200f03deeeb2f667c7d186a..bed430919bf4f36b55820e415a4a5c2a0f1b7cb3 100644 --- a/shukan/ShukanData.java +++ b/shukan/ShukanData.java @@ -692,7 +692,6 @@ public class ShukanData for (int i =0; i<holly_weeks.length; i++) { if (week == holly_weeks[i]) return false; } - System.out.println(moduleStart(cursusNumber(), mod)); // hollydays if (debut == 0) { if (week_durations[week-debut-4]==0) return false; } else { if (week_durations[week-debut]==0) return false; } diff --git a/shukan/ShukanView.java b/shukan/ShukanView.java index 1a0f85fdd150060f06948796fdf95b91a994b7d7..fedaa06c0c123b3476cb3c8737acb73ccf65b79a 100644 --- a/shukan/ShukanView.java +++ b/shukan/ShukanView.java @@ -378,6 +378,12 @@ public class ShukanView extends JPanel int num_cursus = data.cursusNumber(); int num_semaine = data.selectedWeek()+data.startWeekNumber(); + System.out.println(data.subtitle(num_module)); + + int[] activities = data.schedule(num_semaine); + //for (int i =0; i<activities.length; i++) System.out.println(activities[i]); + int[] activities2 = data.scheduleInWeek(num_module, data.selectedWeek()); + for (int i =0; i<activities2.length; i++) System.out.println(activities2[i]); // affiche la fenetre si il y a cours pendant cette periode if(data.isActiveWeek(num_semaine, num_module))