Skip to content
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
fieldExpr="priorityId"
label="Priority"
[dataSource]="priorities"
icon="tag"
>
</dxi-resource>
</dx-scheduler>
Expand Down
1 change: 1 addition & 0 deletions apps/demos/Demos/Scheduler/Adaptability/React/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const App = () => {
dataSource={priorities}
fieldExpr="priorityId"
label="Priority"
icon="tag"
/>
</Scheduler>
<SpeedDialAction
Expand Down
1 change: 1 addition & 0 deletions apps/demos/Demos/Scheduler/Adaptability/ReactJs/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const App = () => {
dataSource={priorities}
fieldExpr="priorityId"
label="Priority"
icon="tag"
/>
</Scheduler>
<SpeedDialAction
Expand Down
1 change: 1 addition & 0 deletions apps/demos/Demos/Scheduler/Adaptability/Vue/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
:data-source="priorities"
field-expr="priorityId"
label="Priority"
icon="tag"
/>
</DxScheduler>
<DxSpeedDialAction
Expand Down
1 change: 1 addition & 0 deletions apps/demos/Demos/Scheduler/Adaptability/jQuery/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ $(() => {
fieldExpr: 'priorityId',
dataSource: priorities,
label: 'Priority',
icon: 'tag',
}],
}).dxScheduler('instance');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@
[allowMultiple]="true"
[dataSource]="assignees"
[useColorAsDefault]="true"
icon="user"
>
</dxi-resource>
<dxi-resource
fieldExpr="priorityId"
label="Priority"
[dataSource]="priorities"
icon="tag"
>
</dxi-resource>
</dx-scheduler>
2 changes: 2 additions & 0 deletions apps/demos/Demos/Scheduler/Agenda/React/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@ const App = () => (
fieldExpr="assigneeId"
label="Assignee"
useColorAsDefault={true}
icon="user"
/>
<Resource
dataSource={priorities}
fieldExpr="priorityId"
label="Priority"
icon="tag"
/>
</Scheduler>
);
Expand Down
2 changes: 2 additions & 0 deletions apps/demos/Demos/Scheduler/Agenda/ReactJs/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@ const App = () => (
fieldExpr="assigneeId"
label="Assignee"
useColorAsDefault={true}
icon="user"
/>
<Resource
dataSource={priorities}
fieldExpr="priorityId"
label="Priority"
icon="tag"
/>
</Scheduler>
);
Expand Down
2 changes: 2 additions & 0 deletions apps/demos/Demos/Scheduler/Agenda/Vue/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@
:allow-multiple="true"
field-expr="assigneeId"
label="Assignee"
icon="user"
/>
<DxResource
:data-source="priorities"
field-expr="priorityId"
label="Priority"
icon="tag"
/>
</DxScheduler>
</template>
Expand Down
2 changes: 2 additions & 0 deletions apps/demos/Demos/Scheduler/Agenda/jQuery/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ $(() => {
dataSource: assignees,
label: 'Assignee',
useColorAsDefault: true,
icon: 'user',
}, {
fieldExpr: 'priorityId',
dataSource: priorities,
label: 'Priority',
icon: 'tag',
}],
height: 600,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@
fieldExpr="roomId"
label="room"
[dataSource]="resourcesData"
icon="conferenceroomoutline"
></dxi-resource>
</dx-scheduler>
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const App = () => (
dataSource={resourcesData}
fieldExpr="roomId"
label="Room"
icon="conferenceroomoutline"
/>
</Scheduler>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const App = () => (
dataSource={resourcesData}
fieldExpr="roomId"
label="Room"
icon="conferenceroomoutline"
/>
</Scheduler>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
:data-source="resourcesData"
field-expr="roomId"
label="Room"
icon="conferenceroomoutline"
/>
<DxView
type="month"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ $(() => {
fieldExpr: 'roomId',
dataSource: resourcesData,
label: 'Room',
icon: 'conferenceroomoutline',
}],
height: 730,
}).dxScheduler('instance');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
fieldExpr="roomId"
label="room"
[dataSource]="resourcesData"
icon="conferenceroomoutline"
></dxi-resource>
</dx-scheduler>
<dx-context-menu
Expand Down
1 change: 1 addition & 0 deletions apps/demos/Demos/Scheduler/ContextMenu/React/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ const App = () => {
dataSource={resourcesData}
fieldExpr="roomId"
label="Room"
icon="conferenceroomoutline"
/>
</Scheduler>
<ContextMenu
Expand Down
1 change: 1 addition & 0 deletions apps/demos/Demos/Scheduler/ContextMenu/ReactJs/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ const App = () => {
dataSource={resourcesData}
fieldExpr="roomId"
label="Room"
icon="conferenceroomoutline"
/>
</Scheduler>
<ContextMenu
Expand Down
1 change: 1 addition & 0 deletions apps/demos/Demos/Scheduler/ContextMenu/Vue/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
:data-source="resourcesData"
field-expr="roomId"
label="Room"
icon="conferenceroomoutline"
/>
</DxScheduler>
<DxContextMenu
Expand Down
1 change: 1 addition & 0 deletions apps/demos/Demos/Scheduler/ContextMenu/jQuery/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ $(() => {
fieldExpr: 'roomId',
dataSource: resourcesData,
label: 'Room',
icon: 'conferenceroomoutline',
}],
height: 730,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
fieldExpr="priorityId"
label="Priority"
[allowMultiple]="false"
icon="tag"
></dxi-resource>
</dx-scheduler>

Expand Down
1 change: 1 addition & 0 deletions apps/demos/Demos/Scheduler/GroupByDate/React/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const App = () => {
allowMultiple={false}
dataSource={priorityData}
label="Priority"
icon="tag"
/>
<View type="week" name="Week" />
<View type="month" name="Month" />
Expand Down
1 change: 1 addition & 0 deletions apps/demos/Demos/Scheduler/GroupByDate/ReactJs/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const App = () => {
allowMultiple={false}
dataSource={priorityData}
label="Priority"
icon="tag"
/>
<View
type="week"
Expand Down
1 change: 1 addition & 0 deletions apps/demos/Demos/Scheduler/GroupByDate/Vue/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
:data-source="priorityData"
field-expr="priorityId"
label="Priority"
icon="tag"
/>
</DxScheduler>

Expand Down
1 change: 1 addition & 0 deletions apps/demos/Demos/Scheduler/GroupByDate/jQuery/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ $(() => {
allowMultiple: false,
dataSource: priorityData,
label: 'Priority',
icon: 'tag',
},
],
height: 730,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
fieldExpr="priorityId"
label="Priority"
[allowMultiple]="false"
icon="tag"
></dxi-resource>
</dx-scheduler>
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const App = () => (
allowMultiple={false}
dataSource={priorityData}
label="Priority"
icon="tag"
/>
</Scheduler>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const App = () => (
allowMultiple={false}
dataSource={priorityData}
label="Priority"
icon="tag"
/>
</Scheduler>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
:data-source="priorityData"
field-expr="priorityId"
label="Priority"
icon="tag"
/>
</DxScheduler>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ $(() => {
allowMultiple: false,
dataSource: priorityData,
label: 'Priority',
icon: 'tag',
},
],
showCurrentTimeIndicator: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
[allowMultiple]="false"
[dataSource]="priorityData"
label="Priority"
icon="tag"
>
</dxi-resource>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const App = () => (
fieldExpr="priorityId"
label="Priority"
allowMultiple={false}
icon="tag"
/>
<Resource
dataSource={typeData}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ const App = () => (
fieldExpr="priorityId"
label="Priority"
allowMultiple={false}
icon="tag"
/>
<Resource
dataSource={typeData}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
:allow-multiple="false"
field-expr="priorityId"
label="Priority"
icon="tag"
/>
<DxResource
:data-source="typeData"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ $(() => {
allowMultiple: false,
dataSource: priorityData,
label: 'Priority',
icon: 'tag',
}, {
fieldExpr: 'typeId',
allowMultiple: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
[allowMultiple]="false"
[dataSource]="resourcesDataSource"
label="Employee"
icon="group"
>
</dxi-resource>

Expand Down
1 change: 1 addition & 0 deletions apps/demos/Demos/Scheduler/Overview/React/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const App = () => (
fieldExpr="employeeID"
dataSource={employees}
allowMultiple={false}
icon="group"
/>
</Scheduler>
);
Expand Down
1 change: 1 addition & 0 deletions apps/demos/Demos/Scheduler/Overview/ReactJs/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const App = () => (
fieldExpr="employeeID"
dataSource={employees}
allowMultiple={false}
icon="group"
/>
</Scheduler>
);
Expand Down
1 change: 1 addition & 0 deletions apps/demos/Demos/Scheduler/Overview/Vue/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
:allow-multiple="false"
label="Employee"
field-expr="employeeID"
icon="group"
/>

<template #resourceCellTemplate="{ data: employee }">
Expand Down
1 change: 1 addition & 0 deletions apps/demos/Demos/Scheduler/Overview/jQuery/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ $(() => {
allowMultiple: false,
dataSource: employees,
label: 'Employee',
icon: 'group',
},
],
dataCellTemplate(cellData, index, container) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
fieldExpr="roomId"
label="room"
[dataSource]="resourcesData"
icon="conferenceroomoutline"
></dxi-resource>
</dx-scheduler>
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const App = () => (
dataSource={resourcesData}
fieldExpr="roomId"
label="Room"
icon="conferenceroomoutline"
/>
</Scheduler>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const App = () => (
dataSource={resourcesData}
fieldExpr="roomId"
label="Room"
icon="conferenceroomoutline"
/>
</Scheduler>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
:data-source="resourcesData"
field-expr="roomId"
label="Room"
icon="conferenceroomoutline"
/>
</DxScheduler>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ $(() => {
fieldExpr: 'roomId',
dataSource: resourcesData,
label: 'Room',
icon: 'conferenceroomoutline',
}],
height: 730,
});
Expand Down
Loading
Loading