diff --git a/BeautySalonView/ClientWebApp/APIWorker.cs b/BeautySalonView/ClientWebApp/APIWorker.cs index b34cc90..5ea2bd4 100644 --- a/BeautySalonView/ClientWebApp/APIWorker.cs +++ b/BeautySalonView/ClientWebApp/APIWorker.cs @@ -1,4 +1,5 @@ using BeautySalonContracts.ViewModels; +using BeautySalonDatabaseImplement.Models; using Newtonsoft.Json; using System.Net.Http.Headers; using System.Text; @@ -22,7 +23,6 @@ namespace WorkerWebApp { var response = _worker.GetAsync(requestUrl); var result = response.Result.Content.ReadAsStringAsync().Result; - if (response.Result.IsSuccessStatusCode) { return JsonConvert.DeserializeObject(result); @@ -41,7 +41,6 @@ namespace WorkerWebApp var response = _worker.PostAsync(requestUrl, data); var result = response.Result.Content.ReadAsStringAsync().Result; - if (!response.Result.IsSuccessStatusCode) { throw new Exception(result); diff --git a/BeautySalonView/ClientWebApp/Controllers/HomeController.cs b/BeautySalonView/ClientWebApp/Controllers/HomeController.cs index 1881a07..514c121 100644 --- a/BeautySalonView/ClientWebApp/Controllers/HomeController.cs +++ b/BeautySalonView/ClientWebApp/Controllers/HomeController.cs @@ -182,7 +182,9 @@ namespace WorkerWebApp.Controllers var data = _reportLogic.GetOrders(new ReportOrderBindingModel { DateFrom = dateFrom, - DateTo = dateTo + DateTo = dateTo, + WorkerId = APIWorker.Worker.Id + }); ViewBag.Procedures = _procedureLogic.ReadList(new ProcedureSearchModel @@ -207,7 +209,7 @@ namespace WorkerWebApp.Controllers if (procedures == null || procedures.Count <= 0) { - throw new Exception("Не выбраны рецепты!"); + throw new Exception("Не выбраны процедуры!"); } _reportLogic.SaveProcedureCosmeticsToWordFile(new ReportBindingModel @@ -234,7 +236,7 @@ namespace WorkerWebApp.Controllers if (procedures == null || procedures.Count <= 0) { - throw new Exception("Не выбраны рецепты!"); + throw new Exception("Не выбраны процедуры!"); } _reportLogic.SaveProcedureCosmeticsToExcelFile(new ReportBindingModel diff --git a/BeautySalonView/ClientWebApp/Views/Home/Enter.cshtml b/BeautySalonView/ClientWebApp/Views/Home/Enter.cshtml index 106d3d5..57576f8 100644 --- a/BeautySalonView/ClientWebApp/Views/Home/Enter.cshtml +++ b/BeautySalonView/ClientWebApp/Views/Home/Enter.cshtml @@ -1,21 +1,19 @@ @{ - ViewData["Title"] = "Enter"; + ViewData["Title"] = "Вход"; } -
-

Вход в приложение

-
+

Вход в приложение

+
-
-
Логин:
-
-
-
-
Пароль:
-
-
-
-
-
-
+
+ + +
+
+ + +
+
\ No newline at end of file diff --git a/BeautySalonView/ClientWebApp/Views/Home/Register.cshtml b/BeautySalonView/ClientWebApp/Views/Home/Register.cshtml index 286d65c..87f3b84 100644 --- a/BeautySalonView/ClientWebApp/Views/Home/Register.cshtml +++ b/BeautySalonView/ClientWebApp/Views/Home/Register.cshtml @@ -1,26 +1,25 @@ @{ - ViewData["Title"] = "Register"; + ViewData["Title"] = "Регистрация"; } -
-

Регистрация

-
+ +

Регистрация

+
-
-
Логин (электронная почта):
-
+
+ +
-
-
Пароль:
-
+
+ +
-
-
ваше ФИО:
+
+ +
-
-
-
- -
+
+
- \ No newline at end of file +