diff --git a/LawFim/LawFirmContracts/ViewModels/ConsultationViewModel.cs b/LawFim/LawFirmContracts/ViewModels/ConsultationViewModel.cs index c7a3bbb..3285781 100644 --- a/LawFim/LawFirmContracts/ViewModels/ConsultationViewModel.cs +++ b/LawFim/LawFirmContracts/ViewModels/ConsultationViewModel.cs @@ -1,4 +1,5 @@ using LawFimDataModels.Models; +using Newtonsoft.Json; using System.ComponentModel; namespace LawFirmContracts.ViewModels @@ -16,5 +17,13 @@ namespace LawFirmContracts.ViewModels public int CaseId { get; set; } public int GuarantorId { get; set; } public Dictionary ConsultationLawyers { get; set; } = new(); - } + + public ConsultationViewModel() { } + [JsonConstructor] + public ConsultationViewModel(Dictionary ConsultationLawyers) + { + this.ConsultationLawyers = ConsultationLawyers.ToDictionary(x => x.Key, x => x.Value as ILawyerModel); + } + } } + diff --git a/LawFim/LawFirmContracts/ViewModels/HearingViewModel.cs b/LawFim/LawFirmContracts/ViewModels/HearingViewModel.cs index 6dd637b..50c318e 100644 --- a/LawFim/LawFirmContracts/ViewModels/HearingViewModel.cs +++ b/LawFim/LawFirmContracts/ViewModels/HearingViewModel.cs @@ -1,5 +1,7 @@ using LawFimDataModels.Models; using System.ComponentModel; +using Newtonsoft.Json; + namespace LawFirmContracts.ViewModels { @@ -13,5 +15,11 @@ namespace LawFirmContracts.ViewModels public string Judge { get; set; } = string.Empty; public int GuarantorId { get; set; } public Dictionary HearingLawyers { get; set; } = new(); - } + public HearingViewModel() { } + [JsonConstructor] + public HearingViewModel(Dictionary HearingLawyers) + { + this.HearingLawyers = HearingLawyers.ToDictionary(x => x.Key, x => x.Value as ILawyerModel); + } + } } diff --git a/LawFim/LawFirmGuarantorApp/Controllers/ConsultationController.cs b/LawFim/LawFirmGuarantorApp/Controllers/ConsultationController.cs index 9a5d7b0..e4fc155 100644 --- a/LawFim/LawFirmGuarantorApp/Controllers/ConsultationController.cs +++ b/LawFim/LawFirmGuarantorApp/Controllers/ConsultationController.cs @@ -79,6 +79,7 @@ namespace LawFirmGuarantorApp.Controllers [HttpGet] public IActionResult UpdateConsultation() { + ViewBag.Cases = APIClient.GetRequest>($"api/case/getcaselist?executorId=1"); return View(); } [HttpPost] @@ -126,7 +127,7 @@ namespace LawFirmGuarantorApp.Controllers Id = id }); - Response.Redirect("Home/Consultations"); + Response.Redirect("/Home/Consultations"); } } } diff --git a/LawFim/LawFirmGuarantorApp/Controllers/HearingController.cs b/LawFim/LawFirmGuarantorApp/Controllers/HearingController.cs index 7eff068..da03ecc 100644 --- a/LawFim/LawFirmGuarantorApp/Controllers/HearingController.cs +++ b/LawFim/LawFirmGuarantorApp/Controllers/HearingController.cs @@ -40,7 +40,7 @@ namespace LawFirmGuarantorApp.Controllers } APIClient.PostRequest("api/hearing/addlawyertohearing", Tuple.Create(new HearingSearchModel { Id = Id }, lawyerId)); - Response.Redirect("/Home/Lawyers"); + Response.Redirect("/Home/Hearings"); } [HttpGet] public IActionResult CreateHearing() diff --git a/LawFim/LawFirmGuarantorApp/Views/Consultation/CreateConsultation.cshtml b/LawFim/LawFirmGuarantorApp/Views/Consultation/CreateConsultation.cshtml index 408f261..0555d76 100644 --- a/LawFim/LawFirmGuarantorApp/Views/Consultation/CreateConsultation.cshtml +++ b/LawFim/LawFirmGuarantorApp/Views/Consultation/CreateConsultation.cshtml @@ -20,9 +20,9 @@
-
Дело
+
Номер дела
- +
diff --git a/LawFim/LawFirmGuarantorApp/Views/Consultation/UpdateConsultation.cshtml b/LawFim/LawFirmGuarantorApp/Views/Consultation/UpdateConsultation.cshtml index 99b1786..17509ce 100644 --- a/LawFim/LawFirmGuarantorApp/Views/Consultation/UpdateConsultation.cshtml +++ b/LawFim/LawFirmGuarantorApp/Views/Consultation/UpdateConsultation.cshtml @@ -8,21 +8,15 @@
-
Стоимость
+
Стоимость консультации
- +
-
Дата
+
Дата и время
- -
-
-
-
Дело
-
- +
diff --git a/LawFim/LawFirmGuarantorApp/Views/Home/Consultations.cshtml b/LawFim/LawFirmGuarantorApp/Views/Home/Consultations.cshtml index 0a78673..558b813 100644 --- a/LawFim/LawFirmGuarantorApp/Views/Home/Consultations.cshtml +++ b/LawFim/LawFirmGuarantorApp/Views/Home/Consultations.cshtml @@ -33,7 +33,7 @@ Дата консультации - Наименование дела + Номер дела @@ -55,7 +55,7 @@ @Html.DisplayFor(modelItem => - item.CaseName) + item.CaseId) @@ -70,9 +70,9 @@ -
+ - +
diff --git a/LawFim/LawFirmGuarantorApp/Views/Home/Hearings.cshtml b/LawFim/LawFirmGuarantorApp/Views/Home/Hearings.cshtml index 4675f33..97bd510 100644 --- a/LawFim/LawFirmGuarantorApp/Views/Home/Hearings.cshtml +++ b/LawFim/LawFirmGuarantorApp/Views/Home/Hearings.cshtml @@ -62,9 +62,9 @@ -
+ - +
diff --git a/LawFim/LawFirmGuarantorApp/Views/Lawyer/CreateLawyer.cshtml b/LawFim/LawFirmGuarantorApp/Views/Lawyer/CreateLawyer.cshtml index 562cf03..dc16c67 100644 --- a/LawFim/LawFirmGuarantorApp/Views/Lawyer/CreateLawyer.cshtml +++ b/LawFim/LawFirmGuarantorApp/Views/Lawyer/CreateLawyer.cshtml @@ -16,7 +16,7 @@
Номер телефона
- +
diff --git a/LawFim/LawFirmGuarantorApp/Views/Shared/_Layout.cshtml b/LawFim/LawFirmGuarantorApp/Views/Shared/_Layout.cshtml index c2f0a61..f16ed2c 100644 --- a/LawFim/LawFirmGuarantorApp/Views/Shared/_Layout.cshtml +++ b/LawFim/LawFirmGuarantorApp/Views/Shared/_Layout.cshtml @@ -19,9 +19,6 @@