RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Displaying color samples in Calendar Exception Type edition

Browse source 
FEA: ItEr75S04BugFixing
This commit is contained in:
Lorenzo Tilve Álvaro 2011-08-30 13:51:16 +02:00
parent 4b8f112650
commit 50645aa21d
3 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java
View file

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

6
navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
View file

@ -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%;

13
navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul
View file

@ -56,12 +56,19 @@
</row>
<row>
<label value="${i18n:_('Color')}" />
<listbox id="colorsListbox" mold="select"
<hbox align="pack">
<listbox id="colorsListbox" mold="select"
model="@{controller.colors}"
selectedItem="@{controller.exceptionDayType.color}"
itemRenderer="@{controller.colorsRenderer}"/>
itemRenderer="@{controller.colorsRenderer}"
onSelect="controller.reloadSampleColors()" />
<div id="colorSampleOwn" sclass="color-sample" style="@{controller.styleColorOwnException}" />
<label value="${i18n:_('Own exception')}" />
<div id="colorSampleDerived" sclass="color-sample" style="@{controller.styleColorDerivedException}" />
<label value="${i18n:_('Derived exception')}" />
</hbox>
</row>
<row>
<row>
<label value="${i18n:_('Standard Effort')}" />
<effortDurationPicker id="standardEffort" />
</row>