fix: Issue #1798 - fixing recurrent calendar events crosstime DST

modules/default/calendar/calendarfetcher.js

@@ -184,7 +184,14 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 
 						// For recurring events, get the set of start dates that fall within the range
 						// of dates we"re looking for.
-						var dates = rule.between(past, future, true, limitFunction);
+						// kblankenship1989 - to fix issue #1798, converting all dates to locale time first, then converting back to UTC time
+						var pastLocal = moment(past).subtract(past.getTimezoneOffset(), "minutes").toDate();
+						var futureLocal = moment(past).subtract(future.getTimezoneOffset(), "minutes").toDate();
+						var datesLocal = rule.between(pastLocal, futureLocal, true, limitFunction);
+						var dates = datesLocal.map(function(dateLocal) {
+							var date = moment(dateLocal).add(dateLocal.getTimezoneOffset(), "minutes").toDate();
+							return date;
+						});
 
 						// The "dates" array contains the set of dates within our desired date range range that are valid
 						// for the recurrence rule.  *However*, it"s possible for us to have a specific recurrence that

modules/default/calendar/vendor/ical.js/node-ical.js

@@ -26,6 +26,17 @@ exports.parseFile = function(filename){
 
 var rrule = require('rrule').RRule
 
+function getLocaleISOString(date) {
+	var year = date.getFullYear().toString(10).padStart(4,'0');
+	var month = date.getMonth().toString(10).padStart(2,'0');
+	var day = date.getDate().toString(10).padStart(2,'0');
+	var hour = date.getHours().toString(10).padStart(2,'0');
+	var minute = date.getMinutes().toString(10).padStart(2,'0');
+	var second = date.getSeconds().toString(10).padStart(2,'0');
+
+	return `${year}${month}${day}T${hour}${minute}${second}Z`;
+}
+
 ical.objectHandlers['RRULE'] = function(val, params, curr, stack, line){
   curr.rrule = line;
   return curr
@@ -50,8 +61,8 @@ ical.objectHandlers['END'] = function (val, params, curr, stack) {
 
 				if (typeof curr.start.toISOString === 'function') {
 					try {
-						rule += ';DTSTART=' + curr.start.toISOString().replace(/[-:]/g, '');
+						// kblankenship1989 - to fix issue #1798, converting all dates to locale time first, then converting back to UTC time
-						rule = rule.replace(/\.[0-9]{3}/, '');
+						rule += ';DTSTART=' + getLocaleISOString(curr.start);
 					} catch (error) {
 						console.error("ERROR when trying to convert to ISOString", error);
 					}

modules/default/compliments/compliments.js

@@ -151,7 +151,7 @@ Module.register("compliments", {
 		// get the current time of day compliments list
 		var compliments = this.complimentArray();
 		// variable for index to next message to display
-		let index=0
+		let index=0;
 		// are we randomizing
 		if(this.config.random){
 			// yes
@@ -160,7 +160,7 @@ Module.register("compliments", {
 		else{
 			// no, sequetial
 			// if doing sequential,  don't fall off the end
-			index = (this.lastIndexUsed >= (compliments.length-1))?0: ++this.lastIndexUsed
+			index = (this.lastIndexUsed >= (compliments.length-1))?0: ++this.lastIndexUsed;
 		}
 
 		return compliments[index];
@@ -173,15 +173,15 @@ Module.register("compliments", {
 		// get the compliment text
 		var complimentText = this.randomCompliment();
 		// split it into parts on newline text
-		var parts= complimentText.split('\n')
+		var parts= complimentText.split("\n");
 		// create a span to hold it all
-		var compliment=document.createElement('span')
+		var compliment=document.createElement("span");
 		// process all the parts of the compliment text
 		for (part of parts){
 			// create a text element for each part
-			compliment.appendChild(document.createTextNode(part))
+			compliment.appendChild(document.createTextNode(part));
 			// add a break `
-			compliment.appendChild(document.createElement('BR'))
+			compliment.appendChild(document.createElement("BR"));
 		}
 		// remove the last break
 		compliment.lastElementChild.remove();

tests/e2e/modules/mocks/weather_current.js

@@ -1,4 +1,4 @@
-const _ = require('lodash');
+const _ = require("lodash");
 
 function generateWeather(extendedData = {}) {
 	return JSON.stringify(_.merge({}, {

tests/e2e/modules/mocks/weather_forecast.js

@@ -1,4 +1,4 @@
-const _ = require('lodash');
+const _ = require("lodash");
 
 function generateWeatherForecast(extendedData = {}) {
 	return JSON.stringify(_.merge({}, {

tests/e2e/vendor_spec.js

@@ -36,9 +36,9 @@ describe("Vendors", function () {
 				urlVendor = "http://localhost:8080/vendor/" + vendors[vendor];
 				request.get(urlVendor, function (err, res, body) {
 					if (!err)
-						expect(res.statusCode).to.equal(200);
+					{expect(res.statusCode).to.equal(200);}
 					else
-						mlog.pending(`There error vendor 200 test ${err}`);						
+					{mlog.pending(`There error vendor 200 test ${err}`);}
 				});
 			});
 		});
@@ -48,9 +48,9 @@ describe("Vendors", function () {
 				urlVendor = "http://localhost:8080/" + vendors[vendor];
 				request.get(urlVendor, function (err, res, body) {
 					if (!err)
-						expect(res.statusCode).to.equal(404);
+					{expect(res.statusCode).to.equal(404);}
 					else
-						mlog.pending(`There error vendor 404 test ${err}`);
+					{mlog.pending(`There error vendor 404 test ${err}`);}
 				});
 			});
 		});

vendor/package-lock.json

@@ -703,7 +703,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
       "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-      "optional": true,
       "requires": {
         "is-glob": "^2.0.0"
       }
@@ -717,8 +716,7 @@
     "inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-      "optional": true
     },
     "invert-kv": {
       "version": "1.0.0",
@@ -737,8 +735,7 @@
     "is-buffer": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
-      "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=",
+      "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw="
-      "optional": true
     },
     "is-dotfile": {
       "version": "1.0.3",
@@ -764,8 +761,7 @@
     "is-extglob": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
-      "optional": true
     },
     "is-fullwidth-code-point": {
       "version": "1.0.0",
@@ -779,7 +775,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
       "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-      "optional": true,
       "requires": {
         "is-extglob": "^1.0.0"
       }
@@ -808,8 +803,7 @@
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-      "optional": true
     },
     "isobject": {
       "version": "2.1.0",
@@ -824,7 +818,6 @@
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "optional": true,
       "requires": {
         "is-buffer": "^1.1.5"
       }
@@ -890,7 +883,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "optional": true,
       "requires": {
         "remove-trailing-separator": "^1.0.1"
       }
@@ -1039,14 +1031,12 @@
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
-      "optional": true
     },
     "repeat-element": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
+      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo="
-      "optional": true
     },
     "repeat-string": {
       "version": "1.6.1",
@@ -1057,8 +1047,7 @@
     "safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-      "optional": true
     },
     "set-immediate-shim": {
       "version": "1.0.1",