SushiBar/SushiBar/FormClients.Designer.cs

@@ -1,4 +1,5 @@
-namespace SushiBarView
+
+namespace SushiBarView
 {
     partial class FormClients
     {
@@ -29,55 +30,63 @@
         private void InitializeComponent()
         {
             dataGridView = new DataGridView();
-            buttonRefresh = new Button();
-            buttonDelete = new Button();
+            buttonDel = new Button();
+            buttonRef = new Button();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             SuspendLayout();
             // 
             // dataGridView
             // 
-            dataGridView.BackgroundColor = Color.AntiqueWhite;
+            dataGridView.AllowUserToAddRows = false;
+            dataGridView.AllowUserToDeleteRows = false;
+            dataGridView.BackgroundColor = SystemColors.ControlLightLight;
             dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             dataGridView.Dock = DockStyle.Left;
             dataGridView.Location = new Point(0, 0);
+            dataGridView.Margin = new Padding(4, 3, 4, 3);
             dataGridView.Name = "dataGridView";
+            dataGridView.ReadOnly = true;
             dataGridView.RowHeadersVisible = false;
-            dataGridView.RowHeadersWidth = 51;
             dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridView.Size = new Size(615, 450);
+            dataGridView.Size = new Size(609, 360);
             dataGridView.TabIndex = 0;
             // 
-            // buttonRefresh
+            // buttonDel
             // 
-            buttonRefresh.Location = new Point(669, 53);
-            buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(144, 54);
-            buttonRefresh.TabIndex = 1;
-            buttonRefresh.Text = "Обновить";
-            buttonRefresh.UseVisualStyleBackColor = true;
-            buttonRefresh.Click += buttonRefresh_Click;
+            buttonDel.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            buttonDel.Location = new Point(639, 14);
+            buttonDel.Margin = new Padding(4, 3, 4, 3);
+            buttonDel.Name = "buttonDel";
+            buttonDel.Size = new Size(88, 27);
+            buttonDel.TabIndex = 3;
+            buttonDel.Text = "Удалить";
+            buttonDel.UseVisualStyleBackColor = true;
+            buttonDel.Click += ButtonDel_Click;
             // 
-            // buttonDelete
+            // buttonRef
             // 
-            buttonDelete.Location = new Point(669, 160);
-            buttonDelete.Name = "buttonDelete";
-            buttonDelete.Size = new Size(144, 54);
-            buttonDelete.TabIndex = 2;
-            buttonDelete.Text = "Удалить";
-            buttonDelete.UseVisualStyleBackColor = true;
-            buttonDelete.Click += buttonDelete_Click;
+            buttonRef.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            buttonRef.Location = new Point(639, 61);
+            buttonRef.Margin = new Padding(4, 3, 4, 3);
+            buttonRef.Name = "buttonRef";
+            buttonRef.Size = new Size(88, 27);
+            buttonRef.TabIndex = 4;
+            buttonRef.Text = "Обновить";
+            buttonRef.UseVisualStyleBackColor = true;
+            buttonRef.Click += ButtonRef_Click;
             // 
             // FormClients
             // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            BackColor = Color.BurlyWood;
-            ClientSize = new Size(862, 450);
-            Controls.Add(buttonDelete);
-            Controls.Add(buttonRefresh);
+            ClientSize = new Size(761, 360);
+            Controls.Add(buttonRef);
+            Controls.Add(buttonDel);
             Controls.Add(dataGridView);
+            Margin = new Padding(4, 3, 4, 3);
             Name = "FormClients";
-            Text = "FormClients";
+            StartPosition = FormStartPosition.CenterScreen;
+            Text = "Клиенты";
             Load += FormClients_Load;
             ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
             ResumeLayout(false);
@@ -85,8 +94,8 @@
 
         #endregion
 
-        private DataGridView dataGridView;
-        private Button buttonRefresh;
-        private Button buttonDelete;
+        private System.Windows.Forms.DataGridView dataGridView;
+        private System.Windows.Forms.Button buttonDel;
+        private System.Windows.Forms.Button buttonRef;
     }
 }

SushiBar/SushiBar/FormClients.cs

@@ -1,28 +1,21 @@
 using Microsoft.Extensions.Logging;
 using SushiBarContracts.BindingModel;
 using SushiBarContracts.BusinessLogicsContracts;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+
 
 namespace SushiBarView
 {
     public partial class FormClients : Form
     {
         private readonly ILogger _logger;
-        private readonly IClientLogic _clientLogic;
+
+        private readonly IClientLogic _logic;
 
         public FormClients(ILogger<FormClients> logger, IClientLogic logic)
         {
-            _logger = logger;
-            _clientLogic = logic;
             InitializeComponent();
+            _logger = logger;
+            _logic = logic;
         }
 
         private void FormClients_Load(object sender, EventArgs e)
@@ -34,53 +27,48 @@ namespace SushiBarView
         {
             try
             {
-                var list = _clientLogic.ReadList(null);
+                var list = _logic.ReadList(null);
                 if (list != null)
                 {
                     dataGridView.DataSource = list;
                     dataGridView.Columns["Id"].Visible = false;
                     dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    _logger.LogInformation("Клиенты успешно загружены");
                 }
+                _logger.LogInformation("Загрузка клиентов");
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex.Message, "Ошибка загрузки клиентов");
-                MessageBox.Show(ex.Message, "Ошибка загрузки клиентов");
+                _logger.LogError(ex, "Ошибка загрузки клиентов");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
 
-        private void buttonDelete_Click(object sender, EventArgs e)
+        private void ButtonDel_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                if (MessageBox.Show("Вы серьезно хотите удалить клиента? :_) та за что...", "Вопрос",
-                    MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
                 {
+                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
                     try
                     {
-                        int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                        _logger.LogInformation($"Удален клиент под номером {id}");
-
-                        if (!_clientLogic.Delete(new ClientBindingModel
-                        {
-                            Id = id
-                        }))
+                        if (!_logic.Delete(new ClientBindingModel { Id = id }))
                         {
                             throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
                         }
-                        LoadData();
+                        _logger.LogInformation("Удаление клиента");
                     }
                     catch (Exception ex)
                     {
-                        MessageBox.Show(ex.Message, "Не удалось удалить клиента");
-                        _logger.LogError(ex.Message, "Не удалось удалить клиента");
+                        _logger.LogError(ex, "Ошибка удаления клиента");
+                        MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                     }
+                    LoadData();
                 }
             }
         }
 
-        private void buttonRefresh_Click(object sender, EventArgs e)
+        private void ButtonRef_Click(object sender, EventArgs e)
         {
             LoadData();
         }

SushiBar/SushiBar/FormImplementer.Designer.cs

@@ -0,0 +1,167 @@
+namespace SushiBarView
+{
+    partial class FormImplementer
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.textBoxFIO = new System.Windows.Forms.TextBox();
+            this.labelFIO = new System.Windows.Forms.Label();
+            this.textBoxPassword = new System.Windows.Forms.TextBox();
+            this.labelPassword = new System.Windows.Forms.Label();
+            this.labelWorkExperience = new System.Windows.Forms.Label();
+            this.numericUpDownWorkExperience = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDownQualification = new System.Windows.Forms.NumericUpDown();
+            this.labelQualification = new System.Windows.Forms.Label();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.buttonSave = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWorkExperience)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownQualification)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // textBoxFIO
+            // 
+            this.textBoxFIO.Location = new System.Drawing.Point(157, 12);
+            this.textBoxFIO.Name = "textBoxFIO";
+            this.textBoxFIO.Size = new System.Drawing.Size(382, 27);
+            this.textBoxFIO.TabIndex = 3;
+            // 
+            // labelFIO
+            // 
+            this.labelFIO.AutoSize = true;
+            this.labelFIO.Location = new System.Drawing.Point(12, 15);
+            this.labelFIO.Name = "labelFIO";
+            this.labelFIO.Size = new System.Drawing.Size(139, 20);
+            this.labelFIO.TabIndex = 2;
+            this.labelFIO.Text = "ФИО исполнителя:";
+            // 
+            // textBoxPassword
+            // 
+            this.textBoxPassword.Location = new System.Drawing.Point(157, 50);
+            this.textBoxPassword.Name = "textBoxPassword";
+            this.textBoxPassword.Size = new System.Drawing.Size(205, 27);
+            this.textBoxPassword.TabIndex = 5;
+            // 
+            // labelPassword
+            // 
+            this.labelPassword.AutoSize = true;
+            this.labelPassword.Location = new System.Drawing.Point(12, 53);
+            this.labelPassword.Name = "labelPassword";
+            this.labelPassword.Size = new System.Drawing.Size(65, 20);
+            this.labelPassword.TabIndex = 4;
+            this.labelPassword.Text = "Пароль:";
+            // 
+            // labelWorkExperience
+            // 
+            this.labelWorkExperience.AutoSize = true;
+            this.labelWorkExperience.Location = new System.Drawing.Point(12, 99);
+            this.labelWorkExperience.Name = "labelWorkExperience";
+            this.labelWorkExperience.Size = new System.Drawing.Size(105, 20);
+            this.labelWorkExperience.TabIndex = 6;
+            this.labelWorkExperience.Text = "Опыт работы:";
+            // 
+            // numericUpDownWorkExperience
+            // 
+            this.numericUpDownWorkExperience.Location = new System.Drawing.Point(157, 97);
+            this.numericUpDownWorkExperience.Name = "numericUpDownWorkExperience";
+            this.numericUpDownWorkExperience.Size = new System.Drawing.Size(124, 27);
+            this.numericUpDownWorkExperience.TabIndex = 8;
+            // 
+            // numericUpDownQualification
+            // 
+            this.numericUpDownQualification.Location = new System.Drawing.Point(157, 142);
+            this.numericUpDownQualification.Name = "numericUpDownQualification";
+            this.numericUpDownQualification.Size = new System.Drawing.Size(124, 27);
+            this.numericUpDownQualification.TabIndex = 10;
+            // 
+            // labelQualification
+            // 
+            this.labelQualification.AutoSize = true;
+            this.labelQualification.Location = new System.Drawing.Point(12, 144);
+            this.labelQualification.Name = "labelQualification";
+            this.labelQualification.Size = new System.Drawing.Size(114, 20);
+            this.labelQualification.TabIndex = 9;
+            this.labelQualification.Text = "Квалификация:";
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(422, 203);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(136, 40);
+            this.buttonCancel.TabIndex = 12;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+            // 
+            // buttonSave
+            // 
+            this.buttonSave.Location = new System.Drawing.Point(265, 203);
+            this.buttonSave.Name = "buttonSave";
+            this.buttonSave.Size = new System.Drawing.Size(130, 40);
+            this.buttonSave.TabIndex = 11;
+            this.buttonSave.Text = "Сохранить";
+            this.buttonSave.UseVisualStyleBackColor = true;
+            this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
+            // 
+            // FormImplementer
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(570, 255);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonSave);
+            this.Controls.Add(this.numericUpDownQualification);
+            this.Controls.Add(this.labelQualification);
+            this.Controls.Add(this.numericUpDownWorkExperience);
+            this.Controls.Add(this.labelWorkExperience);
+            this.Controls.Add(this.textBoxPassword);
+            this.Controls.Add(this.labelPassword);
+            this.Controls.Add(this.textBoxFIO);
+            this.Controls.Add(this.labelFIO);
+            this.Name = "FormImplementer";
+            this.Text = "Исполнитель";
+            this.Load += new System.EventHandler(this.FormImplementer_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWorkExperience)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownQualification)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private TextBox textBoxFIO;
+        private Label labelFIO;
+        private TextBox textBoxPassword;
+        private Label labelPassword;
+        private Label labelWorkExperience;
+        private NumericUpDown numericUpDownWorkExperience;
+        private NumericUpDown numericUpDownQualification;
+        private Label labelQualification;
+        private Button buttonCancel;
+        private Button buttonSave;
+    }
+}

