[jboss-svn-commits] JBL Code SVN: r33046 - in labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering: swingui and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: ge0ffrey
Date: 2010-05-24 11:00:31 -0400 (Mon, 24 May 2010)
New Revision: 33046

Modified:
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/WeekendDefinition.java
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/swingui/NurseRosteringPanel.java
Log:
show weekdefinition

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/WeekendDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/WeekendDefinition.java	2010-05-24 14:57:39 UTC (rev 33045)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/WeekendDefinition.java	2010-05-24 15:00:31 UTC (rev 33046)
@@ -37,7 +37,7 @@
         return code;
     }
 
-    private boolean isWeekend(DayOfWeek dayOfWeek) {
+    public boolean isWeekend(DayOfWeek dayOfWeek) {
         return dayOfWeekSet.contains(dayOfWeek);
     }
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/swingui/NurseRosteringPanel.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/swingui/NurseRosteringPanel.java	2010-05-24 14:57:39 UTC (rev 33045)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/swingui/NurseRosteringPanel.java	2010-05-24 15:00:31 UTC (rev 33046)
@@ -75,7 +75,7 @@
             employeeShiftDatePanelMap.put(employee, shiftDatePanelMap);
             for (ShiftDate shiftDate : schedule.getShiftDateList()) {
                 EmployeeShiftDatePanel employeeShiftDatePanel = new EmployeeShiftDatePanel();
-                if (shiftDate.getDayOfWeek() == DayOfWeek.SATURDAY || shiftDate.getDayOfWeek() == DayOfWeek.SUNDAY) {
+                if (employee.getContract().getWeekendDefinition().isWeekend(shiftDate.getDayOfWeek())) {
                     employeeShiftDatePanel.setBackground(Color.LIGHT_GRAY);
                 }
                 employeeShiftDatePanel.setToolTipText("employee " + employee.getCode()