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

Bug #1375: Added a constraint for 24 hours and 0 minutes

Browse source 
FEA: ItEr76S04BugFixing
This commit is contained in:
Ignacio Diaz Teijido 2012-02-17 16:16:58 +01:00 • committed by Manuel Rego Casasnovas
parent e4e8e9f9a8
commit 3a305615e7
3 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java
View file

@ -181,6 +181,7 @@ public abstract class BaseCalendarEditionController extends
Component extraEffortRow = comp.getFellow("exceptionDayExtraEffortBox");
EffortDurationPicker normalDuration = findOrCreateDurationPicker(normalEffortRow);
normalDuration.initializeFor24HoursAnd0Minutes();
EffortDurationPicker extraDuration = findOrCreateDurationPicker(extraEffortRow);
Checkbox checkbox = findOrCreateUnlimitedCheckbox(extraEffortRow);
return CapacityPicker.workWith(checkbox, normalDuration, extraDuration,
@ -347,6 +348,7 @@ public abstract class BaseCalendarEditionController extends
addLabelCell(item, day);
EffortDurationPicker normalDurationPicker = new EffortDurationPicker();
normalDurationPicker.initializeFor24HoursAnd0Minutes();
EffortDurationPicker extraDurationPicker = new EffortDurationPicker();
Checkbox unlimitedCheckbox = createUnlimitedCheckbox();

28
libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java
View file

@ -89,6 +89,34 @@ public class EffortDurationPicker extends Hbox {
spinner.setConstraint(spinnerConstraint);
}
public void initializeFor24HoursAnd0Minutes() {
minutes.addEventListener(Events.ON_CHANGE, new EventListener() {
public void onEvent(Event event) throws Exception {
setRangeFor24HoursAnd0Minutes();
}
});
hours.addEventListener(Events.ON_CHANGE, new EventListener() {
public void onEvent(Event event) throws Exception {
setRangeFor24HoursAnd0Minutes();
}
});
}
private void setRangeFor24HoursAnd0Minutes() {
SimpleSpinnerConstraint spinnerConstraint = new SimpleSpinnerConstraint();
spinnerConstraint.setMin(0);
if (minutes.getValue() == null || minutes.getValue().intValue() == 0)
spinnerConstraint.setMax(24);
else {
SimpleSpinnerConstraint spinnerConstraintMinutes = new SimpleSpinnerConstraint();
spinnerConstraintMinutes.setMin(0);
spinnerConstraintMinutes.setMax(59);
minutes.setConstraint(spinnerConstraintMinutes);
spinnerConstraint.setMax(23);
}
hours.setConstraint(spinnerConstraint);
}
private void setMinFor(Spinner spinner, int min) {
SimpleSpinnerConstraint spinnerConstraint = new SimpleSpinnerConstraint();
spinnerConstraint.setMin(min);

1
libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java
View file

@ -152,6 +152,7 @@ public class CalendarExceptionTypeCRUDController extends
tbName = (Textbox) editWindow.getFellowIfAny("tbName");
overAssignable = Util.findComponentAt(editWindow, "overAssignable");
standardEffort = Util.findComponentAt(editWindow, "standardEffort");
standardEffort.initializeFor24HoursAnd0Minutes();
extraEffort = Util.findComponentAt(editWindow, "extraEffort");
}