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

ItEr30S11CUVistaRecursosTempoEmpresaItEr29S13: Using day granularity when the zoom level is DETAIL_FIVE.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-10-15 10:40:55 +02:00 • committed by Javier Moran Rua
parent b261c29cb2
commit 4c555d2510
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java
View file

@ -94,6 +94,10 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
private Integer maximunValueForChart = 0;
private IZoomLevelChangedListener zoomListener;
private ZoomLevel zoomLevel = ZoomLevel.DETAIL_ONE;
private final class TaskElementNavigator implements
IStructureNavigator<TaskElement> {
@Override
@ -145,15 +149,15 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
fillChartOnZoomChange(chartComponent, timeTracker);
}
private IZoomLevelChangedListener zoomListener;
private void fillChartOnZoomChange(final Timeplot chartComponent,
final TimeTracker timeTracker) {
zoomListener = new IZoomLevelChangedListener() {
@Override
public void zoomLevelChanged(ZoomLevel detailLevel) {
public void zoomLevelChanged(final ZoomLevel detailLevel) {
zoomLevel = detailLevel;
transactionService
.runOnReadOnlyTransaction(new IOnTransaction<Void>() {
@Override
@ -387,7 +391,11 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
}
}
return groupByWeek(map);
if (zoomLevel.equals(ZoomLevel.DETAIL_FIVE)) {
return map;
} else {
return groupByWeek(map);
}
}
private SortedMap<LocalDate, Integer> calculateHoursAdditionByDay(
@ -412,7 +420,11 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
map.put(date, hours);
}
return groupByWeek(map);
if (zoomLevel.equals(ZoomLevel.DETAIL_FIVE)) {
return map;
} else {
return groupByWeek(map);
}
}
private SortedMap<LocalDate, Integer> groupByWeek(