From 34f803c11ea9db9fea08808c4542f305d3fe4bb7 Mon Sep 17 00:00:00 2001 From: bocchanskyy Date: Wed, 28 Aug 2024 13:31:47 +0400 Subject: [PATCH] some fixes, but still got a work to do --- .../Controllers/CosmeticController.cs | 4 +- .../Controllers/HomeController.cs | 8 +-- .../Controllers/LaborCostController.cs | 20 +++---- .../Views/Cosmetic/Cosmetics.cshtml | 1 - .../{Create.cshtml => CreateCosmetics.cshtml} | 0 .../{Update.cshtml => UpdateCosmetics.cshtml} | 0 .../Views/Home/Cosmetic.cshtml | 53 ------------------- .../StoreKeeperWebApp/Views/Home/Index.cshtml | 7 ++- .../Views/Home/LaborCosts.cshtml | 51 ------------------ .../Views/Home/ListCosmetics.cshtml | 52 ------------------ .../Views/Home/Register.cshtml | 21 +++++--- .../Home/{Report.cshtml => Reports.cshtml} | 0 .../Views/Home/Service.cshtml | 53 ------------------- .../CreateLaborCosts.cshtml} | 0 .../LaborCosts.cshtml | 0 .../UpdateLaborCosts.cshtml} | 2 +- .../{Create.cshtml => CreateServices.cshtml} | 0 .../{Update.cshtml => UpdateServices.cshtml} | 2 +- .../Views/Shared/_Layout.cshtml | 9 ++-- 19 files changed, 43 insertions(+), 240 deletions(-) rename BeautyStudio/StoreKeeperWebApp/Views/Cosmetic/{Create.cshtml => CreateCosmetics.cshtml} (100%) rename BeautyStudio/StoreKeeperWebApp/Views/Cosmetic/{Update.cshtml => UpdateCosmetics.cshtml} (100%) delete mode 100644 BeautyStudio/StoreKeeperWebApp/Views/Home/Cosmetic.cshtml delete mode 100644 BeautyStudio/StoreKeeperWebApp/Views/Home/LaborCosts.cshtml delete mode 100644 BeautyStudio/StoreKeeperWebApp/Views/Home/ListCosmetics.cshtml rename BeautyStudio/StoreKeeperWebApp/Views/Home/{Report.cshtml => Reports.cshtml} (100%) delete mode 100644 BeautyStudio/StoreKeeperWebApp/Views/Home/Service.cshtml rename BeautyStudio/StoreKeeperWebApp/Views/{LaborCosts/Create.cshtml => LaborCost/CreateLaborCosts.cshtml} (100%) rename BeautyStudio/StoreKeeperWebApp/Views/{LaborCosts => LaborCost}/LaborCosts.cshtml (100%) rename BeautyStudio/StoreKeeperWebApp/Views/{LaborCosts/Update.cshtml => LaborCost/UpdateLaborCosts.cshtml} (98%) rename BeautyStudio/StoreKeeperWebApp/Views/Service/{Create.cshtml => CreateServices.cshtml} (100%) rename BeautyStudio/StoreKeeperWebApp/Views/Service/{Update.cshtml => UpdateServices.cshtml} (96%) diff --git a/BeautyStudio/StoreKeeperWebApp/Controllers/CosmeticController.cs b/BeautyStudio/StoreKeeperWebApp/Controllers/CosmeticController.cs index f7d5a56..6cd0229 100644 --- a/BeautyStudio/StoreKeeperWebApp/Controllers/CosmeticController.cs +++ b/BeautyStudio/StoreKeeperWebApp/Controllers/CosmeticController.cs @@ -71,14 +71,14 @@ namespace StoreKeeperWebApp.Controllers } [HttpPost] - public void CreateCosmetics(string name, string brand, double price, int laborCost) + public void CreateCosmetics(string name, double price, int laborCost) { if (APIStoreKeeper.Storekeeper == null) { throw new Exception("Необходимо авторизоваться!"); } - if (string.IsNullOrEmpty(name) || string.IsNullOrEmpty(brand) || price <= 0 || laborCost <= 0) + if (string.IsNullOrEmpty(name) || price <= 0 || laborCost <= 0) { throw new Exception("Введены не все данные!"); } diff --git a/BeautyStudio/StoreKeeperWebApp/Controllers/HomeController.cs b/BeautyStudio/StoreKeeperWebApp/Controllers/HomeController.cs index 2d9d045..f7c0628 100644 --- a/BeautyStudio/StoreKeeperWebApp/Controllers/HomeController.cs +++ b/BeautyStudio/StoreKeeperWebApp/Controllers/HomeController.cs @@ -103,7 +103,7 @@ namespace StoreKeeperWebApp.Controllers APIStoreKeeper.Storekeeper = _logic.ReadElement(new StoreKeeperSearchModel { - StoreKeeperEmail = login, + StoreKeeperLogin = login, StoreKeeperPassword = password }); if (APIStoreKeeper.Storekeeper == null) @@ -125,16 +125,16 @@ namespace StoreKeeperWebApp.Controllers return View(); } [HttpPost] - public void Register(string fullname, string email, string password, string phone) + public void Register(string fio, string email, string password, string phone) { - if (string.IsNullOrEmpty(fullname) || string.IsNullOrEmpty(email) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(phone)) + if (string.IsNullOrEmpty(fio) || string.IsNullOrEmpty(email) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(phone)) { throw new Exception(" !"); } _logic.Create(new StoreKeeperBindingModel { - StoreKeeperFIO = fullname, + StoreKeeperFIO = fio, StoreKeeperEmail = email, StoreKeeperPassword = password, StoreKeeperLogin = email, diff --git a/BeautyStudio/StoreKeeperWebApp/Controllers/LaborCostController.cs b/BeautyStudio/StoreKeeperWebApp/Controllers/LaborCostController.cs index 32526d7..5b6d8cd 100644 --- a/BeautyStudio/StoreKeeperWebApp/Controllers/LaborCostController.cs +++ b/BeautyStudio/StoreKeeperWebApp/Controllers/LaborCostController.cs @@ -28,7 +28,7 @@ namespace StoreKeeperWebApp.Controllers } [HttpGet] - public LaborCostViewModel? GetLaborCost(int id) + public LaborCostViewModel? GetLaborCosts(int id) { try { @@ -45,7 +45,7 @@ namespace StoreKeeperWebApp.Controllers } [HttpGet] - public IActionResult LaborCost() + public IActionResult LaborCosts() { if (APIStoreKeeper.Storekeeper == null) { @@ -56,7 +56,7 @@ namespace StoreKeeperWebApp.Controllers } [HttpGet] - public IActionResult CreateLaborCost() + public IActionResult CreateLaborCosts() { if (APIStoreKeeper.Storekeeper == null) { @@ -72,7 +72,7 @@ namespace StoreKeeperWebApp.Controllers } [HttpPost] - public void CreateLaborCost(int hours, string difficulty, int cosmeticId) + public void CreateLaborCosts(int hours, string difficulty, int cosmeticId) { if (APIStoreKeeper.Storekeeper == null) { @@ -110,12 +110,12 @@ namespace StoreKeeperWebApp.Controllers }); } - Response.Redirect("/LaborCost/LaborCost"); + Response.Redirect("/LaborCost/LaborCosts"); } [HttpGet] - public IActionResult UpdateLaborCost(int id) + public IActionResult UpdateLaborCosts(int id) { if (APIStoreKeeper.Storekeeper == null) { @@ -134,7 +134,7 @@ namespace StoreKeeperWebApp.Controllers } [HttpPost] - public void UpdateLaborCost(int hours, string difficulty) + public void UpdateLaborCosts(int hours, string difficulty) { if (APIStoreKeeper.Storekeeper == null) { @@ -153,7 +153,7 @@ namespace StoreKeeperWebApp.Controllers StoreKeeperId = APIStoreKeeper.Storekeeper.Id }); - Response.Redirect("/LaborCost/LaborCost"); + Response.Redirect("/LaborCost/LaborCosts"); } /// @@ -161,7 +161,7 @@ namespace StoreKeeperWebApp.Controllers /// /// [HttpPost] - public void DeleteLaborCost(int id) + public void DeleteLaborCosts(int id) { if (APIStoreKeeper.Storekeeper == null) { @@ -173,7 +173,7 @@ namespace StoreKeeperWebApp.Controllers Id = id }); - Response.Redirect("/LaborCost/LaborCost"); + Response.Redirect("/LaborCost/LaborCosts"); } } } diff --git a/BeautyStudio/StoreKeeperWebApp/Views/Cosmetic/Cosmetics.cshtml b/BeautyStudio/StoreKeeperWebApp/Views/Cosmetic/Cosmetics.cshtml index ba5487e..16e0455 100644 --- a/BeautyStudio/StoreKeeperWebApp/Views/Cosmetic/Cosmetics.cshtml +++ b/BeautyStudio/StoreKeeperWebApp/Views/Cosmetic/Cosmetics.cshtml @@ -27,7 +27,6 @@ Номер Название - Бренд Цена diff --git a/BeautyStudio/StoreKeeperWebApp/Views/Cosmetic/Create.cshtml b/BeautyStudio/StoreKeeperWebApp/Views/Cosmetic/CreateCosmetics.cshtml similarity index 100% rename from BeautyStudio/StoreKeeperWebApp/Views/Cosmetic/Create.cshtml rename to BeautyStudio/StoreKeeperWebApp/Views/Cosmetic/CreateCosmetics.cshtml diff --git a/BeautyStudio/StoreKeeperWebApp/Views/Cosmetic/Update.cshtml b/BeautyStudio/StoreKeeperWebApp/Views/Cosmetic/UpdateCosmetics.cshtml similarity index 100% rename from BeautyStudio/StoreKeeperWebApp/Views/Cosmetic/Update.cshtml rename to BeautyStudio/StoreKeeperWebApp/Views/Cosmetic/UpdateCosmetics.cshtml diff --git a/BeautyStudio/StoreKeeperWebApp/Views/Home/Cosmetic.cshtml b/BeautyStudio/StoreKeeperWebApp/Views/Home/Cosmetic.cshtml deleted file mode 100644 index d28aad4..0000000 --- a/BeautyStudio/StoreKeeperWebApp/Views/Home/Cosmetic.cshtml +++ /dev/null @@ -1,53 +0,0 @@ -@using BeautyStudioContracts.ViewModels - -@{ - ViewData["Title"] = "Косметика"; -} - -

Косметика

- -
-
- - Создать - - - -
-
-
- - / @ViewBag.NumberOfPages -
- - Перейти - -
-
-
- - - - - - - - - - @foreach (var item in ViewBag.Cosmetic) - { - - - - - - } - -
БрендНаименование косметикиСтоимость
@item.Brand@item.CosmeticName@item.CosmeticPrice
-
- - \ No newline at end of file diff --git a/BeautyStudio/StoreKeeperWebApp/Views/Home/Index.cshtml b/BeautyStudio/StoreKeeperWebApp/Views/Home/Index.cshtml index 4adab0d..41d8044 100644 --- a/BeautyStudio/StoreKeeperWebApp/Views/Home/Index.cshtml +++ b/BeautyStudio/StoreKeeperWebApp/Views/Home/Index.cshtml @@ -1,8 +1,11 @@ @{ ViewData["Title"] = "HomePage"; } -

текст в центре окей

+

+ Vēni. Vidi. Vici. + Пришел. Увидел. Победил. +

-

Logo

+

Logo

\ No newline at end of file diff --git a/BeautyStudio/StoreKeeperWebApp/Views/Home/LaborCosts.cshtml b/BeautyStudio/StoreKeeperWebApp/Views/Home/LaborCosts.cshtml deleted file mode 100644 index 0bd6013..0000000 --- a/BeautyStudio/StoreKeeperWebApp/Views/Home/LaborCosts.cshtml +++ /dev/null @@ -1,51 +0,0 @@ -@using BeautyStudioContracts.ViewModels - -@{ - ViewData["Title"] = "Трудозатраты"; -} - -

Трудозатраты

- -
-
- - Создать - - - Обновить - - -
-
-
- - / @ViewBag.NumberOfPages -
- - Перейти - -
-
-
- - - - - - - - - @foreach (var item in ViewBag.LaborCosts) - { - - - - - } - -
Количество часовСложность
@item.NumberHours@item.Difficlty
-
- - diff --git a/BeautyStudio/StoreKeeperWebApp/Views/Home/ListCosmetics.cshtml b/BeautyStudio/StoreKeeperWebApp/Views/Home/ListCosmetics.cshtml deleted file mode 100644 index cfa9a27..0000000 --- a/BeautyStudio/StoreKeeperWebApp/Views/Home/ListCosmetics.cshtml +++ /dev/null @@ -1,52 +0,0 @@ -@{ - ViewData["Title"] = "Список косметики по процедурам"; -} - -

Список косметики по процедурам

- -@{ - if (ViewBag.IsAllowed == false) - { -

Авторизируйтесь

- return; - } - -
- - -
- -

Выбранные процедуры:

-
- - - - - - - - - - - - - - - -
НаименованиеСтоимость
Не выбрано
-
- -

Добавить процедуру:

-
- - -
- - -} diff --git a/BeautyStudio/StoreKeeperWebApp/Views/Home/Register.cshtml b/BeautyStudio/StoreKeeperWebApp/Views/Home/Register.cshtml index 87f3b84..0a3163d 100644 --- a/BeautyStudio/StoreKeeperWebApp/Views/Home/Register.cshtml +++ b/BeautyStudio/StoreKeeperWebApp/Views/Home/Register.cshtml @@ -5,18 +5,25 @@

Регистрация

+
- - -
-
- - + +
- +
+
+ + +
+ +
+ + +
+
-
-
-
- - / @ViewBag.NumberOfPages -
- - Перейти - -
- -
- - - - - - - - - @foreach (var item in ViewBag.Service) - { - - - - - } - -
НаименованиеСтоимость
@item.ServiceName@item.ServicePrice
-
- \ No newline at end of file diff --git a/BeautyStudio/StoreKeeperWebApp/Views/LaborCosts/Create.cshtml b/BeautyStudio/StoreKeeperWebApp/Views/LaborCost/CreateLaborCosts.cshtml similarity index 100% rename from BeautyStudio/StoreKeeperWebApp/Views/LaborCosts/Create.cshtml rename to BeautyStudio/StoreKeeperWebApp/Views/LaborCost/CreateLaborCosts.cshtml diff --git a/BeautyStudio/StoreKeeperWebApp/Views/LaborCosts/LaborCosts.cshtml b/BeautyStudio/StoreKeeperWebApp/Views/LaborCost/LaborCosts.cshtml similarity index 100% rename from BeautyStudio/StoreKeeperWebApp/Views/LaborCosts/LaborCosts.cshtml rename to BeautyStudio/StoreKeeperWebApp/Views/LaborCost/LaborCosts.cshtml diff --git a/BeautyStudio/StoreKeeperWebApp/Views/LaborCosts/Update.cshtml b/BeautyStudio/StoreKeeperWebApp/Views/LaborCost/UpdateLaborCosts.cshtml similarity index 98% rename from BeautyStudio/StoreKeeperWebApp/Views/LaborCosts/Update.cshtml rename to BeautyStudio/StoreKeeperWebApp/Views/LaborCost/UpdateLaborCosts.cshtml index 3c9a647..bdda888 100644 --- a/BeautyStudio/StoreKeeperWebApp/Views/LaborCosts/Update.cshtml +++ b/BeautyStudio/StoreKeeperWebApp/Views/LaborCost/UpdateLaborCosts.cshtml @@ -3,7 +3,7 @@ @model LaborCostViewModel @{ - ViewData["Title"] = "Редактирование трудозатраты"; + ViewData["Title"] = "Редактирование трудозатрат"; }
diff --git a/BeautyStudio/StoreKeeperWebApp/Views/Service/Create.cshtml b/BeautyStudio/StoreKeeperWebApp/Views/Service/CreateServices.cshtml similarity index 100% rename from BeautyStudio/StoreKeeperWebApp/Views/Service/Create.cshtml rename to BeautyStudio/StoreKeeperWebApp/Views/Service/CreateServices.cshtml diff --git a/BeautyStudio/StoreKeeperWebApp/Views/Service/Update.cshtml b/BeautyStudio/StoreKeeperWebApp/Views/Service/UpdateServices.cshtml similarity index 96% rename from BeautyStudio/StoreKeeperWebApp/Views/Service/Update.cshtml rename to BeautyStudio/StoreKeeperWebApp/Views/Service/UpdateServices.cshtml index 5e13baa..cb21a13 100644 --- a/BeautyStudio/StoreKeeperWebApp/Views/Service/Update.cshtml +++ b/BeautyStudio/StoreKeeperWebApp/Views/Service/UpdateServices.cshtml @@ -3,7 +3,7 @@ @model ServiceViewModel @{ - ViewData["Title"] = "Создание услуги"; + ViewData["Title"] = "Редактирование услуг"; }
diff --git a/BeautyStudio/StoreKeeperWebApp/Views/Shared/_Layout.cshtml b/BeautyStudio/StoreKeeperWebApp/Views/Shared/_Layout.cshtml index a43f47b..d1d96e3 100644 --- a/BeautyStudio/StoreKeeperWebApp/Views/Shared/_Layout.cshtml +++ b/BeautyStudio/StoreKeeperWebApp/Views/Shared/_Layout.cshtml @@ -29,13 +29,16 @@ Авторизация
  • - Услуги + Услуги
  • - Трудозатраты + Трудозатраты
  • - Косметика + Косметика +
    • +
  • + Отчет