Skip to content

Commit daafaa1

Browse files
DuckTieCorpMemberDuckTieCorpMember
authored
Merge pull request #3 from DuckTieCorpMember/25.1.3+
Convert to 25.1.3 and fix lint issues
2 parents d7194b2 + 18ccadd commit daafaa1

30 files changed

+15374
-16509
lines changed

‎ASP.NET Core/ASP.NET Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</Target>
2121

2222
<ItemGroup>
23-
<PackageReference Include="DevExtreme.AspNet.Core" Version="25.1.*" />
23+
<PackageReference Include="DevExtreme.AspNet.Core" Version="25.1.3" />
2424
</ItemGroup>
2525

2626
</Project>

‎ASP.NET Core/Controllers/SampleDataController.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,22 @@ public object Get(DataSourceLoadOptions loadOptions) {
1818
return DataSourceLoader.Load(SampleData.Orders, loadOptions);
1919
}
2020

21+
[HttpGet]
22+
[Route("GetTasks")]
23+
public object GetTasks(DataSourceLoadOptions loadOptions) {
24+
return DataSourceLoader.Load(TaskData.Tasks, loadOptions);
25+
}
26+
27+
[HttpGet]
28+
[Route("GetEmployees")]
29+
public object GetEmployees(DataSourceLoadOptions loadOptions) {
30+
return DataSourceLoader.Load(TaskData.Employees, loadOptions);
31+
}
32+
33+
[HttpGet]
34+
[Route("GetPriorities")]
35+
public object GetPriorities(DataSourceLoadOptions loadOptions) {
36+
return DataSourceLoader.Load(TaskData.Priorities, loadOptions);
37+
}
38+
2139
}

