@syncfusion/ej2-schedule 32.1.19 → 32.1.20

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

@@ -16844,14 +16844,16 @@ class ResourceBase {
                         resourceId: levelId,
                         resourceName: treeLevel.resourceData[resource.textField],
                         resource: treeLevel.resource,
-                        resourceData: treeLevel.resourceData
+                        resourceData: treeLevel.resourceData,
+                        date: this.parent.selectedDate
                     };
                 }
                 else {
                     resObj = {
                         type: 'resourceHeader', resource: treeLevel.resource,
                         resourceData: treeLevel.resourceData, groupIndex: groupIndex,
-                        groupOrder: treeLevel.groupOrder
+                        groupOrder: treeLevel.groupOrder,
+                        date: this.parent.selectedDate
                     };
                     resTreeColl.push(resObj);
                     groupIndex++;
@@ -17155,6 +17157,11 @@ class ResourceBase {
         }
         this.lastResourceLevel = headerLevels.slice(-1)[0] || [];
         if (!this.parent.activeViewOptions.group.byDate) {
+            for (let levelIndex = 0; levelIndex < headerLevels.length; levelIndex++) {
+                for (const levelItem of headerLevels[parseInt(levelIndex.toString(), 10)]) {
+                    levelItem.date = this.parent.selectedDate;
+                }
+            }
             let index = 0;
             for (const lastLevelResource of this.lastResourceLevel) {
                 for (let i = 0; i < lastLevelResource.colSpan; i++) {
@@ -17247,6 +17254,9 @@ class ResourceBase {
             datesColumn.push(headerDate);
             const resGroup = extend([], levels, null, true);
             for (let k = 0, length = resGroup.length; k < length; k++) {
+                for (const resTd of resGroup[parseInt(k.toString(), 10)]) {
+                    resTd.date = headerDate.date;
+                }
                 if (k === resGroup.length - 1) {
                     for (const resTd of resGroup[parseInt(k.toString(), 10)]) {
                         resTd.date = headerDate.date;
@@ -20932,7 +20942,7 @@ class ActionBase {
         const startHour = this.parent.activeView.getStartHour();
         const intervalInMS = MS_PER_MINUTE * this.actionObj.interval;
         dateInMS += (startHour.getHours() * 60 + startHour.getMinutes()) * MS_PER_MINUTE + startHour.getSeconds() * 1000;
-        dateInMS = dateInMS + Math.floor((date.getTime() - dateInMS) / intervalInMS) * intervalInMS;
+        dateInMS = dateInMS + ((date.getTime() - dateInMS) / intervalInMS) * intervalInMS;
         return new Date(dateInMS);
     }
     getContentAreaDimension() {
@@ -21687,7 +21697,7 @@ class Resize extends ActionBase {
                     const offsetWidth = (Math.round(offset / this.actionObj.cellWidth) *
                         this.actionObj.cellWidth) + (isLeft ? 0 : (this.parent.getElementWidth(this.actionObj.clone) -
                         this.actionObj.cellWidth));
-                    cellIndex = Math.floor(offsetWidth / this.actionObj.cellWidth);
+                    cellIndex = Math.ceil(offsetWidth / this.actionObj.cellWidth);
                 }
                 isLastCell = cellIndex === tdCollections.length;
                 cellIndex = this.getIndex(cellIndex);
@@ -21705,13 +21715,29 @@ class Resize extends ActionBase {
             }
             else {
                 if (!isLeft) {
-                    offset += this.parent.getElementWidth(this.actionObj.clone);
-                }
-                let spanMinutes = Math.floor((this.actionObj.slotInterval / this.actionObj.cellWidth) *
+                    let cloneWidth = this.parent.getElementWidth(this.actionObj.clone);
+                    const pixelsPerInterval = this.actionObj.cellWidth /
+                        (this.actionObj.slotInterval / this.actionObj.interval);
+                    const numIntervals = Math.round(cloneWidth / pixelsPerInterval);
+                    cloneWidth = numIntervals * pixelsPerInterval;
+                    offset = offset + cloneWidth;
+                }
+                let spanMinutes = Math.ceil((this.actionObj.slotInterval / this.actionObj.cellWidth) *
                     (offset - Math.floor(offset / this.actionObj.cellWidth) * this.actionObj.cellWidth));
                 spanMinutes = (isLastCell || (!isLeft && spanMinutes === 0)) ? this.actionObj.slotInterval : spanMinutes;
                 resizeTime = new Date(resizeDate.getTime());
                 resizeTime = new Date(resizeDate.getTime() + (spanMinutes * MS_PER_MINUTE));
+                const isCustomResizeInterval = this.actionObj.interval !== this.actionObj.slotInterval;
+                const initialCellTime = new Date(resizeTime.getTime());
+                const intervalInMS = this.actionObj.interval * 60000;
+                if (intervalInMS > 0 && isCustomResizeInterval) {
+                    if (this.resizeEdges.right || this.resizeEdges.left) {
+                        const eventTime = this.resizeEdges.right ? eventEnd : eventStart;
+                        const timeDifferenceMs = initialCellTime.getTime() - eventTime.getTime();
+                        const intervalCount = Math.round(timeDifferenceMs / intervalInMS);
+                        resizeTime = new Date(eventTime.getTime() + intervalCount * intervalInMS);
+                    }
+                }
                 this.updateTimePosition(resizeTime);
             }
         }
@@ -24042,14 +24068,18 @@ class ViewBase {
         }
     }
     getHeaderBarHeight() {
-        let headerBarHeight = 2;
+        const computedStyle = getComputedStyle(this.parent.element);
+        const borderTop = parseFloat(computedStyle.borderTopWidth) || 1;
+        const borderBottom = parseFloat(computedStyle.borderBottomWidth) || 1;
+        const border = Math.round(borderTop + borderBottom);
+        let headerBarHeight = border;
         if (this.parent.headerModule) {
             headerBarHeight += getOuterHeight(this.parent.headerModule.getHeaderElement());
         }
         if (this.parent.uiStateValues.isGroupAdaptive) {
             const resHeader = this.parent.element.querySelector('.' + RESOURCE_HEADER_TOOLBAR);
             if (resHeader) {
-                headerBarHeight += resHeader.offsetHeight;
+                headerBarHeight += getOuterHeight(resHeader);
             }
         }
         return headerBarHeight;
@@ -24332,7 +24362,7 @@ class ViewBase {
     }
     setResourceHeaderContent(tdElement, tdData, className = TEXT_ELLIPSIS) {
         if (this.parent.activeViewOptions.resourceHeaderTemplate) {
-            const data = { resource: tdData.resource, resourceData: tdData.resourceData };
+            const data = { resource: tdData.resource, resourceData: tdData.resourceData, date: tdData.date };
             const scheduleId = this.parent.element.id + '_';
             const viewName = this.parent.activeViewOptions.resourceHeaderTemplateName;
             const templateId = scheduleId + viewName + 'resourceHeaderTemplate';
@@ -26829,7 +26859,7 @@ class AgendaBase extends ViewBase {
                                         groupOrder: resData[parseInt(res.toString(), 10)].groupOrder.slice(0, -1),
                                         resourceData: resData[parseInt(res.toString(), 10)].resourceData,
                                         groupIndex: (lastLevelInfo.length - data.length), className: [RESOURCE_NAME],
-                                        date: agendaDate
+                                        date: this.parent.activeViewOptions.group.byDate ? firstDate : agendaDate
                                     };
                                     lastLevelInfo[parseInt((lastLevelInfo.length - data.length).toString(), 10)].push(tempObj);
                                     tempLastLevelInfo.push(extend({}, tempObj, null, true));
@@ -26857,7 +26887,8 @@ class AgendaBase extends ViewBase {
                                 tempGroupedData[0].type = 'parentColumnLevel_' + (y + 1);
                                 tempGroupedData[0].resource = topResources[topResources.length - (y + 1)];
                                 tempGroupedData[0].resourceData = data[parseInt(x.toString(), 10)];
-                                tempGroupedData[0].date = agendaDate;
+                                tempGroupedData[0].date = this.parent.activeViewOptions.group.byDate ?
+                                    tempLastLevelInfo[parseInt(u.toString(), 10)].date : agendaDate;
                                 lastLevelInfo[tempGroupedData[0].groupIndex].push(tempGroupedData[0]);
                                 tempGroupedData = [];
                                 totalRowSpan = 0;