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

Add money cost percentage in the tooltip

Browse source 
FEA: ItEr76S17MoneyCostMonitoringSystem
This commit is contained in:
Manuel Rego Casasnovas 2012-03-16 12:38:23 +01:00
parent c430f8e198
commit 277ef6e947
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@
*
* Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
* Desenvolvemento Tecnolóxico de Galicia
* Copyright (C) 2011 Igalia, S.L.
* Copyright (C) 2012 Igalia, S.L.
*
* This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License as published by the Free
@ -95,9 +95,11 @@ import org.zkoss.zk.ui.Desktop;
/**
* Model for UI operations related to {@link Order}. <br />
*
* @author Óscar González Fernández <ogonzalez@igalia.com>
* @author Diego Pino García <dpino@igalia.com>
* @author Jacobo Aragunde Pérez <jaragunde@igalia.com>
* @author Manuel Rego Casasnovas <rego@igalia.com>
*/
@Service
@Scope(BeanDefinition.SCOPE_PROTOTYPE)
@ -677,7 +679,11 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
StringBuilder result = new StringBuilder();
result.append(_("Progress") + ": ").append(getEstimatedAdvance(order)).append("% , ");
result.append(_("Hours invested") + ": ").append(
getHoursAdvancePercentage(order)).append("% \n");
getHoursAdvancePercentage(order)).append("% , ");
// TODO change method and message, for the moment using
// getHoursAdvancePercentage(order)
result.append(_("Cost") + ": ")
.append(getHoursAdvancePercentage(order)).append("% \n");
if (!getDescription(order).equals("")) {
result.append(" , " + _("Description") + ": "

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

@ -3,7 +3,7 @@
*
* Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
* Desenvolvemento Tecnolóxico de Galicia
* Copyright (C) 2010-2011 Igalia, S.L.
* Copyright (C) 2010-2012 Igalia, S.L.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -103,6 +103,7 @@ import org.zkoss.ganttz.data.constraint.Constraint;
/**
* @author Óscar González Fernández <ogonzalez@igalia.com>
* @author Manuel Rego Casasnovas <rego@igalia.com>
*/
@Component
@Scope(BeanDefinition.SCOPE_SINGLETON)
@ -951,6 +952,13 @@ public class TaskElementAdapter {
result.append(_("Hours invested") + ": ")
.append(getHoursAdvancePercentage().multiply(
new BigDecimal(100))).append("% <br/>");
// TODO change method and message, for the moment using
// getHoursAdvancePercentage()
result.append(_("Cost") + ": ")
.append(getHoursAdvancePercentage().multiply(
new BigDecimal(100))).append("% <br/>");
if (taskElement.getOrderElement() instanceof Order) {
result.append(_("State") + ": ").append(getOrderState());
}