1.0.3 - maintenance release

rdmtc · Jan 23, 2022 · c698371 · c698371
1 parent b2f4c58
commit c698371
Show file tree

Hide file tree

Showing 5 changed files with 381 additions and 765 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 ### CHANGELOG
 
+#### 1.0.3 - maintenance release
+
+- merged pull requests by @rucksman
+  - added "isWeekendOrHolidayOrSpecialday" #21
+  - Add Weltfrauentag as holiday in Berlin #22
+- Dependencies update
+
 #### 1.0.2 - bug fix
 
 - changed completely from UTC to local time, because in some time-zones day calculated wrong

diff --git a/german-holidays.html b/german-holidays.html
@@ -480,9 +480,16 @@ <h3>References</h3>
                     namerAlt: 'International Women\'s Day',
                     month: 3,
                     day: 8,
+                    regions: ['BE'],
+                    character: characteristic.holiday
+                },
+                /* FRAUENTAG: {
+                    name: 'Frauentag', // 8. März - Internationaler Frauentag
+                    month: 3,
+                    day: 8,
                     regions: [],
                     character: characteristic.actionday
-                },
+                }, */
                 PALMSONNTAG: {
                     name: 'Palmsonntag', // 7 Tage vor dem Ostersonntag
                     month: easterX,
@@ -532,13 +539,6 @@ <h3>References</h3>
                     regions: [],
                     character: characteristic.calendar
                 },
-                FRAUENTAG: {
-                    name: 'Frauentag', // 8. März - Internationaler Frauentag
-                    month: 3,
-                    day: 8,
-                    regions: [],
-                    character: characteristic.actionday
-                },
                 APRILSCHERZ: {
                     name: '1. April',
                     month: 4,

diff --git a/german-holidays.js b/german-holidays.js
@@ -521,6 +521,7 @@ module.exports = function (RED) {
             result.isHoliday = ((typeof result.holiday !== 'undefined') && (result.holiday !== null));
             result.specialday = daysObjects.specialdays.find(specialday => specialday.equals(date));
             result.isSpecialday = ((typeof result.specialday !== 'undefined') && (result.specialday !== null));
+            result.isHolidayOrSpecialday = result.isHoliday || result.isSpecialday;
 
             if (offsetToday) {
                 result.dayOffset = offsetToday;
@@ -530,7 +531,6 @@ module.exports = function (RED) {
             result.isSunOrHoliday = result.isSunday || result.isHoliday;
             result.isWeekendOrHoliday = result.isSaturday || result.isSunday || result.isHoliday;
             result.isWeekendOrHolidayOrSpecialday = result.isSaturday || result.isSunday || result.isHoliday || result.isSpecialday;
-            result.isHolidayOrSpecialday = result.isHoliday || result.isSpecialday;
 
             if (result.isHoliday) {
                 result.id = result.holiday.id;
@@ -823,4 +823,4 @@ module.exports = function (RED) {
     }
 
     RED.nodes.registerType('german-holidays', germanHolidaysNode);
-};
+};