Skip to content
This repository was archived by the owner on Oct 3, 2022. It is now read-only.

Commit 78cf090

Browse files
BinderDynBinderDyn
authored
Merge pull request #59 from BinderDyn/develop
2.2.0 Charlotte
2 parents ee0cd14 + c45fd0f commit 78cf090

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2215
-6198
lines changed

‎.vs/TakeMyTime.NETCore/DesignTimeBuild/.dtbcache‎

431 KB
Binary file not shown.

‎.vs/TakeMyTime.NETCore/v16/.suo‎

11.5 KB
Binary file not shown.

‎.vs/TakeMyTime.NETCore/v16/Server/sqlite3/storage.ide-shm‎

-32 KB
Binary file not shown.

‎.vs/TakeMyTime.NETCore/v16/Server/sqlite3/storage.ide-wal‎

-249 KB
Binary file not shown.

‎TakeMyTime.BLL/Logic/AssignmentLogic.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using TakeMyTime.DAL.uow;
66

77
using TakeMyTime.Models.Models;
8+
using static Common.Enums.EnumDefinition;
89

910
namespace TakeMyTime.BLL.Logic
1011
{
@@ -59,6 +60,16 @@ public void UpdateAssignment(int id, Assignment.IUpdateParam param)
5960
unitOfWork.Complete();
6061
}
6162

63+
public void UpdateAssignmentStatus(int id, AssignmentStatus status)
64+
{
65+
var edit = unitOfWork.Assignments.Get(id);
66+
if (edit != null)
67+
{
68+
edit.UpdateStatus(status);
69+
unitOfWork.Complete();
70+
}
71+
}
72+
6273
public void DeleteAssignment(int id)
6374
{
6475
var toBeDeleted = GetAssignmentById(id);

‎TakeMyTime.BLL/obj/TakeMyTime.BLL.csproj.nuget.cache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"version": 1,
3-
"dgSpecHash": "tZ4JLstLxflaK5W8yastjmzy/+9+TnWDYfxfeGh21rssvRSNMNyQCukgKQ8orh4/nwL4IQCzKz77exKJaKPIlQ==",
3+
"dgSpecHash": "xWNeER+R3wBnRMUaXBziXwvZXvRE5hnepLmXR7jkfxsMjIszfwOMYagnhGfzTb3tFKLg6BZALVAAW8J6ERZp0Q==",
44
"success": true
55
}

‎TakeMyTime.BLL/obj/TakeMyTime.BLL.csproj.nuget.dgspec.json‎

