Skip to content

Commit

Permalink
dxScheduler- update appointment layout in demo(day shift) (#3053)
Browse files Browse the repository at this point in the history
* Add colon

* Update data

* Fix shortcomings in server-side demos

* Fix data in reactjs

* Fix react.js data
  • Loading branch information
andrewmakarov authored Nov 30, 2023
1 parent 4164cb3 commit 66c9fd3
Show file tree
Hide file tree
Showing 14 changed files with 28 additions and 28 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="options">
<div class="option">
<div class="label">Work Hours</div>
<div class="label">Work Hours:</div>
<div class="value">
<dx-radio-group
[items]="shifts"
Expand Down
6 changes: 3 additions & 3 deletions JSDemos/Demos/Scheduler/WorkShifts/Angular/app/app.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const appointments: Appointment[] = [{
}, {
text: 'Approve Personal Computer Upgrade Plan',
startDate: '2021-03-31T01:30:00.000Z',
endDate: '2021-03-31T02:00:00.000Z',
endDate: '2021-03-31T03:00:00.000Z',
}, {
text: 'Final Budget Review',
startDate: '2021-03-30T16:30:00.000Z',
Expand All @@ -46,7 +46,7 @@ export const appointments: Appointment[] = [{
}, {
text: 'Prepare 2021 Marketing Plan',
startDate: '2021-04-01T16:30:00.000Z',
endDate: '2021-04-01T17:30:00.000Z',
endDate: '2021-04-01T18:00:00.000Z',
}, {
text: 'Brochure Design Review',
startDate: '2021-04-02T17:30:00.000Z',
Expand All @@ -62,7 +62,7 @@ export const appointments: Appointment[] = [{
}, {
text: 'Launch New Website',
startDate: '2021-04-01T01:30:00.000Z',
endDate: '2021-04-01T02:30:00.000Z',
endDate: '2021-04-01T03:00:00.000Z',
recurrenceRule: 'FREQ=WEEKLY;BYDAY=WE;INTERVAL=2',
}, {
text: 'Install New Router in Dev Room',
Expand Down
2 changes: 1 addition & 1 deletion JSDemos/Demos/Scheduler/WorkShifts/React/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const App = () => {
return <React.Fragment>
<div className="options">
<div className="option">
<div className="label">Work Hours</div>
<div className="label">Work Hours:</div>
<div className="value">
<RadioGroup
defaultValue={shifts[0]}
Expand Down
6 changes: 3 additions & 3 deletions JSDemos/Demos/Scheduler/WorkShifts/React/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const data: SchedulerTypes.Appointment[] = [{
}, {
text: 'Approve Personal Computer Upgrade Plan',
startDate: '2021-03-31T01:30:00.000Z',
endDate: '2021-03-31T02:00:00.000Z',
endDate: '2021-03-31T03:00:00.000Z',
}, {
text: 'Final Budget Review',
startDate: '2021-03-30T16:30:00.000Z',
Expand All @@ -39,7 +39,7 @@ export const data: SchedulerTypes.Appointment[] = [{
}, {
text: 'Prepare 2021 Marketing Plan',
startDate: '2021-04-01T16:30:00.000Z',
endDate: '2021-04-01T17:30:00.000Z',
endDate: '2021-04-01T18:00:00.000Z',
}, {
text: 'Brochure Design Review',
startDate: '2021-04-02T17:30:00.000Z',
Expand All @@ -55,7 +55,7 @@ export const data: SchedulerTypes.Appointment[] = [{
}, {
text: 'Launch New Website',
startDate: '2021-04-01T01:30:00.000Z',
endDate: '2021-04-01T02:30:00.000Z',
endDate: '2021-04-01T03:00:00.000Z',
recurrenceRule: 'FREQ=WEEKLY;BYDAY=WE;INTERVAL=2',
}, {
text: 'Install New Router in Dev Room',
Expand Down
2 changes: 1 addition & 1 deletion JSDemos/Demos/Scheduler/WorkShifts/ReactJs/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const App = () => {
<React.Fragment>
<div className="options">
<div className="option">
<div className="label">Work Hours</div>
<div className="label">Work Hours:</div>
<div className="value">
<RadioGroup
defaultValue={shifts[0]}
Expand Down
6 changes: 3 additions & 3 deletions JSDemos/Demos/Scheduler/WorkShifts/ReactJs/data.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const data = [
{
text: 'Approve Personal Computer Upgrade Plan',
startDate: '2021-03-31T01:30:00.000Z',
endDate: '2021-03-31T02:00:00.000Z',
endDate: '2021-03-31T03:00:00.000Z',
},
{
text: 'Final Budget Review',
Expand All @@ -41,7 +41,7 @@ export const data = [
{
text: 'Prepare 2021 Marketing Plan',
startDate: '2021-04-01T16:30:00.000Z',
endDate: '2021-04-01T17:30:00.000Z',
endDate: '2021-04-01T18:00:00.000Z',
},
{
text: 'Brochure Design Review',
Expand All @@ -61,7 +61,7 @@ export const data = [
{
text: 'Launch New Website',
startDate: '2021-04-01T01:30:00.000Z',
endDate: '2021-04-01T02:30:00.000Z',
endDate: '2021-04-01T03:00:00.000Z',
recurrenceRule: 'FREQ=WEEKLY;BYDAY=WE;INTERVAL=2',
},
{
Expand Down
2 changes: 1 addition & 1 deletion JSDemos/Demos/Scheduler/WorkShifts/Vue/App.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="options">
<div class="option">
<div class="label">Work Hours</div>
<div class="label">Work Hours:</div>
<div class="value">
<DxRadioGroup
:items="shifts"
Expand Down
6 changes: 3 additions & 3 deletions JSDemos/Demos/Scheduler/WorkShifts/Vue/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const appointments: Appointment[] = [{
}, {
text: 'Approve Personal Computer Upgrade Plan',
startDate: '2021-03-31T01:30:00.000Z',
endDate: '2021-03-31T02:00:00.000Z',
endDate: '2021-03-31T03:00:00.000Z',
}, {
text: 'Final Budget Review',
startDate: '2021-03-30T16:30:00.000Z',
Expand All @@ -44,7 +44,7 @@ export const appointments: Appointment[] = [{
}, {
text: 'Prepare 2021 Marketing Plan',
startDate: '2021-04-01T16:30:00.000Z',
endDate: '2021-04-01T17:30:00.000Z',
endDate: '2021-04-01T18:00:00.000Z',
}, {
text: 'Brochure Design Review',
startDate: '2021-04-02T17:30:00.000Z',
Expand All @@ -60,7 +60,7 @@ export const appointments: Appointment[] = [{
}, {
text: 'Launch New Website',
startDate: '2021-04-01T01:30:00.000Z',
endDate: '2021-04-01T02:30:00.000Z',
endDate: '2021-04-01T03:00:00.000Z',
recurrenceRule: 'FREQ=WEEKLY;BYDAY=WE;INTERVAL=2',
}, {
text: 'Install New Router in Dev Room',
Expand Down
6 changes: 3 additions & 3 deletions JSDemos/Demos/Scheduler/WorkShifts/jQuery/data.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const data = [{
}, {
text: 'Approve Personal Computer Upgrade Plan',
startDate: '2021-03-31T01:30:00.000Z',
endDate: '2021-03-31T02:00:00.000Z',
endDate: '2021-03-31T03:00:00.000Z',
}, {
text: 'Final Budget Review',
startDate: '2021-03-30T16:30:00.000Z',
Expand All @@ -32,7 +32,7 @@ const data = [{
}, {
text: 'Prepare 2021 Marketing Plan',
startDate: '2021-04-01T16:30:00.000Z',
endDate: '2021-04-01T17:30:00.000Z',
endDate: '2021-04-01T18:00:00.000Z',
}, {
text: 'Brochure Design Review',
startDate: '2021-04-02T17:30:00.000Z',
Expand All @@ -48,7 +48,7 @@ const data = [{
}, {
text: 'Launch New Website',
startDate: '2021-04-01T01:30:00.000Z',
endDate: '2021-04-01T02:30:00.000Z',
endDate: '2021-04-01T03:00:00.000Z',
recurrenceRule: 'FREQ=WEEKLY;BYDAY=WE;INTERVAL=2',
}, {
text: 'Install New Router in Dev Room',
Expand Down
2 changes: 1 addition & 1 deletion JSDemos/Demos/Scheduler/WorkShifts/jQuery/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<div class="demo-container">
<div class="options">
<div class="option">
<div class="label">Work Hours</div>
<div class="label">Work Hours:</div>
<div class="value">
<div id="shifts"></div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions MVCDemos/Models/SampleData/WorkShiftsAppointmentData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public partial class SampleData {
}, new Appointment {
Text = "Approve Personal Computer Upgrade Plan",
StartDate = "2021-03-31T01:30:00.000Z",
EndDate = "2021-03-31T02:00:00.000Z",
EndDate = "2021-03-31T03:00:00.000Z",
}, new Appointment {
Text = "Final Budget Review",
StartDate = "2021-03-30T16:30:00.000Z",
Expand All @@ -28,7 +28,7 @@ public partial class SampleData {
}, new Appointment {
Text = "Prepare 2021 Marketing Plan",
StartDate = "2021-04-01T16:30:00.000Z",
EndDate = "2021-04-01T17:30:00.000Z",
EndDate = "2021-04-01T18:00:00.000Z",
}, new Appointment {
Text = "Brochure Design Review",
StartDate = "2021-04-02T17:30:00.000Z",
Expand All @@ -44,7 +44,7 @@ public partial class SampleData {
}, new Appointment {
Text = "Launch New Website",
StartDate = "2021-04-01T01:30:00.000Z",
EndDate = "2021-04-01T02:30:00.000Z",
EndDate = "2021-04-01T03:00:00.000Z",
RecurrenceRule = "FREQ=WEEKLY;BYDAY=WE;INTERVAL=2",
}, new Appointment {
Text = "Install New Router in Dev Room",
Expand Down
2 changes: 1 addition & 1 deletion MVCDemos/Views/Scheduler/WorkShifts.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div class="options">
<div class="option">
<div class="label">Work Hours</div>
<div class="label">Work Hours:</div>
<div class="value">
@(Html.DevExtreme().RadioGroup()
.DataSource(Model.WorkShifts)
Expand Down
6 changes: 3 additions & 3 deletions NetCoreDemos/Models/SampleData/WorkShiftsAppointmentData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public partial class SampleData {
}, new Appointment {
Text = "Approve Personal Computer Upgrade Plan",
StartDate = "2021-03-31T01:30:00.000Z",
EndDate = "2021-03-31T02:00:00.000Z",
EndDate = "2021-03-31T03:00:00.000Z",
}, new Appointment {
Text = "Final Budget Review",
StartDate = "2021-03-30T16:30:00.000Z",
Expand All @@ -27,7 +27,7 @@ public partial class SampleData {
}, new Appointment {
Text = "Prepare 2021 Marketing Plan",
StartDate = "2021-04-01T16:30:00.000Z",
EndDate = "2021-04-01T17:30:00.000Z",
EndDate = "2021-04-01T18:00:00.000Z",
}, new Appointment {
Text = "Brochure Design Review",
StartDate = "2021-04-02T17:30:00.000Z",
Expand All @@ -43,7 +43,7 @@ public partial class SampleData {
}, new Appointment {
Text = "Launch New Website",
StartDate = "2021-04-01T01:30:00.000Z",
EndDate = "2021-04-01T02:30:00.000Z",
EndDate = "2021-04-01T03:00:00.000Z",
RecurrenceRule = "FREQ=WEEKLY;BYDAY=WE;INTERVAL=2",
}, new Appointment {
Text = "Install New Router in Dev Room",
Expand Down
2 changes: 1 addition & 1 deletion NetCoreDemos/Views/Scheduler/WorkShifts.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div class="options">
<div class="option">
<div class="label">Work Hours</div>
<div class="label">Work Hours:</div>
<div class="value">
@(Html.DevExtreme().RadioGroup()
.DataSource(Model.WorkShifts)
Expand Down

0 comments on commit 66c9fd3

Please sign in to comment.