From d079e2754a0d7491bff2154c200fce7f6b2efeda Mon Sep 17 00:00:00 2001
From: piquerez <corentin.piquerez1@etu.univ-lorraine.fr>
Date: Wed, 31 May 2023 18:09:07 +0200
Subject: [PATCH] suppression cours fonctionnel
---
data/2223_S2/V027_230531/S2/A2.txt | 20 ++++++++
data/2223_S2/V027_230531/S2/BD2.txt | 25 ++++++++++
data/2223_S2/V027_230531/S2/C2a.txt | 14 ++++++
data/2223_S2/V027_230531/S2/C2b.txt | 14 ++++++
data/2223_S2/V027_230531/S2/COO.txt | 14 ++++++
data/2223_S2/V027_230531/S2/DR1.txt | 16 +++++++
data/2223_S2/V027_230531/S2/ERG.txt | 12 +++++
data/2223_S2/V027_230531/S2/GP2.txt | 29 +++++++++++
data/2223_S2/V027_230531/S2/IHM.txt | 33 +++++++++++++
data/2223_S2/V027_230531/S2/M3.txt | 27 +++++++++++
data/2223_S2/V027_230531/S2/M4.txt | 16 +++++++
data/2223_S2/V027_230531/S2/M5.txt | 15 ++++++
data/2223_S2/V027_230531/S2/POO.txt | 41 ++++++++++++++++
data/2223_S2/V027_230531/S2/PPP2.txt | 16 +++++++
data/2223_S2/V027_230531/S2/QD1.txt | 10 ++++
data/2223_S2/V027_230531/S2/RES.txt | 48 +++++++++++++++++++
data/2223_S2/V027_230531/S2/modules.txt | 16 +++++++
data/2223_S2/V027_230531/S4/A4.txt | 23 +++++++++
data/2223_S2/V027_230531/S4/ASR8.txt | 26 ++++++++++
data/2223_S2/V027_230531/S4/BD4.txt | 22 +++++++++
data/2223_S2/V027_230531/S4/C4.txt | 22 +++++++++
data/2223_S2/V027_230531/S4/DEV6.txt | 31 ++++++++++++
data/2223_S2/V027_230531/S4/DEV7.txt | 30 ++++++++++++
data/2223_S2/V027_230531/S4/GP4.txt | 33 +++++++++++++
data/2223_S2/V027_230531/S4/IG.txt | 30 ++++++++++++
data/2223_S2/V027_230531/S4/M10.txt | 21 ++++++++
data/2223_S2/V027_230531/S4/M11.txt | 21 ++++++++
data/2223_S2/V027_230531/S4/PPP4.txt | 20 ++++++++
data/2223_S2/V027_230531/S4/WEB3.txt | 35 ++++++++++++++
data/2223_S2/V027_230531/S4/modules.txt | 12 +++++
data/2223_S2/V027_230531/cursus.txt | 2 +
data/2223_S2/V027_230531/weeks.txt | 13 +++++
data/2223_S2/V028_230531/S2/A2.txt | 20 ++++++++
data/2223_S2/V028_230531/S2/BD2.txt | 25 ++++++++++
data/2223_S2/V028_230531/S2/C2a.txt | 14 ++++++
data/2223_S2/V028_230531/S2/C2b.txt | 14 ++++++
data/2223_S2/V028_230531/S2/COO.txt | 14 ++++++
data/2223_S2/V028_230531/S2/DR1.txt | 16 +++++++
data/2223_S2/V028_230531/S2/ERG.txt | 12 +++++
data/2223_S2/V028_230531/S2/GP2.txt | 29 +++++++++++
data/2223_S2/V028_230531/S2/IHM.txt | 33 +++++++++++++
data/2223_S2/V028_230531/S2/M3.txt | 27 +++++++++++
data/2223_S2/V028_230531/S2/M4.txt | 16 +++++++
data/2223_S2/V028_230531/S2/M5.txt | 15 ++++++
data/2223_S2/V028_230531/S2/POO.txt | 41 ++++++++++++++++
data/2223_S2/V028_230531/S2/PPP2.txt | 15 ++++++
data/2223_S2/V028_230531/S2/QD1.txt | 10 ++++
data/2223_S2/V028_230531/S2/RES.txt | 46 ++++++++++++++++++
data/2223_S2/V028_230531/S2/modules.txt | 16 +++++++
data/2223_S2/V028_230531/S4/A4.txt | 23 +++++++++
data/2223_S2/V028_230531/S4/ASR8.txt | 26 ++++++++++
data/2223_S2/V028_230531/S4/BD4.txt | 22 +++++++++
data/2223_S2/V028_230531/S4/C4.txt | 22 +++++++++
data/2223_S2/V028_230531/S4/DEV6.txt | 31 ++++++++++++
data/2223_S2/V028_230531/S4/DEV7.txt | 30 ++++++++++++
data/2223_S2/V028_230531/S4/GP4.txt | 33 +++++++++++++
data/2223_S2/V028_230531/S4/IG.txt | 30 ++++++++++++
data/2223_S2/V028_230531/S4/M10.txt | 21 ++++++++
data/2223_S2/V028_230531/S4/M11.txt | 21 ++++++++
data/2223_S2/V028_230531/S4/PPP4.txt | 20 ++++++++
data/2223_S2/V028_230531/S4/WEB3.txt | 35 ++++++++++++++
data/2223_S2/V028_230531/S4/modules.txt | 12 +++++
data/2223_S2/V028_230531/cursus.txt | 2 +
data/2223_S2/V028_230531/weeks.txt | 13 +++++
data/2223_S2/version.txt | 2 +-
.../data/2223_S2/version.txt | 2 +-
shukan/ShukanData.java | 5 +-
shukan/ShukanModule.java | 2 +-
shukan/ShukanParameters.java | 11 +++--
shukan/ShukanView.java | 29 +++++------
70 files changed, 1437 insertions(+), 25 deletions(-)
create mode 100644 data/2223_S2/V027_230531/S2/A2.txt
create mode 100644 data/2223_S2/V027_230531/S2/BD2.txt
create mode 100644 data/2223_S2/V027_230531/S2/C2a.txt
create mode 100644 data/2223_S2/V027_230531/S2/C2b.txt
create mode 100644 data/2223_S2/V027_230531/S2/COO.txt
create mode 100644 data/2223_S2/V027_230531/S2/DR1.txt
create mode 100644 data/2223_S2/V027_230531/S2/ERG.txt
create mode 100644 data/2223_S2/V027_230531/S2/GP2.txt
create mode 100644 data/2223_S2/V027_230531/S2/IHM.txt
create mode 100644 data/2223_S2/V027_230531/S2/M3.txt
create mode 100644 data/2223_S2/V027_230531/S2/M4.txt
create mode 100644 data/2223_S2/V027_230531/S2/M5.txt
create mode 100644 data/2223_S2/V027_230531/S2/POO.txt
create mode 100644 data/2223_S2/V027_230531/S2/PPP2.txt
create mode 100644 data/2223_S2/V027_230531/S2/QD1.txt
create mode 100644 data/2223_S2/V027_230531/S2/RES.txt
create mode 100644 data/2223_S2/V027_230531/S2/modules.txt
create mode 100644 data/2223_S2/V027_230531/S4/A4.txt
create mode 100644 data/2223_S2/V027_230531/S4/ASR8.txt
create mode 100644 data/2223_S2/V027_230531/S4/BD4.txt
create mode 100644 data/2223_S2/V027_230531/S4/C4.txt
create mode 100644 data/2223_S2/V027_230531/S4/DEV6.txt
create mode 100644 data/2223_S2/V027_230531/S4/DEV7.txt
create mode 100644 data/2223_S2/V027_230531/S4/GP4.txt
create mode 100644 data/2223_S2/V027_230531/S4/IG.txt
create mode 100644 data/2223_S2/V027_230531/S4/M10.txt
create mode 100644 data/2223_S2/V027_230531/S4/M11.txt
create mode 100644 data/2223_S2/V027_230531/S4/PPP4.txt
create mode 100644 data/2223_S2/V027_230531/S4/WEB3.txt
create mode 100644 data/2223_S2/V027_230531/S4/modules.txt
create mode 100644 data/2223_S2/V027_230531/cursus.txt
create mode 100644 data/2223_S2/V027_230531/weeks.txt
create mode 100644 data/2223_S2/V028_230531/S2/A2.txt
create mode 100644 data/2223_S2/V028_230531/S2/BD2.txt
create mode 100644 data/2223_S2/V028_230531/S2/C2a.txt
create mode 100644 data/2223_S2/V028_230531/S2/C2b.txt
create mode 100644 data/2223_S2/V028_230531/S2/COO.txt
create mode 100644 data/2223_S2/V028_230531/S2/DR1.txt
create mode 100644 data/2223_S2/V028_230531/S2/ERG.txt
create mode 100644 data/2223_S2/V028_230531/S2/GP2.txt
create mode 100644 data/2223_S2/V028_230531/S2/IHM.txt
create mode 100644 data/2223_S2/V028_230531/S2/M3.txt
create mode 100644 data/2223_S2/V028_230531/S2/M4.txt
create mode 100644 data/2223_S2/V028_230531/S2/M5.txt
create mode 100644 data/2223_S2/V028_230531/S2/POO.txt
create mode 100644 data/2223_S2/V028_230531/S2/PPP2.txt
create mode 100644 data/2223_S2/V028_230531/S2/QD1.txt
create mode 100644 data/2223_S2/V028_230531/S2/RES.txt
create mode 100644 data/2223_S2/V028_230531/S2/modules.txt
create mode 100644 data/2223_S2/V028_230531/S4/A4.txt
create mode 100644 data/2223_S2/V028_230531/S4/ASR8.txt
create mode 100644 data/2223_S2/V028_230531/S4/BD4.txt
create mode 100644 data/2223_S2/V028_230531/S4/C4.txt
create mode 100644 data/2223_S2/V028_230531/S4/DEV6.txt
create mode 100644 data/2223_S2/V028_230531/S4/DEV7.txt
create mode 100644 data/2223_S2/V028_230531/S4/GP4.txt
create mode 100644 data/2223_S2/V028_230531/S4/IG.txt
create mode 100644 data/2223_S2/V028_230531/S4/M10.txt
create mode 100644 data/2223_S2/V028_230531/S4/M11.txt
create mode 100644 data/2223_S2/V028_230531/S4/PPP4.txt
create mode 100644 data/2223_S2/V028_230531/S4/WEB3.txt
create mode 100644 data/2223_S2/V028_230531/S4/modules.txt
create mode 100644 data/2223_S2/V028_230531/cursus.txt
create mode 100644 data/2223_S2/V028_230531/weeks.txt
diff --git a/data/2223_S2/V027_230531/S2/A2.txt b/data/2223_S2/V027_230531/S2/A2.txt
new file mode 100644
index 0000000..378861b
--- /dev/null
+++ b/data/2223_S2/V027_230531/S2/A2.txt
@@ -0,0 +1,20 @@
+TD
+TP2
+TD
+TP2
+TD
+TP2
+TD
+TP2
+TD
+TP2
+TD
+TP2
+TD
+SQ
+SQ
+Params
+Subtitle ACas
+AffectTD 2 ACas ACas
+AffectTP 4 ACas ACas ACas ACas
+Sched 4 5 6 7 10 11 12 14 15 18 19 21 22 23 24
diff --git a/data/2223_S2/V027_230531/S2/BD2.txt b/data/2223_S2/V027_230531/S2/BD2.txt
new file mode 100644
index 0000000..c46c4f8
--- /dev/null
+++ b/data/2223_S2/V027_230531/S2/BD2.txt
@@ -0,0 +1,25 @@
+TD
+TD
+TD
+TD
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+Params
+StartsOn 9
+Subtitle FA
+AffectCM FAbd
+AffectTD 2 FAbd FAbd
+AffectTP 4 FAbd FAbd FAbd FAbd
+Sched 9 9 10 10 11 11 12 13 14 15 18 19 20 21 22 23 24 25
diff --git a/data/2223_S2/V027_230531/S2/C2a.txt b/data/2223_S2/V027_230531/S2/C2a.txt
new file mode 100644
index 0000000..a23b8c4
--- /dev/null
+++ b/data/2223_S2/V027_230531/S2/C2a.txt
@@ -0,0 +1,14 @@
+TD
+TD
+TQ2
+TD
+TQ2
+TD
+SD
+SQ
+Params
+Subtitle SNdo
+AffectCM SNdo
+AffectTD 2 SNdo SNdo
+AffectTP 4 SNdo SNdo SNdo SNdo
+Sched 4 5 6 7 9 10 12 13
diff --git a/data/2223_S2/V027_230531/S2/C2b.txt b/data/2223_S2/V027_230531/S2/C2b.txt
new file mode 100644
index 0000000..81d43e9
--- /dev/null
+++ b/data/2223_S2/V027_230531/S2/C2b.txt
@@ -0,0 +1,14 @@
+TD
+TD
+TP2
+TD
+TD
+TP2
+TP2
+Params
+StartsOn 13
+Subtitle MAT
+AffectCM MAug
+AffectTD 2 MAug MAug
+AffectTP 4 MAug MAug MAug MAug
+Sched 18 18 19 20 20 21 22
diff --git a/data/2223_S2/V027_230531/S2/COO.txt b/data/2223_S2/V027_230531/S2/COO.txt
new file mode 100644
index 0000000..c21d850
--- /dev/null
+++ b/data/2223_S2/V027_230531/S2/COO.txt
@@ -0,0 +1,14 @@
+CM
+TD
+TD
+TP4
+TM
+TP4
+EV2
+Params
+EndsOn 20
+Subtitle OC
+AffectCM OCas
+AffectTD 2 OCas OCas
+AffectTP 4 AHez OCas OCas AHez
+Sched 5 6 7 9 10 11 12
diff --git a/data/2223_S2/V027_230531/S2/DR1.txt b/data/2223_S2/V027_230531/S2/DR1.txt
new file mode 100644
index 0000000..916e073
--- /dev/null
+++ b/data/2223_S2/V027_230531/S2/DR1.txt
@@ -0,0 +1,16 @@
+TD
+CM
+TD
+TD
+TD
+TD
+TD
+TD
+EV2
+Params
+Hollyweek 7
+Subtitle BD
+AffectCM BDav
+AffectTD 2 BDav BDav
+AffectTP 4 BDav BDav BDav BDav
+Sched 18 19 19 20 21 22 23 24 25
diff --git a/data/2223_S2/V027_230531/S2/ERG.txt b/data/2223_S2/V027_230531/S2/ERG.txt
new file mode 100644
index 0000000..12a79df
--- /dev/null
+++ b/data/2223_S2/V027_230531/S2/ERG.txt
@@ -0,0 +1,12 @@
+CM
+CM
+TP2
+TP2
+TP2
+Params
+StartsOn 13
+Subtitle PE
+AffectCM PEve
+AffectTD 2 PEve PEve
+AffectTP 4 PEve PEve PEve PEve
+Sched 13 13 13 14 15
diff --git a/data/2223_S2/V027_230531/S2/GP2.txt b/data/2223_S2/V027_230531/S2/GP2.txt
new file mode 100644
index 0000000..d690d78
--- /dev/null
+++ b/data/2223_S2/V027_230531/S2/GP2.txt
@@ -0,0 +1,29 @@
+CM
+TD
+TD
+SM
+TD
+SP
+TD
+TD
+SP
+SP
+SP
+SP
+CM
+TD
+TD
+TM
+TP2
+CM
+TD
+TP2
+TP2
+EV2
+Params
+Hollyweek 7
+Subtitle BD
+AffectCM BDav
+AffectTD 2 BDav BDav
+AffectTP 4 BDav BDav BDav BDav
+Sched 4 4 4 5 5 6 6 6 9 10 11 12 13 14 15 15 18 19 19 20 21 22
diff --git a/data/2223_S2/V027_230531/S2/IHM.txt b/data/2223_S2/V027_230531/S2/IHM.txt
new file mode 100644
index 0000000..2d8cd07
--- /dev/null
+++ b/data/2223_S2/V027_230531/S2/IHM.txt
@@ -0,0 +1,33 @@
+CM
+TD
+CM
+TP2
+CM
+TP2
+TD
+TP2
+TP2
+TD
+TP2
+TP4
+SP
+SP
+SD
+Params
+StartsOn 9
+Subtitle S-V-M
+AffectCM PVil
+AffectTD 2 PVil PVil
+AffectTP 4 EMic EMic EMic EMic
+AffectSpec 3 4 PVil EMic EMic PVil
+AffectSpec 5 4 PVil EMic EMic PVil
+AffectSpec 7 4 PVil EMic EMic PVil
+AffectSpec 10 4 PVil EMic EMic PVil
+AffectSpec 11 4 HSli HSli HSli HSli
+AffectSpec 12 4 HSli HSli HSli HSli
+AffectSpec 13 4 HSli HSli HSli HSli
+OnLeft 11
+OnLeft 12
+OnLeft 13
+OnRight 8
+Sched 9 9 10 10 11 11 12 12 13 14 14 15 18 20 23
diff --git a/data/2223_S2/V027_230531/S2/M3.txt b/data/2223_S2/V027_230531/S2/M3.txt
new file mode 100644
index 0000000..04c147f
--- /dev/null
+++ b/data/2223_S2/V027_230531/S2/M3.txt
@@ -0,0 +1,27 @@
+TD
+TD
+TD
+TD
+TD
+TD
+TD
+TP2
+TD
+TP2
+TD
+TP2
+SP
+TQ2
+TQ2
+TP2
+SP
+EV1
+Params
+EndsOn 14
+Hollyweek 9
+Hollyweek 10
+Subtitle PA
+AffectCM PAde
+AffectTD 2 PAde PAde
+AffectTP 4 PAde PAde PAde PAde
+Sched 4 4 4 5 5 5 6 6 6 7 7 7 11 12 12 13 13 14
diff --git a/data/2223_S2/V027_230531/S2/M4.txt b/data/2223_S2/V027_230531/S2/M4.txt
new file mode 100644
index 0000000..b83c26d
--- /dev/null
+++ b/data/2223_S2/V027_230531/S2/M4.txt
@@ -0,0 +1,16 @@
+TD
+SD
+TQ2
+TQ2
+TP2
+SP
+EV1
+SP
+Params
+StartsOn 18
+Hollyweek 23
+Subtitle PA
+AffectCM PAde
+AffectTD 2 PAde PAde
+AffectTP 4 PAde PAde PAde PAde
+Sched 18 19 20 21 22 24 24 25
diff --git a/data/2223_S2/V027_230531/S2/M5.txt b/data/2223_S2/V027_230531/S2/M5.txt
new file mode 100644
index 0000000..b6f7fc1
--- /dev/null
+++ b/data/2223_S2/V027_230531/S2/M5.txt
@@ -0,0 +1,15 @@
+TD
+TD
+TP2
+TQ2
+TP2
+TP2
+SP
+EV1
+Params
+EndsOn 22
+Subtitle PA
+AffectCM PAde
+AffectTD 2 PAde PAde
+AffectTP 4 PAde PAde PAde PAde
+Sched 9 9 10 11 12 13 14 15
diff --git a/data/2223_S2/V027_230531/S2/POO.txt b/data/2223_S2/V027_230531/S2/POO.txt
new file mode 100644
index 0000000..6b19ae0
--- /dev/null
+++ b/data/2223_S2/V027_230531/S2/POO.txt
@@ -0,0 +1,41 @@
+CM
+CM
+TD
+TP2
+CM
+TD
+TP2
+TD
+TP2
+TP2
+TD
+TP2
+TP2
+CM
+TD
+TP2
+TP2
+TD
+TP2
+SD
+TP2
+TP2
+TP2
+TP2
+EV2
+SP
+TP2
+SP
+SD
+Params
+Subtitle PE
+AffectCM PEve
+AffectTD 2 PEve PEve
+AffectTP 4 PEve PEve PEve PEve
+AffectSpec 20 4 HSli HSli HSli HSli
+AffectSpec 21 4 HSli HSli HSli HSli
+AffectSpec 26 4 PEve HSli HSli PEve
+OnLeft 20
+OnLeft 21
+OnLeft 26
+Sched 4 4 4 4 5 5 5 6 6 7 7 7 7 9 9 9 10 10 10 11 11 11 12 12 13 13 14 18 23
diff --git a/data/2223_S2/V027_230531/S2/PPP2.txt b/data/2223_S2/V027_230531/S2/PPP2.txt
new file mode 100644
index 0000000..d923fc9
--- /dev/null
+++ b/data/2223_S2/V027_230531/S2/PPP2.txt
@@ -0,0 +1,16 @@
+TD
+TD
+TD
+TD
+Params
+StartsOn 5
+EndsOn 13
+Hollyweek 6
+Hollyweek 7
+Hollyweek 10
+Hollyweek 12
+Subtitle DR
+AffectCM DRon
+AffectTD 2 DRon DRon
+AffectTP 4 DRon DRon DRon DRon
+Sched 5 9 11 13
diff --git a/data/2223_S2/V027_230531/S2/QD1.txt b/data/2223_S2/V027_230531/S2/QD1.txt
new file mode 100644
index 0000000..f7e0e27
--- /dev/null
+++ b/data/2223_S2/V027_230531/S2/QD1.txt
@@ -0,0 +1,10 @@
+TP2
+TP2
+TP2
+Params
+StartsOn 18
+Subtitle SD
+AffectCM SDie
+AffectTD 2 SDie SDie
+AffectTP 4 SDie SDie SDie SDie
+Sched 19 20 21
diff --git a/data/2223_S2/V027_230531/S2/RES.txt b/data/2223_S2/V027_230531/S2/RES.txt
new file mode 100644
index 0000000..30b7b9b
--- /dev/null
+++ b/data/2223_S2/V027_230531/S2/RES.txt
@@ -0,0 +1,48 @@
+CM
+CM
+CM
+TD
+TD
+TD
+TD
+TD
+TP4
+TP4
+TP4
+SD
+TD
+TD
+TD
+TD
+TD
+TP4
+TP2
+SD
+SP
+Params
+Subtitle SD
+AffectCM SDie
+AffectTD 2 SDie SDie
+AffectTP 4 SDie SDie SDie SDie
+OnLeft 0
+OnLeft 1
+OnLeft 2
+OnLeft 3
+OnLeft 4
+OnLeft 5
+OnLeft 6
+OnLeft 7
+OnLeft 8
+OnLeft 9
+OnLeft 10
+OnLeft 11
+OnRight 12
+OnRight 13
+OnRight 14
+OnRight 15
+OnRight 16
+OnRight 17
+OnRight 18
+OnRight 19
+OnRight 20
+Sched 4 4 5 5 6 6 7 7 10 12 14 15 18 18 19 20 21 22 23 24 25
diff --git a/data/2223_S2/V027_230531/S2/modules.txt b/data/2223_S2/V027_230531/S2/modules.txt
new file mode 100644
index 0000000..72d37f1
--- /dev/null
+++ b/data/2223_S2/V027_230531/S2/modules.txt
@@ -0,0 +1,16 @@
+POO
+COO
+IHM
+ERG
+QD1
+RES
+BD2
+M3
+M4
+M5
+GP2
+DR1
+A2
+C2a
+C2b
+PPP2
diff --git a/data/2223_S2/V027_230531/S4/A4.txt b/data/2223_S2/V027_230531/S4/A4.txt
new file mode 100644
index 0000000..ba4e9b2
--- /dev/null
+++ b/data/2223_S2/V027_230531/S4/A4.txt
@@ -0,0 +1,23 @@
+TD
+TD
+TP2
+TD
+TP2
+TD
+TD
+SD
+SP
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle AC
+AffectTD 2 ACas ACas
+AffectTP 2 ACas ACas
+Sched 5 6 7 18 19 20 23 24 25
diff --git a/data/2223_S2/V027_230531/S4/ASR8.txt b/data/2223_S2/V027_230531/S4/ASR8.txt
new file mode 100644
index 0000000..5214d08
--- /dev/null
+++ b/data/2223_S2/V027_230531/S4/ASR8.txt
@@ -0,0 +1,26 @@
+TD
+TD
+TD
+TD
+TD
+TP2
+TP2
+TP2
+TP2
+SD
+SP
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle AB
+AffectCM ABou
+AffectTD 2 ABou ABou
+AffectTP 2 ABou ABou
+Sched 4 4 5 5 6 6 7 7 18 19 20
diff --git a/data/2223_S2/V027_230531/S4/BD4.txt b/data/2223_S2/V027_230531/S4/BD4.txt
new file mode 100644
index 0000000..cabca30
--- /dev/null
+++ b/data/2223_S2/V027_230531/S4/BD4.txt
@@ -0,0 +1,22 @@
+TD
+TD
+TD
+TP2
+TP2
+TP2
+SD
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle SD
+AffectCM SDie
+AffectTD 2 SDie SDie
+AffectTP 2 SDie SDie
+Sched 18 18 19 19 20 23 24
diff --git a/data/2223_S2/V027_230531/S4/C4.txt b/data/2223_S2/V027_230531/S4/C4.txt
new file mode 100644
index 0000000..ecfeb5b
--- /dev/null
+++ b/data/2223_S2/V027_230531/S4/C4.txt
@@ -0,0 +1,22 @@
+TD
+TD
+TD
+TD
+TD
+TP2
+SD
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 18
+Hollyweek 21
+Hollyweek 22
+Subtitle AR
+AffectTD 2 ARic ARic
+AffectTP 2 ARic ARic
+Sched 19 19 20 20 23 23 24
diff --git a/data/2223_S2/V027_230531/S4/DEV6.txt b/data/2223_S2/V027_230531/S4/DEV6.txt
new file mode 100644
index 0000000..6824f0f
--- /dev/null
+++ b/data/2223_S2/V027_230531/S4/DEV6.txt
@@ -0,0 +1,31 @@
+CM
+CM
+TP4
+CM
+CM
+TP4
+CM
+TD
+TD
+TM
+TP4
+TP4
+SD
+SD
+SP
+SP
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle EM
+AffectCM EMic
+AffectTD 2 EMic HSli
+AffectTP 2 EMic HSli
+Sched 4 4 4 5 5 5 6 6 6 6 7 7 23 23 24 25
diff --git a/data/2223_S2/V027_230531/S4/DEV7.txt b/data/2223_S2/V027_230531/S4/DEV7.txt
new file mode 100644
index 0000000..117b80a
--- /dev/null
+++ b/data/2223_S2/V027_230531/S4/DEV7.txt
@@ -0,0 +1,30 @@
+TD
+TD
+TD
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+SD
+SP
+SP
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle EM
+AffectCM EMed
+AffectTD 2 EMed EMed
+AffectTP 2 EMed EMed
+Sched 18 18 18 19 19 19 20 20 23 23 23 24 24 24 25
diff --git a/data/2223_S2/V027_230531/S4/GP4.txt b/data/2223_S2/V027_230531/S4/GP4.txt
new file mode 100644
index 0000000..849d54a
--- /dev/null
+++ b/data/2223_S2/V027_230531/S4/GP4.txt
@@ -0,0 +1,33 @@
+CM
+TD
+TP2
+TP2
+TP2
+TD
+TD
+SD
+TD
+TD
+TP2
+Params
+Hollyweek 7
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle BD
+AffectCM BDav
+AffectTD 2 BDav BDav
+AffectTP 2 BDav BDav
+AffectSpec 8 2 MMin MMin
+AffectSpec 9 2 MMin MMin
+AffectSpec 10 2 MMin MMin
+OnRight 8
+OnRight 9
+OnRight 10
+Sched 4 4 4 5 5 5 6 6 18 18 18
diff --git a/data/2223_S2/V027_230531/S4/IG.txt b/data/2223_S2/V027_230531/S4/IG.txt
new file mode 100644
index 0000000..9cb7862
--- /dev/null
+++ b/data/2223_S2/V027_230531/S4/IG.txt
@@ -0,0 +1,30 @@
+CM
+TD
+TP2
+CM
+TD
+TP2
+CM
+TD
+TP2
+TD
+TP2
+TD
+TP2
+TP2
+EV2
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle PV
+AffectCM PVil
+AffectTD 2 PVil PVil
+AffectTP 4 PVil PVil PVil PVil
+Sched 4 4 4 5 5 5 6 6 6 7 7 23 23 24 25
diff --git a/data/2223_S2/V027_230531/S4/M10.txt b/data/2223_S2/V027_230531/S4/M10.txt
new file mode 100644
index 0000000..b3effeb
--- /dev/null
+++ b/data/2223_S2/V027_230531/S4/M10.txt
@@ -0,0 +1,21 @@
+TP2
+TP2
+TP2
+TQ2
+TQ2
+SP
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle PA
+AffectCM PAde
+AffectTD 2 PAde PAde
+AffectTP 2 PAde PAde
+Sched 4 4 5 6 7 7
diff --git a/data/2223_S2/V027_230531/S4/M11.txt b/data/2223_S2/V027_230531/S4/M11.txt
new file mode 100644
index 0000000..dd028cc
--- /dev/null
+++ b/data/2223_S2/V027_230531/S4/M11.txt
@@ -0,0 +1,21 @@
+TP2
+TP2
+TP2
+TQ2
+TQ2
+SP
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle PA
+AffectCM PAde
+AffectTD 2 PAde PAde
+AffectTP 2 PAde PAde
+Sched 18 19 20 23 24 25
diff --git a/data/2223_S2/V027_230531/S4/PPP4.txt b/data/2223_S2/V027_230531/S4/PPP4.txt
new file mode 100644
index 0000000..5363643
--- /dev/null
+++ b/data/2223_S2/V027_230531/S4/PPP4.txt
@@ -0,0 +1,20 @@
+TD
+TD
+TD
+TD
+Params
+Hollyweek 7
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle BD
+AffectCM BDav
+AffectTD 2 BDav BDav
+AffectTP 2 BDav BDav
+Sched 18 18 19 19
diff --git a/data/2223_S2/V027_230531/S4/WEB3.txt b/data/2223_S2/V027_230531/S4/WEB3.txt
new file mode 100644
index 0000000..f163528
--- /dev/null
+++ b/data/2223_S2/V027_230531/S4/WEB3.txt
@@ -0,0 +1,35 @@
+TD
+TP2
+TP2
+TP2
+TP2
+CM
+TP2
+TP2
+TP2
+SP
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle AB
+AffectCM ABic
+AffectTD 2 ABic ABic
+AffectTP 2 ABic ABic
+AffectSpec 5 1 EMic
+AffectSpec 6 2 EMic HSli
+AffectSpec 7 2 EMic HSli
+AffectSpec 8 2 EMic HSli
+AffectSpec 9 2 EMic HSli
+OnRight 5
+OnRight 6
+OnRight 7
+OnRight 8
+OnRight 9
+Sched 4 5 6 6 7 23 23 24 24 25
diff --git a/data/2223_S2/V027_230531/S4/modules.txt b/data/2223_S2/V027_230531/S4/modules.txt
new file mode 100644
index 0000000..251ccb1
--- /dev/null
+++ b/data/2223_S2/V027_230531/S4/modules.txt
@@ -0,0 +1,12 @@
+DEV6
+WEB3
+DEV7
+ASR8
+BD4
+M10
+M11
+GP4
+A4
+C4
+PPP4
+IG
diff --git a/data/2223_S2/V027_230531/cursus.txt b/data/2223_S2/V027_230531/cursus.txt
new file mode 100644
index 0000000..68c617a
--- /dev/null
+++ b/data/2223_S2/V027_230531/cursus.txt
@@ -0,0 +1,2 @@
+S2
+S4
diff --git a/data/2223_S2/V027_230531/weeks.txt b/data/2223_S2/V027_230531/weeks.txt
new file mode 100644
index 0000000..99c6ed6
--- /dev/null
+++ b/data/2223_S2/V027_230531/weeks.txt
@@ -0,0 +1,13 @@
+ScolarYear 2022
+YearOfFirstWeek 2023
+FirstWeek 4
+SemesterLength 22
+DefaultWeekLength 40
+WeekLength S8 0
+WeekLength S15 28
+WeekLength S16 0
+WeekLength S17 0
+WeekLength S18 32
+WeekLength S19 32
+WeekLength S20 24
+WeekLength S22 32
diff --git a/data/2223_S2/V028_230531/S2/A2.txt b/data/2223_S2/V028_230531/S2/A2.txt
new file mode 100644
index 0000000..378861b
--- /dev/null
+++ b/data/2223_S2/V028_230531/S2/A2.txt
@@ -0,0 +1,20 @@
+TD
+TP2
+TD
+TP2
+TD
+TP2
+TD
+TP2
+TD
+TP2
+TD
+TP2
+TD
+SQ
+SQ
+Params
+Subtitle ACas
+AffectTD 2 ACas ACas
+AffectTP 4 ACas ACas ACas ACas
+Sched 4 5 6 7 10 11 12 14 15 18 19 21 22 23 24
diff --git a/data/2223_S2/V028_230531/S2/BD2.txt b/data/2223_S2/V028_230531/S2/BD2.txt
new file mode 100644
index 0000000..c46c4f8
--- /dev/null
+++ b/data/2223_S2/V028_230531/S2/BD2.txt
@@ -0,0 +1,25 @@
+TD
+TD
+TD
+TD
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+Params
+StartsOn 9
+Subtitle FA
+AffectCM FAbd
+AffectTD 2 FAbd FAbd
+AffectTP 4 FAbd FAbd FAbd FAbd
+Sched 9 9 10 10 11 11 12 13 14 15 18 19 20 21 22 23 24 25
diff --git a/data/2223_S2/V028_230531/S2/C2a.txt b/data/2223_S2/V028_230531/S2/C2a.txt
new file mode 100644
index 0000000..a23b8c4
--- /dev/null
+++ b/data/2223_S2/V028_230531/S2/C2a.txt
@@ -0,0 +1,14 @@
+TD
+TD
+TQ2
+TD
+TQ2
+TD
+SD
+SQ
+Params
+Subtitle SNdo
+AffectCM SNdo
+AffectTD 2 SNdo SNdo
+AffectTP 4 SNdo SNdo SNdo SNdo
+Sched 4 5 6 7 9 10 12 13
diff --git a/data/2223_S2/V028_230531/S2/C2b.txt b/data/2223_S2/V028_230531/S2/C2b.txt
new file mode 100644
index 0000000..81d43e9
--- /dev/null
+++ b/data/2223_S2/V028_230531/S2/C2b.txt
@@ -0,0 +1,14 @@
+TD
+TD
+TP2
+TD
+TD
+TP2
+TP2
+Params
+StartsOn 13
+Subtitle MAT
+AffectCM MAug
+AffectTD 2 MAug MAug
+AffectTP 4 MAug MAug MAug MAug
+Sched 18 18 19 20 20 21 22
diff --git a/data/2223_S2/V028_230531/S2/COO.txt b/data/2223_S2/V028_230531/S2/COO.txt
new file mode 100644
index 0000000..c21d850
--- /dev/null
+++ b/data/2223_S2/V028_230531/S2/COO.txt
@@ -0,0 +1,14 @@
+CM
+TD
+TD
+TP4
+TM
+TP4
+EV2
+Params
+EndsOn 20
+Subtitle OC
+AffectCM OCas
+AffectTD 2 OCas OCas
+AffectTP 4 AHez OCas OCas AHez
+Sched 5 6 7 9 10 11 12
diff --git a/data/2223_S2/V028_230531/S2/DR1.txt b/data/2223_S2/V028_230531/S2/DR1.txt
new file mode 100644
index 0000000..916e073
--- /dev/null
+++ b/data/2223_S2/V028_230531/S2/DR1.txt
@@ -0,0 +1,16 @@
+TD
+CM
+TD
+TD
+TD
+TD
+TD
+TD
+EV2
+Params
+Hollyweek 7
+Subtitle BD
+AffectCM BDav
+AffectTD 2 BDav BDav
+AffectTP 4 BDav BDav BDav BDav
+Sched 18 19 19 20 21 22 23 24 25
diff --git a/data/2223_S2/V028_230531/S2/ERG.txt b/data/2223_S2/V028_230531/S2/ERG.txt
new file mode 100644
index 0000000..12a79df
--- /dev/null
+++ b/data/2223_S2/V028_230531/S2/ERG.txt
@@ -0,0 +1,12 @@
+CM
+CM
+TP2
+TP2
+TP2
+Params
+StartsOn 13
+Subtitle PE
+AffectCM PEve
+AffectTD 2 PEve PEve
+AffectTP 4 PEve PEve PEve PEve
+Sched 13 13 13 14 15
diff --git a/data/2223_S2/V028_230531/S2/GP2.txt b/data/2223_S2/V028_230531/S2/GP2.txt
new file mode 100644
index 0000000..d690d78
--- /dev/null
+++ b/data/2223_S2/V028_230531/S2/GP2.txt
@@ -0,0 +1,29 @@
+CM
+TD
+TD
+SM
+TD
+SP
+TD
+TD
+SP
+SP
+SP
+SP
+CM
+TD
+TD
+TM
+TP2
+CM
+TD
+TP2
+TP2
+EV2
+Params
+Hollyweek 7
+Subtitle BD
+AffectCM BDav
+AffectTD 2 BDav BDav
+AffectTP 4 BDav BDav BDav BDav
+Sched 4 4 4 5 5 6 6 6 9 10 11 12 13 14 15 15 18 19 19 20 21 22
diff --git a/data/2223_S2/V028_230531/S2/IHM.txt b/data/2223_S2/V028_230531/S2/IHM.txt
new file mode 100644
index 0000000..2d8cd07
--- /dev/null
+++ b/data/2223_S2/V028_230531/S2/IHM.txt
@@ -0,0 +1,33 @@
+CM
+TD
+CM
+TP2
+CM
+TP2
+TD
+TP2
+TP2
+TD
+TP2
+TP4
+SP
+SP
+SD
+Params
+StartsOn 9
+Subtitle S-V-M
+AffectCM PVil
+AffectTD 2 PVil PVil
+AffectTP 4 EMic EMic EMic EMic
+AffectSpec 3 4 PVil EMic EMic PVil
+AffectSpec 5 4 PVil EMic EMic PVil
+AffectSpec 7 4 PVil EMic EMic PVil
+AffectSpec 10 4 PVil EMic EMic PVil
+AffectSpec 11 4 HSli HSli HSli HSli
+AffectSpec 12 4 HSli HSli HSli HSli
+AffectSpec 13 4 HSli HSli HSli HSli
+OnLeft 11
+OnLeft 12
+OnLeft 13
+OnRight 8
+Sched 9 9 10 10 11 11 12 12 13 14 14 15 18 20 23
diff --git a/data/2223_S2/V028_230531/S2/M3.txt b/data/2223_S2/V028_230531/S2/M3.txt
new file mode 100644
index 0000000..04c147f
--- /dev/null
+++ b/data/2223_S2/V028_230531/S2/M3.txt
@@ -0,0 +1,27 @@
+TD
+TD
+TD
+TD
+TD
+TD
+TD
+TP2
+TD
+TP2
+TD
+TP2
+SP
+TQ2
+TQ2
+TP2
+SP
+EV1
+Params
+EndsOn 14
+Hollyweek 9
+Hollyweek 10
+Subtitle PA
+AffectCM PAde
+AffectTD 2 PAde PAde
+AffectTP 4 PAde PAde PAde PAde
+Sched 4 4 4 5 5 5 6 6 6 7 7 7 11 12 12 13 13 14
diff --git a/data/2223_S2/V028_230531/S2/M4.txt b/data/2223_S2/V028_230531/S2/M4.txt
new file mode 100644
index 0000000..b83c26d
--- /dev/null
+++ b/data/2223_S2/V028_230531/S2/M4.txt
@@ -0,0 +1,16 @@
+TD
+SD
+TQ2
+TQ2
+TP2
+SP
+EV1
+SP
+Params
+StartsOn 18
+Hollyweek 23
+Subtitle PA
+AffectCM PAde
+AffectTD 2 PAde PAde
+AffectTP 4 PAde PAde PAde PAde
+Sched 18 19 20 21 22 24 24 25
diff --git a/data/2223_S2/V028_230531/S2/M5.txt b/data/2223_S2/V028_230531/S2/M5.txt
new file mode 100644
index 0000000..b6f7fc1
--- /dev/null
+++ b/data/2223_S2/V028_230531/S2/M5.txt
@@ -0,0 +1,15 @@
+TD
+TD
+TP2
+TQ2
+TP2
+TP2
+SP
+EV1
+Params
+EndsOn 22
+Subtitle PA
+AffectCM PAde
+AffectTD 2 PAde PAde
+AffectTP 4 PAde PAde PAde PAde
+Sched 9 9 10 11 12 13 14 15
diff --git a/data/2223_S2/V028_230531/S2/POO.txt b/data/2223_S2/V028_230531/S2/POO.txt
new file mode 100644
index 0000000..6b19ae0
--- /dev/null
+++ b/data/2223_S2/V028_230531/S2/POO.txt
@@ -0,0 +1,41 @@
+CM
+CM
+TD
+TP2
+CM
+TD
+TP2
+TD
+TP2
+TP2
+TD
+TP2
+TP2
+CM
+TD
+TP2
+TP2
+TD
+TP2
+SD
+TP2
+TP2
+TP2
+TP2
+EV2
+SP
+TP2
+SP
+SD
+Params
+Subtitle PE
+AffectCM PEve
+AffectTD 2 PEve PEve
+AffectTP 4 PEve PEve PEve PEve
+AffectSpec 20 4 HSli HSli HSli HSli
+AffectSpec 21 4 HSli HSli HSli HSli
+AffectSpec 26 4 PEve HSli HSli PEve
+OnLeft 20
+OnLeft 21
+OnLeft 26
+Sched 4 4 4 4 5 5 5 6 6 7 7 7 7 9 9 9 10 10 10 11 11 11 12 12 13 13 14 18 23
diff --git a/data/2223_S2/V028_230531/S2/PPP2.txt b/data/2223_S2/V028_230531/S2/PPP2.txt
new file mode 100644
index 0000000..1eaa423
--- /dev/null
+++ b/data/2223_S2/V028_230531/S2/PPP2.txt
@@ -0,0 +1,15 @@
+TD
+TD
+TD
+Params
+StartsOn 5
+EndsOn 13
+Hollyweek 6
+Hollyweek 7
+Hollyweek 10
+Hollyweek 12
+Subtitle DR
+AffectCM DRon
+AffectTD 2 DRon DRon
+AffectTP 4 DRon DRon DRon DRon
+Sched 5 9 11
diff --git a/data/2223_S2/V028_230531/S2/QD1.txt b/data/2223_S2/V028_230531/S2/QD1.txt
new file mode 100644
index 0000000..f7e0e27
--- /dev/null
+++ b/data/2223_S2/V028_230531/S2/QD1.txt
@@ -0,0 +1,10 @@
+TP2
+TP2
+TP2
+Params
+StartsOn 18
+Subtitle SD
+AffectCM SDie
+AffectTD 2 SDie SDie
+AffectTP 4 SDie SDie SDie SDie
+Sched 19 20 21
diff --git a/data/2223_S2/V028_230531/S2/RES.txt b/data/2223_S2/V028_230531/S2/RES.txt
new file mode 100644
index 0000000..2d25a1a
--- /dev/null
+++ b/data/2223_S2/V028_230531/S2/RES.txt
@@ -0,0 +1,46 @@
+CM
+CM
+CM
+TD
+TD
+TD
+TD
+TD
+TP4
+TP4
+SD
+TD
+TD
+TD
+TD
+TD
+TP4
+TP2
+SD
+SP
+Params
+Subtitle SD
+AffectCM SDie
+AffectTD 2 SDie SDie
+AffectTP 4 SDie SDie SDie SDie
+OnLeft 0
+OnLeft 1
+OnLeft 2
+OnLeft 3
+OnLeft 4
+OnLeft 5
+OnLeft 6
+OnLeft 7
+OnLeft 8
+OnLeft 9
+OnLeft 10
+OnRight 11
+OnRight 12
+OnRight 13
+OnRight 14
+OnRight 15
+OnRight 16
+OnRight 17
+OnRight 18
+OnRight 19
+Sched 4 4 5 5 6 6 7 7 10 14 15 18 18 19 20 21 22 23 24 25
diff --git a/data/2223_S2/V028_230531/S2/modules.txt b/data/2223_S2/V028_230531/S2/modules.txt
new file mode 100644
index 0000000..72d37f1
--- /dev/null
+++ b/data/2223_S2/V028_230531/S2/modules.txt
@@ -0,0 +1,16 @@
+POO
+COO
+IHM
+ERG
+QD1
+RES
+BD2
+M3
+M4
+M5
+GP2
+DR1
+A2
+C2a
+C2b
+PPP2
diff --git a/data/2223_S2/V028_230531/S4/A4.txt b/data/2223_S2/V028_230531/S4/A4.txt
new file mode 100644
index 0000000..ba4e9b2
--- /dev/null
+++ b/data/2223_S2/V028_230531/S4/A4.txt
@@ -0,0 +1,23 @@
+TD
+TD
+TP2
+TD
+TP2
+TD
+TD
+SD
+SP
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle AC
+AffectTD 2 ACas ACas
+AffectTP 2 ACas ACas
+Sched 5 6 7 18 19 20 23 24 25
diff --git a/data/2223_S2/V028_230531/S4/ASR8.txt b/data/2223_S2/V028_230531/S4/ASR8.txt
new file mode 100644
index 0000000..5214d08
--- /dev/null
+++ b/data/2223_S2/V028_230531/S4/ASR8.txt
@@ -0,0 +1,26 @@
+TD
+TD
+TD
+TD
+TD
+TP2
+TP2
+TP2
+TP2
+SD
+SP
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle AB
+AffectCM ABou
+AffectTD 2 ABou ABou
+AffectTP 2 ABou ABou
+Sched 4 4 5 5 6 6 7 7 18 19 20
diff --git a/data/2223_S2/V028_230531/S4/BD4.txt b/data/2223_S2/V028_230531/S4/BD4.txt
new file mode 100644
index 0000000..cabca30
--- /dev/null
+++ b/data/2223_S2/V028_230531/S4/BD4.txt
@@ -0,0 +1,22 @@
+TD
+TD
+TD
+TP2
+TP2
+TP2
+SD
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle SD
+AffectCM SDie
+AffectTD 2 SDie SDie
+AffectTP 2 SDie SDie
+Sched 18 18 19 19 20 23 24
diff --git a/data/2223_S2/V028_230531/S4/C4.txt b/data/2223_S2/V028_230531/S4/C4.txt
new file mode 100644
index 0000000..ecfeb5b
--- /dev/null
+++ b/data/2223_S2/V028_230531/S4/C4.txt
@@ -0,0 +1,22 @@
+TD
+TD
+TD
+TD
+TD
+TP2
+SD
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 18
+Hollyweek 21
+Hollyweek 22
+Subtitle AR
+AffectTD 2 ARic ARic
+AffectTP 2 ARic ARic
+Sched 19 19 20 20 23 23 24
diff --git a/data/2223_S2/V028_230531/S4/DEV6.txt b/data/2223_S2/V028_230531/S4/DEV6.txt
new file mode 100644
index 0000000..6824f0f
--- /dev/null
+++ b/data/2223_S2/V028_230531/S4/DEV6.txt
@@ -0,0 +1,31 @@
+CM
+CM
+TP4
+CM
+CM
+TP4
+CM
+TD
+TD
+TM
+TP4
+TP4
+SD
+SD
+SP
+SP
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle EM
+AffectCM EMic
+AffectTD 2 EMic HSli
+AffectTP 2 EMic HSli
+Sched 4 4 4 5 5 5 6 6 6 6 7 7 23 23 24 25
diff --git a/data/2223_S2/V028_230531/S4/DEV7.txt b/data/2223_S2/V028_230531/S4/DEV7.txt
new file mode 100644
index 0000000..117b80a
--- /dev/null
+++ b/data/2223_S2/V028_230531/S4/DEV7.txt
@@ -0,0 +1,30 @@
+TD
+TD
+TD
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+TP2
+SD
+SP
+SP
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle EM
+AffectCM EMed
+AffectTD 2 EMed EMed
+AffectTP 2 EMed EMed
+Sched 18 18 18 19 19 19 20 20 23 23 23 24 24 24 25
diff --git a/data/2223_S2/V028_230531/S4/GP4.txt b/data/2223_S2/V028_230531/S4/GP4.txt
new file mode 100644
index 0000000..849d54a
--- /dev/null
+++ b/data/2223_S2/V028_230531/S4/GP4.txt
@@ -0,0 +1,33 @@
+CM
+TD
+TP2
+TP2
+TP2
+TD
+TD
+SD
+TD
+TD
+TP2
+Params
+Hollyweek 7
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle BD
+AffectCM BDav
+AffectTD 2 BDav BDav
+AffectTP 2 BDav BDav
+AffectSpec 8 2 MMin MMin
+AffectSpec 9 2 MMin MMin
+AffectSpec 10 2 MMin MMin
+OnRight 8
+OnRight 9
+OnRight 10
+Sched 4 4 4 5 5 5 6 6 18 18 18
diff --git a/data/2223_S2/V028_230531/S4/IG.txt b/data/2223_S2/V028_230531/S4/IG.txt
new file mode 100644
index 0000000..9cb7862
--- /dev/null
+++ b/data/2223_S2/V028_230531/S4/IG.txt
@@ -0,0 +1,30 @@
+CM
+TD
+TP2
+CM
+TD
+TP2
+CM
+TD
+TP2
+TD
+TP2
+TD
+TP2
+TP2
+EV2
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle PV
+AffectCM PVil
+AffectTD 2 PVil PVil
+AffectTP 4 PVil PVil PVil PVil
+Sched 4 4 4 5 5 5 6 6 6 7 7 23 23 24 25
diff --git a/data/2223_S2/V028_230531/S4/M10.txt b/data/2223_S2/V028_230531/S4/M10.txt
new file mode 100644
index 0000000..b3effeb
--- /dev/null
+++ b/data/2223_S2/V028_230531/S4/M10.txt
@@ -0,0 +1,21 @@
+TP2
+TP2
+TP2
+TQ2
+TQ2
+SP
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle PA
+AffectCM PAde
+AffectTD 2 PAde PAde
+AffectTP 2 PAde PAde
+Sched 4 4 5 6 7 7
diff --git a/data/2223_S2/V028_230531/S4/M11.txt b/data/2223_S2/V028_230531/S4/M11.txt
new file mode 100644
index 0000000..dd028cc
--- /dev/null
+++ b/data/2223_S2/V028_230531/S4/M11.txt
@@ -0,0 +1,21 @@
+TP2
+TP2
+TP2
+TQ2
+TQ2
+SP
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle PA
+AffectCM PAde
+AffectTD 2 PAde PAde
+AffectTP 2 PAde PAde
+Sched 18 19 20 23 24 25
diff --git a/data/2223_S2/V028_230531/S4/PPP4.txt b/data/2223_S2/V028_230531/S4/PPP4.txt
new file mode 100644
index 0000000..5363643
--- /dev/null
+++ b/data/2223_S2/V028_230531/S4/PPP4.txt
@@ -0,0 +1,20 @@
+TD
+TD
+TD
+TD
+Params
+Hollyweek 7
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle BD
+AffectCM BDav
+AffectTD 2 BDav BDav
+AffectTP 2 BDav BDav
+Sched 18 18 19 19
diff --git a/data/2223_S2/V028_230531/S4/WEB3.txt b/data/2223_S2/V028_230531/S4/WEB3.txt
new file mode 100644
index 0000000..f163528
--- /dev/null
+++ b/data/2223_S2/V028_230531/S4/WEB3.txt
@@ -0,0 +1,35 @@
+TD
+TP2
+TP2
+TP2
+TP2
+CM
+TP2
+TP2
+TP2
+SP
+Params
+Hollyweek 9
+Hollyweek 10
+Hollyweek 11
+Hollyweek 12
+Hollyweek 13
+Hollyweek 14
+Hollyweek 15
+Hollyweek 21
+Hollyweek 22
+Subtitle AB
+AffectCM ABic
+AffectTD 2 ABic ABic
+AffectTP 2 ABic ABic
+AffectSpec 5 1 EMic
+AffectSpec 6 2 EMic HSli
+AffectSpec 7 2 EMic HSli
+AffectSpec 8 2 EMic HSli
+AffectSpec 9 2 EMic HSli
+OnRight 5
+OnRight 6
+OnRight 7
+OnRight 8
+OnRight 9
+Sched 4 5 6 6 7 23 23 24 24 25
diff --git a/data/2223_S2/V028_230531/S4/modules.txt b/data/2223_S2/V028_230531/S4/modules.txt
new file mode 100644
index 0000000..251ccb1
--- /dev/null
+++ b/data/2223_S2/V028_230531/S4/modules.txt
@@ -0,0 +1,12 @@
+DEV6
+WEB3
+DEV7
+ASR8
+BD4
+M10
+M11
+GP4
+A4
+C4
+PPP4
+IG
diff --git a/data/2223_S2/V028_230531/cursus.txt b/data/2223_S2/V028_230531/cursus.txt
new file mode 100644
index 0000000..68c617a
--- /dev/null
+++ b/data/2223_S2/V028_230531/cursus.txt
@@ -0,0 +1,2 @@
+S2
+S4
diff --git a/data/2223_S2/V028_230531/weeks.txt b/data/2223_S2/V028_230531/weeks.txt
new file mode 100644
index 0000000..99c6ed6
--- /dev/null
+++ b/data/2223_S2/V028_230531/weeks.txt
@@ -0,0 +1,13 @@
+ScolarYear 2022
+YearOfFirstWeek 2023
+FirstWeek 4
+SemesterLength 22
+DefaultWeekLength 40
+WeekLength S8 0
+WeekLength S15 28
+WeekLength S16 0
+WeekLength S17 0
+WeekLength S18 32
+WeekLength S19 32
+WeekLength S20 24
+WeekLength S22 32
diff --git a/data/2223_S2/version.txt b/data/2223_S2/version.txt
index d82a4c1..f9df411 100644
--- a/data/2223_S2/version.txt
+++ b/data/2223_S2/version.txt
@@ -1,2 +1,2 @@
-26
+28
230531
diff --git a/out/production/sae2.01-developpement-application/data/2223_S2/version.txt b/out/production/sae2.01-developpement-application/data/2223_S2/version.txt
index d82a4c1..f9df411 100644
--- a/out/production/sae2.01-developpement-application/data/2223_S2/version.txt
+++ b/out/production/sae2.01-developpement-application/data/2223_S2/version.txt
@@ -1,2 +1,2 @@
-26
+28
230531
diff --git a/shukan/ShukanData.java b/shukan/ShukanData.java
index f67b27b..e1e4835 100644
--- a/shukan/ShukanData.java
+++ b/shukan/ShukanData.java
@@ -114,7 +114,10 @@ public class ShukanData
}
/** Delete the activity of a module */
- public void deleteActivity (int cursNum, int modNum, int index) {mod[cursNum][modNum].deleteActivity (index);};
+ public void deleteActivity (int cursNum, int modNum, int num_sem, int index) {
+ for (int i =0; i<num_sem; i++)index+=scheduleInWeek(modNum, i).length;
+ mod[cursNum][modNum].deleteActivity (index);
+ }
/** Automatically plans a free module */
public void autoPlan (int cursNum, int modNum)
diff --git a/shukan/ShukanModule.java b/shukan/ShukanModule.java
index 973c98c..972caef 100644
--- a/shukan/ShukanModule.java
+++ b/shukan/ShukanModule.java
@@ -177,7 +177,7 @@ public class ShukanModule
tmponLeft[i] = onLeft[i];
tmponRight[i] = onRight[i];
}
- for (int i = index+1; i < size; i++)
+ for (int i = index+1; i < size+1; i++)
{
tmp[i-1] = activ[i];
tmpaff[i-1] = affect[i];
diff --git a/shukan/ShukanParameters.java b/shukan/ShukanParameters.java
index c897749..2351010 100644
--- a/shukan/ShukanParameters.java
+++ b/shukan/ShukanParameters.java
@@ -20,7 +20,7 @@ class ShukanParameters extends JFrame {
/** Standard number of modules */
private final static int STD_MODULES_NUMBER = 14;
/**Labels for the shortcuts */
- private JLabel Labq, Labl, Labm, LabLO, LabMP, Lableft, Labright, LabE, LabX;
+ private JLabel Labq, Labl, Labm, LabLO, LabMP, Lableft, Labright, LabE, LabX, Labs;
/** built a parameter window */
@@ -161,7 +161,7 @@ class ShukanParameters extends JFrame {
p2 = new JPanel(new GridBagLayout());
GridBagConstraints gbcpara = new GridBagConstraints();
- setSize(new Dimension(500, 400));
+ setSize(new Dimension(500, 500));
Labq = new JLabel("q : Quitter en sauvegardant");
Labl = new JLabel("l : Déplace extremité gauche vers gauche");
@@ -172,6 +172,7 @@ class ShukanParameters extends JFrame {
Labright = new JLabel("→ : Professeur suivant");
LabE = new JLabel("E : Exporter en format .tex");
LabX = new JLabel("CTRL + X : Echanger les extrémités d'une séléction");
+ Labs = new JLabel("click droit + shift + click droit : crée une séléction");
retour = new JButton("Retour");
@@ -243,8 +244,12 @@ class ShukanParameters extends JFrame {
gbcpara.gridy = 8;
p2.add(LabX, gbcpara);
+ gbcpara.gridx = 0;
+ gbcpara.gridy = 9;
+ p2.add(Labs, gbcpara);
+
gbcprinc.gridx = 0;
- gbcprinc.gridy = 9;
+ gbcprinc.gridy = 10;
p2.add(retour, gbcprinc);
diff --git a/shukan/ShukanView.java b/shukan/ShukanView.java
index 858bb23..f522ec8 100644
--- a/shukan/ShukanView.java
+++ b/shukan/ShukanView.java
@@ -531,11 +531,10 @@ public class ShukanView extends JPanel
JPanel global_act = new JPanel();
JPanel global_sem = new JPanel();
JPanel global = new JPanel(new GridLayout(3,0));
+ JLabel info = new JLabel("Vous allez supprimer le dernier cours de la semaine choisie");
JLabel mod = new JLabel("A quelle matiere voulez vous supprimer un cours ?");
- JLabel act = new JLabel("Quel cours voulez vous supprimer ? ");
JLabel sem = new JLabel("Pendant quelle semaine le cours se déroule t-il ?");
JComboBox mod_info = new JComboBox(data.moduleNames(data.cursusNumber()));
- JComboBox act_info = new JComboBox(ShukanModule.TYPES);
JComboBox sem_info = new JComboBox(s);
JButton valider = new JButton("Valider");
@@ -543,35 +542,29 @@ public class ShukanView extends JPanel
@Override
public void actionPerformed(ActionEvent e) {
int num_mod = mod_info.getSelectedIndex();
- int num_act = act_info.getSelectedIndex();
- int num_sem = sem_info.getSelectedIndex()+data.startWeekNumber();
+ int num_sem = sem_info.getSelectedIndex();
int cursus = data.cursusNumber();
- int mod_start = data.moduleStart(cursus, num_mod);
- if (mod_start!=0) mod_start-=data.startWeekNumber();
- int nb_act = data.scheduleInWeek(num_mod, mod_start).length;
-
- data.unscheduleActivity(cursus, num_mod, nb_act, num_sem, data.semesterSize());
- data.deleteActivity(cursus, num_mod, nb_act);
-
- int[] weeks = data.schedule(num_mod);
- data.unscheduleActivities(cursus, num_mod);
- data.setSchedule(cursus, num_mod, weeks);
+ int nb_act = data.scheduleInWeek(num_mod, num_sem).length;
- repaint();
+ if (nb_act>0){
+ data.deleteActivity(cursus, num_mod, num_sem, nb_act-1);
+ for (int i =0; i<data.activities(num_mod).length; i++)System.out.println(data.activities(num_mod)[i]);
+ data.unscheduleActivity(cursus, num_mod, nb_act, num_sem, data.semesterSize());
+ repaint();
+ }
f.dispose();
}
});
global_mod.add(mod);
global_mod.add(mod_info);
- global_act.add(act);
- global_act.add(act_info);
global_sem.add(sem);
global_sem.add(sem_info);
global.add(global_mod);
global.add(global_act);
global.add(global_sem);
- f.add(global, BorderLayout.NORTH);
+ f.add(info, BorderLayout.NORTH);
+ f.add(global, BorderLayout.CENTER);
f.add(valider, BorderLayout.SOUTH);
f.setVisible(true);
f.setSize(new Dimension(400, 200));
--
GitLab