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

[Bug #998] Fix layout

Browse source 
Renamed infinetlyOverAssignable as unlimited

FEA: ItEr74S04BugFixing
This commit is contained in:
Diego Pino Garcia 2011-04-19 12:21:15 +02:00
parent 5ce2e526b1
commit 0093878872
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java
View file

@ -169,7 +169,7 @@ public abstract class BaseCalendarEditionController extends
EffortDurationPicker normalDuration = findOrCreateDurationPicker(normalEffortRow);
EffortDurationPicker extraDuration = findOrCreateDurationPicker(extraEffortRow);
Checkbox checkbox = findOrCreateOverAssignableCheckbox(extraEffortRow);
Checkbox checkbox = findOrCreateUnlimitedCheckbox(extraEffortRow);
return CapacityPicker.workWith(checkbox, normalDuration, extraDuration,
Capacity.create(EffortDuration.zero()));
}
@ -187,22 +187,24 @@ public abstract class BaseCalendarEditionController extends
});
}
private Checkbox findOrCreateOverAssignableCheckbox(Component parent) {
private Checkbox findOrCreateUnlimitedCheckbox(Component parent) {
return findOrCreate(parent, Checkbox.class, new ICreation<Checkbox>() {
@Override
public Checkbox createAt(Component parent) {
Checkbox result = createInfinitelyOverAssignableCheckbox();
Checkbox result = createUnlimitedCheckbox();
parent.appendChild(result);
return result;
}
});
}
private Checkbox createInfinitelyOverAssignableCheckbox() {
Checkbox infinitelyOverAssignable = new Checkbox();
infinitelyOverAssignable.setLabel(_("Infinitely Over Assignable"));
return infinitelyOverAssignable;
private Checkbox createUnlimitedCheckbox() {
Checkbox unlimited = new Checkbox();
unlimited.setLabel(_("Unlimited"));
unlimited.setTooltiptext(_("Infinitely Over Assignable"));
return unlimited;
}
private void updateWithCapacityFrom(CalendarExceptionType exceptionType) {
@ -345,12 +347,12 @@ public abstract class BaseCalendarEditionController extends
EffortDurationPicker normalDurationPicker = new EffortDurationPicker();
EffortDurationPicker extraDurationPicker = new EffortDurationPicker();
Checkbox checkbox = createInfinitelyOverAssignableCheckbox();
Checkbox unlimitedCheckbox = createUnlimitedCheckbox();
addNormalDurationCell(item, normalDurationPicker);
addExtraEffortCell(item, extraDurationPicker, checkbox);
addExtraEffortCell(item, extraDurationPicker, unlimitedCheckbox);
CapacityPicker capacityPicker = CapacityPicker.workWith(checkbox,
CapacityPicker capacityPicker = CapacityPicker.workWith(unlimitedCheckbox,
normalDurationPicker,
extraDurationPicker, new Getter<Capacity>() {

4
navalplanner-webapp/src/main/webapp/calendars/_edition.zul
View file

@ -180,8 +180,8 @@
itemRenderer="@{calendarController.editionController.hoursPerDayRenderer}">
<listhead>
<listheader label="${i18n:_('Day of week')}" width="80px"/>
<listheader label="${i18n:_('Normal Effort')}" width="160px"/>
<listheader label="${i18n:_('Extra Effort')}" width="200px"/>
<listheader label="${i18n:_('Normal Effort')}" width="100px"/>
<listheader label="${i18n:_('Extra Effort')}" width="120px"/>
<listheader label="${i18n:_('Inh.')}" width="30px" tooltiptext="${i18n:_('Inherited from parent calendar')}" />
</listhead>
</listbox>