@syncfusion/ej2-schedule 20.3.58 → 20.4.38

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

@@ -356,8 +356,6 @@ function getDateFromString(date) {
     return date.indexOf('Date') !== -1 ? new Date(parseInt(date.match(/\d+/g).toString(), 10)) :
         date.indexOf('T') !== -1 ? new Date(date) : new Date(date.replace(/-/g, '/'));
 }
-/** @private */
-var scrollWidth = null;
 /**
  * Method to get scrollbar width
  *
@@ -373,7 +371,7 @@ function getScrollBarWidth() {
         Math.ceil(devicePixelRatio % 1) : Math.floor(devicePixelRatio % 1) : 0;
     value = (divNode.offsetWidth - divNode.clientWidth - ratio) | 0;
     document.body.removeChild(divNode);
-    return scrollWidth = value;
+    return value;
 }
 /**
  * Method to find the index from data collection
@@ -388,12 +386,12 @@ function getScrollBarWidth() {
 // eslint-disable-next-line max-len
 function findIndexInData(data, field, value, event, resourceCollection) {
     for (var i = 0, length_1 = data.length; i < length_1; i++) {
-        if (data[i][field] === value) {
+        if (data[parseInt(i.toString(), 10)]["" + field] === value) {
             if (event) {
                 var field_1 = resourceCollection.slice(-2)[0].field;
-                var res = (event[field_1] instanceof Array ? event[field_1] : [event[field_1]]);
+                var res = (event["" + field_1] instanceof Array ? event["" + field_1] : [event["" + field_1]]);
                 var resData = res.join(',');
-                if (resData.includes(data[i][resourceCollection.slice(-1)[0].groupIDField])) {
+                if (resData.includes(data[parseInt(i.toString(), 10)][resourceCollection.slice(-1)[0].groupIDField])) {
                     return i;
                 }
             }
@@ -1101,13 +1099,29 @@ var HeaderRenderer = /** @__PURE__ @class */ (function () {
             addClass([selEle[this.parent.viewIndex]], ['e-active-view']);
         }
     };