SushiBar/SushiBar/FormImplementer.cs

@@ -0,0 +1,95 @@
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.SearchModels;
+using SushiBarDataModels.Models;
+
+namespace SushiBarView
+{
+    public partial class FormImplementer : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IImplementerLogic _logic;
+        private int? _id;
+        public int Id { set { _id = value; } }
+
+        public FormImplementer(ILogger<FormImplementer> logger, IImplementerLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+        }
+
+        private void FormImplementer_Load(object sender, EventArgs e)
+        {
+            if (_id.HasValue)
+            {
+                try
+                {
+                    _logger.LogInformation("Получение исполнителя");
+                    var view = _logic.ReadElement(new ImplementerSearchModel
+                    {
+                        Id = _id.Value
+                    });
+                    if (view != null)
+                    {
+                        textBoxFIO.Text = view.ImplementerFIO;
+                        textBoxPassword.Text = view.Password;
+                        numericUpDownWorkExperience.Value = view.WorkExperience;
+                        numericUpDownQualification.Value = view.Qualification;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Ошибка получения исполнителя");
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+
+        private void buttonSave_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxFIO.Text))
+            {
+                MessageBox.Show("Заполните ФИО", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (string.IsNullOrEmpty(textBoxPassword.Text))
+            {
+                MessageBox.Show("Заполните пароль", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _logger.LogInformation("Сохранение исполнителя");
+            try
+            {
+                var model = new ImplementerBindingModel
+                {
+                    Id = _id ?? 0,
+                    ImplementerFIO = textBoxFIO.Text,
+                    Password = textBoxPassword.Text,
+                    WorkExperience = (int)numericUpDownWorkExperience.Value,
+                    Qualification = (int)numericUpDownQualification.Value
+                };
+                var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
+                if (!operationResult)
+                {
+                    throw new Exception("Ошибка при создании или обновлении. Дополнительная информация в логах.");
+                }
+                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                DialogResult = DialogResult.OK;
+                Close();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка сохранения исполнителя");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void buttonCancel_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+    }
+}

SushiBar/SushiBar/FormImplementer.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

SushiBar/SushiBar/FormImplementers.Designer.cs

@@ -0,0 +1,130 @@
+namespace SushiBarView
+{
+    partial class FormImplementers
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.ToolsPanel = new System.Windows.Forms.Panel();
+            this.buttonRef = new System.Windows.Forms.Button();
+            this.buttonDel = new System.Windows.Forms.Button();
+            this.buttonUpd = new System.Windows.Forms.Button();
+            this.buttonAdd = new System.Windows.Forms.Button();
+            this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.ToolsPanel.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // ToolsPanel
+            // 
+            this.ToolsPanel.Controls.Add(this.buttonRef);
+            this.ToolsPanel.Controls.Add(this.buttonDel);
+            this.ToolsPanel.Controls.Add(this.buttonUpd);
+            this.ToolsPanel.Controls.Add(this.buttonAdd);
+            this.ToolsPanel.Location = new System.Drawing.Point(608, 12);
+            this.ToolsPanel.Name = "ToolsPanel";
+            this.ToolsPanel.Size = new System.Drawing.Size(180, 426);
+            this.ToolsPanel.TabIndex = 3;
+            // 
+            // buttonRef
+            // 
+            this.buttonRef.Location = new System.Drawing.Point(31, 206);
+            this.buttonRef.Name = "buttonRef";
+            this.buttonRef.Size = new System.Drawing.Size(126, 36);
+            this.buttonRef.TabIndex = 3;
+            this.buttonRef.Text = "Обновить";
+            this.buttonRef.UseVisualStyleBackColor = true;
+            this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click);
+            // 
+            // buttonDel
+            // 
+            this.buttonDel.Location = new System.Drawing.Point(31, 142);
+            this.buttonDel.Name = "buttonDel";
+            this.buttonDel.Size = new System.Drawing.Size(126, 36);
+            this.buttonDel.TabIndex = 2;
+            this.buttonDel.Text = "Удалить";
+            this.buttonDel.UseVisualStyleBackColor = true;
+            this.buttonDel.Click += new System.EventHandler(this.buttonDel_Click);
+            // 
+            // buttonUpd
+            // 
+            this.buttonUpd.Location = new System.Drawing.Point(31, 76);
+            this.buttonUpd.Name = "buttonUpd";
+            this.buttonUpd.Size = new System.Drawing.Size(126, 36);
+            this.buttonUpd.TabIndex = 1;
+            this.buttonUpd.Text = "Изменить";
+            this.buttonUpd.UseVisualStyleBackColor = true;
+            this.buttonUpd.Click += new System.EventHandler(this.buttonUpd_Click);
+            // 
+            // buttonAdd
+            // 
+            this.buttonAdd.Location = new System.Drawing.Point(31, 16);
+            this.buttonAdd.Name = "buttonAdd";
+            this.buttonAdd.Size = new System.Drawing.Size(126, 36);
+            this.buttonAdd.TabIndex = 0;
+            this.buttonAdd.Text = "Добавить";
+            this.buttonAdd.UseVisualStyleBackColor = true;
+            this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click);
+            // 
+            // dataGridView
+            // 
+            this.dataGridView.AllowUserToAddRows = false;
+            this.dataGridView.AllowUserToDeleteRows = false;
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Location = new System.Drawing.Point(12, 12);
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.ReadOnly = true;
+            this.dataGridView.RowHeadersWidth = 51;
+            this.dataGridView.RowTemplate.Height = 29;
+            this.dataGridView.Size = new System.Drawing.Size(590, 426);
+            this.dataGridView.TabIndex = 2;
+            // 
+            // FormImplementers
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.ToolsPanel);
+            this.Controls.Add(this.dataGridView);
+            this.Name = "FormImplementers";
+            this.Text = "Исполнители";
+            this.Load += new System.EventHandler(this.FormImplementers_Load);
+            this.ToolsPanel.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private Panel ToolsPanel;
+        private Button buttonRef;
+        private Button buttonDel;
+        private Button buttonUpd;
+        private Button buttonAdd;
+        private DataGridView dataGridView;
+    }
+}

SushiBar/SushiBar/FormImplementers.cs

@@ -0,0 +1,108 @@
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+
+namespace SushiBarView
+{
+    public partial class FormImplementers : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IImplementerLogic _logic;
+
+        public FormImplementers(ILogger<FormImplementers> logger, IImplementerLogic implementerLogic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = implementerLogic;
+        }
+
+        private void LoadData()
+        {
+            try
+            {
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["ImplementerFIO"].AutoSizeMode =
+                    DataGridViewAutoSizeColumnMode.Fill;
+                }
+                _logger.LogInformation("Загрузка исполнителей");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки исполнителей");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+                MessageBoxIcon.Error);
+            }
+        }
+
+        private void FormImplementers_Load(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+
+        private void buttonAdd_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+            if (service is FormImplementer form)
+            {
+                if (form.ShowDialog() == DialogResult.OK)
+                {
+                    LoadData();
+                }
+            }
+        }
+
+        private void buttonUpd_Click(object sender, EventArgs e)
+        {
+            if (dataGridView.SelectedRows.Count == 1)
+            {
+                var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+                if (service is FormImplementer form)
+                {
+                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        LoadData();
+                    }
+                }
+            }
+        }
+
+        private void buttonDel_Click(object sender, EventArgs e)
+        {
+            if (dataGridView.SelectedRows.Count == 1)
+            {
+                if (MessageBox.Show("Удалить запись?", "Вопрос",
+                MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                {
+                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    _logger.LogInformation("Удаление исполнителя");
+                    try
+                    {
+                        if (!_logic.Delete(new ImplementerBindingModel
+                        {
+                            Id = id
+                        }))
+                        {
+                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
+                        }
+                        LoadData();
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogError(ex, "Ошибка удаления исполнителя");
+                        MessageBox.Show(ex.Message, "Ошибка",
+                        MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    }
+                }
+            }
+        }
+        private void buttonRef_Click(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+    }
+}

SushiBar/SushiBar/FormImplementers.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

SushiBar/SushiBar/FormMain.Designer.cs

@@ -32,11 +32,13 @@
             справочникиToolStripMenuItem = new ToolStripMenuItem();
             ингредиентыToolStripMenuItem = new ToolStripMenuItem();
             сушиToolStripMenuItem = new ToolStripMenuItem();
+            клиентыToolStripMenuItem = new ToolStripMenuItem();
+            исполнителиToolStripMenuItem = new ToolStripMenuItem();
+            начатьРаботуToolStripMenuItem = new ToolStripMenuItem();
             отчетыToolStripMenuItem = new ToolStripMenuItem();
             списокСушиToolStripMenuItem = new ToolStripMenuItem();
             сушиСИнгредиентамиToolStripMenuItem = new ToolStripMenuItem();
             списокЗаказовToolStripMenuItem = new ToolStripMenuItem();
-            клиентыToolStripMenuItem = new ToolStripMenuItem();
             buttonUpdate = new Button();
             buttonSetToFinish = new Button();
             buttonSetToDone = new Button();
@@ -49,7 +51,7 @@
             // 
             // menuStrip
             // 
-            menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, клиентыToolStripMenuItem });
+            menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem });
             menuStrip.Location = new Point(0, 0);
             menuStrip.Name = "menuStrip";
             menuStrip.Size = new Size(1112, 24);
