diff --git a/LawFim/LawFim.sln b/LawFim/LawFim.sln index 353fcb4..c163a81 100644 --- a/LawFim/LawFim.sln +++ b/LawFim/LawFim.sln @@ -17,8 +17,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawFirmExecutorApp", "LawFi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawFirmGuarantorApp", "LawFirmGuarantorApp\LawFirmGuarantorApp.csproj", "{4B6D26B1-141A-48CC-A6F7-E51BDD06C4E2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LawFirmGuarantorApp2", "LawFirmGuarantorApp2\LawFirmGuarantorApp2.csproj", "{5A462569-89A0-4A92-A671-4A6D824AB254}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -51,10 +49,6 @@ Global {4B6D26B1-141A-48CC-A6F7-E51BDD06C4E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4B6D26B1-141A-48CC-A6F7-E51BDD06C4E2}.Release|Any CPU.ActiveCfg = Release|Any CPU {4B6D26B1-141A-48CC-A6F7-E51BDD06C4E2}.Release|Any CPU.Build.0 = Release|Any CPU - {5A462569-89A0-4A92-A671-4A6D824AB254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A462569-89A0-4A92-A671-4A6D824AB254}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A462569-89A0-4A92-A671-4A6D824AB254}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A462569-89A0-4A92-A671-4A6D824AB254}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/LawFim/LawFirmDatabaseImplement/LawFirmDatabase.cs b/LawFim/LawFirmDatabaseImplement/LawFirmDatabase.cs index 4d12370..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 fa7c2ab..52501f7 100644 --- a/LawFim/LawFirmGuarantorApp/Controllers/ConsultationController.cs +++ b/LawFim/LawFirmGuarantorApp/Controllers/ConsultationController.cs @@ -38,7 +38,7 @@ namespace LawFirmGuarantorApp.Controllers } APIClient.PostRequest("api/consultation/addlawyertoconsultation", Tuple.Create(new ConsultationSearchModel { Id = conId }, lawyerId)); - Response.Redirect("Home/Consultations"); + Response.Redirect("/Home/Consultations"); } [HttpGet] public IActionResult CreateConsultation() @@ -61,7 +61,7 @@ namespace LawFirmGuarantorApp.Controllers Cost = cost, }); - Response.Redirect("Home/Consultations"); + Response.Redirect("/Home/Consultations"); } [HttpGet] public IActionResult UpdateConsultation() @@ -85,7 +85,7 @@ namespace LawFirmGuarantorApp.Controllers Cost = cost }); - Response.Redirect("Home/Consultations"); + Response.Redirect("/Home/Consultations"); } [HttpPost] public void DeleteConsultation(int id) diff --git a/LawFim/LawFirmGuarantorApp/Controllers/HearingController.cs b/LawFim/LawFirmGuarantorApp/Controllers/HearingController.cs index b4c1e68..465a6ff 100644 --- a/LawFim/LawFirmGuarantorApp/Controllers/HearingController.cs +++ b/LawFim/LawFirmGuarantorApp/Controllers/HearingController.cs @@ -38,7 +38,7 @@ namespace LawFirmGuarantorApp.Controllers } APIClient.PostRequest("api/hearing/addlawyertohearing", Tuple.Create(new HearingSearchModel { Id = hearId }, lawyerId)); - Response.Redirect("Home/Hearings"); + Response.Redirect("/Home/Lawyers"); } [HttpGet] public IActionResult CreateHearing() @@ -61,7 +61,7 @@ namespace LawFirmGuarantorApp.Controllers Judge = judge }); - Response.Redirect("Home/Hearings"); + Response.Redirect("/Home/Hearings"); } [HttpGet] public IActionResult UpdateHearing() @@ -85,7 +85,7 @@ namespace LawFirmGuarantorApp.Controllers Judge = judge }); - Response.Redirect("Home/Hearings"); + Response.Redirect("/Home/Hearings"); } [HttpPost] public void DeleteHearing(int id) @@ -104,7 +104,7 @@ namespace LawFirmGuarantorApp.Controllers Id = id }); - Response.Redirect("Home/Hearings"); + Response.Redirect("/Home/Hearings"); } } } diff --git a/LawFim/LawFirmGuarantorApp/Controllers/HomeController.cs b/LawFim/LawFirmGuarantorApp/Controllers/HomeController.cs index aecb041..203ce2f 100644 --- a/LawFim/LawFirmGuarantorApp/Controllers/HomeController.cs +++ b/LawFim/LawFirmGuarantorApp/Controllers/HomeController.cs @@ -85,7 +85,7 @@ namespace LawFirmGuarantorApp.Controllers APIClient.Guarantor.FIO = fio; APIClient.Guarantor.Email = login; APIClient.Guarantor.Password = password; - Response.Redirect("Home/Lawyers"); + Response.Redirect("/Home/Lawyers"); } // РЕГИСТРАЦИЯ ПОРУЧИТЕЛЯ @@ -111,7 +111,7 @@ namespace LawFirmGuarantorApp.Controllers Email = login, Password = password }); - Response.Redirect("Home/EnterGuarantor"); + Response.Redirect("/Home/EnterGuarantor"); return; } @@ -137,7 +137,7 @@ namespace LawFirmGuarantorApp.Controllers } else { - Response.Redirect("Home/Lawyers"); + Response.Redirect("/Home/Lawyers"); } } diff --git a/LawFim/LawFirmGuarantorApp/Controllers/LawyerController.cs b/LawFim/LawFirmGuarantorApp/Controllers/LawyerController.cs index 5510417..ff63dd0 100644 --- a/LawFim/LawFirmGuarantorApp/Controllers/LawyerController.cs +++ b/LawFim/LawFirmGuarantorApp/Controllers/LawyerController.cs @@ -29,7 +29,7 @@ namespace LawFirmGuarantorApp.Controllers Email = email }); - Response.Redirect("Home/Lawyers"); + Response.Redirect("/Home/Lawyers"); } [HttpPost] @@ -46,7 +46,7 @@ namespace LawFirmGuarantorApp.Controllers Id = id }); - Response.Redirect("Home/Lawyers"); + Response.Redirect("/Home/Lawyers"); } [HttpGet] public IActionResult UpdateLawyer() @@ -70,7 +70,7 @@ namespace LawFirmGuarantorApp.Controllers Email = email, Phone = phone }); - Response.Redirect("Home/Lawyers"); + Response.Redirect("/Home/Lawyers"); } } } diff --git a/LawFim/LawFirmGuarantorApp/Views/Consultation/AddLawyer.cshtml b/LawFim/LawFirmGuarantorApp/Views/Consultation/AddLawyer.cshtml index 935ce64..d0d6c95 100644 --- a/LawFim/LawFirmGuarantorApp/Views/Consultation/AddLawyer.cshtml +++ b/LawFim/LawFirmGuarantorApp/Views/Consultation/AddLawyer.cshtml @@ -18,7 +18,7 @@
Консультация
- +
diff --git a/LawFim/LawFirmGuarantorApp/Views/Consultation/CreateConsultation.cshtml b/LawFim/LawFirmGuarantorApp/Views/Consultation/CreateConsultation.cshtml index 19ea78c..408f261 100644 --- a/LawFim/LawFirmGuarantorApp/Views/Consultation/CreateConsultation.cshtml +++ b/LawFim/LawFirmGuarantorApp/Views/Consultation/CreateConsultation.cshtml @@ -22,7 +22,7 @@
Дело
- +
diff --git a/LawFim/LawFirmGuarantorApp/Views/Hearing/AddLawyer.cshtml b/LawFim/LawFirmGuarantorApp/Views/Hearing/AddLawyer.cshtml index 225c0af..084e1b0 100644 --- a/LawFim/LawFirmGuarantorApp/Views/Hearing/AddLawyer.cshtml +++ b/LawFim/LawFirmGuarantorApp/Views/Hearing/AddLawyer.cshtml @@ -12,13 +12,13 @@
Слушание
- +
Юрист
- +
diff --git a/LawFim/LawFirmGuarantorApp/Views/Home/Consultation.cshtml b/LawFim/LawFirmGuarantorApp/Views/Home/Consultations.cshtml similarity index 100% rename from LawFim/LawFirmGuarantorApp/Views/Home/Consultation.cshtml rename to LawFim/LawFirmGuarantorApp/Views/Home/Consultations.cshtml diff --git a/LawFim/LawFirmGuarantorApp/Views/Home/PrivacyGuarantor.cshtml b/LawFim/LawFirmGuarantorApp/Views/Home/PrivacyGuarantor.cshtml index 3bec508..ac2b10c 100644 --- a/LawFim/LawFirmGuarantorApp/Views/Home/PrivacyGuarantor.cshtml +++ b/LawFim/LawFirmGuarantorApp/Views/Home/PrivacyGuarantor.cshtml @@ -13,7 +13,7 @@
Электронная почта:
-