@syncfusion/ej2-schedule 20.2.36 → 20.2.38

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

@@ -5966,8 +5966,9 @@ class EventBase {
             }
         }
         const occurrenceCollection = [];
-        for (const date of dates) {
+        for (let date of dates) {
             const 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];
@@ -5978,6 +5979,21 @@ class EventBase {
         }
         return occurrenceCollection;
     }
+    getDSTAdjustedTime(date, event) {
+        let occurDate = date;
+        if (this.parent.timezone &&
+            (event[this.parent.eventFields.startTimezone] || event[this.parent.eventFields.endTimezone])) {
+            const eventOffset = this.getDSTDiff(event[this.parent.eventFields.startTime], new Date(date), event[this.parent.eventFields.startTimezone]);
+            const schOffset = this.getDSTDiff(event[this.parent.eventFields.startTime], new Date(date), this.parent.timezone);
+            occurDate = (new Date(date).getTime() - (eventOffset - schOffset) * 60000);
+        }
+        return occurDate;
+    }
+    getDSTDiff(startDate, occurDate, timezone) {
+        const startOffset = this.parent.tzModule.offset(new Date(startDate), timezone);
+        const occurOffset = this.parent.tzModule.offset(new Date(occurDate), timezone);
+        return startOffset - occurOffset;
+    }
     getParentEvent(eventObj, isParent = false) {
         let parentEvent;
         do {
@@ -11274,6 +11290,7 @@ class EventWindow {
     setDialogContent() {
         this.dialogObject.content = this.getEventWindowContent();
         this.dialogObject.dataBind();
+        this.applyFormValidation();
     }
     preventEventSave(e) {
         if (this.parent && !this.parent.allowKeyboardInteraction && e.code === 'Enter') {
@@ -25144,7 +25161,7 @@ class ICalendarExport {
         const timeZone = this.parent.timezone || this.parent.tzModule.getLocalTimezoneName();
         const fields = this.parent.eventFields;
         eventsData.forEach((eventObj) => {
-            let uId = this.parent.eventBase.generateGuid();
+            let uId = eventObj[fields.id] || eventObj.Guid || this.parent.eventBase.generateGuid();
             const editedExDate = [];
             if (eventObj[fields.recurrenceID]) {
                 const filter = this.filterEvents(filterCollection, fields.id, eventObj[fields.recurrenceID]);
@@ -25343,8 +25360,16 @@ class ICalendarImport {
                             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;
@@ -25380,6 +25405,10 @@ class ICalendarImport {
         const appoint = [];
         const uId = 'UID';
         const fields = this.parent.eventFields;
+        let appointmentIds = [];
+        this.parent.eventsData.forEach((eventObj) => {
+            appointmentIds.push(eventObj[fields.id]);
+        });
         app.forEach((eventObj) => {
             let parentObj;
             let id;
@@ -25388,24 +25417,26 @@ class ICalendarImport {
                 parentObj = eventObj;
                 id = eventObj[fields.id];
             }
-            const data = app.filter((data) => data.UID === eventObj[uId]);
-            if (data.length > 1 && isNullOrUndefined(eventObj[fields.recurrenceID])) {
-                for (let i = 0; i < data.length; i++) {
-                    // eslint-disable-next-line no-prototype-builtins
-                    if (data[i].hasOwnProperty(fields.recurrenceID)) {
-                        const 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) {
+                const data = app.filter((data) => data.UID === eventObj[uId]);
+                if (data.length > 1 && isNullOrUndefined(eventObj[fields.recurrenceID])) {
+                    for (let i = 0; i < data.length; i++) {
+                        // eslint-disable-next-line no-prototype-builtins
+                        if (data[i].hasOwnProperty(fields.recurrenceID)) {
+                            const 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;