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

ItEr58S04ValidacionEProbasFuncionaisItEr57S04: Small fix on chart filler.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-05-14 10:31:39 +02:00 • committed by Javier Moran Rua
parent f0596bbad2
commit c151c10fc0
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java
View file

@ -204,13 +204,19 @@ public abstract class ChartFiller implements IChartFiller {
}
private void fillZeroValueFromStart(PrintWriter writer) {
printLine(writer, start, BigDecimal.ZERO);
if (startIsPreviousToPreviousDayToFirstAssignment()) {
printLine(writer, previousDayToFirstAssignment(),
BigDecimal.ZERO);
if (!startIsDayOfFirstAssignment()) {
printLine(writer, start, BigDecimal.ZERO);
if (startIsPreviousToPreviousDayToFirstAssignment()) {
printLine(writer, previousDayToFirstAssignment(),
BigDecimal.ZERO);
}
}
}
private boolean startIsDayOfFirstAssignment() {
return !map.isEmpty() && start.compareTo(map.firstKey()) == 0;
}
private boolean startIsPreviousToPreviousDayToFirstAssignment() {
return !map.isEmpty()
&& start.compareTo(previousDayToFirstAssignment()) < 0;
@ -221,10 +227,17 @@ public abstract class ChartFiller implements IChartFiller {
}
private void fillZeroValueToFinish(PrintWriter writer) {
if (finishIsPosteriorToNextDayToLastAssignment()) {
printLine(writer, nextDayToLastAssignment(), BigDecimal.ZERO);
if (!finishIsDayOfLastAssignment()) {
if (finishIsPosteriorToNextDayToLastAssignment()) {
printLine(writer, nextDayToLastAssignment(),
BigDecimal.ZERO);
}
printLine(writer, finish, BigDecimal.ZERO);
}
printLine(writer, finish, BigDecimal.ZERO);
}
private boolean finishIsDayOfLastAssignment() {
return !map.isEmpty() && start.compareTo(map.lastKey()) == 0;
}
private boolean finishIsPosteriorToNextDayToLastAssignment() {