fenetre de precision pratiquement finie (profs spécifiques pas encore fait)

out/production/sae2.01-developpement-application/data/2223_S2/version.txt

-14
-230520
+17
+230524

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);
+  }
 }

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];
+  }
 }

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);
     }
   }