Scheduler: add Resolve Time Conflicts demo description + update function name#33093
Open
vladaskorohodova wants to merge 3 commits intoDevExpress:26_1from
Open
Scheduler: add Resolve Time Conflicts demo description + update function name#33093vladaskorohodova wants to merge 3 commits intoDevExpress:26_1from
vladaskorohodova wants to merge 3 commits intoDevExpress:26_1from
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Adds end-user documentation for the “Resolve Time Conflicts” Scheduler demo and standardizes a helper function name across framework implementations.
Changes:
- Added
description.mdfor the Resolve Time Conflicts demo, explaining conflict detection, overlapping rules, and error display behavior. - Renamed
alertConflictIfNeeded→handleConflictacross Angular/React/ReactJs/Vue/jQuery demo sources to better reflect behavior.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/jQuery/index.js | Renames conflict-handling helper and updates event handlers to call it. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/description.md | New demo description documenting conflict detection and UI behavior. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/Vue/App.vue | Renames conflict-handling helper and updates event handlers to call it. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/ReactJs/App.js | Renames conflict-handling callback and updates handlers/deps. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/React/App.tsx | Renames conflict-handling callback and updates handlers/deps. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/Angular/app/app.component.ts | Renames conflict-handling method and updates event handlers to call it. |
Tucchhaa
previously approved these changes
Mar 30, 2026
aleksei-semikozov
previously approved these changes
Mar 30, 2026
Abadzhev
reviewed
Mar 31, 2026
Co-authored-by: Vladimir Abadzhev <vladimira@devexpress.com> Signed-off-by: Vlada Skorokhodova <94827090+vladaskorohodova@users.noreply.github.com>
e138bc9
| }, | ||
| onAppointmentUpdating(e) { | ||
| alertConflictIfNeeded(e, e.newData); | ||
| handleConflict(e, e.newData); |
There was a problem hiding this comment.
onAppointmentUpdating passes e.newData directly into conflict detection. In Scheduler, newData can be partial (only changed fields), so detectConflict() may receive an appointment without startDate/endDate/assigneeId and miss conflicts. Consider passing a merged object (e.g., old + new) here, consistent with the React/Vue/Angular versions of this demo.
Suggested change
| handleConflict(e, e.newData); | |
| const updatedAppointment = $.extend({}, e.appointmentData, e.newData); | |
| handleConflict(e, updatedAppointment); |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.