From f4a4b58f3d8b4d61292b2f25b3ea71de152df98b Mon Sep 17 00:00:00 2001
From: piquerez <corentin.piquerez1@etu.univ-lorraine.fr>
Date: Sun, 21 May 2023 18:51:21 +0200
Subject: [PATCH] fenetre double click update
---
shukan/ShukanData.java | 14 +++++++++++---
shukan/ShukanView.java | 11 +++++++++++
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/shukan/ShukanData.java b/shukan/ShukanData.java
index 5531b38..e4fb9d4 100644
--- a/shukan/ShukanData.java
+++ b/shukan/ShukanData.java
@@ -683,15 +683,23 @@ public class ShukanData
/** test if a week is active for a module */
public boolean isActiveWeek(int week, int mod){
- if (week>=moduleStart(cursusNumber(), mod) && (week<=moduleEnd(cursusNumber(), mod) || moduleEnd(cursusNumber(), mod)==0))
+ int debut = moduleStart(cursusNumber(), mod);
+ if (week>=debut && (week<=moduleEnd(cursusNumber(), mod) || moduleEnd(cursusNumber(), mod)==0))
{
int[] holly_weeks = moduleHollyWeeks(cursusNumber(), mod);
+ int[] week_durations = weekDurations();
+ // periode d'indisponibilité
for (int i =0; i<holly_weeks.length; i++) {
if (week == holly_weeks[i]) return false;
}
- return true;
+ 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; }
+
+ return true;
}
+ // avant début de module ou après fin de module
return false;
}
-
}
diff --git a/shukan/ShukanView.java b/shukan/ShukanView.java
index 7123a1e..3ef2602 100644
--- a/shukan/ShukanView.java
+++ b/shukan/ShukanView.java
@@ -383,8 +383,19 @@ public class ShukanView extends JPanel
if(data.isActiveWeek(num_semaine, num_module))
{
JFrame spec = new JFrame(data.cursusName(num_cursus) + " - Semaine" + (num_semaine) + " - " + data.moduleNames(num_cursus)[num_module]);
+
//int[] a = data.scheduleInWeek(num_module, num_semaine);
//for (int i = 0; i<a.length; i++)System.out.println(a[i]);
+ JLabel[] noms_cours = {new JLabel("Cours Magistral")};
+ JLabel[] profs = {new JLabel("Professeur : PEven")};
+ JLabel[] duree = {new JLabel("durée : 2h")};
+ JPanel cours = new JPanel(new GridLayout(noms_cours.length*3, 1));
+ for(int i = 0; i<noms_cours.length; i++){
+ cours.add(noms_cours[i]);
+ cours.add(profs[i]);
+ cours.add(duree[i]);
+ }
+ spec.add(cours);
spec.setSize(new Dimension(300, 150));
spec.setVisible(true);
}
--
GitLab