From 5f50a44a693013400a8503a8fb937a1df1896304 Mon Sep 17 00:00:00 2001 From: dex_moth Date: Tue, 6 Feb 2024 23:13:36 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BE=D0=BF=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20?= =?UTF-8?q?=D1=81=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FishFactory/FishFactory.sln | 2 +- ...hFactory.csproj => FishFactoryView.csproj} | 3 + FishFactory/FormCanned.Designer.cs | 298 +++++++++++------- FishFactory/FormCanned.cs | 189 ++++++++++- FishFactory/FormCanned.resx | 55 ++-- FishFactory/FormCannedComponent.Designer.cs | 134 ++++---- FishFactory/FormCannedComponent.cs | 73 ++++- FishFactory/FormCannedComponent.resx | 50 +-- FishFactory/FormCanneds.Designer.cs | 120 +++++++ FishFactory/FormCanneds.cs | 115 +++++++ FishFactory/FormCanneds.resx | 120 +++++++ FishFactory/FormComponent.Designer.cs | 126 ++++---- FishFactory/FormComponent.cs | 67 +++- FishFactory/FormComponent.resx | 50 +-- FishFactory/FormComponents.Designer.cs | 133 ++++---- FishFactory/FormComponents.cs | 97 +++++- FishFactory/FormComponents.resx | 50 +-- FishFactory/FormCreateOrder.Designer.cs | 163 +++++----- FishFactory/FormCreateOrder.cs | 107 ++++++- FishFactory/FormCreateOrder.resx | 50 +-- FishFactory/FormMain.Designer.cs | 251 ++++++++------- FishFactory/FormMain.cs | 137 +++++++- FishFactory/FormMain.resx | 53 ++-- FishFactory/Program.cs | 38 ++- FishFactory/nlog.config | 15 + .../BusinessLogic/CannedLogic.cs | 3 +- .../BusinessLogic/OrderLogic.cs | 73 +++-- .../FishFactoryListImplement.csproj | 4 - .../Implements/CannedStorage.cs | 112 +++++++ .../Implements/ComponentStorage.cs | 106 +++++++ .../Implements/OrderStorage.cs | 125 ++++++++ FishFactoryListImplement/Models/Canned.cs | 10 +- FishFactoryView/FishFactoryView.csproj | 11 + FishFactoryView/Form1.Designer.cs | 39 +++ FishFactoryView/Form1.cs | 10 + FishFactoryView/Form1.resx | 120 +++++++ FishFactoryView/Program.cs | 17 + 37 files changed, 2409 insertions(+), 717 deletions(-) rename FishFactory/{FishFactory.csproj => FishFactoryView.csproj} (65%) create mode 100644 FishFactory/FormCanneds.Designer.cs create mode 100644 FishFactory/FormCanneds.cs create mode 100644 FishFactory/FormCanneds.resx create mode 100644 FishFactory/nlog.config create mode 100644 FishFactoryListImplement/Implements/CannedStorage.cs create mode 100644 FishFactoryListImplement/Implements/ComponentStorage.cs create mode 100644 FishFactoryListImplement/Implements/OrderStorage.cs create mode 100644 FishFactoryView/FishFactoryView.csproj create mode 100644 FishFactoryView/Form1.Designer.cs create mode 100644 FishFactoryView/Form1.cs create mode 100644 FishFactoryView/Form1.resx create mode 100644 FishFactoryView/Program.cs diff --git a/FishFactory/FishFactory.sln b/FishFactory/FishFactory.sln index c9b9f51..13c7466 100644 --- a/FishFactory/FishFactory.sln +++ b/FishFactory/FishFactory.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.7.34221.43 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FishFactory", "FishFactory.csproj", "{D820588F-CBC7-418A-8473-1224A24A8327}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryView", "FishFactoryView.csproj", "{D820588F-CBC7-418A-8473-1224A24A8327}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryBusinessLogic", "..\FishFactoryBusinessLogic\FishFactoryBusinessLogic.csproj", "{B2815667-7698-4714-8A4A-49E2D2D12897}" EndProject diff --git a/FishFactory/FishFactory.csproj b/FishFactory/FishFactoryView.csproj similarity index 65% rename from FishFactory/FishFactory.csproj rename to FishFactory/FishFactoryView.csproj index e0de06e..854aa79 100644 --- a/FishFactory/FishFactory.csproj +++ b/FishFactory/FishFactoryView.csproj @@ -10,10 +10,13 @@ + + + \ No newline at end of file diff --git a/FishFactory/FormCanned.Designer.cs b/FishFactory/FormCanned.Designer.cs index 0740892..db5feff 100644 --- a/FishFactory/FormCanned.Designer.cs +++ b/FishFactory/FormCanned.Designer.cs @@ -28,163 +28,217 @@ /// private void InitializeComponent() { - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.button1 = new System.Windows.Forms.Button(); - this.button2 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.button4 = new System.Windows.Forms.Button(); - this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.Component = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); - this.groupBox1.SuspendLayout(); - this.SuspendLayout(); + label1 = new Label(); + label2 = new Label(); + buttonAdd = new Button(); + buttonUpd = new Button(); + buttonDel = new Button(); + buttonRef = new Button(); + dataGridView = new DataGridView(); + Number = new DataGridViewTextBoxColumn(); + Component = new DataGridViewTextBoxColumn(); + Count = new DataGridViewTextBoxColumn(); + textBoxName = new TextBox(); + textBoxPrice = new TextBox(); + groupBox1 = new GroupBox(); + buttonSave = new Button(); + buttonCancel = new Button(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + groupBox1.SuspendLayout(); + SuspendLayout(); // // label1 // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(18, 16); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(76, 16); - this.label1.TabIndex = 0; - this.label1.Text = "Название:"; + label1.AutoSize = true; + label1.Location = new Point(18, 20); + label1.Name = "label1"; + label1.Size = new Size(80, 20); + label1.TabIndex = 0; + label1.Text = "Название:"; // // label2 // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(18, 44); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(80, 16); - this.label2.TabIndex = 1; - this.label2.Text = "Стоимость:"; + label2.AutoSize = true; + label2.Location = new Point(18, 55); + label2.Name = "label2"; + label2.Size = new Size(86, 20); + label2.TabIndex = 1; + label2.Text = "Стоимость:"; // - // button1 + // buttonAdd // - this.button1.Location = new System.Drawing.Point(661, 47); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(97, 30); - this.button1.TabIndex = 0; - this.button1.Text = "Добавить"; - this.button1.UseVisualStyleBackColor = true; + buttonAdd.Location = new Point(656, 59); + buttonAdd.Margin = new Padding(3, 4, 3, 4); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(111, 38); + buttonAdd.TabIndex = 0; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; // - // button2 + // buttonUpd // - this.button2.Location = new System.Drawing.Point(661, 96); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(97, 30); - this.button2.TabIndex = 1; - this.button2.Text = "Изменить"; - this.button2.UseVisualStyleBackColor = true; + buttonUpd.Location = new Point(656, 120); + buttonUpd.Margin = new Padding(3, 4, 3, 4); + buttonUpd.Name = "buttonUpd"; + buttonUpd.Size = new Size(111, 38); + buttonUpd.TabIndex = 1; + buttonUpd.Text = "Изменить"; + buttonUpd.UseVisualStyleBackColor = true; + buttonUpd.Click += buttonUpd_Click; // - // button3 + // buttonDel // - this.button3.Location = new System.Drawing.Point(661, 142); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(97, 30); - this.button3.TabIndex = 2; - this.button3.Text = "Удалить"; - this.button3.UseVisualStyleBackColor = true; + buttonDel.Location = new Point(656, 178); + buttonDel.Margin = new Padding(3, 4, 3, 4); + buttonDel.Name = "buttonDel"; + buttonDel.Size = new Size(111, 38); + buttonDel.TabIndex = 2; + buttonDel.Text = "Удалить"; + buttonDel.UseVisualStyleBackColor = true; + buttonDel.Click += buttonDel_Click; // - // button4 + // buttonRef // - this.button4.Location = new System.Drawing.Point(661, 185); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(97, 30); - this.button4.TabIndex = 3; - this.button4.Text = "Обновить"; - this.button4.UseVisualStyleBackColor = true; + buttonRef.Location = new Point(656, 231); + buttonRef.Margin = new Padding(3, 4, 3, 4); + buttonRef.Name = "buttonRef"; + buttonRef.Size = new Size(111, 38); + buttonRef.TabIndex = 3; + buttonRef.Text = "Обновить"; + buttonRef.UseVisualStyleBackColor = true; + buttonRef.Click += buttonRef_Click; // - // dataGridView1 + // dataGridView // - this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Component, - this.Count}); - this.dataGridView1.Location = new System.Drawing.Point(0, 21); - this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.RowHeadersWidth = 51; - this.dataGridView1.RowTemplate.Height = 24; - this.dataGridView1.Size = new System.Drawing.Size(627, 443); - this.dataGridView1.TabIndex = 4; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Columns.AddRange(new DataGridViewColumn[] { Number, Component, Count }); + dataGridView.Location = new Point(0, 26); + dataGridView.Margin = new Padding(3, 4, 3, 4); + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 24; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.ShowEditingIcon = false; + dataGridView.Size = new Size(627, 443); + dataGridView.TabIndex = 4; + // + // Number + // + Number.HeaderText = "Номер"; + Number.MinimumWidth = 6; + Number.Name = "Number"; + Number.Width = 60; // // Component // - this.Component.HeaderText = "Компонент"; - this.Component.MinimumWidth = 6; - this.Component.Name = "Component"; - this.Component.Width = 125; + Component.HeaderText = "Компонент"; + Component.MinimumWidth = 6; + Component.Name = "Component"; + Component.Width = 125; // // Count // - this.Count.HeaderText = "Количество"; - this.Count.MinimumWidth = 6; - this.Count.Name = "Count"; - this.Count.Width = 125; + Count.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + Count.HeaderText = "Количество"; + Count.MinimumWidth = 6; + Count.Name = "Count"; // - // textBox1 + // textBoxName // - this.textBox1.Location = new System.Drawing.Point(107, 14); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(281, 22); - this.textBox1.TabIndex = 3; + textBoxName.Location = new Point(107, 18); + textBoxName.Margin = new Padding(3, 4, 3, 4); + textBoxName.Name = "textBoxName"; + textBoxName.Size = new Size(281, 27); + textBoxName.TabIndex = 3; // - // textBox2 + // textBoxPrice // - this.textBox2.Location = new System.Drawing.Point(107, 42); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(97, 22); - this.textBox2.TabIndex = 4; + textBoxPrice.Location = new Point(107, 52); + textBoxPrice.Margin = new Padding(3, 4, 3, 4); + textBoxPrice.Name = "textBoxPrice"; + textBoxPrice.ReadOnly = true; + textBoxPrice.Size = new Size(97, 27); + textBoxPrice.TabIndex = 4; + textBoxPrice.TabStop = false; // // groupBox1 // - this.groupBox1.Controls.Add(this.button4); - this.groupBox1.Controls.Add(this.button3); - this.groupBox1.Controls.Add(this.dataGridView1); - this.groupBox1.Controls.Add(this.button2); - this.groupBox1.Controls.Add(this.button1); - this.groupBox1.Location = new System.Drawing.Point(16, 76); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(787, 464); - this.groupBox1.TabIndex = 5; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Компоненты"; + groupBox1.Controls.Add(buttonRef); + groupBox1.Controls.Add(buttonDel); + groupBox1.Controls.Add(dataGridView); + groupBox1.Controls.Add(buttonUpd); + groupBox1.Controls.Add(buttonAdd); + groupBox1.Location = new Point(16, 95); + groupBox1.Margin = new Padding(3, 4, 3, 4); + groupBox1.Name = "groupBox1"; + groupBox1.Padding = new Padding(3, 4, 3, 4); + groupBox1.Size = new Size(787, 489); + groupBox1.TabIndex = 5; + groupBox1.TabStop = false; + groupBox1.Text = "Компоненты"; + // + // buttonSave + // + buttonSave.Location = new Point(454, 605); + buttonSave.Margin = new Padding(3, 4, 3, 4); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(130, 38); + buttonSave.TabIndex = 0; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(609, 605); + buttonCancel.Margin = new Padding(3, 4, 3, 4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(130, 38); + buttonCancel.TabIndex = 0; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; // // FormCanned // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(813, 558); - this.Controls.Add(this.groupBox1); - this.Controls.Add(this.textBox2); - this.Controls.Add(this.textBox1); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Name = "FormCanned"; - this.Text = "FormCanned"; - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); - this.groupBox1.ResumeLayout(false); - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(813, 663); + Controls.Add(groupBox1); + Controls.Add(textBoxPrice); + Controls.Add(textBoxName); + Controls.Add(label2); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(label1); + Margin = new Padding(3, 4, 3, 4); + Name = "FormCanned"; + Text = "Консерва"; + Load += FormCanned_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + groupBox1.ResumeLayout(false); + ResumeLayout(false); + PerformLayout(); } #endregion - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Button button4; - private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.Button button1; - private System.Windows.Forms.DataGridView dataGridView1; - private System.Windows.Forms.DataGridViewTextBoxColumn Component; - private System.Windows.Forms.DataGridViewTextBoxColumn Count; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.GroupBox groupBox1; + private Label label1; + private Label label2; + private Button buttonRef; + private Button buttonDel; + private Button buttonUpd; + private Button buttonAdd; + private DataGridView dataGridView; + private TextBox textBoxName; + private TextBox textBoxPrice; + private GroupBox groupBox1; + private DataGridViewTextBoxColumn Number; + private DataGridViewTextBoxColumn Component; + private DataGridViewTextBoxColumn Count; + private Button buttonSave; + private Button buttonCancel; } } \ No newline at end of file diff --git a/FishFactory/FormCanned.cs b/FishFactory/FormCanned.cs index 2bf2f9c..ffe2997 100644 --- a/FishFactory/FormCanned.cs +++ b/FishFactory/FormCanned.cs @@ -1,4 +1,6 @@ -using System; +using FishFactoryDataModel.Models; +using Microsoft.Extensions.Logging; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -7,14 +9,197 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using FishFactoryContracts.BusinessLogicsContracts; +using FishFactoryContracts.SearchModels; +using FishFactoryContracts.BindingModels; namespace FishFactory.Forms { public partial class FormCanned : Form { - public FormCanned() + private readonly ILogger _logger; + private readonly ICannedLogic _logic; + private int? _id; + private Dictionary _productComponents; + public int Id { set { _id = value; } } + public FormCanned(ILogger logger, ICannedLogic logic) { InitializeComponent(); + _logger = logger; + _logic = logic; + _productComponents = new Dictionary(); + } + private void FormCanned_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + _logger.LogInformation("Загрузка изделия"); + try + { + var view = _logic.ReadElement(new CannedSearchModel + { + Id = _id.Value + }); + if (view != null) + { + textBoxName.Text = view.CannedName; + textBoxPrice.Text = view.Price.ToString(); + _productComponents = view.CannedComponents ?? new Dictionary(); + LoadData(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки изделия"); + } + } + } + private void LoadData() + { + _logger.LogInformation("Загрузка компонент изделия"); + try + { + if (_productComponents != null) + { + dataGridView.Rows.Clear(); + foreach (var pc in _productComponents) + { + dataGridView.Rows.Add(new object[] { pc.Key, pc.Value.Item1.ComponentName, pc.Value.Item2 }); + } + textBoxPrice.Text = CalcPrice().ToString(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки компонент изделия"); + } + } + private void buttonAdd_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormCannedComponent)); + if (service is FormCannedComponent form) + { + if (form.ShowDialog() == DialogResult.OK) + { + if (form.ComponentModel == null) + { + return; + } + _logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count} ", form.ComponentModel.ComponentName, form.Count); + if (_productComponents.ContainsKey(form.Id)) + { + _productComponents[form.Id] = (form.ComponentModel, form.Count); + } + else + { + _productComponents.Add(form.Id, (form.ComponentModel, form.Count)); + } + LoadData(); + } + } + } + private void buttonUpd_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormCannedComponent)); + if (service is FormCannedComponent form) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + form.Id = id; + form.Count = _productComponents[id].Item2; + if (form.ShowDialog() == DialogResult.OK) + { + if (form.ComponentModel == null) + { + return; + } + _logger.LogInformation("Изменение компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); + _productComponents[form.Id] = (form.ComponentModel, form.Count); + LoadData(); + } + } + } + } + private void buttonDel_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + try + { + _logger.LogInformation("Удаление компонента: { ComponentName} - { Count}", dataGridView.SelectedRows[0].Cells[1].Value); + _productComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value)); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + LoadData(); + } + } + } + private void buttonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + private void buttonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxName.Text)) + { + MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(textBoxPrice.Text)) + { + MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (_productComponents == null || _productComponents.Count == 0) + { + MessageBox.Show("Заполните компоненты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение изделия"); + try + { + var model = new CannedBindingModel + { + Id = _id ?? 0, + CannedName = textBoxName.Text, + Price = Convert.ToDouble(textBoxPrice.Text), + CannedComponents = _productComponents + }; + 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(); + } + + private double CalcPrice() + { + double price = 0; + foreach (var elem in _productComponents) + { + price += ((elem.Value.Item1?.Cost ?? 0) * elem.Value.Item2); + } + return Math.Round(price * 1.1, 2); } } } diff --git a/FishFactory/FormCanned.resx b/FishFactory/FormCanned.resx index 0ecc145..5052aba 100644 --- a/FishFactory/FormCanned.resx +++ b/FishFactory/FormCanned.resx @@ -1,17 +1,17 @@  - @@ -117,10 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - + True diff --git a/FishFactory/FormCannedComponent.Designer.cs b/FishFactory/FormCannedComponent.Designer.cs index 5e90bfa..36cffad 100644 --- a/FishFactory/FormCannedComponent.Designer.cs +++ b/FishFactory/FormCannedComponent.Designer.cs @@ -28,90 +28,96 @@ /// private void InitializeComponent() { - this.button1 = new System.Windows.Forms.Button(); - this.button2 = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.comboBox1 = new System.Windows.Forms.ComboBox(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.SuspendLayout(); + buttonSave = new Button(); + buttonCancel = new Button(); + label1 = new Label(); + label2 = new Label(); + comboBoxComponent = new ComboBox(); + textBoxCount = new TextBox(); + SuspendLayout(); // - // button1 + // buttonSave // - this.button1.Location = new System.Drawing.Point(220, 80); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(86, 29); - this.button1.TabIndex = 0; - this.button1.Text = "button1"; - this.button1.UseVisualStyleBackColor = true; + buttonSave.Location = new Point(199, 100); + buttonSave.Margin = new Padding(3, 4, 3, 4); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(98, 36); + buttonSave.TabIndex = 0; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; // - // button2 + // buttonCancel // - this.button2.Location = new System.Drawing.Point(316, 80); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(86, 29); - this.button2.TabIndex = 1; - this.button2.Text = "button2"; - this.button2.UseVisualStyleBackColor = true; + buttonCancel.Location = new Point(308, 100); + buttonCancel.Margin = new Padding(3, 4, 3, 4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(98, 36); + buttonCancel.TabIndex = 1; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; // // label1 // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(14, 14); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(82, 16); - this.label1.TabIndex = 2; - this.label1.Text = "Компонент:"; + label1.AutoSize = true; + label1.Location = new Point(14, 18); + label1.Name = "label1"; + label1.Size = new Size(91, 20); + label1.TabIndex = 2; + label1.Text = "Компонент:"; // // label2 // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(14, 46); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(88, 16); - this.label2.TabIndex = 3; - this.label2.Text = "Количество:"; + label2.AutoSize = true; + label2.Location = new Point(14, 58); + label2.Name = "label2"; + label2.Size = new Size(93, 20); + label2.TabIndex = 3; + label2.Text = "Количество:"; // - // comboBox1 + // comboBoxComponent // - this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(121, 10); - this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(285, 24); - this.comboBox1.TabIndex = 4; + comboBoxComponent.FormattingEnabled = true; + comboBoxComponent.Location = new Point(121, 12); + comboBoxComponent.Margin = new Padding(3, 4, 3, 4); + comboBoxComponent.Name = "comboBoxComponent"; + comboBoxComponent.Size = new Size(285, 28); + comboBoxComponent.TabIndex = 4; // - // textBox1 + // textBoxCount // - this.textBox1.Location = new System.Drawing.Point(121, 46); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(285, 22); - this.textBox1.TabIndex = 5; + textBoxCount.Location = new Point(121, 58); + textBoxCount.Margin = new Padding(3, 4, 3, 4); + textBoxCount.Name = "textBoxCount"; + textBoxCount.Size = new Size(285, 27); + textBoxCount.TabIndex = 5; // // FormCannedComponent // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(426, 120); - this.Controls.Add(this.textBox1); - this.Controls.Add(this.comboBox1); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.button2); - this.Controls.Add(this.button1); - this.Name = "FormCannedComponent"; - this.Text = "FormCannedComponent"; - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(426, 150); + Controls.Add(textBoxCount); + Controls.Add(comboBoxComponent); + Controls.Add(label2); + Controls.Add(label1); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Margin = new Padding(3, 4, 3, 4); + Name = "FormCannedComponent"; + Text = "Компонент консервы"; + ResumeLayout(false); + PerformLayout(); } #endregion - private System.Windows.Forms.Button button1; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.ComboBox comboBox1; - private System.Windows.Forms.TextBox textBox1; + private Button buttonSave; + private Button buttonCancel; + private Label label1; + private Label label2; + private ComboBox comboBoxComponent; + private TextBox textBoxCount; } } \ No newline at end of file diff --git a/FishFactory/FormCannedComponent.cs b/FishFactory/FormCannedComponent.cs index 86f496a..37aacec 100644 --- a/FishFactory/FormCannedComponent.cs +++ b/FishFactory/FormCannedComponent.cs @@ -1,4 +1,7 @@ -using System; +using FishFactoryContracts.BusinessLogicsContracts; +using FishFactoryContracts.ViewModels; +using FishFactoryDataModel.Models; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,9 +15,75 @@ namespace FishFactory.Forms { public partial class FormCannedComponent : Form { - public FormCannedComponent() + private readonly List? _list; + public int Id + { + get + { + return Convert.ToInt32(comboBoxComponent.SelectedValue); + } + set + { + comboBoxComponent.SelectedValue = value; + } + } + public IComponentModel? ComponentModel + { + get + { + if (_list == null) + { + return null; + } + foreach (var elem in _list) + { + if (elem.Id == Id) + { + return elem; + } + } + return null; + } + } + public int Count + { + get { return Convert.ToInt32(textBoxCount.Text); } + set { textBoxCount.Text = value.ToString(); } + } + + public FormCannedComponent(IComponentLogic logic) { InitializeComponent(); + + _list = logic.ReadList(null); + if (_list != null) + { + comboBoxComponent.DisplayMember = "ComponentName"; + comboBoxComponent.ValueMember = "Id"; + comboBoxComponent.DataSource = _list; + comboBoxComponent.SelectedItem = null; + } + } + + private void buttonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxComponent.SelectedValue == null) + { + MessageBox.Show("Выберите компонент", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + DialogResult = DialogResult.OK; + Close(); + } + private void buttonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); } } } diff --git a/FishFactory/FormCannedComponent.resx b/FishFactory/FormCannedComponent.resx index 1af7de1..af32865 100644 --- a/FishFactory/FormCannedComponent.resx +++ b/FishFactory/FormCannedComponent.resx @@ -1,17 +1,17 @@  - diff --git a/FishFactory/FormCanneds.Designer.cs b/FishFactory/FormCanneds.Designer.cs new file mode 100644 index 0000000..59ee6c4 --- /dev/null +++ b/FishFactory/FormCanneds.Designer.cs @@ -0,0 +1,120 @@ +namespace FishFactory.Forms +{ + partial class FormCanneds + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + buttonRef = new Button(); + buttonDel = new Button(); + buttonUpd = new Button(); + buttonAdd = new Button(); + dataGridView = new DataGridView(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // buttonRef + // + buttonRef.Location = new Point(740, 180); + buttonRef.Margin = new Padding(3, 4, 3, 4); + buttonRef.Name = "buttonRef"; + buttonRef.Size = new Size(128, 35); + buttonRef.TabIndex = 9; + buttonRef.Text = "Обновить"; + buttonRef.UseVisualStyleBackColor = true; + buttonRef.Click += buttonRef_Click; + // + // buttonDel + // + buttonDel.Location = new Point(740, 129); + buttonDel.Margin = new Padding(3, 4, 3, 4); + buttonDel.Name = "buttonDel"; + buttonDel.Size = new Size(128, 35); + buttonDel.TabIndex = 8; + buttonDel.Text = "Удалить"; + buttonDel.UseVisualStyleBackColor = true; + buttonDel.Click += buttonDel_Click; + // + // buttonUpd + // + buttonUpd.Location = new Point(740, 77); + buttonUpd.Margin = new Padding(3, 4, 3, 4); + buttonUpd.Name = "buttonUpd"; + buttonUpd.Size = new Size(128, 35); + buttonUpd.TabIndex = 7; + buttonUpd.Text = "Изменить"; + buttonUpd.UseVisualStyleBackColor = true; + buttonUpd.Click += buttonUpd_Click; + // + // buttonAdd + // + buttonAdd.Location = new Point(740, 27); + buttonAdd.Margin = new Padding(3, 4, 3, 4); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(128, 35); + buttonAdd.TabIndex = 6; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; + // + // dataGridView + // + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Location = new Point(-1, 0); + dataGridView.Margin = new Padding(3, 4, 3, 4); + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 24; + dataGridView.Size = new Size(709, 568); + dataGridView.TabIndex = 5; + // + // FormCanneds + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(895, 570); + Controls.Add(buttonRef); + Controls.Add(buttonDel); + Controls.Add(buttonUpd); + Controls.Add(buttonAdd); + Controls.Add(dataGridView); + Name = "FormCanneds"; + Text = "Список консерв"; + Load += FormCanneds_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private Button buttonRef; + private Button buttonDel; + private Button buttonUpd; + private Button buttonAdd; + private DataGridView dataGridView; + } +} \ No newline at end of file diff --git a/FishFactory/FormCanneds.cs b/FishFactory/FormCanneds.cs new file mode 100644 index 0000000..6cbeb50 --- /dev/null +++ b/FishFactory/FormCanneds.cs @@ -0,0 +1,115 @@ +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; +using FishFactory; +using FishFactoryContracts.BindingModels; +using FishFactoryContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; + +namespace FishFactory.Forms +{ + public partial class FormCanneds : Form + { + private readonly ILogger _logger; + private readonly ICannedLogic _logic; + public FormCanneds(ILogger logger, ICannedLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormCanneds_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["CannedComponents"].Visible = false; + dataGridView.Columns["CannedName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка консерв"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки компонентов"); + } + } + + private void buttonAdd_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormCanned)); + if (service is FormCanned 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(FormCanned)); + if (service is FormCanned 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 CannedBindingModel + { + 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(); + } + } +} diff --git a/FishFactory/FormCanneds.resx b/FishFactory/FormCanneds.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/FishFactory/FormCanneds.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/FishFactory/FormComponent.Designer.cs b/FishFactory/FormComponent.Designer.cs index 8412d68..db006a9 100644 --- a/FishFactory/FormComponent.Designer.cs +++ b/FishFactory/FormComponent.Designer.cs @@ -28,91 +28,95 @@ /// private void InitializeComponent() { - this.buttonSave = new System.Windows.Forms.Button(); - this.buttonCancel = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.textBoxName = new System.Windows.Forms.TextBox(); - this.textBoxCost = new System.Windows.Forms.TextBox(); - this.SuspendLayout(); + buttonSave = new Button(); + buttonCancel = new Button(); + label1 = new Label(); + label2 = new Label(); + textBoxName = new TextBox(); + textBoxCost = new TextBox(); + SuspendLayout(); // // buttonSave // - this.buttonSave.Location = new System.Drawing.Point(217, 95); - this.buttonSave.Name = "buttonSave"; - this.buttonSave.Size = new System.Drawing.Size(98, 27); - this.buttonSave.TabIndex = 0; - this.buttonSave.Text = "Сохранить"; - this.buttonSave.UseVisualStyleBackColor = true; - this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + buttonSave.Location = new Point(217, 119); + buttonSave.Margin = new Padding(3, 4, 3, 4); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(98, 34); + buttonSave.TabIndex = 0; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; // // buttonCancel // - this.buttonCancel.Location = new System.Drawing.Point(325, 95); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(98, 27); - this.buttonCancel.TabIndex = 1; - this.buttonCancel.Text = "Отмена"; - this.buttonCancel.UseVisualStyleBackColor = true; - this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); + buttonCancel.Location = new Point(325, 119); + buttonCancel.Margin = new Padding(3, 4, 3, 4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(98, 34); + buttonCancel.TabIndex = 1; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; // // label1 // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(24, 24); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(76, 16); - this.label1.TabIndex = 2; - this.label1.Text = "Название:"; + label1.AutoSize = true; + label1.Location = new Point(24, 30); + label1.Name = "label1"; + label1.Size = new Size(80, 20); + label1.TabIndex = 2; + label1.Text = "Название:"; // // label2 // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 55); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(43, 16); - this.label2.TabIndex = 3; - this.label2.Text = "Цена:"; + label2.AutoSize = true; + label2.Location = new Point(24, 69); + label2.Name = "label2"; + label2.Size = new Size(48, 20); + label2.TabIndex = 3; + label2.Text = "Цена:"; // // textBoxName // - this.textBoxName.Location = new System.Drawing.Point(118, 21); - this.textBoxName.Name = "textBoxName"; - this.textBoxName.Size = new System.Drawing.Size(305, 22); - this.textBoxName.TabIndex = 4; + textBoxName.Location = new Point(118, 26); + textBoxName.Margin = new Padding(3, 4, 3, 4); + textBoxName.Name = "textBoxName"; + textBoxName.Size = new Size(305, 27); + textBoxName.TabIndex = 4; // // textBoxCost // - this.textBoxCost.Location = new System.Drawing.Point(118, 52); - this.textBoxCost.Name = "textBoxCost"; - this.textBoxCost.Size = new System.Drawing.Size(186, 22); - this.textBoxCost.TabIndex = 5; + textBoxCost.Location = new Point(118, 65); + textBoxCost.Margin = new Padding(3, 4, 3, 4); + textBoxCost.Name = "textBoxCost"; + textBoxCost.Size = new Size(186, 27); + textBoxCost.TabIndex = 5; // // FormComponent // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(462, 139); - this.Controls.Add(this.textBoxCost); - this.Controls.Add(this.textBoxName); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.buttonCancel); - this.Controls.Add(this.buttonSave); - this.Name = "FormComponent"; - this.Text = "FormComponent"; - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(462, 174); + Controls.Add(textBoxCost); + Controls.Add(textBoxName); + Controls.Add(label2); + Controls.Add(label1); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Margin = new Padding(3, 4, 3, 4); + Name = "FormComponent"; + Text = "Компонент"; + ResumeLayout(false); + PerformLayout(); } #endregion - private System.Windows.Forms.Button buttonSave; - private System.Windows.Forms.Button buttonCancel; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.TextBox textBoxName; - private System.Windows.Forms.TextBox textBoxCost; + private Button buttonSave; + private Button buttonCancel; + private Label label1; + private Label label2; + private TextBox textBoxName; + private TextBox textBoxCost; } } \ No newline at end of file diff --git a/FishFactory/FormComponent.cs b/FishFactory/FormComponent.cs index 613e314..86b613f 100644 --- a/FishFactory/FormComponent.cs +++ b/FishFactory/FormComponent.cs @@ -8,7 +8,10 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using Microsoft.Extensions.Logging; -using FishFactoryBusinessLogic.BusinessLogic; +using FishFactoryContracts.BusinessLogicsContracts; +using Microsoft.VisualBasic.Logging; +using FishFactoryContracts.SearchModels; +using FishFactoryContracts.BindingModels; namespace FishFactory.Forms { @@ -18,19 +21,75 @@ namespace FishFactory.Forms private readonly IComponentLogic _logic; private int? _id; public int Id { set { _id = value; } } - public FormComponent((ILogger logger, IComponentLogic logic) + public FormComponent(ILogger logger, IComponentLogic logic) { InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormComponent_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + try + { + _logger.LogInformation("Получение компонента"); + var view = _logic.ReadElement(new ComponentSearchModel + { + Id = _id.Value + }); + if (view != null) + { + textBoxName.Text = view.ComponentName; + textBoxCost.Text = view.Cost.ToString(); + } + } + 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(textBoxName.Text)) + { + MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение компонента"); + try + { + var model = new ComponentBindingModel + { + Id = _id ?? 0, + ComponentName = textBoxName.Text, + Cost = Convert.ToDouble(textBoxCost.Text) + }; + 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(); } } } diff --git a/FishFactory/FormComponent.resx b/FishFactory/FormComponent.resx index 1af7de1..af32865 100644 --- a/FishFactory/FormComponent.resx +++ b/FishFactory/FormComponent.resx @@ -1,17 +1,17 @@  - diff --git a/FishFactory/FormComponents.Designer.cs b/FishFactory/FormComponents.Designer.cs index b04807a..f1542ad 100644 --- a/FishFactory/FormComponents.Designer.cs +++ b/FishFactory/FormComponents.Designer.cs @@ -28,83 +28,94 @@ /// private void InitializeComponent() { - this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.button1 = new System.Windows.Forms.Button(); - this.button2 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.button4 = new System.Windows.Forms.Button(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); - this.SuspendLayout(); + dataGridView = new DataGridView(); + buttonAdd = new Button(); + buttonUpd = new Button(); + buttonDel = new Button(); + buttonRef = new Button(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); // - // dataGridView1 + // dataGridView // - this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView1.Location = new System.Drawing.Point(-1, -2); - this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.RowHeadersWidth = 51; - this.dataGridView1.RowTemplate.Height = 24; - this.dataGridView1.Size = new System.Drawing.Size(499, 454); - this.dataGridView1.TabIndex = 0; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Location = new Point(-1, -2); + dataGridView.Margin = new Padding(3, 4, 3, 4); + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 24; + dataGridView.Size = new Size(499, 568); + dataGridView.TabIndex = 0; // - // button1 + // buttonAdd // - this.button1.Location = new System.Drawing.Point(525, 38); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(111, 28); - this.button1.TabIndex = 1; - this.button1.Text = "button1"; - this.button1.UseVisualStyleBackColor = true; + buttonAdd.Location = new Point(525, 48); + buttonAdd.Margin = new Padding(3, 4, 3, 4); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(125, 35); + buttonAdd.TabIndex = 1; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; // - // button2 + // buttonUpd // - this.button2.Location = new System.Drawing.Point(525, 78); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(111, 28); - this.button2.TabIndex = 2; - this.button2.Text = "button2"; - this.button2.UseVisualStyleBackColor = true; + buttonUpd.Location = new Point(525, 98); + buttonUpd.Margin = new Padding(3, 4, 3, 4); + buttonUpd.Name = "buttonUpd"; + buttonUpd.Size = new Size(125, 35); + buttonUpd.TabIndex = 2; + buttonUpd.Text = "Изменить"; + buttonUpd.UseVisualStyleBackColor = true; + buttonUpd.Click += buttonUpd_Click; // - // button3 + // buttonDel // - this.button3.Location = new System.Drawing.Point(525, 120); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(111, 28); - this.button3.TabIndex = 3; - this.button3.Text = "button3"; - this.button3.UseVisualStyleBackColor = true; + buttonDel.Location = new Point(525, 150); + buttonDel.Margin = new Padding(3, 4, 3, 4); + buttonDel.Name = "buttonDel"; + buttonDel.Size = new Size(125, 35); + buttonDel.TabIndex = 3; + buttonDel.Text = "Удалить"; + buttonDel.UseVisualStyleBackColor = true; + buttonDel.Click += buttonDel_Click; // - // button4 + // buttonRef // - this.button4.Location = new System.Drawing.Point(525, 161); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(111, 28); - this.button4.TabIndex = 4; - this.button4.Text = "button4"; - this.button4.UseVisualStyleBackColor = true; + buttonRef.Location = new Point(525, 201); + buttonRef.Margin = new Padding(3, 4, 3, 4); + buttonRef.Name = "buttonRef"; + buttonRef.Size = new Size(125, 35); + buttonRef.TabIndex = 4; + buttonRef.Text = "Обновить"; + buttonRef.UseVisualStyleBackColor = true; + buttonRef.Click += buttonRef_Click; // // FormComponents // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(662, 450); - this.Controls.Add(this.button4); - this.Controls.Add(this.button3); - this.Controls.Add(this.button2); - this.Controls.Add(this.button1); - this.Controls.Add(this.dataGridView1); - this.Name = "FormComponents"; - this.Text = "FormComponents"; - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); - this.ResumeLayout(false); - + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(676, 562); + Controls.Add(buttonRef); + Controls.Add(buttonDel); + Controls.Add(buttonUpd); + Controls.Add(buttonAdd); + Controls.Add(dataGridView); + Margin = new Padding(3, 4, 3, 4); + Name = "FormComponents"; + Text = "Список компонентов"; + Load += FormComponents_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); } #endregion - private System.Windows.Forms.DataGridView dataGridView1; - private System.Windows.Forms.Button button1; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button4; + private DataGridView dataGridView; + private Button buttonAdd; + private Button buttonUpd; + private Button buttonDel; + private Button buttonRef; } } \ No newline at end of file diff --git a/FishFactory/FormComponents.cs b/FishFactory/FormComponents.cs index 4915dd4..ef3531a 100644 --- a/FishFactory/FormComponents.cs +++ b/FishFactory/FormComponents.cs @@ -1,4 +1,7 @@ -using System; +using FishFactoryContracts.BindingModels; +using FishFactoryContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,9 +15,99 @@ namespace FishFactory.Forms { public partial class FormComponents : Form { - public FormComponents() + private readonly ILogger _logger; + private readonly IComponentLogic _logic; + public FormComponents(ILogger logger, IComponentLogic logic) { InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormComponents_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["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка компонентов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки компонентов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void buttonAdd_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); + if (service is FormComponent 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(FormComponent)); + if (service is FormComponent 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 ComponentBindingModel + { + 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(); } } } diff --git a/FishFactory/FormComponents.resx b/FishFactory/FormComponents.resx index 1af7de1..af32865 100644 --- a/FishFactory/FormComponents.resx +++ b/FishFactory/FormComponents.resx @@ -1,17 +1,17 @@  - diff --git a/FishFactory/FormCreateOrder.Designer.cs b/FishFactory/FormCreateOrder.Designer.cs index 972a2e7..22e74f7 100644 --- a/FishFactory/FormCreateOrder.Designer.cs +++ b/FishFactory/FormCreateOrder.Designer.cs @@ -28,112 +28,123 @@ /// private void InitializeComponent() { - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.textBoxCount = new System.Windows.Forms.TextBox(); - this.comboBoxCanned = new System.Windows.Forms.ComboBox(); - this.textBoxSum = new System.Windows.Forms.TextBox(); - this.buttonSave = new System.Windows.Forms.Button(); - this.buttonCancel = new System.Windows.Forms.Button(); - this.SuspendLayout(); + label1 = new Label(); + label2 = new Label(); + label3 = new Label(); + textBoxCount = new TextBox(); + comboBoxCanned = new ComboBox(); + textBoxSum = new TextBox(); + buttonSave = new Button(); + buttonCancel = new Button(); + SuspendLayout(); // // label1 // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(22, 13); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(68, 16); - this.label1.TabIndex = 0; - this.label1.Text = "Изделие:"; + label1.AutoSize = true; + label1.Location = new Point(22, 16); + label1.Name = "label1"; + label1.Size = new Size(71, 20); + label1.TabIndex = 0; + label1.Text = "Изделие:"; // // label2 // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(22, 46); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(88, 16); - this.label2.TabIndex = 1; - this.label2.Text = "Количество:"; + label2.AutoSize = true; + label2.Location = new Point(22, 58); + label2.Name = "label2"; + label2.Size = new Size(93, 20); + label2.TabIndex = 1; + label2.Text = "Количество:"; // // label3 // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(22, 75); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(53, 16); - this.label3.TabIndex = 2; - this.label3.Text = "Сумма:"; + label3.AutoSize = true; + label3.Location = new Point(22, 94); + label3.Name = "label3"; + label3.Size = new Size(58, 20); + label3.TabIndex = 2; + label3.Text = "Сумма:"; // // textBoxCount // - this.textBoxCount.Location = new System.Drawing.Point(118, 43); - this.textBoxCount.Name = "textBoxCount"; - this.textBoxCount.Size = new System.Drawing.Size(280, 22); - this.textBoxCount.TabIndex = 3; + textBoxCount.Location = new Point(118, 55); + textBoxCount.Margin = new Padding(3, 4, 3, 4); + textBoxCount.Name = "textBoxCount"; + textBoxCount.Size = new Size(280, 27); + textBoxCount.TabIndex = 3; + textBoxCount.TextChanged += textBoxCount_TextChanged; // // comboBoxCanned // - this.comboBoxCanned.FormattingEnabled = true; - this.comboBoxCanned.Location = new System.Drawing.Point(118, 11); - this.comboBoxCanned.Name = "comboBoxCanned"; - this.comboBoxCanned.Size = new System.Drawing.Size(280, 24); - this.comboBoxCanned.TabIndex = 4; + comboBoxCanned.FormattingEnabled = true; + comboBoxCanned.Location = new Point(118, 14); + comboBoxCanned.Margin = new Padding(3, 4, 3, 4); + comboBoxCanned.Name = "comboBoxCanned"; + comboBoxCanned.Size = new Size(280, 28); + comboBoxCanned.TabIndex = 4; + comboBoxCanned.SelectedIndexChanged += ComboBoxCanned_SelectedIndexChanged; // // textBoxSum // - this.textBoxSum.Location = new System.Drawing.Point(118, 75); - this.textBoxSum.Name = "textBoxSum"; - this.textBoxSum.Size = new System.Drawing.Size(280, 22); - this.textBoxSum.TabIndex = 5; + textBoxSum.Location = new Point(118, 94); + textBoxSum.Margin = new Padding(3, 4, 3, 4); + textBoxSum.Name = "textBoxSum"; + textBoxSum.ReadOnly = true; + textBoxSum.Size = new Size(280, 27); + textBoxSum.TabIndex = 5; // // buttonSave // - this.buttonSave.Location = new System.Drawing.Point(215, 108); - this.buttonSave.Name = "buttonSave"; - this.buttonSave.Size = new System.Drawing.Size(88, 28); - this.buttonSave.TabIndex = 6; - this.buttonSave.Text = "Сохранить"; - this.buttonSave.UseVisualStyleBackColor = true; + buttonSave.Location = new Point(172, 135); + buttonSave.Margin = new Padding(3, 4, 3, 4); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(107, 35); + buttonSave.TabIndex = 6; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; // // buttonCancel // - this.buttonCancel.Location = new System.Drawing.Point(310, 108); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(88, 28); - this.buttonCancel.TabIndex = 7; - this.buttonCancel.Text = "Отмена"; - this.buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Location = new Point(285, 135); + buttonCancel.Margin = new Padding(3, 4, 3, 4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(107, 35); + buttonCancel.TabIndex = 7; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; // // FormCreateOrder // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(428, 146); - this.Controls.Add(this.buttonCancel); - this.Controls.Add(this.buttonSave); - this.Controls.Add(this.textBoxSum); - this.Controls.Add(this.comboBoxCanned); - this.Controls.Add(this.textBoxCount); - this.Controls.Add(this.label3); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Name = "FormCreateOrder"; - this.Text = "Заказ"; - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(428, 182); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(textBoxSum); + Controls.Add(comboBoxCanned); + Controls.Add(textBoxCount); + Controls.Add(label3); + Controls.Add(label2); + Controls.Add(label1); + Margin = new Padding(3, 4, 3, 4); + Name = "FormCreateOrder"; + Text = "Заказ"; + Load += new System.EventHandler(this.FormCreateOrder_Load); + ResumeLayout(false); + PerformLayout(); } #endregion - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.TextBox textBoxCount; - private System.Windows.Forms.ComboBox comboBoxCanned; - private System.Windows.Forms.TextBox textBoxSum; - private System.Windows.Forms.Button buttonSave; - private System.Windows.Forms.Button buttonCancel; + private Label label1; + private Label label2; + private Label label3; + private TextBox textBoxCount; + private ComboBox comboBoxCanned; + private TextBox textBoxSum; + private Button buttonSave; + private Button buttonCancel; } } \ No newline at end of file diff --git a/FishFactory/FormCreateOrder.cs b/FishFactory/FormCreateOrder.cs index c2d0511..dc9a485 100644 --- a/FishFactory/FormCreateOrder.cs +++ b/FishFactory/FormCreateOrder.cs @@ -1,4 +1,8 @@ -using System; +using FishFactoryContracts.BindingModels; +using FishFactoryContracts.BusinessLogicsContracts; +using FishFactoryContracts.SearchModels; +using Microsoft.Extensions.Logging; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,9 +16,108 @@ namespace FishFactory.Forms { public partial class FormCreateOrder : Form { - public FormCreateOrder() + private readonly ILogger _logger; + private readonly ICannedLogic _logicP; + private readonly IOrderLogic _logicO; + public FormCreateOrder(ILogger logger, ICannedLogic logicP, IOrderLogic logicO) { InitializeComponent(); + _logger = logger; + _logicP = logicP; + _logicO = logicO; } + + private void FormCreateOrder_Load(object sender, EventArgs e) + { + try + { + var list = _logicP.ReadList(null); + if (list != null) + { + comboBoxCanned.DisplayMember = "CannedName"; + comboBoxCanned.ValueMember = "Id"; + comboBoxCanned.DataSource = list; + comboBoxCanned.SelectedItem = null; + _logger.LogInformation("Загрузка изделий для заказа"); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка изделий"); + } + } + private void CalcSum() + { + if (comboBoxCanned.SelectedValue != null && !string.IsNullOrEmpty(textBoxCount.Text)) + { + try + { + int id = Convert.ToInt32(comboBoxCanned.SelectedValue); + var canned = _logicP.ReadElement(new CannedSearchModel + { + Id = id + }); + int count = Convert.ToInt32(textBoxCount.Text); + textBoxSum.Text = Math.Round(count * (canned?.Price ?? 0), 2).ToString(); + _logger.LogInformation("Расчет суммы заказа"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка расчета суммы заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + private void textBoxCount_TextChanged(object sender, EventArgs e) + { + CalcSum(); + } + + private void ComboBoxCanned_SelectedIndexChanged(object sender, EventArgs e) + { + CalcSum(); + } + + private void buttonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxCanned.SelectedValue == null) + { + MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Создание заказа"); + try + { + var operationResult = _logicO.CreateOrder(new OrderBindingModel + { + CannedId = Convert.ToInt32(comboBoxCanned.SelectedValue), + Count = Convert.ToInt32(textBoxCount.Text), + Sum = Convert.ToDouble(textBoxSum.Text) + }); + 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(); + } + } } diff --git a/FishFactory/FormCreateOrder.resx b/FishFactory/FormCreateOrder.resx index 1af7de1..af32865 100644 --- a/FishFactory/FormCreateOrder.resx +++ b/FishFactory/FormCreateOrder.resx @@ -1,17 +1,17 @@  - diff --git a/FishFactory/FormMain.Designer.cs b/FishFactory/FormMain.Designer.cs index 57a63ee..73fef74 100644 --- a/FishFactory/FormMain.Designer.cs +++ b/FishFactory/FormMain.Designer.cs @@ -29,143 +29,156 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain)); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.buttonCreateOrder = new System.Windows.Forms.Button(); - this.buttonTakeOrderInWork = new System.Windows.Forms.Button(); - this.buttonOrderReady = new System.Windows.Forms.Button(); - this.buttonIssuedOrder = new System.Windows.Forms.Button(); - this.buttonRef = new System.Windows.Forms.Button(); - this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton(); - this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.консервыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStrip1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); - this.SuspendLayout(); + toolStrip1 = new ToolStrip(); + toolStripDropDownButton1 = new ToolStripDropDownButton(); + компонентыToolStripMenuItem = new ToolStripMenuItem(); + консервыToolStripMenuItem = new ToolStripMenuItem(); + buttonCreateOrder = new Button(); + buttonTakeOrderInWork = new Button(); + buttonOrderReady = new Button(); + buttonIssuedOrder = new Button(); + buttonRef = new Button(); + dataGridView = new DataGridView(); + toolStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); // // toolStrip1 // - this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripDropDownButton1}); - this.toolStrip1.Location = new System.Drawing.Point(0, 0); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(865, 27); - this.toolStrip1.TabIndex = 0; - this.toolStrip1.Text = "toolStrip1"; - // - // buttonCreateOrder - // - this.buttonCreateOrder.Location = new System.Drawing.Point(655, 43); - this.buttonCreateOrder.Name = "buttonCreateOrder"; - this.buttonCreateOrder.Size = new System.Drawing.Size(175, 26); - this.buttonCreateOrder.TabIndex = 1; - this.buttonCreateOrder.Text = "Создать заказ"; - this.buttonCreateOrder.UseVisualStyleBackColor = true; - // - // buttonTakeOrderInWork - // - this.buttonTakeOrderInWork.Location = new System.Drawing.Point(655, 90); - this.buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; - this.buttonTakeOrderInWork.Size = new System.Drawing.Size(175, 26); - this.buttonTakeOrderInWork.TabIndex = 2; - this.buttonTakeOrderInWork.Text = "Отдать на выполнение"; - this.buttonTakeOrderInWork.UseVisualStyleBackColor = true; - // - // buttonOrderReady - // - this.buttonOrderReady.Location = new System.Drawing.Point(655, 135); - this.buttonOrderReady.Name = "buttonOrderReady"; - this.buttonOrderReady.Size = new System.Drawing.Size(175, 26); - this.buttonOrderReady.TabIndex = 3; - this.buttonOrderReady.Text = "Заказ готов"; - this.buttonOrderReady.UseVisualStyleBackColor = true; - // - // buttonIssuedOrder - // - this.buttonIssuedOrder.Location = new System.Drawing.Point(655, 176); - this.buttonIssuedOrder.Name = "buttonIssuedOrder"; - this.buttonIssuedOrder.Size = new System.Drawing.Size(175, 26); - this.buttonIssuedOrder.TabIndex = 4; - this.buttonIssuedOrder.Text = "Заказ выдан"; - this.buttonIssuedOrder.UseVisualStyleBackColor = true; - // - // buttonRef - // - this.buttonRef.Location = new System.Drawing.Point(655, 220); - this.buttonRef.Name = "buttonRef"; - this.buttonRef.Size = new System.Drawing.Size(175, 26); - this.buttonRef.TabIndex = 5; - this.buttonRef.Text = "Обновить список"; - this.buttonRef.UseVisualStyleBackColor = true; - // - // dataGridView1 - // - this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView1.Location = new System.Drawing.Point(0, 28); - this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.RowHeadersWidth = 51; - this.dataGridView1.RowTemplate.Height = 24; - this.dataGridView1.Size = new System.Drawing.Size(630, 464); - this.dataGridView1.TabIndex = 6; + toolStrip1.ImageScalingSize = new Size(20, 20); + toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1 }); + toolStrip1.Location = new Point(0, 0); + toolStrip1.Name = "toolStrip1"; + toolStrip1.Size = new Size(1107, 27); + toolStrip1.TabIndex = 0; + toolStrip1.Text = "toolStrip1"; // // toolStripDropDownButton1 // - this.toolStripDropDownButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.компонентыToolStripMenuItem, - this.консервыToolStripMenuItem}); - this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); - this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(108, 24); - this.toolStripDropDownButton1.Text = "Справочник"; + toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text; + toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, консервыToolStripMenuItem }); + toolStripDropDownButton1.Image = (Image)resources.GetObject("toolStripDropDownButton1.Image"); + toolStripDropDownButton1.ImageTransparentColor = Color.Magenta; + toolStripDropDownButton1.Name = "toolStripDropDownButton1"; + toolStripDropDownButton1.Size = new Size(108, 24); + toolStripDropDownButton1.Text = "Справочник"; // // компонентыToolStripMenuItem // - this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(224, 26); - this.компонентыToolStripMenuItem.Text = "Компоненты"; + компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; + компонентыToolStripMenuItem.Size = new Size(182, 26); + компонентыToolStripMenuItem.Text = "Компоненты"; + компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click; // // консервыToolStripMenuItem // - this.консервыToolStripMenuItem.Name = "консервыToolStripMenuItem"; - this.консервыToolStripMenuItem.Size = new System.Drawing.Size(224, 26); - this.консервыToolStripMenuItem.Text = "Консервы"; + консервыToolStripMenuItem.Name = "консервыToolStripMenuItem"; + консервыToolStripMenuItem.Size = new Size(182, 26); + консервыToolStripMenuItem.Text = "Консервы"; + консервыToolStripMenuItem.Click += консервыToolStripMenuItem_Click; + // + // buttonCreateOrder + // + buttonCreateOrder.Location = new Point(914, 75); + buttonCreateOrder.Margin = new Padding(3, 4, 3, 4); + buttonCreateOrder.Name = "buttonCreateOrder"; + buttonCreateOrder.Size = new Size(161, 32); + buttonCreateOrder.TabIndex = 1; + buttonCreateOrder.Text = "Создать заказ"; + buttonCreateOrder.UseVisualStyleBackColor = true; + buttonCreateOrder.Click += buttonCreateOrder_Click; + // + // buttonTakeOrderInWork + // + buttonTakeOrderInWork.Location = new Point(914, 133); + buttonTakeOrderInWork.Margin = new Padding(3, 4, 3, 4); + buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; + buttonTakeOrderInWork.Size = new Size(161, 32); + buttonTakeOrderInWork.TabIndex = 2; + buttonTakeOrderInWork.Text = "Отдать на выполнение"; + buttonTakeOrderInWork.UseVisualStyleBackColor = true; + buttonTakeOrderInWork.Click += buttonTakeOrderInWork_Click; + // + // buttonOrderReady + // + buttonOrderReady.Location = new Point(914, 190); + buttonOrderReady.Margin = new Padding(3, 4, 3, 4); + buttonOrderReady.Name = "buttonOrderReady"; + buttonOrderReady.Size = new Size(161, 32); + buttonOrderReady.TabIndex = 3; + buttonOrderReady.Text = "Заказ готов"; + buttonOrderReady.UseVisualStyleBackColor = true; + buttonOrderReady.Click += buttonOrderReady_Click; + // + // buttonIssuedOrder + // + buttonIssuedOrder.Location = new Point(914, 241); + buttonIssuedOrder.Margin = new Padding(3, 4, 3, 4); + buttonIssuedOrder.Name = "buttonIssuedOrder"; + buttonIssuedOrder.Size = new Size(161, 32); + buttonIssuedOrder.TabIndex = 4; + buttonIssuedOrder.Text = "Заказ выдан"; + buttonIssuedOrder.UseVisualStyleBackColor = true; + buttonIssuedOrder.Click += buttonIssuedOrder_Click; + // + // buttonRef + // + buttonRef.Location = new Point(914, 296); + buttonRef.Margin = new Padding(3, 4, 3, 4); + buttonRef.Name = "buttonRef"; + buttonRef.Size = new Size(161, 32); + buttonRef.TabIndex = 5; + buttonRef.Text = "Обновить список"; + buttonRef.UseVisualStyleBackColor = true; + buttonRef.Click += buttonRef_Click; + // + // dataGridView + // + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Location = new Point(0, 35); + dataGridView.Margin = new Padding(3, 4, 3, 4); + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 24; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(872, 580); + dataGridView.TabIndex = 6; // // FormMain // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(865, 494); - this.Controls.Add(this.dataGridView1); - this.Controls.Add(this.buttonRef); - this.Controls.Add(this.buttonIssuedOrder); - this.Controls.Add(this.buttonOrderReady); - this.Controls.Add(this.buttonTakeOrderInWork); - this.Controls.Add(this.buttonCreateOrder); - this.Controls.Add(this.toolStrip1); - this.Name = "FormMain"; - this.Text = "Рыбный завод"; - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1107, 615); + Controls.Add(dataGridView); + Controls.Add(buttonRef); + Controls.Add(buttonIssuedOrder); + Controls.Add(buttonOrderReady); + Controls.Add(buttonTakeOrderInWork); + Controls.Add(buttonCreateOrder); + Controls.Add(toolStrip1); + Margin = new Padding(3, 4, 3, 4); + Name = "FormMain"; + Text = "Рыбный завод"; + Load += FormMain_Load; + toolStrip1.ResumeLayout(false); + toolStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + PerformLayout(); } #endregion - private System.Windows.Forms.ToolStrip toolStrip1; - private System.Windows.Forms.Button buttonCreateOrder; - private System.Windows.Forms.Button buttonTakeOrderInWork; - private System.Windows.Forms.Button buttonOrderReady; - private System.Windows.Forms.Button buttonIssuedOrder; - private System.Windows.Forms.Button buttonRef; - private System.Windows.Forms.DataGridView dataGridView1; - private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1; - private System.Windows.Forms.ToolStripMenuItem компонентыToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem консервыToolStripMenuItem; + private ToolStrip toolStrip1; + private Button buttonCreateOrder; + private Button buttonTakeOrderInWork; + private Button buttonOrderReady; + private Button buttonIssuedOrder; + private Button buttonRef; + private DataGridView dataGridView; + private ToolStripDropDownButton toolStripDropDownButton1; + private ToolStripMenuItem компонентыToolStripMenuItem; + private ToolStripMenuItem консервыToolStripMenuItem; } } \ No newline at end of file diff --git a/FishFactory/FormMain.cs b/FishFactory/FormMain.cs index dbc3ffa..4c661cf 100644 --- a/FishFactory/FormMain.cs +++ b/FishFactory/FormMain.cs @@ -1,4 +1,7 @@ -using System; +using FishFactoryContracts.BindingModels; +using FishFactoryContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,10 +15,140 @@ namespace FishFactory.Forms { public partial class FormMain : Form { - public FormMain() + private readonly ILogger _logger; + private readonly IOrderLogic _orderLogic; + public FormMain(ILogger logger, IOrderLogic orderLogic) { InitializeComponent(); + _logger = logger; + _orderLogic = orderLogic; + } + private void FormMain_Load(object sender, EventArgs e) + { + LoadData(); + } + private void LoadData() + { + _logger.LogInformation("Загрузка заказов"); + try + { + var list = _orderLogic.ReadList(null); + + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["CannedId"].Visible = false; + dataGridView.Columns["CannedName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + + _logger.LogInformation("Загрузка заказов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки заказов"); + } + } + private void компонентыToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); + if (service is FormComponents form) + { + form.ShowDialog(); + } + } + private void консервыToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormCanneds)); + + if (service is FormCanneds form) + { + form.ShowDialog(); + } } + private void buttonCreateOrder_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); + if (service is FormCreateOrder form) + { + form.ShowDialog(); + LoadData(); + } + } + private void buttonTakeOrderInWork_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id); + try + { + var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel + { Id = id }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка передачи заказа в работу"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + private void buttonOrderReady_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = + Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id); + try + { + var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о готовности заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + private void buttonIssuedOrder_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id); + try + { + var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel + { + Id = id + }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + _logger.LogInformation("Заказ №{id} выдан", id); + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + private void buttonRef_Click(object sender, EventArgs e) + { + LoadData(); + } } } diff --git a/FishFactory/FormMain.resx b/FishFactory/FormMain.resx index f5c694e..672dbc1 100644 --- a/FishFactory/FormMain.resx +++ b/FishFactory/FormMain.resx @@ -1,17 +1,17 @@  - @@ -136,4 +136,7 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + 56 + \ No newline at end of file diff --git a/FishFactory/Program.cs b/FishFactory/Program.cs index 78294d3..08c8b2d 100644 --- a/FishFactory/Program.cs +++ b/FishFactory/Program.cs @@ -1,7 +1,18 @@ +using FishFactory.Forms; +using FishFactoryContracts.BusinessLogicsContracts; +using FishFactoryBusinessLogic.BusinessLogic; +using FishFactoryContracts.StoragesContracts; +using FishFactoryListImplement.Implements; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using NLog.Extensions.Logging; + namespace FishFactory { internal static class Program { + private static ServiceProvider? _serviceProvider; + public static ServiceProvider? ServiceProvider => _serviceProvider; /// /// The main entry point for the application. /// @@ -11,7 +22,32 @@ namespace FishFactory // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormComponents()); + var services = new ServiceCollection(); + ConfigureServices(services); + _serviceProvider = services.BuildServiceProvider(); + + Application.Run(_serviceProvider.GetRequiredService()); + } + private static void ConfigureServices(ServiceCollection services) + { + services.AddLogging(option => + { + option.SetMinimumLevel(LogLevel.Information); + option.AddNLog("nlog.config"); + }); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/FishFactory/nlog.config b/FishFactory/nlog.config new file mode 100644 index 0000000..40d8642 --- /dev/null +++ b/FishFactory/nlog.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/FishFactoryBusinessLogic/BusinessLogic/CannedLogic.cs b/FishFactoryBusinessLogic/BusinessLogic/CannedLogic.cs index 0461660..4bdf067 100644 --- a/FishFactoryBusinessLogic/BusinessLogic/CannedLogic.cs +++ b/FishFactoryBusinessLogic/BusinessLogic/CannedLogic.cs @@ -1,4 +1,5 @@ using FishFactoryContracts.BindingModels; +using FishFactoryContracts.BusinessLogicsContracts; using FishFactoryContracts.SearchModels; using FishFactoryContracts.StoragesContracts; using FishFactoryContracts.ViewModels; @@ -11,7 +12,7 @@ using System.Threading.Tasks; namespace FishFactoryBusinessLogic.BusinessLogic { - internal class CannedLogic + public class CannedLogic : ICannedLogic { private readonly ILogger _logger; private readonly ICannedStorage _cannedStorage; diff --git a/FishFactoryBusinessLogic/BusinessLogic/OrderLogic.cs b/FishFactoryBusinessLogic/BusinessLogic/OrderLogic.cs index b402f5c..3df114c 100644 --- a/FishFactoryBusinessLogic/BusinessLogic/OrderLogic.cs +++ b/FishFactoryBusinessLogic/BusinessLogic/OrderLogic.cs @@ -1,4 +1,5 @@ using FishFactoryContracts.BindingModels; +using FishFactoryContracts.BusinessLogicsContracts; using FishFactoryContracts.SearchModels; using FishFactoryContracts.StoragesContracts; using FishFactoryContracts.ViewModels; @@ -12,7 +13,7 @@ using System.Threading.Tasks; namespace FishFactoryBusinessLogic.BusinessLogic { - internal class OrderLogic + public class OrderLogic : IOrderLogic { //Класс с логикой для заказов будет отвечать за получение списка заказов, //создания заказа и смены его статусов. Следует учитывать, что у заказа можно @@ -29,7 +30,7 @@ namespace FishFactoryBusinessLogic.BusinessLogic public List? ReadList(OrderSearchModel? model) { - _logger.LogInformation("ReadList. Id:{Id}", model?.Id); + _logger.LogInformation("ReadList. OrderId:{Id}", model?.Id); var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); if (list == null) { @@ -40,27 +41,12 @@ namespace FishFactoryBusinessLogic.BusinessLogic return list; } - //public OrderViewModel? ReadElement(OrderSearchModel model) - //{ - // if (model == null) - // { - // throw new ArgumentNullException(nameof(model)); - // } - // _logger.LogInformation("ReadElement. OrderName:{OrderName}.Id:{Id}", model.OrderName, model.Id); - // var element = _orderStorage.GetElement(model); - // if (element == null) - // { - // _logger.LogWarning("ReadElement element not found"); - // return null; - // } - // _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); - // return element; - //} - - public bool Create(OrderBindingModel model) + public bool CreateOrder(OrderBindingModel model) { CheckModel(model); + if (model.Status != OrderStatus.Неизвестен) + return false; model.Status = OrderStatus.Принят; if (_orderStorage.Insert(model) == null) @@ -72,9 +58,40 @@ namespace FishFactoryBusinessLogic.BusinessLogic return true; } + public bool TakeOrderInWork(OrderBindingModel model) + { + return ToNextStatus(model, OrderStatus.Выполняется); + } + + public bool FinishOrder(OrderBindingModel model) + { + return ToNextStatus(model, OrderStatus.Готов); + } + + public bool DeliveryOrder(OrderBindingModel model) + { + return ToNextStatus(model, OrderStatus.Выдан); + } + public bool ToNextStatus(OrderBindingModel model, OrderStatus orderStatus) { CheckModel(model); + var element = _orderStorage.GetElement(new OrderSearchModel() + { + Id = model.Id + }); + if (element == null) + { + throw new ArgumentNullException(nameof(element)); + } + + model.CannedId = element.CannedId; + model.DateCreate = element.DateCreate; + model.DateImplement = element.DateImplement; + model.Status = element.Status; + model.Count = element.Count; + model.Sum = element.Sum; + if (model.Status != orderStatus - 1) { _logger.LogWarning("Status update to " + orderStatus + " operation failed"); @@ -90,19 +107,7 @@ namespace FishFactoryBusinessLogic.BusinessLogic if (_orderStorage.Update(model) == null) { model.Status--; - _logger.LogWarning("Update operation failed"); - return false; - } - - return true; - } - - public bool Update(OrderBindingModel model) - { - CheckModel(model); - if (_orderStorage.Update(model) == null) - { - _logger.LogWarning("Update operation failed"); + _logger.LogWarning("Changing status operation faled"); return false; } return true; @@ -126,7 +131,7 @@ namespace FishFactoryBusinessLogic.BusinessLogic { throw new ArgumentNullException("Цена заказа должна быть больше 0", nameof(model.Sum)); } - _logger.LogInformation("Order. OrderName: {Count}.Price: {Sum}. Id: {Id}", model.Count, model.Sum, model.Id); + _logger.LogInformation("Canned. CannedId:{CannedId}.Count:{Count}.Sum:{Sum}Id:{Id}", model.CannedId, model.Count, model.Sum, model.Id); } } } diff --git a/FishFactoryListImplement/FishFactoryListImplement.csproj b/FishFactoryListImplement/FishFactoryListImplement.csproj index a59355a..7c5b328 100644 --- a/FishFactoryListImplement/FishFactoryListImplement.csproj +++ b/FishFactoryListImplement/FishFactoryListImplement.csproj @@ -12,8 +12,4 @@ - - - - diff --git a/FishFactoryListImplement/Implements/CannedStorage.cs b/FishFactoryListImplement/Implements/CannedStorage.cs new file mode 100644 index 0000000..c55004e --- /dev/null +++ b/FishFactoryListImplement/Implements/CannedStorage.cs @@ -0,0 +1,112 @@ +using FishFactoryContracts.BindingModels; +using FishFactoryContracts.SearchModels; +using FishFactoryContracts.StoragesContracts; +using FishFactoryContracts.ViewModels; +using FishFactoryListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FishFactoryListImplement.Implements +{ + public class CannedStorage : ICannedStorage + { + private readonly DataListSingleton _source; + public CannedStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public CannedViewModel? Delete(CannedBindingModel model) + { + for (int i = 0; i < _source.Canneds.Count; ++i) + { + if (_source.Canneds[i].Id == model.Id) + { + var element = _source.Canneds[i]; + _source.Canneds.RemoveAt(i); + return element.GetViewModel; + } + } + return null; + } + + public CannedViewModel? GetElement(CannedSearchModel model) + { + if (string.IsNullOrEmpty(model.CannedName) && !model.Id.HasValue) + { + return null; + } + foreach (var canned in _source.Canneds) + { + if ((!string.IsNullOrEmpty(model.CannedName) && canned.CannedName == model.CannedName) || + (model.Id.HasValue && canned.Id == model.Id)) + { + return canned.GetViewModel; + } + } + return null; + } + + public List GetFilteredList(CannedSearchModel model) + { + var result = new List(); + if (string.IsNullOrEmpty(model.CannedName)) + { + return result; + } + foreach (var canned in _source.Canneds) + { + if (canned.CannedName.Contains(model.CannedName)) + { + result.Add(canned.GetViewModel); + } + } + return result; + } + + public List GetFullList() + { + var result = new List(); + foreach (var canned in _source.Canneds) + { + result.Add(canned.GetViewModel); + } + return result; + } + + public CannedViewModel? Insert(CannedBindingModel model) + { + model.Id = 1; + foreach (var canned in _source.Canneds) + { + if (model.Id <= canned.Id) + { + model.Id = canned.Id + 1; + } + } + var newCanned = Canned.Create(model); + if (newCanned == null) + { + return null; + } + _source.Canneds.Add(newCanned); + return newCanned.GetViewModel; + } + + public CannedViewModel? Update(CannedBindingModel model) + { + foreach (var canned in _source.Canneds) + { + if (canned.Id == model.Id) + { + canned.Update(model); + return canned.GetViewModel; + } + } + return null; + } + } +} diff --git a/FishFactoryListImplement/Implements/ComponentStorage.cs b/FishFactoryListImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..a3edb40 --- /dev/null +++ b/FishFactoryListImplement/Implements/ComponentStorage.cs @@ -0,0 +1,106 @@ +using FishFactoryContracts.StoragesContracts; +using FishFactoryContracts.BindingModels; +using FishFactoryContracts.SearchModels; +using FishFactoryContracts.ViewModels; +using FishFactoryListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FishFactoryListImplement.Implements +{ + public class ComponentStorage : IComponentStorage + { + private readonly DataListSingleton _source; + public ComponentStorage() + { + _source = DataListSingleton.GetInstance(); + } + public List GetFullList() + { + var result = new List(); + foreach (var component in _source.Components) + { + result.Add(component.GetViewModel); + } + return result; + } + public List GetFilteredList(ComponentSearchModel model) + { + var result = new List(); + if (string.IsNullOrEmpty(model.ComponentName)) + { + return result; + } + foreach (var component in _source.Components) + { + if (component.ComponentName.Contains(model.ComponentName)) + { + result.Add(component.GetViewModel); + } + } + return result; + } + public ComponentViewModel? GetElement(ComponentSearchModel model) + { + if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue) + { + return null; + } + foreach (var component in _source.Components) + { + if ((!string.IsNullOrEmpty(model.ComponentName) && component.ComponentName == model.ComponentName) || + (model.Id.HasValue && component.Id == model.Id)) + { + return component.GetViewModel; + } + } + return null; + } + public ComponentViewModel? Insert(ComponentBindingModel model) + { + model.Id = 1; + foreach (var component in _source.Components) + { + if (model.Id <= component.Id) + { + model.Id = component.Id + 1; + } + } + var newComponent = Component.Create(model); + if (newComponent == null) + { + return null; + } + _source.Components.Add(newComponent); + return newComponent.GetViewModel; + } + public ComponentViewModel? Update(ComponentBindingModel model) + { + foreach (var component in _source.Components) + { + if (component.Id == model.Id) + { + component.Update(model); + return component.GetViewModel; + } + } + return null; + } + public ComponentViewModel? Delete(ComponentBindingModel model) + { + for (int i = 0; i < _source.Components.Count; ++i) + { + if (_source.Components[i].Id == model.Id) + { + var element = _source.Components[i]; + _source.Components.RemoveAt(i); + return element.GetViewModel; + } + } + return null; + } + } +} diff --git a/FishFactoryListImplement/Implements/OrderStorage.cs b/FishFactoryListImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..75896f3 --- /dev/null +++ b/FishFactoryListImplement/Implements/OrderStorage.cs @@ -0,0 +1,125 @@ +using FishFactoryContracts.BindingModels; +using FishFactoryContracts.SearchModels; +using FishFactoryContracts.StoragesContracts; +using FishFactoryContracts.ViewModels; +using FishFactoryListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FishFactoryListImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + private readonly DataListSingleton _source; + + public OrderStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public List GetFullList() + { + var result = new List(); + foreach (var order in _source.Orders) + { + result.Add(AttachCannedName(order.GetViewModel)); + } + return result; + } + + public List GetFilteredList(OrderSearchModel model) + { + var result = new List(); + if (model == null || !model.Id.HasValue) + { + return result; + } + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + result.Add(AttachCannedName(order.GetViewModel)); + } + } + return result; + } + + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return null; + } + foreach (var order in _source.Orders) + { + if (model.Id.HasValue && order.Id == model.Id) + { + return AttachCannedName(order.GetViewModel); + } + } + return null; + } + + public OrderViewModel? Insert(OrderBindingModel model) + { + model.Id = 1; + foreach (var order in _source.Orders) + { + if (model.Id <= order.Id) + { + model.Id = order.Id + 1; + } + } + var newOrder = Order.Create(model); + if (newOrder == null) + { + return null; + } + _source.Orders.Add(newOrder); + return AttachCannedName(newOrder.GetViewModel); + } + + public OrderViewModel? Update(OrderBindingModel model) + { + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + order.Update(model); + return AttachCannedName(order.GetViewModel); + } + } + return null; + } + + public OrderViewModel? Delete(OrderBindingModel model) + { + for (int i = 0; i < _source.Orders.Count; ++i) + { + if (_source.Orders[i].Id == model.Id) + { + var element = _source.Orders[i]; + _source.Orders.RemoveAt(i); + return AttachCannedName(element.GetViewModel); + } + } + return null; + } + + private OrderViewModel AttachCannedName(OrderViewModel model) + { + foreach (var canned in _source.Canneds) + { + if (canned.Id == model.CannedId) + { + model.CannedName = canned.CannedName; + return model; + } + } + return model; + } + } +} diff --git a/FishFactoryListImplement/Models/Canned.cs b/FishFactoryListImplement/Models/Canned.cs index 511edcf..f9433fe 100644 --- a/FishFactoryListImplement/Models/Canned.cs +++ b/FishFactoryListImplement/Models/Canned.cs @@ -26,11 +26,11 @@ namespace FishFactoryListImplement.Models return null; } return new Canned() - { - Id = model.Id, - CannedName = model.CannedName, - Price = model.Price, - CannedComponents = model.CannedComponents + { + Id = model.Id, + CannedName = model.CannedName, + Price = model.Price, + CannedComponents = model.CannedComponents }; } public void Update(CannedBindingModel? model) diff --git a/FishFactoryView/FishFactoryView.csproj b/FishFactoryView/FishFactoryView.csproj new file mode 100644 index 0000000..b57c89e --- /dev/null +++ b/FishFactoryView/FishFactoryView.csproj @@ -0,0 +1,11 @@ + + + + WinExe + net6.0-windows + enable + true + enable + + + \ No newline at end of file diff --git a/FishFactoryView/Form1.Designer.cs b/FishFactoryView/Form1.Designer.cs new file mode 100644 index 0000000..780281a --- /dev/null +++ b/FishFactoryView/Form1.Designer.cs @@ -0,0 +1,39 @@ +namespace FishFactoryView +{ + partial class Form1 + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Text = "Form1"; + } + + #endregion + } +} \ No newline at end of file diff --git a/FishFactoryView/Form1.cs b/FishFactoryView/Form1.cs new file mode 100644 index 0000000..8a68d8f --- /dev/null +++ b/FishFactoryView/Form1.cs @@ -0,0 +1,10 @@ +namespace FishFactoryView +{ + public partial class Form1 : Form + { + public Form1() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/FishFactoryView/Form1.resx b/FishFactoryView/Form1.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/FishFactoryView/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/FishFactoryView/Program.cs b/FishFactoryView/Program.cs new file mode 100644 index 0000000..5881723 --- /dev/null +++ b/FishFactoryView/Program.cs @@ -0,0 +1,17 @@ +namespace FishFactoryView +{ + internal static class Program + { + /// + /// The main entry point for the application. + /// + [STAThread] + static void Main() + { + // To customize application configuration such as set high DPI settings or default font, + // see https://aka.ms/applicationconfiguration. + ApplicationConfiguration.Initialize(); + Application.Run(new Form1()); + } + } +} \ No newline at end of file