@@ -58,7 +60,7 @@
             // 
             // справочникиToolStripMenuItem
             // 
-            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ингредиентыToolStripMenuItem, сушиToolStripMenuItem });
+            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ингредиентыToolStripMenuItem, сушиToolStripMenuItem, клиентыToolStripMenuItem, исполнителиToolStripMenuItem, начатьРаботуToolStripMenuItem });
             справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
             справочникиToolStripMenuItem.Size = new Size(94, 20);
             справочникиToolStripMenuItem.Text = "Справочники";
@@ -66,17 +68,38 @@
             // ингредиентыToolStripMenuItem
             // 
             ингредиентыToolStripMenuItem.Name = "ингредиентыToolStripMenuItem";
-            ингредиентыToolStripMenuItem.Size = new Size(148, 22);
+            ингредиентыToolStripMenuItem.Size = new Size(180, 22);
             ингредиентыToolStripMenuItem.Text = "Ингредиенты";
             ингредиентыToolStripMenuItem.Click += IngredientsToolStripMenuItem_Click;
             // 
             // сушиToolStripMenuItem
             // 
             сушиToolStripMenuItem.Name = "сушиToolStripMenuItem";
-            сушиToolStripMenuItem.Size = new Size(148, 22);
+            сушиToolStripMenuItem.Size = new Size(180, 22);
             сушиToolStripMenuItem.Text = "Суши";
             сушиToolStripMenuItem.Click += SushiToolStripMenuItem_Click;
             // 
