Добавлен атрибут Column для полей моделей

SecuritySystem/SecuritySystemContracts/Attributes/ColumnAttribute.cs

@@ -0,0 +1,21 @@
+namespace SecuritySystemContracts.Attributes
+{
+    [AttributeUsage(AttributeTargets.Property)]
+    public class ColumnAttribute : Attribute
+    {
+        public ColumnAttribute(string title = "", bool visible = true, int width = 0,
+            GridViewAutoSize gridViewAutoSize = GridViewAutoSize.None, bool isUseAutoSize = false)
+        {
+            Title = title;
+            Visible = visible;
+            Width = width;
+            GridViewAutoSize = gridViewAutoSize;
+            IsUseAutoSize = isUseAutoSize;
+        }
+        public string Title { get; private set; }
+        public bool Visible { get; private set; }
+        public int Width { get; private set; }
+        public GridViewAutoSize GridViewAutoSize { get; private set; }
+        public bool IsUseAutoSize { get; private set; }
+    }
+}

SecuritySystem/SecuritySystemContracts/Attributes/GridViewAutoSize.cs

@@ -0,0 +1,14 @@
+namespace SecuritySystemContracts.Attributes
+{
+    public enum GridViewAutoSize
+    {
+        NotSet = 0,
+        None = 1,
+        ColumnHeader = 2,
+        AllCellsExceptHeader = 4,
+        AllCells = 6,
+        DisplayedCellsExceptHeader = 8,
+        DisplayedCells = 10,
+        Fill = 16
+    }
+}

SecuritySystem/SecuritySystemContracts/SecuritySystemContracts.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>

SecuritySystem/SecuritySystemContracts/ViewModels/ClientViewModel.cs

