5 лаба, добавила форму клиентов

TravelCompany/TravelCompany/FormClients.Designer.cs

@@ -0,0 +1,88 @@
+namespace TravelCompanyView
+{
+	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()
+		{
+			dataGridView = new DataGridView();
+			buttonDel = new Button();
+			buttonRef = new Button();
+			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+			SuspendLayout();
+			// 
+			// dataGridView
+			// 
+			dataGridView.BackgroundColor = SystemColors.ControlLightLight;
+			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			dataGridView.Location = new Point(2, 1);
+			dataGridView.Name = "dataGridView";
+			dataGridView.RowTemplate.Height = 25;
+			dataGridView.Size = new Size(464, 376);
+			dataGridView.TabIndex = 0;
+			// 
+			// buttonDel
+			// 
+			buttonDel.Location = new Point(493, 46);
+			buttonDel.Name = "buttonDel";
+			buttonDel.Size = new Size(75, 23);
+			buttonDel.TabIndex = 1;
+			buttonDel.Text = "Удалить";
+			buttonDel.UseVisualStyleBackColor = true;
+			buttonDel.Click += buttonDel_Click;
+			// 
+			// buttonRef
+			// 
+			buttonRef.Location = new Point(493, 89);
+			buttonRef.Name = "buttonRef";
+			buttonRef.Size = new Size(75, 23);
+			buttonRef.TabIndex = 2;
+			buttonRef.Text = "Обновить";
+			buttonRef.UseVisualStyleBackColor = true;
+			buttonRef.Click += buttonRef_Click;
+			// 
+			// FormClients
+			// 
+			AutoScaleDimensions = new SizeF(7F, 15F);
+			AutoScaleMode = AutoScaleMode.Font;
+			ClientSize = new Size(599, 376);
+			Controls.Add(buttonRef);
+			Controls.Add(buttonDel);
+			Controls.Add(dataGridView);
+			Name = "FormClients";
+			Text = "Клиенты";
+			Load += FormClients_Load;
+			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			ResumeLayout(false);
+		}
+
+		#endregion
+
+		private DataGridView dataGridView;
+		private Button buttonDel;
+		private Button buttonRef;
+	}
+}

TravelCompany/TravelCompany/FormClients.cs

@@ -0,0 +1,73 @@
+using TravelCompanyContracts.BindingModels;
+using TravelCompanyContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+using TravelCompanyContracts.BusinessLogicContracts;
+
+namespace TravelCompanyView
+{
+	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 buttonRef_Click(object sender, EventArgs e)
+		{
+			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 ClientBindingModel { Id = id }))
+						{
+							throw new Exception("Ошибка при удалении клиента");
+						}
+						LoadData();
+					}
+					catch (Exception ex)
+					{
+						_logger.LogError(ex, "Ошибка при удалении клиента");
+						MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					}
+				}
+			}
+		}
+	}
+}

TravelCompany/TravelCompany/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>

TravelCompany/TravelCompany/FormCreateOrder.Designer.cs

@@ -36,64 +36,70 @@
 			textBoxSum = new TextBox();
 			buttonSave = new Button();
 			buttonCancel = new Button();
+			label4 = new Label();
+			comboBoxClient = new ComboBox();
 			SuspendLayout();
 			// 
 			// label1
 			// 
 			label1.AutoSize = true;
-            label1.Location = new Point(11, 13);
+			label1.Location = new Point(10, 10);
 			label1.Name = "label1";
-            label1.Size = new Size(170, 20);
+			label1.Size = new Size(136, 15);
 			label1.TabIndex = 0;
 			label1.Text = "Туристическая путевка:";
 			// 
 			// label2
 			// 
 			label2.AutoSize = true;
-            label2.Location = new Point(88, 52);
+			label2.Location = new Point(77, 39);
 			label2.Name = "label2";
-            label2.Size = new Size(93, 20);
+			label2.Size = new Size(75, 15);
 			label2.TabIndex = 1;
 			label2.Text = "Количество:";
 			// 
 			// label3
 			// 
 			label3.AutoSize = true;
-            label3.Location = new Point(123, 99);
+			label3.Location = new Point(108, 74);
 			label3.Name = "label3";
-            label3.Size = new Size(58, 20);
+			label3.Size = new Size(48, 15);
 			label3.TabIndex = 2;
 			label3.Text = "Сумма:";
 			// 
 			// comboBoxTravel
 			// 
 			comboBoxTravel.FormattingEnabled = true;
-            comboBoxTravel.Location = new Point(191, 5);
+			comboBoxTravel.Location = new Point(167, 4);
+			comboBoxTravel.Margin = new Padding(3, 2, 3, 2);
 			comboBoxTravel.Name = "comboBoxTravel";
-            comboBoxTravel.Size = new Size(278, 28);
+			comboBoxTravel.Size = new Size(244, 23);
 			comboBoxTravel.TabIndex = 3;
 			comboBoxTravel.SelectedIndexChanged += ComboBoxTravel_SelectedIndexChanged;
 			// 
 			// textBoxCount
 			// 
