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-15 15:31:58 +04:00
parent 94dacd99f1
commit d2241ea027
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IceCreamShop/IceCreamShopContracts/BindingModels/OrderBindingModel.cs
View File

@ -13,7 +13,7 @@ namespace IceCreamShopContracts.BindingModels
{ {
public int Id { get; set; } public int Id { get; set; }
public int IceCreamId { get; set; } public int IceCreamId { get; set; }
public int ImplementerId { get; set; } public int? ImplementerId { get; set; } = null;
public int ClientId { get; set; } public int ClientId { get; set; }
public int Count { get; set; } public int Count { get; set; }
public double Sum { get; set; } public double Sum { get; set; }

2
IceCreamShop/IceCreamShopContracts/ViewModels/OrderViewModel.cs
View File

@ -16,7 +16,7 @@ namespace IceCreamShopContracts.ViewModels
public int Id { get; set; } public int Id { get; set; }
public int IceCreamId { get; set; } public int IceCreamId { get; set; }
public int ClientId { get; set; } public int ClientId { get; set; }
public int ImplementerId { get; set; } public int? ImplementerId { get; set; } = null;
[DisplayName("Клиент")] [DisplayName("Клиент")]
public string ClientFIO { get; set; } = string.Empty; public string ClientFIO { get; set; } = string.Empty;
[DisplayName("Мороженное")] [DisplayName("Мороженное")]

2
IceCreamShop/IceCreamShopDataModels/IOrderModel.cs
View File

@ -11,7 +11,7 @@ namespace IceCreamShopDataModels.Models
{ {
int IceCreamId { get; } int IceCreamId { get; }
int ClientId { get; } int ClientId { get; }
int ImplementerId { get; } int? ImplementerId { get; }
int Count { get; } int Count { get; }
double Sum { get; } double Sum { get; }
OrderStatus Status { get; } OrderStatus Status { get; }

6
IceCreamShop/IceCreamShopDatabaseImplement/Models/Order.cs
View File

@ -30,8 +30,8 @@ namespace IceCreamShopDatabaseImplement.Models
public int ClientId { get; private set; } public int ClientId { get; private set; }
public virtual Client Client { get; private set; } public virtual Client Client { get; private set; }
[Required] [Required]
public int ImplementerId { get; private set; } public int? ImplementerId { get; private set; } = null;
public virtual Implementer Implementer { get; private set; } public virtual Implementer? Implementer { get; private set; }
public static Order? Create(IceCreamShopDataBase context, OrderBindingModel model) public static Order? Create(IceCreamShopDataBase context, OrderBindingModel model)
{ {
if (model == null) if (model == null)
@ -78,7 +78,7 @@ namespace IceCreamShopDatabaseImplement.Models
IceCreamName = IceCream.IceCreamName, IceCreamName = IceCream.IceCreamName,
Id = Id, Id = Id,
ClientFIO = Client.ClientFIO, ClientFIO = Client.ClientFIO,
ImplementerFIO = Implementer.ImplementerFIO ImplementerFIO = (Implementer != null ? Implementer.ImplementerFIO : string.Empty)
}; };
} }

2
IceCreamShop/IceCreamShopFileImplement/Models/Order.cs
View File

@ -15,7 +15,7 @@ namespace IceCreamShopFileImplement.Models
{ {
public int Id { get; private set; } public int Id { get; private set; }
public int IceCreamId { get; private set; } public int IceCreamId { get; private set; }
public int ImplementerId { get; private set; } public int? ImplementerId { get; private set; } = null;
public int ClientId { get; private set; } public int ClientId { get; private set; }
public int Count { get; private set; } public int Count { get; private set; }
public double Sum { get; private set; } public double Sum { get; private set; }

2
IceCreamShop/IceCreamShopListImplement/Models/Order.cs
View File

@ -18,7 +18,7 @@ namespace IceCreamShopListImplement.Models
public int Id { get; private set; } public int Id { get; private set; }
public int IceCreamId { get; private set; } public int IceCreamId { get; private set; }
public int ClientId { get; private set; } public int ClientId { get; private set; }
public int ImplementerId { get; private set; } public int? ImplementerId { get; private set; }
public int Count { get; private set; } public int Count { get; private set; }
public double Sum { get; private set; } public double Sum { get; private set; }
public OrderStatus Status { get; private set; } public OrderStatus Status { get; private set; }