1 этап

RenovationWork/RenovationWorkBusinessLogic/BusinessLogic/ClientLogic.cs

@@ -0,0 +1,40 @@
+using RenovationWorkContracts.BindingModels;
+using RenovationWorkContracts.BusinessLogicsContracts;
+using RenovationWorkContracts.SeatchModels;
+using RenovationWorkContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RenovationWorkBusinessLogic.BusinessLogic
+{
+    public class ClientLogic : IClientLogic //дописать 
+    {
+        public bool Create(ClientBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool Delete(ClientBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ClientViewModel? ReadElement(ClientSearchModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public List<ClientViewModel>? ReadList(ClientSearchModel? model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool Update(ClientBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

RenovationWork/RenovationWorkContracts/BindingModels/ClientBindingModel.cs

@@ -0,0 +1,20 @@
+using RenovationWorkDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RenovationWorkContracts.BindingModels
+{
+    public class ClientBindingModel : IClientModel
+    {
+        public int Id { get; set; }
+
+        public string ClientFIO { get; set; } = string.Empty;
+
+        public string Email { get; set; } = string.Empty;
+
+        public string Password { get; set; } = string.Empty;
+    }
+}

RenovationWork/RenovationWorkContracts/BusinessLogicsContracts/IClientLogic.cs

@@ -0,0 +1,24 @@
+using RenovationWorkContracts.BindingModels;
+using RenovationWorkContracts.SeatchModels;
+using RenovationWorkContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RenovationWorkContracts.BusinessLogicsContracts
+{
+    public interface IClientLogic
+    {
+        List<ClientViewModel>? ReadList(ClientSearchModel? model);
+
+        ClientViewModel? ReadElement(ClientSearchModel model);
+
+        bool Create(ClientBindingModel model);
+
+        bool Update(ClientBindingModel model);
+
+        bool Delete(ClientBindingModel model);
+    }
+}

RenovationWork/RenovationWorkContracts/SeatchModels/ClientSearchModel.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RenovationWorkContracts.SeatchModels
+{
+    public class ClientSearchModel
+    {
+        public int? Id { get; set; }
+
+        public string? ClientFIO { get; set; }
+
+        public string? Email { get; set; }
+
+        public string? Password { get; set; }
+    }
+}

RenovationWork/RenovationWorkContracts/StorageContracts/IClientStorage.cs

@@ -0,0 +1,26 @@
+using RenovationWorkContracts.BindingModels;
+using RenovationWorkContracts.SeatchModels;
+using RenovationWorkContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RenovationWorkContracts.StorageContracts
+{
+    public interface IClientStorage
+    {
+        List<ClientViewModel> GetFullList();
+
+        List<ClientViewModel> GetFilteredList(ClientSearchModel model);
+
+        ClientViewModel? GetElement(ClientSearchModel model);
+
+        ClientViewModel? Insert(ClientBindingModel model);
+
+        ClientViewModel? Update(ClientBindingModel model);
+
+        ClientViewModel? Delete(ClientBindingModel model);
+    }
+}

RenovationWork/RenovationWorkContracts/ViewModels/ClientViewModel.cs

@@ -0,0 +1,24 @@
+using RenovationWorkDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RenovationWorkContracts.ViewModels
+{
+    public class ClientViewModel : IClientModel
+    {
+        public int Id { get; set; }
+
+        [DisplayName("ФИО клиента")]
+        public string ClientFIO { get; set; } = string.Empty;
+
+        [DisplayName("Логин (эл. почта)")]
+        public string Email { get; set; } = string.Empty;
+
+        [DisplayName("Пароль")]
+        public string Password { get; set; } = string.Empty;
+    }
+}

RenovationWork/RenovationWorkDataModels/Models/IClientModel.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RenovationWorkDataModels.Models
+{
+    public interface IClientModel : IId
+    {
+        string ClientFIO { get; }
+
+        string Email { get; }
+
+        string Password { get; }
+    }
+}

RenovationWork/RenovationWorkDatabaseImplement/Implements/ClientStorage.cs

@@ -0,0 +1,45 @@
+using RenovationWorkContracts.BindingModels;
+using RenovationWorkContracts.SeatchModels;
+using RenovationWorkContracts.StorageContracts;
+using RenovationWorkContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RenovationWorkDatabaseImplement.Implements
+{
+    public class ClientStorage : IClientStorage
+    {
+        public ClientViewModel? Delete(ClientBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ClientViewModel? GetElement(ClientSearchModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public List<ClientViewModel> GetFilteredList(ClientSearchModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public List<ClientViewModel> GetFullList()
+        {
+            throw new NotImplementedException();
+        }
+
+        public ClientViewModel? Insert(ClientBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ClientViewModel? Update(ClientBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

RenovationWork/RenovationWorkFileImplement/Implements/ClientStorage.cs

@@ -0,0 +1,45 @@
+using RenovationWorkContracts.BindingModels;
+using RenovationWorkContracts.SeatchModels;
+using RenovationWorkContracts.StorageContracts;
+using RenovationWorkContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RenovationWorkFileImplement.Implements
+{
+    public class ClientStorage : IClientStorage
+    {
+        public ClientViewModel? Delete(ClientBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ClientViewModel? GetElement(ClientSearchModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public List<ClientViewModel> GetFilteredList(ClientSearchModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public List<ClientViewModel> GetFullList()
+        {
+            throw new NotImplementedException();
+        }
+
+        public ClientViewModel? Insert(ClientBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ClientViewModel? Update(ClientBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

RenovationWork/RenovationWorkListImplement/Implements/ClientStorage.cs

@@ -0,0 +1,45 @@
+using RenovationWorkContracts.BindingModels;
+using RenovationWorkContracts.SeatchModels;
+using RenovationWorkContracts.StorageContracts;
+using RenovationWorkContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RenovationWorkListImplement.Implements
+{
+    public class ClientStorage : IClientStorage
+    {
+        public ClientViewModel? Delete(ClientBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ClientViewModel? GetElement(ClientSearchModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public List<ClientViewModel> GetFilteredList(ClientSearchModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public List<ClientViewModel> GetFullList()
+        {
+            throw new NotImplementedException();
+        }
+
+        public ClientViewModel? Insert(ClientBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ClientViewModel? Update(ClientBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

RenovationWork/RenovationWorkView/FormClients.Designer.cs

@@ -0,0 +1,95 @@
+namespace RenovationWorkView
+{
+    partial class FormClients
+    {
+        /// <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.dataGridView = new System.Windows.Forms.DataGridView();
+            this.buttonDel = new System.Windows.Forms.Button();
+            this.buttonRef = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // dataGridView
+            // 
+            this.dataGridView.AllowUserToAddRows = false;
+            this.dataGridView.AllowUserToDeleteRows = false;
+            this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left;
+            this.dataGridView.Location = new System.Drawing.Point(0, 0);
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.ReadOnly = true;
+            this.dataGridView.RowHeadersVisible = false;
+            this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dataGridView.Size = new System.Drawing.Size(350, 312);
+            this.dataGridView.TabIndex = 0;
+            // 
+            // buttonDel
+            // 
+            this.buttonDel.Location = new System.Drawing.Point(368, 12);
+            this.buttonDel.Name = "buttonDel";
+            this.buttonDel.Size = new System.Drawing.Size(75, 23);
+            this.buttonDel.TabIndex = 3;
+            this.buttonDel.Text = "Удалить";
+            this.buttonDel.UseVisualStyleBackColor = true;
+            this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click);
+            // 
+            // buttonRef
+            // 
+            this.buttonRef.Location = new System.Drawing.Point(368, 53);
+            this.buttonRef.Name = "buttonRef";
+            this.buttonRef.Size = new System.Drawing.Size(75, 23);
+            this.buttonRef.TabIndex = 4;
+            this.buttonRef.Text = "Обновить";
+            this.buttonRef.UseVisualStyleBackColor = true;
+            this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click);
+            // 
+            // FormClients
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(464, 312);
+            this.Controls.Add(this.buttonRef);
+            this.Controls.Add(this.buttonDel);
+            this.Controls.Add(this.dataGridView);
+            this.Name = "FormClients";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "Клиенты";
+            this.Load += new System.EventHandler(this.FormClients_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.DataGridView dataGridView;
+        private System.Windows.Forms.Button buttonDel;
+        private System.Windows.Forms.Button buttonRef;
+    }
+}

RenovationWork/RenovationWorkView/FormClients.cs

@@ -0,0 +1,84 @@
+using Microsoft.Extensions.Logging;
+using RenovationWorkContracts.BindingModels;
+using RenovationWorkContracts.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 RenovationWorkView
+{
+    public partial class FormClients : Form
+    {
+        private readonly ILogger _logger;
+
+        private readonly IClientLogic _logic;
+
+        public FormClients(ILogger<FormClients> logger, IClientLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+        }
+
+        private void FormClients_Load(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+
+        private void LoadData()
+        {
+            try
+            {
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                }
+                _logger.LogInformation("Загрузка клиентов");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки клиентов");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        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);
+                    try
+                    {
+                        if (!_logic.Delete(new ClientBindingModel { Id = id }))
+                        {
+                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
+                        }
+                        _logger.LogInformation("Удаление клиента");
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogError(ex, "Ошибка удаления клиента");
+                        MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    }
+                    LoadData();
+                }
+            }
+        }
+
+        private void ButtonRef_Click(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+    }
+}

RenovationWork/RenovationWorkView/FormClients.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>

RenovationWork/RenovationWorkView/Program.cs

@@ -32,11 +32,14 @@ namespace RenovationWorkView
             {
                 option.SetMinimumLevel(LogLevel.Information);
                 option.AddNLog("nlog.config");
-            }); 
+            });
+
+            services.AddTransient<IClientStorage, ClientStorage>();
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<IRepairStorage, RepairStorage>();
 
+            services.AddTransient<IClientLogic, ClientLogic>();
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IRepairLogic, RepairLogic>();
@@ -47,6 +50,7 @@ namespace RenovationWorkView
             services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
 
             services.AddTransient<FormMain>();
+            services.AddTransient<FormClients>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
             services.AddTransient<FormCreateOrder>();