-            textBoxCount.Location = new Point(191, 49);
+			textBoxCount.Location = new Point(167, 37);
+			textBoxCount.Margin = new Padding(3, 2, 3, 2);
 			textBoxCount.Name = "textBoxCount";
-            textBoxCount.Size = new Size(278, 27);
+			textBoxCount.Size = new Size(244, 23);
 			textBoxCount.TabIndex = 4;
 			textBoxCount.TextChanged += textBoxCount_TextChanged;
 			// 
 			// textBoxSum
 			// 
-            textBoxSum.Location = new Point(191, 92);
+			textBoxSum.Location = new Point(167, 69);
+			textBoxSum.Margin = new Padding(3, 2, 3, 2);
 			textBoxSum.Name = "textBoxSum";
-            textBoxSum.Size = new Size(278, 27);
+			textBoxSum.Size = new Size(244, 23);
 			textBoxSum.TabIndex = 5;
 			// 
 			// buttonSave
 			// 
-            buttonSave.Location = new Point(247, 148);
+			buttonSave.Location = new Point(217, 166);
+			buttonSave.Margin = new Padding(3, 2, 3, 2);
 			buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(94, 29);
+			buttonSave.Size = new Size(82, 22);
 			buttonSave.TabIndex = 6;
 			buttonSave.Text = "Сохранить";
 			buttonSave.UseVisualStyleBackColor = true;
@@ -101,19 +107,40 @@
 			// 
 			// buttonCancel
 			// 
-            buttonCancel.Location = new Point(375, 148);
+			buttonCancel.Location = new Point(329, 166);
+			buttonCancel.Margin = new Padding(3, 2, 3, 2);
 			buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(94, 29);
+			buttonCancel.Size = new Size(82, 22);
 			buttonCancel.TabIndex = 7;
 			buttonCancel.Text = "Отмена";
 			buttonCancel.UseVisualStyleBackColor = true;
 			buttonCancel.Click += buttonCancel_Click;
 			// 
+			// label4
+			// 
+			label4.AutoSize = true;
+			label4.Location = new Point(108, 116);
+			label4.Name = "label4";
+			label4.Size = new Size(49, 15);
+			label4.TabIndex = 8;
+			label4.Text = "Клиент:";
+			// 
+			// comboBoxClient
+			// 
+			comboBoxClient.FormattingEnabled = true;
+			comboBoxClient.Location = new Point(167, 113);
+			comboBoxClient.Margin = new Padding(3, 2, 3, 2);
+			comboBoxClient.Name = "comboBoxClient";
+			comboBoxClient.Size = new Size(244, 23);
+			comboBoxClient.TabIndex = 10;
+			// 
 			// FormCreateOrder
 			// 
-            AutoScaleDimensions = new SizeF(8F, 20F);
+			AutoScaleDimensions = new SizeF(7F, 15F);
 			AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(496, 200);
+			ClientSize = new Size(434, 199);
+			Controls.Add(comboBoxClient);
+			Controls.Add(label4);
 			Controls.Add(buttonCancel);
 			Controls.Add(buttonSave);
 			Controls.Add(textBoxSum);
@@ -122,6 +149,7 @@
 			Controls.Add(label3);
 			Controls.Add(label2);
 			Controls.Add(label1);
+			Margin = new Padding(3, 2, 3, 2);
 			Name = "FormCreateOrder";
 			Text = "Заказ";
 			Load += FormCreateOrder_Load;
@@ -139,5 +167,7 @@
 		private TextBox textBoxSum;
 		private Button buttonSave;
 		private Button buttonCancel;
+		private Label label4;
+		private ComboBox comboBoxClient;
 	}
 }

TravelCompany/TravelCompany/FormCreateOrder.cs

@@ -9,6 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using TravelCompanyContracts.BindingModels;
+using TravelCompanyContracts.BusinessLogicContracts;
 using TravelCompanyContracts.BusinessLogicsContracts;
 using TravelCompanyContracts.SearchModels;
 
@@ -19,12 +20,14 @@ namespace TravelCompanyView
 		private readonly ILogger _logger;
 		private readonly ITravelLogic _logicP;
 		private readonly IOrderLogic _logicO;
-        public FormCreateOrder(ILogger<FormCreateOrder> logger, ITravelLogic logicP, IOrderLogic logicO)
+		private readonly IClientLogic _logicC;
+		public FormCreateOrder(ILogger<FormCreateOrder> logger, ITravelLogic logicP, IOrderLogic logicO, IClientLogic logicC)
 		{
 			InitializeComponent();
 			_logger = logger;
 			_logicP = logicP;
 			_logicO = logicO;
+			_logicC = logicC;
 		}
 
 		private void FormCreateOrder_Load(object sender, EventArgs e)
