From 96b5ff183b70d9c2cbc2becf0f4f41a470cf63ab Mon Sep 17 00:00:00 2001
From: Dave Iverson <dave.iverson@raizlabs.com>
Date: Thu, 21 Jun 2018 10:58:37 -0500
Subject: [PATCH] Modified the "days of the week" code to make the first day
 configurable. In OpenAir, the business is able to change the first day of the
 week. Previously this extension had the first day hardcoded to "Monday". In
 this change I add a new dropdown to the Options menu allowing the user to
 select the first day. It still defaults to Monday.

Since loading the options is asynchronous, we can no longer rely on "getDayNum()" to return the correct day until we have loaded this setting. That means we need to delay the timesheet code that depends on this function. I've moded that code to a callback after the "firstDayOfWeek" setting is loaded.
---
 app/options.html         | 13 +++++++++
 app/scripts/openair.js   | 34 ++++++++++++++++++------
 app/scripts/options.js   |  4 ++-
 app/scripts/timeentry.js | 57 ++++++++++++++++++++++++----------------
 4 files changed, 77 insertions(+), 31 deletions(-)

diff --git a/app/options.html b/app/options.html
index a813e31..b7d3d06 100644
--- a/app/options.html
+++ b/app/options.html
@@ -51,6 +51,19 @@ <h1>OpenAir Reborn Options</h1>
                     </select>
                     <p class="description">Choosing "Yes" will automatically save your timesheet after 15 minutes of inactivity.</p>
                 </div>
+                <div class="form-input-wrapper">
+                    <label for="firstDayOfWeek">First day of the week</label>
+                    <select id="firstDayOfWeek"  name="firstDayOfWeek" ng-model="firstDayOfWeek">
+                        <option value="su">Sunday</option>
+                        <option value="mo">Monday</option>
+                        <option value="tu">Tuesday</option>
+                        <option value="we">Wednesday</option>
+                        <option value="th">Thursday</option>
+                        <option value="fr">Friday</option>
+                        <option value="sa">Saturday</option>
+                    </select>
+                    <p class="description">Select the first day of the week. This can be set by the business, and will be the first time entry column.</p>
+                </div>
                 <!--
                 <div class="form-input-wrapper">
                     <label for="persistentTimers">Persistent timers</label>
