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

Set date of new stretch starting from consolidated date if any

Browse source 
* Initialize amount of work too.

FEA: ItEr74S04BugFixing
This commit is contained in:
Diego Pino Garcia 2011-04-25 12:09:32 +02:00
parent f02f541dd0
commit fd7530cbf0
2 changed files with 63 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Stretch.java
View file

@ -43,6 +43,42 @@ public class Stretch {
return new Stretch(date, datePercent, workPercent);
}
/**
* Infers the datePercent based on duration of task and the date of the
* Stretch
*
* @param date
* @param task
* @param workPercent
* @return
*/
public static Stretch create(LocalDate date, Task task,
BigDecimal workPercent) {
LocalDate start = task.getStartAsLocalDate();
LocalDate end = task.getEndAsLocalDate();
Days taskDuration = Days.daysBetween(start, end);
Days daysDuration = Days.daysBetween(start, date);
BigDecimal daysPercent = daysPercent(daysDuration, taskDuration);
return new Stretch(date, daysPercent, workPercent);
}
protected static BigDecimal daysPercent(Days daysPartial, Days daysTotal) {
return percentWorked(daysPartial.getDays(), daysTotal.getDays());
}
private static BigDecimal percentWorked(int daysPartial, int daysTotal) {
return divide(BigDecimal.valueOf(daysPartial), Integer.valueOf(daysTotal));
}
private static BigDecimal divide(BigDecimal numerator, Integer denominator) {
if (Integer.valueOf(0).equals(denominator)) {
return BigDecimal.ZERO;
}
return numerator.divide(BigDecimal.valueOf(denominator), 8,
BigDecimal.ROUND_HALF_EVEN);
}
public static Stretch copy(Stretch stretch) {
return create(stretch.date, stretch.lengthPercentage, stretch.amountWorkPercentage);
}
@ -71,7 +107,7 @@ public class Stretch {
@NotNull
private BigDecimal amountWorkPercentage = BigDecimal.ZERO;
// Trasient value, a stretch is readOnly if it's a consolidated stretch
// Trasient value, a stretch is readOnly if it's a consolidated stretch
// or if it is a stretch user cannot edit
private boolean readOnly = false;
@ -165,20 +201,14 @@ class ConsolidatedStretch {
}
final Task task = resourceAllocation.getTask();
final LocalDate start = task.getStartAsLocalDate();
final LocalDate taskEnd = task.getEndAsLocalDate();
final LocalDate consolidatedEnd = lastDay(consolidated);
Days daysDuration = Days.daysBetween(start, taskEnd);
Days daysWorked = Days.daysBetween(start, consolidatedEnd);
BigDecimal daysPercent = daysPercent(daysWorked, daysDuration);
return create(consolidatedEnd.plusDays(1), daysPercent, task.getAdvancePercentage());
return create(consolidatedEnd.plusDays(1), task.getAdvancePercentage(), task);
}
private static Stretch create(LocalDate consolidatedEnd,
BigDecimal advancePercentage, BigDecimal percentWorked) {
Stretch result = Stretch.create(consolidatedEnd, advancePercentage, percentWorked);
private static Stretch create(LocalDate date, BigDecimal advancePercentage,
Task task) {
Stretch result = Stretch.create(date, task, advancePercentage);
result.readOnly(true);
return result;
}
@ -187,22 +217,6 @@ class ConsolidatedStretch {
}
private static BigDecimal daysPercent(Days daysPartial, Days daysTotal) {
return percentWorked(daysPartial.getDays(), daysTotal.getDays());
}
private static BigDecimal percentWorked(int daysPartial, int daysTotal) {
return divide(BigDecimal.valueOf(daysPartial), Integer.valueOf(daysTotal));
}
private static BigDecimal divide(BigDecimal numerator, Integer denominator) {
if (Integer.valueOf(0).equals(denominator)) {
return BigDecimal.ZERO;
}
return numerator.divide(BigDecimal.valueOf(denominator), 8,
BigDecimal.ROUND_HALF_EVEN);
}
private static LocalDate lastDay(List<? extends DayAssignment> days) {
return days.get(days.size() - 1).getDay();
}

33
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java
View file

@ -233,12 +233,31 @@ public class StretchesFunctionModel implements IStretchesFunctionModel {
@Override
public void addStretch() {
if (stretchesFunction != null) {
stretchesFunction.addStretch(Stretch.create(
task.getStartAsLocalDate(), BigDecimal.ZERO,
BigDecimal.ZERO));
stretchesFunction.addStretch(newStretch());
}
}
private Stretch newStretch() {
LocalDate startDate = getTaskStartDate();
BigDecimal amountWorkPercent = BigDecimal.ZERO;
Stretch consolidatedStretch = stretchesFunction
.getConsolidatedStretch();
if (consolidatedStretch != null) {
startDate = consolidatedStretch.getDate().plusDays(1);
amountWorkPercent = consolidatedStretch.getAmountWorkPercentage().add(BigDecimal.ONE.divide(BigDecimal.valueOf(100)));
}
return Stretch.create(startDate, task, amountWorkPercent);
}
@Override
public LocalDate getTaskStartDate() {
if (task == null) {
return null;
}
return task.getStartAsLocalDate();
}
@Override
public void removeStretch(Stretch stretch) {
if (stretchesFunction != null) {
@ -320,14 +339,6 @@ public class StretchesFunctionModel implements IStretchesFunctionModel {
stretch.setDate(new LocalDate(stretchDate));
}
@Override
public LocalDate getTaskStartDate() {
if (task == null) {
return null;
}
return new LocalDate(task.getStartDate());
}
@Override
public Integer getAllocationHours() {
if (task == null) {