+            // клиентыToolStripMenuItem
+            // 
+            клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
+            клиентыToolStripMenuItem.Size = new Size(180, 22);
+            клиентыToolStripMenuItem.Text = "Клиенты";
+            клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click;
+            // 
+            // исполнителиToolStripMenuItem
+            // 
+            исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
+            исполнителиToolStripMenuItem.Size = new Size(180, 22);
+            исполнителиToolStripMenuItem.Text = "Исполнители";
+            исполнителиToolStripMenuItem.Click += employersToolStripMenuItem_Click;
+            // 
+            // начатьРаботуToolStripMenuItem
+            // 
+            начатьРаботуToolStripMenuItem.Name = "начатьРаботуToolStripMenuItem";
+            начатьРаботуToolStripMenuItem.Size = new Size(180, 22);
+            начатьРаботуToolStripMenuItem.Text = "Начать работу";
+            начатьРаботуToolStripMenuItem.Click += startWorkToolStripMenuItem_Click;
+            // 
             // отчетыToolStripMenuItem
             // 
             отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокСушиToolStripMenuItem, сушиСИнгредиентамиToolStripMenuItem, списокЗаказовToolStripMenuItem });
@@ -105,13 +128,6 @@
             списокЗаказовToolStripMenuItem.Text = "Список заказов";
             списокЗаказовToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
             // 
