-
Notifications
You must be signed in to change notification settings - Fork 601
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Scheduler - Appointment is rendered incorrectly in the workWeek view …
…when the interval >= 2 (T1243027) (#27763)
- Loading branch information
Showing
42 changed files
with
68 additions
and
2 deletions.
There are no files selected for viewing
Binary file modified
BIN
+198 Bytes
(100%)
...me/tests/form/etalons/generic-resource(view=timelineWorkWeek-resource=true).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+20.8 KB
...vextreme/tests/scheduler/appointments/workWeek/etalons/work_week_interval-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
59 changes: 59 additions & 0 deletions
59
e2e/testcafe-devextreme/tests/scheduler/appointments/workWeek/interval.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
import Scheduler from 'devextreme-testcafe-models/scheduler'; | ||
import { createScreenshotsComparer } from 'devextreme-screenshot-comparer'; | ||
import url from '../../../../helpers/getPageUrl'; | ||
import { createWidget } from '../../../../helpers/createWidget'; | ||
import { safeSizeTest } from '../../../../helpers/safeSizeTest'; | ||
|
||
fixture.disablePageReloads`Appointments with adaptive` | ||
.page(url(__dirname, '../../../container.html')); | ||
|
||
safeSizeTest('Should correctly render scheduler in workWeek view with interval, skipping weekends (T1243027)', async (t) => { | ||
const { takeScreenshot, compareResults } = createScreenshotsComparer(t); | ||
const scheduler = new Scheduler('#container'); | ||
|
||
await takeScreenshot('work_week_interval-2.png', scheduler.workSpace); | ||
|
||
await t.expect(compareResults.isValid()) | ||
.ok(compareResults.errorMessages()); | ||
}).before(async () => createWidget('dxScheduler', { | ||
dataSource: [ | ||
{ | ||
startDate: '2024-01-05T01:00:00', | ||
endDate: '2024-01-07T01:00:00', | ||
text: 'Ends in weekend', | ||
color: 'red', | ||
}, | ||
{ | ||
startDate: '2024-01-07T01:00:00', | ||
endDate: '2024-01-08T01:00:00', | ||
text: 'Starts in weekend', | ||
color: 'blue', | ||
}, | ||
{ | ||
startDate: '2024-01-05T01:00:00', | ||
endDate: '2024-01-08T01:00:00', | ||
text: 'Goes over weekend', | ||
color: 'green', | ||
}, | ||
], | ||
views: [{ | ||
name: 'myView', | ||
type: 'workWeek', | ||
allDayPanelMode: 'allDay', | ||
intervalCount: 2, | ||
maxAppointmentsPerCell: 'unlimited', | ||
}], | ||
currentView: 'myView', | ||
currentDate: '2024-01-01', | ||
height: 600, | ||
// NOTE: resources are used only to distinguish appts in etalon file | ||
resources: [{ | ||
fieldExpr: 'color', | ||
dataSource: [ | ||
{ id: 'red', color: 'red' }, | ||
{ id: 'blue', color: 'blue' }, | ||
{ id: 'green', color: 'green' }, | ||
], | ||
label: 'Room', | ||
}], | ||
})); |
Binary file modified
BIN
-2 Bytes
(100%)
...view_markup_all-day_timelineWorkWeek_offset--735_start-9_end-17_first-day-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2 Bytes
(100%)
.../view_markup_all-day_timelineWorkWeek_offset-735_start-9_end-17_first-day-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+7 Bytes
(100%)
...kup_recurrent-appts_timelineWorkWeek_offset--735_start-0_end-24_first-day-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+2.03 KB
(110%)
...kup_recurrent-appts_timelineWorkWeek_offset--735_start-0_end-24_first-day-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+8 Bytes
(100%)
...kup_recurrent-appts_timelineWorkWeek_offset--735_start-9_end-17_first-day-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+8 Bytes
(100%)
...kup_recurrent-appts_timelineWorkWeek_offset--735_start-9_end-17_first-day-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+13 Bytes
(100%)
...rkup_recurrent-appts_timelineWorkWeek_offset-735_start-0_end-24_first-day-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+2.29 KB
(110%)
...rkup_recurrent-appts_timelineWorkWeek_offset-735_start-0_end-24_first-day-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+4 Bytes
(100%)
...rkup_recurrent-appts_timelineWorkWeek_offset-735_start-9_end-17_first-day-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+4 Bytes
(100%)
...rkup_recurrent-appts_timelineWorkWeek_offset-735_start-9_end-17_first-day-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-1.42 KB
(98%)
...view_markup_recurrent-appts_workWeek_offset--735_start-0_end-24_first-day-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-473 Bytes
(99%)
.../view_markup_recurrent-appts_workWeek_offset-735_start-0_end-24_first-day-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+1 KB
(100%)
...markup_usual-appts_timelineWorkWeek_offset--1440_start-0_end-24_first-day-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+291 Bytes
(100%)
...markup_usual-appts_timelineWorkWeek_offset--1440_start-0_end-24_first-day-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-4 Bytes
(100%)
...markup_usual-appts_timelineWorkWeek_offset--1440_start-9_end-17_first-day-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-7 Bytes
(100%)
...markup_usual-appts_timelineWorkWeek_offset--1440_start-9_end-17_first-day-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+5.68 KB
(110%)
..._markup_usual-appts_timelineWorkWeek_offset--735_start-0_end-24_first-day-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+5.72 KB
(110%)
..._markup_usual-appts_timelineWorkWeek_offset--735_start-0_end-24_first-day-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+7.33 KB
(110%)
..._markup_usual-appts_timelineWorkWeek_offset--735_start-9_end-17_first-day-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+7.35 KB
(110%)
..._markup_usual-appts_timelineWorkWeek_offset--735_start-9_end-17_first-day-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+1.21 KB
(100%)
...iew_markup_usual-appts_timelineWorkWeek_offset-0_start-0_end-24_first-day-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-437 Bytes
(100%)
...iew_markup_usual-appts_timelineWorkWeek_offset-0_start-0_end-24_first-day-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-3 Bytes
(100%)
...iew_markup_usual-appts_timelineWorkWeek_offset-0_start-9_end-17_first-day-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-5 Bytes
(100%)
...iew_markup_usual-appts_timelineWorkWeek_offset-0_start-9_end-17_first-day-3.png
Oops, something went wrong.
Binary file modified
BIN
+1.28 KB
(100%)
..._markup_usual-appts_timelineWorkWeek_offset-1440_start-0_end-24_first-day-0.png
Oops, something went wrong.
Binary file modified
BIN
-454 Bytes
(100%)
..._markup_usual-appts_timelineWorkWeek_offset-1440_start-0_end-24_first-day-3.png
Oops, something went wrong.
Binary file modified
BIN
-2 Bytes
(100%)
..._markup_usual-appts_timelineWorkWeek_offset-1440_start-9_end-17_first-day-0.png
Oops, something went wrong.
Binary file modified
BIN
-2 Bytes
(100%)
..._markup_usual-appts_timelineWorkWeek_offset-1440_start-9_end-17_first-day-3.png
Oops, something went wrong.
Binary file modified
BIN
+4.71 KB
(110%)
...w_markup_usual-appts_timelineWorkWeek_offset-735_start-0_end-24_first-day-0.png
Oops, something went wrong.
Binary file modified
BIN
+4.19 KB
(100%)
...w_markup_usual-appts_timelineWorkWeek_offset-735_start-0_end-24_first-day-3.png
Oops, something went wrong.
Binary file modified
BIN
+3.91 KB
(100%)
...w_markup_usual-appts_timelineWorkWeek_offset-735_start-9_end-17_first-day-0.png
Oops, something went wrong.
Binary file modified
BIN
+3.77 KB
(100%)
...w_markup_usual-appts_timelineWorkWeek_offset-735_start-9_end-17_first-day-3.png
Oops, something went wrong.
Binary file modified
BIN
-162 Bytes
(100%)
...ns/view_markup_usual-appts_workWeek_offset--1440_start-0_end-24_first-day-3.png
Oops, something went wrong.
Binary file modified
BIN
-612 Bytes
(100%)
...ons/view_markup_usual-appts_workWeek_offset--735_start-0_end-24_first-day-3.png
Oops, something went wrong.
Binary file modified
BIN
-262 Bytes
(100%)
...talons/view_markup_usual-appts_workWeek_offset-0_start-0_end-24_first-day-3.png
Oops, something went wrong.
Binary file modified
BIN
-669 Bytes
(99%)
...ons/view_markup_usual-appts_workWeek_offset-1440_start-0_end-24_first-day-3.png
Oops, something went wrong.
Binary file modified
BIN
-641 Bytes
(100%)
...lons/view_markup_usual-appts_workWeek_offset-735_start-0_end-24_first-day-3.png
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters