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

[Bug #1132] Modify CalendarExceptionType edition form

Browse source 
CalendarExceptionTypeCRUDController is adapted to new enum.

FEA: ItEr75S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2011-08-04 15:00:31 +02:00
parent e633a179b1
commit 4403e80f6e
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import java.util.ConcurrentModificationException;
import java.util.List;
import org.navalplanner.business.calendars.entities.CalendarExceptionType;
import org.navalplanner.business.calendars.entities.CalendarExceptionTypeColor;
import org.navalplanner.business.calendars.entities.Capacity;
import org.navalplanner.business.calendars.entities.PredefinedCalendarExceptionTypes;
import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
@ -44,6 +45,9 @@ import org.zkoss.zk.ui.event.CheckEvent;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Checkbox;
import org.zkoss.zul.Grid;
import org.zkoss.zul.Listcell;
import org.zkoss.zul.Listitem;
import org.zkoss.zul.ListitemRenderer;
import org.zkoss.zul.Row;
import org.zkoss.zul.Textbox;
@ -60,14 +64,21 @@ public class CalendarExceptionTypeCRUDController extends
private Textbox tbName;
private Textbox tbColor;
private Checkbox overAssignable;
private EffortDurationPicker standardEffort;
private EffortDurationPicker extraEffort;
private static ListitemRenderer calendarExceptionTypeColorRenderer = new ListitemRenderer() {
@Override
public void render(Listitem item, Object data) throws Exception {
CalendarExceptionTypeColor color = (CalendarExceptionTypeColor) data;
item.setValue(color);
item.appendChild(new Listcell(_(color.getName())));
}
};
@Override
public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp);
@ -94,7 +105,6 @@ public class CalendarExceptionTypeCRUDController extends
private void initializeEditWindowComponents() {
tbName = (Textbox) editWindow.getFellowIfAny("tbName");
tbColor = (Textbox) editWindow.getFellowIfAny("tbColor");
overAssignable = Util.findComponentAt(editWindow, "overAssignable");
standardEffort = Util.findComponentAt(editWindow, "standardEffort");
extraEffort = Util.findComponentAt(editWindow, "extraEffort");
@ -127,7 +137,6 @@ public class CalendarExceptionTypeCRUDController extends
private void clearFields() {
tbName.setRawValue("");
tbColor.setRawValue("");
}
@Override
@ -202,4 +211,12 @@ public class CalendarExceptionTypeCRUDController extends
return calendarExceptionTypeModel.getExceptionDayType();
}
public CalendarExceptionTypeColor[] getColors() {
return CalendarExceptionTypeColor.values();
}
public ListitemRenderer getColorsRenderer() {
return calendarExceptionTypeColorRenderer;
}
}

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

@ -55,9 +55,10 @@
</row>
<row>
<label value="${i18n:_('Color')}" />
<textbox id="tbColor"
value="@{controller.exceptionDayType.color}"
width="300px"/>
<listbox id="colorsListbox" mold="select"
model="@{controller.colors}"
selectedItem="@{controller.exceptionDayType.color}"
itemRenderer="@{controller.colorsRenderer}"/>
</row>
<row>
<label value="${i18n:_('Standard Effort')}" />