diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java index f9fffea14..d469c33a8 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java @@ -49,6 +49,7 @@ import org.zkoss.zul.Checkbox; import org.zkoss.zul.Grid; import org.zkoss.zul.Hbox; import org.zkoss.zul.Label; +import org.zkoss.zul.Listbox; import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; @@ -75,6 +76,8 @@ public class CalendarExceptionTypeCRUDController extends private EffortDurationPicker extraEffort; + private Listbox colorsListbox; + private static ListitemRenderer calendarExceptionTypeColorRenderer = new ListitemRenderer() { @Override public void render(Listitem item, Object data) throws Exception { @@ -265,4 +268,19 @@ public class CalendarExceptionTypeCRUDController extends return exceptionDayTypeRenderer; } + public String getStyleColorOwnException() { + return (getExceptionDayType() == null) ? "" : "background-color: " + + getExceptionDayType().getColor().getColorOwnException(); + } + + public String getStyleColorDerivedException() { + return (getExceptionDayType() == null) ? "" : "background-color: " + + getExceptionDayType().getColor().getColorDerivedException(); + } + + public void reloadSampleColors() { + Util.reloadBindings(editWindow.getFellow("colorSampleOwn")); + Util.reloadBindings(editWindow.getFellow("colorSampleDerived")); + } + } diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css index 5f17617b2..320329e20 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css @@ -1403,6 +1403,12 @@ display:none; overflow: hidden; } +.color-sample { + height: 10px; + width: 20px; + border: solid 1px black; +} + /* Expand vertical boxes for non-ffox browsers */ .z-vbox { width:100%; diff --git a/navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul b/navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul index 7e598c996..3d4e3c880 100644 --- a/navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul +++ b/navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul @@ -56,12 +56,19 @@