@syncfusion/ej2-schedule 27.1.56 → 27.1.57

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

@@ -4039,7 +4039,7 @@ function generate(startDate, rule, excludeDate, startDayOfWeek, maximumCount = M
             dailyType(modifiedDate, ruleObject.until, data, ruleObject);
             break;
         case 'WEEKLY':
-            weeklyType(modifiedDate, ruleObject.until, data, ruleObject);
+            weeklyType(modifiedDate, ruleObject.until, data, ruleObject, startDayOfWeek);
             break;
         case 'MONTHLY':
             monthlyType(modifiedDate, ruleObject.until, data, ruleObject);
@@ -4142,10 +4142,11 @@ function dailyType(startDate, endDate, data, ruleObject) {
  * @param {Date} endDate Accepts the end date
  * @param {number[]} data Accepts the collection of dates
  * @param {RecRule} ruleObject Accepts the recurrence rule object
+ * @param {number} startDayOfWeek Accepts the start day index of week
  * @returns {void}
  * @private
  */
-function weeklyType(startDate, endDate, data, ruleObject) {
+function weeklyType(startDate, endDate, data, ruleObject, startDayOfWeek) {
     let tempDate = new Date(startDate.getTime());
     if (!ruleObject.day.length) {
         ruleObject.day.push(DAYINDEX[startDate.getDay()]);
@@ -4194,7 +4195,7 @@ function weeklyType(startDate, endDate, data, ruleObject) {
     }
     else {
         tempDate = getStartDateForWeek(startDate, ruleObject.day);
-        if (interval > 1 && dayIndex.indexOf(ruleObject.day[0]) < startDate.getDay()) {
+        if (interval > 1 && dayIndex.indexOf(ruleObject.day[0]) < (startDate.getDay() - startDayOfWeek)) {
             tempDate.setDate(tempDate.getDate() + ((interval - 1) * 7));
         }
         while (compareDates(tempDate, endDate)) {
@@ -6064,11 +6065,14 @@ class EventBase {
         if (eventsData.length > 0) {
             const selectedObject = eventsData[eventsData.length - 1];
             const eventStartTime = selectedObject[this.parent.eventFields.startTime];
-            let nearestTime = new Date(+eventStartTime).setMinutes(0, 0, 0);
+            let nearestTime;
             const isAllDay = this.isAllDayAppointment(selectedObject);
-            if (this.parent.currentView === 'Month' || isAllDay) {
+            if (this.parent.currentView === 'Month' || isAllDay || !this.parent.activeViewOptions.timeScale.enable) {
                 nearestTime = new Date(+eventStartTime).setHours(0, 0, 0, 0);
             }
+            else {
+                nearestTime = this.findNearestSlot(eventStartTime);
+            }
             let targetArea;
             if (isAllDay && ['Day', 'Week', 'WorkWeek'].indexOf(this.parent.currentView) !== -1) {
                 targetArea = this.parent.getAllDayRow();
@@ -6077,7 +6081,8 @@ class EventBase {
                 targetArea = this.parent.getContentTable();
             }
             let queryString = '[data-date="' + new Date(nearestTime).getTime() + '"]';
-            if (this.parent.activeViewOptions.group.resources.length > 0) {
+            if (!isNullOrUndefined(this.parent.activeViewOptions.group.resources) &&
+                this.parent.activeViewOptions.group.resources.length > 0) {
                 queryString += '[data-group-index="' + this.getGroupIndexFromEvent(selectedObject) + '"]';
             }
             target = targetArea.querySelector(queryString);
@@ -6091,6 +6096,25 @@ class EventBase {
         }
         return target;
     }
+    findNearestSlot(appointmentTime) {
+        const msMajorInterval = this.parent.activeViewOptions.timeScale.interval * MS_PER_MINUTE;
+        const msInterval = msMajorInterval / this.parent.activeViewOptions.timeScale.slotCount;
+        const numberOfSlots = Math.round(MS_PER_DAY / msInterval);
+        const startTime = new Date(appointmentTime);
+        startTime.setHours(0, 0, 0, 0);
+        const slots = Array.from({ length: numberOfSlots }, (_, i) => {
+            const slotTime = new Date(startTime.getTime() + i * msInterval);
+            return slotTime;
+        });
+        const nearestSlot = slots.reduce((nearest, slot) => {
+            const difference = Math.abs(appointmentTime.getTime() - slot.getTime());
+            if (!nearest || difference < Math.abs(appointmentTime.getTime() - nearest.getTime())) {
+                return slot;
+            }
+            return nearest;
+        }, null);
+        return Math.trunc(nearestSlot.getTime() / 1000) * 1000;
+    }
     getGroupIndexFromEvent(eventData) {
         let levelIndex;
         let resource;
@@ -6379,7 +6403,7 @@ class EventBase {
         const newTimezone = this.parent.timezone || this.parent.tzModule.getLocalTimezoneName();
         const firstDay = this.parent.activeViewOptions.firstDayOfWeek;
         const calendarMode = this.parent.calendarMode;
-        if (event[this.parent.eventFields.recurrenceRule] && event[this.parent.eventFields.recurrenceRule].includes('BYMONTHDAY') &&
+        if (event[this.parent.eventFields.recurrenceRule] && this.isDayBasedRecurrence(event) &&
             this.parent.timezone && event[this.parent.eventFields.startTimezone] && event[this.parent.eventFields.endTimezone]) {
             startDate = this.parent.tzModule.convert(event[this.parent.eventFields.startTime], this.parent.timezone, event[this.parent.eventFields.startTimezone]);
         }
@@ -6399,7 +6423,7 @@ class EventBase {
         }
         let isDSTAdjusted = false;
         let convertedDates = [];
-        if (event[this.parent.eventFields.recurrenceRule] && event[this.parent.eventFields.recurrenceRule].includes('BYMONTHDAY') &&
+        if (event[this.parent.eventFields.recurrenceRule] && this.isDayBasedRecurrence(event) &&
             this.parent.timezone && event[this.parent.eventFields.startTimezone] && event[this.parent.eventFields.endTimezone]) {
             isDSTAdjusted = true;
             convertedDates.push(...dates.map((date) => this.parent.tzModule.convert(new Date(date), event[this.parent.eventFields.startTimezone], this.parent.timezone).getTime()));
@@ -6419,6 +6443,10 @@ class EventBase {
         }
         return occurrenceCollection;
     }
+    isDayBasedRecurrence(event) {
+        return (event[this.parent.eventFields.recurrenceRule].includes('BYMONTHDAY')
+            || event[this.parent.eventFields.recurrenceRule].includes('BYDAY'));
+    }
     getDSTAdjustedTime(date, event) {
         let occurDate = date;
         if (this.parent.timezone &&