Oleja123/PIbd-23-Salin-O.A.-IceCreamShop
0
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Прихорашиваю

Browse Source
This commit is contained in:
gg12 darfren 2024-04-27 22:38:44 +04:00
parent f83f74edc1
commit 7d89799f0e
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IceCreamShop/IceCreamShopBusinessLogic/BusinessLogic/ClientLogic.cs
View File

@ -102,12 +102,12 @@ namespace IceCreamShopBusinessLogic.BusinessLogic
if (string.IsNullOrEmpty(model.Email)) if (string.IsNullOrEmpty(model.Email))
{ {
throw new ArgumentNullException("Нет Email клиента", throw new ArgumentNullException("Нет Email клиента",
nameof(model.ClientFIO)); nameof(model.Email));
} }
if (string.IsNullOrEmpty(model.Password)) if (string.IsNullOrEmpty(model.Password))
{ {
throw new ArgumentNullException("Нет пароля клиента", throw new ArgumentNullException("Нет пароля клиента",
nameof(model.ClientFIO)); nameof(model.Password));
} }
_logger.LogInformation("Client. ClientFIO:{ClientFIO}." + _logger.LogInformation("Client. ClientFIO:{ClientFIO}." +
"Email:{ Email}. Password:{ Password}. Id: { Id} ", model.ClientFIO, model.Email, model.Password, model.Id); "Email:{ Email}. Password:{ Password}. Id: { Id} ", model.ClientFIO, model.Email, model.Password, model.Id);

1
IceCreamShop/IceCreamShopClientApp/Controllers/HomeController.cs
View File

@ -113,6 +113,7 @@ namespace IceCreamShopClientApp.Controllers
[HttpGet] [HttpGet]
public IActionResult Create() public IActionResult Create()
{ {
var res = APIClient.GetRequest<List<IceCreamViewModel>>("api/main/geticecreamlist");
ViewBag.IceCreams = ViewBag.IceCreams =
APIClient.GetRequest<List<IceCreamViewModel>>("api/main/geticecreamlist"); APIClient.GetRequest<List<IceCreamViewModel>>("api/main/geticecreamlist");
return View(); return View();

6
IceCreamShop/IceCreamShopDatabaseImplement/Implements/ClientStorage.cs
View File

@ -30,9 +30,9 @@ namespace IceCreamShopDatabaseImplement.Implements
} }
using var context = new IceCreamShopDataBase(); using var context = new IceCreamShopDataBase();
return context.Clients return context.Clients
.Where(x => (string.IsNullOrEmpty(model.ClientFIO) || x.ClientFIO.Contains(model.ClientFIO) && .Where(x => (string.IsNullOrEmpty(model.ClientFIO) || x.ClientFIO.Contains(model.ClientFIO)) &&
string.IsNullOrEmpty(model.Email) || x.ClientFIO.Contains(model.Email) && (string.IsNullOrEmpty(model.Email) || x.ClientFIO.Contains(model.Email)) &&
string.IsNullOrEmpty(model.Password) || x.ClientFIO.Contains(model.Password))) (string.IsNullOrEmpty(model.Password) || x.ClientFIO.Contains(model.Password)))
.Select(x => x.GetViewModel) .Select(x => x.GetViewModel)
.ToList(); .ToList();
} }