-            // клиентыToolStripMenuItem
-            // 
-            клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
-            клиентыToolStripMenuItem.Size = new Size(67, 20);
-            клиентыToolStripMenuItem.Text = "Клиенты";
-            клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click;
-            // 
             // buttonUpdate
             // 
             buttonUpdate.Anchor = AnchorStyles.Top | AnchorStyles.Right;
@@ -224,5 +240,7 @@
         private ToolStripMenuItem сушиСИнгредиентамиToolStripMenuItem;
         private ToolStripMenuItem списокЗаказовToolStripMenuItem;
         private ToolStripMenuItem клиентыToolStripMenuItem;
+        private ToolStripMenuItem исполнителиToolStripMenuItem;
+        private ToolStripMenuItem начатьРаботуToolStripMenuItem;
     }
 }

SushiBar/SushiBar/FormMain.cs

@@ -9,13 +9,16 @@ namespace SushiBarView
         private readonly ILogger _logger;
         private readonly IOrderLogic _orderLogic;
         private readonly IReportLogic _reportLogic;
+        private readonly IWorkProcess _workProcess;
 
-        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic)
+        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
         {
             InitializeComponent();
             _logger = logger;
             _orderLogic = orderLogic;
             _reportLogic = reportLogic;
+            _workProcess = workProcess;
+            _workProcess = workProcess;
         }
         private void FormMain_Load(object sender, EventArgs e)
         {
@@ -31,6 +34,7 @@ namespace SushiBarView
                 {
                     dataGridView.DataSource = list;
                     dataGridView.Columns["SushiId"].Visible = false;
+                    dataGridView.Columns["Implementerid"].Visible=false;
                 }
                 _logger.LogInformation("Загрузка заказов");
             }
