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

ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Fix bug, show % completion percentage instead of % end date

Browse source
This commit is contained in:
Diego Pino Garcia 2010-06-14 21:43:42 +02:00 • committed by Javier Moran Rua
parent 910137eb3e
commit ff0807cdca
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java
View file

@ -20,6 +20,7 @@
package org.navalplanner.business.planner.limiting.entities;
import java.math.BigDecimal;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
@ -275,4 +276,8 @@ public class LimitingResourceQueueElement extends BaseEntity {
return resourceAllocation.getAssignments();
}
public BigDecimal getAdvancePercentage() {
return resourceAllocation.getTask().getAdvancePercentage();
}
}

16
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java
View file

@ -198,7 +198,7 @@ public class QueueComponent extends XulElement implements
StringBuilder result = new StringBuilder();
result.append(_("Order: {0} ", order.getName()));
result.append(_("Task: {0} ", task.getName()));
result.append(_("Completed: {0} ", getAdvancementEndDate(element)));
result.append(_("Completed: {0}% ", element.getAdvancePercentage().multiply(new BigDecimal(100))));
final ResourceAllocation<?> resourceAllocation = element.getResourceAllocation();
if (resourceAllocation instanceof SpecificResourceAllocation) {
@ -213,13 +213,17 @@ public class QueueComponent extends XulElement implements
return result.toString();
}
private static DateAndHour getAdvancementEndDate(LimitingResourceQueueElement element) {
final Task task = element.getResourceAllocation().getTask();
/**
* Returns end date considering % of task completion
*
* @param element
* @return
*/
private static DateAndHour getAdvanceEndDate(LimitingResourceQueueElement element) {
int hoursWorked = 0;
final List<? extends DayAssignment> dayAssignments = element.getDayAssignments();
if (element.hasDayAssignments()) {
final int estimatedWorkedHours = estimatedWorkedHours(element.getIntentedTotalHours(), task.getAdvancePercentage());
final int estimatedWorkedHours = estimatedWorkedHours(element.getIntentedTotalHours(), element.getAdvancePercentage());
for (DayAssignment each: dayAssignments) {
hoursWorked += each.getHours();
@ -296,7 +300,7 @@ public class QueueComponent extends XulElement implements
private static Component generateProgressBar(IDatesMapper datesMapper,
LimitingResourceQueueElement queueElement, Task task,
int startPixels) {
DateAndHour advancementEndDate = getAdvancementEndDate(queueElement);
DateAndHour advancementEndDate = getAdvanceEndDate(queueElement);
long millis = (advancementEndDate.toDateTime().getMillis() - queueElement
.getStartTime().toDateTime().getMillis());
Div progressBar = new Div();