2 files changed, 38 insertions, 4 deletions
diff --git a/resources/assets/js/forms.js b/resources/assets/js/forms.js
index f5818e97..9970b907 100644
--- a/resources/assets/js/forms.js
+++ b/resources/assets/js/forms.js
@@ -16,7 +16,7 @@ global.checkAll = (id, checked) => {
  * Sets the checkboxes according to the given type
  *
  * @param {string} id The elements ID
- * @param {list} shifts_list A list of numbers
+ * @param {list} shiftsList A list of numbers
  */
 global.checkOwnTypes = (id, shiftsList) => {
     $('#' + id + ' input[type="checkbox"]').each(function () {
@@ -144,10 +144,10 @@ $(function () {
         elem.children('input').on('click', function (ev) {
             ev.stopImmediatePropagation();
             if (typeof elem.data('DateTimePicker') === 'undefined') {
-              elem.datetimepicker(opts);
-              elem.data('DateTimePicker').show();
+                elem.datetimepicker(opts);
+                elem.data('DateTimePicker').show();
             } else {
-              elem.data('DateTimePicker').toggle();
+                elem.data('DateTimePicker').toggle();
             }
         });
     });
@@ -173,3 +173,30 @@ $(function () {
         });
     });
 });
+
+/**
+ * Set the filter selects to latest state
+ *
+ * Uses DOMContentLoaded to prevent flickering
+ */
+window.addEventListener('DOMContentLoaded', () => {
+    const filter = document.getElementById('collapseShiftsFilterSelect');
+    if (!filter || localStorage.getItem('collapseShiftsFilterSelect') !== 'hidden') {
+        return;
+    }
+
+    filter.classList.remove('in');
+});
+$(() => {
+    if (typeof (localStorage) === 'undefined') {
+        return;
+    }
+
+    const onChange = (e) => {
+        localStorage.setItem('collapseShiftsFilterSelect', e.type);
+    };
+
+    $('#collapseShiftsFilterSelect')
+        .on('hidden.bs.collapse', onChange)
+        .on('shown.bs.collapse', onChange);
+});
diff --git a/resources/assets/js/vendor.js b/resources/assets/js/vendor.js
index bf3807f7..b4b6487d 100644
--- a/resources/assets/js/vendor.js
+++ b/resources/assets/js/vendor.js
@@ -10,6 +10,13 @@ require('./forms');
 require('./sticky-headers');
 require('./moment-countdown');
 
+moment.updateLocale('en', {
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
 $.ajaxSetup({
     headers: {'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')}
 });