Lines changed: 16 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -59,29 +59,16 @@
5959
"warn": true,
6060
"downloadDependencies": [
6161
{
62-
"name": "Microsoft.AspNetCore.App.Runtime.win-x64",
63-
"version": "[3.1.1, 3.1.1]"
64-
},
65-
{
66-
"name": "Microsoft.NETCore.App.Runtime.win-x64",
67-
"version": "[3.1.1, 3.1.1]"
68-
},
69-
{
70-
"name": "Microsoft.WindowsDesktop.App.Runtime.win-x64",
71-
"version": "[3.1.1, 3.1.1]"
62+
"name": "Microsoft.AspNetCore.App.Ref",
63+
"version": "[3.1.2, 3.1.2]"
7264
}
7365
],
7466
"frameworkReferences": {
7567
"Microsoft.NETCore.App": {
7668
"privateAssets": "all"
7769
}
7870
},
79-
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.101\\RuntimeIdentifierGraph.json"
80-
}
81-
},
82-
"runtimes": {
83-
"win-x64": {
84-
"#import": []
71+
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.300\\RuntimeIdentifierGraph.json"
8572
}
8673
}
8774
},
@@ -133,29 +120,16 @@
133120
"warn": true,
134121
"downloadDependencies": [
135122
{
136-
"name": "Microsoft.AspNetCore.App.Runtime.win-x64",
137-
"version": "[3.1.1, 3.1.1]"
138-
},
139-
{
140-
"name": "Microsoft.NETCore.App.Runtime.win-x64",
141-
"version": "[3.1.1, 3.1.1]"
142-
},
143-
{
144-
"name": "Microsoft.WindowsDesktop.App.Runtime.win-x64",
145-
"version": "[3.1.1, 3.1.1]"
123+
"name": "Microsoft.AspNetCore.App.Ref",
124+
"version": "[3.1.2, 3.1.2]"
146125
}
147126
],
148127
"frameworkReferences": {
149128
"Microsoft.NETCore.App": {
150129
"privateAssets": "all"
151130
}
152131
},
153-
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.101\\RuntimeIdentifierGraph.json"
154-
}
155-
},
156-
"runtimes": {
157-
"win-x64": {
158-
"#import": []
132+
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.300\\RuntimeIdentifierGraph.json"
159133
}
160134
}
161135
},
@@ -214,6 +188,10 @@
214188
"target": "Package",
215189
"version": "[3.1.0, )"
216190
},
191+
"Microsoft.EntityFrameworkCore.Proxies": {
192+
"target": "Package",
193+
"version": "[3.1.0, )"
194+
},
217195
"Microsoft.EntityFrameworkCore.Relational": {
218196
"target": "Package",
219197
"version": "[3.1.0, )"
@@ -257,29 +235,16 @@
257235
"warn": true,
258236
"downloadDependencies": [
259237
{
260-
"name": "Microsoft.AspNetCore.App.Runtime.win-x64",
261-
"version": "[3.1.1, 3.1.1]"
262-
},
263-
{
264-
"name": "Microsoft.NETCore.App.Runtime.win-x64",
265-
"version": "[3.1.1, 3.1.1]"
266-
},
267-
{
268-
"name": "Microsoft.WindowsDesktop.App.Runtime.win-x64",
269-
"version": "[3.1.1, 3.1.1]"
238+
"name": "Microsoft.AspNetCore.App.Ref",
239+
"version": "[3.1.2, 3.1.2]"
270240
}
271241
],
272242
"frameworkReferences": {
273243
"Microsoft.NETCore.App": {
274244
"privateAssets": "all"
275245
}
276246
},
277-
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.101\\RuntimeIdentifierGraph.json"
278-
}
279-
},
280-
"runtimes": {
281-
"win-x64": {
282-
"#import": []
247+
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.300\\RuntimeIdentifierGraph.json"
283248
}
284249
}
285250
},
@@ -335,29 +300,16 @@
335300
"warn": true,
336301
"downloadDependencies": [
337302
{
338-
"name": "Microsoft.AspNetCore.App.Runtime.win-x64",
339-
"version": "[3.1.1, 3.1.1]"
340-
},
341-
{
342-
"name": "Microsoft.NETCore.App.Runtime.win-x64",
343-
"version": "[3.1.1, 3.1.1]"
344-
},
345-
{
346-
"name": "Microsoft.WindowsDesktop.App.Runtime.win-x64",
347-
"version": "[3.1.1, 3.1.1]"
303+
"name": "Microsoft.AspNetCore.App.Ref",
304+
"version": "[3.1.2, 3.1.2]"
348305
}
349306
],
350307
"frameworkReferences": {
351308
"Microsoft.NETCore.App": {
352309
"privateAssets": "all"
353310
}
354311
},
355-
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.101\\RuntimeIdentifierGraph.json"
356-
}
357-
},
358-
"runtimes": {
359-
"win-x64": {
360-
"#import": []
312+
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.300\\RuntimeIdentifierGraph.json"
361313
}
362314
}
363315
}

‎TakeMyTime.BLL/obj/TakeMyTime.BLL.csproj.nuget.g.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
88
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\marvi\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
99
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
10-
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.4.0</NuGetToolVersion>
10+
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion>
1111
</PropertyGroup>
1212
<PropertyGroup>
1313
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>

0 commit comments

Comments
 (0)