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

Bug #1483: Improve labels in cost indicators

Browse source 
FEA: ItEr76S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-07-09 12:23:45 +02:00
parent 3b167e0def
commit 643fac0fbd
2 changed files with 42 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java
View file

@ -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);
}
}

16
libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul
View file

@ -34,23 +34,25 @@
<vbox hflex="1" align="pack" vflex="1">
<vbox style="margin-bottom:10px">
<label class="dashboard-label"
value="${i18n:_('CV (Cost Variance)')}" />
value="@{controller.labelCV}" />
<label class="dashboard-label dashboard-label-remarked" id="lblCV"/>
</vbox>
<label class="dashboard-label"
value="${i18n:_('Hours invested')}" />
value="@{controller.labelACWP}"
tooltiptext="${i18n:_('Hours invested')}" />
<label class="dashboard-label dashboard-label-remarked"
id="lblACWP" />
</vbox>
<vbox hflex="1" align="pack" vflex="1">
<vbox style="margin-bottom:10px">
<label class="dashboard-label"
value="${i18n:_('CPI (Cost Performance Index)')}" />
value="@{controller.labelCPI}" />
<label class="dashboard-label dashboard-label-remarked"
id="lblCPI" />
</vbox>
<label class="dashboard-label"
value="${i18n:_('Remaining time')}" />
value="@{controller.labelETC}"
tooltiptext="${i18n:_('Remaining time')}" />
<label class="dashboard-label dashboard-label-remarked"
id="lblETC" />
</vbox>
@ -69,18 +71,18 @@
<vbox hflex="1" align="pack" vflex="1">
<vbox style="margin-bottom:10px">
<label class="dashboard-label"
value="${i18n:_('EAC (Estimate At Completion)')}" />
value="@{controller.labelEAC}" />
<label class="dashboard-label dashboard-label-remarked"
id="lblEAC" />
</vbox>
<label class="dashboard-label"
value="${i18n:_('BAC (Budget At Completion)')}" />
value="@{controller.labelBAC}" />
<label class="dashboard-label dashboard-label-remarked"
id="lblBAC" />
</vbox>
<vbox hflex="1" align="pack" vflex="1">
<label class="dashboard-label"
value="${i18n:_('VAC (Variance At Completion)')}" />
value="@{controller.labelVAC}" />
<label class="dashboard-label dashboard-label-remarked"
id="lblVAC" />
</vbox>