-    HeaderRenderer.prototype.updateDateRange = function (text) {
+    HeaderRenderer.prototype.updateDateRange = function (date) {
         var selEle = this.toolbarObj.element.querySelector('.e-date-range');
-        if (selEle) {
+        if (!selEle) {
+            return;
+        }
+        var textEle = selEle.querySelector('.e-tbar-btn-text');
+        if (this.parent.activeViewOptions.dateRangeTemplate) {
+            textEle.textContent = '';
+            var args = {
+                startDate: this.parent.activeView.getStartDate(),
+                endDate: this.parent.activeView.getEndDate(), currentView: this.parent.currentView
+            };
+            var viewName = this.parent.activeViewOptions.dateRangeTemplateName;
+            var templateId = this.parent.element.id + '_' + viewName + 'dateRangeTemplate';
+            var dateTemplate = [].slice.call(this.parent.getDateRangeTemplate()(args, this.parent, 'dateRangeTemplate', templateId, false));
+            append(dateTemplate, textEle);
+        }
+        else {
+            var text = this.parent.activeView.getDateRangeText(date);
             selEle.setAttribute('aria-label', text);
-            selEle.querySelector('.e-tbar-btn-text').innerHTML = text;
-            this.refresh();
+            textEle.textContent = text;
         }
+        this.refresh();
     };
     HeaderRenderer.prototype.refresh = function () {
         if (this.toolbarObj) {
@@ -1610,8 +1624,9 @@ var ScheduleTouch = /** @__PURE__ @class */ (function () {
     }
     ScheduleTouch.prototype.scrollHandler = function (e) {
         if (this.parent.currentView === 'Agenda' || this.parent.uiStateValues.action || !this.parent.allowSwiping ||
-            (e.originalEvent && e.originalEvent.target && (e.originalEvent.target.classList.contains(APPOINTMENT_CLASS) ||
-                closest(e.originalEvent.target, '.' + APPOINTMENT_CLASS)) && !this.parent.isAdaptive)) {
+            (e.originalEvent && e.originalEvent.target &&
+                (e.originalEvent.target.classList.contains(APPOINTMENT_CLASS) ||
+                    closest(e.originalEvent.target, '.' + APPOINTMENT_CLASS)) && !this.parent.isAdaptive)) {
             return;
         }
         if (!this.timeStampStart) {
@@ -1763,7 +1778,7 @@ var ScheduleTouch = /** @__PURE__ @class */ (function () {
                 addClass([_this.element], TRANSLATE_CLASS);
                 _this.element.style.transform = 'translatex(' + translateX + 'px)';
                 if (_this.parent.headerModule) {
-                    _this.parent.headerModule.updateDateRange(_this.parent.activeView.getDateRangeText());
+                    _this.parent.headerModule.updateDateRange();
                 }
                 _this.parent.renderTemplates();
                 _this.parent.crudModule.refreshDataManager();
@@ -2342,7 +2357,7 @@ var KeyboardInteraction = /** @__PURE__ @class */ (function () {
         var appointmentElements = [];
         appointments.map(function (value) { return value.getAttribute('data-guid'); }).filter(function (value, index, self) {
             if (self.indexOf(value) === index) {
-                appointmentElements.push(appointments[index]);
+                appointmentElements.push(appointments[parseInt(index.toString(), 10)]);
             }
         });
         return appointmentElements;
@@ -2354,7 +2369,7 @@ var KeyboardInteraction = /** @__PURE__ @class */ (function () {
     KeyboardInteraction.prototype.processViewNavigation = function (e) {
         var index = parseInt(e.key, 10) - 1;
         if (index < this.parent.views.length) {
-            var view = this.parent.viewCollections[index].option;
+            var view = this.parent.viewCollections[parseInt(index.toString(), 10)].option;
             this.parent.changeView(view, e, undefined, index);
             if (this.parent.headerModule) {
                 this.parent.headerModule.element.querySelector('.e-active-view button').focus();
@@ -2467,10 +2482,11 @@ var KeyboardInteraction = /** @__PURE__ @class */ (function () {
         }
     };
     KeyboardInteraction.prototype.getYearUpDownCell = function (tableRows, rowIndex, cellIndex, isUp) {
-        while (tableRows[rowIndex] && tableRows[rowIndex].cells[cellIndex].classList.contains(OTHERMONTH_CLASS)) {
+        while (tableRows[parseInt(rowIndex.toString(), 10)] &&
+            tableRows[parseInt(rowIndex.toString(), 10)].cells[parseInt(cellIndex.toString(), 10)].classList.contains(OTHERMONTH_CLASS)) {
             rowIndex = rowIndex + (isUp ? -1 : 1);
         }
-        return tableRows[rowIndex].cells[cellIndex];
+        return tableRows[parseInt(rowIndex.toString(), 10)].cells[parseInt(cellIndex.toString(), 10)];
     };
     // eslint-disable-next-line max-len
     KeyboardInteraction.prototype.getHorizontalUpDownCell = function (tableRows, target, curRowIndex, isUp) {
@@ -2489,7 +2505,7 @@ var KeyboardInteraction = /** @__PURE__ @class */ (function () {
         var hasRow = isUp && curRowIndex > 0 || !isUp && curRowIndex < tableRows.length - 1;
         var targetCell = hasRow ? tableRows[curRowIndex + (isUp ? -1 : 1)].cells[target.cellIndex] : undefined;
         if (!targetCell || targetCell.classList.contains(OTHERMONTH_CLASS)) {
-            var column = tableRows[curRowIndex].cells[target.cellIndex - (isUp ? 1 : -1)];
+            var column = tableRows[parseInt(curRowIndex.toString(), 10)].cells[target.cellIndex - (isUp ? 1 : -1)];
             if (column) {
                 var dateAttr = +target.getAttribute('data-date') - (isUp ? MS_PER_DAY : -MS_PER_DAY);
                 return this.parent.getContentTable().querySelector('.' + WORK_CELLS_CLASS + '[data-date="' + dateAttr + '"]');
@@ -2505,7 +2521,7 @@ var KeyboardInteraction = /** @__PURE__ @class */ (function () {
             element: tableEle,
             rowIndex: curRowIndex,
             columnIndex: target.cellIndex,
-            maxIndex: tableEle.rows[curRowIndex].cells.length
+            maxIndex: tableEle.rows[parseInt(curRowIndex.toString(), 10)].cells.length
         };
         return key;
     };
@@ -2578,7 +2594,8 @@ var KeyboardInteraction = /** @__PURE__ @class */ (function () {
                     var rowIndex = this.isInverseTableSelect() ? key.rowIndex : 0;
                     this.parent.changeDate(this.parent.activeView.getNextPreviousDate('next'), e);
                     var tableEle = this.parent.getContentTable();
-                    var cell = isMonthEnd ? tableEle.rows[rowIndex].querySelector('.' + WORK_CELLS_CLASS + ':not(.' + OTHERMONTH_CLASS + ')') : tableEle.rows[rowIndex].cells[0];
+                    var cell = isMonthEnd ? tableEle.rows[parseInt(rowIndex.toString(), 10)].querySelector('.' + WORK_CELLS_CLASS + ':not(.' + OTHERMONTH_CLASS + ')')
+                        : tableEle.rows[parseInt(rowIndex.toString(), 10)].cells[0];
                     this.selectCells(false, cell);
                 }
             }
@@ -2648,7 +2665,7 @@ var KeyboardInteraction = /** @__PURE__ @class */ (function () {
                     this.parent.changeDate(this.parent.activeView.getNextPreviousDate('previous'), e);
                     var tableEle = this.parent.getContentTable();
                     var rowIndex = this.isInverseTableSelect() ? key.rowIndex : tableEle.rows.length - 1;
-                    var cell = tableEle.rows[rowIndex].cells[key.maxIndex - 1];
+                    var cell = tableEle.rows[parseInt(rowIndex.toString(), 10)].cells[key.maxIndex - 1];
                     if (isMonthStart) {
                         var tbody = this.parent.element.querySelectorAll('.' + CONTENT_TABLE_CLASS + ' tbody');
                         cell = tbody.item(tbody.length - 1).querySelector(':not(.' + OTHERMONTH_CLASS + ')[data-date="' + this.parent.activeView.getEndDate().getTime() + '"]');
@@ -3179,7 +3196,7 @@ var Islamic = /** @__PURE__ @class */ (function () {
         var hDate = this.getHijriDate(date);
         var day = [];
         for (var i = 0; i < days.length; i++) {
-            var gDate = HijriParser.toGregorian(hDate.year, hDate.month, days[i]);
+            var gDate = HijriParser.toGregorian(hDate.year, hDate.month, days[parseInt(i.toString(), 10)]);
             day.push(gDate.getDate());
         }
         return day;
@@ -3596,7 +3613,7 @@ function generateSummary(rule, localeObject, locale, calendarType) {
         case 'WEEKLY':
             summary += localeObject.getConstant(WEEKS) + ' ' + localeObject.getConstant(ON) + ' ';
             ruleObject.day.forEach(function (day, index) {
-                summary += capitalizeFirstWord(getValue(DAYINDEXOBJECT[day], cldrObj), 'single');
+                summary += capitalizeFirstWord(getValue(DAYINDEXOBJECT["" + day], cldrObj), 'single');
                 summary += (((ruleObject.day.length - 1) === index) ? '' : ', ');
             });
             break;
@@ -3694,7 +3711,7 @@ function generate(startDate, rule, excludeDate, startDayOfWeek, maximumCount, vi
         return data;
     }
     maxOccurrence = maximumCount;
-    setFirstDayOfWeek(DAYINDEX[startDayOfWeek]);
+    setFirstDayOfWeek(DAYINDEX[parseInt(startDayOfWeek.toString(), 10)]);
     if (ruleObject.until) {
         var end = resetTime(ruleObject.until);
         ruleObject.until = new Date(end.getFullYear(), end.getMonth(), end.getDate(), 23, 59, 59);
@@ -3970,7 +3987,7 @@ function processWeekNo(startDate, endDate, data, ruleObject) {
         startDay = dayIndex.indexOf(DAYINDEX[stDate.getDay()]);
         firstWeekSpan = (6 - startDay) + 1;
         for (var index = 0; index < weekNos.length; index++) {
-            weekNo = weekNos[index];
+            weekNo = weekNos[parseInt(index.toString(), 10)];
             weekNo = (weekNo > 0) ? weekNo : 53 + weekNo + 1;
             maxDate = (weekNo === 1) ? firstWeekSpan : firstWeekSpan + ((weekNo - 1) * 7);
             minDate = (weekNo === 1) ? firstWeekSpan - 7 : firstWeekSpan + ((weekNo - 2) * 7);
@@ -4017,7 +4034,7 @@ function processYearDay(startDate, endDate, data, ruleObject) {
     var expectedDays = ruleObject.day;
     while (compareDates(stDate, endDate)) {
         for (var index = 0; index < ruleObject.yearDay.length; index++) {
-            date = ruleObject.yearDay[index];
+            date = ruleObject.yearDay[parseInt(index.toString(), 10)];
             tempDate = new Date(stDate.getTime());
             if ((date === calendarUtil.getLeapYearDaysCount() || date === -calendarUtil.getLeapYearDaysCount()) &&
                 (!calendarUtil.isLeapYear(calendarUtil.getFullYear(tempDate), 1))) {
@@ -4177,7 +4194,7 @@ function monthlyDateTypeProcessforMonthFreq(startDate, endDate, data, ruleObject
  */
 function processDateCollectionForByMonthDay(ruleObject, recRuleVariables, endDate, isByMonth, startDate, data) {
     for (var index = 0; index < ruleObject.monthDay.length; index++) {
-        recRuleVariables.date = ruleObject.monthDay[index];
+        recRuleVariables.date = ruleObject.monthDay[parseInt(index.toString(), 10)];
         recRuleVariables.tempDate = calendarUtil.getMonthStartDate(recRuleVariables.tempDate);
         var maxDate = calendarUtil.getMonthDaysCount(recRuleVariables.tempDate);
         recRuleVariables.date = recRuleVariables.date > 0 ? recRuleVariables.date : (maxDate + recRuleVariables.date + 1);
@@ -4221,7 +4238,7 @@ function setNextValidDate(tempDate, ruleObject, monthInit, beginDate, interval)
     if (ruleObject.month.length) {
         monthInit++;
         monthInit = monthInit % ruleObject.month.length;
-        calendarUtil.setMonth(tempDate, ruleObject.month[monthInit], 1);
+        calendarUtil.setMonth(tempDate, ruleObject.month[parseInt(monthInit.toString(), 10)], 1);
         if (monthInit === 0) {
             calendarUtil.addYears(tempDate, interval, ruleObject.month[0]);
         }
@@ -4266,7 +4283,7 @@ function getMonthCollection(startDate, endDate, data, ruleObject) {
         var isHavingNumber = expectedDays.map(function (item) { return HASNUMBER.test(item); });
         if (isHavingNumber.indexOf(true) > -1) {
             for (var j = 0; j <= expectedDays.length - 1; j++) {
-                var expectedDaysArray = expectedDays[j].match(SPLITNUMBERANDSTRING);
+                var expectedDaysArray = expectedDays[parseInt(j.toString(), 10)].match(SPLITNUMBERANDSTRING);
                 var position = parseInt(expectedDaysArray[0], 10);
                 tempDate = new Date(tempDate.getTime());
                 tempDate = calendarUtil.getMonthStartDate(tempDate);
@@ -4327,8 +4344,8 @@ function getMonthCollection(startDate, endDate, data, ruleObject) {
                 index = 0;
                 var datas = [];
                 for (var week = 0; week < monthCollection.length; week++) {
-                    for (var row = 0; row < monthCollection[week].length; row++) {
-                        datas.push(monthCollection[week][row]);
+                    for (var row = 0; row < monthCollection[parseInt(week.toString(), 10)].length; row++) {
+                        datas.push(monthCollection[parseInt(week.toString(), 10)][parseInt(row.toString(), 10)]);
                     }
                 }
                 monthCollection = [datas];
@@ -4520,8 +4537,8 @@ function processDateCollectionforByDayWithInteger(startDate, endDate, data, rule
                     while (calendarUtil.isSameYear(currentMonthDate, tempDate)) {
                         currentMonthDate = new Date(tempDate.getTime());
                         if (ruleObject.month.length === 0 ||
-                            (ruleObject.month.length > 0 && ruleObject.month[i] === calendarUtil.getMonth(currentMonthDate))) {
-                            var expectedDaysArray = expectedDays[j].match(SPLITNUMBERANDSTRING);
+                            (ruleObject.month.length > 0 && ruleObject.month[parseInt(i.toString(), 10)] === calendarUtil.getMonth(currentMonthDate))) {
+                            var expectedDaysArray = expectedDays[parseInt(j.toString(), 10)].match(SPLITNUMBERANDSTRING);
                             var position = parseInt(expectedDaysArray[0], 10);
                             currentDate = new Date(tempDate.getTime());
                             while (calendarUtil.isSameYear(currentDate, tempDate)
@@ -4640,8 +4657,8 @@ function insertDataCollection(dateCollection, state, startDate, endDate, data, r
 function getDateCollectionforBySetPosNull(monthCollection) {
     var datas = [];
     for (var week = 0; week < monthCollection.length; week++) {
-        for (var row = 0; row < monthCollection[week].length; row++) {
-            datas.push(new Date(monthCollection[week][row]).getTime());
+        for (var row = 0; row < monthCollection[parseInt(week.toString(), 10)].length; row++) {
+            datas.push(new Date(monthCollection[parseInt(week.toString(), 10)][parseInt(row.toString(), 10)]).getTime());
         }
     }
     monthCollection = datas.length > 0 ? [datas] : [];
@@ -4687,8 +4704,8 @@ function insertDateCollectionBasedonIndex(monthCollection, startDate, endDate, d
  * @private
  */
 function filterDateCollectionByIndex(monthCollection, index, datas) {
-    for (var week = 0; week < monthCollection[index].length; week++) {
-        datas.push(monthCollection[index][week]);
+    for (var week = 0; week < monthCollection[parseInt(index.toString(), 10)].length; week++) {
+        datas.push(monthCollection[parseInt(index.toString(), 10)][parseInt(week.toString(), 10)]);
     }
     return datas;
 }
@@ -4732,7 +4749,7 @@ function weekCount(year, startDayOfWeek, monthCollection, week, ruleObject) {
     var firstWeekDay = (firstOfMonth.getDay() - firstDayOfWeek + 7) % 7;
     var used = firstWeekDay + numberOfDaysInMonth;
     var count = Math.ceil(used / 7) - 1;
-    var dayData = monthCollection[week][count];
+    var dayData = monthCollection[parseInt(week.toString(), 10)][parseInt(count.toString(), 10)];
     var chDate = new Date(dayData);
     var state = validateRules(chDate, ruleObject);
     return (state) ? count : count - 1;
@@ -4752,15 +4769,15 @@ function weekCount(year, startDayOfWeek, monthCollection, week, ruleObject) {
 function insertDateCollectionBasedonBySetPos(monthCollection, state, startDate, endDate, data, ruleObject) {
     if (monthCollection.length > 0) {
         for (var week = 0; week < monthCollection.length; week++) {
-            monthCollection[week].sort();
+            monthCollection[parseInt(week.toString(), 10)].sort();
             var expectedDays = ruleObject.day;
             var isHavingNumber = expectedDays.map(function (item) { return HASNUMBER.test(item); });
             var weekIndex = (ruleObject.freq === 'YEARLY' && (ruleObject.validRules.indexOf('BYMONTH') > -1) &&
                 !(isHavingNumber.indexOf(true) > -1)) ?
                 weekCount(new Date(monthCollection[0][0]).getFullYear(), 0, monthCollection, week, ruleObject)
-                : (monthCollection[week].length + ruleObject.setPosition);
+                : (monthCollection[parseInt(week.toString(), 10)].length + ruleObject.setPosition);
             var index = ((ruleObject.setPosition < 1) ? weekIndex : ruleObject.setPosition - 1);
-            var dayData = monthCollection[week][index];
+            var dayData = monthCollection[parseInt(week.toString(), 10)][parseInt(index.toString(), 10)];
             insertDateCollection(state, startDate, endDate, data, ruleObject, dayData);
         }
     }
@@ -4783,9 +4800,9 @@ function insertDatasIntoExistingCollection(monthCollection, state, startDate, en
         index = !isNullOrUndefined(index) ? index :
             ((ruleObject.setPosition < 1)
                 ? (monthCollection.length + ruleObject.setPosition) : ruleObject.setPosition - 1);
-        monthCollection[index].sort();
-        for (var week = 0; week < monthCollection[index].length; week++) {
-            var dayData = monthCollection[index][week];
+        monthCollection[parseInt(index.toString(), 10)].sort();
+        for (var week = 0; week < monthCollection[parseInt(index.toString(), 10)].length; week++) {
+            var dayData = monthCollection[parseInt(index.toString(), 10)][parseInt(week.toString(), 10)];
             insertDateCollection(state, startDate, endDate, data, ruleObject, dayData);
         }
     }
@@ -4832,7 +4849,7 @@ function checkDayIndex(day, expectedDays) {
             sortedExpectedDays.push(expectedDaysNumberSplit[0]);
         }
     });
-    return (sortedExpectedDays.indexOf(DAYINDEX[day]) === -1);
+    return (sortedExpectedDays.indexOf(DAYINDEX[parseInt(day.toString(), 10)]) === -1);
 }
 /**
  * Internal method to get start date of week
@@ -4848,7 +4865,7 @@ function getStartDateForWeek(startDate, expectedDays) {
     if (expectedDays.length > 0) {
         var expectedDaysArr = [];
         for (var i = 0; i <= expectedDays.length - 1; i++) {
-            newstr = getDayString(expectedDays[i]);
+            newstr = getDayString(expectedDays[parseInt(i.toString(), 10)]);
             expectedDaysArr.push(newstr);
         }
         if (expectedDaysArr.indexOf(DAYINDEX[tempDate.getDay()]) === -1) {
@@ -4962,10 +4979,10 @@ function processWeekDays(expectedDays) {
             while (temp % 7 !== dayIndex.indexOf(expectedDays[0])) {
                 temp++;
             }
-            dayCycle[element] = temp - startIndex;
+            dayCycle["" + element] = temp - startIndex;
         }
         else {
-            dayCycle[element] = dayIndex.indexOf(expectedDays[(index + 1)]) - dayIndex.indexOf(element);
+            dayCycle["" + element] = dayIndex.indexOf(expectedDays[(index + 1)]) - dayIndex.indexOf(element);
         }
     });
     return dayCycle;
@@ -5224,8 +5241,8 @@ var EventBase = /** @__PURE__ @class */ (function () {
                 event_1 = this_1.processTimezone(event_1);
             }
             for (var level = 0; level < resourceCollection.length; level++) {
-                if (event_1[resourceCollection[level].field] === null || event_1[resourceCollection[level].field] === 0) {
-                    event_1[resourceCollection[level].field] = undefined;
+                if (event_1[resourceCollection[parseInt(level.toString(), 10)].field] === null || event_1[resourceCollection[parseInt(level.toString(), 10)].field] === 0) {
+                    event_1[resourceCollection[parseInt(level.toString(), 10)].field] = undefined;
                 }
             }
             if (!isNullOrUndefined(event_1[fields.recurrenceRule]) && event_1[fields.recurrenceRule] === '') {
@@ -5397,7 +5414,7 @@ var EventBase = /** @__PURE__ @class */ (function () {
         var resourceData;
         if (this.parent.activeViewOptions.group.resources.length > 0) {
             var data = this.getGroupIndexFromEvent(eventObj);
-            resourceData = this.parent.resourceBase.lastResourceLevel[data];
+            resourceData = this.parent.resourceBase.lastResourceLevel[parseInt(data.toString(), 10)];
         }
         var blockEvents = extend([], this.parent.blockProcessed, null, true);
         for (var _i = 0, blockEvents_1 = blockEvents; _i < blockEvents_1.length; _i++) {
@@ -5449,15 +5466,15 @@ var EventBase = /** @__PURE__ @class */ (function () {
         var predicate = {};
         var resourceCollection = this.parent.resourceBase.resourceCollection;
         for (var level = 0; level < resourceCollection.length; level++) {
-            predicate[resourceCollection[level].field] = resourceTdData.groupOrder[level];
+            predicate[resourceCollection[parseInt(level.toString(), 10)].field] = resourceTdData.groupOrder[parseInt(level.toString(), 10)];
         }
         var keys = Object.keys(predicate);
         var filteredCollection = appointments.filter(function (eventObj) { return keys.every(function (key) {
-            if (eventObj[key] instanceof Array) {
-                return eventObj[key].indexOf(predicate[key]) > -1;
+            if (eventObj["" + key] instanceof Array) {
+                return eventObj["" + key].indexOf(predicate["" + key]) > -1;
             }
             else {
-                return eventObj[key] === predicate[key];
+                return eventObj["" + key] === predicate["" + key];
             }
         }); });
         return filteredCollection;
@@ -5562,7 +5579,7 @@ var EventBase = /** @__PURE__ @class */ (function () {
             }
             var cStart = start;
             for (var level = 0; level < this.slots.length; level++) {
-                var slot = this.slots[level];
+                var slot = this.slots[parseInt(level.toString(), 10)];
                 if (this.parent.currentView === 'WorkWeek' || this.parent.currentView === 'TimelineWorkWeek'
                     || this.parent.activeViewOptions.group.byDate || this.parent.activeViewOptions.showWeekend) {
                     var slotDates = [];
@@ -5597,9 +5614,9 @@ var EventBase = /** @__PURE__ @class */ (function () {
                         var hasBreak = endIndex !== -1;
                         endIndex = hasBreak ? endIndex : slot.length - 1;
                         var count = ((endIndex - startIndex) + 1);
-                        var isLeft = (slot[startIndex] !== orgStart);
-                        var isRight = (slot[endIndex] !== orgEnd);
-                        ranges.push(this.cloneEventObject(event, slot[startIndex], slot[endIndex], count, isLeft, isRight));
+                        var isLeft = (slot[parseInt(startIndex.toString(), 10)] !== orgStart);
+                        var isRight = (slot[parseInt(endIndex.toString(), 10)] !== orgEnd);
+                        ranges.push(this.cloneEventObject(event, slot[parseInt(startIndex.toString(), 10)], slot[parseInt(endIndex.toString(), 10)], count, isLeft, isRight));
                         if (hasBreak) {
                             break;
                         }
@@ -5609,8 +5626,8 @@ var EventBase = /** @__PURE__ @class */ (function () {
                     if (this.dateInRange(cStart, slot[0], slot[slot.length - 1])) {
                         var availSlot = [];
                         for (var i = 0; i < slot.length; i++) {
-                            if (this.dateInRange(slot[i], orgStart, orgEnd)) {
-                                availSlot.push(slot[i]);
+                            if (this.dateInRange(slot[parseInt(i.toString(), 10)], orgStart, orgEnd)) {
+                                availSlot.push(slot[parseInt(i.toString(), 10)]);
                             }
                         }
                         if (availSlot.length > 0) {
@@ -5786,9 +5803,9 @@ var EventBase = /** @__PURE__ @class */ (function () {
         var levelName;
         var idField;
         for (var i = this.parent.resourceBase.resourceCollection.length - 1; i >= 0; i--) {
-            var resourceData = eventData[this.parent.resourceBase.resourceCollection[i].field];
+            var resourceData = eventData[this.parent.resourceBase.resourceCollection[parseInt(i.toString(), 10)].field];
             if (!isNullOrUndefined(resourceData)) {
-                resource = this.parent.resourceBase.resourceCollection[i];
+                resource = this.parent.resourceBase.resourceCollection[parseInt(i.toString(), 10)];
                 levelIndex = i;
                 levelName = resource.name;
                 idField = resource.field;
@@ -5807,8 +5824,8 @@ var EventBase = /** @__PURE__ @class */ (function () {
                 return null;
             })[0];
         }
-        var id = ((eventData[idField] instanceof Array) ?
-            eventData[idField][0] : eventData[idField]);
+        var id = ((eventData["" + idField] instanceof Array) ?
+            eventData["" + idField][0] : eventData["" + idField]);
         if (levelIndex > 0) {
             var parentField = this.parent.resourceCollection[levelIndex - 1].field;
             return this.parent.resourceBase.getIndexFromResourceId(id, levelName, resource, eventData, parentField);
@@ -6185,7 +6202,7 @@ var EventBase = /** @__PURE__ @class */ (function () {
         var idField = isGuid ? 'Guid' : (isFollowing) ? this.parent.eventFields.followingID : this.parent.eventFields.recurrenceID;
         var fieldKey = isGuid ? 'Guid' : this.parent.eventFields.id;
         var dataSource = isGuid ? this.parent.eventsProcessed : this.parent.eventsData;
-        return dataSource.filter(function (data) { return data[idField] === eventObj[fieldKey]; });
+        return dataSource.filter(function (data) { return data["" + idField] === eventObj["" + fieldKey]; });
     };
     EventBase.prototype.getOccurrencesByID = function (id) {
         var fields = this.parent.eventFields;
@@ -6229,14 +6246,14 @@ var EventBase = /** @__PURE__ @class */ (function () {
             var exDateString_1 = parentObject[fields.recurrenceException].split(',');
             var _loop_3 = function (i, len) {
                 var edited = this_2.parent.eventsData.filter(function (eventObj) {
-                    return eventObj[fields.recurrenceID] === parentObject[fields.id] && eventObj[fields.recurrenceException] === exDateString_1[i];
+                    return eventObj[fields.recurrenceID] === parentObject[fields.id] && eventObj[fields.recurrenceException] === exDateString_1[parseInt(i.toString(), 10)];
                 });
                 if (edited.length === 0) {
-                    var exDate = getDateFromRecurrenceDateString(exDateString_1[i]);
+                    var exDate = getDateFromRecurrenceDateString(exDateString_1[parseInt(i.toString(), 10)]);
                     var childObject = extend({}, recurrenceData, null, true);
                     childObject[fields.recurrenceID] = parentObject[fields.id];
                     delete childObject[fields.followingID];
-                    childObject[fields.recurrenceException] = exDateString_1[i];
+                    childObject[fields.recurrenceException] = exDateString_1[parseInt(i.toString(), 10)];
                     var startDate = new Date(exDate.getTime());
                     var time = parentObject[fields.endTime].getTime() - parentObject[fields.startTime].getTime();
                     var endDate = new Date(startDate.getTime());
@@ -6388,14 +6405,14 @@ var EventBase = /** @__PURE__ @class */ (function () {
         var filteredDates;
         if (dateRender[0] < this.parent.minDate && dateRender[dateRender.length - 1] > this.parent.maxDate) {
             for (var i = 0; i < dateRender.length; i++) {
-                if (resetTime(dateRender[i]).getTime() === resetTime(new Date(this.parent.minDate)).getTime()) {
+                if (resetTime(dateRender[parseInt(i.toString(), 10)]).getTime() === resetTime(new Date(this.parent.minDate)).getTime()) {
                     firstDate = i;
                 }
-                if (resetTime(dateRender[i]).getTime() === resetTime(new Date(this.parent.maxDate)).getTime()) {
+                if (resetTime(dateRender[parseInt(i.toString(), 10)]).getTime() === resetTime(new Date(this.parent.maxDate)).getTime()) {
                     lastDate = i;
                 }
             }
-            filteredDates = dateRender.filter(function (date) { return date >= dateRender[firstDate] && date <= dateRender[lastDate]; });
+            filteredDates = dateRender.filter(function (date) { return date >= dateRender[parseInt(firstDate.toString(), 10)] && date <= dateRender[parseInt(lastDate.toString(), 10)]; });
         }
         return filteredDates;
     };
@@ -6446,7 +6463,7 @@ var EventBase = /** @__PURE__ @class */ (function () {
         var tr = createElement('tr');
         var levels = this.parent.activeView.colLevels.slice(-1)[0];
         for (var i = 0, len = levels.length; i < len; i++) {
-            var col = levels[i];
+            var col = levels[parseInt(i.toString(), 10)];
             var appointmentWrap = createElement('td', {
                 className: (type === 'allDay') ? ALLDAY_APPOINTMENT_WRAPPER_CLASS : (type === 'timeIndicator') ?
                     TIMELINE_WRAPPER_CLASS : DAY_WRAPPER_CLASS, attrs: { 'data-date': col.date.getTime().toString() }
@@ -6536,8 +6553,8 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
                 wrapper.classList.contains(ROW_COUNT_WRAPPER_CLASS))) {
                 var groupIndex = parseInt(wrapper.getAttribute('data-group-index'), 10);
                 for (var j = 0, len = this.parent.crudModule.crudObj.sourceEvent.length; j < len; j++) {
-                    if (groupIndex === this.parent.crudModule.crudObj.sourceEvent[j].groupIndex ||
-                        groupIndex === this.parent.crudModule.crudObj.targetEvent[j].groupIndex) {
+                    if (groupIndex === this.parent.crudModule.crudObj.sourceEvent[parseInt(j.toString(), 10)].groupIndex ||
+                        groupIndex === this.parent.crudModule.crudObj.targetEvent[parseInt(j.toString(), 10)].groupIndex) {
                         remove(wrapper);
                     }
                 }
@@ -6592,7 +6609,7 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
         this.dateRender[0] = this.parent.activeView.renderDates;
         if (this.parent.activeViewOptions.group.resources.length > 0) {
             for (var i = 0, len = this.resources.length; i < len; i++) {
-                this.dateRender[i] = this.resources[i].renderDates;
+                this.dateRender[parseInt(i.toString(), 10)] = this.resources[parseInt(i.toString(), 10)].renderDates;
             }
         }
     };
@@ -6626,11 +6643,11 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
         var dateCount = this.getStartCount();
         for (var _i = 0, resources_1 = resources; _i < resources_1.length; _i++) {
             var resource = resources_1[_i];
-            var renderDates = this.dateRender[resource];
+            var renderDates = this.dateRender[parseInt(resource.toString(), 10)];
             for (var day = 0, length_1 = renderDates.length; day < length_1; day++) {
-                var startDate = new Date(renderDates[day].getTime());
-                var endDate = addDays(renderDates[day], 1);
-                var filterEvents = this.filterEvents(startDate, endDate, this.parent.blockProcessed, this.resources[resource]);
+                var startDate = new Date(renderDates[parseInt(day.toString(), 10)].getTime());
+                var endDate = addDays(renderDates[parseInt(day.toString(), 10)], 1);
+                var filterEvents = this.filterEvents(startDate, endDate, this.parent.blockProcessed, this.resources[parseInt(resource.toString(), 10)]);
                 for (var _a = 0, filterEvents_1 = filterEvents; _a < filterEvents_1.length; _a++) {
                     var event_1 = filterEvents_1[_a];
                     if (this.parent.resourceBase) {
@@ -6648,9 +6665,9 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
         var spannedData = this.isSpannedEvent(eventObj, dayIndex, resource);
         var eStart = spannedData[this.fields.startTime];
         var eEnd = spannedData[this.fields.endTime];
-        var currentDate = resetTime(new Date(this.dateRender[resource][dayIndex].getTime()));
+        var currentDate = resetTime(new Date(this.dateRender[parseInt(resource.toString(), 10)][parseInt(dayIndex.toString(), 10)].getTime()));
         var schedule = getStartEndHours(currentDate, this.startHour, this.endHour);
-        if (eStart <= eEnd && this.isValidEvent(eventObj, eStart, eEnd, schedule)) {
+        if (eStart <= eEnd && this.isValidEvent(eventObj, eStart, eEnd, schedule) && this.isWorkDayAvailable(resource, eStart)) {
             var blockTop = void 0;
             var blockHeight = void 0;
             if (spannedData[this.fields.isAllDay]) {
@@ -6664,9 +6681,7 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
             }
             var appointmentElement = this.createBlockAppointmentElement(eventObj, resource, this.isResourceEventTemplate);
             setStyleAttribute(appointmentElement, { 'width': '100%', 'height': blockHeight, 'top': blockTop });
-            var renderedIndex = this.getDayIndex(dayIndex, resource);
-            var index = this.parent.activeViewOptions.group.byDate ?
-                (this.resources.length * renderedIndex) + resource : dayCount;
+            var index = this.getDayIndex(dayIndex, resource, dayCount);
             this.appendEvent(eventObj, appointmentElement, index, '0px');
         }
     };
@@ -6686,15 +6701,15 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
                 }
             }
             this_1.slots = [];
-            var renderDates = this_1.dateRender[resource];
+            var renderDates = this_1.dateRender[parseInt(resource.toString(), 10)];
             var renderedDate = this_1.getRenderedDates(renderDates) || renderDates;
             this_1.slots.push(renderDates.map(function (date) { return +date; }));
             for (var day = 0, length_2 = renderDates.length; day < length_2 &&
-                renderDates[day] <= renderedDate[renderedDate.length - 1]; day++) {
+                renderDates[parseInt(day.toString(), 10)] <= renderedDate[renderedDate.length - 1]; day++) {
                 this_1.renderedEvents = [];
-                var startDate = new Date(renderDates[day].getTime());
-                var endDate = addDays(renderDates[day], 1);
-                var filterEvents = this_1.filterEvents(startDate, endDate, eventCollection, this_1.resources[resource]);
+                var startDate = new Date(renderDates[parseInt(day.toString(), 10)].getTime());
+                var endDate = addDays(renderDates[parseInt(day.toString(), 10)], 1);
+                var filterEvents = this_1.filterEvents(startDate, endDate, eventCollection, this_1.resources[parseInt(resource.toString(), 10)]);
                 if (isRender) {
                     for (var _i = 0, filterEvents_2 = filterEvents; _i < filterEvents_2.length; _i++) {
                         var event_2 = filterEvents_2[_i];
@@ -6742,15 +6757,37 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
         return this.parent.virtualScrollModule && this.parent.activeViewOptions.allowVirtualScrolling && this.parent.timeScale.enable ?
             parseInt(this.element.querySelector('.' + APPOINTMENT_WRAPPER_CLASS).getAttribute('id').split('-').slice(-1)[0], 10) : 0;
     };
-    VerticalEvent.prototype.getDayIndex = function (dayIndex, resource) {
-        return this.parent.activeViewOptions.group.byDate ?
-            this.parent.resourceBase.lastResourceLevel[0].renderDates.indexOf(this.dateRender[resource][dayIndex]) :
-            dayIndex;
+    VerticalEvent.prototype.getDayIndex = function (dayIndex, resource, dayCount) {
+        var _this = this;
+        if (!this.parent.activeViewOptions.group.byDate) {
+            return dayCount;
+        }
+        if (this.parent.activeViewOptions.group.byDate && !this.parent.activeViewOptions.group.hideNonWorkingDays) {
+            var renderedIndex = this.parent.resourceBase.lastResourceLevel[0].renderDates.indexOf(this.dateRender[parseInt(resource.toString(), 10)][parseInt(dayIndex.toString(), 10)]);
+            return (this.resources.length * renderedIndex) + resource;
+        }
+        var dateIndex = 0;
+        var firstColumn = this.parent.activeView.colLevels[0];
+        var currentDate = this.dateRender[parseInt(resource.toString(), 10)][parseInt(dayIndex.toString(), 10)].getTime();
+        var currentResources = [];
+        for (var i = 0; i < firstColumn.length; i++) {
+            currentResources = this.parent.resourceBase.resourceDateTree[parseInt(i.toString(), 10)];
+            if (currentDate === firstColumn[parseInt(i.toString(), 10)].date.getTime()) {
+                break;
+            }
+            dateIndex = dateIndex + firstColumn[parseInt(i.toString(), 10)].colSpan;
+        }
+        var resIndex = currentResources.findIndex(function (x) { return x.groupOrder.toString() ===
+            _this.resources[parseInt(resource.toString(), 10)].groupOrder.toString(); });
+        if (resIndex < 0) {
+            return dateIndex;
+        }
+        return dateIndex + resIndex;
     };
     VerticalEvent.prototype.setValues = function (event, resourceIndex) {
         if (this.parent.activeViewOptions.group.resources.length > 0) {
-            this.cssClass = this.resources[resourceIndex].cssClass;
-            this.groupOrder = this.resources[resourceIndex].groupOrder;
+            this.cssClass = this.resources[parseInt(resourceIndex.toString(), 10)].cssClass;
+            this.groupOrder = this.resources[parseInt(resourceIndex.toString(), 10)].groupOrder;
         }
         else {
             this.cssClass = this.parent.resourceBase.getCssClass(event);
@@ -6863,7 +6900,7 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
     };
     VerticalEvent.prototype.createMoreIndicator = function (allDayRow, count, currentDay) {
         var index = currentDay + count;
-        var countWrapper = allDayRow[index];
+        var countWrapper = allDayRow[parseInt(index.toString(), 10)];
         if (countWrapper.childElementCount <= 0) {
             var innerCountWrap = createElement('div', {
                 className: ROW_COUNT_WRAPPER_CLASS,
@@ -6909,8 +6946,8 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
         }
     };
     VerticalEvent.prototype.isSpannedEvent = function (record, day, resource) {
-        var currentDate = resetTime(this.dateRender[resource][day]);
-        var renderedDate = this.getRenderedDates(this.dateRender[resource]) || [currentDate];
+        var currentDate = resetTime(this.dateRender[parseInt(resource.toString(), 10)][parseInt(day.toString(), 10)]);
+        var renderedDate = this.getRenderedDates(this.dateRender[parseInt(resource.toString(), 10)]) || [currentDate];
         var currentDay = renderedDate.filter(function (date) { return date.getDay() === day; });
         if (currentDay.length === 0) {
             currentDate = resetTime(renderedDate[0]);
@@ -6932,12 +6969,22 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
         event[field.endTime] = eventDates.endDate;
         return event;
     };
+    VerticalEvent.prototype.isWorkDayAvailable = function (resource, start) {
+        if (this.parent.activeViewOptions.group.hideNonWorkingDays && this.resources.length > 0) {
+            var workDays = this.resources[parseInt(resource.toString(), 10)].
+                resourceData[this.resources[parseInt(resource.toString(), 10)].resource.workDaysField] ||
+                this.parent.activeViewOptions.workDays;
+            return workDays && workDays.indexOf(start.getDay()) >= 0;
+        }
+        return true;
+    };
     VerticalEvent.prototype.renderAllDayEvents = function (eventObj, dayIndex, resource, dayCount, inline) {
         var _this = this;
-        var currentDates = this.getRenderedDates(this.dateRender[resource]) || this.dateRender[resource];
+        var currentDates = this.getRenderedDates(this.dateRender[parseInt(resource.toString(), 10)]) ||
+            this.dateRender[parseInt(resource.toString(), 10)];
         if (this.parent.activeViewOptions.group.byDate) {
-            this.slots[0] = [this.dateRender[resource][dayIndex].getTime()];
-            currentDates = [this.dateRender[resource][dayIndex]];
+            this.slots[0] = [this.dateRender[parseInt(resource.toString(), 10)][parseInt(dayIndex.toString(), 10)].getTime()];
+            currentDates = [this.dateRender[parseInt(resource.toString(), 10)][parseInt(dayIndex.toString(), 10)]];
         }
         var record = this.splitEvent(eventObj, currentDates)[0];
         var allDayRowCell = this.element.querySelector('.' + ALLDAY_CELLS_CLASS + ':first-child');
@@ -6948,16 +6995,17 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
         var topValue = 1;
         var isDateRange = currentDates[0].getTime() <= eStart.getTime() &&
             addDays(currentDates.slice(-1)[0], 1).getTime() >= eStart.getTime();
-        if (eStart <= eEnd && isDateRange) {
+        if (eStart <= eEnd && isDateRange && this.isWorkDayAvailable(resource, eStart)) {
             var isAlreadyRendered = [];
-            if (this.renderedAllDayEvents[resource]) {
-                isAlreadyRendered = this.renderedAllDayEvents[resource].filter(function (event) {
+            if (this.renderedAllDayEvents[parseInt(resource.toString(), 10)]) {
+                isAlreadyRendered = this.renderedAllDayEvents[parseInt(resource.toString(), 10)].filter(function (event) {
                     return event.Guid === eventObj.Guid;
                 });
                 if (this.parent.activeViewOptions.group.byDate) {
                     isAlreadyRendered = isAlreadyRendered.filter(function (event) {
-                        return event[_this.parent.eventFields.startTime] >= currentDates[dayIndex] &&
-                            event[_this.parent.eventFields.endTime] <= addDays(new Date(+currentDates[dayIndex]), 1);
+                        return event[_this.parent.eventFields.startTime] >= currentDates[parseInt(dayIndex.toString(), 10)] &&
+                            event[_this.parent.eventFields.endTime] <=
+                                addDays(new Date(+currentDates[parseInt(dayIndex.toString(), 10)]), 1);
                     });
                 }
             }
@@ -6971,14 +7019,12 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
                 if (allDayDifference_1 >= 0) {
                     appWidth = (allDayDifference_1 * 100) - widthAdjustment;
                 }
-                if (isNullOrUndefined(this.renderedAllDayEvents[resource])) {
-                    this.renderedAllDayEvents[resource] = [];
+                if (isNullOrUndefined(this.renderedAllDayEvents[parseInt(resource.toString(), 10)])) {
+                    this.renderedAllDayEvents[parseInt(resource.toString(), 10)] = [];
                 }
-                var renderedIndex = this.getDayIndex(dayIndex, resource);
-                this.renderedAllDayEvents[resource].push(extend({}, record, null, true));
+                this.renderedAllDayEvents[parseInt(resource.toString(), 10)].push(extend({}, record, null, true));
                 var allDayRow_1 = [].slice.call(this.element.querySelector('.' + ALLDAY_ROW_CLASS).children);
-                var wIndex_1 = this.parent.activeViewOptions.group.byDate ?
-                    (this.resources.length * renderedIndex) + resource : dayCount;
+                var wIndex_1 = this.getDayIndex(dayIndex, resource, dayCount);
                 var eventWrapper_1 = this.element.querySelector('.' + ALLDAY_APPOINTMENT_WRAPPER_CLASS +
                     ':nth-child(' + (wIndex_1 + 1) + ')');
                 var appointmentElement_1;
@@ -7022,13 +7068,13 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
         var appWidth = '0%';
         var appLeft = '0%';
         var topValue = 0;
-        var currentDate = resetTime(new Date(this.dateRender[resource][dayIndex].getTime()));
+        var currentDate = resetTime(new Date(this.dateRender[parseInt(resource.toString(), 10)][parseInt(dayIndex.toString(), 10)].getTime()));
         var schedule = getStartEndHours(currentDate, this.startHour, this.endHour);
         var isValidEvent = this.isValidEvent(eventObj, eStart, eEnd, schedule);
         if ((eStart.getTime() < this.parent.minDate.getTime()) || (eEnd.getTime() > this.parent.maxDate.getTime())) {
             return;
         }
-        if (eStart <= eEnd && isValidEvent) {
+        if (eStart <= eEnd && isValidEvent && this.isWorkDayAvailable(resource, eStart)) {
             var appHeight_1 = this.getHeight(eStart, eEnd);
             if (eStart.getTime() > schedule.startHour.getTime()) {
                 topValue = this.getTopValue(eStart, dayIndex, resource);
@@ -7037,27 +7083,26 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
             record.Index = appIndex;
             this.overlapList.push(record);
             if (this.overlapList.length > 1) {
-                if (isNullOrUndefined(this.overlapEvents[appIndex])) {
-                    this.overlapEvents[appIndex] = [];
+                if (isNullOrUndefined(this.overlapEvents[parseInt(appIndex.toString(), 10)])) {
+                    this.overlapEvents[parseInt(appIndex.toString(), 10)] = [];
                 }
-                this.overlapEvents[appIndex].push(record);
+                this.overlapEvents[parseInt(appIndex.toString(), 10)].push(record);
             }
             else {
                 this.overlapEvents = [];
                 this.overlapEvents.push([record]);
             }
             appWidth = this.getEventWidth();
-            var renderedIndex = this.getDayIndex(dayIndex, resource);
             var argsData = {
                 index: appIndex, left: appLeft, width: appWidth,
-                day: renderedIndex, dayIndex: dayCount, record: record, resource: resource
+                day: dayCount, dayIndex: dayIndex, record: record, resource: resource
             };
             var tempData = this.adjustOverlapElements(argsData);
             appWidth = (tempData.appWidth);
-            if (isNullOrUndefined(this.renderedEvents[resource])) {
-                this.renderedEvents[resource] = [];
+            if (isNullOrUndefined(this.renderedEvents[parseInt(resource.toString(), 10)])) {
+                this.renderedEvents[parseInt(resource.toString(), 10)] = [];
             }
-            this.renderedEvents[resource].push(extend({}, record, null, true));
+            this.renderedEvents[parseInt(resource.toString(), 10)].push(extend({}, record, null, true));
             var appointmentElement = void 0;
             if (inline) {
                 appointmentElement = this.parent.inlineModule.createInlineAppointmentElement(eventObj);
@@ -7075,8 +7120,7 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
             if (!this.parent.isAdaptive && subjectElement) {
                 subjectElement.style.maxHeight = formatUnit(maxHeight);
             }
-            var index = this.parent.activeViewOptions.group.byDate ?
-                (this.resources.length * renderedIndex) + resource : dayCount;
+            var index = this.getDayIndex(dayIndex, resource, dayCount);
             var eventData = {};
             eventData[this.fields.startTime] = eventObj[this.fields.startTime];
             eventData[this.fields.endTime] = eventObj[this.fields.endTime];
@@ -7101,7 +7145,7 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
         return (tempLeft > 99 ? 99 : tempLeft) + '%';
     };
     VerticalEvent.prototype.getTopValue = function (date, day, resource) {
-        var startEndHours = getStartEndHours(resetTime(this.dateRender[resource][day]), this.startHour, this.endHour);
+        var startEndHours = getStartEndHours(resetTime(this.dateRender[parseInt(resource.toString(), 10)][parseInt(day.toString(), 10)]), this.startHour, this.endHour);
         var startHour = startEndHours.startHour;
         var diffInMinutes = ((date.getHours() - startHour.getHours()) * 60) + (date.getMinutes() - startHour.getMinutes());
         return (this.parent.activeViewOptions.timeScale.enable) ? ((diffInMinutes * this.cellHeight * this.slotCount) / this.interval) : 0;
@@ -7113,20 +7157,20 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
         var appIndex = -1;
         this.overlapEvents = [];
         if (isAllDay) {
-            if (!isNullOrUndefined(this.renderedAllDayEvents[resource])) {
-                var date_1 = resetTime(new Date(this.dateRender[resource][day].getTime()));
-                eventsList = this.renderedAllDayEvents[resource].filter(function (app) {
+            if (!isNullOrUndefined(this.renderedAllDayEvents[parseInt(resource.toString(), 10)])) {
+                var date_1 = resetTime(new Date(this.dateRender[parseInt(resource.toString(), 10)][parseInt(day.toString(), 10)].getTime()));
+                eventsList = this.renderedAllDayEvents[parseInt(resource.toString(), 10)].filter(function (app) {
                     return resetTime(app[fieldMapping.startTime]).getTime() <= date_1.getTime() &&
                         resetTime(app[fieldMapping.endTime]).getTime() >= date_1.getTime();
                 });
                 if (this.parent.activeViewOptions.group.resources.length > 0) {
-                    eventsList = this.filterEventsByResource(this.resources[resource], eventsList);
+                    eventsList = this.filterEventsByResource(this.resources[parseInt(resource.toString(), 10)], eventsList);
                 }
             }
         }
         else {
-            var appointmentList_1 = !isNullOrUndefined(this.renderedEvents[resource]) ?
-                this.renderedEvents[resource] : [];
+            var appointmentList_1 = !isNullOrUndefined(this.renderedEvents[parseInt(resource.toString(), 10)]) ?
+                this.renderedEvents[parseInt(resource.toString(), 10)] : [];
             var appointment_1 = [];
             var recordStart_1 = record[fieldMapping.startTime];
             var recordEnd_1 = record[fieldMapping.endTime];
@@ -7137,14 +7181,14 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
                         data[fieldMapping.startTime].getTime() === recordStart_1.getTime() && data[fieldMapping.endTime] < recordEnd_1);
             });
             if (this.parent.activeViewOptions.group.resources.length > 0) {
-                this.overlapList = this.filterEventsByResource(this.resources[resource], this.overlapList);
+                this.overlapList = this.filterEventsByResource(this.resources[parseInt(resource.toString(), 10)], this.overlapList);
             }
             this.overlapList.forEach(function (obj) {
                 var filterList = appointmentList_1.filter(function (data) {
                     return data[fieldMapping.endTime] > obj[fieldMapping.startTime] && data[fieldMapping.startTime] <= obj[fieldMapping.endTime];
                 });
                 if (_this.parent.activeViewOptions.group.resources.length > 0) {
-                    filterList = _this.filterEventsByResource(_this.resources[resource], filterList);
+                    filterList = _this.filterEventsByResource(_this.resources[parseInt(resource.toString(), 10)], filterList);
                 }
                 var collection = filterList.filter(function (val) {
                     return _this.overlapList.indexOf(val) === -1;
@@ -7155,7 +7199,8 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
             });
             for (var i = 0; i < appointment_1.length - 1; i++) {
                 for (var j = i + 1; j < appointment_1.length; j++) {
-                    if (appointment_1[i][fieldMapping.id] === appointment_1[j][fieldMapping.id]) {
+                    if (appointment_1[parseInt(i.toString(), 10)][fieldMapping.id] ===
+                        appointment_1[parseInt(j.toString(), 10)][fieldMapping.id]) {
                         appointment_1.splice(j, 1);
                         j--;
                     }
@@ -7167,11 +7212,11 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
                 var event_4 = eventsList_1[_i];
                 var record_1 = event_4;
                 var index = record_1.Index;
-                if (isNullOrUndefined(this.overlapEvents[index])) {
-                    this.overlapEvents[index] = [event_4];
+                if (isNullOrUndefined(this.overlapEvents[parseInt(index.toString(), 10)])) {
+                    this.overlapEvents[parseInt(index.toString(), 10)] = [event_4];
                 }
                 else {
-                    this.overlapEvents[index].push(event_4);
+                    this.overlapEvents[parseInt(index.toString(), 10)].push(event_4);
                 }
             }
         }
@@ -7195,13 +7240,12 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
     VerticalEvent.prototype.adjustOverlapElements = function (args) {
         var data = { appWidth: args.width, appLeft: args.left };
         for (var i = 0, length1 = this.overlapEvents.length; i < length1; i++) {
-            if (!isNullOrUndefined(this.overlapEvents[i])) {
-                for (var j = 0, length2 = this.overlapEvents[i].length; j < length2; j++) {
-                    var dayCount = this.parent.activeViewOptions.group.byDate ?
-                        (this.resources.length * args.day) + args.resource : args.dayIndex;
+            if (!isNullOrUndefined(this.overlapEvents[parseInt(i.toString(), 10)])) {
+                for (var j = 0, length2 = this.overlapEvents[parseInt(i.toString(), 10)].length; j < length2; j++) {
+                    var dayCount = this.getDayIndex(args.dayIndex, args.resource, args.day);
                     var element = this.element.querySelector('#e-appointment-wrapper-' + dayCount);
                     if (element && element.childElementCount > 0) {
-                        var eleGuid = this.overlapEvents[i][j].Guid;
+                        var eleGuid = this.overlapEvents[parseInt(i.toString(), 10)][parseInt(j.toString(), 10)].Guid;
                         if (element.querySelectorAll('div[data-guid="' + eleGuid + '"]').length > 0 && eleGuid !== args.record.Guid) {
                             var apps = element.querySelector('div[data-guid="' + eleGuid + '"]');
                             if (parseFloat(args.width) <= parseFloat(apps.style.width)) {
@@ -7379,7 +7423,8 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
     }
     MonthEvent.prototype.removeEventWrapper = function (appElement) {
         if (appElement.length > 0) {
-            appElement = (this.parent.currentView === 'Month') ? appElement : [appElement[0]];
+            appElement = (this.parent.currentView === 'Month' || (!this.parent.activeView.isTimelineView() &&
+                !this.parent.activeViewOptions.timeScale.enable)) ? appElement : [appElement[0]];
             for (var _i = 0, appElement_1 = appElement; _i < appElement_1.length; _i++) {
                 var wrap = appElement_1[_i];
                 if (wrap.parentElement && wrap.parentElement.parentNode) {
@@ -7402,12 +7447,13 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
         if (this.parent.crudModule && this.parent.crudModule.crudObj.isCrudAction) {
             for (var i = 0, len = this.parent.crudModule.crudObj.sourceEvent.length; i < len; i++) {
                 var appElement = [].slice.call(this.element.querySelectorAll('.e-appointment-wrapper ' + '[data-group-index="' +
-                    this.parent.crudModule.crudObj.sourceEvent[i].groupIndex + '"]'));
+                    this.parent.crudModule.crudObj.sourceEvent[parseInt(i.toString(), 10)].groupIndex + '"]'));
                 this.removeEventWrapper(appElement);
-                if (this.parent.crudModule.crudObj.targetEvent[i] && this.parent.crudModule.crudObj.sourceEvent[i].groupIndex !==
-                    this.parent.crudModule.crudObj.targetEvent[i].groupIndex) {
+                if (this.parent.crudModule.crudObj.targetEvent[parseInt(i.toString(), 10)] &&
+                    this.parent.crudModule.crudObj.sourceEvent[parseInt(i.toString(), 10)].groupIndex !==
+                        this.parent.crudModule.crudObj.targetEvent[parseInt(i.toString(), 10)].groupIndex) {
                     var ele = [].slice.call(this.element.querySelectorAll('.e-appointment-wrapper ' + '[data-group-index="' +
-                        this.parent.crudModule.crudObj.targetEvent[i].groupIndex + '"]'));
+                        this.parent.crudModule.crudObj.targetEvent[parseInt(i.toString(), 10)].groupIndex + '"]'));
                     this.removeEventWrapper(ele);
                 }
             }
@@ -7469,7 +7515,7 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
                 var totalCells_1 = [].slice.call(this.parent.element.querySelectorAll('.e-content-wrap table tr td:first-child'));
                 var weekNumberCells = [].slice.call(this.parent.element.querySelectorAll('.' + WEEK_NUMBER_CLASS));
                 weekNumberCells.forEach(function (cell, i) {
-                    var height = totalCells_1[i].offsetHeight;
+                    var height = totalCells_1[parseInt(i.toString(), 10)].offsetHeight;
                     setStyleAttribute(cell, { 'height': height + 'px' });
                 });
                 this.parent.element.querySelector('.' + WEEK_NUMBER_WRAPPER_CLASS).scrollTop =
@@ -7523,7 +7569,7 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
         }
         for (var level = 0; level < this.slots.length; level++) {
             this.renderedEvents = [];
-            var slot = this.slots[level];
+            var slot = this.slots[parseInt(level.toString(), 10)];
             var endDate = addDays(new Date(slot[slot.length - 1]), 1);
             var spannedEvents = this.filterEvents(new Date(slot[0]), endDate, events);
             for (var _a = 0, spannedEvents_1 = spannedEvents; _a < spannedEvents_1.length; _a++) {
@@ -7631,7 +7677,7 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
         return event[this.fields.endTime];
     };
     MonthEvent.prototype.getCellTd = function (day) {
-        return this.workCells[day];
+        return this.workCells[parseInt(day.toString(), 10)];
     };
     MonthEvent.prototype.getEventWidth = function (startDate, endDate, isAllDay, count) {
         return count * this.cellWidth - 1;
@@ -7678,11 +7724,11 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
             this.parent.resourceBase.renderedResources;
         if (this.parent.crudModule && this.parent.crudModule.crudObj.isCrudAction) {
             for (var i = 0, len = this.parent.crudModule.crudObj.sourceEvent.length; i < len; i++) {
-                var sourceRes = this.parent.crudModule.crudObj.sourceEvent[i];
+                var sourceRes = this.parent.crudModule.crudObj.sourceEvent[parseInt(i.toString(), 10)];
                 this.renderEventsHandler(sourceRes.renderDates, sourceRes.workDays, sourceRes);
-                if (this.parent.crudModule.crudObj.sourceEvent[i].groupIndex !==
-                    this.parent.crudModule.crudObj.targetEvent[i].groupIndex) {
-                    var target = this.parent.crudModule.crudObj.targetEvent[i];
+                if (this.parent.crudModule.crudObj.sourceEvent[parseInt(i.toString(), 10)].groupIndex !==
+                    this.parent.crudModule.crudObj.targetEvent[parseInt(i.toString(), 10)].groupIndex) {
+                    var target = this.parent.crudModule.crudObj.targetEvent[parseInt(i.toString(), 10)];
                     this.renderEventsHandler(target.renderDates, target.workDays, target);
                 }
             }
@@ -7698,7 +7744,8 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
     MonthEvent.prototype.getSlotDates = function (workDays) {
         this.slots = [];
         var dates = this.dateRender.map(function (date) { return +date; });
-        var noOfDays = this.parent.activeViewOptions.showWeekend ? WEEK_LENGTH : workDays.length;
+        var noOfDays = !this.parent.activeViewOptions.showWeekend || (this.parent.activeViewOptions.group.byDate &&
+            this.parent.activeViewOptions.group.hideNonWorkingDays) ? workDays.length : WEEK_LENGTH;
         while (dates.length > 0) {
             this.slots.push(dates.splice(0, noOfDays));
         }
@@ -7835,7 +7882,7 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
         var diffInDays = event.data.count;
         if (startTime.getTime() <= endTime.getTime()) {
             var appWidth = (diffInDays * this.cellWidth) - 5;
-            var cellTd = this.workCells[day];
+            var cellTd = this.workCells[parseInt(day.toString(), 10)];
             var appTop = (overlapCount * (this.eventHeight + EVENT_GAP));
             var height = this.monthHeaderHeight + ((overlapCount + 1) * (this.eventHeight + EVENT_GAP)) + this.moreIndicatorHeight;
             var enableAppRender = this.maxOrIndicator ? overlapCount < 1 ? true : false : this.cellHeight > height;
@@ -8151,12 +8198,12 @@ var TimelineEvent = /** @__PURE__ @class */ (function (_super) {
             this.parent.resourceBase.renderedResources;
         if (this.parent.crudModule && this.parent.crudModule.crudObj.isCrudAction) {
             for (var i = 0, len = this.parent.crudModule.crudObj.sourceEvent.length; i < len; i++) {
-                var source = this.parent.crudModule.crudObj.sourceEvent[i];
+                var source = this.parent.crudModule.crudObj.sourceEvent[parseInt(i.toString(), 10)];
                 this.rowIndex = source.groupIndex;
                 this.renderEventsHandler(this.parent.activeView.renderDates, this.parent.activeViewOptions.workDays, source);
-                if (this.parent.crudModule.crudObj.targetEvent[i] && this.parent.crudModule.crudObj.sourceEvent[i].groupIndex !==
-                    this.parent.crudModule.crudObj.targetEvent[i].groupIndex) {
-                    var target = this.parent.crudModule.crudObj.targetEvent[i];
+                if (this.parent.crudModule.crudObj.targetEvent[parseInt(i.toString(), 10)] && this.parent.crudModule.crudObj.sourceEvent[parseInt(i.toString(), 10)].groupIndex !==
+                    this.parent.crudModule.crudObj.targetEvent[parseInt(i.toString(), 10)].groupIndex) {
+                    var target = this.parent.crudModule.crudObj.targetEvent[parseInt(i.toString(), 10)];
                     this.rowIndex = target.groupIndex;
                     this.renderEventsHandler(this.parent.activeView.renderDates, this.parent.activeViewOptions.workDays, target);
                 }
@@ -8166,7 +8213,7 @@ var TimelineEvent = /** @__PURE__ @class */ (function (_super) {
         else {
             for (var i = 0; i < resources.length; i++) {
                 this.rowIndex = i;
-                this.renderEventsHandler(this.parent.activeView.renderDates, this.parent.activeViewOptions.workDays, resources[i]);
+                this.renderEventsHandler(this.parent.activeView.renderDates, this.parent.activeViewOptions.workDays, resources[parseInt(i.toString(), 10)]);
             }
         }
     };
@@ -8212,10 +8259,10 @@ var TimelineEvent = /** @__PURE__ @class */ (function (_super) {
             var position = this.getPosition(startTime, endTime, event[this.fields.isAllDay], this.day);
             appWidth_1 = (appWidth_1 <= 0) ? this.cellWidth : appWidth_1; // appWidth 0 when start and end time as same
             this.renderedEvents.push(extend({}, event, null, true));
-            if (isNullOrUndefined(this.cellTops[resIndex])) {
-                this.cellTops[resIndex] = this.getRowTop(resIndex);
+            if (isNullOrUndefined(this.cellTops[parseInt(resIndex.toString(), 10)])) {
+                this.cellTops[parseInt(resIndex.toString(), 10)] = this.getRowTop(resIndex);
             }
-            var top_1 = this.cellTops[resIndex];
+            var top_1 = this.cellTops[parseInt(resIndex.toString(), 10)];
             var appTop = (top_1 + (this.maxHeight ? 0 : EVENT_GAP$1)) + (overlapCount * (appHeight + EVENT_GAP$1));
             appLeft = (this.parent.enableRtl) ? 0 : position;
             appRight = (this.parent.enableRtl) ? position : 0;
@@ -8481,7 +8528,7 @@ var TimelineEvent = /** @__PURE__ @class */ (function (_super) {
         if (this.renderType === 'day' || isAllDay) {
             return (day * this.slotsPerDay) * this.cellWidth;
         }
-        var currentDate = resetTime(new Date(this.dateRender[day].getTime()));
+        var currentDate = resetTime(new Date(this.dateRender[parseInt(day.toString(), 10)].getTime()));
         var schedule = getStartEndHours(currentDate, this.startHour, this.endHour);
         var cellIndex;
         if (schedule.endHour.getTime() <= endTime.getTime() && schedule.startHour.getTime() >= startTime.getTime()) {
@@ -8511,7 +8558,7 @@ var TimelineEvent = /** @__PURE__ @class */ (function (_super) {
         for (var i = 0; i < moreIndicator.length; i++) {
             var indicatorPos = void 0;
             if (moreIndicator) {
-                indicatorPos = (this.parent.enableRtl) ? moreIndicator[i].style.right : moreIndicator[i].style.left;
+                indicatorPos = (this.parent.enableRtl) ? moreIndicator[parseInt(i.toString(), 10)].style.right : moreIndicator[parseInt(i.toString(), 10)].style.left;
             }
             if (parseInt(indicatorPos, 10) === Math.floor(appPos)) {
                 return true;
@@ -8528,7 +8575,7 @@ var TimelineEvent = /** @__PURE__ @class */ (function (_super) {
     };
     TimelineEvent.prototype.getCellTd = function () {
         var wrapIndex = this.parent.uiStateValues.isGroupAdaptive ? 0 : this.rowIndex;
-        return this.eventContainers[wrapIndex];
+        return this.eventContainers[parseInt(wrapIndex.toString(), 10)];
     };
     TimelineEvent.prototype.renderBlockIndicator = function (cellTd, position, resIndex) {
         // No need to render block icon for Year, Month and Week header rows
@@ -8619,11 +8666,12 @@ var InlineEdit = /** @__PURE__ @class */ (function () {
         var start = resetTime(new Date('' + saveObj[this.parent.eventFields.startTime])).getTime();
         var end = resetTime(new Date('' + saveObj[this.parent.eventFields.endTime])).getTime();
         var resIndex = args.groupIndex || 0;
-        if (this.parent.currentView === 'Day' || this.parent.currentView === 'Week' || this.parent.currentView === 'WorkWeek') {
+        var isVertical = this.parent.currentView === 'Day' || this.parent.currentView === 'Week' || this.parent.currentView === 'WorkWeek';
+        if (this.parent.activeViewOptions.timeScale.enable && isVertical) {
             var dayIndex = saveObj[this.parent.eventFields.startTime].getDay();
             this.createVerticalViewInline(saveObj, dayIndex, resIndex, cellIndex);
         }
-        else if (this.parent.currentView === 'Month') {
+        else if (this.parent.currentView === 'Month' || (!this.parent.activeViewOptions.timeScale.enable && isVertical)) {
             this.createMonthViewInline(saveObj, resIndex, start, end);
         }
         else {
@@ -8673,7 +8721,7 @@ var InlineEdit = /** @__PURE__ @class */ (function () {
         var count = this.getEventDaysCount(saveObj);
         var verticalEvent = new VerticalEvent(this.parent);
         verticalEvent.initializeValues();
-        var index = verticalEvent.dateRender[resIndex].map(function (date) { return date.getDay(); }).indexOf(dayIndex);
+        var index = verticalEvent.dateRender[parseInt(resIndex.toString(), 10)].map(function (date) { return date.getDay(); }).indexOf(dayIndex);
         if (count >= 1) {
             verticalEvent.allDayElement = [].slice.call(this.parent.element.querySelectorAll('.' + ALLDAY_CELLS_CLASS));
             (_a = verticalEvent.slots).push.apply(_a, this.parent.activeView.renderDates.map(function (date) { return +date; }));
@@ -8701,14 +8749,16 @@ var InlineEdit = /** @__PURE__ @class */ (function () {
         var monthCellSelector = '.' + WORK_CELLS_CLASS;
         if (this.parent.activeViewOptions.group.resources.length > 0) {
             monthCellSelector += '[data-group-index="' + index + '"]';
-            var resourceData = this.parent.resourceBase.lastResourceLevel[index];
+            var resourceData = this.parent.resourceBase.lastResourceLevel[parseInt(index.toString(), 10)];
             renderDates = resourceData.renderDates;
             workDays = resourceData.workDays;
         }
+        monthEvent.dateRender = renderDates;
         monthEvent.workCells = [].slice.call(this.parent.element.querySelectorAll(monthCellSelector));
         monthEvent.cellWidth = monthEvent.workCells[0].offsetWidth;
         monthEvent.cellHeight = monthEvent.workCells[0].offsetHeight;
-        monthEvent.eventHeight = getElementHeightFromClass(this.parent.monthModule.element, APPOINTMENT_CLASS);
+        monthEvent.eventHeight =
+            getElementHeightFromClass(this.parent.monthModule.element || monthEvent.element, APPOINTMENT_CLASS);
         monthEvent.getSlotDates(workDays);
         var filteredDates = monthEvent.getRenderedDates(renderDates);
         var spannedEvents = monthEvent.splitEvent(saveObject, filteredDates || renderDates);
@@ -9636,9 +9686,9 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
                 var resourceData = void 0;
                 var lastResource_1;
                 for (var i = this.parent.resourceBase.resourceCollection.length - 1; i >= 0; i--) {
-                    resourceData = eventData[this.parent.resourceBase.resourceCollection[i].field];
+                    resourceData = eventData[this.parent.resourceBase.resourceCollection[parseInt(i.toString(), 10)].field];
                     if (!isNullOrUndefined(resourceData)) {
-                        lastResource_1 = this.parent.resourceBase.resourceCollection[i];
+                        lastResource_1 = this.parent.resourceBase.resourceCollection[parseInt(i.toString(), 10)];
                         break;
                     }
                 }
@@ -9651,7 +9701,7 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
                     var text;
                     var i = findIndexInData(lastResourceData_1, lastResource_1.idField, value);
                     if (i > -1) {
-                        text = lastResourceData_1[i][lastResource_1.textField];
+                        text = lastResourceData_1[parseInt(i.toString(), 10)][lastResource_1.textField];
                     }
                     if (text) {
                         resNames_1.push(text);
@@ -9662,7 +9712,7 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
             else {
                 var argsData = args;
                 var groupIndex = !isNullOrUndefined(argsData.groupIndex) ? argsData.groupIndex : 0;
-                var resourceDetails = this.parent.resourceBase.lastResourceLevel[groupIndex];
+                var resourceDetails = this.parent.resourceBase.lastResourceLevel[parseInt(groupIndex.toString(), 10)];
                 resourceValue = resourceDetails.resourceData[resourceDetails.resource.textField];
             }
         }
@@ -9739,9 +9789,9 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
                         var workCells = [].slice.call(this.parent.element.querySelectorAll('.' + CONTENT_WRAP_CLASS +
                             ' tbody tr td[data-group-index="' + gIndex + '"]'));
                         for (var i = 0; i < workCells.length; i++) {
-                            var date = workCells[i].getAttribute('data-date');
+                            var date = workCells[parseInt(i.toString(), 10)].getAttribute('data-date');
                             if (date < tdDate) {
-                                this.morePopup.relateTo = workCells[i];
+                                this.morePopup.relateTo = workCells[parseInt(i.toString(), 10)];
                             }
                         }
                     }
@@ -10308,12 +10358,13 @@ var EventTooltip = /** @__PURE__ @class */ (function () {
             var resCollection = void 0;
             if (this.parent.activeView.isTimelineView()) {
                 var index = parseInt(args.target.getAttribute('data-group-index'), 10);
-                resCollection = this.parent.resourceBase.lastResourceLevel[index];
+                resCollection = this.parent.resourceBase.lastResourceLevel[parseInt(index.toString(), 10)];
             }
             else {
                 var rowIndex = args.target.parentNode.sectionRowIndex;
                 var cellIndex = args.target.cellIndex;
-                resCollection = this.parent.activeView.getColumnLevels()[rowIndex][cellIndex];
+                resCollection =
+                    this.parent.activeView.getColumnLevels()[parseInt(rowIndex.toString(), 10)][parseInt(cellIndex.toString(), 10)];
             }
             var data = {
                 resource: resCollection.resource,
@@ -11075,7 +11126,7 @@ var RecurrenceEditor = /** @__PURE__ @class */ (function (_super) {
         var self = this;
         var dataSource = [];
         monthpos.forEach(function (data) {
-            dataSource.push({ text: self.localeObj.getConstant(data), value: monthposValue[data] });
+            dataSource.push({ text: self.localeObj.getConstant(data), value: monthposValue["" + data] });
         });
         return dataSource;
     };
@@ -11095,7 +11146,7 @@ var RecurrenceEditor = /** @__PURE__ @class */ (function (_super) {
         for (var _i = 0, weekday_1 = weekday; _i < weekday_1.length; _i++) {
             var obj = weekday_1[_i];
             var day = getValue(obj, cldrObj);
-            dayData.push({ text: format === 'narrow' ? day : capitalizeFirstWord(day, 'single'), value: valueData[obj] });
+            dayData.push({ text: format === 'narrow' ? day : capitalizeFirstWord(day, 'single'), value: valueData["" + obj] });
         }
         return dayData;
     };
@@ -11185,7 +11236,7 @@ var RecurrenceEditor = /** @__PURE__ @class */ (function (_super) {
         var weekday = [RULESUNDAY, RULEMONDAY, RULETUESDAY, RULEWEDNESDAY, RULETHURSDAY, RULEFRIDAY, RULESATURDAY];
         this.rotateArray(weekday, this.firstDayOfWeek);
         for (var index = 0; index < elements.length; index++) {
-            ruleData += weekday[parseInt(elements[index].getAttribute('data-index'), 10)] + (index === (elements.length - 1) ? '' : COMMA);
+            ruleData += weekday[parseInt(elements[parseInt(index.toString(), 10)].getAttribute('data-index'), 10)] + (index === (elements.length - 1) ? '' : COMMA);
         }
         return ruleData + SEMICOLON;
     };
@@ -11215,7 +11266,7 @@ var RecurrenceEditor = /** @__PURE__ @class */ (function (_super) {
         for (var _i = 0, _a = this.dayButtons; _i < _a.length; _i++) {
             var obj = _a[_i];
             var index = parseInt(obj.element.getAttribute('data-index'), 10);
-            if (keys.indexOf(weekday[index]) !== -1) {
+            if (keys.indexOf(weekday[parseInt(index.toString(), 10)]) !== -1) {
                 obj.setProperties({ isPrimary: true });
             }
             else {
@@ -11233,7 +11284,7 @@ var RecurrenceEditor = /** @__PURE__ @class */ (function (_super) {
             this.monthWeekPos.setProperties({ value: this.ruleObject.setPosition });
             for (var _i = 0, _a = Object.keys(valueData); _i < _a.length; _i++) {
                 var key = _a[_i];
-                if (valueData[key] === this.ruleObject.day[0]) {
+                if (valueData["" + key] === this.ruleObject.day[0]) {
                     this.monthWeekDays.setProperties({ value: this.ruleObject.day[0] });
                     break;
                 }
@@ -12041,14 +12092,14 @@ var EventWindow = /** @__PURE__ @class */ (function () {
         var resourceCollection = this.parent.resourceBase.resourceCollection;
         var fieldName = args.element.getAttribute('name') || this.getColumnName(args.element);
         for (var i = 0; i < resourceCollection.length; i++) {
-            if (resourceCollection[i].field === fieldName && i < resourceCollection.length - 1) {
+            if (resourceCollection[parseInt(i.toString(), 10)].field === fieldName && i < resourceCollection.length - 1) {
                 var resObject = this.createInstance(i);
                 var datasource = [];
                 var _loop_1 = function (j) {
                     var resourceModel = resourceCollection[i + 1];
                     // eslint-disable-next-line max-len
                     var filter = resourceModel.dataSource.filter(function (data) {
-                        return data[resourceModel.groupIDField] === args.value[j];
+                        return data[resourceModel.groupIDField] === args.value[parseInt(j.toString(), 10)];
                     })[0];
                     var groupId = (!isNullOrUndefined(filter)) ?
                         filter[resourceCollection[i + 1].groupIDField] : null;
@@ -12078,9 +12129,9 @@ var EventWindow = /** @__PURE__ @class */ (function () {
         var fieldName = args.element.getAttribute('name') || this.getColumnName(args.element);
         var resourceCollection = this.parent.resourceBase.resourceCollection;
         for (var i = 0; i < resourceCollection.length; i++) {
-            if ((i < resourceCollection.length - 1) && resourceCollection[i].field === fieldName) {
+            if ((i < resourceCollection.length - 1) && resourceCollection[parseInt(i.toString(), 10)].field === fieldName) {
                 var resObj = this.createInstance(i);
-                var groupId = args.itemData[resourceCollection[i].idField];
+                var groupId = args.itemData[resourceCollection[parseInt(i.toString(), 10)].idField];
                 resObj.dataSource = this.filterDatasource(i, groupId);
                 resObj.dataBind();
                 var resValue = (resObj.dataSource.length > 0) ?
@@ -12405,7 +12456,7 @@ var EventWindow = /** @__PURE__ @class */ (function () {
             var columnName = curElement.name || this.getColumnName(curElement);
             if (!isNullOrUndefined(columnName) && columnName !== '') {
                 if (keyNames.indexOf(columnName) !== -1) {
-                    this.setValueToElement(curElement, eventObj[columnName]);
+                    this.setValueToElement(curElement, eventObj["" + columnName]);
                 }
                 else {
                     this.setDefaultValueToElement(curElement);
@@ -12852,7 +12903,7 @@ var EventWindow = /** @__PURE__ @class */ (function () {
             var currentElement = formElement_2[_i];
             var columnName = currentElement.name || this.getColumnName(currentElement);
             if (!isNullOrUndefined(columnName) && columnName !== '') {
-                eventObj[columnName] = this.getValueFromElement(currentElement);
+                eventObj["" + columnName] = this.getValueFromElement(currentElement);
             }
         }
         return eventObj;
@@ -12914,11 +12965,13 @@ var EventWindow = /** @__PURE__ @class */ (function () {
                     case 'WEEKLY':
                         types = recEditor.value.split(';')[1].split('=')[1].split(',');
                         for (var index = 0; index < types.length * (interval + 1); index++) {
-                            temp[index] = (types.length > index) ? obj[types[index]] : temp[index - types.length] + (7 * interval);
+                            temp[parseInt(index.toString(), 10)] =
+                                (types.length > index) ? obj[types[parseInt(index.toString(), 10)]] :
+                                    temp[index - types.length] + (7 * interval);
                         }
                         tempValue = temp.sort(function (a, b) { return a - b; });
                         for (var index = 1; index < tempValue.length; index++) {
-                            tempDiff.push(tempValue[index] - tempValue[index - 1]);
+                            tempDiff.push(tempValue[parseInt(index.toString(), 10)] - tempValue[index - 1]);
                         }
                         if ((((endDate.getTime() - startDate.getTime()) / (1000 * 3600)) >= Math.min.apply(Math, tempDiff) * 24)
                             || isNullOrUndefined(interval)) {
@@ -12954,7 +13007,7 @@ var EventWindow = /** @__PURE__ @class */ (function () {
     EventWindow.prototype.getRecurrenceIndex = function (recColl, event) {
         var recIndex;
         for (var index = 0; index < recColl.length; index++) {
-            if (event[this.fields.startTime].valueOf() === recColl[index][this.fields.startTime].valueOf()) {
+            if (event[this.fields.startTime].valueOf() === recColl[parseInt(index.toString(), 10)][this.fields.startTime].valueOf()) {
                 recIndex = index;
                 break;
             }
@@ -13057,8 +13110,8 @@ var EventWindow = /** @__PURE__ @class */ (function () {
                     if (temp.length > 0) {
                         temp[0][_this.fields.id] = eventObj[_this.fields.id];
                         for (var k = 1; k < temp.length; k++) {
-                            temp[k][_this.fields.id] = _this.parent.eventBase.getEventMaxID(i);
-                            eventList.push(temp[k]);
+                            temp[parseInt(k.toString(), 10)][_this.fields.id] = _this.parent.eventBase.getEventMaxID(i);
+                            eventList.push(temp[parseInt(k.toString(), 10)]);
                             _this.parent.saveEvent(temp[0], currentAction);
                         }
                     }
@@ -13070,8 +13123,8 @@ var EventWindow = /** @__PURE__ @class */ (function () {
                 else {
                     if (temp.length > 0) {
                         for (var j = 0; j < temp.length; j++) {
-                            temp[j][_this.fields.id] = _this.parent.eventBase.getEventMaxID(j);
-                            eventList.push(temp[j]);
+                            temp[parseInt(j.toString(), 10)][_this.fields.id] = _this.parent.eventBase.getEventMaxID(j);
+                            eventList.push(temp[parseInt(j.toString(), 10)]);
                         }
                     }
                     else {
@@ -13085,50 +13138,54 @@ var EventWindow = /** @__PURE__ @class */ (function () {
                 var resCol = this_2.parent.resourceCollection;
                 var index = void 0;
                 if (resCol.length > 1) {
-                    index = findIndexInData(lastResource, lastResourceData.idField, resourceData[i], events, resCol);
+                    index =
+                        findIndexInData(lastResource, lastResourceData.idField, resourceData[parseInt(i.toString(), 10)], events, resCol);
                 }
                 else {
-                    index = findIndexInData(lastResource, lastResourceData.idField, resourceData[i]);
+                    index =
+                        findIndexInData(lastResource, lastResourceData.idField, resourceData[parseInt(i.toString(), 10)]);
                 }
                 if (index < 0) {
                     return { value: void 0 };
                 }
-                var groupId_1 = lastResource[index][lastResourceData.groupIDField];
-                var filter = lastLevel.filter(function (obj) { return obj.resourceData[lastResourceData.idField] === resourceData[i]; }).
+                var groupId_1 = lastResource[parseInt(index.toString(), 10)][lastResourceData.groupIDField];
+                var filter = lastLevel.filter(function (obj) { return obj.resourceData[lastResourceData.idField] ===
+                    resourceData[parseInt(i.toString(), 10)]; }).
                     filter(function (obj) { return obj.resourceData[lastResourceData.groupIDField] === groupId_1; })[0];
                 var groupOrder = filter.groupOrder;
                 for (var index_1 = 0; index_1 < this_2.parent.resourceBase.resourceCollection.length; index_1++) {
-                    var field = this_2.parent.resourceBase.resourceCollection[index_1].field;
-                    events[field] = (groupOrder[index_1] instanceof Array) ? groupOrder[index_1][0] : groupOrder[index_1];
+                    var field = this_2.parent.resourceBase.resourceCollection[parseInt(index_1.toString(), 10)].field;
+                    events["" + field] = (groupOrder[parseInt(index_1.toString(), 10)] instanceof Array) ? groupOrder[parseInt(index_1.toString(), 10)][0] :
+                        groupOrder[parseInt(index_1.toString(), 10)];
                 }
                 addValues();
             }
             else {
                 for (var index = 0; index < this_2.parent.resourceBase.resourceCollection.length - 1; index++) {
-                    var field = this_2.parent.resourceBase.resourceCollection[index].field;
-                    if (events[field] instanceof Array && events[field].length > 1) {
-                        for (var k = 0; k < events[field].length; k++) {
+                    var field = this_2.parent.resourceBase.resourceCollection[parseInt(index.toString(), 10)].field;
+                    if (events["" + field] instanceof Array && events["" + field].length > 1) {
+                        for (var k = 0; k < events["" + field].length; k++) {
                             var event_3 = extend({}, events, null, true);
-                            event_3[field] = eventObj[field][k];
-                            event_3[lastResourceData.field] = resourceData[i];
+                            event_3["" + field] = eventObj["" + field][parseInt(k.toString(), 10)];
+                            event_3[lastResourceData.field] = resourceData[parseInt(i.toString(), 10)];
                             temp.push(event_3);
                         }
                     }
                     else {
                         if (temp.length === 0) {
-                            events[field] = (eventObj[field] instanceof Array) ?
-                                eventObj[field][0] : eventObj[field];
-                            events[lastResourceData.field] = resourceData[i];
+                            events["" + field] = (eventObj["" + field] instanceof Array) ?
+                                eventObj["" + field][0] : eventObj["" + field];
+                            events[lastResourceData.field] = resourceData[parseInt(i.toString(), 10)];
                         }
                         else {
                             for (var l = 0; l < temp.length; l++) {
-                                temp[l][field] = (eventObj[field] instanceof Array) ?
-                                    eventObj[field][0] : eventObj[field];
+                                temp[parseInt(l.toString(), 10)]["" + field] = (eventObj["" + field] instanceof Array) ?
+                                    eventObj["" + field][0] : eventObj["" + field];
                             }
                         }
                     }
                 }
-                events[lastResourceData.field] = resourceData[i];
+                events[lastResourceData.field] = resourceData[parseInt(i.toString(), 10)];
                 addValues();
             }
         };
@@ -13619,21 +13676,24 @@ var VirtualScroll = /** @__PURE__ @class */ (function () {
         var resCollection = [];
         var index = { startIndex: 0, endIndex: 0 };
         if (this.parent.activeViewOptions.group.byDate) {
-            if (lastLevel[startIndex].date.getTime() === this.parent.resourceBase.expandedResources[0].date.getTime() &&
-                lastLevel[endIndex].date.getTime() ===
+            if (lastLevel[parseInt(startIndex.toString(), 10)].date.getTime() ===
+                this.parent.resourceBase.expandedResources[0].date.getTime() &&
+                lastLevel[parseInt(endIndex.toString(), 10)].date.getTime() ===
                     this.parent.resourceBase.expandedResources[this.parent.resourceBase.expandedResources.length - 1].date.getTime()) {
                 return this.parent.resourceBase.expandedResources;
             }
-            resCollection = this.getByDateCollection(lastLevel[startIndex], lastLevel[endIndex], index);
+            resCollection =
+                this.getByDateCollection(lastLevel[parseInt(startIndex.toString(), 10)], lastLevel[parseInt(endIndex.toString(), 10)], index);
             this.setRenderedDates(resCollection);
         }
         else {
-            if (lastLevel[startIndex].groupIndex === this.parent.resourceBase.expandedResources[0].groupIndex &&
-                lastLevel[endIndex].groupIndex ===
+            if (lastLevel[parseInt(startIndex.toString(), 10)].groupIndex === this.parent.resourceBase.expandedResources[0].groupIndex &&
+                lastLevel[parseInt(endIndex.toString(), 10)].groupIndex ===
                     this.parent.resourceBase.expandedResources[this.parent.resourceBase.expandedResources.length - 1].groupIndex) {
                 return this.parent.resourceBase.expandedResources;
             }
-            resCollection = this.getByIdCollection(lastLevel[startIndex], lastLevel[endIndex], index);
+            resCollection =
+                this.getByIdCollection(lastLevel[parseInt(startIndex.toString(), 10)], lastLevel[parseInt(endIndex.toString(), 10)], index);
         }
         if (this.parent.currentView !== 'Month') {
             this.startIndex = index.startIndex;
@@ -13713,7 +13773,7 @@ var VirtualScroll = /** @__PURE__ @class */ (function () {
         else {
             var col = [].slice.call(conWrap.querySelector('colgroup').children);
             for (var i = 0; i < col.length; i++) {
-                remove(col[i]);
+                remove(col[parseInt(i.toString(), 10)]);
             }
             this.parent.activeView.colLevels[this.parent.activeView.colLevels.length - 1] = resCollection;
             var contentRows = this.parent.activeView.getContentRows();
@@ -13805,8 +13865,8 @@ var Render = /** @__PURE__ @class */ (function () {
         if (this.parent.activeView) {
             var templates = [
                 'cellTemplate', 'eventTemplate', 'tooltipTemplate', 'majorSlotTemplate', 'minorSlotTemplate',
-                'headerTooltipTemplate', 'dateHeaderTemplate', 'dayHeaderTemplate', 'mothHeaderTemplate',
-                'headerIndentTemplate', 'resourceHeaderTemplate', 'cellHeaderTemplate'
+                'headerTooltipTemplate', 'dateHeaderTemplate', 'dayHeaderTemplate', 'monthHeaderTemplate',
+                'headerIndentTemplate', 'resourceHeaderTemplate', 'cellHeaderTemplate', 'dateRangeTemplate'
             ];
             this.parent.resetTemplates(templates);
             this.parent.activeView.removeEventListener();
@@ -13910,7 +13970,7 @@ var Render = /** @__PURE__ @class */ (function () {
             else if (this.parent.element.classList.contains(READ_ONLY)) {
                 removeClass([this.parent.element], READ_ONLY);
             }
-            this.parent.headerModule.updateDateRange(this.parent.activeView.getDateRangeText());
+            this.parent.headerModule.updateDateRange();
             this.parent.headerModule.updateHeaderItems('remove');
         }
     };
@@ -14156,10 +14216,10 @@ var Crud = /** @__PURE__ @class */ (function () {
                 ['Agenda', 'MonthAgenda', 'Year', 'TimelineYear'].indexOf(this.parent.currentView) === -1) {
                 templateNames = [];
                 for (var i = 0, len = this.crudObj.sourceEvent.length; i < len; i++) {
-                    templateNames.push('eventTemplate_' + this.crudObj.sourceEvent[i].groupIndex);
-                    if (this.crudObj.targetEvent[i] && this.crudObj.sourceEvent[i].groupIndex !==
-                        this.crudObj.targetEvent[i].groupIndex) {
-                        templateNames.push('eventTemplate_' + this.crudObj.targetEvent[i].groupIndex);
+                    templateNames.push('eventTemplate_' + this.crudObj.sourceEvent[parseInt(i.toString(), 10)].groupIndex);
+                    if (this.crudObj.targetEvent[parseInt(i.toString(), 10)] && this.crudObj.sourceEvent[parseInt(i.toString(), 10)].groupIndex !==
+                        this.crudObj.targetEvent[parseInt(i.toString(), 10)].groupIndex) {
+                        templateNames.push('eventTemplate_' + this.crudObj.targetEvent[parseInt(i.toString(), 10)].groupIndex);
                     }
                 }
             }
@@ -14200,7 +14260,7 @@ var Crud = /** @__PURE__ @class */ (function () {
                     var groupIndex = this_1.parent.eventBase.getGroupIndexFromEvent(data);
                     if (groupIndex > -1 && this_1.parent.crudModule.crudObj.sourceEvent.filter(function (tdData) { return tdData.groupIndex === groupIndex; }).length === 0
                         && this_1.crudObj.isCrudAction) {
-                        this_1.crudObj.sourceEvent.push(this_1.parent.resourceBase.lastResourceLevel[groupIndex]);
+                        this_1.crudObj.sourceEvent.push(this_1.parent.resourceBase.lastResourceLevel[parseInt(groupIndex.toString(), 10)]);
                     }
                 };
                 var this_1 = this;
@@ -14418,8 +14478,8 @@ var Crud = /** @__PURE__ @class */ (function () {
                 var editParams = { addedRecords: [], changedRecords: [], deletedRecords: [] };
                 var occurrenceEvents = (occurrenceData instanceof Array ? occurrenceData : [occurrenceData]);
                 var _loop_2 = function (a, count) {
-                    var childEvent = occurrenceArgs.changedRecords[a];
-                    var parentEvent = occurrenceEvents[a].parent;
+                    var childEvent = occurrenceArgs.changedRecords[parseInt(a.toString(), 10)];
+                    var parentEvent = occurrenceEvents[parseInt(a.toString(), 10)].parent;
                     var parentException = parentEvent[fields.recurrenceException];
                     var editedData = void 0;
                     var exceptionDate = void 0;
@@ -14490,8 +14550,8 @@ var Crud = /** @__PURE__ @class */ (function () {
                 var editParams = { addedRecords: [], changedRecords: [], deletedRecords: [] };
                 var followEvents = followData instanceof Array ? followData : [followData];
                 var _loop_3 = function (a, count) {
-                    var childEvent = followArgs.changedRecords[a];
-                    var parentEvent = followEvents[a].parent;
+                    var childEvent = followArgs.changedRecords[parseInt(a.toString(), 10)];
+                    var parentEvent = followEvents[parseInt(a.toString(), 10)].parent;
                     var followData_1 = _this.parent.eventBase.getEventCollections(parentEvent, childEvent);
                     var isSpanned = void 0;
                     switch (action) {
@@ -14567,8 +14627,8 @@ var Crud = /** @__PURE__ @class */ (function () {
                 var editParams = { addedRecords: [], changedRecords: [], deletedRecords: [] };
                 var seriesEvents = seriesData instanceof Array ? seriesData : [seriesData];
                 var _loop_4 = function (a, count) {
-                    var childEvent = seriesArgs.changedRecords[a];
-                    var parentEvent = seriesEvents[a];
+                    var childEvent = seriesArgs.changedRecords[parseInt(a.toString(), 10)];
+                    var parentEvent = seriesEvents[parseInt(a.toString(), 10)];
                     var eventCollections = _this.parent.eventBase.getEventCollections(parentEvent);
                     var deletedEvents = eventCollections.follow.concat(eventCollections.occurrence);
                     switch (action) {
@@ -14633,13 +14693,13 @@ var Crud = /** @__PURE__ @class */ (function () {
                 var fields_3 = _this.parent.eventFields;
                 var editParams = { addedRecords: [], changedRecords: [], deletedRecords: [] };
                 var _loop_5 = function (a, count) {
-                    var isDelete = isNullOrUndefined(deleteArgs.deletedRecords[a][_this.parent.eventFields.recurrenceRule]);
+                    var isDelete = isNullOrUndefined(deleteArgs.deletedRecords[parseInt(a.toString(), 10)][_this.parent.eventFields.recurrenceRule]);
                     if (!isDelete) {
-                        var parentEvent_1 = deleteData[a].parent;
+                        var parentEvent_1 = deleteData[parseInt(a.toString(), 10)].parent;
                         var isEdited = editParams.changedRecords.filter(function (obj) {
                             return obj[fields_3.id] === parentEvent_1[fields_3.id];
                         });
-                        var editedDate = deleteArgs.deletedRecords[a][fields_3.startTime];
+                        var editedDate = deleteArgs.deletedRecords[parseInt(a.toString(), 10)][fields_3.startTime];
                         if (isEdited.length > 0) {
                             var editedData = isEdited[0];
                             editedData[fields_3.recurrenceException] =
@@ -14652,10 +14712,10 @@ var Crud = /** @__PURE__ @class */ (function () {
                         if (isEdited.length === 0) {
                             editParams.changedRecords.push(_this.parent.eventBase.processTimezone(parentEvent_1, true));
                         }
-                        isDelete = deleteArgs.deletedRecords[a][fields_3.id] !== parentEvent_1[fields_3.id];
+                        isDelete = deleteArgs.deletedRecords[parseInt(a.toString(), 10)][fields_3.id] !== parentEvent_1[fields_3.id];
                     }
                     if (isDelete) {
-                        editParams.deletedRecords.push(deleteArgs.deletedRecords[a]);
+                        editParams.deletedRecords.push(deleteArgs.deletedRecords[parseInt(a.toString(), 10)]);
                     }
                 };
                 for (var a = 0, count = deleteArgs.deletedRecords.length; a < count; a++) {
@@ -15178,6 +15238,9 @@ var Group = /** @__PURE__ @class */ (function (_super) {
     __decorate$9([
         Property()
     ], Group.prototype, "headerTooltipTemplate", void 0);
+    __decorate$9([
+        Property(false)
+    ], Group.prototype, "hideNonWorkingDays", void 0);
     return Group;
 }(ChildProperty));
 
@@ -15263,6 +15326,7 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
     function ResourceBase(parent) {
         this.resourceCollection = [];
         this.leftPixel = 25;
+        this.resourceDateTree = [];
         this.parent = parent;
     }
     ResourceBase.prototype.renderResourceHeaderIndent = function (tr) {
@@ -15285,8 +15349,8 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
         }
         var trCount = this.lastResourceLevel.length;
         for (var i = 0; i < trCount; i++) {
-            var resData = this.lastResourceLevel[i].resourceData;
-            var res = this.lastResourceLevel[i].resource;
+            var resData = this.lastResourceLevel[parseInt(i.toString(), 10)].resourceData;
+            var res = this.lastResourceLevel[parseInt(i.toString(), 10)].resource;
             if (resData.ClassName === RESOURCE_PARENT_CLASS && !resData[res.expandedField] &&
                 !isNullOrUndefined(resData[res.expandedField])) {
                 var trCollection = [].slice.call(tBody.children);
@@ -15329,10 +15393,10 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
     ResourceBase.prototype.setExpandedResources = function () {
         var resources = [];
         for (var i = 0; i < this.lastResourceLevel.length; i++) {
-            var resource = this.lastResourceLevel[i].resourceData;
+            var resource = this.lastResourceLevel[parseInt(i.toString(), 10)].resourceData;
             var count = resource.Count;
-            resources.push(this.lastResourceLevel[i]);
-            var isExpanded = resource[this.lastResourceLevel[i].resource.expandedField];
+            resources.push(this.lastResourceLevel[parseInt(i.toString(), 10)]);
+            var isExpanded = resource[this.lastResourceLevel[parseInt(i.toString(), 10)].resource.expandedField];
             if (!isNullOrUndefined(isExpanded) && !isExpanded && count > 0) {
                 i = i + count;
             }
@@ -15348,21 +15412,21 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
         var td = createElement('td', { attrs: { tabindex: isVirtualScroll ? '-1' : '0' } });
         for (var i = 0; i < resData.length; i++) {
             var ntd = td.cloneNode();
-            rIndex = findIndexInData(resColl, 'name', resData[i].resource.name);
+            rIndex = findIndexInData(resColl, 'name', resData[parseInt(i.toString(), 10)].resource.name);
             if (rIndex === resColl.length - 1) {
-                extend(resData[i].resourceData, { ClassName: RESOURCE_CHILD_CLASS });
-                this.renderedResources[i].className = [RESOURCE_CHILD_CLASS];
+                extend(resData[parseInt(i.toString(), 10)].resourceData, { ClassName: RESOURCE_CHILD_CLASS });
+                this.renderedResources[parseInt(i.toString(), 10)].className = [RESOURCE_CHILD_CLASS];
             }
             else {
-                extend(resData[i].resourceData, { ClassName: RESOURCE_PARENT_CLASS });
-                this.renderedResources[i].className = [RESOURCE_PARENT_CLASS];
+                extend(resData[parseInt(i.toString(), 10)].resourceData, { ClassName: RESOURCE_PARENT_CLASS });
+                this.renderedResources[parseInt(i.toString(), 10)].className = [RESOURCE_PARENT_CLASS];
             }
             left = (rIndex * this.leftPixel) + 'px';
-            if (resData[i].resourceData.ClassName === RESOURCE_PARENT_CLASS
-                && !isNullOrUndefined(resData[i].resourceData.Count) && (resData[i].resourceData.Count > 0)) {
+            if (resData[parseInt(i.toString(), 10)].resourceData.ClassName === RESOURCE_PARENT_CLASS
+                && !isNullOrUndefined(resData[parseInt(i.toString(), 10)].resourceData.Count) && (resData[parseInt(i.toString(), 10)].resourceData.Count > 0)) {
                 var iconClass = void 0;
-                if (resData[i].resourceData[resColl[rIndex].expandedField] ||
-                    isNullOrUndefined(resData[i].resourceData[resColl[rIndex].expandedField])) {
+                if (resData[parseInt(i.toString(), 10)].resourceData[resColl[parseInt(rIndex.toString(), 10)].expandedField] ||
+                    isNullOrUndefined(resData[parseInt(i.toString(), 10)].resourceData[resColl[parseInt(rIndex.toString(), 10)].expandedField])) {
                     iconClass = RESOURCE_COLLAPSE_CLASS;
                 }
                 else {
@@ -15376,15 +15440,15 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
                     EventHandler.add(iconDiv, 'click', this.onTreeIconClick, this);
                 }
             }
-            this.parent.activeView.setResourceHeaderContent(ntd, resData[i], RESOURCE_TEXT_CLASS);
-            ntd.setAttribute('data-group-index', resData[i].groupIndex.toString());
-            ntd.setAttribute('aria-label', resData[i].resourceData[resData[i].resource.textField] + ' resource');
+            this.parent.activeView.setResourceHeaderContent(ntd, resData[parseInt(i.toString(), 10)], RESOURCE_TEXT_CLASS);
+            ntd.setAttribute('data-group-index', resData[parseInt(i.toString(), 10)].groupIndex.toString());
+            ntd.setAttribute('aria-label', resData[parseInt(i.toString(), 10)].resourceData[resData[parseInt(i.toString(), 10)].resource.textField] + ' resource');
             if (!this.parent.activeViewOptions.resourceHeaderTemplate) {
                 this.setMargin(ntd.querySelector('.' + RESOURCE_TEXT_CLASS), left);
             }
-            var classCollection = [RESOURCE_CELLS_CLASS, resData[i].resourceData.ClassName];
+            var classCollection = [RESOURCE_CELLS_CLASS, resData[parseInt(i.toString(), 10)].resourceData.ClassName];
             addClass([ntd], classCollection);
-            var args = { elementType: 'resourceHeader', element: ntd, groupIndex: resData[i].groupIndex };
+            var args = { elementType: 'resourceHeader', element: ntd, groupIndex: resData[parseInt(i.toString(), 10)].groupIndex };
             this.parent.trigger(renderCell, args);
             var ntr = tr.cloneNode();
             ntr.appendChild(ntd);
@@ -15407,17 +15471,17 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
             for (var x = 0; x < data.length; x++) {
                 var totalCount = 0;
                 if (this.parent.activeViewOptions.group.byGroupID) {
-                    var query = new Query().where(wholeCollection[wholeCollection.length - 1].groupIDField, 'equal', data[x][parentCollection[parentCollection.length - (y + 1)].idField]);
+                    var query = new Query().where(wholeCollection[wholeCollection.length - 1].groupIDField, 'equal', data[parseInt(x.toString(), 10)][parentCollection[parentCollection.length - (y + 1)].idField]);
                     collection = new DataManager(wholeCollection[wholeCollection.length - 1].dataSource).executeLocal(query);
                 }
                 else {
                     collection = wholeCollection[wholeCollection.length - 1].dataSource;
                 }
                 for (var z = 0; z < collection.length; z++) {
-                    totalCount = totalCount + parseInt(collection[z].Count, 10);
+                    totalCount = totalCount + parseInt(collection[parseInt(z.toString(), 10)].Count, 10);
                 }
-                totalCount = totalCount + parseInt(data[x].Count, 10);
-                extend(data[x], { Count: totalCount });
+                totalCount = totalCount + parseInt(data[parseInt(x.toString(), 10)].Count, 10);
+                extend(data[parseInt(x.toString(), 10)], { Count: totalCount });
             }
             wholeCollection = wholeCollection.slice(0, -1);
         }
@@ -15473,7 +15537,7 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
         var workCellCollection = [];
         var headerRowCollection = [];
         var pNode;
-        var clickedRes = this.lastResourceLevel[index].resourceData;
+        var clickedRes = this.lastResourceLevel[parseInt(index.toString(), 10)].resourceData;
         var resRows = [].slice.call(this.parent.element.querySelectorAll('.' + RESOURCE_COLUMN_WRAP_CLASS + ' ' + 'tr'));
         var contentRows = [].slice.call(this.parent.element.querySelectorAll('.' + CONTENT_WRAP_CLASS + ' ' + 'tbody tr'));
         var eventRows = [].slice.call(this.parent.element.querySelectorAll('.' + CONTENT_WRAP_CLASS + ' .' + APPOINTMENT_CONTAINER_CLASS));
@@ -15485,45 +15549,45 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
         var clonedCollection = this.lastResourceLevel;
         for (var i = 0; i < rowCollection.length; i++) {
             var expanded = true;
-            pNode = rowCollection[i].children[0].classList.contains(RESOURCE_PARENT_CLASS);
-            clonedCollection[index].resourceData[clonedCollection[index].resource.expandedField] = !hide;
+            pNode = rowCollection[parseInt(i.toString(), 10)].children[0].classList.contains(RESOURCE_PARENT_CLASS);
+            clonedCollection[parseInt(index.toString(), 10)].resourceData[clonedCollection[parseInt(index.toString(), 10)].resource.expandedField] = !hide;
             if (hide) {
                 if (pNode) {
-                    var trElem = rowCollection[i].querySelector('.' + RESOURCE_TREE_ICON_CLASS);
+                    var trElem = rowCollection[parseInt(i.toString(), 10)].querySelector('.' + RESOURCE_TREE_ICON_CLASS);
                     if (trElem) {
                         classList(trElem, [RESOURCE_EXPAND_CLASS], [RESOURCE_COLLAPSE_CLASS]);
                     }
                 }
-                if (!rowCollection[i].classList.contains(HIDDEN_CLASS)) {
-                    addClass([rowCollection[i], workCellCollection[i], headerRowCollection[i]], HIDDEN_CLASS);
+                if (!rowCollection[parseInt(i.toString(), 10)].classList.contains(HIDDEN_CLASS)) {
+                    addClass([rowCollection[parseInt(i.toString(), 10)], workCellCollection[parseInt(i.toString(), 10)], headerRowCollection[parseInt(i.toString(), 10)]], HIDDEN_CLASS);
                 }
             }
             else {
                 if (pNode) {
-                    var rowIndex = rowCollection[i].rowIndex;
-                    if (!clonedCollection[rowIndex].resourceData[clonedCollection[rowIndex].resource.expandedField]
-                        && !isNullOrUndefined(clonedCollection[rowIndex].resourceData[clonedCollection[rowIndex].resource.expandedField])) {
-                        rowCollection.splice(i + 1, (parseInt(clonedCollection[rowIndex].resourceData.Count, 10)));
-                        workCellCollection.splice(i + 1, (parseInt(clonedCollection[rowIndex].resourceData.Count, 10)));
-                        headerRowCollection.splice(i + 1, (parseInt(clonedCollection[rowIndex].resourceData.Count, 10)));
+                    var rowIndex = rowCollection[parseInt(i.toString(), 10)].rowIndex;
+                    if (!clonedCollection[parseInt(rowIndex.toString(), 10)].resourceData[clonedCollection[parseInt(rowIndex.toString(), 10)].resource.expandedField]
+                        && !isNullOrUndefined(clonedCollection[parseInt(rowIndex.toString(), 10)].resourceData[clonedCollection[parseInt(rowIndex.toString(), 10)].resource.expandedField])) {
+                        rowCollection.splice(i + 1, (parseInt(clonedCollection[parseInt(rowIndex.toString(), 10)].resourceData.Count, 10)));
+                        workCellCollection.splice(i + 1, (parseInt(clonedCollection[parseInt(rowIndex.toString(), 10)].resourceData.Count, 10)));
+                        headerRowCollection.splice(i + 1, (parseInt(clonedCollection[parseInt(rowIndex.toString(), 10)].resourceData.Count, 10)));
                         expanded = false;
                     }
                     if (expanded) {
-                        var trElem = rowCollection[i].querySelector('.' + RESOURCE_TREE_ICON_CLASS);
+                        var trElem = rowCollection[parseInt(i.toString(), 10)].querySelector('.' + RESOURCE_TREE_ICON_CLASS);
                         if (trElem) {
                             classList(trElem, [RESOURCE_COLLAPSE_CLASS], [RESOURCE_EXPAND_CLASS]);
                         }
                     }
                 }
-                if (rowCollection[i].classList.contains(HIDDEN_CLASS)) {
-                    removeClass([rowCollection[i], workCellCollection[i], headerRowCollection[i]], HIDDEN_CLASS);
+                if (rowCollection[parseInt(i.toString(), 10)].classList.contains(HIDDEN_CLASS)) {
+                    removeClass([rowCollection[parseInt(i.toString(), 10)], workCellCollection[parseInt(i.toString(), 10)], headerRowCollection[parseInt(i.toString(), 10)]], HIDDEN_CLASS);
                 }
             }
         }
     };
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     ResourceBase.prototype.updateVirtualContent = function (index, expand, e, target) {
-        this.lastResourceLevel[index].resourceData[this.lastResourceLevel[index].resource.expandedField] = !expand;
+        this.lastResourceLevel[parseInt(index.toString(), 10)].resourceData[this.lastResourceLevel[parseInt(index.toString(), 10)].resource.expandedField] = !expand;
         this.setExpandedResources();
         var resourceCount = this.parent.virtualScrollModule.getRenderedCount();
         var startIndex = this.expandedResources.indexOf(this.renderedResources[0]);
@@ -15614,7 +15678,7 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
         var groupIndex = 0;
         var _loop_1 = function (i, len) {
             var treeHandler = function (treeLevel, index, levelId) {
-                var resource = _this.resourceCollection[index];
+                var resource = _this.resourceCollection[parseInt(index.toString(), 10)];
                 var treeArgs;
                 var resObj;
                 if (!isTimeLine) {
@@ -15654,10 +15718,10 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
                 return treeArgs;
             };
             if (!isTimeLine) {
-                treeCollection.push(treeHandler(this_1.resourceTreeLevel[i], 0, (i + 1).toString()));
+                treeCollection.push(treeHandler(this_1.resourceTreeLevel[parseInt(i.toString(), 10)], 0, (i + 1).toString()));
             }
             else {
-                treeHandler(this_1.resourceTreeLevel[i], 0, (i + 1).toString());
+                treeHandler(this_1.resourceTreeLevel[parseInt(i.toString(), 10)], 0, (i + 1).toString());
             }
         };
         var this_1 = this;
@@ -15676,9 +15740,9 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
         var resource = this.lastResourceLevel[this.parent.uiStateValues.groupIndex];
         var headerCollection = [];
         var _loop_2 = function (i, len) {
-            var resourceLevel = this_2.resourceCollection[i];
+            var resourceLevel = this_2.resourceCollection[parseInt(i.toString(), 10)];
             var resourceText = resourceLevel.dataSource.filter(function (resData) {
-                return resData[resourceLevel.idField] === resource.groupOrder[i];
+                return resData[resourceLevel.idField] === resource.groupOrder[parseInt(i.toString(), 10)];
             });
             var resourceName = createElement('div', {
                 className: RESOURCE_NAME,
@@ -15775,8 +15839,8 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
         }
         this.parent.resourceCollection = [];
         for (var i = 0, length_1 = e.length; i < length_1; i++) {
-            var resource = this.parent.resources[i];
-            var resourceObj = this.getResourceModel(resource, e[i].result);
+            var resource = this.parent.resources[parseInt(i.toString(), 10)];
+            var resourceObj = this.getResourceModel(resource, e[parseInt(i.toString(), 10)].result);
             this.parent.resourceCollection.push(resourceObj);
         }
         this.refreshLayout(isSetModel);
@@ -15815,7 +15879,7 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
                 var resource = _a[_i];
                 var index_1 = findIndexInData(this.parent.resourceCollection, 'name', resource);
                 if (index_1 >= 0) {
-                    requiredResources.push(this.parent.resourceCollection[index_1]);
+                    requiredResources.push(this.parent.resourceCollection[parseInt(index_1.toString(), 10)]);
                 }
             }
         }
@@ -15860,8 +15924,8 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
                     if (prevOrder && prevOrder.length > 0) {
                         groupOrder = groupOrder.concat(prevOrder);
                     }
-                    groupOrder.push(data[i][resource.idField]);
-                    var items = group(resources.slice(1), index + 1, resource, data[i], groupOrder);
+                    groupOrder.push(data[parseInt(i.toString(), 10)][resource.idField]);
+                    var items = group(resources.slice(1), index + 1, resource, data[parseInt(i.toString(), 10)], groupOrder);
                     // Here validate child item empty top level resource only
                     if (index === 0 && items.length === 0 && _this.resourceCollection.length > 1) {
                         continue;
@@ -15870,9 +15934,9 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
                     var renderDates = _this.parent.activeView.renderDates;
                     var resWorkDays = void 0;
                     if (!_this.parent.activeViewOptions.group.byDate && index + 1 === _this.resourceCollection.length) {
-                        var workDays = data[i][resource.workDaysField];
-                        var resStartHour = data[i][resource.startHourField];
-                        var resEndHour = data[i][resource.endHourField];
+                        var workDays = data[parseInt(i.toString(), 10)][resource.workDaysField];
+                        var resStartHour = data[parseInt(i.toString(), 10)][resource.startHourField];
+                        var resEndHour = data[parseInt(i.toString(), 10)][resource.endHourField];
                         if (workDays && workDays.length > 0) {
                             renderDates = _this.parent.activeView.getRenderDates(workDays);
                             resWorkDays = workDays;
@@ -15885,22 +15949,22 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
                         var dateSlots = _this.generateCustomHours(dateCol, resStartHour, resEndHour, groupOrder);
                         lastColumnDates = lastColumnDates.concat(dateSlots);
                     }
-                    var resCssClass = data[i][resource.cssClassField];
+                    var resCssClass = data[parseInt(i.toString(), 10)][resource.cssClassField];
                     var slotData = {
                         type: 'resourceHeader', className: ['e-resource-cells'],
                         resourceLevelIndex: index, groupOrder: groupOrder,
-                        resource: resource, resourceData: data[i],
+                        resource: resource, resourceData: data[parseInt(i.toString(), 10)],
                         colSpan: _this.parent.activeViewOptions.group.byDate ? 1 : dateCol.length,
                         renderDates: renderDates, workDays: resWorkDays, cssClass: resCssClass,
                         child: items
                     };
                     resTree.push(slotData);
                 }
-                if (!resTreeGroup[index]) {
-                    resTreeGroup[index] = [];
+                if (!resTreeGroup[parseInt(index.toString(), 10)]) {
+                    resTreeGroup[parseInt(index.toString(), 10)] = [];
                 }
                 if (resTree.length > 0) {
-                    resTreeGroup[index].push(resTree);
+                    resTreeGroup[parseInt(index.toString(), 10)].push(resTree);
                 }
                 return resTree;
             }
@@ -15929,12 +15993,12 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
         var headerLevels = [];
         for (var i = resTreeGroup.length - 1; i >= 0; i--) {
             var temp = 0;
-            for (var _i = 0, _a = resTreeGroup[i]; _i < _a.length; _i++) {
+            for (var _i = 0, _a = resTreeGroup[parseInt(i.toString(), 10)]; _i < _a.length; _i++) {
                 var currentLevelChilds = _a[_i];
                 for (var _b = 0, currentLevelChilds_1 = currentLevelChilds; _b < currentLevelChilds_1.length; _b++) {
                     var currentLevelChild = currentLevelChilds_1[_b];
                     if (resTreeGroup[i + 1] && resTreeGroup[i + 1].length > 0) {
-                        var nextLevelChilds = resTreeGroup[i + 1][temp];
+                        var nextLevelChilds = resTreeGroup[parseInt((i + 1).toString(), 10)][parseInt(temp.toString(), 10)];
                         if (!nextLevelChilds) {
                             continue;
                         }
@@ -15962,7 +16026,7 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
             for (var _d = 0, _e = this.lastResourceLevel; _d < _e.length; _d++) {
                 var lastLevelResource = _e[_d];
                 for (var i = 0; i < lastLevelResource.colSpan; i++) {
-                    lastColumnDates[index].groupIndex = lastLevelResource.groupIndex;
+                    lastColumnDates[parseInt(index.toString(), 10)].groupIndex = lastLevelResource.groupIndex;
                     index++;
                 }
             }
@@ -15971,21 +16035,106 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
         }
         var dateHeaderLevels = [];
         var levels = extend([], headerLevels, null, true);
+        var datesColumn = [];
+        if (this.parent.activeViewOptions.group.hideNonWorkingDays) {
+            var renderDates_1 = [];
+            var dateIndex = 0;
+            var _loop_3 = function (headerDate) {
+                this_3.resourceDateTree[parseInt(dateIndex.toString(), 10)] = [];
+                var currentDateLevels = [];
+                var _loop_4 = function (j) {
+                    var workDays = this_3.lastResourceLevel[parseInt(j.toString(), 10)].resourceData[this_3.lastResourceLevel[parseInt(j.toString(), 10)].resource.workDaysField];
+                    if (!workDays) {
+                        workDays = this_3.parent.activeViewOptions.workDays;
+                    }
+                    if (workDays.indexOf(headerDate.date.getDay()) !== -1) {
+                        var resTd_1 = extend({}, this_3.lastResourceLevel[parseInt(j.toString(), 10)], null, true);
+                        resTd_1.date = headerDate.date;
+                        this_3.lastResourceLevel[parseInt(j.toString(), 10)].workDays = workDays;
+                        resTd_1.startHour = this_3.parent.getStartEndTime(resTd_1.resourceData[resTd_1.resource.startHourField]) ||
+                            headerDate.startHour;
+                        resTd_1.endHour = this_3.parent.getStartEndTime(resTd_1.resourceData[resTd_1.resource.endHourField]) ||
+                            headerDate.endHour;
+                        this_3.resourceDateTree[parseInt(dateIndex.toString(), 10)].push(resTd_1);
+                        var _loop_5 = function (k) {
+                            if (!currentDateLevels[parseInt(k.toString(), 10)]) {
+                                currentDateLevels[parseInt(k.toString(), 10)] = [];
+                            }
+                            if (k === resTd_1.groupOrder.length - 1) {
+                                if (!renderDates_1[parseInt(j.toString(), 10)]) {
+                                    renderDates_1[parseInt(j.toString(), 10)] = [];
+                                }
+                                var filterDates = resTd_1.renderDates.filter(function (x) { return x.getDay() === headerDate.date.getDay(); });
+                                renderDates_1[parseInt(j.toString(), 10)] = renderDates_1[parseInt(j.toString(), 10)].concat(filterDates);
+                                currentDateLevels[parseInt(k.toString(), 10)].push(resTd_1);
+                                return "continue";
+                            }
+                            var currentLevel = levels[parseInt(k.toString(), 10)];
+                            var filteredResource = currentLevel.filter(function (data) {
+                                return data.resourceData[data.resource.idField] === resTd_1.groupOrder[parseInt(k.toString(), 10)];
+                            });
+                            if (filteredResource && filteredResource.length > 0) {
+                                var existedResource = currentDateLevels[parseInt(k.toString(), 10)].filter(function (data) {
+                                    return data.resourceData[data.resource.idField] === resTd_1.groupOrder[parseInt(k.toString(), 10)];
+                                });
+                                if (existedResource && existedResource.length > 0) {
+                                    existedResource[0].colSpan += 1;
+                                }
+                                else {
+                                    var filteredTd = extend({}, filteredResource[0], null, true);
+                                    filteredTd.colSpan = 1;
+                                    currentDateLevels[parseInt(k.toString(), 10)].push(filteredTd);
+                                }
+                            }
+                        };
+                        for (var k = 0; k < resTd_1.groupOrder.length; k++) {
+                            _loop_5(k);
+                        }
+                    }
+                };
+                for (var j = 0; j < this_3.lastResourceLevel.length; j++) {
+                    _loop_4(j);
+                }
+                if (currentDateLevels.length > 0) {
+                    for (var l = 0; l < levels.length; l++) {
+                        if (!dateHeaderLevels[parseInt(l.toString(), 10)]) {
+                            dateHeaderLevels[parseInt(l.toString(), 10)] = [];
+                        }
+                        dateHeaderLevels[parseInt(l.toString(), 10)] = dateHeaderLevels[parseInt(l.toString(), 10)].concat(currentDateLevels[parseInt(l.toString(), 10)]);
+                    }
+                    headerDate.colSpan = currentDateLevels[currentDateLevels.length - 1].length;
+                    datesColumn.push(headerDate);
+                }
+                dateIndex++;
+            };
+            var this_3 = this;
+            for (var _f = 0, headerDates_1 = headerDates; _f < headerDates_1.length; _f++) {
+                var headerDate = headerDates_1[_f];
+                _loop_3(headerDate);
+            }
+            this.resourceDateTree = this.resourceDateTree.filter(function (data) { return data.length > 0; });
+            this.lastResourceLevel.forEach(function (x, index) {
+                if (renderDates_1[parseInt(index.toString(), 10)]) {
+                    x.renderDates = renderDates_1[parseInt(index.toString(), 10)].sort(function (a, b) { return a.getTime() - b.getTime(); });
+                }
+            });
+            dateHeaderLevels.unshift(datesColumn);
+            return dateHeaderLevels;
+        }
         var dateColSpan = 0;
-        for (var _f = 0, _g = levels[0]; _f < _g.length; _f++) {
-            var firstRowTd = _g[_f];
+        for (var _g = 0, _h = levels[0]; _g < _h.length; _g++) {
+            var firstRowTd = _h[_g];
             dateColSpan += firstRowTd.colSpan;
         }
-        var datesColumn = [];
-        for (var _h = 0, headerDates_1 = headerDates; _h < headerDates_1.length; _h++) {
-            var headerDate = headerDates_1[_h];
+        for (var _j = 0, headerDates_2 = headerDates; _j < headerDates_2.length; _j++) {
+            var headerDate = headerDates_2[_j];
             headerDate.colSpan = dateColSpan;
             datesColumn.push(headerDate);
             var resGroup = extend([], levels, null, true);
             for (var k = 0, length_2 = resGroup.length; k < length_2; k++) {
                 if (k === resGroup.length - 1) {
-                    for (var _j = 0, _k = resGroup[k]; _j < _k.length; _j++) {
-                        var resTd = _k[_j];
+                    for (var _k = 0, _l = resGroup[parseInt(k.toString(), 10)]; _k < _l.length; _k++) {
+                        var resTd = _l[_k];
                         resTd.date = headerDate.date;
                         resTd.workDays = headerDate.workDays;
                         resTd.startHour = this.parent.getStartEndTime(resTd.resourceData[resTd.resource.startHourField]) ||
@@ -15994,10 +16143,10 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
                             headerDate.endHour;
                     }
                 }
-                if (!dateHeaderLevels[k]) {
-                    dateHeaderLevels[k] = [];
+                if (!dateHeaderLevels[parseInt(k.toString(), 10)]) {
+                    dateHeaderLevels[parseInt(k.toString(), 10)] = [];
                 }
-                dateHeaderLevels[k] = dateHeaderLevels[k].concat(resGroup[k]);
+                dateHeaderLevels[parseInt(k.toString(), 10)] = dateHeaderLevels[parseInt(k.toString(), 10)].concat(resGroup[parseInt(k.toString(), 10)]);
             }
         }
         dateHeaderLevels.unshift(datesColumn);
@@ -16006,11 +16155,11 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
     ResourceBase.prototype.setResourceValues = function (eventObj, groupIndex) {
         var _this = this;
         var setValues = function (index, field, value) {
-            if (_this.resourceCollection[index].allowMultiple && _this.parent.activeViewOptions.group.allowGroupEdit) {
-                eventObj[field] = [value];
+            if (_this.resourceCollection[parseInt(index.toString(), 10)].allowMultiple && _this.parent.activeViewOptions.group.allowGroupEdit) {
+                eventObj["" + field] = [value];
             }
             else {
-                eventObj[field] = value;
+                eventObj["" + field] = value;
             }
         };
         if (groupIndex === void 0) {
@@ -16018,16 +16167,16 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
                 this.parent.activeCellsData.groupIndex;
         }
         if (this.parent.activeViewOptions.group.resources.length > 0 && !isNullOrUndefined(groupIndex)) {
-            var groupOrder = this.lastResourceLevel[groupIndex].groupOrder;
+            var groupOrder = this.lastResourceLevel[parseInt(groupIndex.toString(), 10)].groupOrder;
             for (var index = 0; index < this.resourceCollection.length; index++) {
-                setValues(index, this.resourceCollection[index].field, groupOrder[index]);
+                setValues(index, this.resourceCollection[parseInt(index.toString(), 10)].field, groupOrder[parseInt(index.toString(), 10)]);
             }
         }
         else if (this.parent.resourceCollection.length > 0) {
             for (var index = 0; index < this.resourceCollection.length; index++) {
-                var data = this.resourceCollection[index].dataSource[0];
+                var data = this.resourceCollection[parseInt(index.toString(), 10)].dataSource[0];
                 if (data) {
-                    setValues(index, this.resourceCollection[index].field, data[this.resourceCollection[index].idField]);
+                    setValues(index, this.resourceCollection[parseInt(index.toString(), 10)].field, data[this.resourceCollection[parseInt(index.toString(), 10)].idField]);
                 }
             }
         }
@@ -16035,11 +16184,11 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
     ResourceBase.prototype.getResourceColor = function (eventObj, groupOrder) {
         var colorFieldIndex = (!isNullOrUndefined(groupOrder) &&
             this.colorIndex > groupOrder.length - 1) ? groupOrder.length - 1 : this.colorIndex;
-        var resource = this.resourceCollection[colorFieldIndex];
+        var resource = this.resourceCollection[parseInt(colorFieldIndex.toString(), 10)];
         if (isNullOrUndefined(groupOrder) && this.parent.activeViewOptions.group.allowGroupEdit && resource.allowMultiple) {
             return undefined;
         }
-        var id = isNullOrUndefined(groupOrder) ? eventObj[resource.field] : groupOrder[colorFieldIndex];
+        var id = isNullOrUndefined(groupOrder) ? eventObj[resource.field] : groupOrder[parseInt(colorFieldIndex.toString(), 10)];
         var data = this.filterData(resource.dataSource, resource.idField, id);
         if (data.length > 0) {
             return data[0][resource.colorField];
@@ -16068,35 +16217,35 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
         return renderDates;
     };
     ResourceBase.prototype.filterData = function (dataSource, field, value) {
-        return dataSource.filter(function (data) { return data[field] === value; });
+        return dataSource.filter(function (data) { return data["" + field] === value; });
     };
     ResourceBase.prototype.getResourceData = function (eventObj, index, groupEditIndex) {
         if (this.parent.activeViewOptions.group.allowGroupEdit) {
             var resourceObj = {};
             for (var _i = 0, groupEditIndex_1 = groupEditIndex; _i < groupEditIndex_1.length; _i++) {
                 var groupIndex = groupEditIndex_1[_i];
-                var resourceLevel = this.lastResourceLevel[groupIndex].groupOrder;
+                var resourceLevel = this.lastResourceLevel[parseInt(groupIndex.toString(), 10)].groupOrder;
                 for (var level = 0, length_3 = resourceLevel.length; level < length_3; level++) {
-                    var fieldName = this.resourceCollection[level].field;
-                    if (isNullOrUndefined(resourceObj[fieldName])) {
-                        resourceObj[fieldName] = [];
+                    var fieldName = this.resourceCollection[parseInt(level.toString(), 10)].field;
+                    if (isNullOrUndefined(resourceObj["" + fieldName])) {
+                        resourceObj["" + fieldName] = [];
                     }
-                    resourceObj[fieldName].push(resourceLevel[level]);
+                    resourceObj["" + fieldName].push(resourceLevel[parseInt(level.toString(), 10)]);
                 }
             }
             eventObj = extend(eventObj, resourceObj);
         }
         else {
             for (var level = 0, length_4 = this.resourceCollection.length; level < length_4; level++) {
-                if (this.lastResourceLevel[index]) {
-                    eventObj[this.resourceCollection[level].field] = this.lastResourceLevel[index].groupOrder[level];
+                if (this.lastResourceLevel[parseInt(index.toString(), 10)]) {
+                    eventObj[this.resourceCollection[parseInt(level.toString(), 10)].field] = this.lastResourceLevel[parseInt(index.toString(), 10)].groupOrder[parseInt(level.toString(), 10)];
                 }
             }
         }
     };
     ResourceBase.prototype.addResource = function (resources, name, index) {
         var resourceCollection = (resources instanceof Array) ? resources : [resources];
-        var _loop_3 = function (resource) {
+        var _loop_6 = function (resource) {
             if (resource.name === name) {
                 resourceCollection.forEach(function (addObj, i) {
                     return new DataManager({ json: resource.dataSource }).insert(addObj, null, null, index + i);
@@ -16106,7 +16255,7 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
         };
         for (var _i = 0, _a = this.parent.resourceCollection; _i < _a.length; _i++) {
             var resource = _a[_i];
-            var state_1 = _loop_3(resource);
+            var state_1 = _loop_6(resource);
             if (state_1 === "break")
                 break;
         }
@@ -16114,7 +16263,7 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
     };
     ResourceBase.prototype.removeResource = function (resourceId, name) {
         var resourceCollection = (resourceId instanceof Array) ? resourceId : [resourceId];
-        var _loop_4 = function (resource) {
+        var _loop_7 = function (resource) {
             if (resource.name === name) {
                 resourceCollection.forEach(function (removeObj) {
                     return new DataManager({ json: resource.dataSource }).remove(resource.idField, removeObj);
@@ -16124,7 +16273,7 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
         };
         for (var _i = 0, _a = this.parent.resourceCollection; _i < _a.length; _i++) {
             var resource = _a[_i];
-            var state_2 = _loop_4(resource);
+            var state_2 = _loop_7(resource);
             if (state_2 === "break")
                 break;
         }
@@ -16140,7 +16289,7 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
         }
         var resource = resourceData.dataSource.filter(function (e) {
             if (event && e[resourceData.idField] === id) {
-                if (e[resourceData.groupIDField] === event[parentField]) {
+                if (e[resourceData.groupIDField] === event["" + parentField]) {
                     return e[resourceData.idField] === id;
                 }
                 return null;
@@ -16243,7 +16392,7 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
             }
             var offsetTarget = this.parent.element.querySelector("." + HEADER_ROW_CLASS + ":nth-child(" + (levelIndex + 1) + ")");
             var offset = [].slice.call(offsetTarget.children).map(function (node) { return node.offsetLeft; });
-            scrollElement.scrollLeft = offset[index];
+            scrollElement.scrollLeft = offset[parseInt(index.toString(), 10)];
         }
     };
     ResourceBase.prototype.destroy = function () {
@@ -16459,7 +16608,7 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
     };
     Schedule.prototype.getViewIndex = function (viewName) {
         for (var item = 0; item < this.viewCollections.length; item++) {
-            var checkIndex = this.viewCollections[item].option;
+            var checkIndex = this.viewCollections[parseInt(item.toString(), 10)].option;
             if (checkIndex === viewName) {
                 return item;
             }
@@ -16496,6 +16645,7 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
             var fieldViewName = viewName.charAt(0).toLowerCase() + viewName.slice(1);
             obj.cellHeaderTemplateName = obj.cellHeaderTemplate ? obj.option : '';
             obj.dateHeaderTemplateName = obj.dateHeaderTemplate ? obj.option : '';
+            obj.dateRangeTemplateName = obj.dateRangeTemplate ? obj.option : '';
             obj.cellTemplateName = obj.cellTemplate ? obj.option : '';
             obj.dayHeaderTemplateName = obj.dayHeaderTemplate ? obj.option : '';
             obj.monthHeaderTemplateName = obj.monthHeaderTemplate ? obj.option : '';
@@ -16509,11 +16659,11 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
                 delete obj.interval;
             }
             this.viewCollections.push(obj);
-            if (isNullOrUndefined(this.viewOptions[fieldViewName])) {
-                this.viewOptions[fieldViewName] = [obj];
+            if (isNullOrUndefined(this.viewOptions["" + fieldViewName])) {
+                this.viewOptions["" + fieldViewName] = [obj];
             }
             else {
-                this.viewOptions[fieldViewName].push(obj);
+                this.viewOptions["" + fieldViewName].push(obj);
             }
             count++;
         }
@@ -16541,7 +16691,8 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
             allowGroupEdit: this.group.allowGroupEdit,
             resources: this.group.resources,
             headerTooltipTemplate: this.group.headerTooltipTemplate,
-            enableCompactView: this.group.enableCompactView
+            enableCompactView: this.group.enableCompactView,
+            hideNonWorkingDays: ['Day', 'Week', 'WorkWeek', 'Month'].indexOf(this.currentView) > -1 ? this.group.hideNonWorkingDays : false
         };
         var workDays = this.viewCollections[this.viewIndex].workDays ? [] : this.workDays;
         var scheduleOptions = {
@@ -16558,6 +16709,7 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
             cellTemplate: this.cellTemplate,
             eventTemplate: this.eventSettings.template,
             dateHeaderTemplate: this.dateHeaderTemplate,
+            dateRangeTemplate: this.dateRangeTemplate,
             resourceHeaderTemplate: this.resourceHeaderTemplate,
             headerIndentTemplate: this.headerIndentTemplate,
             firstMonthOfYear: this.firstMonthOfYear,
@@ -16637,6 +16789,7 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
         this.monthHeaderTemplateFn = this.templateParser(this.activeViewOptions.monthHeaderTemplate);
         this.cellTemplateFn = this.templateParser(this.activeViewOptions.cellTemplate);
         this.dateHeaderTemplateFn = this.templateParser(this.activeViewOptions.dateHeaderTemplate);
+        this.dateRangeTemplateFn = this.templateParser(this.activeViewOptions.dateRangeTemplate);
         this.majorSlotTemplateFn = this.templateParser(this.activeViewOptions.timeScale.majorSlotTemplate);
         this.minorSlotTemplateFn = this.templateParser(this.activeViewOptions.timeScale.minorSlotTemplate);
         this.appointmentTemplateFn = this.templateParser(this.activeViewOptions.eventTemplate);
@@ -16749,16 +16902,18 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
         if (!muteOnChange && index === this.viewIndex && this.currentView === view || index < 0) {
             return;
         }
-        this.viewIndex = index;
+        var previousView = this.activeViewOptions ? this.activeViewOptions.option : this.currentView;
         var args = { requestType: 'viewNavigate', cancel: false, event: event };
         this.trigger(actionBegin, args, function (actionArgs) {
             if (!actionArgs.cancel) {
                 var navArgs = {
-                    action: 'view', cancel: false, currentDate: _this.selectedDate, previousView: _this.currentView, currentView: view, viewIndex: _this.viewIndex
+                    action: 'view', cancel: false, currentDate: _this.selectedDate, previousView: previousView, currentView: view, viewIndex: index
                 };
                 _this.trigger(navigating, navArgs, function (navigationArgs) {
                     if (!navigationArgs.cancel) {
-                        _this.uiStateValues.isInitial = view.indexOf('Timeline') > -1 || _this.currentView.indexOf('Timeline') > -1 ? true : _this.uiStateValues.isInitial;
+                        var isVertical = ['Day', 'Week', 'WorkWeek'].indexOf(view) > -1 && ['Day', 'Week', 'WorkWeek'].indexOf(previousView) < 0;
+                        _this.uiStateValues.isInitial = isVertical || view.indexOf('Timeline') > -1 || view.indexOf('Year') > -1;
+                        _this.uiStateValues.top = view.indexOf('Timeline') > -1 && previousView.indexOf('Timeline') < 0 ? 0 : _this.uiStateValues.top;
                         _this.viewIndex = navigationArgs.viewIndex;
                         _this.setProperties({ currentView: view }, true);
                         if (_this.headerModule) {
@@ -16771,8 +16926,14 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
                         args = { requestType: 'viewNavigate', cancel: false, event: event };
                         _this.trigger(actionComplete, args);
                     }
+                    else {
+                        _this.currentView = previousView;
+                    }
                 });
             }
+            else {
+                _this.currentView = previousView;
+            }
         });
     };
     /**
@@ -16793,7 +16954,7 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
                 };
                 _this.trigger(navigating, navArgs, function (navigationArgs) {
                     if (!navigationArgs.cancel) {
-                        _this.uiStateValues.isInitial = _this.activeView.isTimelineView() ? true : _this.uiStateValues.isInitial;
+                        _this.uiStateValues.isInitial = _this.activeView.isTimelineView() && _this.currentView !== 'TimelineYear';
                         _this.validateDate(navigationArgs.currentDate);
                         if (_this.headerModule) {
                             _this.headerModule.setCalendarDate(navigationArgs.currentDate);
@@ -17200,6 +17361,15 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
     Schedule.prototype.getDateHeaderTemplate = function () {
         return this.dateHeaderTemplateFn;
     };
+    /**
+     * Method to process date range template
+     *
+     * @returns {CallbackFunction} Returns the callback function
+     * @private
+     */
+    Schedule.prototype.getDateRangeTemplate = function () {
+        return this.dateRangeTemplateFn;
+    };
     /**
      * Method to process major slot template
      *
@@ -17559,14 +17729,14 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
                 case 'dateFormat':
                     this.activeViewOptions = this.getActiveViewOptions();
                     if (this.headerModule) {
-                        this.headerModule.updateDateRange(this.activeView.getDateRangeText());
+                        this.headerModule.updateDateRange();
                     }
                     break;
                 case 'showHeaderBar':
                     this.destroyHeaderModule();
                     if (newProp.showHeaderBar) {
                         this.headerModule = new HeaderRenderer(this);
-                        this.headerModule.updateDateRange(this.activeView.getDateRangeText());
+                        this.headerModule.updateDateRange();
                     }
                     this.notify(scrollUiUpdate, { cssProperties: this.getCssProperties() });
                     if (this.activeView.isTimelineView()) {
@@ -17623,6 +17793,13 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
                     this.dateHeaderTemplateFn = this.templateParser(this.activeViewOptions.dateHeaderTemplate);
                     state.isLayout = true;
                     break;
+                case 'dateRangeTemplate':
+                    this.activeViewOptions.dateRangeTemplate = newProp.dateRangeTemplate;
+                    this.dateRangeTemplateFn = this.templateParser(this.activeViewOptions.dateRangeTemplate);
+                    if (this.headerModule) {
+                        this.headerModule.updateDateRange();
+                    }
+                    break;
                 case 'dayHeaderTemplate':
                     this.activeViewOptions.dayHeaderTemplate = newProp.dayHeaderTemplate;
                     this.dayHeaderTemplateFn = this.templateParser(this.activeViewOptions.dayHeaderTemplate);
@@ -17802,7 +17979,7 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
                 if (this.showHeaderBar && this.headerModule) {
                     this.destroyHeaderModule();
                     this.headerModule = new HeaderRenderer(this);
-                    this.headerModule.updateDateRange(this.activeView.getDateRangeText());
+                    this.headerModule.updateDateRange();
                 }
                 state.isLayout = true;
                 break;
@@ -17825,7 +18002,7 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
         for (var _i = 0, _a = Object.keys(newProp); _i < _a.length; _i++) {
             var prop = _a[_i];
             if (prop === 'headerTooltipTemplate') {
-                this.headerTooltipTemplateFn = this.templateParser(newProp[prop]);
+                this.headerTooltipTemplateFn = this.templateParser(newProp.headerTooltipTemplate);
             }
             else {
                 state.isLayout = true;
@@ -18000,7 +18177,7 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
             resetTime(date);
             var renderDates = this.activeView.renderDates;
             if (!isNullOrUndefined(groupIndex) && this.resourceBase && !this.activeView.isTimelineView()) {
-                renderDates = this.resourceBase.lastResourceLevel[groupIndex].renderDates;
+                renderDates = this.resourceBase.lastResourceLevel[parseInt(groupIndex.toString(), 10)].renderDates;
             }
             var colIndex = this.getIndexOfDate(renderDates, date);
             if (colIndex >= 0) {
@@ -18012,16 +18189,16 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
                 for (var i = startIndex; i < endIndex; i++) {
                     if (this.activeView.isTimelineView()) {
                         var rowIndex = (!isNullOrUndefined(groupIndex)) ? groupIndex : 0;
-                        cells.push(tableEle.rows[rowIndex].cells[i]);
+                        cells.push(tableEle.rows[parseInt(rowIndex.toString(), 10)].cells[parseInt(i.toString(), 10)]);
                     }
                     else {
                         if (!isNullOrUndefined(groupIndex)) {
                             var selector = '.' + WORK_CELLS_CLASS + '[data-group-index="' + groupIndex + '"]';
-                            var tds = [].slice.call(tableEle.rows[i].querySelectorAll(selector));
-                            cells.push(tds[colIndex]);
+                            var tds = [].slice.call(tableEle.rows[parseInt(i.toString(), 10)].querySelectorAll(selector));
+                            cells.push(tds[parseInt(colIndex.toString(), 10)]);
                         }
                         else {
-                            cells.push(tableEle.rows[i].cells[colIndex]);
+                            cells.push(tableEle.rows[parseInt(i.toString(), 10)].cells[parseInt(colIndex.toString(), 10)]);
                         }
                     }
                 }
@@ -18106,7 +18283,7 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
     Schedule.prototype.changeCurrentView = function (viewName, viewIndex) {
         var index = this.getViewIndex(viewName);
         var view = viewName.charAt(0).toLowerCase() + viewName.slice(1);
-        var viewOptions = this.viewOptions[view];
+        var viewOptions = this.viewOptions["" + view];
         if (viewOptions) {
             index = this.viewCollections.indexOf(viewOptions[viewIndex || 0]);
         }
@@ -18135,7 +18312,7 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
             if (index < 0 || index >= this.resourceBase.lastResourceLevel.length) {
                 return undefined;
             }
-            var data = this.resourceBase.lastResourceLevel[index];
+            var data = this.resourceBase.lastResourceLevel[parseInt(index.toString(), 10)];
             var groupData = {};
             this.resourceBase.setResourceValues(groupData, index);
             return { resource: data.resource, resourceData: data.resourceData, groupData: groupData };
@@ -18477,6 +18654,12 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
                 this.dateHeaderTemplateFn = this.templateParser(this.activeViewOptions.dateHeaderTemplate);
                 this.activeView.refreshHeader();
                 break;
+            case 'dateRangeTemplate':
+                this.dateRangeTemplateFn = this.templateParser(this.activeViewOptions.dateRangeTemplate);
+                if (this.headerModule) {
+                    this.headerModule.refresh();
+                }
+                break;
             case 'resourceHeaderTemplate':
                 this.resourceHeaderTemplateFn = this.templateParser(this.activeViewOptions.resourceHeaderTemplate);
                 if (this.activeView.isTimelineView()) {
@@ -18582,7 +18765,8 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
         eventEnd = this.getDateTime(eventEnd);
         var eventCollection = this.eventBase.filterEvents(eventStart, eventEnd);
         if (!isNullOrUndefined(groupIndex) && this.resourceBase && this.resourceBase.lastResourceLevel.length > 0) {
-            eventCollection = this.eventBase.filterEventsByResource(this.resourceBase.lastResourceLevel[groupIndex], eventCollection);
+            eventCollection =
+                this.eventBase.filterEventsByResource(this.resourceBase.lastResourceLevel[parseInt(groupIndex.toString(), 10)], eventCollection);
         }
         if (eventObj) {
             if (eventObj.Guid) {
@@ -18715,6 +18899,19 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
             this.quickPopup.quickPopupHide(true);
         }
     };
+    /**
+     * Closes the tooltip.
+     * For example, when the context menu is opened for an event,
+     * the tooltip can be closed by calling this method.
+     *
+     * @function closeTooltip
+     * @returns {void}
+     */
+    Schedule.prototype.closeTooltip = function () {
+        if (this.eventTooltip) {
+            this.eventTooltip.close();
+        }
+    };
     /**
      * Select the resource based on group index in mobile mode.
      *
@@ -18827,7 +19024,7 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
         ];
         for (var _i = 0, modules_1 = modules; _i < modules_1.length; _i++) {
             var module = modules_1[_i];
-            this[module] = null;
+            this["" + module] = null;
         }
         removeChildren(this.element);
         var removeClasses = [ROOT, RTL, DEVICE_CLASS, MULTI_DRAG];
@@ -18920,6 +19117,9 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
     __decorate([
         Property()
     ], Schedule.prototype, "dateHeaderTemplate", void 0);
+    __decorate([
+        Property()
+    ], Schedule.prototype, "dateRangeTemplate", void 0);
     __decorate([
         Property()
     ], Schedule.prototype, "cellHeaderTemplate", void 0);
@@ -19223,8 +19423,8 @@ var ActionBase = /** @__PURE__ @class */ (function () {
                 var startTime = this.actionObj.start;
                 var endTime = this.actionObj.end;
                 if (multiData && multiData.length > 0) {
-                    startTime = multiData[index][this.parent.eventFields.startTime];
-                    endTime = multiData[index][this.parent.eventFields.endTime];
+                    startTime = multiData[parseInt(index.toString(), 10)][this.parent.eventFields.startTime];
+                    endTime = multiData[parseInt(index.toString(), 10)][this.parent.eventFields.endTime];
                 }
                 timeElement.innerHTML = this.parent.getTimeString(startTime) + ' - ' +
                     this.parent.getTimeString(endTime);
@@ -19522,7 +19722,7 @@ var ActionBase = /** @__PURE__ @class */ (function () {
             addClass([appointmentElement], CLONE_ELEMENT_CLASS);
             this.monthEvent.applyResourceColor(appointmentElement, event_1, 'backgroundColor', groupOrder);
             setStyleAttribute(appointmentElement, { 'width': appWidth + 'px', 'border': '0px', 'pointer-events': 'none' });
-            var cellTd = workCells[day];
+            var cellTd = workCells[parseInt(day.toString(), 10)];
             if (cellTd && isNullOrUndefined(this.parent.eventDragArea)) {
                 this.monthEvent.renderElement(cellTd, appointmentElement, true);
                 this.actionObj.cloneElement.push(appointmentElement);
@@ -19573,9 +19773,9 @@ var Resize = /** @__PURE__ @class */ (function (_super) {
     Resize.prototype.resizeHelper = function () {
         if (this.parent.activeViewOptions.group.resources.length > 0 && this.parent.activeViewOptions.group.allowGroupEdit) {
             for (var i = 0, len = this.actionObj.originalElement.length; i < len; i++) {
-                var cloneElement = this.createCloneElement(this.actionObj.originalElement[i]);
-                this.actionObj.cloneElement[i] = cloneElement;
-                if (this.actionObj.element === this.actionObj.originalElement[i]) {
+                var cloneElement = this.createCloneElement(this.actionObj.originalElement[parseInt(i.toString(), 10)]);
+                this.actionObj.cloneElement[parseInt(i.toString(), 10)] = cloneElement;
+                if (this.actionObj.element === this.actionObj.originalElement[parseInt(i.toString(), 10)]) {
                     this.actionObj.clone = cloneElement;
                 }
             }
@@ -19940,10 +20140,10 @@ var Resize = /** @__PURE__ @class */ (function (_super) {
             }
             var resizeDate = void 0;
             if (['Year', 'Month', 'Week', 'Date'].indexOf(headerName) !== -1) {
-                resizeDate = new Date(this.parent.activeView.renderDates[cellIndex].getTime());
+                resizeDate = new Date(this.parent.activeView.renderDates[parseInt(cellIndex.toString(), 10)].getTime());
             }
             else {
-                resizeDate = this.parent.getDateFromElement(tr.children[cellIndex]);
+                resizeDate = this.parent.getDateFromElement(tr.children[parseInt(cellIndex.toString(), 10)]);
             }
             if (['TimelineMonth', 'Year', 'Month', 'Week', 'Date'].indexOf(headerName) !== -1 ||
                 !this.parent.activeViewOptions.timeScale.enable) {
@@ -19970,7 +20170,7 @@ var Resize = /** @__PURE__ @class */ (function (_super) {
             var tr = closest(this.actionObj.clone, 'tr');
             var dayIndex = isLeft ? cloneIndex - noOfDays : cloneIndex + noOfDays - 1;
             dayIndex = this.getIndex(dayIndex);
-            resizeTime = this.parent.getDateFromElement(tr.children[dayIndex]);
+            resizeTime = this.parent.getDateFromElement(tr.children[parseInt(dayIndex.toString(), 10)]);
             if (isLeft) {
                 resizeTime.setHours(eventStart.getHours(), eventStart.getMinutes(), eventStart.getSeconds());
             }
@@ -20188,14 +20388,17 @@ var YearEvent = /** @__PURE__ @class */ (function (_super) {
             for (var index = 0; startDate.getTime() < endDate.getTime(); index++) {
                 var start = resetTime(new Date(startDate.getTime()));
                 var end = addDays(new Date(start.getTime()), 1);
+                startDate = addDays(new Date(startDate.getTime()), 1);
+                if (!this.parent.isMinMaxDate(start)) {
+                    continue;
+                }
                 var filterEvents = this.parent.eventBase.filterEvents(start, end);
                 if (filterEvents.length > 0) {
-                    var workCell = workCells[index];
+                    var workCell = workCells[parseInt(index.toString(), 10)];
                     if (workCell) {
                         workCell.appendChild(createElement('div', { className: APPOINTMENT_CLASS }));
                     }
                 }
-                startDate = addDays(new Date(startDate.getTime()), 1);
             }
         }
     };
@@ -20207,12 +20410,14 @@ var YearEvent = /** @__PURE__ @class */ (function (_super) {
         this.eventHeight = getElementHeightFromClass(eventTable, APPOINTMENT_CLASS);
         var wrapperCollection = [].slice.call(this.parent.element.querySelectorAll('.' + APPOINTMENT_CONTAINER_CLASS));
         var months = this.getMonths();
+        var groupIndex = (this.parent.activeViewOptions.group.resources.length > 0 && this.parent.uiStateValues.isGroupAdaptive) ?
+            this.parent.uiStateValues.groupIndex : undefined;
         for (var row = 0; row < months.length; row++) {
-            var wrapper = wrapperCollection[row];
+            var wrapper = wrapperCollection[parseInt(row.toString(), 10)];
             var td = row + 1;
             var eventWrapper = createElement('div', { className: APPOINTMENT_WRAPPER_CLASS });
             wrapper.appendChild(eventWrapper);
-            var monthStart = new Date(this.parent.selectedDate.getFullYear(), months[row], 1);
+            var monthStart = new Date(this.parent.selectedDate.getFullYear(), months[parseInt(row.toString(), 10)], 1);
             var monthEnd = new Date(monthStart.getFullYear(), monthStart.getMonth() + 1, 0);
             var dayIndex = monthStart.getDay();
             var isSpannedCollection = [];
@@ -20223,7 +20428,7 @@ var YearEvent = /** @__PURE__ @class */ (function (_super) {
                 var leftValue = void 0;
                 var rightValue = void 0;
                 if (this.parent.activeViewOptions.orientation === 'Vertical') {
-                    var wrapper_1 = wrapperCollection[dayIndex];
+                    var wrapper_1 = wrapperCollection[parseInt(dayIndex.toString(), 10)];
                     td = dayIndex + 1;
                     var eventWrapper_1 = wrapper_1.querySelector('.' + APPOINTMENT_WRAPPER_CLASS);
                     if (!eventWrapper_1) {
@@ -20256,7 +20461,7 @@ var YearEvent = /** @__PURE__ @class */ (function (_super) {
                 var dayEvents = this.parent.eventBase.filterEvents(dayStart, dayEnd, undefined, resource);
                 dayEvents = this.parent.eventBase.sortByDateTime(dayEvents);
                 var _loop_1 = function (index, count) {
-                    var eventData = extend({}, dayEvents[index], null, true);
+                    var eventData = extend({}, dayEvents[parseInt(index.toString(), 10)], null, true);
                     this_1.updateSpannedEvents(eventData, dayStart, dayEnd);
                     var overlapIndex = this_1.getIndex(dayStart);
                     eventData.Index = overlapIndex;
@@ -20274,7 +20479,7 @@ var YearEvent = /** @__PURE__ @class */ (function (_super) {
                         });
                         if (isRendered.length > 0 && isRendered[0].MoreIndicator || isSpanned.length > 0 && isSpanned[0].MoreIndicator) {
                             var moreIndex = this_1.parent.activeViewOptions.orientation === 'Horizontal' ? row : dayIndex;
-                            this_1.renderMoreIndicator(eventWrapper, moreIndicatorCount, dayStart, moreIndex, leftValue, rightValue);
+                            this_1.renderMoreIndicator(eventWrapper, moreIndicatorCount, dayStart, moreIndex, leftValue, rightValue, groupIndex);
                             return "continue";
                         }
                         else if (isRendered.length > 0 || isSpanned.length > 0) {
@@ -20289,7 +20494,7 @@ var YearEvent = /** @__PURE__ @class */ (function (_super) {
                     }
                     else {
                         var moreIndex = this_1.parent.activeViewOptions.orientation === 'Horizontal' ? row : dayIndex;
-                        this_1.renderMoreIndicator(eventWrapper, moreIndicatorCount, dayStart, moreIndex, leftValue, rightValue);
+                        this_1.renderMoreIndicator(eventWrapper, moreIndicatorCount, dayStart, moreIndex, leftValue, rightValue, groupIndex);
                         if (this_1.parent.activeViewOptions.orientation === 'Horizontal') {
                             eventData.MoreIndicator = true;
                             this_1.renderedEvents.push(eventData);
@@ -20346,10 +20551,10 @@ var YearEvent = /** @__PURE__ @class */ (function (_super) {
         var months = this.getMonths();
         if (this.parent.activeViewOptions.orientation === 'Horizontal') {
             for (var month = 0; month < months.length; month++) {
-                var monthStart = new Date(this.parent.selectedDate.getFullYear(), months[month], 1);
+                var monthStart = new Date(this.parent.selectedDate.getFullYear(), months[parseInt(month.toString(), 10)], 1);
                 for (var i = 0, len = resources.length; i < len; i++) {
                     this.renderedEvents = [];
-                    this.renderResourceEvent(wrapperCollection[month], resources[i], month, i, monthStart);
+                    this.renderResourceEvent(wrapperCollection[parseInt(month.toString(), 10)], resources[parseInt(i.toString(), 10)], month, i, monthStart);
                 }
             }
         }
@@ -20357,8 +20562,8 @@ var YearEvent = /** @__PURE__ @class */ (function (_super) {
             for (var i = 0, len = resources.length; i < len; i++) {
                 this.renderedEvents = [];
                 for (var month = 0; month < months.length; month++) {
-                    var monthStart = new Date(this.parent.selectedDate.getFullYear(), months[month], 1);
-                    this.renderResourceEvent(wrapperCollection[i], resources[i], month, i, monthStart);
+                    var monthStart = new Date(this.parent.selectedDate.getFullYear(), months[parseInt(month.toString(), 10)], 1);
+                    this.renderResourceEvent(wrapperCollection[parseInt(i.toString(), 10)], resources[parseInt(i.toString(), 10)], month, i, monthStart);
                 }
             }
         }
@@ -20373,7 +20578,7 @@ var YearEvent = /** @__PURE__ @class */ (function (_super) {
         this.cellHeight = td.offsetHeight;
         this.groupOrder = resource.groupOrder;
         for (var a = 0; a < eventDatas.length; a++) {
-            var data = eventDatas[a];
+            var data = eventDatas[parseInt(a.toString(), 10)];
             var overlapIndex = void 0;
             var eventData = extend({}, data, null, true);
             if (this.parent.activeViewOptions.group.resources.length > 0) {
@@ -20388,6 +20593,9 @@ var YearEvent = /** @__PURE__ @class */ (function (_super) {
             var availedHeight = this.cellHeader + (this.eventHeight * (a + 1)) + EVENT_GAP$2 + this.moreIndicatorHeight;
             var leftValue = (this.parent.activeViewOptions.orientation === 'Vertical') ?
                 month * this.cellWidth : index * this.cellWidth;
+            if (!this.parent.isMinMaxDate(eventData[this.fields.startTime])) {
+                return;
+            }
             if (this.parent.rowAutoHeight || this.cellHeight > availedHeight) {
                 this.renderEvent(eventWrapper, eventData, month, leftValue, leftValue, monthStart, index);
                 this.updateCellHeight(td, availedHeight);
@@ -20397,7 +20605,7 @@ var YearEvent = /** @__PURE__ @class */ (function (_super) {
                 this.renderMoreIndicator(eventWrapper, eventDatas.length - a, monthStart, moreIndex, leftValue, leftValue, index);
                 if (this.parent.activeViewOptions.orientation === 'Horizontal') {
                     for (var i = index; i < eventDatas.length; i++) {
-                        this.renderedEvents.push(extend({}, eventDatas[i], { Index: overlapIndex + i }, true));
+                        this.renderedEvents.push(extend({}, eventDatas[parseInt(i.toString(), 10)], { Index: overlapIndex + i }, true));
                     }
                 }
                 break;
@@ -20458,7 +20666,7 @@ var YearEvent = /** @__PURE__ @class */ (function (_super) {
             return;
         }
         var endDate;
-        if (this.parent.activeViewOptions.group.resources.length > 0) {
+        if (this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
             endDate = addDays(lastDateOfMonth(new Date(startDate.getTime())), 1);
         }
         else {
@@ -20561,7 +20769,7 @@ var YearEvent = /** @__PURE__ @class */ (function (_super) {
             eventData[this.fields.endTime] = monthEnd;
             isSpanned.isRight = true;
         }
-        if (this.parent.activeViewOptions.group.resources.length === 0) {
+        if (this.parent.activeViewOptions.group.resources.length === 0 || this.parent.uiStateValues.isGroupAdaptive) {
             var end = resetTime(eventData[this.fields.endTime]).getTime();
             var start = resetTime(eventData[this.fields.startTime]).getTime();
             if (eventObj[this.fields.isAllDay] && end === eventObj[this.fields.endTime].getTime() || isSpanned.isRight) {
@@ -20582,7 +20790,7 @@ var YearEvent = /** @__PURE__ @class */ (function (_super) {
         var appointmentsList = [];
         var dateStart;
         var dateEnd;
-        if (this.parent.activeViewOptions.group.resources.length > 0) {
+        if (this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
             var monthStart = this.parent.calendarUtil.getMonthStartDate(new Date(date.getTime()));
             var monthEnd = addDays(this.parent.calendarUtil.getMonthEndDate(new Date(date.getTime())), -1);
             dateStart = resetTime(new Date(monthStart.getTime())).getTime();
@@ -21027,7 +21235,8 @@ var DragAndDrop = /** @__PURE__ @class */ (function (_super) {
                 _this.parent.crudModule.crudObj.sourceEvent =
                     [_this.parent.resourceBase.lastResourceLevel[parseInt(dragArgs.element.getAttribute('data-group-index'), 10)]];
                 var currentGroupIndex = parseInt(dragArgs.target.getAttribute('data-group-index'), 10) || _this.actionObj.groupIndex;
-                _this.parent.crudModule.crudObj.targetEvent = [_this.parent.resourceBase.lastResourceLevel[currentGroupIndex]];
+                _this.parent.crudModule.crudObj.targetEvent =
+                    [_this.parent.resourceBase.lastResourceLevel[parseInt(currentGroupIndex.toString(), 10)]];
             }
             _this.saveChangedData(dragEventArgs, _this.isMultiSelect);
         });
@@ -21222,7 +21431,7 @@ var DragAndDrop = /** @__PURE__ @class */ (function (_super) {
         }
         else {
             var trCollections = [].slice.call(this.parent.getContentTable().querySelectorAll('tr'));
-            tr = trCollections[rowIndex];
+            tr = trCollections[parseInt(rowIndex.toString(), 10)];
         }
         var index;
         if (closest(this.actionObj.target, 'td').classList.contains(WORK_CELLS_CLASS) ||
@@ -21234,7 +21443,7 @@ var DragAndDrop = /** @__PURE__ @class */ (function (_super) {
         if (isNullOrUndefined(tr)) {
             return;
         }
-        var td = tr.children[colIndex];
+        var td = tr.children[parseInt(colIndex.toString(), 10)];
         if (this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
             this.actionObj.groupIndex = parseInt(td.getAttribute('data-group-index'), 10);
         }
@@ -21299,16 +21508,17 @@ var DragAndDrop = /** @__PURE__ @class */ (function (_super) {
             }
             var startTimeDiff = event[this.parent.eventFields.startTime].getTime() - this.startTime;
             for (var index_2 = 0; index_2 < this.multiData.length; index_2++) {
-                this.updatedData[index_2] = this.updateMultipleData(this.multiData[index_2], startTimeDiff);
-                var dayIndex = this.getDayIndex(this.updatedData[index_2]);
+                this.updatedData[parseInt(index_2.toString(), 10)] =
+                    this.updateMultipleData(this.multiData[parseInt(index_2.toString(), 10)], startTimeDiff);
+                var dayIndex = this.getDayIndex(this.updatedData[parseInt(index_2.toString(), 10)]);
                 if (dayIndex >= 0) {
-                    var wrapper = this.getEventWrapper(dayIndex, this.updatedData[index_2][this.parent.eventFields.isAllDay]);
-                    this.appendCloneElement(wrapper, this.actionObj.cloneElement[index_2]);
-                    this.updateEventHeight(this.updatedData[index_2], index_2, dayIndex);
+                    var wrapper = this.getEventWrapper(dayIndex, this.updatedData[parseInt(index_2.toString(), 10)][this.parent.eventFields.isAllDay]);
+                    this.appendCloneElement(wrapper, this.actionObj.cloneElement[parseInt(index_2.toString(), 10)]);
+                    this.updateEventHeight(this.updatedData[parseInt(index_2.toString(), 10)], index_2, dayIndex);
                 }
                 else {
-                    if (!isNullOrUndefined(this.actionObj.cloneElement[index_2].parentNode)) {
-                        remove(this.actionObj.cloneElement[index_2]);
+                    if (!isNullOrUndefined(this.actionObj.cloneElement[parseInt(index_2.toString(), 10)].parentNode)) {
+                        remove(this.actionObj.cloneElement[parseInt(index_2.toString(), 10)]);
                     }
                 }
             }
@@ -21336,7 +21546,7 @@ var DragAndDrop = /** @__PURE__ @class */ (function (_super) {
             }
             var index = eventData.length - 1;
             eventData[0][eventFields.startTime] = startTime;
-            eventData[index][eventFields.endTime] = endTime;
+            eventData[parseInt(index.toString(), 10)][eventFields.endTime] = endTime;
         }
         else {
             eventData.push(event);
@@ -21393,8 +21603,8 @@ var DragAndDrop = /** @__PURE__ @class */ (function (_super) {
         var datesCount = this.verticalEvent.getStartCount();
         if (!this.parent.uiStateValues.isGroupAdaptive) {
             for (var i = 0; i < this.actionObj.groupIndex; i++) {
-                if (this.verticalEvent.dateRender[i]) {
-                    datesCount = datesCount + this.verticalEvent.dateRender[i].length;
+                if (this.verticalEvent.dateRender[parseInt(i.toString(), 10)]) {
+                    datesCount = datesCount + this.verticalEvent.dateRender[parseInt(i.toString(), 10)].length;
                 }
             }
         }
@@ -21405,7 +21615,7 @@ var DragAndDrop = /** @__PURE__ @class */ (function (_super) {
             var dynamicIndex = -1;
             var dayIndex = !this.parent.activeViewOptions.group.byDate ?
                 isNullOrUndefined(index) ? this.actionObj.index - datesCount : colIndex - datesCount
-                : this.parent.getIndexOfDate(this.verticalEvent.dateRender[indexGroup], resetTime(
+                : this.parent.getIndexOfDate(this.verticalEvent.dateRender[parseInt(indexGroup.toString(), 10)], resetTime(
                 // eslint-disable-next-line max-len
                 this.parent.getDateFromElement(isNullOrUndefined(index) ? this.actionObj.target : this.targetTd)));
             var splitEvents = this.splitEvent(event);
@@ -21413,7 +21623,7 @@ var DragAndDrop = /** @__PURE__ @class */ (function (_super) {
                 this.parent.eventSettings.spannedEventPlacement !== 'TimeSlot' ? [event] : splitEvents;
             for (var i = 0; i < events_1.length; i++) {
                 if (i > 0) {
-                    var filterQuery = ".e-day-wrapper[data-date=\"" + resetTime(events_1[i][this.parent.eventFields.startTime]).getTime() + "\"]";
+                    var filterQuery = ".e-day-wrapper[data-date=\"" + resetTime(events_1[parseInt(i.toString(), 10)][this.parent.eventFields.startTime]).getTime() + "\"]";
                     if (this.parent.activeViewOptions.group.resources.length > 0) {
                         filterQuery = filterQuery.concat('[data-group-index = "' + this.actionObj.groupIndex + '"]');
                     }
@@ -21427,7 +21637,7 @@ var DragAndDrop = /** @__PURE__ @class */ (function (_super) {
                     }
                 }
                 if (dayIndex >= 0) {
-                    var record = this.verticalEvent.isSpannedEvent(events_1[i], dayIndex, indexGroup);
+                    var record = this.verticalEvent.isSpannedEvent(events_1[parseInt(i.toString(), 10)], dayIndex, indexGroup);
                     var eStart = record[this.verticalEvent.fields.startTime];
                     var eEnd = record[this.verticalEvent.fields.endTime];
                     var appHeight = this.parent.activeViewOptions.timeScale.enable ? this.verticalEvent.getHeight(eStart, eEnd) :
@@ -21455,12 +21665,12 @@ var DragAndDrop = /** @__PURE__ @class */ (function (_super) {
                                 appWidth = (allDayDifference * this.actionObj.cellWidth);
                             }
                         }
-                        if (this.actionObj.cloneElement[index]) {
+                        if (this.actionObj.cloneElement[parseInt(index.toString(), 10)]) {
                             if (i === 0) {
-                                this.actionObj.cloneElement[index].style.top = formatUnit(topValue);
-                                this.actionObj.cloneElement[index].style.height = formatUnit(appHeight);
-                                this.actionObj.cloneElement[index].style.width = formatUnit(appWidth);
-                                this.actionObj.cloneElement[index].style.left = formatUnit(0);
+                                this.actionObj.cloneElement[parseInt(index.toString(), 10)].style.top = formatUnit(topValue);
+                                this.actionObj.cloneElement[parseInt(index.toString(), 10)].style.height = formatUnit(appHeight);
+                                this.actionObj.cloneElement[parseInt(index.toString(), 10)].style.width = formatUnit(appWidth);
+                                this.actionObj.cloneElement[parseInt(index.toString(), 10)].style.left = formatUnit(0);
                             }
                             else {
                                 this.renderSpannedEvents(record, dynamicIndex, topValue, appHeight);
@@ -21485,7 +21695,7 @@ var DragAndDrop = /** @__PURE__ @class */ (function (_super) {
                 'border': '0px'
             });
             var appointmentWrap = [].slice.call(this.parent.element.querySelectorAll('.' + APPOINTMENT_WRAPPER_CLASS));
-            appointmentWrap[index].appendChild(appointmentElement);
+            appointmentWrap[parseInt(index.toString(), 10)].appendChild(appointmentElement);
         }
     };
     DragAndDrop.prototype.getRenderedDates = function () {
@@ -21603,12 +21813,13 @@ var DragAndDrop = /** @__PURE__ @class */ (function (_super) {
                 startTimeDiff += startTime.getMonth();
             }
             for (var index = 0; index < this.multiData.length; index++) {
-                this.updatedData[index] = this.updateMultipleVerticalDate(this.multiData[index], startTimeDiff);
+                this.updatedData[parseInt(index.toString(), 10)] =
+                    this.updateMultipleVerticalDate(this.multiData[parseInt(index.toString(), 10)], startTimeDiff);
                 if (this.parent.currentView === 'TimelineYear') {
-                    this.dynamicYearlyEventsRendering(this.updatedData[index]);
+                    this.dynamicYearlyEventsRendering(this.updatedData[parseInt(index.toString(), 10)]);
                 }
                 else {
-                    this.dynamicEventsRendering(this.updatedData[index]);
+                    this.dynamicEventsRendering(this.updatedData[parseInt(index.toString(), 10)]);
                 }
             }
         }
@@ -21671,8 +21882,8 @@ var DragAndDrop = /** @__PURE__ @class */ (function (_super) {
         var tr = this.parent.getContentTable().querySelector('tr');
         var index = this.getCursorCurrentIndex(colIndex, cloneIndex, tr);
         index = index < 0 ? 0 : index;
-        var eventStart = this.isHeaderRows ? new Date(this.timelineEventModule.dateRender[index].getTime()) :
-            this.parent.getDateFromElement(tr.children[index]);
+        var eventStart = this.isHeaderRows ? new Date(this.timelineEventModule.dateRender[parseInt(index.toString(), 10)].getTime()) :
+            this.parent.getDateFromElement(tr.children[parseInt(index.toString(), 10)]);
         if (this.isStepDragging) {
             var widthDiff = this.getWidthDiff(tr, index);
             if (widthDiff !== 0) {
@@ -21723,12 +21934,13 @@ var DragAndDrop = /** @__PURE__ @class */ (function (_super) {
         if (this.multiData.length > 0) {
             var startTimeDiff = eventsData[0][this.parent.eventFields.startTime].getTime() - this.startTime;
             for (var i = 0; i < this.multiData.length; i++) {
-                this.updatedData[i] = this.updateMultipleData(this.multiData[i], startTimeDiff);
+                this.updatedData[parseInt(i.toString(), 10)] =
+                    this.updateMultipleData(this.multiData[parseInt(i.toString(), 10)], startTimeDiff);
             }
             eventsData = this.updatedData;
         }
         for (var dataIndex = 0; dataIndex < eventsData.length; dataIndex++) {
-            var events_2 = this.timelineEventModule.splitEvent(eventsData[dataIndex], this.timelineEventModule.dateRender);
+            var events_2 = this.timelineEventModule.splitEvent(eventsData[parseInt(dataIndex.toString(), 10)], this.timelineEventModule.dateRender);
             var eventData = events_2[0].data;
             var startTime = this.timelineEventModule.getStartTime(events_2[0], eventData);
             var endTime = this.timelineEventModule.getEndTime(events_2[0], eventData);
@@ -21738,7 +21950,7 @@ var DragAndDrop = /** @__PURE__ @class */ (function (_super) {
             var day = this.parent.getIndexOfDate(this.timelineEventModule.dateRender, resetTime(new Date(startTime.getTime())));
             day = day < 0 ? 0 : day;
             var left = this.timelineEventModule.getPosition(startTime, endTime, eventObj[this.parent.eventFields.isAllDay], day);
-            var cloneElement = this.multiData.length > 0 ? this.actionObj.cloneElement[dataIndex] : this.actionObj.clone;
+            var cloneElement = this.multiData.length > 0 ? this.actionObj.cloneElement[parseInt(dataIndex.toString(), 10)] : this.actionObj.clone;
             if (this.parent.enableRtl) {
                 cloneElement.style.right = formatUnit(left);
             }
@@ -21798,7 +22010,7 @@ var DragAndDrop = /** @__PURE__ @class */ (function (_super) {
     DragAndDrop.prototype.getWidthDiff = function (tr, index) {
         var pages = this.scrollArgs.element.getBoundingClientRect();
         if (pages.left <= this.actionObj.pageX && pages.right >= this.actionObj.pageX) {
-            var targetLeft = tr.children[index].offsetLeft;
+            var targetLeft = tr.children[parseInt(index.toString(), 10)].offsetLeft;
             var pageX = this.actionObj.pageX - pages.left;
             if (this.parent.enableRtl) {
                 return (targetLeft + this.actionObj.cellWidth) - (this.scrollArgs.element.scrollLeft + pageX);
@@ -21868,7 +22080,7 @@ var DragAndDrop = /** @__PURE__ @class */ (function (_super) {
         var td = closest(this.actionObj.target, 'td');
         this.actionObj.groupIndex = (td && !isNaN(parseInt(td.getAttribute('data-group-index'), 10)))
             ? parseInt(td.getAttribute('data-group-index'), 10) : this.actionObj.groupIndex;
-        var top = trCollection[rowIndex].getBoundingClientRect().height * rowIndex;
+        var top = trCollection[parseInt(rowIndex.toString(), 10)].getBoundingClientRect().height * rowIndex;
         if (this.parent.rowAutoHeight) {
             var cursorElement = this.getCursorElement(e);
             if (cursorElement) {
@@ -21952,6 +22164,7 @@ var ViewBase = /** @__PURE__ @class */ (function () {
      * @param {Schedule} parent Accepts the schedule instance
      */
     function ViewBase(parent) {
+        this.previousNextAction = 'next';
         this.parent = parent;
     }
     ViewBase.prototype.isTimelineView = function () {
@@ -22001,7 +22214,7 @@ var ViewBase = /** @__PURE__ @class */ (function () {
         for (var row = 0; row < trCount; row++) {
             eventContainer = createElement('div', { className: APPOINTMENT_CONTAINER_CLASS });
             if (this.parent.resourceBase && !this.parent.uiStateValues.isGroupAdaptive && this.parent.resourceBase.renderedResources) {
-                eventContainer.setAttribute('data-group-index', this.parent.resourceBase.renderedResources[row].groupIndex.toString());
+                eventContainer.setAttribute('data-group-index', this.parent.resourceBase.renderedResources[parseInt(row.toString(), 10)].groupIndex.toString());
             }
             eventRows.push(eventContainer);
         }
@@ -22129,6 +22342,12 @@ var ViewBase = /** @__PURE__ @class */ (function () {
     ViewBase.prototype.highlightCurrentTime = function () {
         // Here showTimeIndicator functionalities
     };
+    ViewBase.prototype.getStartDate = function () {
+        return this.renderDates[0];
+    };
+    ViewBase.prototype.getEndDate = function () {
+        return this.renderDates[this.renderDates.length - 1];
+    };
     ViewBase.prototype.startDate = function () {
         return this.renderDates[0];
     };
@@ -22228,6 +22447,7 @@ var ViewBase = /** @__PURE__ @class */ (function () {
         return renderDates;
     };
     ViewBase.prototype.getNextPreviousDate = function (type) {
+        this.previousNextAction = type;
         if (this.parent.currentView === 'Day' || this.parent.currentView === 'TimelineDay') {
             if (this.parent.activeViewOptions.showWeekend) {
                 var daysCount = this.parent.activeViewOptions.interval;
@@ -22498,8 +22718,8 @@ var ViewBase = /** @__PURE__ @class */ (function () {
             if (index >= renderedCount) {
                 break;
             }
-            index += lastLevel[i].colSpan;
-            this.parent.resourceBase.expandedResources.push(lastLevel[i]);
+            index += lastLevel[parseInt(i.toString(), 10)].colSpan;
+            this.parent.resourceBase.expandedResources.push(lastLevel[parseInt(i.toString(), 10)]);
         }
         if (this.parent.activeViewOptions.group.byDate) {
             this.colLevels[0] = this.parent.resourceBase.expandedResources;
@@ -22635,6 +22855,9 @@ var VerticalView = /** @__PURE__ @class */ (function (_super) {
         }
         if (!args.isPreventScrollUpdate) {
             if (this.parent.uiStateValues.isInitial) {
+                if (this.parent.currentView.indexOf('Timeline') > -1) {
+                    content.scrollTop = this.parent.uiStateValues.top;
+                }
                 this.scrollToWorkHour();
                 this.parent.uiStateValues.isInitial = false;
             }
@@ -22700,6 +22923,18 @@ var VerticalView = /** @__PURE__ @class */ (function (_super) {
         var columnLevels = [];
         if (this.parent.activeViewOptions.group.resources.length > 0) {
             columnLevels = this.parent.resourceBase.generateResourceLevels(level);
+            if (this.parent.activeViewOptions.group.hideNonWorkingDays) {
+                while (columnLevels[0].length === 0) {
+                    this.parent.setProperties({ selectedDate: this.parent.activeView.getNextPreviousDate(this.previousNextAction) }, true);
+                    this.parent.activeView.getRenderDates();
+                    if (this.parent.headerModule) {
+                        this.parent.headerModule.setCalendarDate(this.parent.selectedDate);
+                        this.parent.headerModule.updateDateRange();
+                    }
+                    level = this.getDateSlots(this.renderDates, this.parent.activeViewOptions.workDays);
+                    columnLevels = this.parent.resourceBase.generateResourceLevels(level);
+                }
+            }
             if (this.parent.uiStateValues.isGroupAdaptive && this.parent.resourceBase.lastResourceLevel.length > 0) {
                 var resourceLevel = this.parent.resourceBase.lastResourceLevel[this.parent.uiStateValues.groupIndex];
                 var resStartHour = resourceLevel.resourceData[resourceLevel.resource.startHourField];
@@ -22847,11 +23082,11 @@ var VerticalView = /** @__PURE__ @class */ (function (_super) {
         }
         var curTimeWrap = [].slice.call(this.element.querySelectorAll('.' + TIMELINE_WRAPPER_CLASS));
         for (var i = 0, length_1 = currentDateIndex[0]; i < length_1; i++) {
-            curTimeWrap[i].appendChild(createElement('div', { className: PREVIOUS_TIMELINE_CLASS, styles: 'top:' + topInPx }));
+            curTimeWrap[parseInt(i.toString(), 10)].appendChild(createElement('div', { className: PREVIOUS_TIMELINE_CLASS, styles: 'top:' + topInPx }));
         }
         for (var _i = 0, currentDateIndex_1 = currentDateIndex; _i < currentDateIndex_1.length; _i++) {
             var day = currentDateIndex_1[_i];
-            curTimeWrap[day].appendChild(createElement('div', { className: CURRENT_TIMELINE_CLASS, styles: 'top:' + topInPx }));
+            curTimeWrap[parseInt(day.toString(), 10)].appendChild(createElement('div', { className: CURRENT_TIMELINE_CLASS, styles: 'top:' + topInPx }));
         }
         var currentTimeEle = createElement('div', {
             innerHTML: this.parent.getTimeString(this.parent.getCurrentTime()),
@@ -22860,8 +23095,8 @@ var VerticalView = /** @__PURE__ @class */ (function (_super) {
         });
         if (rowIndex <= timeTrs.length) {
             removeClass(timeCellsWrap.querySelectorAll('.' + HIDE_CHILDS_CLASS), HIDE_CHILDS_CLASS);
-            if (timeTrs[rowIndex]) {
-                addClass([timeTrs[rowIndex].lastElementChild], HIDE_CHILDS_CLASS);
+            if (timeTrs[parseInt(rowIndex.toString(), 10)]) {
+                addClass([timeTrs[parseInt(rowIndex.toString(), 10)].lastElementChild], HIDE_CHILDS_CLASS);
             }
             prepend([currentTimeEle], timeCellsWrap);
             currentTimeEle.style.top = formatUnit(currentTimeEle.offsetTop - (currentTimeEle.offsetHeight / 2));
@@ -23020,7 +23255,7 @@ var VerticalView = /** @__PURE__ @class */ (function (_super) {
         var nth;
         for (var i = 0; i < rowCount; i++) {
             var ntr_1 = trEle.cloneNode();
-            var data_1 = { className: [(this.colLevels[i][0] && this.colLevels[i][0].className[0])], type: 'emptyCells' };
+            var data_1 = { className: [(this.colLevels[parseInt(i.toString(), 10)][0] && this.colLevels[parseInt(i.toString(), 10)][0].className[0])], type: 'emptyCells' };
             if (this.parent.activeViewOptions.showWeekNumber && data_1.className.indexOf(HEADER_CELLS_CLASS) !== -1) {
                 data_1.className.push(WEEK_NUMBER_CLASS);
                 var weekNo = this.parent.getWeekNumberContent(this.renderDates);
@@ -23062,9 +23297,9 @@ var VerticalView = /** @__PURE__ @class */ (function (_super) {
         var lastLevel = this.colLevels[rowCount - 1];
         for (var i = 0; i < rowCount; i++) {
             var ntr = trEle.cloneNode();
-            var level = this.colLevels[i];
+            var level = this.colLevels[parseInt(i.toString(), 10)];
             for (var j = 0; j < level.length; j++) {
-                ntr.appendChild(this.createTd(level[j]));
+                ntr.appendChild(this.createTd(level[parseInt(j.toString(), 10)]));
             }
             tbl.querySelector('tbody').appendChild(ntr);
         }
@@ -23076,7 +23311,7 @@ var VerticalView = /** @__PURE__ @class */ (function (_super) {
     VerticalView.prototype.createAllDayRow = function (table, tdData) {
         var ntr = createElement('tr', { className: ALLDAY_ROW_CLASS });
         for (var j = 0; j < tdData.length; j++) {
-            var td = extend({}, tdData[j]);
+            var td = extend({}, tdData[parseInt(j.toString(), 10)]);
             td.className = [ALLDAY_CELLS_CLASS];
             td.type = 'alldayCells';
             var ntd = this.createTd(td);
@@ -23305,7 +23540,7 @@ var VerticalView = /** @__PURE__ @class */ (function (_super) {
             var startDate = new Date(new Date(timeSlots[0].date.getTime()).
                 setHours(startTime.getHours(), startTime.getMinutes(), startTime.getMilliseconds()));
             for (var i = 0; i < timeSlots.length; i++) {
-                if (timeSlots[i].date.getTime() > startDate.getTime()) {
+                if (timeSlots[parseInt(i.toString(), 10)].date.getTime() > startDate.getTime()) {
                     startTime.setHours(timeSlots[i - 1].date.getHours(), timeSlots[i - 1].date.getMinutes(), timeSlots[i - 1].date.getMilliseconds());
                     return new Date(startTime);
                 }
@@ -23598,7 +23833,9 @@ var Month = /** @__PURE__ @class */ (function (_super) {
         }
         if (leftPanelElement) {
             if (this.parent.currentView === 'MonthAgenda') {
-                height = this.element.querySelector('.' + CONTENT_TABLE_CLASS).offsetHeight;
+                height = (this.parent.activeViewOptions.interval > 1) ?
+                    this.getContentAreaElement().firstElementChild.offsetHeight :
+                    this.element.querySelector('.' + CONTENT_TABLE_CLASS).offsetHeight;
             }
             leftPanelElement.style.height = 'auto';
             leftPanelElement.style.height = formatUnit(height - this.getScrollXIndent(content));
@@ -23614,7 +23851,14 @@ var Month = /** @__PURE__ @class */ (function (_super) {
             }
             if (this.parent.uiStateValues.isGroupAdaptive && this.parent.resourceBase.lastResourceLevel.length > 0) {
                 var resourceLevel = this.parent.resourceBase.lastResourceLevel[this.parent.uiStateValues.groupIndex];
-                colLevels = [this.getDateSlots(resourceLevel.renderDates, resourceLevel.workDays)];
+                var levels_1 = this.getDateSlots(resourceLevel.renderDates, resourceLevel.workDays);
+                if (this.parent.activeViewOptions.group.byDate && this.parent.activeViewOptions.group.hideNonWorkingDays) {
+                    var index = levels_1.findIndex(function (x, index) {
+                        return index !== 0 && x.date.getDay() === levels_1[0].date.getDay();
+                    });
+                    levels_1 = index > -1 ? levels_1.slice(0, index) : levels_1;
+                }
+                colLevels = [levels_1];
             }
         }
         else {
@@ -23633,7 +23877,7 @@ var Month = /** @__PURE__ @class */ (function (_super) {
             if (isCurrentMonth && currentDateIndex.indexOf(this.parent.getCurrentTime().getDay()) === col) {
                 classList$$1.push(CURRENT_DAY_CLASS);
             }
-            dateSlots.push({ date: renderDates[col], type: 'monthDay', className: classList$$1, colSpan: 1, workDays: workDays });
+            dateSlots.push({ date: renderDates[parseInt(col.toString(), 10)], type: 'monthDay', className: classList$$1, colSpan: 1, workDays: workDays });
         }
         return dateSlots;
     };
@@ -23650,6 +23894,9 @@ var Month = /** @__PURE__ @class */ (function (_super) {
         clsList.push(type);
         if (this.parent.activeViewOptions.group.byDate) {
             clsList.push('e-by-date');
+            if (this.parent.currentView !== 'Month') {
+                this.parent.activeViewOptions.group.hideNonWorkingDays = false;
+            }
         }
         if (this.parent.activeViewOptions.allowVirtualScrolling && !this.parent.uiStateValues.isGroupAdaptive) {
             clsList.push(VIRTUAL_SCROLL_CLASS);
@@ -23763,10 +24010,10 @@ var Month = /** @__PURE__ @class */ (function (_super) {
         this.createColGroup(table, this.colLevels[this.colLevels.length - 1]);
         var trEle = createElement('tr');
         for (var i = 0; i < this.colLevels.length; i++) {
-            var level = this.colLevels[i];
+            var level = this.colLevels[parseInt(i.toString(), 10)];
             var ntr = trEle.cloneNode();
             for (var j = 0; j < level.length; j++) {
-                var td = level[j];
+                var td = level[parseInt(j.toString(), 10)];
                 ntr.appendChild(this.createHeaderCell(td));
             }
             table.querySelector('tbody').appendChild(ntr);
@@ -23824,10 +24071,10 @@ var Month = /** @__PURE__ @class */ (function (_super) {
                 date: new Date(+renderDate), groupIndex: resData.groupIndex, workDays: resData.workDays,
                 type: 'monthCells', className: classList$$1 || [WORK_CELLS_CLASS]
             };
-            if (!slotDatas[rowIndex]) {
-                slotDatas[rowIndex] = [];
+            if (!slotDatas[parseInt(rowIndex.toString(), 10)]) {
+                slotDatas[parseInt(rowIndex.toString(), 10)] = [];
             }
-            slotDatas[rowIndex].push(data);
+            slotDatas[parseInt(rowIndex.toString(), 10)].push(data);
         };
         var includeResource = this.parent.currentView !== 'MonthAgenda' &&
             this.parent.activeViewOptions.group.resources.length > 0;
@@ -23853,22 +24100,38 @@ var Month = /** @__PURE__ @class */ (function (_super) {
             var startIndex = this.renderDates.map(Number).indexOf(+level[0].date);
             for (var i = 0; i < (this.renderDates.length / count); i++) {
                 var colDates = dates.splice(0, count);
-                for (var j = startIndex; j < (this.colLevels[0].length + startIndex) && j < colDates.length; j++) {
-                    var colDate = colDates[j];
+                var k = startIndex;
+                var _loop_1 = function (j) {
+                    var colDate = colDates[parseInt(k.toString(), 10)];
+                    k++;
                     if (includeResource) {
-                        var lastRow = this.colLevels[(this.colLevels.length - 1)];
-                        var resourcesTd = lastRow.slice(0, lastRow.length / count);
+                        var lastRow = this_1.colLevels[(this_1.colLevels.length - 1)];
+                        var rowCount = lastRow.length / count;
+                        var resourcesTd = lastRow.slice(0, rowCount);
+                        if (this_1.parent.activeViewOptions.group.hideNonWorkingDays) {
+                            resourcesTd = lastRow.filter(function (x) { return x.date.getDay() === colDate.getDay(); });
+                            if (resourcesTd.length === 0) {
+                                j = j - 1;
+                                return out_j_1 = j, "continue";
+                            }
+                        }
                         for (var resIndex = 0; resIndex < resourcesTd.length; resIndex++) {
                             var clsList = void 0;
                             if (resIndex !== 0) {
                                 clsList = [WORK_CELLS_CLASS, DISABLE_DATE];
                             }
-                            prepareSlots(i, colDate, resourcesTd[resIndex], clsList);
+                            prepareSlots(i, colDate, resourcesTd[parseInt(resIndex.toString(), 10)], clsList);
                         }
                     }
                     else {
-                        prepareSlots(i, colDate, this.colLevels[this.colLevels.length - 1][0]);
+                        prepareSlots(i, colDate, this_1.colLevels[this_1.colLevels.length - 1][0]);
                     }
+                    out_j_1 = j;
+                };
+                var this_1 = this, out_j_1;
+                for (var j = startIndex; j < (this.colLevels[0].length + startIndex) && j < colDates.length; j++) {
+                    _loop_1(j);
+                    j = out_j_1;
                 }
             }
         }
@@ -23912,8 +24175,8 @@ var Month = /** @__PURE__ @class */ (function (_super) {
         var slotDatas = this.getContentSlots();
         for (var row = 0; row < slotDatas.length; row++) {
             var ntr = tr.cloneNode();
-            for (var col = 0; col < slotDatas[row].length; col++) {
-                var ntd = this.createContentTd(slotDatas[row][col], td);
+            for (var col = 0; col < slotDatas[parseInt(row.toString(), 10)].length; col++) {
+                var ntd = this.createContentTd(slotDatas[parseInt(row.toString(), 10)][parseInt(col.toString(), 10)], td);
                 ntr.appendChild(ntd);
             }
             trows.push(ntr);
@@ -24235,7 +24498,7 @@ var Year = /** @__PURE__ @class */ (function (_super) {
     Year.prototype.renderCalendarHeader = function (currentDate) {
         var headerWrapper = createElement('div', { className: 'e-header e-month' });
         var headerContent = createElement('div', { className: 'e-day e-title' });
-        if (this.parent.monthHeaderTemplate) {
+        if (this.parent.activeViewOptions.monthHeaderTemplate) {
             var args = { date: currentDate, type: 'monthHeader' };
             this.renderTemplates(this.parent.getMonthHeaderTemplate(), args, 'monthHeaderTemplate', this.parent.activeViewOptions.monthHeaderTemplateName, headerContent);
         }
@@ -24259,7 +24522,7 @@ var Year = /** @__PURE__ @class */ (function (_super) {
             tr.appendChild(createElement('th'));
         }
         for (var i = 0; i < WEEK_LENGTH; i++) {
-            if (this.parent.dayHeaderTemplate) {
+            if (this.parent.activeViewOptions.dayHeaderTemplate) {
                 var th = createElement('th');
                 var args = { date: currentWeek, type: 'dayHeader' };
                 this.renderTemplates(this.parent.getDayHeaderTemplate(), args, 'dayHeaderTemplate', this.parent.activeViewOptions.dayHeaderTemplateName, th);
@@ -24318,9 +24581,14 @@ var Year = /** @__PURE__ @class */ (function (_super) {
                     addClass([td], classList$$1);
                 }
                 tr_1.appendChild(td);
-                EventHandler.add(td, 'click', this.onCellClick, this);
-                if (!this.parent.isAdaptive) {
-                    EventHandler.add(td, 'dblclick', this.parent.workCellAction.cellDblClick, this.parent.workCellAction);
+                if (!this.parent.isMinMaxDate(date)) {
+                    addClass([td], DISABLE_DATES);
+                }
+                else {
+                    EventHandler.add(td, 'click', this.onCellClick, this);
+                    if (!this.parent.isAdaptive) {
+                        EventHandler.add(td, 'dblclick', this.parent.workCellAction.cellDblClick, this.parent.workCellAction);
+                    }
                 }
                 this.parent.trigger(renderCell, { elementType: 'workCells', element: td, date: date });
             }
@@ -24488,6 +24756,7 @@ var Year = /** @__PURE__ @class */ (function (_super) {
         if (!args.isPreventScrollUpdate) {
             if (this.parent.uiStateValues.isInitial) {
                 this.parent.uiStateValues.isInitial = false;
+                this.parent.uiStateValues.top = this.parent.uiStateValues.left = 0;
             }
             else {
                 if (leftPanelElement) {
@@ -24623,40 +24892,41 @@ var AgendaBase = /** @__PURE__ @class */ (function (_super) {
             listElements.forEach(function (element, li) {
                 var appWrapper = createElement('div', {
                     className: APPOINTMENT_CLASS, attrs: {
-                        'data-id': 'Appointment_' + listData[li][_this.parent.eventFields.id],
-                        'data-guid': listData[li].Guid,
+                        'data-id': 'Appointment_' + listData[parseInt(li.toString(), 10)]["" + _this.parent.eventFields.id],
+                        'data-guid': listData[parseInt(li.toString(), 10)].Guid,
                         'role': 'button',
                         'tabindex': '0',
-                        'aria-disabled': _this.parent.eventBase.getReadonlyAttribute(listData[li]),
+                        'aria-disabled': _this.parent.eventBase.getReadonlyAttribute(listData[parseInt(li.toString(), 10)]),
                         'aria-pressed': 'false',
-                        'aria-label': _this.parent.getAnnouncementString(listData[li])
+                        'aria-label': _this.parent.getAnnouncementString(listData[parseInt(li.toString(), 10)])
                     }
                 });
                 if (!isNullOrUndefined(groupIndex)) {
                     appWrapper.setAttribute('data-group-index', groupIndex.toString());
                 }
-                _this.parent.eventBase.applyResourceColor(appWrapper, listData[li], 'borderColor', groupOrder);
+                _this.parent.eventBase.applyResourceColor(appWrapper, listData[parseInt(li.toString(), 10)], 'borderColor', groupOrder);
                 var templateEle;
                 if (!isNullOrUndefined(_this.parent.activeViewOptions.eventTemplate)) {
                     addClass([appWrapper], EVENT_TEMPLATE);
                     var scheduleId = _this.parent.element.id + '_';
                     var viewName = _this.parent.activeViewOptions.eventTemplateName;
                     var templateId = scheduleId + viewName + 'eventTemplate';
-                    templateEle = _this.parent.getAppointmentTemplate()(listData[li], _this.parent, 'eventTemplate', templateId, false);
-                    if (!isNullOrUndefined(listData[li][fieldMapping.recurrenceRule])) {
-                        var iconClass = (listData[li][fieldMapping.id] === listData[li][fieldMapping.recurrenceID]) ?
+                    templateEle = _this.parent.getAppointmentTemplate()(listData[parseInt(li.toString(), 10)], _this.parent, 'eventTemplate', templateId, false);
+                    if (!isNullOrUndefined(listData[parseInt(li.toString(), 10)][fieldMapping.recurrenceRule])) {
+                        var iconClass = (listData[parseInt(li.toString(), 10)][fieldMapping.id] ===
+                            listData[parseInt(li.toString(), 10)][fieldMapping.recurrenceID]) ?
                             EVENT_RECURRENCE_ICON_CLASS : EVENT_RECURRENCE_EDIT_ICON_CLASS;
                         appWrapper.appendChild(createElement('div', { className: ICON + ' ' + iconClass }));
                     }
                 }
                 else {
-                    templateEle = _this.createAppointment(listData[li]);
+                    templateEle = _this.createAppointment(listData[parseInt(li.toString(), 10)]);
                 }
                 append([].slice.call(templateEle), appWrapper);
                 removeChildren(element);
                 element.appendChild(appWrapper);
                 var args = {
-                    data: extend({}, listData[li], null, true),
+                    data: extend({}, listData[parseInt(li.toString(), 10)], null, true),
                     element: element, cancel: false
                 };
                 _this.parent.trigger(eventRendered, args, function (eventArgs) {
@@ -24758,7 +25028,7 @@ var AgendaBase = /** @__PURE__ @class */ (function (_super) {
                     var data = [];
                     agendaDate = firstDate;
                     // eslint-disable-next-line max-len
-                    var resDataCollection = this.parent.eventBase.filterEvents(agendaDate, agendaLastDate, agendaCollection, resData[res]);
+                    var resDataCollection = this.parent.eventBase.filterEvents(agendaDate, agendaLastDate, agendaCollection, resData[parseInt(res.toString(), 10)]);
                     if (resDataCollection.length > 0 || !this.parent.hideEmptyAgendaDays || this.parent.currentView === 'MonthAgenda') {
                         for (var r = 0; r < noOfDays; r++) {
                             // eslint-disable-next-line max-len
@@ -24768,19 +25038,22 @@ var AgendaBase = /** @__PURE__ @class */ (function (_super) {
                                 data.push(resDayCollection[0]);
                                 eventObj = {
                                     rowSpan: 1, type: 'eventColumn', resource: resColl[resColl.length - 1],
-                                    groupIndex: resData[res].groupIndex, groupOrder: resData[res].groupOrder,
-                                    resourceData: resData[res].resourceData, eventData: resDayCollection, date: agendaDate
+                                    groupIndex: resData[parseInt(res.toString(), 10)].groupIndex,
+                                    groupOrder: resData[parseInt(res.toString(), 10)].groupOrder,
+                                    resourceData: resData[parseInt(res.toString(), 10)].resourceData,
+                                    eventData: resDayCollection, date: agendaDate
                                 };
                                 dateObj = {
-                                    rowSpan: 1, type: 'dateColumn', resource: resColl[resColl.length - 1],
-                                    groupOrder: resData[res].groupOrder, resourceData: resData[res].resourceData,
+                                    rowSpan: 1, type: 'dateColumn', resource: resColl[parseInt((resColl.length - 1).toString(), 10)],
+                                    groupOrder: resData[parseInt(res.toString(), 10)].groupOrder,
+                                    resourceData: resData[parseInt(res.toString(), 10)].resourceData,
                                     date: agendaDate
                                 };
-                                if (!lastLevelInfo[tempIndex]) {
-                                    lastLevelInfo[tempIndex] = [];
+                                if (!lastLevelInfo[parseInt(tempIndex.toString(), 10)]) {
+                                    lastLevelInfo[parseInt(tempIndex.toString(), 10)] = [];
                                 }
-                                lastLevelInfo[tempIndex].push(eventObj);
-                                lastLevelInfo[tempIndex].push(dateObj);
+                                lastLevelInfo[parseInt(tempIndex.toString(), 10)].push(eventObj);
+                                lastLevelInfo[parseInt(tempIndex.toString(), 10)].push(dateObj);
                                 tempIndex++;
                             }
                             agendaDate = addDays(agendaDate, 1);
@@ -24788,12 +25061,13 @@ var AgendaBase = /** @__PURE__ @class */ (function (_super) {
                                 || this.parent.currentView === 'MonthAgenda') {
                                 lastLevelInfo[lastLevelInfo.length - 1][1].cssClass = AGENDA_DAY_BORDER_CLASS;
                                 var tempObj = {
-                                    rowSpan: data.length, type: 'resourceColumn', resource: resColl[resColl.length - 1],
-                                    groupOrder: resData[res].groupOrder.slice(0, -1), resourceData: resData[res].resourceData,
+                                    rowSpan: data.length, type: 'resourceColumn', resource: resColl[parseInt((resColl.length - 1).toString(), 10)],
+                                    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
                                 };
-                                lastLevelInfo[lastLevelInfo.length - data.length].push(tempObj);
+                                lastLevelInfo[parseInt((lastLevelInfo.length - data.length).toString(), 10)].push(tempObj);
                                 tempLastLevelInfo.push(extend({}, tempObj, null, true));
                                 break;
                             }
@@ -24809,15 +25083,15 @@ var AgendaBase = /** @__PURE__ @class */ (function (_super) {
                         var z = 0;
                         for (var u = 0; u < tempLastLevelInfo.length; u++) {
                             // eslint-disable-next-line max-len
-                            if (tempLastLevelInfo[u].groupOrder[topResources.length - (y + 1)] === data[x][topResources[topResources.length - (y + 1)].idField]) {
-                                totalRowSpan = totalRowSpan + tempLastLevelInfo[u].rowSpan;
-                                tempGroupedData.push(extend({}, tempLastLevelInfo[u], null, true));
+                            if (tempLastLevelInfo[parseInt(u.toString(), 10)].groupOrder[topResources.length - (y + 1)] === data[parseInt(x.toString(), 10)][topResources[topResources.length - (y + 1)].idField]) {
+                                totalRowSpan = totalRowSpan + tempLastLevelInfo[parseInt(u.toString(), 10)].rowSpan;
+                                tempGroupedData.push(extend({}, tempLastLevelInfo[parseInt(u.toString(), 10)], null, true));
                             }
                             if (++z === tempLastLevelInfo.length && tempGroupedData.length > 0) {
                                 tempGroupedData[0].rowSpan = totalRowSpan;
                                 tempGroupedData[0].type = 'parentColumnLevel_' + (y + 1);
                                 tempGroupedData[0].resource = topResources[topResources.length - (y + 1)];
-                                tempGroupedData[0].resourceData = data[x];
+                                tempGroupedData[0].resourceData = data[parseInt(x.toString(), 10)];
                                 tempGroupedData[0].date = agendaDate;
                                 lastLevelInfo[tempGroupedData[0].groupIndex].push(tempGroupedData[0]);
                                 tempGroupedData = [];
@@ -24845,22 +25119,22 @@ var AgendaBase = /** @__PURE__ @class */ (function (_super) {
             var tContentCollection = [];
             var parentCollection = this.parent.resourceBase.resourceCollection.slice(0, -1);
             for (var w = 0; w < tContent.length; w++) {
-                tContentCollection = tContentCollection.concat(tContent[w]);
+                tContentCollection = tContentCollection.concat(tContent[parseInt(w.toString(), 10)]);
             }
             level = (parentCollection.length > 0) ? 'parentColumnLevel_' + parentCollection.length : 'resourceColumn';
             var rowSpanCollection = tContentCollection.filter(function (data) { return data.type === level; });
             for (var x = 0; x < rowSpanCollection.length; x++) {
-                rowSpan = rowSpan + rowSpanCollection[x].rowSpan;
+                rowSpan = rowSpan + rowSpanCollection[parseInt(x.toString(), 10)].rowSpan;
             }
         }
         for (var row = 0; row < tContent.length; row++) {
             ntr = tr.cloneNode();
-            for (var col = tContent[row].length - 1; col >= 0; col--) {
-                var data = tContent[row][col];
+            for (var col = tContent[parseInt(row.toString(), 10)].length - 1; col >= 0; col--) {
+                var data = tContent[parseInt(row.toString(), 10)][parseInt(col.toString(), 10)];
                 var ntd = td.cloneNode();
                 if (data.type === 'dateColumn') {
                     if (this.parent.activeViewOptions.group.byDate || this.parent.currentView === 'MonthAgenda') {
-                        tempData = tContent[row][col];
+                        tempData = tContent[parseInt(row.toString(), 10)][parseInt(col.toString(), 10)];
                         continue;
                     }
                     ntd.setAttribute('data-date', data.date.getTime().toString());
@@ -25113,7 +25387,7 @@ var Agenda = /** @__PURE__ @class */ (function (_super) {
                     this.parent.activeViewOptions.allowVirtualScrolling = false;
                     date = firstDate;
                     if (this.parent.headerModule) {
-                        this.parent.headerModule.updateDateRange(this.parent.activeView.getDateRangeText());
+                        this.parent.headerModule.updateDateRange();
                         this.parent.headerModule.updateHeaderItems('remove');
                     }
                 }
@@ -25187,8 +25461,8 @@ var Agenda = /** @__PURE__ @class */ (function (_super) {
                 prepend([].slice.call(emptyTBody.childNodes), tBody);
                 this.wireEventActions();
                 for (var s = 0, element = tBody.children; s < element.length; s++) {
-                    if (element[s].getAttribute('data-row-index') === topElement.getAttribute('data-column-index')) {
-                        var scrollToValue = element[s].offsetTop -
+                    if (element[parseInt(s.toString(), 10)].getAttribute('data-row-index') === topElement.getAttribute('data-column-index')) {
+                        var scrollToValue = element[parseInt(s.toString(), 10)].offsetTop -
                             this.element.querySelector('.e-agenda-item').offsetHeight;
                         target.scrollTop = scrollToValue;
                         break;
@@ -25237,7 +25511,7 @@ var Agenda = /** @__PURE__ @class */ (function (_super) {
             }
             else {
                 for (var a = 0, length_1 = liCollection.length; a < length_1; a++) {
-                    li = liCollection[a];
+                    li = liCollection[parseInt(a.toString(), 10)];
                     liDetails = li.getBoundingClientRect();
                     if (liDetails.top >= 0) {
                         filterElement = closest(li, '.' + AGENDA_CELLS_CLASS);
@@ -25250,7 +25524,7 @@ var Agenda = /** @__PURE__ @class */ (function (_super) {
     };
     Agenda.prototype.updateHeaderText = function (date) {
         if (this.parent.showHeaderBar) {
-            this.parent.headerModule.updateDateRange(this.getDateRangeText(date));
+            this.parent.headerModule.updateDateRange(date);
         }
     };
     Agenda.prototype.getPreviousNextDate = function (date, type) {
@@ -25472,11 +25746,18 @@ var MonthAgenda = /** @__PURE__ @class */ (function (_super) {
         }
         var contentArea = this.getContentAreaElement().firstElementChild;
         var dateHeader = this.element.querySelector('.' + DATE_HEADER_WRAP_CLASS);
-        var availHeight = this.parent.element.offsetHeight - headerHeight - dateHeader.offsetHeight - contentArea.offsetHeight;
+        var availHeight = this.parent.element.offsetHeight - headerHeight - dateHeader.offsetHeight;
+        var contentAreaHeight = (this.parent.activeViewOptions.interval > 1) ?
+            Math.round(availHeight * 0.8) : contentArea.offsetHeight;
+        var appContainerHeight = availHeight - contentAreaHeight;
         var wrapperContainer = this.element.querySelector('.' + WRAPPER_CONTAINER_CLASS);
         var eventWrapper = this.element.querySelector('.' + APPOINTMENT_WRAP_CLASS);
         if (this.parent.height !== 'auto') {
-            wrapperContainer.style.height = eventWrapper.style.height = formatUnit(availHeight);
+            if (this.parent.activeViewOptions.interval > 1) {
+                contentArea.style.height = formatUnit(contentAreaHeight);
+                EventHandler.add(contentArea, 'scroll', this.onContentScroll, this);
+            }
+            wrapperContainer.style.height = eventWrapper.style.height = formatUnit(appContainerHeight);
         }
     };
     MonthAgenda.prototype.onDataReady = function (args) {
@@ -25493,7 +25774,7 @@ var MonthAgenda = /** @__PURE__ @class */ (function (_super) {
         for (var _i = 0, _a = this.renderDates; _i < _a.length; _i++) {
             var date = _a[_i];
             var filterData = this.appointmentFiltering(date);
-            var workCell = this.element.querySelectorAll('.' + WORK_CELLS_CLASS)[count];
+            var workCell = this.element.querySelectorAll('.' + WORK_CELLS_CLASS)[parseInt(count.toString(), 10)];
             if (filterData.length > 0) {
                 if (!workCell.querySelector('.' + APPOINTMENT_INDICATOR_CLASS)) {
                     workCell.appendChild(createElement('div', { className: APPOINTMENT_INDICATOR_CLASS }));
@@ -25598,8 +25879,8 @@ var TimelineHeaderRow = /** @__PURE__ @class */ (function () {
         for (var _i = 0, dates_1 = dates; _i < dates_1.length; _i++) {
             var d = dates_1[_i];
             var key = d.getFullYear();
-            result[key] = result[key] || [];
-            result[key].push(d);
+            result[parseInt(key.toString(), 10)] = result[parseInt(key.toString(), 10)] || [];
+            result[parseInt(key.toString(), 10)].push(d);
         }
         return result;
     };
@@ -25608,8 +25889,8 @@ var TimelineHeaderRow = /** @__PURE__ @class */ (function () {
         for (var _i = 0, dates_2 = dates; _i < dates_2.length; _i++) {
             var d = dates_2[_i];
             var key = (d.getFullYear() - 1970) * 12 + d.getMonth();
-            result[key] = result[key] || [];
-            result[key].push(d);
+            result[parseInt(key.toString(), 10)] = result[parseInt(key.toString(), 10)] || [];
+            result[parseInt(key.toString(), 10)].push(d);
         }
         return result;
     };
@@ -25623,8 +25904,8 @@ var TimelineHeaderRow = /** @__PURE__ @class */ (function () {
             if (this.parent.firstDayOfWeek && this.parent.firstDayOfWeek > new Date(+d).getDay()) {
                 key = key - 1;
             }
-            result[key] = result[key] || [];
-            result[key].push(d);
+            result[parseInt(key.toString(), 10)] = result[parseInt(key.toString(), 10)] || [];
+            result[parseInt(key.toString(), 10)].push(d);
         }
         return result;
     };
@@ -25636,7 +25917,7 @@ var TimelineHeaderRow = /** @__PURE__ @class */ (function () {
         var tdDatas = [];
         var keys = Object.keys(data);
         for (var i = 0; i < keys.length; i++) {
-            var dates = data[keys[i]];
+            var dates = data[keys[parseInt(i.toString(), 10)]];
             var htmlCol = void 0;
             if (row.template) {
                 var args = { date: dates[0], type: type };
@@ -25918,7 +26199,7 @@ var TimelineViews = /** @__PURE__ @class */ (function (_super) {
         return 1;
     };
     TimelineViews.prototype.getResourceTdData = function (i, tdData) {
-        var resLevel = this.parent.resourceBase.renderedResources[i];
+        var resLevel = this.parent.resourceBase.renderedResources[parseInt(i.toString(), 10)];
         var resSHr = resLevel.resourceData[resLevel.resource.startHourField] || this.parent.workHours.start;
         var resEHr = resLevel.resourceData[resLevel.resource.endHourField] || this.parent.workHours.end;
         tdData.startHour = this.parent.getStartEndTime(resSHr);
@@ -25968,7 +26249,7 @@ var TimelineViews = /** @__PURE__ @class */ (function (_super) {
         else {
             var timeSlots = this.colLevels[this.colLevels.length - 1];
             for (var i = 0; i < timeSlots.length; i++) {
-                if (timeSlots[i].date.getTime() > date.getTime()) {
+                if (timeSlots[parseInt(i.toString(), 10)].date.getTime() > date.getTime()) {
                     return timeSlots[i - 1].date;
                 }
             }
@@ -26084,7 +26365,7 @@ var TimelineMonth = /** @__PURE__ @class */ (function (_super) {
                 var data = _a[_i];
                 data.className = [WORK_CELLS_CLASS];
                 if (this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
-                    var resLevel = this.parent.resourceBase.renderedResources[row];
+                    var resLevel = this.parent.resourceBase.renderedResources[parseInt(row.toString(), 10)];
                     data.workDays = resLevel.resourceData[resLevel.resource.workDaysField] || this.parent.workDays;
                     data.className = data.className.concat(resLevel.className);
                     data.groupIndex = resLevel.groupIndex;
@@ -26094,10 +26375,10 @@ var TimelineMonth = /** @__PURE__ @class */ (function (_super) {
                     date: new Date(+data.date), colSpan: data.colSpan, groupIndex: data.groupIndex, workDays: data.workDays,
                     type: 'monthCells', className: data.className
                 };
-                if (!slotDatas[row]) {
-                    slotDatas[row] = [];
+                if (!slotDatas[parseInt(row.toString(), 10)]) {
+                    slotDatas[parseInt(row.toString(), 10)] = [];
                 }
-                slotDatas[row].push(slotData);
+                slotDatas[parseInt(row.toString(), 10)].push(slotData);
             }
         }
         return slotDatas;
@@ -26136,7 +26417,7 @@ var TimelineMonth = /** @__PURE__ @class */ (function (_super) {
     TimelineMonth.prototype.getAdjustedDate = function (startTime) {
         var timeSlots = this.colLevels[this.colLevels.length - 1];
         for (var i = 0; i < timeSlots.length; i++) {
-            if (timeSlots[i].date.getTime() > startTime.getTime()) {
+            if (timeSlots[parseInt(i.toString(), 10)].date.getTime() > startTime.getTime()) {
                 return timeSlots[i - 1].date;
             }
         }
@@ -26224,11 +26505,11 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
             var months = this.getMonths();
             var dayHeaderDates = this.getMonthDates(new Date(this.parent.selectedDate.getFullYear(), months[0], 1));
             for (var column = 0; column < this.columnCount; column++) {
-                var date = new Date(this.parent.selectedDate.getFullYear(), months[column], 1);
+                var date = new Date(this.parent.selectedDate.getFullYear(), months[parseInt(column.toString(), 10)], 1);
                 var innerTd = createElement('td', { className: HEADER_CELLS_CLASS });
                 if (this.parent.activeViewOptions.orientation === 'Horizontal') {
                     if (this.parent.dayHeaderTemplate) {
-                        append(this.renderDayMonthHeaderTemplate(dayHeaderDates[column], column, 'dayHeaderTemplate'), innerTd);
+                        append(this.renderDayMonthHeaderTemplate(dayHeaderDates[parseInt(column.toString(), 10)], column, 'dayHeaderTemplate'), innerTd);
                     }
                     else {
                         innerTd.innerHTML = "<span>" + this.parent.getDayNames('abbreviated')[column % 7] + "</span>";
@@ -26236,7 +26517,7 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
                 }
                 else {
                     if (this.parent.monthHeaderTemplate) {
-                        append(this.renderDayMonthHeaderTemplate(date, months[column], 'monthHeaderTemplate'), innerTd);
+                        append(this.renderDayMonthHeaderTemplate(date, months[parseInt(column.toString(), 10)], 'monthHeaderTemplate'), innerTd);
                     }
                     else {
                         innerTd.innerHTML = "<span>" + this.getMonthName(date) + "</span>";
@@ -26352,7 +26633,7 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
         var dayHeaderDates = this.getMonthDates(new Date(this.parent.selectedDate.getFullYear(), months[0], 1));
         for (var month = 0; month < this.rowCount; month++) {
             wrapper.appendChild(createElement('div', { className: APPOINTMENT_CONTAINER_CLASS }));
-            var monthDate = new Date(this.parent.selectedDate.getFullYear(), months[month], 1);
+            var monthDate = new Date(this.parent.selectedDate.getFullYear(), months[parseInt(month.toString(), 10)], 1);
             var monthStart = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
             var monthEnd = this.parent.calendarUtil.getMonthEndDate(new Date(monthDate.getTime()));
             var tr = createElement('tr');
@@ -26372,7 +26653,7 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
             }
             else {
                 if (this.parent.dayHeaderTemplate) {
-                    append(this.renderDayMonthHeaderTemplate(dayHeaderDates[month], month, 'dayHeaderTemplate'), monthTd);
+                    append(this.renderDayMonthHeaderTemplate(dayHeaderDates[parseInt(month.toString(), 10)], month, 'dayHeaderTemplate'), monthTd);
                 }
                 else {
                     monthTd.innerHTML = "<span>" + this.parent.getDayNames('abbreviated')[month % 7] + "</span>";
@@ -26384,11 +26665,11 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
             for (var column = 0; column < this.columnCount; column++) {
                 var isDateAvail = void 0;
                 if (this.parent.activeViewOptions.orientation === 'Vertical') {
-                    monthDate = new Date(this.parent.selectedDate.getFullYear(), months[column], 1);
+                    monthDate = new Date(this.parent.selectedDate.getFullYear(), months[parseInt(column.toString(), 10)], 1);
                     monthStart = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
                     monthEnd = this.parent.calendarUtil.getMonthEndDate(new Date(monthDate.getTime()));
                     var dayDate = (month - monthStart.getDay()) + 1;
-                    date = new Date(this.parent.selectedDate.getFullYear(), months[column], dayDate);
+                    date = new Date(this.parent.selectedDate.getFullYear(), months[parseInt(column.toString(), 10)], dayDate);
                     isDateAvail = dayDate > 0 && date.getTime() < monthEnd.getTime();
                 }
                 else {
@@ -26414,6 +26695,9 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
                     if (this.parent.activeViewOptions.workDays.indexOf(date.getDay()) > -1) {
                         classList$$1.push(WORKDAY_CLASS);
                     }
+                    if (!this.parent.isMinMaxDate(date)) {
+                        addClass([td], DISABLE_DATES);
+                    }
                     if (this.isCurrentDate(date)) {
                         classList$$1.push(CURRENT_DAY_CLASS);
                         if (this.parent.activeViewOptions.orientation === 'Horizontal') {
@@ -26429,6 +26713,9 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
                 }
                 else {
                     addClass([td], OTHERMONTH_CLASS);
+                    if (!this.parent.isMinMaxDate(date)) {
+                        addClass([td], DISABLE_DATES);
+                    }
                 }
                 if (td.classList.contains(OTHERMONTH_CLASS)) {
                     continue;
@@ -26456,9 +26743,9 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
             tRow.push(tr);
             var resData = void 0;
             if (this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
-                resData = this.parent.resourceBase.renderedResources[row];
+                resData = this.parent.resourceBase.renderedResources[parseInt(row.toString(), 10)];
             }
-            var monthDate = new Date(this.parent.selectedDate.getFullYear(), monthCells[row], 1);
+            var monthDate = new Date(this.parent.selectedDate.getFullYear(), monthCells[parseInt(row.toString(), 10)], 1);
             var date = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
             for (var month = 0; month < this.columnCount; month++) {
                 var classList$$1 = [];
@@ -26470,7 +26757,7 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
                 else {
                     classList$$1.push(WORKDAY_CLASS);
                 }
-                monthDate = new Date(this.parent.selectedDate.getFullYear(), monthCells[month], 1);
+                monthDate = new Date(this.parent.selectedDate.getFullYear(), monthCells[parseInt(month.toString(), 10)], 1);
                 date = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
                 var tdELe = createElement('td', {
                     className: WORK_CELLS_CLASS,
@@ -26497,9 +26784,9 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
             contentBody.appendChild(tr);
             var resData = void 0;
             if (this.parent.activeViewOptions.orientation === 'Vertical' && this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
-                resData = this.parent.resourceBase.renderedResources[row];
+                resData = this.parent.resourceBase.renderedResources[parseInt(row.toString(), 10)];
             }
-            var monthDate = new Date(this.parent.selectedDate.getFullYear(), months[row], 1);
+            var monthDate = new Date(this.parent.selectedDate.getFullYear(), months[parseInt(row.toString(), 10)], 1);
             var date = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
             if (this.parent.activeViewOptions.orientation === 'Horizontal') {
                 var monthTr = tr.cloneNode();
@@ -26528,11 +26815,11 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
                     else {
                         classList$$1.push(WORKDAY_CLASS);
                     }
-                    monthDate = new Date(this.parent.selectedDate.getFullYear(), months[month], 1);
+                    monthDate = new Date(this.parent.selectedDate.getFullYear(), months[parseInt(month.toString(), 10)], 1);
                     date = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
                 }
                 else {
-                    groupIndex = this.colLevels.slice(-1)[0][month].groupIndex;
+                    groupIndex = this.colLevels.slice(-1)[0][parseInt(month.toString(), 10)].groupIndex;
                     classList$$1.push(WORKDAY_CLASS);
                 }
                 var td = createElement('td', {
@@ -26690,7 +26977,7 @@ var ICalendarExport = /** @__PURE__ @class */ (function () {
                 var exDate = eventObj[fields.recurrenceException].split(',');
                 for (var i = 0; i < exDate.length - 1; i++) {
                     calendarEvent.splice(5, 0, 'EXDATE:' +
-                        _this.convertDateToString(getDateFromRecurrenceDateString(exDate[i]), eventObj[fields.isAllDay]));
+                        _this.convertDateToString(getDateFromRecurrenceDateString(exDate[parseInt(i.toString(), 10)]), eventObj[fields.isAllDay]));
                 }
             }
             if (eventObj[fields.recurrenceID]) {
@@ -26700,7 +26987,7 @@ var ICalendarExport = /** @__PURE__ @class */ (function () {
             var customFields = _this.customFieldFilter(eventObj, fields);
             if (customFields.length > 0) {
                 customFields.forEach(function (customField) {
-                    return calendarEvent.splice(4, 0, customField + ':' + (eventObj[customField] || ''));
+                    return calendarEvent.splice(4, 0, customField + ':' + (eventObj["" + customField] || ''));
                 });
             }
             var app = extend({}, eventObj);
@@ -26721,7 +27008,7 @@ var ICalendarExport = /** @__PURE__ @class */ (function () {
         return icsString;
     };
     ICalendarExport.prototype.customFieldFilter = function (eventObj, fields) {
-        var defaultFields = Object.keys(fields).map(function (key) { return fields[key]; });
+        var defaultFields = Object.keys(fields).map(function (key) { return fields["" + key]; });
         var eventFields = Object.keys(eventObj);
         return eventFields.filter(function (value) { return (defaultFields.indexOf(value) === -1) && (value !== 'Guid'); });
     };
@@ -26755,7 +27042,7 @@ var ICalendarExport = /** @__PURE__ @class */ (function () {
         }
     };
     ICalendarExport.prototype.filterEvents = function (data, field, value) {
-        return data.filter(function (e) { return e[field] === value; });
+        return data.filter(function (e) { return e["" + field] === value; });
     };
     ICalendarExport.prototype.getModuleName = function () {
         return 'iCalendarExport';
@@ -26846,7 +27133,7 @@ var ICalendarImport = /** @__PURE__ @class */ (function () {
                         case 'BEGIN':
                             break;
                         case 'UID':
-                            curEvent[uId] = value;
+                            curEvent["" + uId] = value;
                             if (typeof (id) == 'number') {
                                 curEvent[fields.id] = parseInt(value, 10);
                                 if (isNaN(curEvent[fields.id])) {
@@ -26876,10 +27163,10 @@ var ICalendarImport = /** @__PURE__ @class */ (function () {
                         default:
                             if (_this.parent.resourceCollection.length > 0) {
                                 var resData = _this.parent.resourceCollection.filter(function (data) { return data.field === type; });
-                                curEvent[type] = (resData.length > 0 && (typeof (resData[0].dataSource[0][resData[0].idField]) == 'number')) ? parseInt(value, 10) : value;
+                                curEvent["" + type] = (resData.length > 0 && (typeof (resData[0].dataSource[0][resData[0].idField]) == 'number')) ? parseInt(value, 10) : value;
                             }
                             else {
-                                curEvent[type] = value;
+                                curEvent["" + type] = value;
                             }
                     }
                 }
@@ -26906,29 +27193,29 @@ var ICalendarImport = /** @__PURE__ @class */ (function () {
                 id = eventObj[fields.id];
             }
             if (appointmentIds.indexOf(eventObj[fields.id]) < 0) {
-                var data = app.filter(function (data) { return data.UID === eventObj[uId]; });
+                var data = app.filter(function (data) { return data.UID === eventObj["" + uId]; });
                 if (data.length > 1 && isNullOrUndefined(eventObj[fields.recurrenceID])) {
                     id = typeof (maxId) === 'number' ? maxId++ : id;
                     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.id] = typeof (maxId) === 'number' ? maxId++ : _this.parent.eventBase.generateGuid();
-                            data[i][fields.recurrenceID] = id;
-                            data[i][fields.recurrenceException] = null;
+                        if (data[parseInt(i.toString(), 10)].hasOwnProperty(fields.recurrenceID)) {
+                            var exdate = data[parseInt(i.toString(), 10)][fields.recurrenceID];
+                            data[parseInt(i.toString(), 10)][fields.id] = typeof (maxId) === 'number' ? maxId++ : _this.parent.eventBase.generateGuid();
+                            data[parseInt(i.toString(), 10)][fields.recurrenceID] = id;
+                            data[parseInt(i.toString(), 10)][fields.recurrenceException] = null;
                             parentObj[fields.recurrenceException] =
                                 _this.getExcludeDateString(parentObj[fields.recurrenceException], exdate);
-                            delete data[i][uId];
-                            appoint.push(data[i]);
+                            delete data[parseInt(i.toString(), 10)]["" + uId];
+                            appoint.push(data[parseInt(i.toString(), 10)]);
                         }
                     }
-                    delete parentObj[uId];
+                    delete parentObj["" + uId];
                     parentObj[fields.id] = id;
                     appoint.push(parentObj);
                     // eslint-disable-next-line no-prototype-builtins
                 }
                 else if (!eventObj.hasOwnProperty(fields.recurrenceID)) {
-                    delete eventObj[uId];
+                    delete eventObj["" + uId];
                     eventObj[fields.id] = typeof (maxId) === 'number' ? maxId++ : id;
                     appoint.push(eventObj);
                 }
@@ -26957,8 +27244,7 @@ var ICalendarImport = /** @__PURE__ @class */ (function () {
         return (value.replace(/\\\,/g, ',').replace(/\\\;/g, ';').replace(/\\[nN]/g, '\n').replace(/\\\\/g, '\\'));
     };
     ICalendarImport.prototype.dateParsing = function (element) {
-        var expression = /([^':;]+)((?:;(?:[^':;]+)(?:=(?:(?:'[^']*')|(?:[^':;]+))))*):(.*)/;
-        var split = (element.match(expression)).slice(1);
+        var split = element.split(':');
         var value = split[split.length - 1];
         var newDate = new Date(this.getDateString(value));
         if (element && (element.indexOf('VALUE=DATE') > -1 || element.indexOf('RECURRENCE-ID;TZID') > -1)) {
@@ -27050,7 +27336,7 @@ var ExcelExport = /** @__PURE__ @class */ (function () {
         var exportColumns = exportOptions.fieldsInfo || [];
         if (exportColumns.length === 0) {
             var fields = exportOptions.fields || Object.keys(this.parent.eventFields).map(function (field) {
-                return _this.parent.eventFields[field];
+                return _this.parent.eventFields["" + field];
             });
             fields.forEach(function (field) { exportColumns.push({ name: field, text: field }); });
         }
@@ -27139,17 +27425,23 @@ var Print = /** @__PURE__ @class */ (function () {
             'dateFormat', 'enableRtl', 'endHour', 'eventSettings', 'firstDayOfWeek',
             'firstMonthOfYear', 'group', 'height', 'locale', 'maxDate', 'minDate', 'readonly',
             'resources', 'rowAutoHeight', 'selectedDate', 'showHeaderBar', 'showTimeIndicator', 'showWeekNumber',
-            'showWeekend', 'startHour', 'timeFormat', 'timeScale', 'timezone', 'views', 'width', 'workDays', 'workHours'
+            'showWeekend', 'startHour', 'timeFormat', 'timeScale', 'timezone', 'views', 'width', 'workDays', 'workHours',
+            'dateHeaderTemplate', 'dateRangeTemplate', 'cellHeaderTemplate', 'dayHeaderTemplate', 'monthHeaderTemplate',
+            'cellTemplate', 'resourceHeaderTemplate', 'headerIndentTemplate'
         ];
+        var scheduleTemplates = ['cellHeaderTemplate', 'dayHeaderTemplate', 'monthHeaderTemplate', 'cellTemplate',
+            'dateHeaderTemplate', 'dateRangeTemplate', 'eventTemplate', 'resourceHeaderTemplate', 'headerIndentTemplate'];
         var eventSettings;
         var group;
+        var timeScale;
+        var views;
         for (var _i = 0, scheduleProps_1 = scheduleProps; _i < scheduleProps_1.length; _i++) {
             var key = scheduleProps_1[_i];
             switch (key) {
                 case 'eventSettings':
                     eventSettings = Object.assign({}, this.parent.eventSettings.properties);
                     eventSettings.dataSource = this.parent.eventsData;
-                    eventSettings.template = null;
+                    eventSettings.template = typeof (eventSettings.template) === 'function' ? null : eventSettings.template;
                     printModel.eventSettings = eventSettings;
                     break;
                 case 'group':
@@ -27157,9 +27449,38 @@ var Print = /** @__PURE__ @class */ (function () {
                     group.headerTooltipTemplate = null;
                     printModel.group = group;
                     break;
+                case 'timeScale':
+                    timeScale = isNullOrUndefined(printOptions.timeScale) ? this.parent.timeScale : printOptions.timeScale;
+                    timeScale.majorSlotTemplate = typeof (timeScale.majorSlotTemplate) === 'function' ? null : timeScale.majorSlotTemplate;
+                    timeScale.minorSlotTemplate = typeof (timeScale.minorSlotTemplate) === 'function' ? null : timeScale.minorSlotTemplate;
+                    printOptions.timeScale = timeScale;
+                    break;
+                case 'views':
+                    views = isNullOrUndefined(printOptions.views) ? this.parent.views : printOptions.views;
+                    if (views && views.length > 0 && typeof (views[0]) === 'object') {
+                        var _loop_1 = function (view) {
+                            scheduleTemplates.forEach(function (x) {
+                                if (!isNullOrUndefined(view["" + x])) {
+                                    view["" + x] = typeof (view["" + x]) === 'function' ? null : view["" + x];
+                                }
+                            });
+                        };
+                        for (var _a = 0, views_1 = views; _a < views_1.length; _a++) {
+                            var view = views_1[_a];
+                            _loop_1(view);
+                        }
+                    }
+                    printModel.views = views;
+                    break;
                 default:
-                    printModel[key] = isNullOrUndefined(printOptions[key]) ?
-                        this.parent[key] : printOptions[key];
+                    if (scheduleTemplates.indexOf(key) > -1) {
+                        printModel["" + key] = isNullOrUndefined(printOptions["" + key]) ?
+                            (typeof (this.parent["" + key]) === 'function' ? null : this.parent["" + key]) :
+                            (typeof (printOptions["" + key]) === 'function' ? null : printOptions["" + key]);
+                        break;
+                    }
+                    printModel["" + key] = isNullOrUndefined(printOptions["" + key]) ?
+                        this.parent["" + key] : printOptions["" + key];
                     break;
             }
         }