‎ASP.NET Core/Controllers/orig_PriorityController.cs‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎ASP.NET Core/Controllers/orig_SampleDataController.cs‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎ASP.NET Core/Models/TaskModels.cs‎

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
using System;
2+
using System.Collections.Generic;
3+
4+
namespace ASP_NET_Core.Models;
5+
6+
public class TaskItem
7+
{
8+
public int Task_ID { get; set; }
9+
public int Task_Parent_ID { get; set; }
10+
public int Task_Assigned_Employee_ID { get; set; }
11+
public int Task_Completion { get; set; }
12+
public int Task_Priority { get; set; }
13+
public string Task_Status { get; set; } = string.Empty;
14+
public string Task_Subject { get; set; } = string.Empty;
15+
public DateTime Task_Start_Date { get; set; }
16+
public DateTime Task_Due_Date { get; set; }
17+
}
18+
19+
public class Employee
20+
{
21+
public int ID { get; set; }
22+
public string Name { get; set; } = string.Empty;
23+
public string Picture { get; set; } = string.Empty;
24+
}
25+
26+
public class Priority
27+
{
28+
public int id { get; set; }
29+
public string value { get; set; } = string.Empty;
30+
}
31+
32+
public static class TaskData
33+
{
34+
public static List<TaskItem> Tasks = new List<TaskItem>
35+
{
36+
new TaskItem
37+
{
38+
Task_ID = 1,
39+
Task_Assigned_Employee_ID = 1,
40+
Task_Subject = "Plans 2015",
41+
Task_Start_Date = new DateTime(2015, 1, 1),
42+
Task_Due_Date = new DateTime(2015, 4, 1),
43+
Task_Status = "Completed",
44+
Task_Priority = 4,
45+
Task_Completion = 100,
46+
Task_Parent_ID = 0
47+
},
48+
new TaskItem
49+
{
50+
Task_ID = 2,
51+
Task_Assigned_Employee_ID = 2,
52+
Task_Subject = "Health Insurance",
53+
Task_Start_Date = new DateTime(2015, 2, 12),
54+
Task_Due_Date = new DateTime(2015, 5, 30),
55+
Task_Status = "In Progress",
56+
Task_Priority = 4,
57+
Task_Completion = 75,
58+
Task_Parent_ID = 0
59+
},
60+
new TaskItem
61+
{
62+
Task_ID = 3,
63+
Task_Assigned_Employee_ID = 4,
64+
Task_Subject = "New Brochures",
65+
Task_Start_Date = new DateTime(2015, 2, 17),
66+
Task_Due_Date = new DateTime(2015, 3, 1),
67+
Task_Status = "Completed",
68+
Task_Priority = 3,
69+
Task_Completion = 100,
70+
Task_Parent_ID = 0
71+
},
72+
new TaskItem
73+
{
74+
Task_ID = 4,
75+
Task_Assigned_Employee_ID = 31,
76+
Task_Subject = "Training",
77+
Task_Start_Date = new DateTime(2015, 3, 2),
78+
Task_Due_Date = new DateTime(2015, 6, 29),
79+
Task_Status = "Completed",
80+
Task_Priority = 3,
81+
Task_Completion = 100,
82+
Task_Parent_ID = 0
83+
},
84+
new TaskItem
85+
{
86+
Task_ID = 5,
87+
Task_Assigned_Employee_ID = 5,
88+
Task_Subject = "NDA",
89+
Task_Start_Date = new DateTime(2015, 3, 12),
90+
Task_Due_Date = new DateTime(2015, 5, 1),
91+
Task_Status = "In Progress",
92+
Task_Priority = 3,
93+
Task_Completion = 90,
94+
Task_Parent_ID = 0
95+
},
96+
new TaskItem
97+
{
98+
Task_ID = 28,
99+
Task_Assigned_Employee_ID = 7,
100+
Task_Subject = "Prepare 2015 Financial",
101+
Task_Start_Date = new DateTime(2015, 1, 15),
102+
Task_Due_Date = new DateTime(2015, 1, 31),
103+
Task_Status = "Completed",
104+
Task_Priority = 4,
105+
Task_Completion = 100,
106+
Task_Parent_ID = 1
107+
},
108+
new TaskItem
109+
{
110+
Task_ID = 29,
111+
Task_Assigned_Employee_ID = 4,
112+
Task_Subject = "Prepare 2015 Marketing Plan",
113+
Task_Start_Date = new DateTime(2015, 1, 1),
114+
Task_Due_Date = new DateTime(2015, 1, 31),
115+
Task_Status = "Completed",
116+
Task_Priority = 4,
117+
Task_Completion = 100,
118+
Task_Parent_ID = 1
119+
},
120+
new TaskItem
121+
{
122+
Task_ID = 30,
123+
Task_Assigned_Employee_ID = 2,
124+
Task_Subject = "Review Health Insurance Options Under the Affordable Care Act",
125+
Task_Start_Date = new DateTime(2015, 2, 12),
126+
Task_Due_Date = new DateTime(2015, 4, 25),
127+
Task_Status = "In Progress",
128+
Task_Priority = 4,
129+
Task_Completion = 50,
130+
Task_Parent_ID = 2
131+
},
132+
new TaskItem
133+
{
134+
Task_ID = 31,
135+
Task_Assigned_Employee_ID = 1,
136+
Task_Subject = "Choose between PPO and HMO Health Plan",
137+
Task_Start_Date = new DateTime(2015, 2, 15),
138+
Task_Due_Date = new DateTime(2015, 4, 15),
139+
Task_Status = "In Progress",
140+
Task_Priority = 4,
141+
Task_Completion = 75,
142+
Task_Parent_ID = 2
143+
}
144+
};
145+
146+
public static List<Employee> Employees = new List<Employee>
147+
{
148+
new Employee { ID = 1, Name = "John Heart", Picture = "images/employees/01.png" },
149+
new Employee { ID = 2, Name = "Samantha Bright", Picture = "images/employees/04.png" },
150+
new Employee { ID = 3, Name = "Arthur Miller", Picture = "images/employees/02.png" },
151+
new Employee { ID = 4, Name = "Robert Reagan", Picture = "images/employees/03.png" },
152+
new Employee { ID = 5, Name = "Greta Sims", Picture = "images/employees/06.png" },
153+
new Employee { ID = 7, Name = "Sandra Johnson", Picture = "images/employees/08.png" },
154+
new Employee { ID = 31, Name = "Nat Maguiree", Picture = "images/employees/34.png" }
155+
};
156+
157+
public static List<Priority> Priorities = new List<Priority>
158+
{
159+
new Priority { id = 1, value = "Low" },
160+
new Priority { id = 2, value = "Normal" },
161+
new Priority { id = 3, value = "High" },
162+
new Priority { id = 4, value = "Urgent" }
163+
};
164+
}

‎ASP.NET Core/Models/orig_Employee.cs‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)