diff --git a/app/scripts/openair.js b/app/scripts/openair.js
index 61571d3..2f53a3c 100644
--- a/app/scripts/openair.js
+++ b/app/scripts/openair.js
@@ -13,6 +13,8 @@
  */
 app.service('OpenAirService', function() {
 
+    this.firstDayOfWeek = 'mo';
+
     var parent = this; // Used in functions below to reference other functions below.
 
     /**
@@ -382,6 +384,7 @@ app.service('OpenAirService', function() {
 
     /**
      * Helper function to convert two digit day code to integer.
+     * This takes the "first day of week" setting into account
      *
      * @TODO: Start using numbers instead of day codes. It'll remove a lot of dumb logic.
      *
@@ -389,14 +392,29 @@ app.service('OpenAirService', function() {
      * @returns {int}
      */
     this.getDayNum = function(dayCode) {
-        var  weekdays = [];
-        weekdays.mo = 0;
-        weekdays.tu = 1;
-        weekdays.we = 2;
-        weekdays.th = 3;
-        weekdays.fr = 4;
-        weekdays.sa = 5;
-        weekdays.su = 6;
+        var  weekdays = {};
+        var days = [
+            'su',
+            'mo',
+            'tu',
+            'we',
+            'th',
+            'fr',
+            'sa',
+        ];
+
+        // figure out which day is the first day
+        var firstDayStr = parent.firstDayOfWeek;
+        var firstDayIndex = days.findIndex(function (d) { return d === firstDayStr; });
+
+        // assign integers for each day, looping around where necessary
+        days.forEach(function (day, i) {
+            var index = i - firstDayIndex;
+            if(index < 0) {
+                index = days.length + index;
+            }
+            weekdays[day] = index;
+        });
         return weekdays[dayCode];
     };
 
diff --git a/app/scripts/options.js b/app/scripts/options.js
index e2c836b..d7bbc92 100644
--- a/app/scripts/options.js
+++ b/app/scripts/options.js
@@ -15,7 +15,8 @@ app.controller('OptionsController', ['$scope', function($scope) {
             timeFormat : $scope.timeFormat,
             multipleTimers : $scope.multipleTimers,
             persistentTimers : $scope.persistentTimers,
-            autosave : $scope.autosave
+            autosave : $scope.autosave,
+            firstDayOfWeek : $scope.firstDayOfWeek,
         }, function() {
             $scope.status = "Settings saved successfully.";
             $scope.$apply();
@@ -69,6 +70,7 @@ app.controller('OptionsController', ['$scope', function($scope) {
         $scope.load('multipleTimers', 1);
         $scope.load('persistentTimers', 1);
         $scope.load('autosave', 0);
+        $scope.load('firstDayOfWeek', 'mo');
     };
 
     // And away we go...
diff --git a/app/scripts/timeentry.js b/app/scripts/timeentry.js
index 62dc557..e84d61c 100644
--- a/app/scripts/timeentry.js
+++ b/app/scripts/timeentry.js
@@ -297,13 +297,16 @@ app.controller('TimeEntryController', ['$scope', '$timeout', '$interval', 'OpenA
      * @param {string} optionName
      * @param {mixed} defaultVal
      */
-    $scope.loadSetting = function(optionName, defaultVal) {
+    $scope.loadSetting = function(optionName, defaultVal, callback) {
         var exists = false;
         chrome.storage.sync.get(optionName, function (obj) {
             if (obj[optionName]) {
                 exists = true;
                 $scope[optionName] = obj[optionName];
             }
+            if(callback) {
+                callback();
+            }
         });
         if (!exists) {
             $scope[optionName] = defaultVal;
@@ -317,6 +320,34 @@ app.controller('TimeEntryController', ['$scope', '$timeout', '$interval', 'OpenA
         $scope.loadSetting('timeFormat', 'hhmm');
         $scope.loadSetting('multipleTimers', 1);
         $scope.loadSetting('autosave', 0);
+        $scope.loadSetting('firstDayOfWeek', 'fr', $scope.afterFirstDayOfWeekLoaded);
+    };
+
+    /**
+     * Callback after the firstDayOfWeek setting has been loaded
+     * After we load this, we can pass it to OpenAirService and set up everything that relies on it
+     */
+    $scope.afterFirstDayOfWeekLoaded = function() {
+        // set the first day of the week for calculations
+        OpenAirService.firstDayOfWeek = $scope.firstDayOfWeek;
+
+        // Days of the week, to match code to day and cycle through in the view.
+        $scope.weekdays = [
+            {code: "mo", name: 'Monday', shortName: 'Mo', timestamp: OpenAirService.getDateTimestamp("mo")},
+            {code: "tu", name: 'Tuesday', shortName: 'Tu', timestamp: OpenAirService.getDateTimestamp("tu")},
+            {code: "we", name: 'Wednesday', shortName: 'We', timestamp: OpenAirService.getDateTimestamp("we")},
+            {code: "th", name: 'Thursday', shortName: 'Th', timestamp: OpenAirService.getDateTimestamp("th")},
+            {code: "fr", name: 'Friday', shortName: 'Fr', timestamp: OpenAirService.getDateTimestamp("fr")},
+            {code: "sa", name: 'Saturday', shortName: 'Sa', timestamp: OpenAirService.getDateTimestamp("sa")},
+            {code: "su", name: 'Sunday', shortName: 'Su', timestamp: OpenAirService.getDateTimestamp("su")}
+        ];
+
+        // The time table is listed in reverse order.
+        // @TODO: Use a filter instead.
+        $scope.reverseWeekdays = $scope.weekdays.reverse();
+
+        // Default the "Day" field to the current day.
+        $scope.when = [$scope.getDay()];
     };
 
     /**
@@ -339,27 +370,6 @@ app.controller('TimeEntryController', ['$scope', '$timeout', '$interval', 'OpenA
         return weekdays;
     };
 
-    // Days of the week, to match code to day and cycle through in the view.
-    $scope.weekdays = [
-        {code: "mo", name: 'Monday', shortName: 'Mo', timestamp: OpenAirService.getDateTimestamp("mo")},
-        {code: "tu", name: 'Tuesday', shortName: 'Tu', timestamp: OpenAirService.getDateTimestamp("tu")},
-        {code: "we", name: 'Wednesday', shortName: 'We', timestamp: OpenAirService.getDateTimestamp("we")},
-        {code: "th", name: 'Thursday', shortName: 'Th', timestamp: OpenAirService.getDateTimestamp("th")},
-        {code: "fr", name: 'Friday', shortName: 'Fr', timestamp: OpenAirService.getDateTimestamp("fr")},
-        {code: "sa", name: 'Saturday', shortName: 'Sa', timestamp: OpenAirService.getDateTimestamp("sa")},
-        {code: "su", name: 'Sunday', shortName: 'Su', timestamp: OpenAirService.getDateTimestamp("su")}
-    ];
-
-    // The time table is listed in reverse order.
-    // @TODO: Use a filter instead.
-    $scope.reverseWeekdays = $scope.weekdays.reverse();
-
-    // Default the "Day" field to the current day.
-    $scope.when = [$scope.getDay()];
-
-    // Load in any user settings if saved, otherwise just load the defaults.
-    $scope.loadSettings();
-
     // Update the submit button's value based on whether the time field has a value or not.
     $scope.$watch('time', function(newTime) {
         if (newTime) {
@@ -503,4 +513,7 @@ app.controller('TimeEntryController', ['$scope', '$timeout', '$interval', 'OpenA
     };
 
     var checkForTimesheet = $interval($scope.initializeFromTimesheet, 100);
+
+    // Load in any user settings if saved, otherwise just load the defaults.
+    $scope.loadSettings();
 }]);
\ No newline at end of file