@@ -181,5 +185,19 @@ namespace SushiBarView
                 form.ShowDialog();
             }
         }
+        private void employersToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
+            if (service is FormImplementers form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void startWorkToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
+            MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+        }
     }
 }

SushiBar/SushiBar/Program.cs

@@ -43,13 +43,15 @@ namespace SushiBarView
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<ISushiStorage, SushiStorage>();
             services.AddTransient<IClientStorage, ClientStorage>();
+            services.AddTransient<IImplementerStorage, ImplementerStorage>();
 
             services.AddTransient<IIngredientLogic, IngredientLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<ISushiLogic, SushiLogic>();
             services.AddTransient<IClientLogic, ClientLogic>();
             services.AddTransient<IReportLogic, ReportLogic>();
-
+            services.AddTransient<IImplementerLogic, ImplementerLogic>();
+            services.AddTransient<IWorkProcess, WorkModeling>();
 
             services.AddTransient<FormMain>();
             services.AddTransient<FormIngredient>();
@@ -60,9 +62,11 @@ namespace SushiBarView
             services.AddTransient<FormListSushi>();
             services.AddTransient<FormClients>();
             services.AddTransient<FormReportSushiIngredients>();
-            services.AddTransient<FormReportOrders>();
+            services.AddTransient<FormReportOrders>(); 
+            services.AddTransient<FormImplementers>();
+            services.AddTransient<FormImplementer>();
+
 
