diff --git a/LawFim/LawFirmExecutorApp/Controllers/CaseController.cs b/LawFim/LawFirmExecutorApp/Controllers/CaseController.cs index 44d141f..4d43085 100644 --- a/LawFim/LawFirmExecutorApp/Controllers/CaseController.cs +++ b/LawFim/LawFirmExecutorApp/Controllers/CaseController.cs @@ -39,7 +39,7 @@ namespace LawFirmExecutorApp.Controllers } APIClient.PostRequest("api/case/addclienttocase", Tuple.Create(new CaseSearchModel { Id = conId }, clientId)); - Response.Redirect("Home/Cases"); + Response.Redirect("~/Home/Cases"); } [HttpGet] public IActionResult CreateCase() @@ -47,7 +47,7 @@ namespace LawFirmExecutorApp.Controllers return View(); } [HttpPost] - public void CreateCase(string name, string type, CaseStatus status, DateTime date) + public void CreateCase(string name, string type) { if (APIClient.Executor == null) { @@ -59,11 +59,11 @@ namespace LawFirmExecutorApp.Controllers { ExecutorId = APIClient.Executor.Id, Name = name, - Status = status, + Status = CaseStatus.Принято, CaseType = type, - DateCreate = date + DateCreate = DateTime.Now }); - Response.Redirect("Home/Cases"); + Response.Redirect("~/Home/Cases"); } [HttpGet] public IActionResult UpdateCase() @@ -87,7 +87,7 @@ namespace LawFirmExecutorApp.Controllers CaseType = type, DateCreate = date }); - Response.Redirect("Home/Cases"); + Response.Redirect("~/Home/Cases"); } [HttpPost] public void DeleteCase(int id) @@ -102,12 +102,12 @@ namespace LawFirmExecutorApp.Controllers { ExecutorId = APIClient.Executor.Id, Name = "", - Status = 0, + Status = CaseStatus.Неизвестен, CaseType = "", DateCreate = DateTime.Now }); - Response.Redirect("Home/Cases"); + Response.Redirect("~/Home/Cases"); } } diff --git a/LawFim/LawFirmExecutorApp/Controllers/ClientController.cs b/LawFim/LawFirmExecutorApp/Controllers/ClientController.cs index 7c00d5f..6140ebf 100644 --- a/LawFim/LawFirmExecutorApp/Controllers/ClientController.cs +++ b/LawFim/LawFirmExecutorApp/Controllers/ClientController.cs @@ -30,7 +30,7 @@ namespace LawFirmExecutorApp.Controllers Email = email }); - Response.Redirect("Home/Clients"); + Response.Redirect("~/Home/Clients"); } [HttpPost] @@ -47,7 +47,7 @@ namespace LawFirmExecutorApp.Controllers Id = id }); - Response.Redirect("Home/Clients"); + Response.Redirect("~/Home/Clients"); } [HttpGet] public IActionResult UpdateClient() @@ -71,7 +71,7 @@ namespace LawFirmExecutorApp.Controllers Email = email, Phone = phone }); - Response.Redirect("Home/Clients"); + Response.Redirect("~/Home/Clients"); } } } diff --git a/LawFim/LawFirmExecutorApp/Controllers/HomeController.cs b/LawFim/LawFirmExecutorApp/Controllers/HomeController.cs index dbac1d1..c8de2b4 100644 --- a/LawFim/LawFirmExecutorApp/Controllers/HomeController.cs +++ b/LawFim/LawFirmExecutorApp/Controllers/HomeController.cs @@ -82,7 +82,7 @@ namespace LawFirmExecutorApp.Controllers APIClient.Executor.FIO = fio; APIClient.Executor.Email = login; APIClient.Executor.Password = password; - Response.Redirect("Home/Clients"); + Response.Redirect("~/Home/Clients"); } // РЕГИСТРАЦИЯ ИСПОЛНИТЕЛЯ @@ -108,7 +108,7 @@ namespace LawFirmExecutorApp.Controllers Email = login, Password = password }); - Response.Redirect("Home/EnterExecutor"); + Response.Redirect("~/Home/EnterExecutor"); return; } @@ -134,7 +134,7 @@ namespace LawFirmExecutorApp.Controllers } else { - Response.Redirect("Home/Clients"); + Response.Redirect("~/Home/Clients"); } } diff --git a/LawFim/LawFirmExecutorApp/Controllers/VizitController.cs b/LawFim/LawFirmExecutorApp/Controllers/VizitController.cs index 60d918e..9e43ca0 100644 --- a/LawFim/LawFirmExecutorApp/Controllers/VizitController.cs +++ b/LawFim/LawFirmExecutorApp/Controllers/VizitController.cs @@ -37,7 +37,7 @@ namespace LawFirmExecutorApp.Controllers } APIClient.PostRequest("api/visit/addclienttovisit", Tuple.Create(new VisitSearchModel { Id = hearId }, clientId)); - Response.Redirect("Home/Visits"); + Response.Redirect("~/Home/Visits"); } [HttpGet] public IActionResult CreateVisit() @@ -58,7 +58,7 @@ namespace LawFirmExecutorApp.Controllers ExecutorId = APIClient.Executor.Id, VisitDate = date, }); - Response.Redirect("Home/Visits"); + Response.Redirect("~/Home/Visits"); } [HttpGet] public IActionResult UpdateVisit() @@ -81,7 +81,7 @@ namespace LawFirmExecutorApp.Controllers VisitDate = date, }); - Response.Redirect("Home/Visits"); + Response.Redirect("~/Home/Visits"); } [HttpPost] public void DeleteVisit(int id) @@ -99,7 +99,7 @@ namespace LawFirmExecutorApp.Controllers Id = id }); - Response.Redirect("Home/Visits"); + Response.Redirect("~/Home/Visits"); } } } diff --git a/LawFim/LawFirmExecutorApp/Views/Case/CreateCase.cshtml b/LawFim/LawFirmExecutorApp/Views/Case/CreateCase.cshtml index c960e15..ff324dd 100644 --- a/LawFim/LawFirmExecutorApp/Views/Case/CreateCase.cshtml +++ b/LawFim/LawFirmExecutorApp/Views/Case/CreateCase.cshtml @@ -16,24 +16,7 @@
Вид производства
- -
-
-
-
Статус
-
- -
-
-
-
Дата создания
-
- +
diff --git a/LawFim/LawFirmExecutorApp/Views/Case/UpdateCase.cshtml b/LawFim/LawFirmExecutorApp/Views/Case/UpdateCase.cshtml index 09cf1da..640962a 100644 --- a/LawFim/LawFirmExecutorApp/Views/Case/UpdateCase.cshtml +++ b/LawFim/LawFirmExecutorApp/Views/Case/UpdateCase.cshtml @@ -30,10 +30,4 @@
-
-
Дата создания
-
- -
-
\ No newline at end of file diff --git a/LawFim/LawFirmExecutorApp/Views/Shared/_Layout.cshtml b/LawFim/LawFirmExecutorApp/Views/Shared/_Layout.cshtml index 16ac199..7014a32 100644 --- a/LawFim/LawFirmExecutorApp/Views/Shared/_Layout.cshtml +++ b/LawFim/LawFirmExecutorApp/Views/Shared/_Layout.cshtml @@ -20,7 +20,7 @@