@syncfusion/ej2-schedule 20.1.48 → 20.1.50

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.1.48
+*  version : 20.1.50
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-schedule@*",
-  "_id": "@syncfusion/ej2-schedule@20.1.47",
+  "_id": "@syncfusion/ej2-schedule@20.1.48",
   "_inBundle": false,
-  "_integrity": "sha512-ojT9XmuGF0+ejBEwCKwTClKpaOcVuZ1fj0UX3L+rue4iHVlaiTuUmdOecrFN+yneZxH0j4zD9r9mUx/sY+4yCg==",
+  "_integrity": "sha512-wml4CbZKHSN6nP2vy10+Dkl+n/2mSMM7fO3MtYdz3aR3UyT5+VB4eV70SydGiLAJ2NybfdtpsNW9Sb8C/vc7eg==",
   "_location": "/@syncfusion/ej2-schedule",
   "_phantomChildren": {},
   "_requested": {
@@ -23,8 +23,8 @@
     "/@syncfusion/ej2-react-schedule",
     "/@syncfusion/ej2-vue-schedule"
   ],
-  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-schedule/-/ej2-schedule-20.1.47.tgz",
-  "_shasum": "a18869a56012417f10f3fec19b7b80c70435a1b4",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-schedule/-/ej2-schedule-20.1.48.tgz",
+  "_shasum": "15229da0441476295c908b95b04a289d5fd2eec4",
   "_spec": "@syncfusion/ej2-schedule@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -35,11 +35,11 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~20.1.48",
-    "@syncfusion/ej2-buttons": "~20.1.47",
+    "@syncfusion/ej2-base": "~20.1.50",
+    "@syncfusion/ej2-buttons": "~20.1.50",
     "@syncfusion/ej2-calendars": "~20.1.47",
     "@syncfusion/ej2-data": "~20.1.47",
-    "@syncfusion/ej2-dropdowns": "~20.1.47",
+    "@syncfusion/ej2-dropdowns": "~20.1.50",
     "@syncfusion/ej2-excel-export": "~20.1.48",
     "@syncfusion/ej2-inputs": "~20.1.48",
     "@syncfusion/ej2-lists": "~20.1.47",
@@ -81,6 +81,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "20.1.48",
+  "version": "20.1.50",
   "sideEffects": false
 }

package/src/recurrence-editor/date-generator.js

@@ -245,6 +245,9 @@ function dailyType(startDate, endDate, data, ruleObject) {
             }
         }
         tempDate.setDate(tempDate.getDate() + interval);
