From 33bdbcc6d075ea625abb05416a77ab32834f44fd Mon Sep 17 00:00:00 2001 From: "kagbie3nn@mail.ru" Date: Fri, 31 May 2024 01:17:36 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B2=D1=81=D0=B5=20=D0=B0=D0=BF=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=BE=D1=87=D0=B8=D0=BD=D0=B8=D0=BB:=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=87=D0=B8=D0=BD=D0=B8=D1=82=D1=8C=20=D1=81=D0=B2=D1=8F=D0=B7?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/HomeController.cs | 8 +++--- .../ZooClientApp/Views/Home/Create.cshtml | 2 +- .../ZooClientApp/Views/Shared/_Layout.cshtml | 6 ++-- .../BindingModels/PreserveBindingModel.cs | 2 ++ .../SearchModels/PreserveSearchModel.cs | 6 ++-- .../ViewModels/PreserveViewModel.cs | 1 + .../ZooDataBaseImplement/Models/Preserve.cs | 3 ++ .../ZooDataModels/Models/IPreserveModel.cs | 1 + git/JurasicZoo/ZooRestApi/Program.cs | 4 +-- git/JurasicZoo/ZooRestApi/WeatherForecast.cs | 13 --------- .../Controllers/HomeController.cs | 28 ++++++++++++++----- .../Views/Home/CreatePreserve.cshtml | 2 +- .../Views/Home/Index.cshtml | 1 + .../Views/Home/Privacy.cshtml | 6 ++-- .../Views/Shared/_Layout.cshtml | 5 +++- 15 files changed, 51 insertions(+), 37 deletions(-) delete mode 100644 git/JurasicZoo/ZooRestApi/WeatherForecast.cs diff --git a/git/JurasicZoo/ZooClientApp/Controllers/HomeController.cs b/git/JurasicZoo/ZooClientApp/Controllers/HomeController.cs index 49b5a53..dc15024 100644 --- a/git/JurasicZoo/ZooClientApp/Controllers/HomeController.cs +++ b/git/JurasicZoo/ZooClientApp/Controllers/HomeController.cs @@ -113,12 +113,12 @@ namespace ZooClientApp.Controllers [HttpGet] public IActionResult Create() { - ViewBag.Canneds = - APIClient.GetRequest>("api/main/getcannedlist"); + ViewBag.Routes = + APIClient.GetRequest>("api/main/getRoutes"); return View(); } [HttpPost] - public void Create(int canned, int count) + public void Create(int Route, int count) { if (APIClient.Client == null) { @@ -128,7 +128,7 @@ namespace ZooClientApp.Controllers { throw new Exception("Количество и сумма должны быть больше 0"); } - APIClient.PostRequest("api/main/createorder", new + APIClient.PostRequest("api/main/createroute", new RouteBindingModel { ClientId = APIClient.Client.Id diff --git a/git/JurasicZoo/ZooClientApp/Views/Home/Create.cshtml b/git/JurasicZoo/ZooClientApp/Views/Home/Create.cshtml index 66cb685..826ee2e 100644 --- a/git/JurasicZoo/ZooClientApp/Views/Home/Create.cshtml +++ b/git/JurasicZoo/ZooClientApp/Views/Home/Create.cshtml @@ -8,7 +8,7 @@
Заповедник:
- +
diff --git a/git/JurasicZoo/ZooClientApp/Views/Shared/_Layout.cshtml b/git/JurasicZoo/ZooClientApp/Views/Shared/_Layout.cshtml index 43a20fd..211ffcb 100644 --- a/git/JurasicZoo/ZooClientApp/Views/Shared/_Layout.cshtml +++ b/git/JurasicZoo/ZooClientApp/Views/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - @ViewData["Title"] - AbstractShowClientApp + @ViewData["Title"] - ZooShowClientApp @@ -13,7 +13,7 @@