From dad9b71a5bfd167cf0c5c94af5d2481d1b92fe19 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 12 Jan 2016 13:38:54 -0500
Subject: [PATCH] (js) Preserve selected date when switching view

---
 UI/Templates/SchedulerUI/UIxCalDayView.wox         | 12 ++++++------
 UI/Templates/SchedulerUI/UIxCalMonthView.wox       | 14 +++++++-------
 .../SchedulerUI/UIxCalMulticolumnDayView.wox       | 12 ++++++------
 UI/Templates/SchedulerUI/UIxCalWeekView.wox        | 12 ++++++------
 .../js/Scheduler/CalendarController.js             | 14 ++++++++++----
 5 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/UI/Templates/SchedulerUI/UIxCalDayView.wox b/UI/Templates/SchedulerUI/UIxCalDayView.wox
index 4084b4fc0..0dca984a4 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayView.wox
@@ -12,12 +12,12 @@
       <md-button class="md-icon-button"
                  label:aria-label="Previous Day"
                  var:date="prevDayQueryParameters.day"
-                 ng-click="calendar.changeView($event)"><md-icon>chevron_left</md-icon></md-button>
+                 ng-click="calendar.changeDate($event)"><md-icon>chevron_left</md-icon></md-button>
       <div><var:string value="currentDayName" /></div>
       <md-button class="md-icon-button"
                  label:aria-label="Next Day"
                  var:date="nextDayQueryParameters.day"
-                 ng-click="calendar.changeView($event)"><md-icon>chevron_right</md-icon></md-button>
+                 ng-click="calendar.changeDate($event)"><md-icon>chevron_right</md-icon></md-button>
       <div class="md-flex"><!-- spacer --></div>
       <md-button class="md-icon-button md-accent"
                  label:aria-label="Today"
@@ -28,16 +28,16 @@
       <a class="md-icon-button md-button"
          label:aria-label="Day"
          ng-disabled="true"
-         href="#/calendar/day"><md-icon>view_day</md-icon></a>
+         ng-click="calendar.changeView('day')"><md-icon>view_day</md-icon></a>
       <a class="md-icon-button md-button"
          label:aria-label="Week"
-         href="#/calendar/week"><md-icon>view_week</md-icon></a>
+         ng-click="calendar.changeView('week')"><md-icon>view_week</md-icon></a>
       <a class="md-icon-button md-button"
          label:aria-label="Month"
-         href="#/calendar/month"><md-icon>view_module</md-icon></a>
+         ng-click="calendar.changeView('month')"><md-icon>view_module</md-icon></a>
       <a class="md-icon-button md-button"
          label:aria-label="Multicolumn Day View"
-         href="#/calendar/multicolumnday"><md-icon>view_array</md-icon></a>
+         ng-click="calendar.changeView('multicolumnday')"><md-icon>view_array</md-icon></a>
     </md-card-actions>
 
     <var:component
diff --git a/UI/Templates/SchedulerUI/UIxCalMonthView.wox b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
index 9a912dd84..347738ab5 100644
--- a/UI/Templates/SchedulerUI/UIxCalMonthView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
@@ -12,12 +12,12 @@
       <md-button class="md-icon-button"
                  label:aria-label="Previous Month"
                  var:date="prevMonthQueryParameters.day"
-                 ng-click="calendar.changeView($event)"><md-icon>chevron_left</md-icon></md-button>
-          <var:string value="monthNameOfThisMonth" /> <var:string value="selectedDate.yearOfCommonEra" />
+                 ng-click="calendar.changeDate($event)"><md-icon>chevron_left</md-icon></md-button>
+      <var:string value="monthNameOfThisMonth" /> <var:string value="selectedDate.yearOfCommonEra" />
       <md-button class="md-icon-button"
                  label:aria-label="Next Month"
                  var:date="nextMonthQueryParameters.day"
-                 ng-click="calendar.changeView($event)"><md-icon>chevron_right</md-icon></md-button>
+                 ng-click="calendar.changeDate($event)"><md-icon>chevron_right</md-icon></md-button>
       <div class="md-flex"><!-- spacer --></div>
       <md-button class="md-icon-button md-accent"
                  label:aria-label="Today"
@@ -27,17 +27,17 @@
       </md-button>
       <a class="md-icon-button md-button"
          label:aria-label="Day"
-         href="#/calendar/day"><md-icon>view_day</md-icon></a>
+         ng-click="calendar.changeView('day')"><md-icon>view_day</md-icon></a>
       <a class="md-icon-button md-button"
          label:aria-label="Week"
-         href="#/calendar/week"><md-icon>view_week</md-icon></a>
+         ng-click="calendar.changeView('week')"><md-icon>view_week</md-icon></a>
       <a class="md-icon-button md-button"
          label:aria-label="Month"
          ng-disabled="true"
-         href="#/calendar/month"><md-icon>view_module</md-icon></a>
+         ng-click="calendar.changeView('month')"><md-icon>view_module</md-icon></a>
       <a class="md-icon-button md-button"
          label:aria-label="Multicolumn Day View"
-         href="#/calendar/multicolumnday"><md-icon>view_array</md-icon></a>
+         ng-click="calendar.changeView('multicolumnday')"><md-icon>view_array</md-icon></a>
     </md-card-actions>
 
     <md-toolbar class="monthView">
