ns.potapov/PIbd-21_Potapov_N.S._SecuritySystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-21 Potapov N.S. LabWork05 #6

Closed
ns.potapov wants to merge 35 commits from LabWork05 into LabWork04
pull from: LabWork05
merge into: ns.potapov:LabWork04
Conversation 0 Commits 35 Files Changed 132 +10 -9
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 645cdb306f - Show all commits

4
SecuritySystem/SecuritySystemFileImplement/Implements/OrderStorage.cs
View File

@ -41,6 +41,10 @@ namespace SecuritySystemFileImplement.Implements
{
orders = orders.Where(x => x.DateCreate <= model.DateTo.Value).ToList();
}
if (model.ClientId.HasValue)
{
orders = orders.Where(x => x.ClientId == model.ClientId.Value).ToList();
}
return orders;
}

1
SecuritySystem/SecuritySystemFileImplement/Models/Order.cs
View File

@ -10,6 +10,7 @@ namespace SecuritySystemFileImplement.Models
{
public int Id { get; private set; }
public int SecureId { get; private set; }
public int ClientId { get; private set; }
public int Count { get; private set; }
public double Sum { get; private set; }
public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;

4
SecuritySystem/SecuritySystemListImplement/Implements/OrderStorage.cs
View File

@ -39,6 +39,10 @@ namespace SecuritySystemListImplement.Implements
{
orders = orders.Where(x => x.DateCreate <= model.DateTo.Value).ToList();
}
if (model.ClientId.HasValue)
{
orders = orders.Where(x => x.ClientId == model.ClientId.Value).ToList();
}
return orders;
}
public OrderViewModel? GetElement(OrderSearchModel model)

10
SecuritySystem/SecuritySystemListImplement/Models/Order.cs
View File

@ -7,19 +7,13 @@ namespace SecuritySystemListImplement.Models
public class Order
{
public int SecureId { get; private set; }
public int ClientId { get; private set; }
public int Count { get; private set; }
public double Sum { get; private set; }
public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
public DateTime DateCreate { get; private set; } = DateTime.Now;
public DateTime? DateImplement { get; private set; }
public int Id { get; private set; }
public static Order? Create(OrderBindingModel? model)
{
if (model == null)
@ -37,7 +31,6 @@ namespace SecuritySystemListImplement.Models
DateImplement = model.DateImplement,
};
}
public void Update(OrderBindingModel? model)
{
if (model == null)
@ -47,7 +40,6 @@ namespace SecuritySystemListImplement.Models
Status = model.Status;
DateImplement = model.DateImplement;
}
public OrderViewModel GetViewModel => new()
{
SecureId = SecureId,