Scheduler - Appointment is rendered incorrectly in the workWeek view …

…when the interval >= 2 (T1243027) (#27763)
DevExpress · Jul 22, 2024 · 48a3265 · 48a3265
1 parent 75574e1
commit 48a3265
Show file tree

Hide file tree

Showing 42 changed files with 68 additions and 2 deletions.
diff --git a/...me/tests/form/etalons/generic-resource(view=timelineWorkWeek-resource=true).png b/...me/tests/form/etalons/generic-resource(view=timelineWorkWeek-resource=true).png
diff --git a/...vextreme/tests/scheduler/appointments/workWeek/etalons/work_week_interval-2.png b/...vextreme/tests/scheduler/appointments/workWeek/etalons/work_week_interval-2.png
diff --git a/e2e/testcafe-devextreme/tests/scheduler/appointments/workWeek/interval.ts b/e2e/testcafe-devextreme/tests/scheduler/appointments/workWeek/interval.ts
@@ -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',
+  }],
+}));
diff --git a/...view_markup_all-day_timelineWorkWeek_offset--735_start-9_end-17_first-day-3.png b/...view_markup_all-day_timelineWorkWeek_offset--735_start-9_end-17_first-day-3.png
diff --git a/.../view_markup_all-day_timelineWorkWeek_offset-735_start-9_end-17_first-day-3.png b/.../view_markup_all-day_timelineWorkWeek_offset-735_start-9_end-17_first-day-3.png
diff --git a/...kup_recurrent-appts_timelineWorkWeek_offset--735_start-0_end-24_first-day-0.png b/...kup_recurrent-appts_timelineWorkWeek_offset--735_start-0_end-24_first-day-0.png
diff --git a/...kup_recurrent-appts_timelineWorkWeek_offset--735_start-0_end-24_first-day-3.png b/...kup_recurrent-appts_timelineWorkWeek_offset--735_start-0_end-24_first-day-3.png
diff --git a/...kup_recurrent-appts_timelineWorkWeek_offset--735_start-9_end-17_first-day-0.png b/...kup_recurrent-appts_timelineWorkWeek_offset--735_start-9_end-17_first-day-0.png
diff --git a/...kup_recurrent-appts_timelineWorkWeek_offset--735_start-9_end-17_first-day-3.png b/...kup_recurrent-appts_timelineWorkWeek_offset--735_start-9_end-17_first-day-3.png
diff --git a/...rkup_recurrent-appts_timelineWorkWeek_offset-735_start-0_end-24_first-day-0.png b/...rkup_recurrent-appts_timelineWorkWeek_offset-735_start-0_end-24_first-day-0.png
diff --git a/...rkup_recurrent-appts_timelineWorkWeek_offset-735_start-0_end-24_first-day-3.png b/...rkup_recurrent-appts_timelineWorkWeek_offset-735_start-0_end-24_first-day-3.png
diff --git a/...rkup_recurrent-appts_timelineWorkWeek_offset-735_start-9_end-17_first-day-0.png b/...rkup_recurrent-appts_timelineWorkWeek_offset-735_start-9_end-17_first-day-0.png
diff --git a/...rkup_recurrent-appts_timelineWorkWeek_offset-735_start-9_end-17_first-day-3.png b/...rkup_recurrent-appts_timelineWorkWeek_offset-735_start-9_end-17_first-day-3.png
diff --git a/...view_markup_recurrent-appts_workWeek_offset--735_start-0_end-24_first-day-3.png b/...view_markup_recurrent-appts_workWeek_offset--735_start-0_end-24_first-day-3.png
diff --git a/.../view_markup_recurrent-appts_workWeek_offset-735_start-0_end-24_first-day-3.png b/.../view_markup_recurrent-appts_workWeek_offset-735_start-0_end-24_first-day-3.png
diff --git a/...markup_usual-appts_timelineWorkWeek_offset--1440_start-0_end-24_first-day-0.png b/...markup_usual-appts_timelineWorkWeek_offset--1440_start-0_end-24_first-day-0.png
diff --git a/...markup_usual-appts_timelineWorkWeek_offset--1440_start-0_end-24_first-day-3.png b/...markup_usual-appts_timelineWorkWeek_offset--1440_start-0_end-24_first-day-3.png
diff --git a/...markup_usual-appts_timelineWorkWeek_offset--1440_start-9_end-17_first-day-0.png b/...markup_usual-appts_timelineWorkWeek_offset--1440_start-9_end-17_first-day-0.png
diff --git a/...markup_usual-appts_timelineWorkWeek_offset--1440_start-9_end-17_first-day-3.png b/...markup_usual-appts_timelineWorkWeek_offset--1440_start-9_end-17_first-day-3.png
diff --git a/..._markup_usual-appts_timelineWorkWeek_offset--735_start-0_end-24_first-day-0.png b/..._markup_usual-appts_timelineWorkWeek_offset--735_start-0_end-24_first-day-0.png
diff --git a/..._markup_usual-appts_timelineWorkWeek_offset--735_start-0_end-24_first-day-3.png b/..._markup_usual-appts_timelineWorkWeek_offset--735_start-0_end-24_first-day-3.png
diff --git a/..._markup_usual-appts_timelineWorkWeek_offset--735_start-9_end-17_first-day-0.png b/..._markup_usual-appts_timelineWorkWeek_offset--735_start-9_end-17_first-day-0.png
diff --git a/..._markup_usual-appts_timelineWorkWeek_offset--735_start-9_end-17_first-day-3.png b/..._markup_usual-appts_timelineWorkWeek_offset--735_start-9_end-17_first-day-3.png
diff --git a/...iew_markup_usual-appts_timelineWorkWeek_offset-0_start-0_end-24_first-day-0.png b/...iew_markup_usual-appts_timelineWorkWeek_offset-0_start-0_end-24_first-day-0.png
diff --git a/...iew_markup_usual-appts_timelineWorkWeek_offset-0_start-0_end-24_first-day-3.png b/...iew_markup_usual-appts_timelineWorkWeek_offset-0_start-0_end-24_first-day-3.png
diff --git a/...iew_markup_usual-appts_timelineWorkWeek_offset-0_start-9_end-17_first-day-0.png b/...iew_markup_usual-appts_timelineWorkWeek_offset-0_start-9_end-17_first-day-0.png
diff --git a/...iew_markup_usual-appts_timelineWorkWeek_offset-0_start-9_end-17_first-day-3.png b/...iew_markup_usual-appts_timelineWorkWeek_offset-0_start-9_end-17_first-day-3.png
diff --git a/..._markup_usual-appts_timelineWorkWeek_offset-1440_start-0_end-24_first-day-0.png b/..._markup_usual-appts_timelineWorkWeek_offset-1440_start-0_end-24_first-day-0.png
diff --git a/..._markup_usual-appts_timelineWorkWeek_offset-1440_start-0_end-24_first-day-3.png b/..._markup_usual-appts_timelineWorkWeek_offset-1440_start-0_end-24_first-day-3.png
diff --git a/..._markup_usual-appts_timelineWorkWeek_offset-1440_start-9_end-17_first-day-0.png b/..._markup_usual-appts_timelineWorkWeek_offset-1440_start-9_end-17_first-day-0.png
diff --git a/..._markup_usual-appts_timelineWorkWeek_offset-1440_start-9_end-17_first-day-3.png b/..._markup_usual-appts_timelineWorkWeek_offset-1440_start-9_end-17_first-day-3.png
diff --git a/...w_markup_usual-appts_timelineWorkWeek_offset-735_start-0_end-24_first-day-0.png b/...w_markup_usual-appts_timelineWorkWeek_offset-735_start-0_end-24_first-day-0.png
diff --git a/...w_markup_usual-appts_timelineWorkWeek_offset-735_start-0_end-24_first-day-3.png b/...w_markup_usual-appts_timelineWorkWeek_offset-735_start-0_end-24_first-day-3.png
diff --git a/...w_markup_usual-appts_timelineWorkWeek_offset-735_start-9_end-17_first-day-0.png b/...w_markup_usual-appts_timelineWorkWeek_offset-735_start-9_end-17_first-day-0.png
diff --git a/...w_markup_usual-appts_timelineWorkWeek_offset-735_start-9_end-17_first-day-3.png b/...w_markup_usual-appts_timelineWorkWeek_offset-735_start-9_end-17_first-day-3.png
diff --git a/...ns/view_markup_usual-appts_workWeek_offset--1440_start-0_end-24_first-day-3.png b/...ns/view_markup_usual-appts_workWeek_offset--1440_start-0_end-24_first-day-3.png
diff --git a/...ons/view_markup_usual-appts_workWeek_offset--735_start-0_end-24_first-day-3.png b/...ons/view_markup_usual-appts_workWeek_offset--735_start-0_end-24_first-day-3.png
diff --git a/...talons/view_markup_usual-appts_workWeek_offset-0_start-0_end-24_first-day-3.png b/...talons/view_markup_usual-appts_workWeek_offset-0_start-0_end-24_first-day-3.png
diff --git a/...ons/view_markup_usual-appts_workWeek_offset-1440_start-0_end-24_first-day-3.png b/...ons/view_markup_usual-appts_workWeek_offset-1440_start-0_end-24_first-day-3.png
diff --git a/...lons/view_markup_usual-appts_workWeek_offset-735_start-0_end-24_first-day-3.png b/...lons/view_markup_usual-appts_workWeek_offset-735_start-0_end-24_first-day-3.png
diff --git a/...vextreme/js/__internal/scheduler/appointments/rendering_strategies/m_strategy_vertical.ts b/...vextreme/js/__internal/scheduler/appointments/rendering_strategies/m_strategy_vertical.ts
@@ -357,7 +357,14 @@ class VerticalRenderingStrategy extends BaseAppointmentsStrategy {
     } = position.info.appointment;
     const allDay = ExpressionUtils.getField(this.dataAccessors, 'allDay', appointment);
     const duration = this.getAppointmentDurationInMs(startDate, normalizedEndDate, allDay);
-    const durationInMinutes = this._adjustDurationByDaylightDiff(duration, startDate, normalizedEndDate) / toMs('minute');
+    const skippedMinutes = getSkippedHoursInRange(
+      startDate,
+      normalizedEndDate,
+      appointment.allDay,
+      this.viewDataProvider,
+    ) * 60;
+
+    const durationInMinutes = this._adjustDurationByDaylightDiff(duration, startDate, normalizedEndDate) / toMs('minute') - skippedMinutes;
 
     const height = durationInMinutes * this._getMinuteHeight();
 

diff --git a/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts b/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts
@@ -445,7 +445,7 @@ export const getSkippedHoursInRange = (
   }
 
   const startDateHours = startDate.getHours();
-  const endDateHours = endDate.getHours() + Math.ceil(endDate.getTime() % HOUR_IN_MS);
+  const endDateHours = endDate.getHours() + (endDate.getTime() % HOUR_IN_MS) / HOUR_IN_MS;
 
   if (viewDataProvider.isSkippedDate(startDate)) {
     if (isAllDay) {