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

Merge branch 'BaseLabWork01' into BaseLabWork02

Browse Source
This commit is contained in:
Николай 2023-03-12 14:03:22 +04:00
commit 54e1ac8f89
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FoodOrders/FoodOrdersListImplement/DataListSingleton.cs
View File

@ -7,12 +7,12 @@ namespace FoodOrdersListImplement
private static DataListSingleton? _instance; private static DataListSingleton? _instance;
public List<Component> Components { get; set; } public List<Component> Components { get; set; }
public List<Order> Orders { get; set; } public List<Order> Orders { get; set; }
public List<Dish> Dish { get; set; } public List<Dish> Dishes { get; set; }
private DataListSingleton() private DataListSingleton()
{ {
Components = new List<Component>(); Components = new List<Component>();
Orders = new List<Order>(); Orders = new List<Order>();
Dish = new List<Dish>(); Dishes = new List<Dish>();
} }
public static DataListSingleton GetInstance() public static DataListSingleton GetInstance()
{ {

20
FoodOrders/FoodOrdersListImplement/Implements/DishStorage.cs
View File

@ -16,7 +16,7 @@ namespace FoodOrdersListImplement.Implements
public List<DishViewModel> GetFullList() public List<DishViewModel> GetFullList()
{ {
var result = new List<DishViewModel>(); var result = new List<DishViewModel>();
foreach (var dish in _source.Dish) foreach (var dish in _source.Dishes)
{ {
result.Add(dish.GetViewModel); result.Add(dish.GetViewModel);
} }
@ -29,7 +29,7 @@ namespace FoodOrdersListImplement.Implements
{ {
return result; return result;
} }
foreach (var dish in _source.Dish) foreach (var dish in _source.Dishes)
{ {
if (dish.DishName.Contains(model.DishName)) if (dish.DishName.Contains(model.DishName))
{ {
@ -44,7 +44,7 @@ namespace FoodOrdersListImplement.Implements
{ {
return null; return null;
} }
foreach (var dish in _source.Dish) foreach (var dish in _source.Dishes)
{ {
if ((!string.IsNullOrEmpty(model.DishName) && dish.DishName == model.DishName) || (model.Id.HasValue && dish.Id == model.Id)) if ((!string.IsNullOrEmpty(model.DishName) && dish.DishName == model.DishName) || (model.Id.HasValue && dish.Id == model.Id))
{ {
@ -56,7 +56,7 @@ namespace FoodOrdersListImplement.Implements
public DishViewModel? Insert(DishBindingModel model) public DishViewModel? Insert(DishBindingModel model)
{ {
model.Id = 1; model.Id = 1;
foreach (var dish in _source.Dish) foreach (var dish in _source.Dishes)
{ {
if (model.Id <= dish.Id) if (model.Id <= dish.Id)
{ {
@ -68,12 +68,12 @@ namespace FoodOrdersListImplement.Implements
{ {
return null; return null;
} }
_source.Dish.Add(newDish); _source.Dishes.Add(newDish);
return newDish.GetViewModel; return newDish.GetViewModel;
} }
public DishViewModel? Update(DishBindingModel model) public DishViewModel? Update(DishBindingModel model)
{ {
foreach (var dish in _source.Dish) foreach (var dish in _source.Dishes)
{ {
if (dish.Id == model.Id) if (dish.Id == model.Id)
{ {
@ -85,12 +85,12 @@ namespace FoodOrdersListImplement.Implements
} }
public DishViewModel? Delete(DishBindingModel model) public DishViewModel? Delete(DishBindingModel model)
{ {
for (int i = 0; i < _source.Dish.Count; ++i) for (int i = 0; i < _source.Dishes.Count; ++i)
{ {
if (_source.Dish[i].Id == model.Id) if (_source.Dishes[i].Id == model.Id)
{ {
var element = _source.Dish[i]; var element = _source.Dishes[i];
_source.Dish.RemoveAt(i); _source.Dishes.RemoveAt(i);
return element.GetViewModel; return element.GetViewModel;
} }
} }

2
FoodOrders/FoodOrdersListImplement/Implements/OrderStorage.cs
View File

@ -63,7 +63,7 @@ namespace FoodOrdersListImplement.Implements
private OrderViewModel GetViewModel(Order order) private OrderViewModel GetViewModel(Order order)
{ {
var viewModel = order.GetViewModel; var viewModel = order.GetViewModel;
foreach (var dish in _source.Dish) foreach (var dish in _source.Dishes)
{ {
if (dish.Id == order.DishId) if (dish.Id == order.DishId)
{ {