chtzsch/PIbd-21_Ievlewa_Zhirnova_Course_Work_Beauty_Salon1
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

оно заработает когда-нибудь или нет

Browse Source
This commit is contained in:
Allllen4a 2024-05-31 10:25:26 +04:00
parent 0442ced796
commit cf0999d6eb
4 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BeautySalonView/ClientWebApp/APIWorker.cs
View File

@ -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<T>(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);

8
BeautySalonView/ClientWebApp/Controllers/HomeController.cs
View File

@ -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

30
BeautySalonView/ClientWebApp/Views/Home/Enter.cshtml
View File

@ -1,21 +1,19 @@
@{
ViewData["Title"] = "Enter";
ViewData["Title"] = "Вход";
}
<div class="text-center">
<h2 class="display-4">Вход в приложение</h2>
</div>
<h4 class="fw-bold">Вход в приложение</h4>
<form method="post">
<div class="row">
<div class="col-4">Логин:</div>
<div class="col-8"><input type="text" name="login" /></div>
</div>
<div class="row">
<div class="col-4">Пароль:</div>
<div class="col-8"><input type="password" name="password" /></div>
</div>
<div class="row">
<div class="col-8"></div>
<div class="col-4"><input type="submit" value="Вход" class="btn btn-primary" /></div>
</div>
<div class="mb-3">
<label for="login" class="form-label">Логин:</label>
<input id="login" name="login" type="text" class="form-control" aria-label="Login">
</div>
<div class="mb-3">
<label for="password" class="form-label">Пароль:</label>
<input id="password" name="password" type="password" class="form-control" aria-label="Password">
</div>
<button type="submit" class="btn button-primary">
Войти
</button>
</form>

37
BeautySalonView/ClientWebApp/Views/Home/Register.cshtml
View File

@ -1,26 +1,25 @@
@{
ViewData["Title"] = "Register";
ViewData["Title"] = "Регистрация";
}
<div class="text-center">
<h2 class="display-4">Регистрация</h2>
</div>
<h4 class="fw-bold">Регистрация</h4>
<form method="post">
<div class="row">
<div class="col-4">Логин (электронная почта):</div>
<div class="col-8"><input type="text" name="login" /></div>
<div class="mb-3">
<label for="login" class="form-label">Логин:</label>
<input id="login" name="login" type="text" class="form-control" aria-label="Login">
</div>
<div class="row">
<div class="col-4">Пароль:</div>
<div class="col-8"><input type="password" name="password" /></div>
<div class="mb-3">
<label for="password" class="form-label">Пароль:</label>
<input id="password" name="password" type="password" class="form-control" aria-label="Password">
</div>
<div class="row">
<div class="col-4">ваше ФИО:</div><div class="col-8"><input type="text" name="fio" /></div>
<div class="mb-3">
<label for="email" class="form-label">Адрес электронной почты:</label>
<input id="email" name="email" type="email" class="form-control" aria-label="Email">
</div>
<div class="row">
<div class="col-8"></div>
<div class="col-4">
<input type="submit" value="Registration"
class="btn btn-primary" />
</div>
<div>
<button type="submit" class="btn button-primary">
Регистрация
</button>
</div>
</form>
</form>