Scheduler - Resolve Time Conflicts Demo#32703
Merged
Tucchhaa merged 26 commits intoDevExpress:26_1from Mar 10, 2026
Merged
Conversation
Tucchhaa
force-pushed
the
appointment-overlappint-demo
branch
from
ba02cf3 to
a3d6f71
Compare
…oss React, Vue, and ReactJs implementations
…lar, React, and Vue implementations; add new etalon images
Contributor
There was a problem hiding this comment.
Pull request overview
Adds a new Scheduler demo (“Resolve Time Conflicts”) to the DevExtreme demos app, showcasing overlap/conflict detection and a selectable overlap rule across supported frameworks.
Changes:
- Registered the new demo in
apps/demos/menuMeta.json. - Added a new “Resolve Time Conflicts” Scheduler demo implementation for jQuery, Angular, React, ReactJS, and Vue (UI + styling + sample data).
- Implemented conflict detection via Scheduler occurrences and surfaced conflict feedback via form validation + dialog.
Reviewed changes
Copilot reviewed 24 out of 26 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| apps/demos/menuMeta.json | Adds the “Resolve Time Conflicts” demo entry under Scheduler → Appointments. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/jQuery/index.html | jQuery demo page scaffold (scheduler + rule selector). |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/jQuery/index.js | jQuery demo logic: conflict detection + form validation + dialog flow. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/jQuery/data.js | jQuery demo sample data (appointments + assignees). |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/jQuery/styles.css | jQuery demo styling (informer, dialog, layout). |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/Angular/index.html | Angular demo page scaffold (SystemJS bootstrap). |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/Angular/app/app.component.ts | Angular demo component: conflict detection + editing configuration. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/Angular/app/app.component.html | Angular template (scheduler + overlap rule select box). |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/Angular/app/app.component.css | Angular demo styling (with ::ng-deep overrides). |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/Angular/app/app.service.ts | Angular demo data/service for appointments + assignees. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/React/index.html | React (TSX) demo page scaffold (SystemJS bootstrap). |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/React/index.tsx | React (TSX) demo entrypoint mounting the app. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/React/App.tsx | React (TSX) demo implementation of conflict handling. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/React/data.ts | React (TSX) demo sample data + types. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/React/styles.css | React (TSX) demo styling. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/ReactJs/index.html | ReactJS (JS) demo page scaffold (SystemJS bootstrap). |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/ReactJs/index.js | ReactJS entrypoint mounting the app. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/ReactJs/App.js | ReactJS demo implementation of conflict handling. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/ReactJs/data.js | ReactJS demo sample data. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/ReactJs/styles.css | ReactJS demo styling. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/Vue/index.html | Vue demo page scaffold (SystemJS + TS in browser). |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/Vue/index.ts | Vue demo entrypoint mounting the app. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/Vue/App.vue | Vue demo implementation of conflict handling + styles. |
| apps/demos/Demos/Scheduler/ResolveTimeConflicts/Vue/data.ts | Vue demo sample data + types. |
…y demos; adjust font size and add recurrence group positioning
…dd padding to dialog content and buttons
Tucchhaa
reviewed
Mar 6, 2026
apps/demos/Demos/Scheduler/ResolveTimeConflicts/Angular/app/app.component.css
Outdated
Show resolved
Hide resolved
Tucchhaa
reviewed
Mar 6, 2026
Tucchhaa
reviewed
Mar 6, 2026
Tucchhaa
reviewed
Mar 6, 2026
Tucchhaa
reviewed
Mar 6, 2026
Tucchhaa
reviewed
Mar 6, 2026
apps/demos/Demos/Scheduler/ResolveTimeConflicts/Angular/app/app.component.html
Outdated
Show resolved
Hide resolved
Tucchhaa
reviewed
Mar 6, 2026
apps/demos/Demos/Scheduler/ResolveTimeConflicts/Angular/app/app.component.ts
Outdated
Show resolved
Hide resolved
Tucchhaa
reviewed
Mar 6, 2026
apps/demos/Demos/Scheduler/ResolveTimeConflicts/Angular/app/app.component.ts
Outdated
Show resolved
Hide resolved
Tucchhaa
reviewed
Mar 6, 2026
apps/demos/Demos/Scheduler/ResolveTimeConflicts/Angular/app/app.component.ts
Outdated
Show resolved
Hide resolved
Tucchhaa
reviewed
Mar 6, 2026
Tucchhaa
reviewed
Mar 6, 2026
apps/demos/Demos/Scheduler/ResolveTimeConflicts/Angular/app/app.component.ts
Outdated
Show resolved
Hide resolved
Tucchhaa
reviewed
Mar 10, 2026
apps/demos/Demos/Scheduler/ResolveTimeConflicts/jQuery/styles.css
Outdated
Show resolved
Hide resolved
Tucchhaa
reviewed
Mar 10, 2026
Tucchhaa
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 24 out of 26 changed files in this pull request and generated no new comments.
You can also share your feedback on Copilot code review. Take the survey.
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 24 out of 26 changed files in this pull request and generated 2 comments.
You can also share your feedback on Copilot code review. Take the survey.
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 24 out of 26 changed files in this pull request and generated 1 comment.
You can also share your feedback on Copilot code review. Take the survey.
Tucchhaa
approved these changes
Mar 10, 2026
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.