Fix bug. Avoid that effort duration picker appears repeated when saving and continuing
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
This commit is contained in:
parent
23f89f0736
commit
c4309dd0c7
1 changed files with 17 additions and 3 deletions
|
|
@ -47,6 +47,7 @@ import org.navalplanner.business.workingday.EffortDuration.Granularity;
|
|||
import org.navalplanner.web.common.Util;
|
||||
import org.navalplanner.web.common.components.CalendarHighlightedDays;
|
||||
import org.navalplanner.web.common.components.EffortDurationPicker;
|
||||
import org.zkoss.ganttz.util.ComponentsFinder;
|
||||
import org.zkoss.zk.ui.Component;
|
||||
import org.zkoss.zk.ui.WrongValueException;
|
||||
import org.zkoss.zk.ui.event.Event;
|
||||
|
|
@ -134,13 +135,26 @@ public abstract class BaseCalendarEditionController extends
|
|||
|
||||
private EffortDurationPicker addEffortDurationPickerAtWorkableTimeRow(
|
||||
Component comp) {
|
||||
Component container = comp.getFellow("exceptionDayWorkableTimeRow");
|
||||
EffortDurationPicker result = new EffortDurationPicker();
|
||||
EffortDurationPicker result = ensureOnePickerOn(comp);
|
||||
result.setValue(EffortDuration.zero());
|
||||
container.appendChild(result);
|
||||
return result;
|
||||
}
|
||||
|
||||
private EffortDurationPicker ensureOnePickerOn(Component comp) {
|
||||
Component container = comp.getFellow("exceptionDayWorkableTimeRow");
|
||||
@SuppressWarnings("unchecked")
|
||||
List<EffortDurationPicker> existent = ComponentsFinder
|
||||
.findComponentsOfType(EffortDurationPicker.class,
|
||||
container.getChildren());
|
||||
if (!existent.isEmpty()) {
|
||||
return existent.get(0);
|
||||
} else {
|
||||
EffortDurationPicker result = new EffortDurationPicker();
|
||||
container.appendChild(result);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
private void prepareExceptionTypeCombo() {
|
||||
Combobox exceptionTypes = (Combobox) window
|
||||
.getFellow("exceptionTypes");
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue