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

ItEr17S13CUConfiguracionDeOrganizacionsDeTraballoConUnidadesTraballoItEr15S11: Fixed the problem with the header of the HoursGroup list when editing an OrderElement.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-07-17 09:09:41 +02:00 • committed by Javier Moran Rua
parent c52e1c2afd
commit e9bd396f33
1 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
View file

@ -385,7 +385,7 @@ public class OrderElementController extends GenericForwardComposer {
item.setValue(hoursGroup); item.setValue(hoursGroup);
Listhead header = ((Listbox) item.getParent()).getListheadApi(); generateListhead(((Listbox) item.getParent()).getListheadApi());
Listcell cellWorkingHours = new Listcell(); Listcell cellWorkingHours = new Listcell();
cellWorkingHours.setParent(item); cellWorkingHours.setParent(item);
@ -430,11 +430,6 @@ public class OrderElementController extends GenericForwardComposer {
Listcell cellCriterion = new Listcell(); Listcell cellCriterion = new Listcell();
cellCriterion.setParent(item); cellCriterion.setParent(item);
// Add a new column on the HoursGroup table
Listheader headerCriterion = new Listheader();
headerCriterion.setLabel(criterionType.getName());
headerCriterion.setParent(header);
// Add a new Listbox for each CriterionType // Add a new Listbox for each CriterionType
final Listbox criterionListbox = new Listbox(); final Listbox criterionListbox = new Listbox();
criterionListbox.setRows(1); criterionListbox.setRows(1);
@ -530,10 +525,6 @@ public class OrderElementController extends GenericForwardComposer {
Listcell cellFixedPercentage = new Listcell(); Listcell cellFixedPercentage = new Listcell();
cellFixedPercentage.setParent(item); cellFixedPercentage.setParent(item);
Listheader headerFixedPercentage = new Listheader();
headerFixedPercentage.setLabel("Fixed percentage");
headerFixedPercentage.setParent(header);
Checkbox fixedPercentage = Util.bind(new Checkbox(), Checkbox fixedPercentage = Util.bind(new Checkbox(),
new Util.Getter<Boolean>() { new Util.Getter<Boolean>() {
@ -572,11 +563,6 @@ public class OrderElementController extends GenericForwardComposer {
Listcell cellCriterion = new Listcell(); Listcell cellCriterion = new Listcell();
cellCriterion.setParent(item); cellCriterion.setParent(item);
// Add a new column on the HoursGroup table
Listheader headerCriterion = new Listheader();
headerCriterion.setLabel(criterionType.getName());
headerCriterion.setParent(header);
// Add a new Listbox for each CriterionType // Add a new Listbox for each CriterionType
final Listbox criterionListbox = new Listbox(); final Listbox criterionListbox = new Listbox();
criterionListbox.setRows(1); criterionListbox.setRows(1);
@ -631,6 +617,39 @@ public class OrderElementController extends GenericForwardComposer {
} }
} }
/**
* Generates the {@link Listhead} depending on the {@link CriterionType}
* selected.
*
* @param listhead
* A {@link Listhead} to be updated
*/
private void generateListhead(Listhead listhead) {
// Remove the current header
listhead.getChildren().clear();
// Generate basi headers
Listheader hours = new Listheader("Hours");
listhead.appendChild(hours);
Listheader percentage = new Listheader("%");
listhead.appendChild(percentage);
// If it's a leaf add Fixed percentage column
if (getOrderElement() instanceof OrderLine) {
Listheader headerFixedPercentage = new Listheader(
"Fixed percentage");
listhead.appendChild(headerFixedPercentage);
}
// For each CriterionType selected
for (CriterionType criterionType : getSelectedCriterionTypes()) {
// Add a new column on the HoursGroup table
Listheader headerCriterion = new Listheader();
headerCriterion.setLabel(criterionType.getName());
listhead.appendChild(headerCriterion);
}
}
/** /**
* Disable workingHours and percentage components depending on the * Disable workingHours and percentage components depending on the
* policy selected by the user. * policy selected by the user.