diff --git a/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox b/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
index c685b0995..fc45e0a75 100644
--- a/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
@@ -12,12 +12,12 @@
       <md-button class="md-icon-button"
                  label:aria-label="Previous Day"
                  var:date="prevDayQueryParameters.day"
-                 ng-click="calendar.changeView($event)"><md-icon>chevron_left</md-icon></md-button>
+                 ng-click="calendar.changeDate($event)"><md-icon>chevron_left</md-icon></md-button>
       <div><var:string value="currentDayName" /></div>
       <md-button class="md-icon-button"
                  label:aria-label="Next Day"
                  var:date="nextDayQueryParameters.day"
-                 ng-click="calendar.changeView($event)"><md-icon>chevron_right</md-icon></md-button>
+                 ng-click="calendar.changeDate($event)"><md-icon>chevron_right</md-icon></md-button>
       <div class="md-flex"><!-- spacer --></div>
       <md-button class="md-icon-button md-accent"
                  label:aria-label="Today"
@@ -27,17 +27,17 @@
       </md-button>
       <a class="md-icon-button md-button"
          label:aria-label="Day"
-         href="#/calendar/day"><md-icon>view_day</md-icon></a>
+         ng-click="calendar.changeView('day')"><md-icon>view_day</md-icon></a>
       <a class="md-icon-button md-button"
          label:aria-label="Week"
-         href="#/calendar/week"><md-icon>view_week</md-icon></a>
+         ng-click="calendar.changeView('week')"><md-icon>view_week</md-icon></a>
       <a class="md-icon-button md-button"
          label:aria-label="Month"
-         href="#/calendar/month"><md-icon>view_module</md-icon></a>
+         ng-click="calendar.changeView('month')"><md-icon>view_module</md-icon></a>
       <a class="md-icon-button md-button"
          label:aria-label="Multicolumn Day View"
          ng-disabled="true"
-         href="#/calendar/multicolumnday"><md-icon>view_array</md-icon></a>
+         ng-click="calendar.changeView('multicolumnday')"><md-icon>view_array</md-icon></a>
     </md-card-actions>
 
     <var:component
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekView.wox b/UI/Templates/SchedulerUI/UIxCalWeekView.wox
index c84d414e3..d269074f1 100644
--- a/UI/Templates/SchedulerUI/UIxCalWeekView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekView.wox
@@ -12,12 +12,12 @@
       <md-button class="md-icon-button"
                  label:aria-label="Previous Week"
                  var:date="prevWeekQueryParameters.day"
-                 ng-click="calendar.changeView($event)"><md-icon>chevron_left</md-icon></md-button>
+                 ng-click="calendar.changeDate($event)"><md-icon>chevron_left</md-icon></md-button>
       <div><var:string value="currentWeekName" /></div>
       <md-button class="md-icon-button"
                  label:aria-label="Next Week"
                  var:date="nextWeekQueryParameters.day"
-                 ng-click="calendar.changeView($event)"><md-icon>chevron_right</md-icon></md-button>
+                 ng-click="calendar.changeDate($event)"><md-icon>chevron_right</md-icon></md-button>
       <div class="md-flex"><!-- spacer --></div>
       <md-button class="md-icon-button md-accent"
                  label:aria-label="Today"
@@ -27,17 +27,17 @@
       </md-button>
       <a class="md-icon-button md-button"
          label:aria-label="Day"
-         href="#/calendar/day"><md-icon>view_day</md-icon></a>
+         ng-click="calendar.changeView('day')"><md-icon>view_day</md-icon></a>
       <a class="md-icon-button md-button"
          label:aria-label="Week"
          ng-disabled="true"
-         href="#/calendar/week"><md-icon>view_week</md-icon></a>
+         ng-click="calendar.changeView('week')"><md-icon>view_week</md-icon></a>
       <a class="md-icon-button md-button"
          label:aria-label="Month"
-         href="#/calendar/month"><md-icon>view_module</md-icon></a>
+         ng-click="calendar.changeView('month')"><md-icon>view_module</md-icon></a>
       <a class="md-icon-button md-button"
          label:aria-label="Multicolumn Day View"
-         href="#/calendar/multicolumnday"><md-icon>view_array</md-icon></a>
+         ng-click="calendar.changeView('multicolumnday')"><md-icon>view_array</md-icon></a>
     </md-card-actions>
   <var:component
       className="UIxCalDayTable"
diff --git a/UI/WebServerResources/js/Scheduler/CalendarController.js b/UI/WebServerResources/js/Scheduler/CalendarController.js
index 38a3affaa..b8e185e55 100644
--- a/UI/WebServerResources/js/Scheduler/CalendarController.js
+++ b/UI/WebServerResources/js/Scheduler/CalendarController.js
@@ -11,6 +11,7 @@
     var vm = this, deregisterCalendarsList;
 
     vm.views = stateEventsBlocks;
+    vm.changeDate = changeDate;
     vm.changeView = changeView;
 
     // Refresh current view when the list of calendars is modified
@@ -32,12 +33,17 @@
       });
     }
 
-    // Change calendar's view
-    function changeView($event) {
+    // Change calendar's date
+    function changeDate($event) {
       var date = angular.element($event.currentTarget).attr('date');
-      $state.go('calendars.view', { view: $stateParams.view, day: date });
+      $state.go('calendars.view', { day: date });
     }
-  }
+
+    // Change calendar's view
+    function changeView(view) {
+      $state.go('calendars.view', { view: view });
+    }
+}
 
   angular
     .module('SOGo.SchedulerUI')