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

Improve tooltip message using budget, consumed money and percentage

Browse source 
FEA: ItEr76S17MoneyCostMonitoringSystem
This commit is contained in:
Manuel Rego Casasnovas 2012-03-19 12:20:10 +01:00
parent ac430aba6a
commit 79accc0c66
2 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
View file

@ -683,10 +683,12 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
orderDAO.reattachUnmodifiedEntity(order);
StringBuilder result = new StringBuilder();
result.append(_("Progress") + ": ").append(getEstimatedAdvance(order)).append("% , ");
result.append(_("Hours invested") + ": ").append(
getHoursAdvancePercentage(order)).append("% , ");
result.append(_("Cost") + ": ")
.append(getMoneyCostBarPercentage(order)).append("% \n");
result.append(_("Hours invested") + ": ")
.append(getHoursAdvancePercentage(order)).append("%\n");
result.append(
_("Budget: {0}€, Consumed: {1}€ ({2}%)", getBudget(order),
getMoneyCost(order), getMoneyCostBarPercentage(order)
.multiply(new BigDecimal(100)))).append("\n");
if (!getDescription(order).equals("")) {
result.append(" , " + _("Description") + ": "
@ -723,9 +725,16 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
}
private BigDecimal getMoneyCostBarPercentage(Order order) {
return MoneyCostCalculator.getMoneyCostProportion(
moneyCostCalculator.getMoneyCost(order), order.getBudget());
return MoneyCostCalculator.getMoneyCostProportion(getMoneyCost(order),
getBudget(order));
}
private BigDecimal getBudget(Order order) {
return order.getBudget();
}
private BigDecimal getMoneyCost(Order order) {
return moneyCostCalculator.getMoneyCost(order);
}
private String buildLabelsText(Order order) {

16
libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
View file

@ -606,8 +606,11 @@ public class TaskElementAdapter {
@Override
public BigDecimal getMoneyCostBarPercentage() {
return MoneyCostCalculator.getMoneyCostProportion(
getMoneyCost(), taskElement.getOrderElement()
.getBudget());
getMoneyCost(), getBudget());
}
private BigDecimal getBudget() {
return taskElement.getOrderElement().getBudget();
}
private BigDecimal getMoneyCost() {
@ -983,9 +986,12 @@ public class TaskElementAdapter {
.append(getHoursAdvancePercentage().multiply(
new BigDecimal(100))).append("% <br/>");
result.append(_("Cost") + ": ")
.append(getMoneyCostBarPercentage().multiply(
new BigDecimal(100))).append("% <br/>");
result.append(
_("Budget: {0}€, Consumed: {1}€ ({2}%)",
getBudget(),
getMoneyCost(),
getMoneyCostBarPercentage().multiply(
new BigDecimal(100)))).append("<br/>");
if (taskElement.getOrderElement() instanceof Order) {
result.append(_("State") + ": ").append(getOrderState());