Merge remote-tracking branch 'origin/main'

shukan/ShukanData.java

@@ -14,7 +14,7 @@ public class ShukanData
   /** Sort for teachers */
   private int[] tSort = new int[0];
   /** Students */
-  private String[] students = {"Etu"};
+  private String[] students = {"Professeur"};
   /** Sort for students */
   private int[] sSort = {0};
   /** Scolar year (for displays) */
@@ -362,10 +362,7 @@ public class ShukanData
     if (selLoad < 0)
       for (int j = 0; j < curs.length; j++)
         for (int i = 0; i < mod[j].length; i++)
-          load += mod[j][i].teacherLoad (tSort[selLoad + teachers.length],
-                                         week);
-    else for (int i = 0; i < mod[selCur].length; i++)
-      load += mod[selCur][i].studentLoad (week);
+          load += mod[j][i].teacherLoad (tSort[selLoad + teachers.length], week);
     return (load);
   }