From 9763ab2e402afb4059d6aaebddbf435e43af8c27 Mon Sep 17 00:00:00 2001 From: Ivan Gutorov Date: Mon, 9 Dec 2024 04:20:44 +0400 Subject: [PATCH] add desplay names and set browsable for entities. have not touched other dirs --- .../Entities/Contract.cs | 17 +++++++++++++++++ .../Entities/Customer.cs | 9 ++++++++- .../Entities/CustomerExecutorReview.cs | 14 +++++++++++++- .../Entities/Executor.cs | 5 +++++ .../Entities/Service.cs | 5 ++++- .../Entities/ServiceContract.cs | 12 +++++++++++- 6 files changed, 58 insertions(+), 4 deletions(-) diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Entities/Contract.cs b/PIbd-23_Gutorov_I.A._IT-Company/Entities/Contract.cs index c56b0a1..2566b29 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Entities/Contract.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Entities/Contract.cs @@ -1,4 +1,5 @@ using PIbd_23_Gutorov_I.A._IT_Company.Entities.Enums; +using System.ComponentModel; namespace PIbd_23_Gutorov_I.A._IT_Company.Entities; @@ -6,18 +7,34 @@ public class Contract { public int Id { get; private set; } + [Browsable(false)] public int CustomerID { get; private set; } + [Browsable(false)] public int ExecutorID { get; private set; } + [DisplayName("Заказчик")] + public int CustomerName { get; private set; } + + [DisplayName("Исполнитель")] + public int ExecutorName { get; private set; } + + [DisplayName("Тип контракта")] public ContractCategory Category { get; private set; } + [DisplayName("Дата заключения")] public DateTime ConclusionDate { get; private set; } + [DisplayName("Дата окончания")] public DateTime Deadline { get; private set; } + [DisplayName("Сумма платежа")] public int PaymentAmount { get; private set; } + [DisplayName("Услуги")] + public string Service => Services != null ? string.Join(", ", Services) : string.Empty; + + [Browsable(false)] public IEnumerable Services { get; private set; } = []; public static Contract CreateEntity(int id, int customerID, int executorID, diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Entities/Customer.cs b/PIbd-23_Gutorov_I.A._IT-Company/Entities/Customer.cs index c3f26db..88c721c 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Entities/Customer.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Entities/Customer.cs @@ -1,13 +1,20 @@ -namespace PIbd_23_Gutorov_I.A._IT_Company.Entities; +using System.ComponentModel; + +namespace PIbd_23_Gutorov_I.A._IT_Company.Entities; public class Customer { public int Id { get; private set; } + [DisplayName("Имя")] public string Name { get; private set; } = string.Empty; + [DisplayName("Контакты")] public string Contact { get; private set; } = string.Empty; + public string FullName => $"{Name} {Contact}"; + + [DisplayName("Адрес")] public string Address { get; private set; } = string.Empty; public static Customer CreateEntity(int id, string name, string contact, string address) diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Entities/CustomerExecutorReview.cs b/PIbd-23_Gutorov_I.A._IT-Company/Entities/CustomerExecutorReview.cs index 1a7f114..66f5db1 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Entities/CustomerExecutorReview.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Entities/CustomerExecutorReview.cs @@ -1,15 +1,27 @@ -namespace PIbd_23_Gutorov_I.A._IT_Company.Entities; +using System.ComponentModel; + +namespace PIbd_23_Gutorov_I.A._IT_Company.Entities; public class CustomerExecutorReview { public int Id { get; private set; } + [Browsable(false)] public int CustomerId { get; private set; } + [Browsable(false)] public int ExecutorId { get; private set; } + [DisplayName("Заказчик")] + public int CustomerName { get; private set; } + + [DisplayName("Исполнитель")] + public int ExecutorName { get; private set; } + + [DisplayName("Отзыв")] public string Review { get; private set; } = string.Empty; + [DisplayName("Оценка")] public int Grade { get; private set; } public static CustomerExecutorReview CreateElement(int id, int customerId, int executorId, string review, int grade) diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Entities/Executor.cs b/PIbd-23_Gutorov_I.A._IT-Company/Entities/Executor.cs index b80579e..f2f7183 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Entities/Executor.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Entities/Executor.cs @@ -1,4 +1,5 @@ using PIbd_23_Gutorov_I.A._IT_Company.Entities.Enums; +using System.ComponentModel; namespace PIbd_23_Gutorov_I.A._IT_Company.Entities; @@ -6,10 +7,14 @@ public class Executor { public int Id { get; private set; } + [DisplayName("Имя")] public string Name { get; private set; } = string.Empty; + [DisplayName("Должность")] public ExecutorPost Post { get; private set; } + public string FullName => $"{Post} {Name}"; + public static Executor CreateEntity(int id, string name, ExecutorPost post) { return new Executor diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Entities/Service.cs b/PIbd-23_Gutorov_I.A._IT-Company/Entities/Service.cs index 76ee123..cbaa4be 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Entities/Service.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Entities/Service.cs @@ -1,9 +1,12 @@ -namespace PIbd_23_Gutorov_I.A._IT_Company.Entities; +using System.ComponentModel; + +namespace PIbd_23_Gutorov_I.A._IT_Company.Entities; public class Service { public int Id { get; private set; } + [DisplayName("Описание услуги")] public string Description { get; private set; } = string.Empty; public static Service CreateEntity(int id, string description) diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Entities/ServiceContract.cs b/PIbd-23_Gutorov_I.A._IT-Company/Entities/ServiceContract.cs index 7edd1bd..4a4c36d 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Entities/ServiceContract.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Entities/ServiceContract.cs @@ -1,13 +1,23 @@ -namespace PIbd_23_Gutorov_I.A._IT_Company.Entities; +using System.ComponentModel; + +namespace PIbd_23_Gutorov_I.A._IT_Company.Entities; public class ServiceContract { public int Id { get; private set; } + [Browsable(false)] public int ServiceId { get; private set; } + [Browsable(false)] public int ContractId { get; private set; } + [DisplayName("Заказчик")] + public int CustomerName { get; private set; } + + [DisplayName("Исполнитель")] + public int ExecutorName { get; private set; } + public static ServiceContract CreateElement(int id, int serviceId, int contractId) { return new ServiceContract