@syncfusion/ej2-schedule 20.1.50 → 20.1.52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  * filename: index.d.ts
3
- * version : 20.1.50
3
+ * version : 20.1.52
4
4
  * Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
5
5
  * Use of this code is subject to the terms of our license.
6
6
  * A copy of the current license can be obtained at any time by e-mailing
package/package.json CHANGED
@@ -1,8 +1,8 @@
1
1
  {
2
2
  "_from": "@syncfusion/ej2-schedule@*",
3
- "_id": "@syncfusion/ej2-schedule@20.1.48",
3
+ "_id": "@syncfusion/ej2-schedule@19.4.55",
4
4
  "_inBundle": false,
5
- "_integrity": "sha512-wml4CbZKHSN6nP2vy10+Dkl+n/2mSMM7fO3MtYdz3aR3UyT5+VB4eV70SydGiLAJ2NybfdtpsNW9Sb8C/vc7eg==",
5
+ "_integrity": "sha512-HWYQpMcZNz/5Y9uM/wwSmC/6yhOXJGqd8wFQ2ewAdUlPOBKGCC8FHZgPABmn/qhuSu2xn2qRh6jjNGoLQ0QY6A==",
6
6
  "_location": "/@syncfusion/ej2-schedule",
7
7
  "_phantomChildren": {},
8
8
  "_requested": {
@@ -23,8 +23,8 @@
23
23
  "/@syncfusion/ej2-react-schedule",
24
24
  "/@syncfusion/ej2-vue-schedule"
25
25
  ],
26
- "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-schedule/-/ej2-schedule-20.1.48.tgz",
27
- "_shasum": "15229da0441476295c908b95b04a289d5fd2eec4",
26
+ "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-schedule/-/ej2-schedule-19.4.55.tgz",
27
+ "_shasum": "5a4ee8cabee27e82436391695885009226b059b5",
28
28
  "_spec": "@syncfusion/ej2-schedule@*",
29
29
  "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
30
30
  "author": {
@@ -36,14 +36,14 @@
36
36
  "bundleDependencies": false,
37
37
  "dependencies": {
38
38
  "@syncfusion/ej2-base": "~20.1.50",
39
- "@syncfusion/ej2-buttons": "~20.1.50",
40
- "@syncfusion/ej2-calendars": "~20.1.47",
39
+ "@syncfusion/ej2-buttons": "~20.1.52",
40
+ "@syncfusion/ej2-calendars": "~20.1.52",
41
41
  "@syncfusion/ej2-data": "~20.1.47",
42
- "@syncfusion/ej2-dropdowns": "~20.1.50",
42
+ "@syncfusion/ej2-dropdowns": "~20.1.52",
43
43
  "@syncfusion/ej2-excel-export": "~20.1.48",
44
44
  "@syncfusion/ej2-inputs": "~20.1.48",
45
45
  "@syncfusion/ej2-lists": "~20.1.47",
46
- "@syncfusion/ej2-navigations": "~20.1.48",
46
+ "@syncfusion/ej2-navigations": "~20.1.51",
47
47
  "@syncfusion/ej2-popups": "~20.1.47"
48
48
  },
49
49
  "deprecated": false,
@@ -81,6 +81,6 @@
81
81
  "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
82
82
  },
83
83
  "typings": "index.d.ts",
84
- "version": "20.1.50",
84
+ "version": "20.1.52",
85
85
  "sideEffects": false
86
86
  }
@@ -145,10 +145,6 @@ export function generate(startDate, rule, excludeDate, startDayOfWeek, maximumCo
145
145
  }
146
146
  maxOccurrence = maximumCount;
147
147
  setFirstDayOfWeek(DAYINDEX[startDayOfWeek]);
148
- if (ruleObject.until) {
149
- var end = resetTime(ruleObject.until);
150
- ruleObject.until = new Date(end.getFullYear(), end.getMonth(), end.getDate(), 23, 59, 59);
151
- }
152
148
  switch (ruleObject.freq) {
153
149
  case 'DAILY':
154
150
  dailyType(modifiedDate, ruleObject.until, data, ruleObject);
@@ -245,9 +241,6 @@ function dailyType(startDate, endDate, data, ruleObject) {
245
241
  }
246
242
  }
247
243
  tempDate.setDate(tempDate.getDate() + interval);
248
- if (tempDate.getHours() !== startDate.getHours()) {
249
- tempDate.setHours(startDate.getHours());
250
- }
251
244
  }
252
245
  }
253
246
  /**
@@ -292,9 +285,6 @@ function weeklyType(startDate, endDate, data, ruleObject) {
292
285
  break;
293
286
  }
294
287
  tempDate.setDate(tempDate.getDate() + 1);
295
- if (tempDate.getHours() !== startDate.getHours()) {
296
- tempDate.setHours(startDate.getHours());
297
- }
298
288
  compareTempDate = new Date(tempDate.getTime());
299
289
  compareTempDate = resetTime(compareTempDate);
300
290
  }
@@ -1177,7 +1167,7 @@ function insertDateCollection(state, startDate, endDate, data, ruleObject, dayDa
1177
1167
  function weekCount(year, startDayOfWeek, monthCollection, week, ruleObject) {
1178
1168
  var firstDayOfWeek = startDayOfWeek || 0;
1179
1169
  var firstOfMonth = new Date(year, ruleObject.month[0] - 1, 1);
1180
- var lastOfMonth = new Date(year, ruleObject.month[0], 0);
1170
+ var lastOfMonth = new Date(year, ruleObject.month[0] - 1, 0);
1181
1171
  var numberOfDaysInMonth = lastOfMonth.getDate();
1182
1172
  var firstWeekDay = (firstOfMonth.getDay() - firstDayOfWeek + 7) % 7;
1183
1173
  var used = firstWeekDay + numberOfDaysInMonth;
@@ -517,7 +517,6 @@ var Schedule = /** @class */ (function (_super) {
517
517
  };
518
518
  _this.trigger(events.navigating, navArgs, function (navigationArgs) {
519
519
  if (!navigationArgs.cancel) {
520
- _this.uiStateValues.isInitial = ['TimelineMonth', 'TimelineYear', 'Year'].indexOf(view) > -1 ? true : _this.uiStateValues.isInitial;
521
520
  _this.viewIndex = navigationArgs.viewIndex;
522
521
  _this.setProperties({ currentView: view }, true);
523
522
  if (_this.headerModule) {
@@ -1142,9 +1141,6 @@ var Schedule = /** @class */ (function (_super) {
1142
1141
  if (document.querySelectorAll(template).length) {
1143
1142
  return compile(document.querySelector(template).innerHTML.trim());
1144
1143
  }
1145
- else {
1146
- return compile(template);
1147
- }
1148
1144
  }
1149
1145
  catch (error) {
1150
1146
  return compile(template);
@@ -34,7 +34,7 @@ var AgendaBase = /** @class */ (function (_super) {
34
34
  moduleName: 'agenda',
35
35
  listClass: this.parent.activeView.viewClass,
36
36
  itemClass: this.parent.activeView.viewClass,
37
- template: "<div class=\"" + cls.AGENDA_NO_EVENT_CLASS + "\">" + this.parent.localeObj.getConstant('noEvents') + "</div>"
37
+ template: '<div class=' + cls.AGENDA_NO_EVENT_CLASS + '>${subject}</div>'
38
38
  });
39
39
  }
40
40
  else {
@@ -50,7 +50,6 @@ export declare class MonthEvent extends EventBase {
50
50
  getEventData(event: Record<string, any>): Record<string, any>;
51
51
  renderElement(cellTd: HTMLElement | Element, element: HTMLElement, isAppointment?: boolean): void;
52
52
  getMoreIndicatorElement(count: number, startDate: Date, endDate: Date): HTMLElement;
53
- private getMoreIndicatorText;
54
53
  removeHeightProperty(selector: string): void;
55
54
  setMaxEventHeight(event: HTMLElement, cell: HTMLElement): void;
56
55
  destroy(): void;
@@ -47,7 +47,7 @@ var MonthEvent = /** @class */ (function (_super) {
47
47
  appElement = (this.parent.currentView === 'Month') ? appElement : [appElement[0]];
48
48
  for (var _i = 0, appElement_1 = appElement; _i < appElement_1.length; _i++) {
49
49
  var wrap = appElement_1[_i];
50
- if (wrap.parentElement && wrap.parentElement.parentNode) {
50
+ if (!wrap.classList.contains('e-more-indicator') && wrap.parentElement && wrap.parentElement.parentNode) {
51
51
  remove(wrap.parentElement);
52
52
  }
53
53
  }
@@ -178,19 +178,12 @@ var MonthEvent = /** @class */ (function (_super) {
178
178
  var filteredDates = this.getRenderedDates(dateRender);
179
179
  this.getSlotDates(workDays || this.parent.activeViewOptions.workDays);
180
180
  this.processBlockEvents(blockList, resIndex, resData);
181
- var events = [];
182
181
  for (var _i = 0, eventsList_1 = eventsList; _i < eventsList_1.length; _i++) {
183
182
  var event_1 = eventsList_1[_i];
184
183
  if (this.parent.resourceBase && !resData) {
185
184
  this.cssClass = this.parent.resourceBase.getCssClass(event_1);
186
185
  }
187
- events = events.concat(this.splitEvent(event_1, filteredDates || this.dateRender));
188
- }
189
- for (var level = 0; level < this.slots.length; level++) {
190
- this.renderedEvents = [];
191
- var slot = this.slots[level];
192
- var endDate = util.addDays(new Date(slot[slot.length - 1]), 1);
193
- var spannedEvents = this.filterEvents(new Date(slot[0]), endDate, events);
186
+ var spannedEvents = this.splitEvent(event_1, filteredDates || this.dateRender);
194
187
  for (var _a = 0, spannedEvents_1 = spannedEvents; _a < spannedEvents_1.length; _a++) {
195
188
  var event_2 = spannedEvents_1[_a];
196
189
  if (this.maxHeight) {
@@ -495,17 +488,21 @@ var MonthEvent = /** @class */ (function (_super) {
495
488
  if (day < 0) {
496
489
  return;
497
490
  }
491
+ if ((startTime.getTime() < this.parent.minDate.getTime()) || (endTime.getTime() > this.parent.maxDate.getTime())) {
492
+ return;
493
+ }
498
494
  var overlapCount = this.getIndex(startTime);
499
495
  event.Index = overlapCount;
496
+ var appHeight = this.eventHeight;
497
+ this.renderedEvents.push(extend({}, event, null, true));
500
498
  var diffInDays = event.data.count;
501
499
  if (startTime.getTime() <= endTime.getTime()) {
502
500
  var appWidth = (diffInDays * this.cellWidth) - 5;
503
501
  var cellTd = this.workCells[day];
504
- var appTop = (overlapCount * (this.eventHeight + EVENT_GAP));
505
- var height = this.monthHeaderHeight + ((overlapCount + 1) * (this.eventHeight + EVENT_GAP)) + this.moreIndicatorHeight;
502
+ var appTop = (overlapCount * (appHeight + EVENT_GAP));
503
+ var height = this.monthHeaderHeight + ((overlapCount + 1) * (appHeight + EVENT_GAP)) + this.moreIndicatorHeight;
506
504
  var enableAppRender = this.maxOrIndicator ? overlapCount < 1 ? true : false : this.cellHeight > height;
507
505
  if (this.parent.rowAutoHeight || enableAppRender) {
508
- this.renderedEvents.push(extend({}, event, null, true));
509
506
  var appointmentElement = void 0;
510
507
  if (this.inlineValue) {
511
508
  appointmentElement = this.parent.inlineModule.createInlineAppointmentElement();
@@ -524,26 +521,24 @@ var MonthEvent = /** @class */ (function (_super) {
524
521
  }
525
522
  else {
526
523
  for (var i = 0; i < diffInDays; i++) {
527
- if (this.workCells[day + i]) {
528
- var indicator = this.workCells[day + i].querySelector('.' + cls.MORE_INDICATOR_CLASS);
529
- if (indicator) {
530
- var count = parseInt(indicator.getAttribute('data-count'), 10) + 1;
531
- indicator.setAttribute('data-count', count.toString());
532
- indicator.innerHTML = this.getMoreIndicatorText(count);
533
- }
534
- else {
535
- var startDate = new Date(this.dateRender[day + i].getTime());
536
- var endDate = util.addDays(this.dateRender[day + i], 1);
537
- var groupIndex = this.workCells[day + i].getAttribute('data-group-index');
538
- var moreIndicatorElement = this.getMoreIndicatorElement(1, startDate, endDate);
539
- if (!isNullOrUndefined(groupIndex)) {
540
- moreIndicatorElement.setAttribute('data-group-index', groupIndex);
541
- }
542
- moreIndicatorElement.style.top = (this.cellHeight - this.monthHeaderHeight - this.moreIndicatorHeight) + 'px';
543
- moreIndicatorElement.style.width = this.cellWidth - 2 + 'px';
544
- this.renderElement(this.workCells[day + i], moreIndicatorElement);
545
- EventHandler.add(moreIndicatorElement, 'click', this.moreIndicatorClick, this);
524
+ var cellTd_1 = this.workCells[day + i];
525
+ if (cellTd_1 && isNullOrUndefined(cellTd_1.querySelector('.' + cls.MORE_INDICATOR_CLASS))) {
526
+ var startDate = new Date(this.dateRender[day + i].getTime());
527
+ var endDate = util.addDays(this.dateRender[day + i], 1);
528
+ var groupIndex = cellTd_1.getAttribute('data-group-index');
529
+ var filterEvents = this.getFilteredEvents(startDate, endDate, groupIndex);
530
+ var appArea = this.cellHeight - this.monthHeaderHeight - this.moreIndicatorHeight;
531
+ appHeight = this.withIndicator ? appArea : appHeight;
532
+ var renderedAppCount = Math.floor(appArea / (appHeight + EVENT_GAP));
533
+ var count = (filterEvents.length - renderedAppCount) <= 0 ? 1 : (filterEvents.length - renderedAppCount);
534
+ var moreIndicatorElement = this.getMoreIndicatorElement(count, startDate, endDate);
535
+ if (!isNullOrUndefined(groupIndex)) {
536
+ moreIndicatorElement.setAttribute('data-group-index', groupIndex);
546
537
  }
538
+ moreIndicatorElement.style.top = appArea + 'px';
539
+ moreIndicatorElement.style.width = this.cellWidth - 2 + 'px';
540
+ this.renderElement(cellTd_1, moreIndicatorElement);
541
+ EventHandler.add(moreIndicatorElement, 'click', this.moreIndicatorClick, this);
547
542
  }
548
543
  }
549
544
  }
@@ -580,9 +575,9 @@ var MonthEvent = /** @class */ (function (_super) {
580
575
  };
581
576
  MonthEvent.prototype.getOverlapEvents = function (date, appointments) {
582
577
  var appointmentsList = [];
583
- var dateTime = util.resetTime(date).getTime();
584
578
  for (var _i = 0, appointments_1 = appointments; _i < appointments_1.length; _i++) {
585
579
  var app = appointments_1[_i];
580
+ var dateTime = util.resetTime(date).getTime();
586
581
  if ((util.resetTime(app[this.fields.startTime]).getTime() <= dateTime) &&
587
582
  (util.resetTime(app[this.fields.endTime]).getTime() >= dateTime)) {
588
583
  appointmentsList.push(app);
@@ -666,10 +661,9 @@ var MonthEvent = /** @class */ (function (_super) {
666
661
  MonthEvent.prototype.getMoreIndicatorElement = function (count, startDate, endDate) {
667
662
  var moreIndicatorElement = createElement('div', {
668
663
  className: cls.MORE_INDICATOR_CLASS,
669
- innerHTML: this.getMoreIndicatorText(count),
664
+ innerHTML: '+' + this.parent.globalize.formatNumber(count) + '&nbsp;' + (this.parent.isAdaptive ? '' : this.parent.localeObj.getConstant('more')),
670
665
  attrs: {
671
666
  'tabindex': '0',
672
- 'data-count': count.toString(),
673
667
  'data-start-date': startDate.getTime().toString(),
674
668
  'data-end-date': endDate.getTime().toString(),
675
669
  'role': 'list'
@@ -677,9 +671,6 @@ var MonthEvent = /** @class */ (function (_super) {
677
671
  });
678
672
  return moreIndicatorElement;
679
673
  };
680
- MonthEvent.prototype.getMoreIndicatorText = function (count) {
681
- return '+' + this.parent.globalize.formatNumber(count) + '&nbsp;' + (this.parent.isAdaptive ? '' : this.parent.localeObj.getConstant('more'));
682
- };
683
674
  MonthEvent.prototype.removeHeightProperty = function (selector) {
684
675
  var rows = [].slice.call(this.element.querySelectorAll('.' + selector + ' tbody tr'));
685
676
  for (var _i = 0, rows_1 = rows; _i < rows_1.length; _i++) {
@@ -224,9 +224,7 @@ var YearEvent = /** @class */ (function (_super) {
224
224
  this.eventHeight = util.getElementHeightFromClass(eventTable, cls.APPOINTMENT_CLASS);
225
225
  var wrapperCollection = [].slice.call(this.parent.element.querySelectorAll('.' + cls.APPOINTMENT_CONTAINER_CLASS));
226
226
  var resources = this.parent.uiStateValues.isGroupAdaptive ?
227
- [this.parent.resourceBase.lastResourceLevel[this.parent.uiStateValues.groupIndex]] :
228
- this.parent.activeViewOptions.allowVirtualScrolling ? this.parent.resourceBase.renderedResources :
229
- this.parent.resourceBase.lastResourceLevel;
227
+ [this.parent.resourceBase.lastResourceLevel[this.parent.uiStateValues.groupIndex]] : this.parent.resourceBase.lastResourceLevel;
230
228
  var months = this.getMonths();
231
229
  if (this.parent.activeViewOptions.orientation === 'Horizontal') {
232
230
  for (var month = 0; month < months.length; month++) {
@@ -23,7 +23,7 @@ var ICalendarExport = /** @class */ (function () {
23
23
  var editedExDate = [];
24
24
  if (eventObj[fields.recurrenceID]) {
25
25
  var filter = _this.filterEvents(filterCollection, fields.id, eventObj[fields.recurrenceID]);
26
- uId = filter.length > 0 ? filter[0].UID : uId;
26
+ uId = filter[0].UID;
27
27
  }
28
28
  if (!eventObj[fields.recurrenceID] && eventObj[fields.recurrenceRule] && eventObj[fields.recurrenceException]) {
29
29
  var exDate = (eventObj[fields.recurrenceException]).split(',');
@@ -656,8 +656,7 @@ var EventWindow = /** @class */ (function () {
656
656
  return labelText;
657
657
  };
658
658
  EventWindow.prototype.onChange = function (args) {
659
- var targetSelector = "." + cls.EVENT_WINDOW_ALL_DAY_CLASS + ",." + cls.TIME_ZONE_CLASS + ",." + cls.EVENT_WINDOW_REPEAT_CLASS;
660
- var target = closest(args.event.target, targetSelector);
659
+ var target = args.event.currentTarget.querySelector('input');
661
660
  if (target.classList.contains(cls.EVENT_WINDOW_ALL_DAY_CLASS)) {
662
661
  this.onAllDayChange(args.checked);
663
662
  }
@@ -823,8 +822,7 @@ var EventWindow = /** @class */ (function () {
823
822
  };
824
823
  EventWindow.prototype.showDetails = function (eventData) {
825
824
  var eventObj = extend({}, eventData, null, true);
826
- if ((!this.cellClickAction || this.cellClickAction && !isNullOrUndefined(this.parent.editorTemplate)) &&
827
- eventObj[this.fields.endTime].getHours() === 0 && eventObj[this.fields.endTime].getMinutes() === 0) {
825
+ if (eventObj[this.fields.endTime].getHours() === 0 && eventObj[this.fields.endTime].getMinutes() === 0) {
828
826
  this.trimAllDay(eventObj);
829
827
  }
830
828
  this.eventData = eventObj;
@@ -92,16 +92,16 @@ var Month = /** @class */ (function (_super) {
92
92
  }
93
93
  this.setColWidth(content);
94
94
  if (args.scrollPosition || !args.isPreventScrollUpdate && this.parent.currentView === 'TimelineMonth') {
95
- var top_1 = this.parent.currentView === 'TimelineMonth' ? this.parent.uiStateValues.top : args.scrollPosition.top;
96
- if (leftPanel) {
97
- leftPanel.scrollTop = top_1;
98
- }
99
- content.scrollTop = top_1;
100
95
  if (this.parent.uiStateValues.isInitial) {
101
96
  this.scrollToSelectedDate();
102
97
  this.parent.uiStateValues.isInitial = false;
103
98
  }
104
99
  else {
100
+ var top_1 = this.parent.currentView === 'TimelineMonth' ? this.parent.uiStateValues.top : args.scrollPosition.top;
101
+ if (leftPanel) {
102
+ leftPanel.scrollTop = top_1;
103
+ }
104
+ content.scrollTop = top_1;
105
105
  content.scrollLeft = this.parent.currentView === 'TimelineMonth' ? this.parent.uiStateValues.left :
106
106
  args.scrollPosition.left;
107
107
  }
@@ -122,9 +122,6 @@ var Month = /** @class */ (function (_super) {
122
122
  else {
123
123
  content.scrollLeft = 0;
124
124
  }
125
- if (content.scrollLeft === 0 && this.parent.uiStateValues.isInitial) {
126
- this.parent.uiStateValues.left = 0;
127
- }
128
125
  };
129
126
  Month.prototype.setContentHeight = function (content, leftPanelElement, height) {
130
127
  content.style.height = 'auto';
@@ -91,8 +91,7 @@ var Render = /** @class */ (function () {
91
91
  this.parent.virtualScrollModule.destroy();
92
92
  this.parent.virtualScrollModule = null;
93
93
  }
94
- if (this.parent.currentView.indexOf('Timeline') !== -1 && (this.parent.currentView.indexOf('Year') === -1 ||
95
- (this.parent.currentView === 'TimelineYear' && this.parent.activeViewOptions.orientation === 'Vertical'))
94
+ if (this.parent.currentView.indexOf('Timeline') !== -1 && this.parent.currentView.indexOf('Year') === -1
96
95
  && this.parent.activeViewOptions.allowVirtualScrolling
97
96
  && this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
98
97
  this.parent.virtualScrollModule = new VirtualScroll(this.parent);
@@ -12,8 +12,7 @@ export declare class TimelineYear extends Year {
12
12
  private renderResourceHeader;
13
13
  renderContent(contentWrapper: HTMLElement): void;
14
14
  private renderDefaultContent;
15
- getContentRows(): Element[];
16
- renderResourceContent(wrapper: HTMLElement, monthBody: HTMLTableSectionElement, contentBody: HTMLTableSectionElement): void;
15
+ private renderResourceContent;
17
16
  private renderDayMonthHeaderTemplate;
18
17
  private renderCellTemplate;
19
18
  scrollToDate(scrollDate: Date): void;
@@ -149,7 +149,7 @@ var TimelineYear = /** @class */ (function (_super) {
149
149
  !this.parent.uiStateValues.isGroupAdaptive) {
150
150
  tdCollection.push(firstTd);
151
151
  firstTd.appendChild(this.parent.resourceBase.createResourceColumn());
152
- this.rowCount = this.parent.resourceBase.renderedResources.length;
152
+ this.rowCount = this.parent.resourceBase.lastResourceLevel.length;
153
153
  }
154
154
  else {
155
155
  tdCollection.push(firstTd);
@@ -166,9 +166,6 @@ var TimelineYear = /** @class */ (function (_super) {
166
166
  content.appendChild(contentTable);
167
167
  var eventWrapper = createElement('div', { className: cls.EVENT_TABLE_CLASS });
168
168
  content.appendChild(eventWrapper);
169
- if (this.parent.virtualScrollModule) {
170
- this.parent.virtualScrollModule.renderVirtualTrack(content);
171
- }
172
169
  var contentTBody = contentTable.querySelector('tbody');
173
170
  if (this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
174
171
  if (this.parent.rowAutoHeight) {
@@ -286,47 +283,6 @@ var TimelineYear = /** @class */ (function (_super) {
286
283
  }
287
284
  }
288
285
  };
289
- TimelineYear.prototype.getContentRows = function () {
290
- var tRow = [];
291
- var monthCells = this.getMonths();
292
- for (var row = 0; row < this.parent.resourceBase.renderedResources.length; row++) {
293
- var tr = createElement('tr', { attrs: { 'role': 'row' } });
294
- tRow.push(tr);
295
- var resData = void 0;
296
- if (this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
297
- resData = this.parent.resourceBase.renderedResources[row];
298
- }
299
- var monthDate = new Date(this.parent.selectedDate.getFullYear(), monthCells[row], 1);
300
- var date = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
301
- for (var month = 0; month < this.columnCount; month++) {
302
- var classList = [];
303
- var groupIndex = resData.groupIndex;
304
- classList = classList.concat(resData.className);
305
- if (classList.indexOf(cls.RESOURCE_PARENT_CLASS) > -1) {
306
- classList.push(cls.RESOURCE_GROUP_CELLS_CLASS);
307
- }
308
- else {
309
- classList.push(cls.WORKDAY_CLASS);
310
- }
311
- monthDate = new Date(this.parent.selectedDate.getFullYear(), monthCells[month], 1);
312
- date = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
313
- var tdELe = createElement('td', {
314
- className: cls.WORK_CELLS_CLASS,
315
- attrs: {
316
- 'role': 'gridcell', 'aria-selected': 'false',
317
- 'data-date': date.getTime().toString()
318
- }
319
- });
320
- addClass([tdELe], classList);
321
- tdELe.setAttribute('data-group-index', groupIndex.toString());
322
- this.renderCellTemplate({ date: date, type: 'resourceGroupCells', groupIndex: groupIndex }, tdELe);
323
- this.wireEvents(tdELe, 'cell');
324
- this.parent.trigger(event.renderCell, { elementType: 'resourceGroupCells', element: tdELe, date: date });
325
- tr.appendChild(tdELe);
326
- }
327
- }
328
- return tRow;
329
- };
330
286
  TimelineYear.prototype.renderResourceContent = function (wrapper, monthBody, contentBody) {
331
287
  var months = this.getMonths();
332
288
  for (var row = 0; row < this.rowCount; row++) {
@@ -334,8 +290,8 @@ var TimelineYear = /** @class */ (function (_super) {
334
290
  var tr = createElement('tr', { attrs: { 'role': 'row' } });
335
291
  contentBody.appendChild(tr);
336
292
  var resData = void 0;
337
- if (this.parent.activeViewOptions.orientation === 'Vertical' && this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
338
- resData = this.parent.resourceBase.renderedResources[row];
293
+ if (this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
294
+ resData = this.parent.resourceBase.lastResourceLevel[row];
339
295
  }
340
296
  var monthDate = new Date(this.parent.selectedDate.getFullYear(), months[row], 1);
341
297
  var date = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
@@ -356,9 +312,8 @@ var TimelineYear = /** @class */ (function (_super) {
356
312
  }
357
313
  for (var month = 0; month < this.columnCount; month++) {
358
314
  var classList = [];
359
- var groupIndex = void 0;
315
+ var groupIndex = row;
360
316
  if (this.parent.activeViewOptions.orientation === 'Vertical') {
361
- groupIndex = resData.groupIndex;
362
317
  classList = classList.concat(resData.className);
363
318
  if (classList.indexOf(cls.RESOURCE_PARENT_CLASS) > -1) {
364
319
  classList.push(cls.RESOURCE_GROUP_CELLS_CLASS);
@@ -726,9 +726,8 @@ var VerticalView = /** @class */ (function (_super) {
726
726
  var msStartHour = startHour.getTime();
727
727
  var msEndHour = endHour.getTime();
728
728
  if (msStartHour !== msEndHour) {
729
- var duration = this.parent.activeViewOptions.timeScale.interval / this.parent.activeViewOptions.timeScale.slotCount;
730
729
  length = (Math.abs(msEndHour - msStartHour) / msInterval) - ((new Date(msEndHour).getTimezoneOffset()
731
- - new Date(msStartHour).getTimezoneOffset()) / duration);
730
+ - new Date(msStartHour).getTimezoneOffset()) / (60 / this.parent.activeViewOptions.timeScale.slotCount));
732
731
  }
733
732
  if (!this.parent.activeViewOptions.timeScale.enable) {
734
733
  length = 1;
@@ -41,9 +41,6 @@ var Year = /** @class */ (function (_super) {
41
41
  var viewTypeClass = this.parent.activeViewOptions.orientation === 'Horizontal' ? 'e-horizontal' : 'e-vertical';
42
42
  addClass([this.element], [this.viewClass, viewTypeClass, className]);
43
43
  this.renderPanel(className);
44
- if (this.parent.activeViewOptions.allowVirtualScrolling) {
45
- addClass([this.element], [cls.VIRTUAL_SCROLL_CLASS]);
46
- }
47
44
  var calendarTable = this.createTableLayout(cls.OUTER_TABLE_CLASS);
48
45
  this.element.appendChild(calendarTable);
49
46
  this.element.querySelector('table').setAttribute('role', 'presentation');
@@ -264,7 +261,6 @@ var Year = /** @class */ (function (_super) {
264
261
  Year.prototype.onContentScroll = function (e) {
265
262
  var target = e.target;
266
263
  var headerWrapper = this.getDatesHeaderElement();
267
- this.parent.notify(event.virtualScroll, e);
268
264
  if (headerWrapper) {
269
265
  headerWrapper.firstElementChild.scrollLeft = target.scrollLeft;
270
266
  }