Nikolay-Raspaev/PIbd-21_Raspaev_N.I._FoodOrders
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Николай 2023-04-09 19:15:33 +04:00
parent c8de74e931
commit 7a37e5d985
3 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
FoodOrders/FoddOrdersClientApp/Views/Home/Create.cshtml
View File

@ -25,7 +25,9 @@
</div> </div>
</form> </form>
<script> @section Scripts
{
<script>
$('#dish').on('change', function () { $('#dish').on('change', function () {
check(); check();
}); });
@ -47,4 +49,5 @@
}); });
}; };
} }
</script> </script>
}

20
FoodOrders/FoodOrdersDatabaseImplement/Implements/ClientStorage.cs
View File

@ -23,15 +23,21 @@ namespace FoodOrdersDatabaseImplement.Implements
public ClientViewModel? GetElement(ClientSearchModel model) public ClientViewModel? GetElement(ClientSearchModel model)
{ {
if (string.IsNullOrEmpty(model.Email) && !model.Id.HasValue)
{
return null;
}
using var context = new FoodOrdersDatabase(); using var context = new FoodOrdersDatabase();
if (model.Id.HasValue)
return context.Clients return context.Clients
.FirstOrDefault(x => (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email) || .FirstOrDefault(x => x.Id == model.Id)?
(model.Id.HasValue && x.Id == model.Id)) .GetViewModel;
?.GetViewModel; if (!string.IsNullOrEmpty(model.Email) && !string.IsNullOrEmpty(model.Password))
return context.Clients
.FirstOrDefault(x => x.Email
.Equals(model.Email) && x.Password
.Equals(model.Password))?
.GetViewModel;
if (!string.IsNullOrEmpty(model.Email))
return context.Clients
.FirstOrDefault(x => x.Email.Equals(model.Email))?.GetViewModel;
return null;
} }
public List<ClientViewModel> GetFilteredList(ClientSearchModel model) public List<ClientViewModel> GetFilteredList(ClientSearchModel model)

6
FoodOrders/FoodOrdersDatabaseImplement/Implements/OrderStorage.cs
View File

@ -21,6 +21,10 @@ namespace FoodOrdersDatabaseImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model) public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{ {
if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.ClientId.HasValue)
{
return new();
}
using var context = new FoodOrdersDatabase(); using var context = new FoodOrdersDatabase();
if (model.ClientId.HasValue) if (model.ClientId.HasValue)
{ {
@ -31,7 +35,7 @@ namespace FoodOrdersDatabaseImplement.Implements
.Select(x => x.GetViewModel) .Select(x => x.GetViewModel)
.ToList(); .ToList();
} }
if (!model.Id.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue) else if (model.DateFrom.HasValue && model.DateTo.HasValue)
{ {
return context.Orders return context.Orders
.Include(x => x.Dish) .Include(x => x.Dish)