Merge pull request #59 from BinderDyn/develop

2.2.0 Charlotte
BinderDyn · Oct 4, 2020 · 78cf090 · 78cf090
2 parents ee0cd14 + c45fd0f
commit 78cf090
Show file tree

Hide file tree

Showing 46 changed files with 2,215 additions and 6,198 deletions.
diff --git a/.vs/TakeMyTime.NETCore/DesignTimeBuild/.dtbcache b/.vs/TakeMyTime.NETCore/DesignTimeBuild/.dtbcache
diff --git a/.vs/TakeMyTime.NETCore/v16/.suo b/.vs/TakeMyTime.NETCore/v16/.suo
diff --git a/.vs/TakeMyTime.NETCore/v16/Server/sqlite3/storage.ide-shm b/.vs/TakeMyTime.NETCore/v16/Server/sqlite3/storage.ide-shm
diff --git a/.vs/TakeMyTime.NETCore/v16/Server/sqlite3/storage.ide-wal b/.vs/TakeMyTime.NETCore/v16/Server/sqlite3/storage.ide-wal
diff --git a/TakeMyTime.BLL/Logic/AssignmentLogic.cs b/TakeMyTime.BLL/Logic/AssignmentLogic.cs
@@ -5,6 +5,7 @@
 using TakeMyTime.DAL.uow;
 
 using TakeMyTime.Models.Models;
+using static Common.Enums.EnumDefinition;
 
 namespace TakeMyTime.BLL.Logic
 {
@@ -59,6 +60,16 @@ public void UpdateAssignment(int id, Assignment.IUpdateParam param)
             unitOfWork.Complete();
         }
 
+        public void UpdateAssignmentStatus(int id, AssignmentStatus status)
+        {
+            var edit = unitOfWork.Assignments.Get(id);
+            if (edit != null)
+            {
+                edit.UpdateStatus(status);
+                unitOfWork.Complete();
+            }
+        }
+
         public void DeleteAssignment(int id)
         {
             var toBeDeleted = GetAssignmentById(id);

diff --git a/TakeMyTime.BLL/obj/TakeMyTime.BLL.csproj.nuget.cache b/TakeMyTime.BLL/obj/TakeMyTime.BLL.csproj.nuget.cache
@@ -1,5 +1,5 @@
 {
   "version": 1,
-  "dgSpecHash": "tZ4JLstLxflaK5W8yastjmzy/+9+TnWDYfxfeGh21rssvRSNMNyQCukgKQ8orh4/nwL4IQCzKz77exKJaKPIlQ==",
+  "dgSpecHash": "xWNeER+R3wBnRMUaXBziXwvZXvRE5hnepLmXR7jkfxsMjIszfwOMYagnhGfzTb3tFKLg6BZALVAAW8J6ERZp0Q==",
   "success": true
 }
diff --git a/TakeMyTime.BLL/obj/TakeMyTime.BLL.csproj.nuget.dgspec.json b/TakeMyTime.BLL/obj/TakeMyTime.BLL.csproj.nuget.dgspec.json
@@ -59,29 +59,16 @@
           "warn": true,
           "downloadDependencies": [
             {
-              "name": "Microsoft.AspNetCore.App.Runtime.win-x64",
-              "version": "[3.1.1, 3.1.1]"
-            },
-            {
-              "name": "Microsoft.NETCore.App.Runtime.win-x64",
-              "version": "[3.1.1, 3.1.1]"
-            },
-            {
-              "name": "Microsoft.WindowsDesktop.App.Runtime.win-x64",
-              "version": "[3.1.1, 3.1.1]"
+              "name": "Microsoft.AspNetCore.App.Ref",
+              "version": "[3.1.2, 3.1.2]"
             }
           ],
           "frameworkReferences": {
             "Microsoft.NETCore.App": {
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.101\\RuntimeIdentifierGraph.json"
-        }
-      },
-      "runtimes": {
-        "win-x64": {
-          "#import": []
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.300\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -133,29 +120,16 @@
           "warn": true,
           "downloadDependencies": [
             {
-              "name": "Microsoft.AspNetCore.App.Runtime.win-x64",
-              "version": "[3.1.1, 3.1.1]"
-            },
-            {
-              "name": "Microsoft.NETCore.App.Runtime.win-x64",
-              "version": "[3.1.1, 3.1.1]"
-            },
-            {
-              "name": "Microsoft.WindowsDesktop.App.Runtime.win-x64",
-              "version": "[3.1.1, 3.1.1]"
+              "name": "Microsoft.AspNetCore.App.Ref",
+              "version": "[3.1.2, 3.1.2]"
             }
           ],
           "frameworkReferences": {
             "Microsoft.NETCore.App": {
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.101\\RuntimeIdentifierGraph.json"
-        }
-      },
-      "runtimes": {
-        "win-x64": {
-          "#import": []
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.300\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -214,6 +188,10 @@
               "target": "Package",
               "version": "[3.1.0, )"
             },
+            "Microsoft.EntityFrameworkCore.Proxies": {
+              "target": "Package",
+              "version": "[3.1.0, )"
+            },
             "Microsoft.EntityFrameworkCore.Relational": {
               "target": "Package",
               "version": "[3.1.0, )"
@@ -257,29 +235,16 @@
           "warn": true,
           "downloadDependencies": [
             {
-              "name": "Microsoft.AspNetCore.App.Runtime.win-x64",
-              "version": "[3.1.1, 3.1.1]"
-            },
-            {
-              "name": "Microsoft.NETCore.App.Runtime.win-x64",
-              "version": "[3.1.1, 3.1.1]"
-            },
-            {
-              "name": "Microsoft.WindowsDesktop.App.Runtime.win-x64",
-              "version": "[3.1.1, 3.1.1]"
+              "name": "Microsoft.AspNetCore.App.Ref",
+              "version": "[3.1.2, 3.1.2]"
             }
           ],
           "frameworkReferences": {
             "Microsoft.NETCore.App": {
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.101\\RuntimeIdentifierGraph.json"
-        }
-      },
-      "runtimes": {
-        "win-x64": {
-          "#import": []
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.300\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -335,29 +300,16 @@
           "warn": true,
           "downloadDependencies": [
             {
-              "name": "Microsoft.AspNetCore.App.Runtime.win-x64",
-              "version": "[3.1.1, 3.1.1]"
-            },
-            {
-              "name": "Microsoft.NETCore.App.Runtime.win-x64",
-              "version": "[3.1.1, 3.1.1]"
-            },
-            {
-              "name": "Microsoft.WindowsDesktop.App.Runtime.win-x64",
-              "version": "[3.1.1, 3.1.1]"
+              "name": "Microsoft.AspNetCore.App.Ref",
+              "version": "[3.1.2, 3.1.2]"
             }
           ],
           "frameworkReferences": {
             "Microsoft.NETCore.App": {
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.101\\RuntimeIdentifierGraph.json"
-        }
-      },
-      "runtimes": {
-        "win-x64": {
-          "#import": []
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.300\\RuntimeIdentifierGraph.json"
         }
       }
     }

diff --git a/TakeMyTime.BLL/obj/TakeMyTime.BLL.csproj.nuget.g.props b/TakeMyTime.BLL/obj/TakeMyTime.BLL.csproj.nuget.g.props
@@ -7,7 +7,7 @@
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\marvi\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.4.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>