Skip to content
Snippets Groups Projects
Commit b5eaf550 authored by PIQUEREZ Corentin's avatar PIQUEREZ Corentin
Browse files

fenetre double click update

parent f06cdde9
No related branches found
No related tags found
No related merge requests found
...@@ -680,4 +680,18 @@ public class ShukanData ...@@ -680,4 +680,18 @@ public class ShukanData
if (selMod != -1 && selAct != -1 && selLength > 1) if (selMod != -1 && selAct != -1 && selLength > 1)
this.mod[selCur][selMod].exchange (selAct, selAct + selLength - 1); this.mod[selCur][selMod].exchange (selAct, selAct + selLength - 1);
} }
/** 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[] holly_weeks = moduleHollyWeeks(cursusNumber(), mod);
for (int i =0; i<holly_weeks.length; i++) {
if (week == holly_weeks[i]) return false;
}
return true;
}
return false;
}
} }
...@@ -377,15 +377,14 @@ public class ShukanView extends JPanel ...@@ -377,15 +377,14 @@ public class ShukanView extends JPanel
int num_module = data.selectedModule(); int num_module = data.selectedModule();
int num_cursus = data.cursusNumber(); int num_cursus = data.cursusNumber();
int num_semaine = data.selectedWeek()+data.startWeekNumber(); int num_semaine = data.selectedWeek()+data.startWeekNumber();
int debut = data.moduleStart(num_cursus, num_module);
int fin = data.moduleEnd(num_cursus, num_module);
// affiche la fenetre si il y a cours pendant cette periode // affiche la fenetre si il y a cours pendant cette periode
if(num_semaine>=debut && (num_semaine<=fin || fin == 0)) if(data.isActiveWeek(num_semaine, num_module))
{ {
JFrame spec = new JFrame(data.cursusName(num_cursus) + " - Semaine" + (num_semaine) + " - " + data.moduleNames(num_cursus)[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); //int[] a = data.scheduleInWeek(num_module, num_semaine);
for (int i = 0; i<a.length; i++)System.out.println(a[i]); //for (int i = 0; i<a.length; i++)System.out.println(a[i]);
spec.setSize(new Dimension(300, 150)); spec.setSize(new Dimension(300, 150));
spec.setVisible(true); spec.setVisible(true);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment