Skip to content
4 changes: 2 additions & 2 deletions packages/devextreme/js/__internal/scheduler/m_scheduler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1256,7 +1256,7 @@ class Scheduler extends SchedulerOptionsBaseWidget {
getResizableStep: () => (this._workSpace ? this._workSpace.positionHelper.getResizableStep() : 0),
getDOMElementsMetaData: () => this._workSpace?.getDOMElementsMetaData(),
getViewDataProvider: () => this._workSpace?.viewDataProvider,
isVerticalGroupedWorkSpace: () => this._workSpace._isVerticalGroupedWorkSpace(),
isVerticalGroupedWorkSpace: () => this._workSpace.isVerticalGroupedWorkSpace(),
isDateAndTimeView: () => isDateAndTimeView(this._workSpace.type),
onContentReady: () => {
this._workSpace?.option('allDayExpanded', this._isAllDayExpanded());
Expand Down Expand Up @@ -1302,7 +1302,7 @@ class Scheduler extends SchedulerOptionsBaseWidget {
this._workSpace = this._createComponent($workSpace, workSpaceComponent, workSpaceConfig);

this._allowDragging() && this._workSpace.initDragBehavior(this, this._all);
this._workSpace._attachTablesEvents();
this._workSpace.attachTablesEvents();
this._workSpace.getWorkArea().append(this._appointments.$element());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ const subscribes = {
};
}

if (!allDay && VERTICAL_VIEW_TYPES.includes(this.currentView.type) && this._workSpace._isVerticalGroupedWorkSpace()) {
if (!allDay && VERTICAL_VIEW_TYPES.includes(this.currentView.type) && this._workSpace.isVerticalGroupedWorkSpace()) {
const verticalGroupBounds = this._workSpace.getGroupBounds(options.coordinates);
return {
left: 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class SchedulerAgenda extends WorkSpace {
if (this._$groupTable) {
this._$groupTable.remove();
this._$groupTable = null;
this._detachGroupCountClass();
this.detachGroupCountClass();
}
} else if (!this._$groupTable) {
this._initGroupTable();
Expand All @@ -112,7 +112,7 @@ class SchedulerAgenda extends WorkSpace {
return false;
}

_isVerticalGroupedWorkSpace() {
isVerticalGroupedWorkSpace() {
return false;
}

Expand All @@ -128,17 +128,17 @@ class SchedulerAgenda extends WorkSpace {
return 1;
}

_getTimePanelRowCount() {
getTimePanelRowCount() {
return this.option('agendaDuration') as number;
}

_renderAllDayPanel() { return noop(); }
renderAllDayPanel() { return noop(); }

_updateAllDayVisibility() { return noop(); }
updateAllDayVisibility() { return noop(); }

_updateAllDayHeight() { return noop(); }

_initWorkSpaceUnits() {
initWorkSpaceUnits() {
this._initGroupTable();
this._$timePanel = $('<table>').attr('aria-hidden', true).addClass(TIME_PANEL_CLASS);
this._$dateTable = $('<table>').attr('aria-hidden', true).addClass(DATE_TABLE_CLASS);
Expand Down Expand Up @@ -169,13 +169,13 @@ class SchedulerAgenda extends WorkSpace {
this._rows = rows;

if (this._$groupTable) {
cellTemplates = this._renderGroupHeader();
cellTemplates = this.renderGroupHeader();
this._setGroupHeaderCellsHeight();
}

this._renderTimePanel();
this._renderDateTable();
this._applyCellTemplates(cellTemplates);
this.renderTimePanel();
this.renderDateTable();
this.applyCellTemplates(cellTemplates);
this._dateTableScrollable.update();
}

Expand All @@ -188,7 +188,7 @@ class SchedulerAgenda extends WorkSpace {

_setTableSizes() { return noop(); }

_toggleHorizontalScrollClass() { return noop(); }
toggleHorizontalScrollClass() { return noop(); }

// eslint-disable-next-line @typescript-eslint/no-unused-vars
_createCrossScrollingConfig(argument?: any) { return noop(); }
Expand Down Expand Up @@ -224,7 +224,7 @@ class SchedulerAgenda extends WorkSpace {
return result;
}

_attachGroupCountClass() {
attachGroupCountClass() {
const className = getVerticalGroupCountClass(this.option('groups'));
(this.$element() as any).addClass(className);
}
Expand All @@ -244,11 +244,11 @@ class SchedulerAgenda extends WorkSpace {
return result;
}

_getGroupHeaderContainer() {
getGroupHeaderContainer() {
return this._$groupTable;
}

_makeGroupRows() {
makeGroupRows() {
const resourceManager = this.option('getResourceManager')();
const allAppointments = (this.option('getFilteredItems') as any)() as ListEntity[];
const tree = reduceResourcesTree(
Expand All @@ -265,7 +265,7 @@ class SchedulerAgenda extends WorkSpace {
cellTag: 'th',
groupTableClass: GROUP_TABLE_CLASS,
groupRowClass: GROUP_ROW_CLASS,
groupCellClass: this._getGroupHeaderClass(),
groupCellClass: this.getGroupHeaderClass(),
groupCellCustomContent(cell: HTMLDivElement, cellTextElement: HTMLElement, index: number, node: GroupNode) {
const container = domAdapter.createElement('div');
container.className = getGroupHeaderContentClass;
Expand Down Expand Up @@ -320,11 +320,11 @@ class SchedulerAgenda extends WorkSpace {
}
}

_createWorkSpaceElements() {
this._createWorkSpaceStaticElements();
createWorkSpaceElements() {
this.createWorkSpaceStaticElements();
}

_createWorkSpaceStaticElements() {
createWorkSpaceStaticElements() {
this._$dateTableContainer.append(this._$dateTable);
this._dateTableScrollable.$content().append(this._$dateTableScrollableContent);

Expand All @@ -336,15 +336,15 @@ class SchedulerAgenda extends WorkSpace {
this.$element().append(this._dateTableScrollable.$element());
}

_renderDateTable() {
this._renderTableBody({
renderDateTable() {
this.renderTableBody({
container: getPublicElement(this._$dateTable),
rowClass: DATE_TABLE_ROW_CLASS,
cellClass: this._getDateTableCellClass(),
cellClass: this.getDateTableCellClass(),
});
}

_attachTablesEvents() { return noop(); }
attachTablesEvents() { return noop(); }

_attachEvents() { return noop(); }

Expand Down Expand Up @@ -372,7 +372,7 @@ class SchedulerAgenda extends WorkSpace {
}

// eslint-disable-next-line @typescript-eslint/no-unused-vars
_renderTableBody(options: any, delayCellTemplateRendering?: any) {
renderTableBody(options: any, delayCellTemplateRendering?: any) {
const cellTemplates: any[] = [];
const cellTemplateOpt = options.cellTemplate;

Expand Down Expand Up @@ -421,7 +421,7 @@ class SchedulerAgenda extends WorkSpace {
}

$(options.container).append($('<tbody>').append(this._$rows));
this._applyCellTemplates(cellTemplates);
this.applyCellTemplates(cellTemplates);
}

_setLastRowClass() {
Expand All @@ -432,10 +432,10 @@ class SchedulerAgenda extends WorkSpace {
}
}

_renderTimePanel() {
this._renderTableBody({
renderTimePanel() {
this.renderTableBody({
container: getPublicElement(this._$timePanel),
rowCount: this._getTimePanelRowCount(),
rowCount: this.getTimePanelRowCount(),
cellCount: 1,
rowClass: TIME_PANEL_ROW_CLASS,
cellClass: TIME_PANEL_CELL_CLASS,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class SchedulerTimeline extends SchedulerWorkSpace {
return this._$sidebarTable ? getOuterWidth(this._$sidebarTable) : 0;
}

_getTotalRowCount(groupCount) {
getTotalRowCount(groupCount) {
if (this._isHorizontalGroupedWorkSpace()) {
return this._getRowCount();
}
Expand Down Expand Up @@ -92,14 +92,14 @@ class SchedulerTimeline extends SchedulerWorkSpace {
return false;
}

_getGroupHeaderContainer() {
getGroupHeaderContainer() {
if (this._isHorizontalGroupedWorkSpace()) {
return this._$thead;
}
return this._$sidebarTable;
}

_insertAllDayRowsIntoDateTable() {
insertAllDayRowsIntoDateTable() {
return false;
}

Expand Down Expand Up @@ -283,7 +283,7 @@ class SchedulerTimeline extends SchedulerWorkSpace {

renderRTimeTable() {}

_renderGroupAllDayPanel() {}
renderGroupAllDayPanel() {}

// eslint-disable-next-line @typescript-eslint/no-unused-vars
generateRenderOptions(argument?: any) {
Expand Down Expand Up @@ -312,7 +312,7 @@ class SchedulerTimeline extends SchedulerWorkSpace {
return 'vertical';
}

_toggleGroupingDirectionClass() {
toggleGroupingDirectionClass() {
(this.$element() as any).toggleClass(HORIZONTAL_GROUPED_WORKSPACE_CLASS, this._isHorizontalGroupedWorkSpace());
}

Expand All @@ -322,22 +322,22 @@ class SchedulerTimeline extends SchedulerWorkSpace {
});
}

_createWorkSpaceElements() {
this._createWorkSpaceScrollableElements();
createWorkSpaceElements() {
this.createWorkSpaceScrollableElements();
}

_updateAllDayVisibility() { return noop(); }
updateAllDayVisibility() { return noop(); }

_updateAllDayHeight() { return noop(); }

_getDateHeaderTemplate() {
getDateHeaderTemplate() {
return this.option('timeCellTemplate');
}

_renderView() {
let groupCellTemplates;
if (!this.isRenovatedRender()) {
groupCellTemplates = this._renderGroupHeader();
groupCellTemplates = this.renderGroupHeader();
}

this.renderWorkSpace();
Expand All @@ -350,13 +350,13 @@ class SchedulerTimeline extends SchedulerWorkSpace {

this._$sidebarTable.appendTo(this._sidebarScrollable.$content());

if (this.isRenovatedRender() && this._isVerticalGroupedWorkSpace()) {
if (this.isRenovatedRender() && this.isVerticalGroupedWorkSpace()) {
this.renderRGroupPanel();
}

this.updateHeaderEmptyCellWidth();

this._applyCellTemplates(groupCellTemplates);
this.applyCellTemplates(groupCellTemplates);
}

_setHorizontalGroupHeaderCellsHeight() { return noop(); }
Expand Down Expand Up @@ -388,14 +388,14 @@ class SchedulerTimeline extends SchedulerWorkSpace {
// These methods should be deleted when we get rid of old render
// --------------

_renderTimePanel() { return noop(); }
renderTimePanel() { return noop(); }

_renderAllDayPanel() { return noop(); }
renderAllDayPanel() { return noop(); }

_createAllDayPanelElements() { return noop(); }
createAllDayPanelElements() { return noop(); }

_renderDateHeader() {
const $headerRow = super._renderDateHeader();
renderDateHeader() {
const $headerRow = super.renderDateHeader();
if (this._needRenderWeekHeader()) {
const firstViewDate = new Date(this.getStartViewDate());
let currentDate = new Date(firstViewDate);
Expand Down Expand Up @@ -424,7 +424,7 @@ class SchedulerTimeline extends SchedulerWorkSpace {
model: {
text,
date: new Date(currentDate),
...this._getGroupsForDateHeaderTemplate(templateIndex, colSpan),
...this.getGroupsForDateHeaderTemplate(templateIndex, colSpan),
},
container: $th,
index: templateIndex,
Expand Down Expand Up @@ -473,7 +473,7 @@ class SchedulerTimeline extends SchedulerWorkSpace {
}
}

_makeGroupRows(groups, groupByDate) {
makeGroupRows(groups, groupByDate) {
const tableCreatorStrategy = this.option('groupOrientation') === 'vertical' ? tableCreator.VERTICAL : tableCreator.HORIZONTAL;

return tableCreator.makeGroupedTable(
Expand All @@ -482,12 +482,12 @@ class SchedulerTimeline extends SchedulerWorkSpace {
{
groupRowClass: GROUP_ROW_CLASS,
groupHeaderRowClass: GROUP_ROW_CLASS,
groupHeaderClass: this._getGroupHeaderClass.bind(this),
groupHeaderClass: this.getGroupHeaderClass.bind(this),
groupHeaderContentClass: GROUP_HEADER_CONTENT_CLASS,
},
this._getCellCount() || 1,
this.option('resourceCellTemplate'),
this._getTotalRowCount(this._getGroupCount()),
this.getTotalRowCount(this._getGroupCount()),
groupByDate,
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class SchedulerTimelineMonth extends SchedulerTimeline {
return TIMELINE_CLASS;
}

_getDateHeaderTemplate() {
getDateHeaderTemplate() {
return this.option('dateCellTemplate');
}

Expand Down
Loading
Loading