-            
             services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
             services.AddTransient<AbstractSaveToWord, SaveToWord>();
             services.AddTransient<AbstractSaveToPdf, SaveToPdf>();

SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs

@@ -8,25 +8,30 @@ namespace SushiBarContracts.ViewModels
     {
         [DisplayName("Номер")]
         public int Id { get; set; }
-        public int ClientId { get; set; }
-        [DisplayName("Имя клиента")]
-        public string ClientFIO { get; set; } = string.Empty;
         public int? ImplementerId { get; set; }
         [DisplayName("Исполнитель")]
         public string? ImplementerFIO { get; set; } = null;
         public int SushiId { get; set; }
-        
-        [DisplayName("Суши")]
+        public int ClientId { get; set; }
+
+        [DisplayName("ФИО клиента")]
+        public string ClientFIO { get; set; } = string.Empty;
+
+        [DisplayName("Изделие")]
         public string SushiName { get; set; } = string.Empty;
 
         [DisplayName("Количество")]
         public int Count { get; set; }
+
         [DisplayName("Сумма")]
         public double Sum { get; set; }
+
         [DisplayName("Статус")]
         public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
+
         [DisplayName("Дата создания")]
         public DateTime DateCreate { get; set; } = DateTime.Now;
+
         [DisplayName("Дата выполнения")]
         public DateTime? DateImplement { get; set; }
     }

SushiBar/SushiBarDataModels/Models/IOrderModel.cs

@@ -11,5 +11,6 @@ namespace SushiBarDataModels.Models
         OrderStatus Status { get; }
         DateTime DateCreate { get; }
         DateTime? DateImplement { get; }
+        int? ImplementerId { get; }
     }
 }

