From 1bca64b238e38368f3c333087b70afe678b16577 Mon Sep 17 00:00:00 2001 From: grishazagidulin Date: Sun, 15 Dec 2024 22:19:14 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82,=20=D0=BA?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D1=80=D0=BE=D0=B3=D0=BE=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D0=B1=D1=83=D0=B4=D0=B5=D1=82=20=D0=B2=20=D1=84=D0=B8=D0=BD?= =?UTF-8?q?=D0=B0=D0=BB=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Workshop/Entities/Master.cs | 6 ++++++ Workshop/Entities/Material.cs | 4 ++++ Workshop/Entities/Product.cs | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/Workshop/Entities/Master.cs b/Workshop/Entities/Master.cs index e1d13fb..2d8d14c 100644 --- a/Workshop/Entities/Master.cs +++ b/Workshop/Entities/Master.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -10,10 +11,15 @@ namespace Workshop.Entities; public class Master { public int Id { get; private set; } + [DisplayName("Имя")] public string Name { get; private set; } = string.Empty; + [DisplayName("Фамилия")] public string LastName { get; private set; } = string.Empty; + [DisplayName("Возраст")] public int Age { get; private set; } + [DisplayName("Должность")] public MasterPosition Position { get; private set; } + public string fullName => $"{Name} {LastName}"; public static Master CreateEntity(int id, string name, string lastName, int age, MasterPosition position) { diff --git a/Workshop/Entities/Material.cs b/Workshop/Entities/Material.cs index b67a045..c4c7dcc 100644 --- a/Workshop/Entities/Material.cs +++ b/Workshop/Entities/Material.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -9,8 +10,11 @@ namespace Workshop.Entities; public class Material { public int Id { get; private set; } + [DisplayName("Название")] public string Name { get; private set; } = string.Empty; + [DisplayName("Количество на складе")] public int WarehouseAmount { get; private set; } + [DisplayName("Цена")] public double Price { get; private set; } public static Material CreateEntity(int id, string name, int warehouseAmount, double price) { diff --git a/Workshop/Entities/Product.cs b/Workshop/Entities/Product.cs index 2357be0..4f80692 100644 --- a/Workshop/Entities/Product.cs +++ b/Workshop/Entities/Product.cs @@ -1,14 +1,20 @@ using System; +using System.ComponentModel; using Workshop.Entities; using Workshop.Entities.Enums; public class Product { public int Id { get; private set; } + [DisplayName("Название")] public string Name { get; private set; } = string.Empty; + [DisplayName("Цена")] public double Price { get; private set; } + [DisplayName("Количество на складе")] public int WarehouseAmount { get; private set; } + [DisplayName("Категория")] public ProductCategory Category { get; private set; } + [DisplayName("Материалы")] public IEnumerable Materials { get; private set; } = []; public static Product CreateEntity(int id, string name, double price, int warehouseAmount, ProductCategory category, IEnumerable materials)