From d49e1679092848ee89903cd14c9a3625c27bb1ae Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Tue, 15 Nov 2011 08:50:56 +0100 Subject: [PATCH] [Bug #1254] Keep zoom level in advanced allocatin perspective When user changes default zoom level of advanced allocation perspective, now the value is stored and used again when user come back to that perspective. FEA: ItEr75S04BugFixing --- .../planner/allocation/AdvancedAllocationController.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java index 485ec6266..43cb00430 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java @@ -379,6 +379,9 @@ public class AdvancedAllocationController extends GenericForwardComposer { private Listbox advancedAllocationHorizontalPagination; private Listbox advancedAllocationVerticalPagination; + private boolean fixedZoomByUser = false; + private ZoomLevel zoomLevel; + public AdvancedAllocationController(IBack back, List allocationInputs) { setInputData(back, allocationInputs); @@ -576,6 +579,9 @@ public class AdvancedAllocationController extends GenericForwardComposer { private void createComponents() { timeTracker = new TimeTracker(addMarginTointerval(), self); paginatorFilter = new PaginatorFilter(); + if (fixedZoomByUser && (zoomLevel != null)) { + timeTracker.setZoomLevel(zoomLevel); + } paginatorFilter.setZoomLevel(timeTracker.getDetailLevel()); paginatorFilter.setInterval(timeTracker.getRealInterval()); paginationUpButton.setDisabled(isLastPage()); @@ -585,6 +591,9 @@ public class AdvancedAllocationController extends GenericForwardComposer { timeTracker.addZoomListener(new IZoomLevelChangedListener() { @Override public void zoomLevelChanged(ZoomLevel detailLevel) { + fixedZoomByUser = true; + zoomLevel = detailLevel; + paginatorFilter.setZoomLevel(detailLevel); paginatorFilter.setInterval(timeTracker.getRealInterval()); timeTracker.setFilter(paginatorFilter);