@syncfusion/ej2-schedule 20.2.36 → 20.2.38

package/dist/es6/ej2-schedule.es5.js

@@ -6047,6 +6047,7 @@ var EventBase = /** @__PURE__ @class */ (function () {
         for (var _i = 0, dates_1 = dates; _i < dates_1.length; _i++) {
             var date = dates_1[_i];
             var clonedObject = extend({}, event, null, true);
+            date = this.getDSTAdjustedTime(date, clonedObject);
             clonedObject[this.parent.eventFields.startTime] = new Date(date);
             clonedObject[this.parent.eventFields.endTime] = new Date(new Date(date).setMilliseconds(duration));
             clonedObject[this.parent.eventFields.recurrenceID] = clonedObject[this.parent.eventFields.id];
@@ -6057,6 +6058,21 @@ var EventBase = /** @__PURE__ @class */ (function () {
         }
         return occurrenceCollection;
     };
+    EventBase.prototype.getDSTAdjustedTime = function (date, event) {
+        var occurDate = date;
+        if (this.parent.timezone &&
+            (event[this.parent.eventFields.startTimezone] || event[this.parent.eventFields.endTimezone])) {
+            var eventOffset = this.getDSTDiff(event[this.parent.eventFields.startTime], new Date(date), event[this.parent.eventFields.startTimezone]);
+            var schOffset = this.getDSTDiff(event[this.parent.eventFields.startTime], new Date(date), this.parent.timezone);
+            occurDate = (new Date(date).getTime() - (eventOffset - schOffset) * 60000);
+        }
+        return occurDate;
+    };
+    EventBase.prototype.getDSTDiff = function (startDate, occurDate, timezone) {
+        var startOffset = this.parent.tzModule.offset(new Date(startDate), timezone);
+        var occurOffset = this.parent.tzModule.offset(new Date(occurDate), timezone);
+        return startOffset - occurOffset;
+    };
     EventBase.prototype.getParentEvent = function (eventObj, isParent) {
         if (isParent === void 0) { isParent = false; }
         var parentEvent;
@@ -11537,6 +11553,7 @@ var EventWindow = /** @__PURE__ @class */ (function () {
     EventWindow.prototype.setDialogContent = function () {
         this.dialogObject.content = this.getEventWindowContent();
         this.dialogObject.dataBind();
+        this.applyFormValidation();
     };
     EventWindow.prototype.preventEventSave = function (e) {
         if (this.parent && !this.parent.allowKeyboardInteraction && e.code === 'Enter') {
@@ -26120,7 +26137,7 @@ var ICalendarExport = /** @__PURE__ @class */ (function () {
         var timeZone = this.parent.timezone || this.parent.tzModule.getLocalTimezoneName();
         var fields = this.parent.eventFields;
         eventsData.forEach(function (eventObj) {
-            var uId = _this.parent.eventBase.generateGuid();
+            var uId = eventObj[fields.id] || eventObj.Guid || _this.parent.eventBase.generateGuid();
             var editedExDate = [];
             if (eventObj[fields.recurrenceID]) {
                 var filter = _this.filterEvents(filterCollection, fields.id, eventObj[fields.recurrenceID]);
@@ -26324,8 +26341,16 @@ var ICalendarImport = /** @__PURE__ @class */ (function () {
                             break;
                         case 'UID':
                             curEvent[uId] = value;
-                            curEvent[fields.id] = typeof (id) === 'string' ? id + count.toString() : id + count;
-                            count++;
+                            if (typeof (id) == 'number') {
+                                curEvent[fields.id] = parseInt(value, 10);
+                                if (isNaN(curEvent[fields.id])) {
+                                    curEvent[fields.id] = id + count;
+                                    count++;
+                                }
+                            }
+                            else {
+                                curEvent[fields.id] = value;
+                            }
                             break;
                         case 'SUMMARY':
                             curEvent[fields.subject] = value;
@@ -26361,6 +26386,10 @@ var ICalendarImport = /** @__PURE__ @class */ (function () {
         var appoint = [];
         var uId = 'UID';
         var fields = this.parent.eventFields;
+        var appointmentIds = [];
+        this.parent.eventsData.forEach(function (eventObj) {
+            appointmentIds.push(eventObj[fields.id]);
+        });
         app.forEach(function (eventObj) {
             var parentObj;
             var id;
@@ -26369,24 +26398,26 @@ var ICalendarImport = /** @__PURE__ @class */ (function () {
                 parentObj = eventObj;
                 id = eventObj[fields.id];
             }
-            var data = app.filter(function (data) { return data.UID === eventObj[uId]; });
-            if (data.length > 1 && isNullOrUndefined(eventObj[fields.recurrenceID])) {
-                for (var i = 0; i < data.length; i++) {
-                    // eslint-disable-next-line no-prototype-builtins
-                    if (data[i].hasOwnProperty(fields.recurrenceID)) {
-                        var exdate = data[i][fields.recurrenceID];
-                        data[i][fields.recurrenceID] = id;
-                        data[i][fields.recurrenceException] = null;
-                        parentObj[fields.recurrenceException] = (isNullOrUndefined(parentObj[fields.recurrenceException])) ?
-                            exdate : parentObj[fields.recurrenceException] + ',' + exdate;
-                        appoint.push(data[i]);
+            if (appointmentIds.indexOf(eventObj[fields.id]) < 0) {
+                var data = app.filter(function (data) { return data.UID === eventObj[uId]; });
+                if (data.length > 1 && isNullOrUndefined(eventObj[fields.recurrenceID])) {
+                    for (var i = 0; i < data.length; i++) {
+                        // eslint-disable-next-line no-prototype-builtins
+                        if (data[i].hasOwnProperty(fields.recurrenceID)) {
+                            var exdate = data[i][fields.recurrenceID];
+                            data[i][fields.recurrenceID] = id;
+                            data[i][fields.recurrenceException] = null;
+                            parentObj[fields.recurrenceException] = (isNullOrUndefined(parentObj[fields.recurrenceException])) ?
+                                exdate : parentObj[fields.recurrenceException] + ',' + exdate;
+                            appoint.push(data[i]);
+                        }
                     }
+                    appoint.push(parentObj);
+                    // eslint-disable-next-line no-prototype-builtins
+                }
+                else if (!eventObj.hasOwnProperty(fields.recurrenceID)) {
+                    appoint.push(eventObj);
                 }
-                appoint.push(parentObj);
-                // eslint-disable-next-line no-prototype-builtins
-            }
-            else if (!eventObj.hasOwnProperty(fields.recurrenceID)) {
-                appoint.push(eventObj);
             }
         });
         return appoint;