Merge pull request #8 from DestinationCore/chore/order-date-exceptions

Exception Formatting

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.5.0 - 2023-02-15
+### Added
+- CP notice when a date has been added to exceptions.
+
+### Changed
+- Date exceptions values ordered before saving.
+- Remove duplicates from date exceptions value before saving.
+
 ## 1.4.4 - 2022-08-10
 ### Added
 - `nesbot/carbon` package.

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "unionco/calendarize",
     "description": "A calendar field type providing functionality for recurrence.",
-    "version": "1.4.4",
+    "version": "1.5.0",
     "type": "craft-plugin",
     "keywords": [
         "craft",

src/assetbundles/cpbundle/src/js/modules/exceptions.js

@@ -95,6 +95,8 @@ class CalendarException {
             li.appendChild(p);
 
             this.listing.appendChild(li);
+
+            Craft.cp.displayNotice("Added date exception for " + getLocalizedDayName(localizedMoment) + ', ' + localizedMoment.format('L') + ".");
         })
     }
 

src/services/CalendarizeService.php

@@ -440,9 +440,14 @@ public function saveField(CalendarizeField $field, ElementInterface $owner): boo
             }
 
             if (isset($value->exceptions)) {
-                $record->exceptions = Json::encode(array_map(function ($exception) use ($value) {
-                    return Db::prepareDateForDb($exception);
-                }, $value->exceptions ?? []));
+                $record->exceptions = collect($value->exceptions)
+                    ->unique()
+                    ->sort()
+                    ->map(function ($exception) {
+                        return Db::prepareDateForDb($exception);
+                    })
+                    ->values()
+                    ->toJson();
             }
 
             if (isset($value->timeChanges)) {