From f6b1b065aacdbd12b483aed5d30981daa189e00e Mon Sep 17 00:00:00 2001
From: piquerez <corentin.piquerez1@etu.univ-lorraine.fr>
Date: Wed, 24 May 2023 11:45:08 +0200
Subject: [PATCH] fermeture correcte au click oui dans fenetre de fermeture
---
data/2223_S2/version.txt | 4 ++--
shukan/Shukan.java | 1 +
shukan/ShukanController.java | 1 -
shukan/ShukanData.java | 1 -
shukan/ShukanView.java | 6 ++++++
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/data/2223_S2/version.txt b/data/2223_S2/version.txt
index 8a6472b..695b2a5 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 865f6c2..55e5c5a 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 3ede257..202d135 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 e4fb9d4..bed4309 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 1a0f85f..fedaa06 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))
--
GitLab