v2.0.14

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Solspace Calendar Changelog
 
+## 2.0.14 - 2019-01-30
+### Fixed
+- Fixed a bug where the mini calendar and date pickers in Month/Week/Day CP views was not respecting the 'First Day of Week' user account setting.
+- Fixed some potential visual issues in create/edit event CP page.
+
 ## 2.0.13 - 2019-01-22
 ### Fixed
 - Fixed a bug where Live Preview was not working correctly in Craft 3.0.

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "solspace/craft3-calendar",
   "description": "The most powerful event management plugin for Craft.",
-  "version": "2.0.13",
+  "version": "2.0.14",
   "type": "craft-plugin",
   "authors": [
     {

src/Controllers/EventsController.php

@@ -425,6 +425,8 @@ private function renderEditForm(Event $event, string $title): Response
 
         $siteHandle = $event->getSite()->handle;
 
+        $weekStartDay = $this->getSettingsService()->getWeekStartDay();
+
         $variables = [
             'name'               => self::EVENT_FIELD_NAME,
             'event'              => $event,
@@ -437,9 +439,10 @@ private function renderEditForm(Event $event, string $title): Response
             'userElementType'    => User::class,
             'frequencyOptions'   => RecurrenceHelper::getFrequencyOptions(),
             'repeatsByOptions'   => RecurrenceHelper::getRepeatsByOptions(),
-            'weekDays'           => DateHelper::getWeekDaysShort(0, 2, true),
+            'weekDays'           => DateHelper::getWeekDaysShort($weekStartDay, 2, true),
             'monthDays'          => DateHelper::getMonthDays(),
             'monthNames'         => DateHelper::getMonthNames(true),
+            'weekStartDay'       => $weekStartDay,
             'continueEditingUrl' => 'calendar/events/{id}/{site.handle}',
             'exceptions'         => $exceptions,
             'dateFormat'         => $dateFormat,

src/Controllers/ViewController.php

@@ -125,6 +125,7 @@ public function actionTargetTime(
                 'isMultisite'          => \Craft::$app->getIsMultiSite(),
                 'dateFormat'           => $dateFormat,
                 'timeFormat'           => $timeFormat,
+                'weekStartDay'         => $this->getSettingsService()->getWeekStartDay(),
             ]
         );
     }

src/Services/SettingsService.php

@@ -111,6 +111,18 @@ public function dismissDemoBanner(): bool
         return \Craft::$app->plugins->savePluginSettings($plugin, ['demoBannerDisabled' => true]);
     }
 
+    /**
+     * @return int
+     */
+    public function getWeekStartDay(): int
+    {
+        return (int) \Craft::$app->getUsers()->getUserPreference(
+            \Craft::$app->getUser()->id,
+            'weekStartDay',
+            \Craft::$app->getConfig()->getGeneral()->defaultWeekStartDay ?? 0
+        );
+    }
+
     /**
      * @return SettingsModel
      */

src/templates/field/_event.html

@@ -2,6 +2,12 @@
 
 {% set dateFormat = craft.app.locale.getDateFormat('medium', 'php') %}
 
+<script>
+    if (Craft && Craft.datepickerOptions) {
+      Craft.datepickerOptions.firstDay = {{ weekStartDay ?? 0 }};
+    }
+</script>
+
 <div class="calendar-event-wrapper">
 
     {% macro dateTimeField(event, fieldName, attribute, label, name) %}

src/templates/view/calendar.html

@@ -48,7 +48,11 @@
 
     {% from _self import dateTimeField %}
 
-
+    <script>
+      if (Craft && Craft.datepickerOptions) {
+        Craft.datepickerOptions.firstDay = {{ weekStartDay ?? 0 }};
+      }
+    </script>
 
     <div id="event-creator">
         {{ forms.textField({
@@ -108,6 +112,7 @@
              id="calendar-mini-cal"
              data-current-day="{{ currentDay.toDateString }}"
              data-language="{{ calendarLanguage }}"
+             data-first-day-of-week="{{ currentUser is defined and currentUser ? currentUser.preference('weekStartDay') : craft.config.defaultWeekStartDay }}"
         ></div>
 
         <nav>