From 99b00254c5af975c5db6b45407a2897a64ff0210 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 21 Nov 2016 16:23:49 -0500
Subject: [PATCH] (js) Persistent state of center list in Calendars

Fixes #3861
---
 NEWS                                                  |  2 +-
 UI/Scheduler/UIxCalMainView.m                         |  8 +++++---
 UI/Templates/SchedulerUI/UIxCalDayView.wox            |  2 +-
 UI/Templates/SchedulerUI/UIxCalMainView.wox           |  5 ++++-
 UI/Templates/SchedulerUI/UIxCalMonthView.wox          |  2 +-
 UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox |  2 +-
 UI/Templates/SchedulerUI/UIxCalWeekView.wox           |  2 +-
 UI/WebServerResources/js/Common/navController.js      | 11 +++++++----
 8 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/NEWS b/NEWS
index 2bb8d21140..9d2b5e35f4 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@
 
 New features
  - [core] support repetitive email alarms on tasks and events (#1053)
- - [web] allow to hide center column on large screens
+ - [web] allow to hide center column on large screens (#3861)
  - [eas] relaxed permission requirements for subscription synchronizations (#3118 and #3180)
 
 Enhancements
diff --git a/UI/Scheduler/UIxCalMainView.m b/UI/Scheduler/UIxCalMainView.m
index db05c2a288..8742fa3fee 100644
--- a/UI/Scheduler/UIxCalMainView.m
+++ b/UI/Scheduler/UIxCalMainView.m
@@ -278,12 +278,14 @@ - (WOResponse *) saveSelectedListAction
 - (WOResponse *) saveListStateAction
 {
   WORequest *request;
+  NSDictionary *params;
   NSString *state;
 
   [self _setupContext];
   request = [context request];
+  params = [[request contentAsString] objectFromJSONString];
 
-  state = [request formValueForKey: @"state"];
+  state = [params objectForKey: @"state"];
   [moduleSettings setObject: state
                      forKey: @"ListState"];
   [us synchronize];
@@ -291,14 +293,14 @@ - (WOResponse *) saveListStateAction
   return [self responseWithStatus: 204];
 }
 
-- (NSString *) listStateStyle
+- (BOOL) listIsCollapsed
 {
   NSString *state;
 
   [self _setupContext];
   state = [moduleSettings objectForKey: @"ListState"];
 
-  return (state && [state compare: @"collapse"] == NSOrderedSame)? @"display: none;" : @"";
+  return (state && [state compare: @"collapse"] == NSOrderedSame);
 }
 
 - (WOResponse *) saveFoldersOrderAction
diff --git a/UI/Templates/SchedulerUI/UIxCalDayView.wox b/UI/Templates/SchedulerUI/UIxCalDayView.wox
index bb00f17005..5c80fc133f 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayView.wox
@@ -9,7 +9,7 @@
 
   <md-card>
     <md-card-actions flex-none="flex-none" layout="row" layout-align="start center">
-      <md-button ng-click="toggleCenter()"
+      <md-button ng-click="toggleCenter({save: true})"
                  class="md-icon-button md-primary md-hue-1 hide show-gt-xs"
                  aria-hidden="true">
         <md-icon class="icon-fullscreen"
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 7a5ec8e75f..cd287348bb 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -14,6 +14,7 @@
     var dayStartHour = <var:string value="dayStartHour"/>;
     var currentView = '<var:string value="currentView"/>';
     var localeCode = '<var:string value="localeCode" />';
+    var centerIsClose = <var:string value="listIsCollapsed.jsonRepresentation" />;
   </script>
   <var:component className="UIxCalendarSelector" />
 
@@ -348,7 +349,9 @@
       </md-toolbar>
       <div layout="row" class="md-flex">
 
-        <div class="view-list" layout="column" ng-class="{'view-list--close': centerIsClose}">
+        <div class="view-list ng-hide" layout="column"
+             ng-show="list.selectedList >= 0"
+             ng-class="{'view-list--close': centerIsClose}">
           <md-toolbar class="md-accent md-hue-1" flex-none="flex-none"
                       ng-hide="list.mode.multiple">
             <!-- sort/filter mode (default) -->
diff --git a/UI/Templates/SchedulerUI/UIxCalMonthView.wox b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
index 8c21e619f4..59c30ca69d 100644
--- a/UI/Templates/SchedulerUI/UIxCalMonthView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
@@ -9,7 +9,7 @@
 
   <md-card>
     <md-card-actions flex-none="flex-none" layout="row" layout-align="start center">
-      <md-button ng-click="toggleCenter()"
+      <md-button ng-click="toggleCenter({save: true})"
                  class="md-icon-button md-primary md-hue-1 hide show-gt-xs"
                  aria-hidden="true">
         <md-icon class="icon-fullscreen"
diff --git a/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox b/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
index a5c32607bb..9029ede6c5 100644
--- a/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
@@ -9,7 +9,7 @@
 
   <md-card>
     <md-card-actions flex-none="flex-none" layout="row" layout-align="start center">
-      <md-button ng-click="toggleCenter()"
+      <md-button ng-click="toggleCenter({save: true})"
                  class="md-icon-button md-primary md-hue-1 hide show-gt-xs"
                  aria-hidden="true">
         <md-icon class="icon-fullscreen"
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekView.wox b/UI/Templates/SchedulerUI/UIxCalWeekView.wox
index 9b4be84266..418f137401 100644
--- a/UI/Templates/SchedulerUI/UIxCalWeekView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekView.wox
@@ -9,7 +9,7 @@
 
   <md-card>
     <md-card-actions flex-none="flex-none" layout="row" layout-align="start center">
-      <md-button ng-click="toggleCenter()"
+      <md-button ng-click="toggleCenter({save: true})"
                  class="md-icon-button md-primary md-hue-1 hide show-gt-xs"
                  aria-hidden="true">
         <md-icon class="icon-fullscreen"
diff --git a/UI/WebServerResources/js/Common/navController.js b/UI/WebServerResources/js/Common/navController.js
index 4ebdeb2988..216b6896be 100644
--- a/UI/WebServerResources/js/Common/navController.js
+++ b/UI/WebServerResources/js/Common/navController.js
@@ -9,14 +9,15 @@
   /**
    * @ngInject
    */
-  navController.$inject =  ['$rootScope', '$scope', '$timeout', '$interval', '$http', '$window', '$mdSidenav', '$mdToast', '$mdMedia', '$log', 'sgConstant', 'sgSettings', 'Alarm'];
-  function navController($rootScope, $scope, $timeout, $interval, $http, $window, $mdSidenav, $mdToast, $mdMedia, $log, sgConstant, sgSettings, Alarm) {
+  navController.$inject =  ['$rootScope', '$scope', '$timeout', '$interval', '$http', '$window', '$mdSidenav', '$mdToast', '$mdMedia', '$log', 'sgConstant', 'sgSettings', 'Resource', 'Alarm'];
+  function navController($rootScope, $scope, $timeout, $interval, $http, $window, $mdSidenav, $mdToast, $mdMedia, $log, sgConstant, sgSettings, Resource, Alarm) {
+    var resource = new Resource(sgSettings.baseURL(), sgSettings.activeUser());
 
     $scope.isPopup = sgSettings.isPopup;
     $scope.activeUser = sgSettings.activeUser();
     $scope.baseURL = sgSettings.baseURL();
     $scope.leftIsClose = !$mdMedia(sgConstant['gt-md']);
-    $scope.centerIsClose = false;
+    $scope.centerIsClose = !!$window.centerIsClose;
 
     // Show current day in top bar
     $scope.currentDay = window.currentDay;
@@ -53,8 +54,10 @@
           $log.debug("toggle right is done");
         });
     };
-    $scope.toggleCenter = function() {
+    $scope.toggleCenter = function(options) {
       $scope.centerIsClose = !$scope.centerIsClose;
+      if (options && options.save)
+        resource.post(null, 'saveListState', { state: $scope.centerIsClose? 'collapse' : 'rise' });
     };
     // $scope.openBottomSheet = function() {
     //   $mdBottomSheet.show({