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

ItEr29S06CUAsignacionGrupoRecursosAPlanificacionItEr28S06: Fixing condition on loop. i is zero based so 1 must be substracted to startDateQuarter

Browse source
This commit is contained in:
Óscar González Fernández 2009-10-11 12:29:47 +02:00
parent 44c815af0d
commit e5c2694679
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailTwoTimeTrackerState.java
View file

@ -107,16 +107,18 @@ public class DetailTwoTimeTrackerState extends TimeTrackerState {
initialYear);
int quarterEndDate = calculateInQuarterPeriodDateInYear(endDate,endYear);
for (int j = initialYear; j <= endYear; j++) {
for (int i = (j == initialYear ? startDateQuarter : 0);
i < (j == endYear ? quarterEndDate : 4); i++) {
DetailItem quarter =
new DetailItem(SECOND_LEVEL_ITEM_SIZE, "Q" + (i + 1),
for (int j = initialYear; j <= endYear; j++) {
final int initialQuarter = (j == initialYear) ? startDateQuarter - 1
: 0;
final int endQuarter = (j == endYear) ? quarterEndDate : 4;
for (int i = initialQuarter; i < endQuarter; i++) {
DetailItem quarter = new DetailItem(SECOND_LEVEL_ITEM_SIZE, "Q"
+ (i + 1),
beginInterval, endInterval);
result.add(quarter);
beginInterval = beginInterval.plusMonths(3);
endInterval = endInterval.plusMonths(3);
}
result.add(quarter);
beginInterval = beginInterval.plusMonths(3);
endInterval = endInterval.plusMonths(3);
}
}
return result;
}