From 089d3869a2b3dc1c074ac0e0438644e7261b8705 Mon Sep 17 00:00:00 2001 From: Ctepa Date: Thu, 19 Dec 2024 08:47:36 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=BE=20=D1=82?= =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Publication/Entites/Customers.cs | 11 +++++++++++ Publication/Entites/Materials.cs | 6 ++++++ Publication/Entites/PrintingHouses.cs | 5 +++++ 3 files changed, 22 insertions(+) diff --git a/Publication/Entites/Customers.cs b/Publication/Entites/Customers.cs index 2e8127e..3c07b88 100644 --- a/Publication/Entites/Customers.cs +++ b/Publication/Entites/Customers.cs @@ -1,12 +1,23 @@ using Publication.Entites.Enums; +using System.ComponentModel; public class Customers { public int Id { get; set; } + + [DisplayName("ФИО заказчика")] public string FullName { get; set; } + + [DisplayName("Возраст")] public int Age { get; set; } + + [DisplayName("Тип заказчика")] public TypeCustomers TypeCustomer { get; set; } + + [DisplayName("Телефон")] public string Phone { get; set; } + + [DisplayName("Почта")] public string Email { get; set; } = string.Empty; public static Customers CreateEntity(int id, string fullName, int age, TypeCustomers typeCustomer, string phone, string email) diff --git a/Publication/Entites/Materials.cs b/Publication/Entites/Materials.cs index da520c2..e21d4d8 100644 --- a/Publication/Entites/Materials.cs +++ b/Publication/Entites/Materials.cs @@ -1,12 +1,18 @@ using Publication.Entites.Enums; namespace Publication.Entites; +using System.ComponentModel; public class Materials { public int Id { get; set; } + + [DisplayName("Дата")] public DateTime DateMaterials { get; set; } + + [DisplayName("Количество")] public int Count { get; set; } + [DisplayName("Материал")] public TypeMaterials Material { get; set; } public static Materials CreateEntity(int id, DateTime dateMaterials, int count, TypeMaterials typeMaterials) diff --git a/Publication/Entites/PrintingHouses.cs b/Publication/Entites/PrintingHouses.cs index bccce91..9198583 100644 --- a/Publication/Entites/PrintingHouses.cs +++ b/Publication/Entites/PrintingHouses.cs @@ -1,4 +1,5 @@ using DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing; +using System.ComponentModel; using Unity; namespace Publication.Entites; @@ -16,6 +17,10 @@ public class PrintingHouses public IEnumerable printingHouseOrder { get; set; } = []; + [DisplayName("Продукты")] + public string Product => printingHouseOrder != null ? + string.Join(", ", printingHouseOrder.Select(x => $"{x} {x.Count}")) : string.Empty; + public static PrintingHouses CreateEntity(int id, string title, string phone, string address,int materialsId, IEnumerable printingHouseOrders) {