@@ -44,6 +47,25 @@ namespace TravelCompanyView
 			catch (Exception ex)
 			{
 				_logger.LogError(ex, "Ошибка загрузки списка изделий");
+				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+
+			}
+			try
+			{
+				var listC = _logicC.ReadList(null);
+				if (listC != null)
+				{
+					comboBoxClient.DisplayMember = "ClientFIO";
+					comboBoxClient.ValueMember = "Id";
+					comboBoxClient.DataSource = listC;
+					comboBoxClient.SelectedItem = null;
+				}
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка загрузки списка клиентов");
+				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+
 			}
 		}
 		private void CalcSum()
@@ -90,12 +112,18 @@ namespace TravelCompanyView
 				MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
 				return;
 			}
+			if (comboBoxClient.SelectedValue == null)
+			{
+				MessageBox.Show("Выберите клиента", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
 			_logger.LogInformation("Создание заказа");
 			try
 			{
 				var operationResult = _logicO.CreateOrder(new OrderBindingModel
 				{
 					TravelId = Convert.ToInt32(comboBoxTravel.SelectedValue),
+					ClientId = Convert.ToInt32(comboBoxClient.SelectedValue),
 					Count = Convert.ToInt32(textBoxCount.Text),
 					Sum = Convert.ToDouble(textBoxSum.Text)
 				});

TravelCompany/TravelCompany/FormMain.Designer.cs

@@ -34,6 +34,7 @@
 			toolStripDropDownButton1 = new ToolStripDropDownButton();
 			компонентыToolStripMenuItem = new ToolStripMenuItem();
 			туристическиеПутевкиToolStripMenuItem = new ToolStripMenuItem();
+			клиентыToolStripMenuItem = new ToolStripMenuItem();
 			toolStripDropDownButton2 = new ToolStripDropDownButton();
 			toolStripMenuItem1 = new ToolStripMenuItem();
 			toolStripMenuItem2 = new ToolStripMenuItem();
@@ -74,7 +75,7 @@
 			// toolStripDropDownButton1
 			// 
 			toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text;
-			toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, туристическиеПутевкиToolStripMenuItem });
+			toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, туристическиеПутевкиToolStripMenuItem, клиентыToolStripMenuItem });
 			toolStripDropDownButton1.Image = (Image)resources.GetObject("toolStripDropDownButton1.Image");
 			toolStripDropDownButton1.ImageTransparentColor = Color.Magenta;
 			toolStripDropDownButton1.Name = "toolStripDropDownButton1";
@@ -95,6 +96,13 @@
 			туристическиеПутевкиToolStripMenuItem.Text = "Туристические путевки";
 			туристическиеПутевкиToolStripMenuItem.Click += путевкиToolStripMenuItem_Click;
 			// 
+			// клиентыToolStripMenuItem
+			// 
+			клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
+			клиентыToolStripMenuItem.Size = new Size(202, 22);
+			клиентыToolStripMenuItem.Text = "Клиенты";
+			клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click;
+			// 
 			// toolStripDropDownButton2
 			// 
 			toolStripDropDownButton2.DisplayStyle = ToolStripItemDisplayStyle.Text;
@@ -219,5 +227,6 @@
 		private ToolStripMenuItem toolStripMenuItem1;
 		private ToolStripMenuItem toolStripMenuItem2;
 		private ToolStripMenuItem списокЗаказовToolStripMenuItem;
+		private ToolStripMenuItem клиентыToolStripMenuItem;
 	}
 }

TravelCompany/TravelCompany/FormMain.cs

@@ -188,5 +188,14 @@ namespace TravelCompanyView
 				form.ShowDialog();
 			}
 		}
+
+		private void клиентыToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormClients));
+			if (service is FormClients form)
+			{
+				form.ShowDialog();
+			}
+		}
 	}
 }

TravelCompany/TravelCompany/Program.cs

@@ -8,6 +8,7 @@ using TravelCompanyDatabaseImplement.Implements;
 using TravelCompanyView;
 using TravelCompanyBusinessLogic.OfficePackage.Implements;
 using TravelCompanyBusinessLogic.OfficePackage;
+using TravelCompanyContracts.BusinessLogicContracts;
 
 namespace TravelCompany
 {
@@ -40,10 +41,14 @@ namespace TravelCompany
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<ITravelStorage, TravelStorage>();
+            services.AddTransient<IClientStorage, ClientStorage>();
+
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<ITravelLogic, TravelLogic>();
             services.AddTransient<IReportLogic, ReportLogic>();
+			services.AddTransient<IClientLogic, ClientLogic>();
+
 			services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
@@ -53,6 +58,9 @@ namespace TravelCompany
             services.AddTransient<FormTravels>();
             services.AddTransient<FormReportTravelComponents>();
             services.AddTransient<FormReportOrders>();
+            services.AddTransient<FormClients>();
+
+
             services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
             services.AddTransient<AbstractSaveToWord, SaveToWord>();
             services.AddTransient<AbstractSaveToPdf, SaveToPdf>();