@@ -1,16 +1,18 @@
-using SecuritySystemDataModels.Models;
+using SecuritySystemContracts.Attributes;
+using SecuritySystemDataModels.Models;
 using System.ComponentModel;
 
 namespace SecuritySystemContracts.ViewModels
 {
     public class ClientViewModel : IClientModel
     {
+        [Column(visible: false)]
         public int Id { get; set; }
-        [DisplayName("ФИО клиента")]
+        [Column(title: "ФИО клиента", width: 150)]
         public string ClientFIO { get; set; } = string.Empty;
-        [DisplayName("Логин (эл. почта)")]
+        [Column(title: "Логин (эл. почта)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
         public string Email { get; set; } = string.Empty;
-        [DisplayName("Пароль")]
+        [Column(title: "Пароль", width: 150)]
         public string Password { get; set; } = string.Empty;
     }
 }

SecuritySystem/SecuritySystemContracts/ViewModels/ComponentViewModel.cs

@@ -1,14 +1,16 @@
-using SecuritySystemDataModels.Models;
+using SecuritySystemContracts.Attributes;
+using SecuritySystemDataModels.Models;
 using System.ComponentModel;
 
 namespace SecuritySystemContracts.ViewModels
 {
     public class ComponentViewModel : IComponentModel
     {
+        [Column(visible: false)]
         public int Id { get; set; }
-        [DisplayName("Название компонента")]
+        [Column(title: "Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
         public string ComponentName { get; set; } = string.Empty;
-        [DisplayName("Цена")]
+        [Column(title: "Цена", width: 150)]
         public double Cost { get; set; }
     }
 }

SecuritySystem/SecuritySystemContracts/ViewModels/ImplementerViewModel.cs

@@ -1,18 +1,20 @@
-using SecuritySystemDataModels.Models;
+using SecuritySystemContracts.Attributes;
+using SecuritySystemDataModels.Models;
 using System.ComponentModel;
 
 namespace SecuritySystemContracts.ViewModels
 {
     public class ImplementerViewModel : IImplementerModel
     {
-        [DisplayName("ФИО сотрудника")]
-        public string ImplementerFIO { get; set; } = string.Empty;
-        [DisplayName("Пароль")]
-        public string Password { get; set; } = string.Empty;
-        [DisplayName("Опыт работы")]
-        public int WorkExperience { get; set; }
-        [DisplayName("Квалификация")]
-        public int Qualification { get; set; }
+        [Column(visible: false)]
         public int Id { get; set; }
+        [Column(title: "ФИО сотрудника", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        public string ImplementerFIO { get; set; } = string.Empty;
+        [Column(title: "Пароль", width: 100)]
+        public string Password { get; set; } = string.Empty;
+        [Column(title: "Опыт работы", width: 50)]
+        public int WorkExperience { get; set; }
+        [Column(title: "Квалификация", width: 50)]
+        public int Qualification { get; set; }
     }
 }

SecuritySystem/SecuritySystemContracts/ViewModels/MessageInfoViewModel.cs

@@ -1,20 +1,22 @@
-using SecuritySystemDataModels.Models;
+using SecuritySystemContracts.Attributes;
+using SecuritySystemDataModels.Models;
 using System.ComponentModel;
 
 namespace SecuritySystemContracts.ViewModels
 {
     public class MessageInfoViewModel : IMessageInfoModel
     {
-        [DisplayName("Идентификатор")]
+        [Column(visible: false)]
         public string MessageId { get; set; } = string.Empty;
+        [Column(visible: false)]
         public int? ClientId { get; set; } = null;
-        [DisplayName("Отправитель")]
+        [Column(title: "Отправитель", width: 200)]
         public string SenderName { get; set; } = string.Empty;
-        [DisplayName("Дата получения")]
+        [Column(title: "Дата получения", width: 50)]
         public DateTime DateDelivery { get; set; } = DateTime.Now;
-        [DisplayName("Тема")]
+        [Column(title: "Тема", width: 200)]
         public string Subject { get; set; } = string.Empty;
-        [DisplayName("Текст")]
+        [Column(title: "Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
         public string Body { get; set; } = string.Empty;
     }
 }

SecuritySystem/SecuritySystemContracts/ViewModels/OrderViewModel.cs

@@ -1,4 +1,5 @@
-using SecuritySystemDataModels.Enums;
+using SecuritySystemContracts.Attributes;
+using SecuritySystemDataModels.Enums;
 using SecuritySystemDataModels.Models;
 using System.ComponentModel;
 
@@ -6,26 +7,29 @@ namespace SecuritySystemContracts.ViewModels
 {
     public class OrderViewModel : IOrderModel
     {
-        [DisplayName("Номер")]
+        [Column(title: "Номер", gridViewAutoSize: GridViewAutoSize.ColumnHeader, isUseAutoSize: true)]
         public int Id { get; set; }
+        [Column(visible: false)]
         public int ClientId { get; set; }
+        [Column(visible: false)]
         public int SecureId { get; set; }
+        [Column(visible: false)]
         public int? ImplementerId { get; set; }
-        [DisplayName("ФИО работника")]
+        [Column(title: "ФИО работника", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
         public string ImplementerFIO { get; set; } = string.Empty;
-        [DisplayName("ФИО клиента")]
+        [Column(title: "ФИО клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
         public string ClientFIO { get; set; } = string.Empty;
-        [DisplayName("Изделие")]
+        [Column(title: "Изделие", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
         public string SecureName { get; set; } = string.Empty;
-        [DisplayName("Количество")]
+        [Column(title: "Количество", gridViewAutoSize: GridViewAutoSize.ColumnHeader, isUseAutoSize: true)]
         public int Count { get; set; }
-        [DisplayName("Сумма")]
+        [Column(title: "Сумма", width: 40)]
         public double Sum { get; set; }
-        [DisplayName("Статус")]
+        [Column(title: "Статус", gridViewAutoSize: GridViewAutoSize.ColumnHeader, isUseAutoSize: true)]
         public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
-        [DisplayName("Дата создания")]
+        [Column(title: "Дата создания", gridViewAutoSize: GridViewAutoSize.ColumnHeader, isUseAutoSize: true)]
         public DateTime DateCreate { get; set; } = DateTime.Now;
-        [DisplayName("Дата выполнения")]
+        [Column(title: "Дата выполнения", gridViewAutoSize: GridViewAutoSize.ColumnHeader, isUseAutoSize: true)]
         public DateTime? DateImplement { get; set; }
     }
 }

SecuritySystem/SecuritySystemContracts/ViewModels/SecureViewModel.cs

@@ -1,15 +1,18 @@
-using SecuritySystemDataModels.Models;
+using SecuritySystemContracts.Attributes;
+using SecuritySystemDataModels.Models;
 using System.ComponentModel;
 
 namespace SecuritySystemContracts.ViewModels
 {
     public class SecureViewModel : ISecureModel
     {
+        [Column(visible: false)]
         public int Id { get; set; }
-        [DisplayName("Название изделия")]
+        [Column(title: "Название изделия", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
         public string SecureName { get; set; } = string.Empty;
-        [DisplayName("Цена")]
+        [Column(title: "Цена", width: 50)]
         public double Price { get; set; }
+        [Column(visible: false)]
         public Dictionary<int, (IComponentModel, int)> SecureComponents { get; set; } = new();
     }
 }

SecuritySystem/SecuritySystemView/Client/FormClients.cs

@@ -23,15 +23,7 @@ namespace SecuritySystemView.Client
         {
             try
             {
-                var list = _logic.ReadList(null);
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader;
-                    dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    dataGridView.Columns["Email"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    dataGridView.Columns["Email"].FillWeight = 50;
-                }
+                dataGridView.FillandConfigGrid(_logic.ReadList(null));
                 _logger.LogInformation("Загрузка клиентов");
             }
             catch (Exception ex)

SecuritySystem/SecuritySystemView/Component/FormComponents.cs

@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Logging;
 using SecuritySystemContracts.BindingModels;
 using SecuritySystemContracts.BusinessLogicsContracts;
+using System.Windows.Forms;
 
 namespace SecuritySystemView
 {
@@ -22,11 +23,7 @@ namespace SecuritySystemView
         {
             try
             {
-                var list = _logic.ReadList(null);
-                if (list != null)
-                {
-                    dataGridViewComponents.DataSource = list;
-                }
+                dataGridViewComponents.FillandConfigGrid(_logic.ReadList(null));
                 _logger.LogInformation("Загрузка компонентов");
             }
             catch (Exception ex)

SecuritySystem/SecuritySystemView/DataGridViewExtension.cs

@@ -0,0 +1,45 @@
+using SecuritySystemContracts.Attributes;
+
+namespace SecuritySystemView
+{
+    public static class DataGridViewExtension
+    {
+        public static void FillandConfigGrid<T>(this DataGridView grid, List<T>? data)
+        {
+            if (data == null)
+            {
+                return;
+            }
+            grid.DataSource = data;
+            var type = typeof(T);
+            var properties = type.GetProperties();
+            foreach (DataGridViewColumn column in grid.Columns)
+            {
+                var property = properties.FirstOrDefault(x => x.Name == column.Name);
+                if (property == null)
+                {
+                    throw new InvalidOperationException($"В типе {type.Name} не найдено свойство с именем {column.Name}");
+                }
+                var attribute = property.GetCustomAttributes(typeof(ColumnAttribute), true)?.SingleOrDefault();
+                if (attribute == null)
+                {
+                    throw new InvalidOperationException($"Не найден атрибут типа ColumnAttribute для свойства {property.Name}");
+                }
+                if (attribute is ColumnAttribute columnAttr)
+                {
+                    column.HeaderText = columnAttr.Title;
+                    column.Visible = columnAttr.Visible;
+                    if (columnAttr.IsUseAutoSize)
+                    {
+                        column.AutoSizeMode = (DataGridViewAutoSizeColumnMode)Enum.Parse(typeof(DataGridViewAutoSizeColumnMode), columnAttr.GridViewAutoSize.ToString());
+                    }
+                    else
+                    {
+                        column.Width = columnAttr.Width;
+                    }
+                }
+            }
+        }
+    }
+
+}

SecuritySystem/SecuritySystemView/FormMain.cs

@@ -28,30 +28,9 @@ namespace SecuritySystemView
         }
         private void LoadData()
         {
-            _logger.LogInformation("Загрузка заказов");
             try
             {
-                var list = _orderLogic.ReadList(null);
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["SecureId"].Visible = false;
-                    dataGridView.Columns["ClientId"].Visible = false;
-                    dataGridView.Columns["ImplementerId"].Visible = false;
-                    dataGridView.Columns["Count"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader;
-                    dataGridView.Columns["Count"].HeaderText = "Кол-во";
-                    dataGridView.Columns["Count"].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight;
-                    dataGridView.Columns["Sum"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader;
-                    dataGridView.Columns["Sum"].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight;
-                    dataGridView.Columns["Id"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader;
-                    dataGridView.Columns["Status"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader;
-                    dataGridView.Columns["Status"].HeaderText = "Статус заказа";
-                    dataGridView.Columns["DateCreate"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader;
-                    dataGridView.Columns["DateImplement"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader;
-                    dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    dataGridView.Columns["SecureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                }
+                dataGridView.FillandConfigGrid(_orderLogic.ReadList(null));
                 _logger.LogInformation("Загрузка заказов");
             }
             catch (Exception ex)

SecuritySystem/SecuritySystemView/Implementer/FormImplementers.cs

@@ -22,15 +22,7 @@ namespace SecuritySystemView.Implementer
         {
             try
             {
-                var list = _logic.ReadList(null);
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].Visible = false;
-                    dataGridView.Columns["WorkExperience"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader;
-                    dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    dataGridView.Columns["Qualification"].AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader;
-                }
+                dataGridView.FillandConfigGrid(_logic.ReadList(null));
                 _logger.LogInformation("Загрузка исполнителей");
             }
             catch (Exception ex)

SecuritySystem/SecuritySystemView/Mail/FormMails.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Logging;
+using SecuritySystemBusinessLogic.BusinessLogics;
 using SecuritySystemContracts.BusinessLogicsContracts;
 
 namespace SecuritySystemView.Mail
@@ -22,13 +23,7 @@ namespace SecuritySystemView.Mail
         {
             try
             {
-                var list = _logic.ReadList(null);
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["MessageId"].Visible = false;
-                    dataGridView.Columns["ClientId"].Visible = false;
-                }
+                dataGridView.FillandConfigGrid(_logic.ReadList(null));
                 _logger.LogInformation("Загрузка почты");
             }
             catch (Exception ex)

SecuritySystem/SecuritySystemView/Secure/FormSecures.cs

@@ -22,14 +22,7 @@ namespace SecuritySystemView
         {
             try
             {
-                var list = _logic.ReadList(null);
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].Visible = false;
-                    dataGridView.Columns["SecureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    dataGridView.Columns["SecureComponents"].Visible = false;
-                }
+                dataGridView.FillandConfigGrid(_logic.ReadList(null));
                 _logger.LogInformation("Загрузка изделий");
             }
             catch (Exception ex)