diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java index 95a5b322e..c0c079f4d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java @@ -28,6 +28,7 @@ import java.util.Date; import org.joda.time.LocalDate; import org.libreplan.business.orders.entities.Order; import org.libreplan.web.common.Util; +import org.libreplan.web.planner.chart.EarnedValueChartFiller.EarnedValueType; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; @@ -120,4 +121,36 @@ public class CostStatusController extends GenericForwardComposer { label.setValue(value.setScale(2, RoundingMode.HALF_UP) + " %"); } + public String getLabel(EarnedValueType type) { + return type.getAcronym() + " (" + type.getName() + ")"; + } + + public String getLabelCV() { + return getLabel(EarnedValueType.CV); + } + + public String getLabelACWP() { + return getLabel(EarnedValueType.ACWP); + } + + public String getLabelCPI() { + return getLabel(EarnedValueType.CPI); + } + + public String getLabelETC() { + return getLabel(EarnedValueType.ETC); + } + + public String getLabelEAC() { + return getLabel(EarnedValueType.EAC); + } + + public String getLabelBAC() { + return getLabel(EarnedValueType.BAC); + } + + public String getLabelVAC() { + return getLabel(EarnedValueType.VAC); + } + } diff --git a/libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul b/libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul index 30c88507e..604a5421c 100644 --- a/libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul +++ b/libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul @@ -34,23 +34,25 @@ @@ -69,18 +71,18 @@