diff --git a/LawFim/LawFirmDatabaseImplement/LawFirmDatabase.cs b/LawFim/LawFirmDatabaseImplement/LawFirmDatabase.cs index d2f7e6f..022c99d 100644 --- a/LawFim/LawFirmDatabaseImplement/LawFirmDatabase.cs +++ b/LawFim/LawFirmDatabaseImplement/LawFirmDatabase.cs @@ -11,9 +11,9 @@ namespace LawFirmDatabaseImplement { if (optionsBuilder.IsConfigured == false) { - optionsBuilder.UseSqlServer(@"Data Source=ZIRAEL\SQLEXPRESS;Initial Catalog=LawFirmDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); + //optionsBuilder.UseSqlServer(@"Data Source=ZIRAEL\SQLEXPRESS;Initial Catalog=LawFirmDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); - // optionsBuilder.UseSqlServer(@"Data Source=PC-Anna\SQLEXPRESS;Initial Catalog=LawFirmDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); + optionsBuilder.UseSqlServer(@"Data Source=PC-Anna\SQLEXPRESS;Initial Catalog=LawFirmDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); } base.OnConfiguring(optionsBuilder); } diff --git a/LawFim/LawFirmGuarantorApp/Controllers/ConsultationController.cs b/LawFim/LawFirmGuarantorApp/Controllers/ConsultationController.cs index 52501f7..8c8d5d2 100644 --- a/LawFim/LawFirmGuarantorApp/Controllers/ConsultationController.cs +++ b/LawFim/LawFirmGuarantorApp/Controllers/ConsultationController.cs @@ -43,6 +43,7 @@ namespace LawFirmGuarantorApp.Controllers [HttpGet] public IActionResult CreateConsultation() { + ViewBag.Cases = APIClient.GetRequest>($"api/case/getcaselist?executorId={APIClient.Guarantor.Id}"); return View(); } [HttpPost] diff --git a/LawFim/LawFirmGuarantorApp/Controllers/HearingController.cs b/LawFim/LawFirmGuarantorApp/Controllers/HearingController.cs index 465a6ff..7eff068 100644 --- a/LawFim/LawFirmGuarantorApp/Controllers/HearingController.cs +++ b/LawFim/LawFirmGuarantorApp/Controllers/HearingController.cs @@ -1,6 +1,8 @@ -using LawFirmContracts.BindingModels; +using LawFimDataModels.Models; +using LawFirmContracts.BindingModels; using LawFirmContracts.SearchModels; using LawFirmContracts.ViewModels; +using LawFirmDatabaseImplement.Models; using Microsoft.AspNetCore.Mvc; namespace LawFirmGuarantorApp.Controllers @@ -30,14 +32,14 @@ namespace LawFirmGuarantorApp.Controllers return View(); } [HttpPost] - public void AddLawyer(int hearId, int lawyerId) + public void AddLawyer(int Id, int lawyerId) { if (APIClient.Guarantor == null) { throw new Exception("Вы как суда попали? Суда вход только авторизованным"); } - APIClient.PostRequest("api/hearing/addlawyertohearing", Tuple.Create(new HearingSearchModel { Id = hearId }, lawyerId)); + APIClient.PostRequest("api/hearing/addlawyertohearing", Tuple.Create(new HearingSearchModel { Id = Id }, lawyerId)); Response.Redirect("/Home/Lawyers"); } [HttpGet] @@ -46,19 +48,29 @@ namespace LawFirmGuarantorApp.Controllers return View(); } [HttpPost] - public void CreateHearing(DateTime date, string judge) + public void CreateHearing(DateTime date, string judge, List lawyers) { if (APIClient.Guarantor == null) { throw new Exception("Вы как суда попали? Суда вход только авторизованным"); } + if (string.IsNullOrEmpty(judge)) + { + throw new Exception("Суд пуст!"); + } + Dictionary a = new Dictionary(); + foreach (int lawyer in lawyers) + { + a.Add(lawyer, new LawyerSearchModel { Id = lawyer } as ILawyerModel); + } APIClient.PostRequest("api/hearing/createhearing", new HearingBindingModel { GuarantorId = APIClient.Guarantor.Id, HearingDate = date, - Judge = judge + Judge = judge, + HearingLawyers = a }); Response.Redirect("/Home/Hearings"); @@ -69,12 +81,21 @@ namespace LawFirmGuarantorApp.Controllers return View(); } [HttpPost] - public void UpdateHearing(int id, DateTime date, string judge) + public void UpdateHearing(int id, DateTime date, string judge, List lawyers) { if (APIClient.Guarantor == null) { throw new Exception("Вы как суда попали? Суда вход только авторизованным"); } + if (string.IsNullOrEmpty(judge)) + { + throw new Exception("Суд пуст!"); + } + Dictionary a = new Dictionary(); + foreach (int lawyer in lawyers) + { + a.Add(lawyer, new LawyerSearchModel { Id = lawyer } as ILawyerModel); + } APIClient.PostRequest("api/hearing/updatehearing", new HearingBindingModel @@ -82,7 +103,8 @@ namespace LawFirmGuarantorApp.Controllers Id = id, GuarantorId = APIClient.Guarantor.Id, HearingDate = date, - Judge = judge + Judge = judge, + HearingLawyers = a }); Response.Redirect("/Home/Hearings"); diff --git a/LawFim/LawFirmGuarantorApp/Controllers/LawyerController.cs b/LawFim/LawFirmGuarantorApp/Controllers/LawyerController.cs index ff63dd0..e5162af 100644 --- a/LawFim/LawFirmGuarantorApp/Controllers/LawyerController.cs +++ b/LawFim/LawFirmGuarantorApp/Controllers/LawyerController.cs @@ -65,6 +65,7 @@ namespace LawFirmGuarantorApp.Controllers APIClient.PostRequest("api/lawyer/updatelawyer", new LawyerBindingModel { + Id = id, GuarantorId = APIClient.Guarantor.Id, FIO = fio, Email = email, diff --git a/LawFim/LawFirmGuarantorApp/Views/Hearing/AddLawyer.cshtml b/LawFim/LawFirmGuarantorApp/Views/Hearing/AddLawyer.cshtml index 084e1b0..8f22d1f 100644 --- a/LawFim/LawFirmGuarantorApp/Views/Hearing/AddLawyer.cshtml +++ b/LawFim/LawFirmGuarantorApp/Views/Hearing/AddLawyer.cshtml @@ -12,7 +12,7 @@
Слушание
- +
diff --git a/LawFim/LawFirmGuarantorApp/Views/Home/Consultations.cshtml b/LawFim/LawFirmGuarantorApp/Views/Home/Consultations.cshtml index a15f303..46577b4 100644 --- a/LawFim/LawFirmGuarantorApp/Views/Home/Consultations.cshtml +++ b/LawFim/LawFirmGuarantorApp/Views/Home/Consultations.cshtml @@ -54,13 +54,22 @@ item.CaseName) - +
+ + +
- +
+ + +
- +
+ + +
} diff --git a/LawFim/LawFirmGuarantorApp/Views/Home/Hearings.cshtml b/LawFim/LawFirmGuarantorApp/Views/Home/Hearings.cshtml index 5c64feb..4675f33 100644 --- a/LawFim/LawFirmGuarantorApp/Views/Home/Hearings.cshtml +++ b/LawFim/LawFirmGuarantorApp/Views/Home/Hearings.cshtml @@ -50,13 +50,22 @@ item.Judge) - +
+ + +
- +
+ + +
- +
+ + +
} diff --git a/LawFim/LawFirmGuarantorApp/Views/Home/Lawyers.cshtml b/LawFim/LawFirmGuarantorApp/Views/Home/Lawyers.cshtml index bdfb2ab..a9a4e70 100644 --- a/LawFim/LawFirmGuarantorApp/Views/Home/Lawyers.cshtml +++ b/LawFim/LawFirmGuarantorApp/Views/Home/Lawyers.cshtml @@ -53,11 +53,17 @@ @Html.DisplayFor(modelItem => item.Email) - +
+ + +
- +
+ + +
}