Skip to content

Commit f435582

Browse files
authored
Fix Datasource (#224)
1 parent 5820730 commit f435582

2 files changed

Lines changed: 31 additions & 53 deletions

File tree

src/app/pages/tasks/tasks.component.html

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,58 +14,43 @@ <h2>Tasks</h2>
1414
<dxo-data-grid-filter-row [visible]="true"></dxo-data-grid-filter-row>
1515

1616
<dxi-data-grid-column
17-
dataField="Task_ID"
17+
dataField="id"
1818
[width]="90"
19-
[hidingPriority]="2">
19+
[hidingPriority]="1">
2020
</dxi-data-grid-column>
2121
<dxi-data-grid-column
22-
dataField="Task_Subject"
22+
dataField="text"
2323
[width]="190"
2424
caption="Subject"
25-
[hidingPriority]="8">
26-
</dxi-data-grid-column>
27-
<dxi-data-grid-column
28-
dataField="Task_Status"
29-
caption="Status"
3025
[hidingPriority]="6">
3126
</dxi-data-grid-column>
3227
<dxi-data-grid-column
33-
dataField="Task_Priority"
34-
caption="Priority"
35-
[hidingPriority]="5">
36-
<dxo-data-grid-lookup
37-
[dataSource]="priority"
38-
valueExpr="value"
39-
displayExpr="name">
40-
</dxo-data-grid-lookup>
28+
dataField="status"
29+
caption="Status"
30+
[hidingPriority]="4">
4131
</dxi-data-grid-column>
4232
<dxi-data-grid-column
43-
dataField="ResponsibleEmployee.Employee_Full_Name"
33+
dataField="owner"
4434
caption="Assigned To"
4535
[allowSorting]="false"
46-
[hidingPriority]="7">
36+
[hidingPriority]="5">
4737
</dxi-data-grid-column>
4838
<dxi-data-grid-column
49-
dataField="Task_Start_Date"
39+
dataField="startDate"
5040
caption="Start Date"
5141
dataType="date"
52-
[hidingPriority]="3">
42+
[hidingPriority]="2">
5343
</dxi-data-grid-column>
5444
<dxi-data-grid-column
55-
dataField="Task_Due_Date"
45+
dataField="dueDate"
5646
caption="Due Date"
5747
dataType="date"
58-
[hidingPriority]="4">
48+
[hidingPriority]="3">
5949
</dxi-data-grid-column>
6050
<dxi-data-grid-column
61-
dataField="Task_Priority"
51+
dataField="priority"
6252
caption="Priority"
6353
name="Priority"
64-
[hidingPriority]="1">
65-
</dxi-data-grid-column>
66-
<dxi-data-grid-column
67-
dataField="Task_Completion"
68-
caption="Completion"
6954
[hidingPriority]="0">
7055
</dxi-data-grid-column>
71-
</dx-data-grid>
56+
</dx-data-grid>
Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Component } from '@angular/core';
22
import { DxDataGridModule } from 'devextreme-angular/ui/data-grid';
3+
import { CustomStore } from 'devextreme-angular/common/data';
34

45
@Component({
56
templateUrl: 'tasks.component.html',
@@ -10,33 +11,25 @@ import { DxDataGridModule } from 'devextreme-angular/ui/data-grid';
1011

1112
export class TasksComponent {
1213
dataSource: any;
13-
priority: any[];
1414

1515
constructor() {
1616
this.dataSource = {
17-
store: {
18-
version: 2,
19-
type: 'odata',
20-
key: 'Task_ID',
21-
url: 'https://js.devexpress.com/Demos/DevAV/odata/Tasks'
22-
},
23-
expand: 'ResponsibleEmployee',
24-
select: [
25-
'Task_ID',
26-
'Task_Subject',
27-
'Task_Start_Date',
28-
'Task_Due_Date',
29-
'Task_Status',
30-
'Task_Priority',
31-
'Task_Completion',
32-
'ResponsibleEmployee/Employee_Full_Name'
33-
]
17+
store: new CustomStore({
18+
key: 'id',
19+
async load() {
20+
try {
21+
const response = await fetch(`https://js.devexpress.com/Demos/RwaService/api/Employees/AllTasks`);
22+
23+
const result = await response.json();
24+
25+
return {
26+
data: result,
27+
};
28+
} catch (err) {
29+
throw new Error('Data Loading Error');
30+
}
31+
},
32+
}),
3433
};
35-
this.priority = [
36-
{ name: 'High', value: 4 },
37-
{ name: 'Urgent', value: 3 },
38-
{ name: 'Normal', value: 2 },
39-
{ name: 'Low', value: 1 }
40-
];
4134
}
4235
}

0 commit comments

Comments
 (0)