+        if (tempDate.getHours() !== startDate.getHours()) {
+            tempDate.setHours(startDate.getHours());
+        }
     }
 }
 /**
@@ -289,6 +292,9 @@ function weeklyType(startDate, endDate, data, ruleObject) {
                     break;
                 }
                 tempDate.setDate(tempDate.getDate() + 1);
+                if (tempDate.getHours() !== startDate.getHours()) {
+                    tempDate.setHours(startDate.getHours());
+                }
                 compareTempDate = new Date(tempDate.getTime());
                 compareTempDate = resetTime(compareTempDate);
             }
@@ -1171,7 +1177,7 @@ function insertDateCollection(state, startDate, endDate, data, ruleObject, dayDa
 function weekCount(year, startDayOfWeek, monthCollection, week, ruleObject) {
     var firstDayOfWeek = startDayOfWeek || 0;
     var firstOfMonth = new Date(year, ruleObject.month[0] - 1, 1);
-    var lastOfMonth = new Date(year, ruleObject.month[0] - 1, 0);
+    var lastOfMonth = new Date(year, ruleObject.month[0], 0);
     var numberOfDaysInMonth = lastOfMonth.getDate();
     var firstWeekDay = (firstOfMonth.getDay() - firstDayOfWeek + 7) % 7;
     var used = firstWeekDay + numberOfDaysInMonth;

package/src/schedule/event-renderer/month.d.ts

@@ -9,7 +9,6 @@ export declare class MonthEvent extends EventBase {
     fields: EventFieldsMapping;
     dateRender: Date[];
     renderedEvents: Record<string, any>[];
-    eventsRendered: Record<string, any>[];
     eventHeight: number;
     private monthHeaderHeight;
     workCells: HTMLElement[];
@@ -41,7 +40,6 @@ export declare class MonthEvent extends EventBase {
     createAppointmentElement(record: Record<string, any>, resIndex: number, isCloneElement?: boolean): HTMLElement;
     private appendEventIcons;
     renderEvents(event: Record<string, any>, resIndex: number, eventsList?: Record<string, any>[]): void;
-    private renderMoreIndicators;
     updateCellHeight(cell: HTMLElement, height: number): void;
     updateBlockElements(): void;
     getFilteredEvents(startDate: Date, endDate: Date, groupIndex: string, eventsList?: Record<string, any>[]): Record<string, any>[];

package/src/schedule/event-renderer/month.js

@@ -27,7 +27,6 @@ var MonthEvent = /** @class */ (function (_super) {
     function MonthEvent(parent) {
         var _this = _super.call(this, parent) || this;
         _this.renderedEvents = [];
-        _this.eventsRendered = [];
         _this.monthHeaderHeight = 0;
         _this.moreIndicatorHeight = 19;
         _this.renderType = 'day';
@@ -144,7 +143,6 @@ var MonthEvent = /** @class */ (function (_super) {
     };
     MonthEvent.prototype.renderEventsHandler = function (dateRender, workDays, resData) {
         this.renderedEvents = [];
-        this.eventsRendered = [];
         var eventsList;
         var blockList;
         var resIndex = 0;
@@ -180,12 +178,19 @@ var MonthEvent = /** @class */ (function (_super) {
         var filteredDates = this.getRenderedDates(dateRender);
         this.getSlotDates(workDays || this.parent.activeViewOptions.workDays);
         this.processBlockEvents(blockList, resIndex, resData);
+        var events = [];
         for (var _i = 0, eventsList_1 = eventsList; _i < eventsList_1.length; _i++) {
             var event_1 = eventsList_1[_i];
             if (this.parent.resourceBase && !resData) {
                 this.cssClass = this.parent.resourceBase.getCssClass(event_1);
             }
-            var spannedEvents = this.splitEvent(event_1, filteredDates || this.dateRender);
+            events = events.concat(this.splitEvent(event_1, filteredDates || this.dateRender));
+        }
+        for (var level = 0; level < this.slots.length; level++) {
+            this.renderedEvents = [];
+            var slot = this.slots[level];
+            var endDate = util.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++) {
                 var event_2 = spannedEvents_1[_a];
                 if (this.maxHeight) {
@@ -490,12 +495,8 @@ var MonthEvent = /** @class */ (function (_super) {
         if (day < 0) {
             return;
         }
-        if ((startTime.getTime() < this.parent.minDate.getTime()) || (endTime.getTime() > this.parent.maxDate.getTime())) {
-            return;
-        }
         var overlapCount = this.getIndex(startTime);
         event.Index = overlapCount;
-        this.renderedEvents.push(extend({}, event, null, true));
         var diffInDays = event.data.count;
         if (startTime.getTime() <= endTime.getTime()) {
             var appWidth = (diffInDays * this.cellWidth) - 5;
@@ -504,7 +505,7 @@ var MonthEvent = /** @class */ (function (_super) {
             var height = this.monthHeaderHeight + ((overlapCount + 1) * (this.eventHeight + EVENT_GAP)) + this.moreIndicatorHeight;
             var enableAppRender = this.maxOrIndicator ? overlapCount < 1 ? true : false : this.cellHeight > height;
             if (this.parent.rowAutoHeight || enableAppRender) {
-                this.eventsRendered.push(extend({}, event, null, true));
+                this.renderedEvents.push(extend({}, event, null, true));
                 var appointmentElement = void 0;
                 if (this.inlineValue) {
                     appointmentElement = this.parent.inlineModule.createInlineAppointmentElement();
@@ -520,37 +521,30 @@ var MonthEvent = /** @class */ (function (_super) {
                     var firstChild = cellTd.parentElement.firstElementChild;
                     this.updateCellHeight(firstChild, height);
                 }
-                else if (cellTd.querySelector('.' + cls.MORE_INDICATOR_CLASS)) {
-                    this.renderMoreIndicators(diffInDays, day);
-                }
             }
             else {
-                this.renderMoreIndicators(diffInDays, day);
-            }
-        }
-    };
-    MonthEvent.prototype.renderMoreIndicators = function (diffInDays, day) {
-        for (var i = 0; i < diffInDays; i++) {
-            if (this.workCells[day + i]) {
-                var startDate = new Date(this.dateRender[day + i].getTime());
-                var endDate = util.addDays(this.dateRender[day + i], 1);
-                var groupIndex = this.workCells[day + i].getAttribute('data-group-index');
-                var filterEvents = this.getFilteredEvents(startDate, endDate, groupIndex);
-                var renderedAppCount = this.getOverlapEvents(startDate, this.eventsRendered).length;
-                var count = (filterEvents.length - renderedAppCount) <= 0 ? 1 : (filterEvents.length - renderedAppCount);
-                var indicator = this.workCells[day + i].querySelector('.' + cls.MORE_INDICATOR_CLASS);
-                if (indicator) {
-                    indicator.innerHTML = this.getMoreIndicatorText(count);
-                }
-                else {
-                    var moreIndicatorElement = this.getMoreIndicatorElement(count, startDate, endDate);
-                    if (!isNullOrUndefined(groupIndex)) {
-                        moreIndicatorElement.setAttribute('data-group-index', groupIndex);
+                for (var i = 0; i < diffInDays; i++) {
+                    if (this.workCells[day + i]) {
+                        var indicator = this.workCells[day + i].querySelector('.' + cls.MORE_INDICATOR_CLASS);
+                        if (indicator) {
+                            var count = parseInt(indicator.getAttribute('data-count'), 10) + 1;
+                            indicator.setAttribute('data-count', count.toString());
+                            indicator.innerHTML = this.getMoreIndicatorText(count);
+                        }
+                        else {
+                            var startDate = new Date(this.dateRender[day + i].getTime());
+                            var endDate = util.addDays(this.dateRender[day + i], 1);
+                            var groupIndex = this.workCells[day + i].getAttribute('data-group-index');
+                            var moreIndicatorElement = this.getMoreIndicatorElement(1, startDate, endDate);
+                            if (!isNullOrUndefined(groupIndex)) {
+                                moreIndicatorElement.setAttribute('data-group-index', groupIndex);
+                            }
+                            moreIndicatorElement.style.top = (this.cellHeight - this.monthHeaderHeight - this.moreIndicatorHeight) + 'px';
+                            moreIndicatorElement.style.width = this.cellWidth - 2 + 'px';
+                            this.renderElement(this.workCells[day + i], moreIndicatorElement);
+                            EventHandler.add(moreIndicatorElement, 'click', this.moreIndicatorClick, this);
+                        }
                     }
-                    moreIndicatorElement.style.top = (this.cellHeight - this.monthHeaderHeight - this.moreIndicatorHeight) + 'px';
-                    moreIndicatorElement.style.width = this.cellWidth - 2 + 'px';
-                    this.renderElement(this.workCells[day + i], moreIndicatorElement);
-                    EventHandler.add(moreIndicatorElement, 'click', this.moreIndicatorClick, this);
                 }
             }
         }
@@ -586,9 +580,9 @@ var MonthEvent = /** @class */ (function (_super) {
     };
     MonthEvent.prototype.getOverlapEvents = function (date, appointments) {
         var appointmentsList = [];
+        var dateTime = util.resetTime(date).getTime();
         for (var _i = 0, appointments_1 = appointments; _i < appointments_1.length; _i++) {
             var app = appointments_1[_i];
-            var dateTime = util.resetTime(date).getTime();
             if ((util.resetTime(app[this.fields.startTime]).getTime() <= dateTime) &&
                 (util.resetTime(app[this.fields.endTime]).getTime() >= dateTime)) {
                 appointmentsList.push(app);
@@ -675,6 +669,7 @@ var MonthEvent = /** @class */ (function (_super) {
             innerHTML: this.getMoreIndicatorText(count),
             attrs: {
                 'tabindex': '0',
+                'data-count': count.toString(),
                 'data-start-date': startDate.getTime().toString(),
                 'data-end-date': endDate.getTime().toString(),
                 'role': 'list'

package/src/schedule/exports/calendar-export.js

@@ -23,7 +23,7 @@ var ICalendarExport = /** @class */ (function () {
             var editedExDate = [];
             if (eventObj[fields.recurrenceID]) {
                 var filter = _this.filterEvents(filterCollection, fields.id, eventObj[fields.recurrenceID]);
-                uId = filter[0].UID;
+                uId = filter.length > 0 ? filter[0].UID : uId;
             }
             if (!eventObj[fields.recurrenceID] && eventObj[fields.recurrenceRule] && eventObj[fields.recurrenceException]) {
                 var exDate = (eventObj[fields.recurrenceException]).split(',');