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 5616f0627292e42ad7c176af2e6e3b301a3628cb..695b2a5b01395c399d8ef73f70ad2109442c2a1f 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 @@ -14 -230520 +17 +230524 diff --git a/shukan/ShukanData.java b/shukan/ShukanData.java index bed430919bf4f36b55820e415a4a5c2a0f1b7cb3..709dea3177f6c947368d5dc446382dc1bed0565d 100644 --- a/shukan/ShukanData.java +++ b/shukan/ShukanData.java @@ -701,4 +701,14 @@ public class ShukanData // avant début de module ou après fin de module return false; } + + /** convert a number of activity into a String */ + public String activityName(int number){ + return mod[selCur][selectedModule()].activityName(number); + } + + /** returns the duration of an activity */ + public int activityDuration(int number){ + return mod[selCur][selectedModule()].activityDuration(number); + } } diff --git a/shukan/ShukanModule.java b/shukan/ShukanModule.java index e7cff5dfc33cf5a0534696331aca316ac080c80e..77a8513020fc90015b146ed18ce7bc2c4bba1a8c 100644 --- a/shukan/ShukanModule.java +++ b/shukan/ShukanModule.java @@ -451,4 +451,14 @@ public class ShukanModule onRight[n1] = onRight[n2]; onRight[n2] = on; } + + /** convert a number of activity into a String */ + public String activityName(int number){ + return TYPES[number]; + } + + /** returns the duration of an activity */ + public int activityDuration(int number){ + return SLOAD[number]; + } } diff --git a/shukan/ShukanView.java b/shukan/ShukanView.java index fedaa06c0c123b3476cb3c8737acb73ccf65b79a..ae2c613d2cbcd30ccec18ce4d6ae922467dd4175 100644 --- a/shukan/ShukanView.java +++ b/shukan/ShukanView.java @@ -377,32 +377,32 @@ public class ShukanView extends JPanel int num_module = data.selectedModule(); 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)) { 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++){ + int[] week_activities = data.scheduleInWeek(num_module, data.selectedWeek()); + int[] activities = data.activities(num_module); + int nb_cours = week_activities.length; + + JPanel cours = new JPanel(new GridLayout(nb_cours*3, 1)); + JLabel[] noms_cours = new JLabel[nb_cours]; + JLabel[] duree = new JLabel[nb_cours]; + JLabel[] profs = new JLabel[nb_cours]; + for (int i =0; i<nb_cours; i++) + { + noms_cours[i] = new JLabel("Cours : "+data.activityName(activities[week_activities[i]])); + noms_cours[i].setFont(new Font(noms_cours[i].getFont().getFamily(), noms_cours[i].getFont().getStyle()+Font.BOLD, noms_cours[i].getFont().getSize()+10)); + duree[i] = new JLabel(" Durée : "+data.activityDuration(activities[week_activities[i]])+"h"); + profs[i] = new JLabel(" Professeur : "+data.subtitle(num_module)); cours.add(noms_cours[i]); - cours.add(profs[i]); cours.add(duree[i]); + cours.add(profs[i]); } + spec.add(cours); - spec.setSize(new Dimension(300, 150)); + spec.setSize(new Dimension(300, 100*nb_cours)); spec.setVisible(true); } }