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 @@
enable
+
+
+
+
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 CaseClients { get; set; } = new();
public int ExecutorId { get; set; }
- }
+ public CaseViewModel() { }
+ [JsonConstructor]
+ public CaseViewModel(Dictionary 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 VisitClients { get; set; } = new();
public int ExecutorId { get; set; }
- }
+ public VisitViewModel() { }
+ [JsonConstructor]
+ public VisitViewModel(Dictionary 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 @@