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

Undo expense column recalculation on budget changes

Browse source 
The patch "Refreshed calculated expense column on hours or budget changes"
on commit 8c2c7996a2 can cause
compilation problems depeding on the JAVA version installed, so it's
reverted till it gets avoided.

FEA: ItEr77S17AutomaticBudgeting
This commit is contained in:
Lorenzo Tilve Álvaro 2013-07-31 17:08:29 +02:00
parent a8eefaaa29
commit 0c33a9431c
2 changed files with 0 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
View file

@ -631,7 +631,6 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
BigDecimal value = currentElement.getSubstractedBudget(); BigDecimal value = currentElement.getSubstractedBudget();
Textbox autoBudgetCell = new Textbox(Util.addCurrencySymbol(value)); Textbox autoBudgetCell = new Textbox(Util.addCurrencySymbol(value));
autoBudgetCell.setDisabled(true); autoBudgetCell.setDisabled(true);
calculatedExpensesBoxByElement.put(currentElement, autoBudgetCell);
addCell(autoBudgetCell); addCell(autoBudgetCell);
} }

29
libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java
View file

@ -37,7 +37,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.hibernate.validator.ClassValidator; import org.hibernate.validator.ClassValidator;
import org.hibernate.validator.InvalidValue; import org.hibernate.validator.InvalidValue;
import org.libreplan.business.orders.entities.OrderElement;
import org.libreplan.business.orders.entities.SchedulingState; import org.libreplan.business.orders.entities.SchedulingState;
import org.libreplan.business.orders.entities.SchedulingState.ITypeChangedListener; import org.libreplan.business.orders.entities.SchedulingState.ITypeChangedListener;
import org.libreplan.business.orders.entities.SchedulingState.Type; import org.libreplan.business.orders.entities.SchedulingState.Type;
@ -630,8 +629,6 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
private Map<T, Decimalbox> budgetDecimalboxByElement = new HashMap<T, Decimalbox>(); private Map<T, Decimalbox> budgetDecimalboxByElement = new HashMap<T, Decimalbox>();
protected Map<T, Textbox> calculatedExpensesBoxByElement = new HashMap<T, Textbox>();
private Map<T, DynamicDatebox> initDateDynamicDateboxByElement = new HashMap<T, DynamicDatebox>(); private Map<T, DynamicDatebox> initDateDynamicDateboxByElement = new HashMap<T, DynamicDatebox>();
private Map<T, DynamicDatebox> endDateDynamicDateboxByElement = new HashMap<T, DynamicDatebox>(); private Map<T, DynamicDatebox> endDateDynamicDateboxByElement = new HashMap<T, DynamicDatebox>();
@ -865,14 +862,6 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
if (readOnly) { if (readOnly) {
decimalboxBudget.setDisabled(true); decimalboxBudget.setDisabled(true);
} }
decimalboxBudget.addEventListener("onChange", new EventListener() {
@Override
public void onEvent(Event event) {
refreshBudgetValueForThisNodeAndParents(getSelectedNode());
}
});
addCell(decimalboxBudget); addCell(decimalboxBudget);
} }
@ -960,7 +949,6 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
Decimalbox decimalbox = budgetDecimalboxByElement.get(element); Decimalbox decimalbox = budgetDecimalboxByElement.get(element);
decimalbox.invalidate(); decimalbox.invalidate();
refreshBudgetValueForThisNodeAndParents(element); refreshBudgetValueForThisNodeAndParents(element);
refreshCalculatedBudgetForNode(element);
} }
} }
@ -996,7 +984,6 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
public void refreshBudgetValueForNodes(List<T> nodes) { public void refreshBudgetValueForNodes(List<T> nodes) {
for (T node : nodes) { for (T node : nodes) {
Decimalbox decimalbox = budgetDecimalboxByElement.get(node); Decimalbox decimalbox = budgetDecimalboxByElement.get(node);
refreshCalculatedBudgetForNode(node);
// For the Order node there is no associated decimalbox // For the Order node there is no associated decimalbox
if (decimalbox != null) { if (decimalbox != null) {
BigDecimal currentBudget = getBudgetHandler().getBudgetFor(node); BigDecimal currentBudget = getBudgetHandler().getBudgetFor(node);
@ -1005,15 +992,6 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
} }
} }
public void refreshCalculatedBudgetForNode(T node) {
Textbox textbox = calculatedExpensesBoxByElement.get(node);
OrderElement e = (OrderElement) node;
if (textbox != null) {
textbox.setValue(Util.addCurrencySymbol(e
.getSubstractedBudget()));
}
}
private Constraint getBudgetConstraintFor(final T line) { private Constraint getBudgetConstraintFor(final T line) {
return new Constraint() { return new Constraint() {
@Override @Override
@ -1039,13 +1017,6 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
intboxHours.setDisabled(true); intboxHours.setDisabled(true);
} }
Treecell cellHours = addCell(intboxHours); Treecell cellHours = addCell(intboxHours);
intboxHours.addEventListener("onChange", new EventListener() {
@Override
public void onEvent(Event event) {
refreshCalculatedBudgetForNode(getSelectedNode());
}
});
setReadOnlyHoursCell(currentElement, intboxHours, cellHours); setReadOnlyHoursCell(currentElement, intboxHours, cellHours);
} }