From ac67eff2425d3263aa9f346793e7be1633272737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=B3=D0=BE=D1=80?= <shtyrkinegor@gmail.com>
Date: Mon, 9 Dec 2024 10:18:42 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=20=E2=84=964=20(1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FurnitureCompany/FurnitureCompany/Entities/Client.cs   |  7 +++++++
 FurnitureCompany/FurnitureCompany/Entities/Product.cs  |  4 ++++
 FurnitureCompany/FurnitureCompany/Entities/Worker.cs   | 10 +++++++++-
 .../FurnitureCompany/Forms/FormDelivery.cs             |  2 +-
 FurnitureCompany/FurnitureCompany/Forms/FormInvoice.cs |  4 ++--
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/FurnitureCompany/FurnitureCompany/Entities/Client.cs b/FurnitureCompany/FurnitureCompany/Entities/Client.cs
index cd724c5..ed4c5d2 100644
--- a/FurnitureCompany/FurnitureCompany/Entities/Client.cs
+++ b/FurnitureCompany/FurnitureCompany/Entities/Client.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,12 +11,18 @@ public class Client
 {
     public int Id { get; private set; }
 
+    [DisplayName("Имя")]
     public string Name { get; private set; } = string.Empty;
 
+    [DisplayName("Адрес")]
     public string Address { get; private set; } = string.Empty;
 
+    public string Info => $"{Name} {Address}";
+
+    [DisplayName("Возраст")]
     public int Age { get; private set; }
 
+    [DisplayName("Заработок")]
     public double Earnings { get; private set; }
 
     public static Client CreateEntity(int id, string name, string address, int age, double earnings)
diff --git a/FurnitureCompany/FurnitureCompany/Entities/Product.cs b/FurnitureCompany/FurnitureCompany/Entities/Product.cs
index 32e8e6c..855ba02 100644
--- a/FurnitureCompany/FurnitureCompany/Entities/Product.cs
+++ b/FurnitureCompany/FurnitureCompany/Entities/Product.cs
@@ -1,6 +1,7 @@
 using FurnitureCompany.Entities.Enums;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -11,10 +12,13 @@ public class Product
 {
     public int Id { get; private set; }
 
+    [DisplayName("Название")]
     public string Name { get; private set; } = string.Empty;
 
+    [DisplayName("Метариал изделия")]
     public Material Material { get; private set; }
 
+    [DisplayName("Цена")]
     public double Price { get; private set; }
 
     public static Product CreateEntity(int id, Material material, string name, double price)
diff --git a/FurnitureCompany/FurnitureCompany/Entities/Worker.cs b/FurnitureCompany/FurnitureCompany/Entities/Worker.cs
index f1ccc7c..28db0a5 100644
--- a/FurnitureCompany/FurnitureCompany/Entities/Worker.cs
+++ b/FurnitureCompany/FurnitureCompany/Entities/Worker.cs
@@ -1,6 +1,9 @@
-using FurnitureCompany.Entities.Enums;
+using DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing;
+using DocumentFormat.OpenXml.Wordprocessing;
+using FurnitureCompany.Entities.Enums;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -11,10 +14,15 @@ public class Worker
 {
     public int Id { get; private set; }
 
+    [DisplayName("Имя")]
     public string FirstName { get; private set; } = string.Empty;
 
+    [DisplayName("Фамилия")]
     public string LastName { get; private set; } = string.Empty;
 
+    public string FullName => $"{FirstName} {LastName}";
+
+    [DisplayName("Уровень опыта")]
     public WorkerPost WorkerPost { get; private set; }
 
     public static Worker CreateEntity(int id, string firstName, string lastName, WorkerPost workerPost)
diff --git a/FurnitureCompany/FurnitureCompany/Forms/FormDelivery.cs b/FurnitureCompany/FurnitureCompany/Forms/FormDelivery.cs
index 70663e1..d312af9 100644
--- a/FurnitureCompany/FurnitureCompany/Forms/FormDelivery.cs
+++ b/FurnitureCompany/FurnitureCompany/Forms/FormDelivery.cs
@@ -26,7 +26,7 @@ namespace FurnitureCompany.Forms
                 throw new ArgumentNullException(nameof(deliveryRepository));
 
             comboBoxWorker.DataSource = workerRepository.ReadWorkers();
-            comboBoxWorker.DisplayMember = "FirstName";
+            comboBoxWorker.DisplayMember = "FullName";
             comboBoxWorker.ValueMember = "Id";
 
             ColumnProduct.DataSource = productRepository.ReadProducts();
diff --git a/FurnitureCompany/FurnitureCompany/Forms/FormInvoice.cs b/FurnitureCompany/FurnitureCompany/Forms/FormInvoice.cs
index 9e49f71..d7001de 100644
--- a/FurnitureCompany/FurnitureCompany/Forms/FormInvoice.cs
+++ b/FurnitureCompany/FurnitureCompany/Forms/FormInvoice.cs
@@ -27,7 +27,7 @@ namespace FurnitureCompany.Forms
                 throw new ArgumentNullException(nameof(invoiceRepository));
 
             comboBoxWorker.DataSource = workerRepository.ReadWorkers();
-            comboBoxWorker.DisplayMember = "FirstName";
+            comboBoxWorker.DisplayMember = "FullName";
             comboBoxWorker.ValueMember = "Id";
 
             comboBoxProduct.DataSource = productRepository.ReadProducts();
@@ -35,7 +35,7 @@ namespace FurnitureCompany.Forms
             comboBoxProduct.ValueMember = "Id";
 
             comboBoxClient.DataSource = clientRepository.ReadClients();
-            comboBoxClient.DisplayMember = "Name";
+            comboBoxClient.DisplayMember = "Info";
             comboBoxClient.ValueMember = "Id";
         }