@syncfusion/ej2-schedule 27.1.52 → 27.1.55

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

@@ -7469,8 +7469,27 @@ class VerticalEvent extends EventBase {
             if (this.parent.activeViewOptions.group.resources.length > 0) {
                 this.overlapList = this.filterEventsByResource(this.resources[parseInt(resource.toString(), 10)], this.overlapList);
             }
+            const queue = [];
             this.overlapList.forEach((obj) => {
-                let filterList = appointmentList.filter((data) => data[fieldMapping.endTime] > obj[fieldMapping.startTime] && data[fieldMapping.startTime] <= obj[fieldMapping.endTime]);
+                queue.push(obj);
+                let filterList = [];
+                const processedIds = new Set();
+                while (queue.length > 0) {
+                    const currentObj = queue.shift();
+                    const overlaps = appointmentList.filter((data) => {
+                        return data[fieldMapping.endTime] > currentObj[fieldMapping.startTime] &&
+                            data[fieldMapping.startTime] <= currentObj[fieldMapping.endTime] &&
+                            !processedIds.has(data[fieldMapping.id]);
+                    });
+                    overlaps.forEach((overlap) => {
+                        filterList.push(overlap);
+                        processedIds.add(overlap[fieldMapping.id]);
+                        queue.push(overlap);
+                    });
+                    if (processedIds.size < appointmentList.length - 1) {
+                        break;
+                    }
+                }
                 if (this.parent.activeViewOptions.group.resources.length > 0) {
                     filterList = this.filterEventsByResource(this.resources[parseInt(resource.toString(), 10)], filterList);
                 }
@@ -8270,7 +8289,7 @@ class MonthEvent extends EventBase {
     renderEventElement(event, appointmentElement, cellTd) {
         const eventType = appointmentElement.classList.contains(BLOCK_APPOINTMENT_CLASS) ? 'blockEvent' : 'event';
         const isAppointment = appointmentElement.classList.contains(APPOINTMENT_CLASS);
-        const eventObj = this.getEventData(event);
+        const eventObj = this.parent.currentView === 'Month' ? this.getSpannedTime(event) : this.getEventData(event);
         const args = { data: eventObj, element: appointmentElement, cancel: false, type: eventType };
         this.parent.trigger(eventRendered, args, (eventArgs) => {
             if (eventArgs.cancel) {
@@ -8281,6 +8300,16 @@ class MonthEvent extends EventBase {
             }
         });
     }
+    getSpannedTime(event) {
+        const eventObj = extend({}, event, null, true);
+        if ((eventObj[this.fields.startTime]).getDate() === (eventObj.data[this.fields.startTime]).getDate()) {
+            eventObj[this.fields.startTime] = eventObj.data[this.fields.startTime];
+        }
+        if ((eventObj[this.fields.endTime]).getDate() === (eventObj.data[this.fields.endTime]).getDate()) {
+            eventObj[this.fields.endTime] = eventObj.data[this.fields.endTime];
+        }
+        return eventObj;
+    }
     getEventData(event) {
         const eventObj = extend({}, event, null, true);
         eventObj[this.fields.startTime] = event.data[this.fields.startTime];
@@ -8779,13 +8808,8 @@ class TimelineEvent extends MonthEvent {
         }
     }
     getSameDayEventsWidth(startDate, endDate) {
-        let intervalMins = this.interval;
-        if (this.slotsPerDay === 1) {
-            const hoursRange = getStartEndHours(resetTime(new Date(startDate.getTime())), this.startHour, this.endHour);
-            intervalMins = (hoursRange.endHour.getTime() - hoursRange.startHour.getTime()) / MS_PER_MINUTE;
-        }
         return ((getUniversalTime(endDate) - getUniversalTime(startDate)) /
-            MS_PER_MINUTE * (this.cellWidth * this.slotCount) / intervalMins);
+            MS_PER_MINUTE * (this.cellWidth * this.slotCount) / this.getIntervalInMinutes(startDate));
     }
     getSpannedEventsWidth(startDate, endDate, diffInDays) {
         const width = (diffInDays * this.slotsPerDay) * this.cellWidth;
@@ -8811,13 +8835,13 @@ class TimelineEvent extends MonthEvent {
     getAppointmentLeft(schedule, startTime, day) {
         const slotTd = (this.isSameDay(startTime, schedule.startHour)) ?
             ((getUniversalTime(startTime) - getUniversalTime(schedule.startHour)) /
-                (MS_PER_MINUTE * this.interval)) * this.slotCount : 0;
+                (MS_PER_MINUTE * this.getIntervalInMinutes(startTime))) * this.slotCount : 0;
         if (day === 0) {
             return slotTd;
         }
         else {
             const daySlot = Math.round((((getUniversalTime(schedule.endHour) - getUniversalTime(schedule.startHour)) /
-                MS_PER_MINUTE) / this.interval) * this.slotCount);
+                MS_PER_MINUTE) / this.getIntervalInMinutes(startTime)) * this.slotCount);
             return (daySlot * day) + slotTd;
         }
     }
@@ -8850,6 +8874,13 @@ class TimelineEvent extends MonthEvent {
             return this.getFilteredEvents(startTime, endTime, gIndex, eventsList);
         }
     }
+    getIntervalInMinutes(startDate) {
+        if (this.slotsPerDay !== 1) {
+            return this.interval;
+        }
+        const hoursRange = getStartEndHours(resetTime(new Date(startDate.getTime())), this.startHour, this.endHour);
+        return (hoursRange.endHour.getTime() - hoursRange.startHour.getTime()) / MS_PER_MINUTE;
+    }
     isAlreadyAvail(appPos, cellTd) {
         const moreIndicator = [].slice.call(cellTd.querySelectorAll('.' + MORE_INDICATOR_CLASS));
         for (let i = 0; i < moreIndicator.length; i++) {
@@ -12937,6 +12968,9 @@ class EventWindow {
             else if (element.classList.contains('e-checkbox')) {
                 fieldSelector = 'e-checkbox';
             }
+            else if (element.classList.contains('e-numerictextbox')) {
+                fieldSelector = 'e-numerictextbox';
+            }
             const classSelector = isDropDowns ? `.${fieldSelector}:not(.e-control)` : `.${fieldSelector}`;
             const control = closest(element, classSelector) || element.querySelector(`.${fieldSelector}`);
             if (control) {
@@ -13667,6 +13701,9 @@ class EventWindow {
         else if (element.classList.contains('e-checkbox')) {
             value = element.ej2_instances[0].checked;
         }
+        else if (element.classList.contains('e-numerictextbox')) {
+            value = element.ej2_instances[0].value;
+        }
         else {
             if (element.type === 'checkbox') {
                 value = element.checked;
@@ -13711,6 +13748,11 @@ class EventWindow {
             instance.checked = value;
             instance.dataBind();
         }
+        else if (element.classList.contains('e-numerictextbox')) {
+            const instance = element.ej2_instances[0];
+            instance.value = value;
+            instance.dataBind();
+        }
         else {
             if (element.type !== 'checkbox') {
                 element.value = value || '';
@@ -13748,6 +13790,11 @@ class EventWindow {
             instance.checked = false;
             instance.dataBind();
         }
+        else if (element.classList.contains('e-numerictextbox')) {
+            const instance = element.ej2_instances[0];
+            instance.value = null;
+            instance.dataBind();
+        }
         else {
             if (element.type === 'checkbox') {
                 element.checked = false;
@@ -18764,8 +18811,9 @@ let Schedule = class Schedule extends Component {
         const msMajorInterval = this.activeViewOptions.timeScale.interval * MS_PER_MINUTE;
         const msInterval = msMajorInterval / this.activeViewOptions.timeScale.slotCount;
         const offsetDiff = ((viewStartHour.getTimezoneOffset() - startHour.getTimezoneOffset()) * MS_PER_MINUTE);
+        const endOffsetDiff = Math.abs((viewStartHour.getTimezoneOffset() - endHour.getTimezoneOffset()) * MS_PER_MINUTE);
         let startIndex = Math.round((startHour.getTime() - viewStartHour.getTime() + offsetDiff) / msInterval);
-        let endIndex = Math.ceil((endHour.getTime() - viewStartHour.getTime() + offsetDiff) / msInterval);
+        let endIndex = Math.ceil((endHour.getTime() - viewStartHour.getTime() - endOffsetDiff) / msInterval);
         const tempStartIndex = startIndex;
         const tempEndIndex = endIndex;
         const cells = [];
@@ -20708,11 +20756,8 @@ class Resize extends ActionBase {
         const eventStart = new Date(this.actionObj.event[this.parent.eventFields.startTime].getTime());
         const eventEnd = new Date(this.actionObj.event[this.parent.eventFields.endTime].getTime());
         let resizeTime;
-        let isDateHeader = false;
         let headerName = this.parent.currentView;
-        const isTimeViews = ['TimelineDay', 'TimelineWeek', 'TimelineWorkWeek'].indexOf(this.parent.currentView) > -1;
         const isTimelineMonth = this.parent.currentView === 'TimelineMonth';
-        const isWithoutScale = isTimelineMonth || isTimeViews && !this.parent.activeViewOptions.timeScale.enable;
         if (this.parent.activeView.isTimelineView()) {
             const tr = this.parent.getContentTable().querySelector('tr');
             if (this.parent.activeViewOptions.headerRows.length > 0) {
@@ -20744,7 +20789,6 @@ class Resize extends ActionBase {
                 }
                 cellIndex = !isTimelineMonth ? Math.round(offsetValue / (this.parent.getElementWidth(tr) / noOfDays)) :
                     Math.floor(offsetValue / Math.floor(this.parent.getElementWidth(tr) / noOfDays));
-                isDateHeader = isTimeViews && headerName === 'Date';
                 cellIndex = isLeft ? cellIndex : isTimelineMonth ? cellIndex + 1 : cellIndex;
                 isLastCell = cellIndex === tdCollections.length;
                 cellIndex = (cellIndex < 0) ? 0 : (cellIndex >= noOfDays) ? noOfDays - 1 : cellIndex;
@@ -20810,15 +20854,14 @@ class Resize extends ActionBase {
             !this.parent.activeViewOptions.timeScale.enable;
         if (isLeft) {
             if ((eventEnd.getTime() - resizeTime.getTime()) <= 0) {
-                resizeTime = isWithoutScale ? resetTime(eventEnd) : eventStart;
+                resizeTime = isNotHourSlot ? resetTime(eventEnd) : eventStart;
             }
             this.actionObj.start = !isNotHourSlot ? this.calculateIntervalTime(resizeTime) : resizeTime;
         }
         else {
-            const isTimeScaleViews = isTimeViews && this.parent.activeViewOptions.timeScale.enable;
-            let resizeEnd = ((!isTimeScaleViews || isDateHeader || isTimeViews && ['Week', 'Month', 'Year'].indexOf(headerName) > -1)
-                && resizeTime.getHours() === 0 && resizeTime.getMinutes() === 0) ? addDays(resizeTime, 1) : resizeTime;
-            if (isWithoutScale && (resizeEnd.getTime() - eventStart.getTime()) <= 0) {
+            let resizeEnd = (isNotHourSlot && resizeTime.getHours() === 0 && resizeTime.getMinutes() === 0) ?
+                addDays(resizeTime, 1) : resizeTime;
+            if (isNotHourSlot && (resizeEnd.getTime() - eventStart.getTime()) <= 0) {
                 resizeEnd = addDays(resetTime(eventStart), 1);
             }
             this.actionObj.end = !isNotHourSlot ? this.calculateIntervalTime(resizeEnd) : resizeEnd;