From fd93dad8240030fa3a285de41750b9dbb88467e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=93=D0=B0=D0=BB=D0=B8=D0=BD=D0=B0=20=D0=A4=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B5=D0=BD=D0=BA=D0=BE?= <fedorenko809@yandex.ru>
Date: Thu, 30 May 2024 02:13:55 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=BA=D0=BE=D1=81=D1=8F=D0=BA=20=D1=81=20=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LawFim/LawFirmContracts/LawFirmContracts.csproj         | 4 ++++
 LawFim/LawFirmContracts/ViewModels/CaseViewModel.cs     | 9 ++++++++-
 LawFim/LawFirmContracts/ViewModels/VisitViewModel.cs    | 9 ++++++++-
 LawFim/LawFirmExecutorApp/Controllers/CaseController.cs | 4 ++--
 LawFim/LawFirmExecutorApp/Views/Case/AddClient.cshtml   | 2 +-
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/LawFim/LawFirmContracts/LawFirmContracts.csproj b/LawFim/LawFirmContracts/LawFirmContracts.csproj
index d5cfabb..64a65c4 100644
--- a/LawFim/LawFirmContracts/LawFirmContracts.csproj
+++ b/LawFim/LawFirmContracts/LawFirmContracts.csproj
@@ -6,6 +6,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\LawFimDataModels\LawFimDataModels.csproj" />
   </ItemGroup>
diff --git a/LawFim/LawFirmContracts/ViewModels/CaseViewModel.cs b/LawFim/LawFirmContracts/ViewModels/CaseViewModel.cs
index 36c491c..dec6a9f 100644
--- a/LawFim/LawFirmContracts/ViewModels/CaseViewModel.cs
+++ b/LawFim/LawFirmContracts/ViewModels/CaseViewModel.cs
@@ -1,6 +1,7 @@
 using LawFimDataModels.Enums;
 using LawFimDataModels.Models;
 using System.ComponentModel;
+using Newtonsoft.Json;
 
 namespace LawFirmContracts.ViewModels
 {
@@ -19,5 +20,11 @@ namespace LawFirmContracts.ViewModels
         public DateTime? DateImplement { get; set; }
         public Dictionary<int, IClientModel> CaseClients { get; set; } = new();
         public int ExecutorId { get; set; }
-    }
+		public CaseViewModel() { }
+		[JsonConstructor]
+		public CaseViewModel(Dictionary<int, ClientViewModel> CaseClients)
+		{
+			this.CaseClients = CaseClients.ToDictionary(x => x.Key, x => x.Value as IClientModel);
+		}
+	}
 }
diff --git a/LawFim/LawFirmContracts/ViewModels/VisitViewModel.cs b/LawFim/LawFirmContracts/ViewModels/VisitViewModel.cs
index 62a4838..23c7320 100644
--- a/LawFim/LawFirmContracts/ViewModels/VisitViewModel.cs
+++ b/LawFim/LawFirmContracts/ViewModels/VisitViewModel.cs
@@ -1,5 +1,6 @@
 using LawFimDataModels.Models;
 using System.ComponentModel;
+using Newtonsoft.Json;
 
 namespace LawFirmContracts.ViewModels
 {
@@ -11,5 +12,11 @@ namespace LawFirmContracts.ViewModels
         public int HearingId { get; set; }
         public Dictionary<int, IClientModel> VisitClients { get; set; } = new();
         public int ExecutorId { get; set; }
-    }
+        public VisitViewModel() { }
+		[JsonConstructor]
+		public VisitViewModel(Dictionary<int, ClientViewModel> VisitClients)
+		{
+			this.VisitClients = VisitClients.ToDictionary(x => x.Key, x => x.Value as IClientModel);
+		}
+	}
 }
diff --git a/LawFim/LawFirmExecutorApp/Controllers/CaseController.cs b/LawFim/LawFirmExecutorApp/Controllers/CaseController.cs
index 5613616..5ef7b18 100644
--- a/LawFim/LawFirmExecutorApp/Controllers/CaseController.cs
+++ b/LawFim/LawFirmExecutorApp/Controllers/CaseController.cs
@@ -31,14 +31,14 @@ namespace LawFirmExecutorApp.Controllers
 			return View();
 		}
 		[HttpPost]
-		public void AddClient(int conId, int clientId)
+		public void AddClient(int caseId, int clientId)
 		{
 			if (APIClient.Executor == null)
 			{
 				throw new Exception("Вы как суда попали? Суда вход только авторизованным");
 			}
 
-			APIClient.PostRequest("api/case/addclienttocase", Tuple.Create(new CaseSearchModel { Id = conId }, clientId));
+			APIClient.PostRequest("api/case/addclienttocase", Tuple.Create(new CaseSearchModel { Id = caseId }, clientId));
 			Response.Redirect("/Home/Cases");
 		}
 		[HttpGet]
diff --git a/LawFim/LawFirmExecutorApp/Views/Case/AddClient.cshtml b/LawFim/LawFirmExecutorApp/Views/Case/AddClient.cshtml
index f90eae4..dfdf5ee 100644
--- a/LawFim/LawFirmExecutorApp/Views/Case/AddClient.cshtml
+++ b/LawFim/LawFirmExecutorApp/Views/Case/AddClient.cshtml
@@ -12,7 +12,7 @@
 	<div class="row">
 		<div class="col-4">Дело</div>
 		<div class="col-8">
-			<select id="id" name="id" class="form-control" asp-items="@(new SelectList(@ViewBag.Cases,"Id", "Name"))"></select>
+			<select id="caseId" name="caseId" class="form-control" asp-items="@(new SelectList(@ViewBag.Cases,"Id", "Name"))"></select>
 		</div>
 	</div>
 	<div class="row">