правки

SushiBar/SushiBarClientApp/Views/Home/Index.cshtml

@@ -1,24 +1,18 @@
 @using SushiBarContracts.ViewModels
-
 @model List<OrderViewModel>
-
 @{
 	ViewData["Title"] = "Home Page";
 }
-
 <div class="text-center">
 	<h1 class="display-4">Заказы</h1>
 </div>
-
-
 <div class="text-center">
 	@{
 		if (Model == null)
 		{
-			<h3 class="display-4">Авторизируйтесь</h3>
+			<h3 class="display-4">Авторизуйтесь</h3>
 			return;
 		}
-
 		<p>
 			<a asp-action="Create">Создать заказ</a>
 		</p>
@@ -29,7 +23,7 @@
 						Номер
 					</th>
 					<th>
-						Суши
+						Изделие
 					</th>
 					<th>
 						Дата создания

SushiBar/SushiBarView/FormClients.Designer.cs

@@ -0,0 +1,86 @@
+namespace SushiBarView
+{
+	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()
+		{
+			buttonDel = new Button();
+			buttonRef = new Button();
+			dataGridView = new DataGridView();
+			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+			SuspendLayout();
+			// 
+			// buttonDel
+			// 
+			buttonDel.Location = new Point(382, 12);
+			buttonDel.Name = "buttonDel";
+			buttonDel.Size = new Size(119, 38);
+			buttonDel.TabIndex = 0;
+			buttonDel.Text = "Удалить";
+			buttonDel.UseVisualStyleBackColor = true;
+			buttonDel.Click += buttonDel_Click;
+			// 
+			// buttonRef
+			// 
+			buttonRef.Location = new Point(382, 56);
+			buttonRef.Name = "buttonRef";
+			buttonRef.Size = new Size(119, 37);
+			buttonRef.TabIndex = 1;
+			buttonRef.Text = "Обновить";
+			buttonRef.UseVisualStyleBackColor = true;
+			buttonRef.Click += buttonRef_Click;
+			// 
+			// dataGridView
+			// 
+			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			dataGridView.Location = new Point(2, 2);
+			dataGridView.Name = "dataGridView";
+			dataGridView.Size = new Size(374, 447);
+			dataGridView.TabIndex = 2;
+			// 
+			// FormClients
+			// 
+			AutoScaleDimensions = new SizeF(7F, 15F);
+			AutoScaleMode = AutoScaleMode.Font;
+			ClientSize = new Size(513, 450);
+			Controls.Add(dataGridView);
+			Controls.Add(buttonRef);
+			Controls.Add(buttonDel);
+			Name = "FormClients";
+			Text = "Клиенты";
+			Load += FormClients_Load;
+			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			ResumeLayout(false);
+		}
+
+		#endregion
+
+		private Button buttonDel;
+		private Button buttonRef;
+		private DataGridView dataGridView;
+	}
+}

SushiBar/SushiBarView/FormClients.cs

@@ -0,0 +1,84 @@
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BindingModels;
+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 _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();
+		}
+	}
+}

SushiBar/SushiBarView/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>

SushiBar/SushiBarView/FormMain.Designer.cs

@@ -42,6 +42,7 @@
 			ComponentsListToolStripMenuItem = new ToolStripMenuItem();
 			ComponentSushisToolStripMenuItem = new ToolStripMenuItem();
 			OrdersToolStripMenuItem = new ToolStripMenuItem();
+			clientToolStripMenuItem = new ToolStripMenuItem();
 			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
 			menuStrip.SuspendLayout();
 			SuspendLayout();
@@ -116,7 +117,7 @@
 			// 
 			// toolStripMenuItem
 			// 
-            toolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem, sushiToolStripMenuItem });
+			toolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem, sushiToolStripMenuItem, clientToolStripMenuItem });
 			toolStripMenuItem.Name = "toolStripMenuItem";
 			toolStripMenuItem.Size = new Size(94, 20);
 			toolStripMenuItem.Text = "Справочники";
@@ -124,14 +125,14 @@
 			// componentsToolStripMenuItem
 			// 
 			componentsToolStripMenuItem.Name = "componentsToolStripMenuItem";
-            componentsToolStripMenuItem.Size = new Size(145, 22);
+			componentsToolStripMenuItem.Size = new Size(180, 22);
 			componentsToolStripMenuItem.Text = "Компоненты";
 			componentsToolStripMenuItem.Click += componentsToolStripMenuItem_Click;
 			// 
 			// sushiToolStripMenuItem
 			// 
 			sushiToolStripMenuItem.Name = "sushiToolStripMenuItem";
-            sushiToolStripMenuItem.Size = new Size(145, 22);
+			sushiToolStripMenuItem.Size = new Size(180, 22);
 			sushiToolStripMenuItem.Text = "Суши";
 			sushiToolStripMenuItem.Click += sushiToolStripMenuItem_Click;
 			// 
@@ -163,6 +164,13 @@
 			OrdersToolStripMenuItem.Text = "Список заказов";
 			OrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
 			// 
+			// clientToolStripMenuItem
+			// 
+			clientToolStripMenuItem.Name = "clientToolStripMenuItem";
+			clientToolStripMenuItem.Size = new Size(180, 22);
+			clientToolStripMenuItem.Text = "Клиент";
+			clientToolStripMenuItem.Click += клиентToolStripMenuItem_Click;
+			// 
 			// FormMain
 			// 
 			AutoScaleDimensions = new SizeF(7F, 15F);
@@ -202,5 +210,6 @@
         private ToolStripMenuItem ComponentsListToolStripMenuItem;
         private ToolStripMenuItem ComponentSushisToolStripMenuItem;
         private ToolStripMenuItem OrdersToolStripMenuItem;
+		private ToolStripMenuItem clientToolStripMenuItem;
 	}
 }

SushiBar/SushiBarView/FormMain.cs

@@ -40,6 +40,7 @@ namespace SushiBarView
 				{
 					dataGridView.DataSource = list;
 					dataGridView.Columns["SushiId"].Visible = false;
+					dataGridView.Columns["ClientId"].Visible = false;
 					dataGridView.Columns["SushiName"].AutoSizeMode =
 					DataGridViewAutoSizeColumnMode.Fill;
 					dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
@@ -197,5 +198,14 @@ e)
 		{
 			LoadData();
 		}
+
+		private void clientToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormClients));
+			if (service is FormClients form)
+			{
+				form.ShowDialog();
+			}
+		}
 	}
 }