SushiBar/SushiBarDatabaseImplement/Models/Order.cs

@@ -61,20 +61,26 @@ namespace SushiBarDatabaseImplement.Models
             Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null;
         }
 
-        public OrderViewModel GetViewModel => new()
+        public OrderViewModel GetViewModel
         {
-            Id = Id,
-            SushiId = SushiId,
-            SushiName=Sushi.SushiName,
-            Count = Count,
-            Sum = Sum,
-            Status = Status,
-            DateCreate = DateCreate,
-            DateImplement = DateImplement,
-            ClientId = ClientId,
-            ClientFIO = Client.ClientFIO,
-            ImplementerId = ImplementerId,
-            ImplementerFIO = Implementer != null ? Implementer.ImplementerFIO : null,
-        };
+            get {
+                using var context = new SushiBarDatabase();
+                return new OrderViewModel
+                {
+                    Id = Id,
+                    ClientId = ClientId,
+                    ClientFIO = context.Clients.FirstOrDefault(x => x.Id == ClientId)?.ClientFIO ?? string.Empty,
+                    SushiId = SushiId,
+                    SushiName = context.ListSushi.FirstOrDefault(x => x.Id == SushiId)?.SushiName ?? string.Empty,
+                    ImplementerId = ImplementerId,
+                    ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty,
+                    Count = Count,
+                    Sum = Sum,
+                    Status = Status,
+                    DateCreate = DateCreate,
+                    DateImplement = DateImplement,
+                };
+            } 
+        }
     }
 }

SushiBar/SushiBarFileImplement/Models/Order.cs

@@ -11,6 +11,7 @@ namespace SushiBarFileImplement.Models
         public int Id { get; private set; }
         public int SushiId { get; private set; }
         public int ClientId { get; private set; }
+        public int? ImplementerId { get; set; }
         public int Count { get; private set; }
         public double Sum { get; private set; }
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
@@ -27,6 +28,7 @@ namespace SushiBarFileImplement.Models
                 Id = model.Id,
                 SushiId = model.SushiId,
                 ClientId = model.ClientId,
+                ImplementerId = model.ImplementerId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -46,6 +48,7 @@ namespace SushiBarFileImplement.Models
                 Id = Convert.ToInt32(element.Attribute("Id")!.Value),
                 SushiId = Convert.ToInt32(element.Element("SushiId")!.Value),
                 ClientId = Convert.ToInt32(element.Element("ClientId")!.Value),
+                ImplementerId = Convert.ToInt32(element.Element("ImplementerId")!.Value),
                 Sum = Convert.ToDouble(element.Element("Sum")!.Value),
                 Count = Convert.ToInt32(element.Element("Count")!.Value),
                 Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
@@ -74,12 +77,14 @@ namespace SushiBarFileImplement.Models
             Id = Id,
             Status = Status,
             ClientId = ClientId,
+            ImplementerId = ImplementerId,
         };
 
         public XElement GetXElement => new("Order",
           new XAttribute("Id", Id),
           new XElement("SushiId", SushiId),
           new XElement("ClientId", ClientId.ToString()),
+          new XElement("ImplementerId", ImplementerId),
           new XElement("Count", Count.ToString()),
           new XElement("Sum", Sum.ToString()),
           new XElement("Status", Status.ToString()),

SushiBar/SushiBarListImplement/Models/Order.cs

@@ -15,6 +15,7 @@ namespace SushiBarListImplement.Models
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
         public DateTime DateCreate { get; private set; } = DateTime.Now;
         public DateTime? DateImplement { get; private set; }
+        public int? ImplementerId { get; private set; }
         public static Order? Create(OrderBindingModel? model)
         {
             if (model == null)
@@ -31,6 +32,7 @@ namespace SushiBarListImplement.Models
                 DateImplement = model.DateImplement,
                 Id = model.Id,
                 ClientId = model.ClientId,
+                ImplementerId = model.ImplementerId,
             };
         }
         public void Update(OrderBindingModel? model)
@@ -57,6 +59,7 @@ namespace SushiBarListImplement.Models
             DateCreate = DateCreate,
             DateImplement = DateImplement,
             ClientId = ClientId,
+            ImplementerId = ImplementerId,
         };
     }
 }