From f29a279a08d8d98ac4a6ccfee4328caf5e647dc4 Mon Sep 17 00:00:00 2001 From: Anastasia Date: Wed, 1 Mar 2023 10:09:51 +0400 Subject: [PATCH 1/2] =?UTF-8?q?=D0=92=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D0=B0=D1=8F=20=D0=BF=D0=B5=D1=80=D0=B2=D0=B0=D1=8F?= =?UTF-8?q?=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Enums/OrderStatus.cs | 11 + JewelryStore/JewelryShopDataModels/IId.cs | 7 + .../JewelryStoreDataModels.csproj | 9 + .../Models/IComponentModel.cs | 11 + .../Models/IJewelModel.cs | 11 + .../Models/IOrderModel.cs | 15 ++ JewelryStore/JewelryStore.sln | 24 ++ JewelryStore/JewelryStore/Form1.Designer.cs | 39 --- JewelryStore/JewelryStore/Form1.cs | 10 - JewelryStore/JewelryStore/Form1.resx | 120 --------- .../JewelryStore/FormComponent.Designer.cs | 118 +++++++++ JewelryStore/JewelryStore/FormComponent.cs | 97 ++++++++ JewelryStore/JewelryStore/FormComponent.resx | 60 +++++ .../JewelryStore/FormComponents.Designer.cs | 117 +++++++++ JewelryStore/JewelryStore/FormComponents.cs | 121 +++++++++ JewelryStore/JewelryStore/FormComponents.resx | 60 +++++ .../JewelryStore/FormCreateOrder.Designer.cs | 145 +++++++++++ JewelryStore/JewelryStore/FormCreateOrder.cs | 140 +++++++++++ .../JewelryStore/FormCreateOrder.resx | 60 +++++ .../JewelryStore/FormJewel.Designer.cs | 234 ++++++++++++++++++ JewelryStore/JewelryStore/FormJewel.cs | 224 +++++++++++++++++ JewelryStore/JewelryStore/FormJewel.resx | 69 ++++++ .../FormJewelComponent.Designer.cs | 119 +++++++++ .../JewelryStore/FormJewelComponent.cs | 83 +++++++ .../JewelryStore/FormJewelComponent.resx | 60 +++++ .../JewelryStore/FormJewels.Designer.cs | 117 +++++++++ JewelryStore/JewelryStore/FormJewels.cs | 117 +++++++++ JewelryStore/JewelryStore/FormJewels.resx | 60 +++++ .../JewelryStore/FormMain.Designer.cs | 176 +++++++++++++ JewelryStore/JewelryStore/FormMain.cs | 149 +++++++++++ JewelryStore/JewelryStore/FormMain.resx | 63 +++++ JewelryStore/JewelryStore/JewelryStore.csproj | 13 + JewelryStore/JewelryStore/Program.cs | 42 +++- .../BusinessLogics/ComponentLogic.cs | 113 +++++++++ .../BusinessLogics/JewelLogic.cs | 117 +++++++++ .../BusinessLogics/OrderLogic.cs | 144 +++++++++++ .../JewelryStoreBusinessLogic.csproj | 17 ++ .../BindingModels/ComponentBindingModel.cs | 11 + .../BindingModels/JewelBindingModel.cs | 17 ++ .../BindingModels/OrderBindingModel.cs | 16 ++ .../IComponentLogic.cs | 15 ++ .../BusinessLogicsContracts/IJewelLogic.cs | 15 ++ .../BusinessLogicsContracts/IOrderLogic.cs | 15 ++ .../JewelryStoreContracts.csproj | 13 + .../SearchModels/ComponentSearchModel.cs | 8 + .../SearchModels/JewelSearchModel.cs | 8 + .../SearchModels/OrderSearchModel.cs | 7 + .../StoragesModels/IComponentStorage.cs | 16 ++ .../StoragesModels/IJewelStorage.cs | 16 ++ .../StoragesModels/IOrderStorage.cs | 16 ++ .../ViewModels/ComponentViewModel.cs | 14 ++ .../ViewModels/JewelViewModel.cs | 19 ++ .../ViewModels/OrderViewModel.cs | 27 ++ .../DataListSingleton.cs | 26 ++ .../Implements/ComponentStorage.cs | 103 ++++++++ .../Implements/JewelStorage.cs | 107 ++++++++ .../Implements/OrderStorage.cs | 119 +++++++++ .../JewelryStoreListImplement.csproj | 14 ++ .../Models/Component.cs | 42 ++++ .../JewelryStoreListImplement/Models/Jewel.cs | 50 ++++ .../JewelryStoreListImplement/Models/Order.cs | 64 +++++ 61 files changed, 3677 insertions(+), 173 deletions(-) create mode 100644 JewelryStore/JewelryShopDataModels/Enums/OrderStatus.cs create mode 100644 JewelryStore/JewelryShopDataModels/IId.cs create mode 100644 JewelryStore/JewelryShopDataModels/JewelryStoreDataModels.csproj create mode 100644 JewelryStore/JewelryShopDataModels/Models/IComponentModel.cs create mode 100644 JewelryStore/JewelryShopDataModels/Models/IJewelModel.cs create mode 100644 JewelryStore/JewelryShopDataModels/Models/IOrderModel.cs delete mode 100644 JewelryStore/JewelryStore/Form1.Designer.cs delete mode 100644 JewelryStore/JewelryStore/Form1.cs delete mode 100644 JewelryStore/JewelryStore/Form1.resx create mode 100644 JewelryStore/JewelryStore/FormComponent.Designer.cs create mode 100644 JewelryStore/JewelryStore/FormComponent.cs create mode 100644 JewelryStore/JewelryStore/FormComponent.resx create mode 100644 JewelryStore/JewelryStore/FormComponents.Designer.cs create mode 100644 JewelryStore/JewelryStore/FormComponents.cs create mode 100644 JewelryStore/JewelryStore/FormComponents.resx create mode 100644 JewelryStore/JewelryStore/FormCreateOrder.Designer.cs create mode 100644 JewelryStore/JewelryStore/FormCreateOrder.cs create mode 100644 JewelryStore/JewelryStore/FormCreateOrder.resx create mode 100644 JewelryStore/JewelryStore/FormJewel.Designer.cs create mode 100644 JewelryStore/JewelryStore/FormJewel.cs create mode 100644 JewelryStore/JewelryStore/FormJewel.resx create mode 100644 JewelryStore/JewelryStore/FormJewelComponent.Designer.cs create mode 100644 JewelryStore/JewelryStore/FormJewelComponent.cs create mode 100644 JewelryStore/JewelryStore/FormJewelComponent.resx create mode 100644 JewelryStore/JewelryStore/FormJewels.Designer.cs create mode 100644 JewelryStore/JewelryStore/FormJewels.cs create mode 100644 JewelryStore/JewelryStore/FormJewels.resx create mode 100644 JewelryStore/JewelryStore/FormMain.Designer.cs create mode 100644 JewelryStore/JewelryStore/FormMain.cs create mode 100644 JewelryStore/JewelryStore/FormMain.resx create mode 100644 JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/ComponentLogic.cs create mode 100644 JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/JewelLogic.cs create mode 100644 JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/OrderLogic.cs create mode 100644 JewelryStore/JewelryStoreBusinessLogic/JewelryStoreBusinessLogic.csproj create mode 100644 JewelryStore/JewelryStoreContracts/BindingModels/ComponentBindingModel.cs create mode 100644 JewelryStore/JewelryStoreContracts/BindingModels/JewelBindingModel.cs create mode 100644 JewelryStore/JewelryStoreContracts/BindingModels/OrderBindingModel.cs create mode 100644 JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IComponentLogic.cs create mode 100644 JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IJewelLogic.cs create mode 100644 JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IOrderLogic.cs create mode 100644 JewelryStore/JewelryStoreContracts/JewelryStoreContracts.csproj create mode 100644 JewelryStore/JewelryStoreContracts/SearchModels/ComponentSearchModel.cs create mode 100644 JewelryStore/JewelryStoreContracts/SearchModels/JewelSearchModel.cs create mode 100644 JewelryStore/JewelryStoreContracts/SearchModels/OrderSearchModel.cs create mode 100644 JewelryStore/JewelryStoreContracts/StoragesModels/IComponentStorage.cs create mode 100644 JewelryStore/JewelryStoreContracts/StoragesModels/IJewelStorage.cs create mode 100644 JewelryStore/JewelryStoreContracts/StoragesModels/IOrderStorage.cs create mode 100644 JewelryStore/JewelryStoreContracts/ViewModels/ComponentViewModel.cs create mode 100644 JewelryStore/JewelryStoreContracts/ViewModels/JewelViewModel.cs create mode 100644 JewelryStore/JewelryStoreContracts/ViewModels/OrderViewModel.cs create mode 100644 JewelryStore/JewelryStoreListImplement/DataListSingleton.cs create mode 100644 JewelryStore/JewelryStoreListImplement/Implements/ComponentStorage.cs create mode 100644 JewelryStore/JewelryStoreListImplement/Implements/JewelStorage.cs create mode 100644 JewelryStore/JewelryStoreListImplement/Implements/OrderStorage.cs create mode 100644 JewelryStore/JewelryStoreListImplement/JewelryStoreListImplement.csproj create mode 100644 JewelryStore/JewelryStoreListImplement/Models/Component.cs create mode 100644 JewelryStore/JewelryStoreListImplement/Models/Jewel.cs create mode 100644 JewelryStore/JewelryStoreListImplement/Models/Order.cs diff --git a/JewelryStore/JewelryShopDataModels/Enums/OrderStatus.cs b/JewelryStore/JewelryShopDataModels/Enums/OrderStatus.cs new file mode 100644 index 0000000..fed7b40 --- /dev/null +++ b/JewelryStore/JewelryShopDataModels/Enums/OrderStatus.cs @@ -0,0 +1,11 @@ +namespace JewelryStoreDataModels.Enums +{ + public enum OrderStatus + { + Неизвестен = -1, + Принят = 0, + Выполняется = 1, + Готов = 2, + Выдан = 3 + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryShopDataModels/IId.cs b/JewelryStore/JewelryShopDataModels/IId.cs new file mode 100644 index 0000000..de08feb --- /dev/null +++ b/JewelryStore/JewelryShopDataModels/IId.cs @@ -0,0 +1,7 @@ +namespace JewelryShopDataModels +{ + public interface IId + { + int Id { get; } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryShopDataModels/JewelryStoreDataModels.csproj b/JewelryStore/JewelryShopDataModels/JewelryStoreDataModels.csproj new file mode 100644 index 0000000..132c02c --- /dev/null +++ b/JewelryStore/JewelryShopDataModels/JewelryStoreDataModels.csproj @@ -0,0 +1,9 @@ + + + + net6.0 + enable + enable + + + diff --git a/JewelryStore/JewelryShopDataModels/Models/IComponentModel.cs b/JewelryStore/JewelryShopDataModels/Models/IComponentModel.cs new file mode 100644 index 0000000..ea7566c --- /dev/null +++ b/JewelryStore/JewelryShopDataModels/Models/IComponentModel.cs @@ -0,0 +1,11 @@ +using JewelryShopDataModels; + +namespace JewelryStoreDataModels.Models +{ + public interface IComponentModel : IId + { + string ComponentName { get; } + double Cost { get; } + } + +} \ No newline at end of file diff --git a/JewelryStore/JewelryShopDataModels/Models/IJewelModel.cs b/JewelryStore/JewelryShopDataModels/Models/IJewelModel.cs new file mode 100644 index 0000000..fee9918 --- /dev/null +++ b/JewelryStore/JewelryShopDataModels/Models/IJewelModel.cs @@ -0,0 +1,11 @@ +using JewelryShopDataModels; + +namespace JewelryStoreDataModels.Models +{ + public interface IJewelModel : IId + { + string JewelName { get; } + double Price { get; } + Dictionary JewelComponents { get; } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryShopDataModels/Models/IOrderModel.cs b/JewelryStore/JewelryShopDataModels/Models/IOrderModel.cs new file mode 100644 index 0000000..d0fd099 --- /dev/null +++ b/JewelryStore/JewelryShopDataModels/Models/IOrderModel.cs @@ -0,0 +1,15 @@ +using JewelryShopDataModels; +using JewelryStoreDataModels.Enums; + +namespace JewelryStoreDataModels.Models +{ + public interface IOrderModel : IId + { + int JewelId { get; } + int Count { get; } + double Sum { get; } + OrderStatus Status { get; } + DateTime DateCreate { get; } + DateTime? DateImplement { get; } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStore.sln b/JewelryStore/JewelryStore.sln index 64b094c..a63adc3 100644 --- a/JewelryStore/JewelryStore.sln +++ b/JewelryStore/JewelryStore.sln @@ -5,6 +5,14 @@ VisualStudioVersion = 17.3.32819.101 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JewelryStore", "JewelryStore\JewelryStore.csproj", "{187BBC53-52AA-4C47-B98B-E119AE64ADA4}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JewelryStoreDataModels", "JewelryShopDataModels\JewelryStoreDataModels.csproj", "{C6D79969-6DC9-4F60-BCC4-A679CB472595}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JewelryStoreContracts", "JewelryStoreContracts\JewelryStoreContracts.csproj", "{F7C956E1-26FC-4914-9ABC-71A16F88B7E8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JewelryStoreBusinessLogic", "JewelryStoreBusinessLogic\JewelryStoreBusinessLogic.csproj", "{B4D1E829-A99F-47D2-B06D-5042CE058CA9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JewelryStoreListImplement", "JewelryStoreListImplement\JewelryStoreListImplement.csproj", "{12C6B5CD-CE5C-4095-91B8-53A5CB08E780}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +23,22 @@ Global {187BBC53-52AA-4C47-B98B-E119AE64ADA4}.Debug|Any CPU.Build.0 = Debug|Any CPU {187BBC53-52AA-4C47-B98B-E119AE64ADA4}.Release|Any CPU.ActiveCfg = Release|Any CPU {187BBC53-52AA-4C47-B98B-E119AE64ADA4}.Release|Any CPU.Build.0 = Release|Any CPU + {C6D79969-6DC9-4F60-BCC4-A679CB472595}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C6D79969-6DC9-4F60-BCC4-A679CB472595}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C6D79969-6DC9-4F60-BCC4-A679CB472595}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C6D79969-6DC9-4F60-BCC4-A679CB472595}.Release|Any CPU.Build.0 = Release|Any CPU + {F7C956E1-26FC-4914-9ABC-71A16F88B7E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F7C956E1-26FC-4914-9ABC-71A16F88B7E8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F7C956E1-26FC-4914-9ABC-71A16F88B7E8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F7C956E1-26FC-4914-9ABC-71A16F88B7E8}.Release|Any CPU.Build.0 = Release|Any CPU + {B4D1E829-A99F-47D2-B06D-5042CE058CA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B4D1E829-A99F-47D2-B06D-5042CE058CA9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B4D1E829-A99F-47D2-B06D-5042CE058CA9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B4D1E829-A99F-47D2-B06D-5042CE058CA9}.Release|Any CPU.Build.0 = Release|Any CPU + {12C6B5CD-CE5C-4095-91B8-53A5CB08E780}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {12C6B5CD-CE5C-4095-91B8-53A5CB08E780}.Debug|Any CPU.Build.0 = Debug|Any CPU + {12C6B5CD-CE5C-4095-91B8-53A5CB08E780}.Release|Any CPU.ActiveCfg = Release|Any CPU + {12C6B5CD-CE5C-4095-91B8-53A5CB08E780}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/JewelryStore/JewelryStore/Form1.Designer.cs b/JewelryStore/JewelryStore/Form1.Designer.cs deleted file mode 100644 index d1c38a9..0000000 --- a/JewelryStore/JewelryStore/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace JewelryStore -{ - 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/JewelryStore/JewelryStore/Form1.cs b/JewelryStore/JewelryStore/Form1.cs deleted file mode 100644 index f3212bd..0000000 --- a/JewelryStore/JewelryStore/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace JewelryStore -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/JewelryStore/JewelryStore/Form1.resx b/JewelryStore/JewelryStore/Form1.resx deleted file mode 100644 index 1af7de1..0000000 --- a/JewelryStore/JewelryStore/Form1.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/JewelryStore/JewelryStore/FormComponent.Designer.cs b/JewelryStore/JewelryStore/FormComponent.Designer.cs new file mode 100644 index 0000000..182fb3a --- /dev/null +++ b/JewelryStore/JewelryStore/FormComponent.Designer.cs @@ -0,0 +1,118 @@ +namespace JewelryStore +{ + partial class FormComponent + { + /// + /// 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.labelName = new System.Windows.Forms.Label(); + this.labelCost = new System.Windows.Forms.Label(); + this.textBoxName = new System.Windows.Forms.TextBox(); + this.textBoxCost = new System.Windows.Forms.TextBox(); + this.buttonSave = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // labelName + // + this.labelName.AutoSize = true; + this.labelName.Location = new System.Drawing.Point(20, 21); + this.labelName.Name = "labelName"; + this.labelName.Size = new System.Drawing.Size(94, 25); + this.labelName.TabIndex = 0; + this.labelName.Text = "Название:"; + // + // labelCost + // + this.labelCost.AutoSize = true; + this.labelCost.Location = new System.Drawing.Point(20, 67); + this.labelCost.Name = "labelCost"; + this.labelCost.Size = new System.Drawing.Size(57, 25); + this.labelCost.TabIndex = 1; + this.labelCost.Text = "Цена:"; + // + // textBoxName + // + this.textBoxName.Location = new System.Drawing.Point(132, 18); + this.textBoxName.Name = "textBoxName"; + this.textBoxName.Size = new System.Drawing.Size(298, 31); + this.textBoxName.TabIndex = 2; + // + // textBoxCost + // + this.textBoxCost.Location = new System.Drawing.Point(132, 64); + this.textBoxCost.Name = "textBoxCost"; + this.textBoxCost.Size = new System.Drawing.Size(298, 31); + this.textBoxCost.TabIndex = 3; + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(132, 113); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(112, 34); + this.buttonSave.TabIndex = 4; + this.buttonSave.Text = "Сохранить"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(318, 113); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(112, 34); + this.buttonCancel.TabIndex = 5; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // FormComponent + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(463, 172); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonSave); + this.Controls.Add(this.textBoxCost); + this.Controls.Add(this.textBoxName); + this.Controls.Add(this.labelCost); + this.Controls.Add(this.labelName); + this.Name = "FormComponent"; + this.Text = "Компонент"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Label labelName; + private Label labelCost; + private TextBox textBoxName; + private TextBox textBoxCost; + private Button buttonSave; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormComponent.cs b/JewelryStore/JewelryStore/FormComponent.cs new file mode 100644 index 0000000..ef76da3 --- /dev/null +++ b/JewelryStore/JewelryStore/FormComponent.cs @@ -0,0 +1,97 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.SearchModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace JewelryStore +{ + public partial class FormComponent : Form + { + private readonly ILogger _logger; + private readonly IComponentLogic _logic; + private int? _id; + public int Id { set { _id = value; } } + 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/JewelryStore/JewelryStore/FormComponent.resx b/JewelryStore/JewelryStore/FormComponent.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/JewelryStore/JewelryStore/FormComponent.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/JewelryStore/JewelryStore/FormComponents.Designer.cs b/JewelryStore/JewelryStore/FormComponents.Designer.cs new file mode 100644 index 0000000..f4d7e82 --- /dev/null +++ b/JewelryStore/JewelryStore/FormComponents.Designer.cs @@ -0,0 +1,117 @@ +namespace JewelryStore +{ + partial class FormComponents + { + /// + /// 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.dataGridView = new System.Windows.Forms.DataGridView(); + this.buttonAdd = new System.Windows.Forms.Button(); + this.buttonRef = new System.Windows.Forms.Button(); + this.buttonDelete = new System.Windows.Forms.Button(); + this.buttonUpdate = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // dataGridView + // + this.dataGridView.BackgroundColor = System.Drawing.SystemColors.Window; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Location = new System.Drawing.Point(12, 11); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowHeadersWidth = 62; + this.dataGridView.RowTemplate.Height = 33; + this.dataGridView.Size = new System.Drawing.Size(525, 427); + this.dataGridView.TabIndex = 0; + this.dataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_CellContentClick); + // + // buttonAdd + // + this.buttonAdd.Location = new System.Drawing.Point(569, 38); + this.buttonAdd.Name = "buttonAdd"; + this.buttonAdd.Size = new System.Drawing.Size(164, 34); + this.buttonAdd.TabIndex = 1; + this.buttonAdd.Text = "Добавить"; + this.buttonAdd.UseVisualStyleBackColor = true; + this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); + // + // buttonRef + // + this.buttonRef.Location = new System.Drawing.Point(569, 107); + this.buttonRef.Name = "buttonRef"; + this.buttonRef.Size = new System.Drawing.Size(164, 34); + this.buttonRef.TabIndex = 2; + this.buttonRef.Text = "Изменить"; + this.buttonRef.UseVisualStyleBackColor = true; + this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click); + // + // buttonDelete + // + this.buttonDelete.Location = new System.Drawing.Point(569, 178); + this.buttonDelete.Name = "buttonDelete"; + this.buttonDelete.Size = new System.Drawing.Size(164, 34); + this.buttonDelete.TabIndex = 3; + this.buttonDelete.Text = "Удалить"; + this.buttonDelete.UseVisualStyleBackColor = true; + this.buttonDelete.Click += new System.EventHandler(this.ButtonDelete_Click); + // + // buttonUpdate + // + this.buttonUpdate.Location = new System.Drawing.Point(569, 249); + this.buttonUpdate.Name = "buttonUpdate"; + this.buttonUpdate.Size = new System.Drawing.Size(164, 34); + this.buttonUpdate.TabIndex = 4; + this.buttonUpdate.Text = "Обновить"; + this.buttonUpdate.UseVisualStyleBackColor = true; + this.buttonUpdate.Click += new System.EventHandler(this.ButtonUpdate_Click); + // + // FormComponents + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(756, 450); + this.Controls.Add(this.buttonUpdate); + this.Controls.Add(this.buttonDelete); + this.Controls.Add(this.buttonRef); + this.Controls.Add(this.buttonAdd); + this.Controls.Add(this.dataGridView); + this.Name = "FormComponents"; + this.Text = "Компоненты"; + this.Load += new System.EventHandler(this.FormComponents_Load_1); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView dataGridView; + private Button buttonAdd; + private Button buttonRef; + private Button buttonDelete; + private Button buttonUpdate; + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormComponents.cs b/JewelryStore/JewelryStore/FormComponents.cs new file mode 100644 index 0000000..95dca4b --- /dev/null +++ b/JewelryStore/JewelryStore/FormComponents.cs @@ -0,0 +1,121 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +using System.Windows.Forms; + +namespace JewelryStore +{ + public partial class FormComponents : Form + { + 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 ButtonUpdate_Click(object sender, EventArgs e) + { + LoadData(); + } + + private void ButtonDelete_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) + { + 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 FormComponents_Load_1(object sender, EventArgs e) + { + + } + + private void dataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormComponents.resx b/JewelryStore/JewelryStore/FormComponents.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/JewelryStore/JewelryStore/FormComponents.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/JewelryStore/JewelryStore/FormCreateOrder.Designer.cs b/JewelryStore/JewelryStore/FormCreateOrder.Designer.cs new file mode 100644 index 0000000..ac480b2 --- /dev/null +++ b/JewelryStore/JewelryStore/FormCreateOrder.Designer.cs @@ -0,0 +1,145 @@ +namespace JewelryStore +{ + partial class FormCreateOrder + { + /// + /// 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.labelJewel = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.comboBoxJewel = new System.Windows.Forms.ComboBox(); + this.textBoxCount = new System.Windows.Forms.TextBox(); + this.textBoxSum = new System.Windows.Forms.TextBox(); + this.buttonSave = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // labelJewel + // + this.labelJewel.AutoSize = true; + this.labelJewel.Location = new System.Drawing.Point(17, 20); + this.labelJewel.Name = "labelJewel"; + this.labelJewel.Size = new System.Drawing.Size(84, 25); + this.labelJewel.TabIndex = 0; + this.labelJewel.Text = "Изделие:"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(17, 62); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(111, 25); + this.label2.TabIndex = 1; + this.label2.Text = "Количество:"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(17, 107); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(71, 25); + this.label3.TabIndex = 2; + this.label3.Text = "Сумма:"; + // + // comboBoxJewel + // + this.comboBoxJewel.FormattingEnabled = true; + this.comboBoxJewel.Location = new System.Drawing.Point(134, 17); + this.comboBoxJewel.MaxDropDownItems = 100; + this.comboBoxJewel.Name = "comboBoxJewel"; + this.comboBoxJewel.Size = new System.Drawing.Size(291, 33); + this.comboBoxJewel.TabIndex = 3; + this.comboBoxJewel.SelectedIndexChanged += new System.EventHandler(this.ComboBoxJewel_SelectedIndexChanged); + // + // textBoxCount + // + this.textBoxCount.Location = new System.Drawing.Point(134, 62); + this.textBoxCount.Name = "textBoxCount"; + this.textBoxCount.Size = new System.Drawing.Size(291, 31); + this.textBoxCount.TabIndex = 4; + this.textBoxCount.TextChanged += new System.EventHandler(this.TextBoxCount_TextChanged); + // + // textBoxSum + // + this.textBoxSum.Location = new System.Drawing.Point(134, 104); + this.textBoxSum.Name = "textBoxSum"; + this.textBoxSum.Size = new System.Drawing.Size(291, 31); + this.textBoxSum.TabIndex = 5; + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(134, 152); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(112, 34); + this.buttonSave.TabIndex = 6; + this.buttonSave.Text = "Сохранить"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(313, 152); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(112, 34); + this.buttonCancel.TabIndex = 7; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // FormCreateOrder + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(441, 205); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonSave); + this.Controls.Add(this.textBoxSum); + this.Controls.Add(this.textBoxCount); + this.Controls.Add(this.comboBoxJewel); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.labelJewel); + this.Name = "FormCreateOrder"; + this.Text = "Заказ"; + this.Load += new System.EventHandler(this.FormCreateOrder_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Label labelJewel; + private Label label2; + private Label label3; + private ComboBox comboBoxJewel; + private TextBox textBoxCount; + private TextBox textBoxSum; + private Button buttonSave; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormCreateOrder.cs b/JewelryStore/JewelryStore/FormCreateOrder.cs new file mode 100644 index 0000000..d9e0bd9 --- /dev/null +++ b/JewelryStore/JewelryStore/FormCreateOrder.cs @@ -0,0 +1,140 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.ViewModels; +using JewelryStoreDataModels.Models; +using Microsoft.Extensions.Logging; + +namespace JewelryStore +{ + public partial class FormCreateOrder : Form + { + private readonly ILogger _logger; + private readonly IJewelLogic _logicJ; + private readonly IOrderLogic _logicO; + + private List? _list; + + public FormCreateOrder(ILogger logger, IJewelLogic logicJ, IOrderLogic logicO) + { + InitializeComponent(); + _logger = logger; + _logicJ = logicJ; + _logicO = logicO; + } + + public int Id { get { return Convert.ToInt32(comboBoxJewel.SelectedValue); } set { comboBoxJewel.SelectedValue = value; } } + + public IJewelModel? JewelModel + { + get + { + if (_list == null) + { + return null; + } + foreach (var elem in _list) + { + if (elem.Id == Id) + { + return elem; + } + } + return null; + } + } + + private void FormCreateOrder_Load(object sender, EventArgs e) + { + _logger.LogInformation("Загрузка изделий для заказа"); + _list = _logicJ.ReadList(null); + if (_list != null) + { + comboBoxJewel.DisplayMember = "JewelName"; + comboBoxJewel.ValueMember = "Id"; + comboBoxJewel.DataSource = _list; + comboBoxJewel.SelectedItem = null; + } + } + private void CalcSum() + { + if (comboBoxJewel.SelectedValue != null && !string.IsNullOrEmpty(textBoxCount.Text)) + { + try + { + int id = Convert.ToInt32(comboBoxJewel.SelectedIndex) + 1; + var Jewel = _logicJ.ReadElement(new JewelSearchModel + { + Id = id + }); + int count = Convert.ToInt32(textBoxCount.Text); + textBoxSum.Text = Math.Round(count * (Jewel?.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 ButtonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxJewel.SelectedValue == null) + { + MessageBox.Show("Выберите драгоценность", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Создание заказа"); + try + { + var operationResult = _logicO.CreateOrder(new OrderBindingModel + { + JewelId = Convert.ToInt32(comboBoxJewel.SelectedIndex) + 1, + 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 ComboBoxJewel_SelectedIndexChanged(object sender, EventArgs e) + { + CalcSum(); + } + + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormCreateOrder.resx b/JewelryStore/JewelryStore/FormCreateOrder.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/JewelryStore/JewelryStore/FormCreateOrder.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/JewelryStore/JewelryStore/FormJewel.Designer.cs b/JewelryStore/JewelryStore/FormJewel.Designer.cs new file mode 100644 index 0000000..5dfb5ce --- /dev/null +++ b/JewelryStore/JewelryStore/FormJewel.Designer.cs @@ -0,0 +1,234 @@ +namespace JewelryStore +{ + partial class FormJewel + { + /// + /// 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.dataGridView = new System.Windows.Forms.DataGridView(); + this.labelName = new System.Windows.Forms.Label(); + this.labelPrice = new System.Windows.Forms.Label(); + this.textBoxName = new System.Windows.Forms.TextBox(); + this.textBoxPrice = new System.Windows.Forms.TextBox(); + this.groupBox = new System.Windows.Forms.GroupBox(); + this.buttonUpdate = new System.Windows.Forms.Button(); + this.buttonDelete = new System.Windows.Forms.Button(); + this.buttonChange = new System.Windows.Forms.Button(); + this.buttonAdd = new System.Windows.Forms.Button(); + this.buttonSave = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.JewelId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ComponentName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.groupBox.SuspendLayout(); + this.SuspendLayout(); + // + // dataGridView + // + this.dataGridView.BackgroundColor = System.Drawing.SystemColors.Window; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.JewelId, + this.ComponentName, + this.Count}); + this.dataGridView.Location = new System.Drawing.Point(6, 25); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowHeadersWidth = 62; + this.dataGridView.RowTemplate.Height = 33; + this.dataGridView.Size = new System.Drawing.Size(468, 325); + this.dataGridView.TabIndex = 0; + this.dataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_CellContentClick); + // + // labelName + // + this.labelName.AutoSize = true; + this.labelName.Location = new System.Drawing.Point(15, 17); + this.labelName.Name = "labelName"; + this.labelName.Size = new System.Drawing.Size(94, 25); + this.labelName.TabIndex = 1; + this.labelName.Text = "Название:"; + // + // labelPrice + // + this.labelPrice.AutoSize = true; + this.labelPrice.Location = new System.Drawing.Point(12, 60); + this.labelPrice.Name = "labelPrice"; + this.labelPrice.Size = new System.Drawing.Size(103, 25); + this.labelPrice.TabIndex = 2; + this.labelPrice.Text = "Стоимость:"; + // + // textBoxName + // + this.textBoxName.Location = new System.Drawing.Point(124, 14); + this.textBoxName.Name = "textBoxName"; + this.textBoxName.Size = new System.Drawing.Size(267, 31); + this.textBoxName.TabIndex = 3; + // + // textBoxPrice + // + this.textBoxPrice.Location = new System.Drawing.Point(124, 57); + this.textBoxPrice.Name = "textBoxPrice"; + this.textBoxPrice.Size = new System.Drawing.Size(267, 31); + this.textBoxPrice.TabIndex = 4; + // + // groupBox + // + this.groupBox.Controls.Add(this.buttonUpdate); + this.groupBox.Controls.Add(this.buttonDelete); + this.groupBox.Controls.Add(this.buttonChange); + this.groupBox.Controls.Add(this.buttonAdd); + this.groupBox.Controls.Add(this.dataGridView); + this.groupBox.Location = new System.Drawing.Point(15, 94); + this.groupBox.Name = "groupBox"; + this.groupBox.Size = new System.Drawing.Size(676, 356); + this.groupBox.TabIndex = 5; + this.groupBox.TabStop = false; + this.groupBox.Text = "Компоненты"; + // + // buttonUpdate + // + this.buttonUpdate.Location = new System.Drawing.Point(505, 242); + this.buttonUpdate.Name = "buttonUpdate"; + this.buttonUpdate.Size = new System.Drawing.Size(141, 34); + this.buttonUpdate.TabIndex = 4; + this.buttonUpdate.Text = "Обновить"; + this.buttonUpdate.UseVisualStyleBackColor = true; + this.buttonUpdate.Click += new System.EventHandler(this.ButtonUpdate_Click); + // + // buttonDelete + // + this.buttonDelete.Location = new System.Drawing.Point(505, 181); + this.buttonDelete.Name = "buttonDelete"; + this.buttonDelete.Size = new System.Drawing.Size(141, 34); + this.buttonDelete.TabIndex = 3; + this.buttonDelete.Text = "Удалить"; + this.buttonDelete.UseVisualStyleBackColor = true; + this.buttonDelete.Click += new System.EventHandler(this.ButtonDelete_Click); + // + // buttonChange + // + this.buttonChange.Location = new System.Drawing.Point(505, 118); + this.buttonChange.Name = "buttonChange"; + this.buttonChange.Size = new System.Drawing.Size(141, 34); + this.buttonChange.TabIndex = 2; + this.buttonChange.Text = "Изменить"; + this.buttonChange.UseVisualStyleBackColor = true; + this.buttonChange.Click += new System.EventHandler(this.ButtonChange_Click); + // + // buttonAdd + // + this.buttonAdd.Location = new System.Drawing.Point(505, 56); + this.buttonAdd.Name = "buttonAdd"; + this.buttonAdd.Size = new System.Drawing.Size(141, 34); + this.buttonAdd.TabIndex = 1; + this.buttonAdd.Text = "Добавить"; + this.buttonAdd.UseVisualStyleBackColor = true; + this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(377, 456); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(112, 34); + this.buttonSave.TabIndex = 6; + this.buttonSave.Text = "Сохранить"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(549, 456); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(112, 34); + this.buttonCancel.TabIndex = 7; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // JewelId + // + this.JewelId.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.JewelId.HeaderText = "Id"; + this.JewelId.MinimumWidth = 8; + this.JewelId.Name = "JewelId"; + this.JewelId.Visible = false; + this.JewelId.Width = 8; + // + // ComponentName + // + this.ComponentName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.ComponentName.HeaderText = "Компонент"; + this.ComponentName.MinimumWidth = 8; + this.ComponentName.Name = "ComponentName"; + // + // Count + // + this.Count.HeaderText = "Количество"; + this.Count.MinimumWidth = 8; + this.Count.Name = "Count"; + this.Count.Width = 150; + // + // FormJewel + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(708, 500); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonSave); + this.Controls.Add(this.textBoxPrice); + this.Controls.Add(this.textBoxName); + this.Controls.Add(this.labelPrice); + this.Controls.Add(this.labelName); + this.Controls.Add(this.groupBox); + this.Name = "FormJewel"; + this.Text = "Изделие"; + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.groupBox.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private DataGridView dataGridView; + private Label labelName; + private Label labelPrice; + private TextBox textBoxName; + private TextBox textBoxPrice; + private GroupBox groupBox; + private Button buttonUpdate; + private Button buttonDelete; + private Button buttonChange; + private Button buttonAdd; + private Button buttonSave; + private Button buttonCancel; + private DataGridViewTextBoxColumn JewelId; + private DataGridViewTextBoxColumn ComponentName; + private DataGridViewTextBoxColumn Count; + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormJewel.cs b/JewelryStore/JewelryStore/FormJewel.cs new file mode 100644 index 0000000..a4bda25 --- /dev/null +++ b/JewelryStore/JewelryStore/FormJewel.cs @@ -0,0 +1,224 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.SearchModels; +using JewelryStoreDataModels.Models; +using Microsoft.Extensions.Logging; +using System.Windows.Forms; + +namespace JewelryStore +{ + public partial class FormJewel : Form + { + private readonly ILogger _logger; + private readonly IJewelLogic _logic; + private int? _id; + private Dictionary _JewelComponents; + public int Id { set { _id = value; } } + public FormJewel(ILogger logger, IJewelLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + _JewelComponents = new Dictionary(); + } + + private void FormJewel_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + _logger.LogInformation("Загрузка драгоценности"); + try + { + var view = _logic.ReadElement(new JewelSearchModel + { + Id = _id.Value + }); + if (view != null) + { + textBoxName.Text = view.JewelName; + textBoxPrice.Text = view.Price.ToString(); + _JewelComponents = view.JewelComponents ?? new + Dictionary(); + LoadData(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки драгоценности"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + + } + private void LoadData() + { + _logger.LogInformation("Загрузка компонент драгоценности"); + try + { + if (_JewelComponents != null) + { + dataGridView.Rows.Clear(); + foreach (var pc in _JewelComponents) + { + dataGridView.Rows.Add(new object[] { pc.Key, pc.Value.Item1.ComponentName, pc.Value.Item2 }); + } + textBoxPrice.Text = CalcPrice().ToString(); + } + } + 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(FormJewelComponent)); + if (service is FormJewelComponent form) + { + if (form.ShowDialog() == DialogResult.OK) + { + if (form.ComponentModel == null) + { + return; + } + _logger.LogInformation("Добавление нового компонента:{ ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); + if (_JewelComponents.ContainsKey(form.Id)) + { + _JewelComponents[form.Id] = (form.ComponentModel, form.Count); + } + else + { + _JewelComponents.Add(form.Id, (form.ComponentModel, form.Count)); + } + LoadData(); + } + } + + } + + private void ButtonChange_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormJewelComponent)); + if (service is FormJewelComponent form) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + form.Id = id; + form.Count = _JewelComponents[id].Item2; + if (form.ShowDialog() == DialogResult.OK) + { + if (form.ComponentModel == null) + { + return; + } + _logger.LogInformation("Изменение компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); + _JewelComponents[form.Id] = (form.ComponentModel, form.Count); + LoadData(); + } + } + } + + } + + private void ButtonDelete_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); + _JewelComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value)); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + LoadData(); + } + } + } + + private void ButtonUpdate_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 (_JewelComponents == null || _JewelComponents.Count == 0) + { + MessageBox.Show("Заполните компоненты", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение драгоценности"); + try + { + var model = new JewelBindingModel + { + Id = _id ?? 0, + JewelName = textBoxName.Text, + Price = Convert.ToDouble(textBoxPrice.Text), + JewelComponents = _JewelComponents + }; + 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 _JewelComponents) + { + price += ((elem.Value.Item1?.Cost ?? 0) * elem.Value.Item2); + } + return Math.Round(price * 1.1, 2); + } + + private void dataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormJewel.resx b/JewelryStore/JewelryStore/FormJewel.resx new file mode 100644 index 0000000..3983a23 --- /dev/null +++ b/JewelryStore/JewelryStore/FormJewel.resx @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormJewelComponent.Designer.cs b/JewelryStore/JewelryStore/FormJewelComponent.Designer.cs new file mode 100644 index 0000000..6782f9e --- /dev/null +++ b/JewelryStore/JewelryStore/FormJewelComponent.Designer.cs @@ -0,0 +1,119 @@ +namespace JewelryStore +{ + partial class FormJewelComponent + { + /// + /// 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.labelComponent = new System.Windows.Forms.Label(); + this.labelCount = new System.Windows.Forms.Label(); + this.comboBoxComponent = new System.Windows.Forms.ComboBox(); + this.textBoxCount = new System.Windows.Forms.TextBox(); + this.buttonSave = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // labelComponent + // + this.labelComponent.AutoSize = true; + this.labelComponent.Location = new System.Drawing.Point(16, 21); + this.labelComponent.Name = "labelComponent"; + this.labelComponent.Size = new System.Drawing.Size(107, 25); + this.labelComponent.TabIndex = 0; + this.labelComponent.Text = "Компонент:"; + // + // labelCount + // + this.labelCount.AutoSize = true; + this.labelCount.Location = new System.Drawing.Point(16, 70); + this.labelCount.Name = "labelCount"; + this.labelCount.Size = new System.Drawing.Size(111, 25); + this.labelCount.TabIndex = 1; + this.labelCount.Text = "Количество:"; + // + // comboBoxComponent + // + this.comboBoxComponent.FormattingEnabled = true; + this.comboBoxComponent.Location = new System.Drawing.Point(148, 18); + this.comboBoxComponent.Name = "comboBoxComponent"; + this.comboBoxComponent.Size = new System.Drawing.Size(288, 33); + this.comboBoxComponent.TabIndex = 2; + // + // textBoxCount + // + this.textBoxCount.Location = new System.Drawing.Point(148, 67); + this.textBoxCount.Name = "textBoxCount"; + this.textBoxCount.Size = new System.Drawing.Size(288, 31); + this.textBoxCount.TabIndex = 3; + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(148, 115); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(112, 34); + this.buttonSave.TabIndex = 4; + this.buttonSave.Text = "Сохранить"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(324, 115); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(112, 34); + this.buttonCancel.TabIndex = 5; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); + // + // FormJewelComponent + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(461, 173); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonSave); + this.Controls.Add(this.textBoxCount); + this.Controls.Add(this.comboBoxComponent); + this.Controls.Add(this.labelCount); + this.Controls.Add(this.labelComponent); + this.Name = "FormJewelComponent"; + this.Text = "Компонент изделия"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Label labelComponent; + private Label labelCount; + private ComboBox comboBoxComponent; + private TextBox textBoxCount; + private Button buttonSave; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormJewelComponent.cs b/JewelryStore/JewelryStore/FormJewelComponent.cs new file mode 100644 index 0000000..3e83f5d --- /dev/null +++ b/JewelryStore/JewelryStore/FormJewelComponent.cs @@ -0,0 +1,83 @@ +using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.ViewModels; +using JewelryStoreDataModels.Models; + +namespace JewelryStore +{ + public partial class FormJewelComponent : Form + { + 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 FormJewelComponent(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(); + } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormJewelComponent.resx b/JewelryStore/JewelryStore/FormJewelComponent.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/JewelryStore/JewelryStore/FormJewelComponent.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/JewelryStore/JewelryStore/FormJewels.Designer.cs b/JewelryStore/JewelryStore/FormJewels.Designer.cs new file mode 100644 index 0000000..b2715da --- /dev/null +++ b/JewelryStore/JewelryStore/FormJewels.Designer.cs @@ -0,0 +1,117 @@ +namespace JewelryStore +{ + partial class FormJewels + { + /// + /// 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.dataGridView = new System.Windows.Forms.DataGridView(); + this.buttonUpdate = new System.Windows.Forms.Button(); + this.buttonDelete = new System.Windows.Forms.Button(); + this.buttonRef = new System.Windows.Forms.Button(); + this.buttonAdd = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // dataGridView + // + this.dataGridView.BackgroundColor = System.Drawing.SystemColors.Window; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.GridColor = System.Drawing.SystemColors.Window; + this.dataGridView.Location = new System.Drawing.Point(17, 18); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowHeadersWidth = 62; + this.dataGridView.RowTemplate.Height = 33; + this.dataGridView.Size = new System.Drawing.Size(467, 333); + this.dataGridView.TabIndex = 0; + this.dataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_CellContentClick); + // + // buttonUpdate + // + this.buttonUpdate.Location = new System.Drawing.Point(516, 262); + this.buttonUpdate.Name = "buttonUpdate"; + this.buttonUpdate.Size = new System.Drawing.Size(164, 34); + this.buttonUpdate.TabIndex = 8; + this.buttonUpdate.Text = "Обновить"; + this.buttonUpdate.UseVisualStyleBackColor = true; + this.buttonUpdate.Click += new System.EventHandler(this.ButtonUpdate_Click); + // + // buttonDelete + // + this.buttonDelete.Location = new System.Drawing.Point(516, 191); + this.buttonDelete.Name = "buttonDelete"; + this.buttonDelete.Size = new System.Drawing.Size(164, 34); + this.buttonDelete.TabIndex = 7; + this.buttonDelete.Text = "Удалить"; + this.buttonDelete.UseVisualStyleBackColor = true; + this.buttonDelete.Click += new System.EventHandler(this.ButtonDelete_Click); + // + // buttonRef + // + this.buttonRef.Location = new System.Drawing.Point(516, 120); + this.buttonRef.Name = "buttonRef"; + this.buttonRef.Size = new System.Drawing.Size(164, 34); + this.buttonRef.TabIndex = 6; + this.buttonRef.Text = "Изменить"; + this.buttonRef.UseVisualStyleBackColor = true; + this.buttonRef.Click += new System.EventHandler(this.ButtonChange_Click); + // + // buttonAdd + // + this.buttonAdd.Location = new System.Drawing.Point(516, 51); + this.buttonAdd.Name = "buttonAdd"; + this.buttonAdd.Size = new System.Drawing.Size(164, 34); + this.buttonAdd.TabIndex = 5; + this.buttonAdd.Text = "Добавить"; + this.buttonAdd.UseVisualStyleBackColor = true; + this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); + // + // FormJewels + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(709, 364); + this.Controls.Add(this.buttonUpdate); + this.Controls.Add(this.buttonDelete); + this.Controls.Add(this.buttonRef); + this.Controls.Add(this.buttonAdd); + this.Controls.Add(this.dataGridView); + this.Name = "FormJewels"; + this.Text = "Изделия"; + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView dataGridView; + private Button buttonUpdate; + private Button buttonDelete; + private Button buttonRef; + private Button buttonAdd; + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormJewels.cs b/JewelryStore/JewelryStore/FormJewels.cs new file mode 100644 index 0000000..53c72c1 --- /dev/null +++ b/JewelryStore/JewelryStore/FormJewels.cs @@ -0,0 +1,117 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; + +namespace JewelryStore +{ + public partial class FormJewels : Form //TODO + { + private readonly ILogger _logger; + private readonly IJewelLogic _logic; + + public FormJewels(ILogger logger, IJewelLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void LoadData() + { + try + { + var list = _logic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["Id"].Visible = false; + dataGridView.Columns["JewelName"].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(FormJewel)); + if (service is FormJewel form) + { + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + + private void ButtonChange_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = + Program.ServiceProvider?.GetService(typeof(FormJewel)); + if (service is FormJewel form) + { + form.Id = + Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + + private void ButtonDelete_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 JewelBindingModel + { + Id = id + })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка удаления изделия"); + MessageBox.Show(ex.Message, "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + + private void ButtonUpdate_Click(object sender, EventArgs e) + { + LoadData(); + } + + private void FormJewels_Load(object sender, EventArgs e) + { + LoadData(); + } + + private void dataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormJewels.resx b/JewelryStore/JewelryStore/FormJewels.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/JewelryStore/JewelryStore/FormJewels.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/JewelryStore/JewelryStore/FormMain.Designer.cs b/JewelryStore/JewelryStore/FormMain.Designer.cs new file mode 100644 index 0000000..9150f33 --- /dev/null +++ b/JewelryStore/JewelryStore/FormMain.Designer.cs @@ -0,0 +1,176 @@ +namespace JewelryStore +{ + partial class FormMain + { + /// + /// 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.menuStrip = new System.Windows.Forms.MenuStrip(); + this.СправочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.КомпонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ИзделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.buttonCreate = new System.Windows.Forms.Button(); + this.buttonToWork = new System.Windows.Forms.Button(); + this.buttonReady = new System.Windows.Forms.Button(); + this.buttonPut = new System.Windows.Forms.Button(); + this.buttonRefresh = new System.Windows.Forms.Button(); + this.menuStrip.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // menuStrip + // + this.menuStrip.ImageScalingSize = new System.Drawing.Size(24, 24); + this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.СправочникиToolStripMenuItem}); + this.menuStrip.Location = new System.Drawing.Point(0, 0); + this.menuStrip.Name = "menuStrip"; + this.menuStrip.Size = new System.Drawing.Size(1121, 33); + this.menuStrip.TabIndex = 0; + this.menuStrip.Text = "menuStrip1"; + // + // СправочникиToolStripMenuItem + // + this.СправочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.КомпонентыToolStripMenuItem, + this.ИзделияToolStripMenuItem}); + this.СправочникиToolStripMenuItem.Name = "СправочникиToolStripMenuItem"; + this.СправочникиToolStripMenuItem.Size = new System.Drawing.Size(139, 29); + this.СправочникиToolStripMenuItem.Text = "Справочники"; + // + // КомпонентыToolStripMenuItem + // + this.КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem"; + this.КомпонентыToolStripMenuItem.Size = new System.Drawing.Size(218, 34); + this.КомпонентыToolStripMenuItem.Text = "Компоненты"; + this.КомпонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click); + // + // ИзделияToolStripMenuItem + // + this.ИзделияToolStripMenuItem.Name = "ИзделияToolStripMenuItem"; + this.ИзделияToolStripMenuItem.Size = new System.Drawing.Size(218, 34); + this.ИзделияToolStripMenuItem.Text = "Изделия"; + this.ИзделияToolStripMenuItem.Click += new System.EventHandler(this.ИзделияToolStripMenuItem_Click); + // + // dataGridView + // + this.dataGridView.BackgroundColor = System.Drawing.SystemColors.Window; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Location = new System.Drawing.Point(12, 36); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowHeadersWidth = 62; + this.dataGridView.RowTemplate.Height = 33; + this.dataGridView.Size = new System.Drawing.Size(851, 402); + this.dataGridView.TabIndex = 1; + // + // buttonCreate + // + this.buttonCreate.Location = new System.Drawing.Point(884, 78); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(210, 34); + this.buttonCreate.TabIndex = 2; + this.buttonCreate.Text = "Создать заказ"; + this.buttonCreate.UseVisualStyleBackColor = true; + this.buttonCreate.Click += new System.EventHandler(this.ButtonCreateOrder_Click); + // + // buttonToWork + // + this.buttonToWork.Location = new System.Drawing.Point(884, 150); + this.buttonToWork.Name = "buttonToWork"; + this.buttonToWork.Size = new System.Drawing.Size(210, 34); + this.buttonToWork.TabIndex = 3; + this.buttonToWork.Text = "Отдать на выполнение"; + this.buttonToWork.UseVisualStyleBackColor = true; + this.buttonToWork.Click += new System.EventHandler(this.ButtonTakeOrderInWork_Click); + // + // buttonReady + // + this.buttonReady.Location = new System.Drawing.Point(884, 221); + this.buttonReady.Name = "buttonReady"; + this.buttonReady.Size = new System.Drawing.Size(210, 34); + this.buttonReady.TabIndex = 4; + this.buttonReady.Text = "Заказ готов"; + this.buttonReady.UseVisualStyleBackColor = true; + this.buttonReady.Click += new System.EventHandler(this.ButtonOrderReady_Click); + // + // buttonPut + // + this.buttonPut.Location = new System.Drawing.Point(884, 292); + this.buttonPut.Name = "buttonPut"; + this.buttonPut.Size = new System.Drawing.Size(210, 34); + this.buttonPut.TabIndex = 5; + this.buttonPut.Text = "Заказ выдан"; + this.buttonPut.UseVisualStyleBackColor = true; + this.buttonPut.Click += new System.EventHandler(this.ButtonIssuedOrder_Click); + // + // buttonRefresh + // + this.buttonRefresh.Location = new System.Drawing.Point(884, 361); + this.buttonRefresh.Name = "buttonRefresh"; + this.buttonRefresh.Size = new System.Drawing.Size(210, 34); + this.buttonRefresh.TabIndex = 6; + this.buttonRefresh.Text = "Обновить список"; + this.buttonRefresh.UseVisualStyleBackColor = true; + this.buttonRefresh.Click += new System.EventHandler(this.ButtonRef_Click); + // + // FormMain + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1121, 450); + this.Controls.Add(this.buttonRefresh); + this.Controls.Add(this.buttonPut); + this.Controls.Add(this.buttonReady); + this.Controls.Add(this.buttonToWork); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.dataGridView); + this.Controls.Add(this.menuStrip); + this.MainMenuStrip = this.menuStrip; + this.Name = "FormMain"; + this.Text = "Ювелирная лавка"; + this.menuStrip.ResumeLayout(false); + this.menuStrip.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private MenuStrip menuStrip; + private ToolStripMenuItem СправочникиToolStripMenuItem; + private ToolStripMenuItem КомпонентыToolStripMenuItem; + private ToolStripMenuItem ИзделияToolStripMenuItem; + private DataGridView dataGridView; + private Button buttonCreate; + private Button buttonToWork; + private Button buttonReady; + private Button buttonPut; + private Button buttonRefresh; + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormMain.cs b/JewelryStore/JewelryStore/FormMain.cs new file mode 100644 index 0000000..5897324 --- /dev/null +++ b/JewelryStore/JewelryStore/FormMain.cs @@ -0,0 +1,149 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreDataModels.Enums; +using Microsoft.Extensions.Logging; +using System.Windows.Forms; + +namespace JewelryStore +{ + public partial class FormMain : Form + { + 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() + { + try + { + var list = _orderLogic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["JewelId"].Visible = false; + } + _logger.LogInformation("Загрузка заказов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки заказов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + 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(FormJewels)); + if (service is FormJewels 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(); + } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormMain.resx b/JewelryStore/JewelryStore/FormMain.resx new file mode 100644 index 0000000..81a9e3d --- /dev/null +++ b/JewelryStore/JewelryStore/FormMain.resx @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 17, 17 + + \ No newline at end of file diff --git a/JewelryStore/JewelryStore/JewelryStore.csproj b/JewelryStore/JewelryStore/JewelryStore.csproj index b57c89e..ed17f82 100644 --- a/JewelryStore/JewelryStore/JewelryStore.csproj +++ b/JewelryStore/JewelryStore/JewelryStore.csproj @@ -8,4 +8,17 @@ enable + + + + + + + + + + + + + \ No newline at end of file diff --git a/JewelryStore/JewelryStore/Program.cs b/JewelryStore/JewelryStore/Program.cs index c4650cd..30e7668 100644 --- a/JewelryStore/JewelryStore/Program.cs +++ b/JewelryStore/JewelryStore/Program.cs @@ -1,17 +1,51 @@ +using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.StoragesContracts; +using JewelryStoreListImplement.Implements; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using NLog.Extensions.Logging; +using JewelryStoreBusinessLogic.BusinessLogics; + namespace JewelryStore { internal static class Program { + private static ServiceProvider? _serviceProvider; + public static ServiceProvider? ServiceProvider => _serviceProvider; /// - /// The main entry point for the application. + /// 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()); + 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/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/ComponentLogic.cs b/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/ComponentLogic.cs new file mode 100644 index 0000000..a15a2b3 --- /dev/null +++ b/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/ComponentLogic.cs @@ -0,0 +1,113 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.StoragesContracts; +using JewelryStoreContracts.ViewModels; +using Microsoft.Extensions.Logging; + +namespace JewelryStoreBusinessLogic.BusinessLogics +{ + public class ComponentLogic : IComponentLogic + { + private readonly ILogger _logger; + private readonly IComponentStorage _componentStorage; + + public ComponentLogic(ILogger logger, IComponentStorage componentStorage) + { + _logger = logger; + _componentStorage = componentStorage; + } + + public List? ReadList(ComponentSearchModel? model) + { + _logger.LogInformation("ReadList. ComponentName:{ComponentName}. Id:{Id}", model?.ComponentName, model?.Id); + var list = model == null ? _componentStorage.GetFullList() : _componentStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + + public ComponentViewModel? ReadElement(ComponentSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. ComponentName:{ComponentName}. Id:{Id}", model.ComponentName, model.Id); + var element = _componentStorage.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(ComponentBindingModel model) + { + CheckModel(model); + if (_componentStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool Update(ComponentBindingModel model) + { + CheckModel(model); + if (_componentStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + public bool Delete(ComponentBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_componentStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + + private void CheckModel(ComponentBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.ComponentName)) + { + throw new ArgumentNullException("Нет названия компонента", nameof(model.ComponentName)); + } + if (model.Cost <= 0) + { + throw new ArgumentNullException("Цена компонента должна быть больше 0", nameof(model.Cost)); + } + _logger.LogInformation("Component. ComponentName:{ComponentName}. Cost:{Cost}. Id:{Id}", model.ComponentName, model.Cost, model.Id); + var element = _componentStorage.GetElement(new ComponentSearchModel + { + ComponentName = model.ComponentName + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Компонент с таким названием уже есть"); + } + } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/JewelLogic.cs b/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/JewelLogic.cs new file mode 100644 index 0000000..a9b3230 --- /dev/null +++ b/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/JewelLogic.cs @@ -0,0 +1,117 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.StoragesContracts; +using JewelryStoreContracts.ViewModels; +using Microsoft.Extensions.Logging; + +namespace JewelryStoreBusinessLogic.BusinessLogics +{ + public class JewelLogic : IJewelLogic // TODO реализовать интерфейс идентично componentLogic + { + private readonly ILogger _logger; + private readonly IJewelStorage _jewelStorage; + + public JewelLogic(ILogger logger, IJewelStorage jewelStorage) + { + _logger = logger; + _jewelStorage = jewelStorage; + } + + public List? ReadList(JewelSearchModel? model) + { + _logger.LogInformation("ReadList. JewelName:{JewelName}. Id:{Id}", model?.JewelName, model?.Id); + var list = model == null ? _jewelStorage.GetFullList() : _jewelStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + + public JewelViewModel? ReadElement(JewelSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. JewelName:{JewelName}. Id:{Id}", model.JewelName, model.Id); + var element = _jewelStorage.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(JewelBindingModel model) + { + CheckModel(model); + if (_jewelStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool Update(JewelBindingModel model) + { + CheckModel(model); + if (_jewelStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + public bool Delete(JewelBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_jewelStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + + private void CheckModel(JewelBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.JewelName)) + { + throw new ArgumentNullException("Нет названия изделия", nameof(model.JewelName)); + } + if (model.Price <= 0) + { + throw new ArgumentNullException("Цена изделия должна быть больше 0", nameof(model.Price)); + } + if (model.JewelComponents == null || model.JewelComponents.Count == 0) + { + throw new ArgumentNullException("Нет компонентов изделия", nameof(model.JewelComponents)); + } + _logger.LogInformation("Jewel. JewelName:{JewelName}. Cost:{Cost}. Id:{Id}", model.JewelName, model.Price, model.Id); + var element = _jewelStorage.GetElement(new JewelSearchModel + { + JewelName = model.JewelName + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Изделие с таким названием уже есть"); + } + } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/OrderLogic.cs b/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/OrderLogic.cs new file mode 100644 index 0000000..d3e47f1 --- /dev/null +++ b/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/OrderLogic.cs @@ -0,0 +1,144 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.StoragesContracts; +using JewelryStoreContracts.ViewModels; +using JewelryStoreDataModels.Enums; +using Microsoft.Extensions.Logging; + +namespace JewelryStoreBusinessLogic.BusinessLogics +{ + public class OrderLogic : IOrderLogic //TODO реализовать интерфейс + { + private readonly ILogger _logger; + private readonly IOrderStorage _orderStorage; + + public OrderLogic(ILogger logger, IOrderStorage orderStorage) + { + _logger = logger; + _orderStorage = orderStorage; + } + + public bool CreateOrder(OrderBindingModel model) + { + CheckModel(model); + if (model.Status != OrderStatus.Неизвестен) return false; + model.Status = OrderStatus.Принят; + if (_orderStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool DeliveryOrder(OrderBindingModel model) + { + CheckModel(model, false); + var element = _orderStorage.GetElement(new OrderSearchModel + { + Id = model.Id + }); + if (element == null) + { + _logger.LogWarning("Read operation failed"); + return false; + } + if (element.Status != OrderStatus.Готов) + { + _logger.LogWarning("Status change operation failed"); + throw new InvalidOperationException("Заказ должен быть переведен в статус готовности перед выдачей!"); + } + model.Status = OrderStatus.Выдан; + model.DateImplement = DateTime.Now; + _orderStorage.Update(model); + return true; + } + + public bool FinishOrder(OrderBindingModel model) + { + CheckModel(model, false); + var element = _orderStorage.GetElement(new OrderSearchModel + { + Id = model.Id + }); + if (element == null) + { + _logger.LogWarning("Read operation failed"); + return false; + } + if (element.Status != OrderStatus.Выполняется) + { + _logger.LogWarning("Status change operation failed"); + throw new InvalidOperationException("Заказ должен быть переведен в статус выполнения перед готовностью!"); + } + model.Status = OrderStatus.Готов; + _orderStorage.Update(model); + return true; + } + + public List? ReadList(OrderSearchModel? model) + { + _logger.LogInformation("ReadList. Id:{Id}", model?.Id); + var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + + public bool TakeOrderInWork(OrderBindingModel model) + { + CheckModel(model, false); + var element = _orderStorage.GetElement(new OrderSearchModel + { + Id = model.Id + }); + if (element == null) + { + _logger.LogWarning("Read operation failed"); + return false; + } + if (element.Status != OrderStatus.Принят) + { + _logger.LogWarning("Status change operation failed"); + throw new InvalidOperationException("Заказ должен быть переведен в статус принятого перед его выполнением!"); + } + model.Status = OrderStatus.Выполняется; + _orderStorage.Update(model); + return true; + } + + private void CheckModel(OrderBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (model.Sum <= 0) + { + throw new ArgumentNullException("Сумма заказа должна быть больше 0", nameof(model.Sum)); + } + if (model.Count <= 0) + { + throw new ArgumentNullException("Количество изделий должно быть больше 0", nameof(model.Count)); + } + _logger.LogInformation("Order. Sum:{Sum}. Id:{Id}", model.Sum, model.Id); + var element = _orderStorage.GetElement(new OrderSearchModel + { + Id = model.Id + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Заказ с таким ID уже существует"); + } + } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreBusinessLogic/JewelryStoreBusinessLogic.csproj b/JewelryStore/JewelryStoreBusinessLogic/JewelryStoreBusinessLogic.csproj new file mode 100644 index 0000000..b375f2f --- /dev/null +++ b/JewelryStore/JewelryStoreBusinessLogic/JewelryStoreBusinessLogic.csproj @@ -0,0 +1,17 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + diff --git a/JewelryStore/JewelryStoreContracts/BindingModels/ComponentBindingModel.cs b/JewelryStore/JewelryStoreContracts/BindingModels/ComponentBindingModel.cs new file mode 100644 index 0000000..4ebc6b2 --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/BindingModels/ComponentBindingModel.cs @@ -0,0 +1,11 @@ +using JewelryStoreDataModels.Models; + +namespace JewelryStoreContracts.BindingModels +{ + public class ComponentBindingModel : IComponentModel + { + public int Id { get; set; } + public string ComponentName { get; set; } = string.Empty; + public double Cost { get; set; } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreContracts/BindingModels/JewelBindingModel.cs b/JewelryStore/JewelryStoreContracts/BindingModels/JewelBindingModel.cs new file mode 100644 index 0000000..3eceeec --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/BindingModels/JewelBindingModel.cs @@ -0,0 +1,17 @@ +using JewelryStoreDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreContracts.BindingModels +{ + public class JewelBindingModel : IJewelModel + { + public int Id { get; set; } + public string JewelName { get; set; } = string.Empty; + public double Price { get; set; } + public Dictionary JewelComponents { get; set; } = new(); + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreContracts/BindingModels/OrderBindingModel.cs b/JewelryStore/JewelryStoreContracts/BindingModels/OrderBindingModel.cs new file mode 100644 index 0000000..ef863a4 --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/BindingModels/OrderBindingModel.cs @@ -0,0 +1,16 @@ +using JewelryStoreDataModels.Enums; +using JewelryStoreDataModels.Models; + +namespace JewelryStoreContracts.BindingModels +{ + public class OrderBindingModel : IOrderModel + { + public int Id { get; set; } + public int JewelId { get; set; } + public int Count { get; set; } + public double Sum { get; set; } + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + public DateTime DateCreate { get; set; } = DateTime.Now; + public DateTime? DateImplement { get; set; } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IComponentLogic.cs b/JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IComponentLogic.cs new file mode 100644 index 0000000..ad21089 --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IComponentLogic.cs @@ -0,0 +1,15 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.ViewModels; + +namespace JewelryStoreContracts.BusinessLogicsContracts +{ + public interface IComponentLogic + { + List? ReadList(ComponentSearchModel? model); + ComponentViewModel? ReadElement(ComponentSearchModel model); + bool Create(ComponentBindingModel model); + bool Update(ComponentBindingModel model); + bool Delete(ComponentBindingModel model); + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IJewelLogic.cs b/JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IJewelLogic.cs new file mode 100644 index 0000000..1fec5be --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IJewelLogic.cs @@ -0,0 +1,15 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.ViewModels; + +namespace JewelryStoreContracts.BusinessLogicsContracts +{ + public interface IJewelLogic + { + List? ReadList(JewelSearchModel? model); + JewelViewModel? ReadElement(JewelSearchModel model); + bool Create(JewelBindingModel model); + bool Update(JewelBindingModel model); + bool Delete(JewelBindingModel model); + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IOrderLogic.cs b/JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IOrderLogic.cs new file mode 100644 index 0000000..e6afa1a --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IOrderLogic.cs @@ -0,0 +1,15 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.ViewModels; + +namespace JewelryStoreContracts.BusinessLogicsContracts +{ + public interface IOrderLogic + { + List? ReadList(OrderSearchModel? model); + bool CreateOrder(OrderBindingModel model); + bool TakeOrderInWork(OrderBindingModel model); + bool FinishOrder(OrderBindingModel model); + bool DeliveryOrder(OrderBindingModel model); + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreContracts/JewelryStoreContracts.csproj b/JewelryStore/JewelryStoreContracts/JewelryStoreContracts.csproj new file mode 100644 index 0000000..1e0a91c --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/JewelryStoreContracts.csproj @@ -0,0 +1,13 @@ + + + + net6.0 + enable + enable + + + + + + + diff --git a/JewelryStore/JewelryStoreContracts/SearchModels/ComponentSearchModel.cs b/JewelryStore/JewelryStoreContracts/SearchModels/ComponentSearchModel.cs new file mode 100644 index 0000000..0ab91eb --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/SearchModels/ComponentSearchModel.cs @@ -0,0 +1,8 @@ +namespace JewelryStoreContracts.SearchModels +{ + public class ComponentSearchModel + { + public int? Id { get; set; } + public string? ComponentName { get; set; } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreContracts/SearchModels/JewelSearchModel.cs b/JewelryStore/JewelryStoreContracts/SearchModels/JewelSearchModel.cs new file mode 100644 index 0000000..84fd88b --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/SearchModels/JewelSearchModel.cs @@ -0,0 +1,8 @@ +namespace JewelryStoreContracts.SearchModels +{ + public class JewelSearchModel + { + public int? Id { get; set; } + public string? JewelName { get; set; } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreContracts/SearchModels/OrderSearchModel.cs b/JewelryStore/JewelryStoreContracts/SearchModels/OrderSearchModel.cs new file mode 100644 index 0000000..1639ae0 --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/SearchModels/OrderSearchModel.cs @@ -0,0 +1,7 @@ +namespace JewelryStoreContracts.SearchModels +{ + public class OrderSearchModel + { + public int? Id { get; set; } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreContracts/StoragesModels/IComponentStorage.cs b/JewelryStore/JewelryStoreContracts/StoragesModels/IComponentStorage.cs new file mode 100644 index 0000000..5796896 --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/StoragesModels/IComponentStorage.cs @@ -0,0 +1,16 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.ViewModels; + +namespace JewelryStoreContracts.StoragesContracts +{ + public interface IComponentStorage + { + List GetFullList(); + List GetFilteredList(ComponentSearchModel model); + ComponentViewModel? GetElement(ComponentSearchModel model); + ComponentViewModel? Insert(ComponentBindingModel model); + ComponentViewModel? Update(ComponentBindingModel model); + ComponentViewModel? Delete(ComponentBindingModel model); + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreContracts/StoragesModels/IJewelStorage.cs b/JewelryStore/JewelryStoreContracts/StoragesModels/IJewelStorage.cs new file mode 100644 index 0000000..92cac38 --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/StoragesModels/IJewelStorage.cs @@ -0,0 +1,16 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.ViewModels; + +namespace JewelryStoreContracts.StoragesContracts +{ + public interface IJewelStorage + { + List GetFullList(); + List GetFilteredList(JewelSearchModel model); + JewelViewModel? GetElement(JewelSearchModel model); + JewelViewModel? Insert(JewelBindingModel model); + JewelViewModel? Update(JewelBindingModel model); + JewelViewModel? Delete(JewelBindingModel model); + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreContracts/StoragesModels/IOrderStorage.cs b/JewelryStore/JewelryStoreContracts/StoragesModels/IOrderStorage.cs new file mode 100644 index 0000000..fcd4576 --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/StoragesModels/IOrderStorage.cs @@ -0,0 +1,16 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.ViewModels; + +namespace JewelryStoreContracts.StoragesContracts +{ + public interface IOrderStorage + { + List GetFullList(); + List GetFilteredList(OrderSearchModel model); + OrderViewModel? GetElement(OrderSearchModel model); + OrderViewModel? Insert(OrderBindingModel model); + OrderViewModel? Update(OrderBindingModel model); + OrderViewModel? Delete(OrderBindingModel model); + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreContracts/ViewModels/ComponentViewModel.cs b/JewelryStore/JewelryStoreContracts/ViewModels/ComponentViewModel.cs new file mode 100644 index 0000000..ab46b0a --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/ViewModels/ComponentViewModel.cs @@ -0,0 +1,14 @@ +using JewelryStoreDataModels.Models; +using System.ComponentModel; + +namespace JewelryStoreContracts.ViewModels +{ + public class ComponentViewModel : IComponentModel + { + public int Id { get; set; } + [DisplayName("Название компонента")] + public string ComponentName { get; set; } = string.Empty; + [DisplayName("Цена")] + public double Cost { get; set; } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreContracts/ViewModels/JewelViewModel.cs b/JewelryStore/JewelryStoreContracts/ViewModels/JewelViewModel.cs new file mode 100644 index 0000000..3fe9d88 --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/ViewModels/JewelViewModel.cs @@ -0,0 +1,19 @@ +using JewelryStoreDataModels.Models; +using System.ComponentModel; + +namespace JewelryStoreContracts.ViewModels +{ + public class JewelViewModel : IJewelModel + { + public int Id { get; set; } + [DisplayName("Название изделия")] + public string JewelName { get; set; } = string.Empty; + [DisplayName("Цена")] + public double Price { get; set; } + public Dictionary JewelComponents + { + get; + set; + } = new(); + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreContracts/ViewModels/OrderViewModel.cs b/JewelryStore/JewelryStoreContracts/ViewModels/OrderViewModel.cs new file mode 100644 index 0000000..e28a225 --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/ViewModels/OrderViewModel.cs @@ -0,0 +1,27 @@ +using JewelryStoreDataModels.Enums; +using JewelryStoreDataModels.Models; +using System.ComponentModel; + +namespace JewelryStoreContracts.ViewModels +{ + public class OrderViewModel : IOrderModel + { + [DisplayName("Номер")] + public int Id { get; set; } + public int JewelId { get; set; } + + [DisplayName("Изделие")] + public string JewelName { get; set; } = string.Empty; + [DisplayName("Количество")] + public int Count { get; set; } + + [DisplayName("Сумма")] + public double Sum { get; set; } + [DisplayName("Статус")] + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + [DisplayName("Дата создания")] + public DateTime DateCreate { get; set; } = DateTime.Now; + [DisplayName("Дата выполнения")] + public DateTime? DateImplement { get; set; } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreListImplement/DataListSingleton.cs b/JewelryStore/JewelryStoreListImplement/DataListSingleton.cs new file mode 100644 index 0000000..6ddcac3 --- /dev/null +++ b/JewelryStore/JewelryStoreListImplement/DataListSingleton.cs @@ -0,0 +1,26 @@ +using JewelryStoreListImplement.Models; + +namespace JewelryStoreListImplement +{ + public class DataListSingleton + { + private static DataListSingleton? _instance; + public List Components { get; set; } + public List Orders { get; set; } + public List Jewels { get; set; } + private DataListSingleton() + { + Components = new List(); + Orders = new List(); + Jewels = new List(); + } + public static DataListSingleton GetInstance() + { + if (_instance == null) + { + _instance = new DataListSingleton(); + } + return _instance; + } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreListImplement/Implements/ComponentStorage.cs b/JewelryStore/JewelryStoreListImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..fda42e9 --- /dev/null +++ b/JewelryStore/JewelryStoreListImplement/Implements/ComponentStorage.cs @@ -0,0 +1,103 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.StoragesContracts; +using JewelryStoreContracts.ViewModels; +using JewelryStoreListImplement.Models; + +namespace JewelryStoreListImplement.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; + } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreListImplement/Implements/JewelStorage.cs b/JewelryStore/JewelryStoreListImplement/Implements/JewelStorage.cs new file mode 100644 index 0000000..be5419d --- /dev/null +++ b/JewelryStore/JewelryStoreListImplement/Implements/JewelStorage.cs @@ -0,0 +1,107 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.StoragesContracts; +using JewelryStoreContracts.ViewModels; +using JewelryStoreListImplement.Models; + +namespace JewelryStoreListImplement.Implements +{ + public class JewelStorage : IJewelStorage // TODO реализовать интерфейс + { + private readonly DataListSingleton _source; + + public JewelStorage() + { + _source = DataListSingleton.GetInstance(); + } + public List GetFullList() + { + var result = new List(); + foreach (var jewel in _source.Jewels) + { + result.Add(jewel.GetViewModel); + } + return result; + } + + public List GetFilteredList(JewelSearchModel model) + { + var result = new List(); + if (string.IsNullOrEmpty(model.JewelName)) + { + return result; + } + foreach (var jewel in _source.Jewels) + { + if (jewel.JewelName.Contains(model.JewelName)) + { + result.Add(jewel.GetViewModel); + } + } + return result; + } + + public JewelViewModel? GetElement(JewelSearchModel model) + { + if (string.IsNullOrEmpty(model.JewelName) && !model.Id.HasValue) + { + return null; + } + foreach (var jewel in _source.Jewels) + { + if ((!string.IsNullOrEmpty(model.JewelName) && jewel.JewelName == model.JewelName) || + (model.Id.HasValue && jewel.Id == model.Id)) + { + return jewel.GetViewModel; + } + } + return null; + } + + public JewelViewModel? Insert(JewelBindingModel model) + { + model.Id = 1; + foreach (var jewel in _source.Jewels) + { + if (model.Id <= jewel.Id) + { + model.Id = jewel.Id + 1; + } + } + var newJewel = Jewel.Create(model); + if (newJewel == null) + { + return null; + } + _source.Jewels.Add(newJewel); + return newJewel.GetViewModel; + } + + public JewelViewModel? Update(JewelBindingModel model) + { + foreach (var jewel in _source.Jewels) + { + if (jewel.Id == model.Id) + { + jewel.Update(model); + return jewel.GetViewModel; + } + } + return null; + } + + public JewelViewModel? Delete(JewelBindingModel model) + { + for (int i = 0; i < _source.Jewels.Count; ++i) + { + if (_source.Jewels[i].Id == model.Id) + { + var element = _source.Jewels[i]; + _source.Jewels.RemoveAt(i); + return element.GetViewModel; + } + } + return null; + } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreListImplement/Implements/OrderStorage.cs b/JewelryStore/JewelryStoreListImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..b0f92c3 --- /dev/null +++ b/JewelryStore/JewelryStoreListImplement/Implements/OrderStorage.cs @@ -0,0 +1,119 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.StoragesContracts; +using JewelryStoreContracts.ViewModels; +using JewelryStoreListImplement.Models; + +namespace JewelryStoreListImplement.Implements +{ + public class OrderStorage : IOrderStorage // TODO реализовать интерфейс + { + private readonly DataListSingleton _source; + + public OrderStorage() + { + _source = DataListSingleton.GetInstance(); + } + public List GetFullList() + { + var result = new List(); + foreach (var order in _source.Orders) + { + result.Add(AccessJewelStorage(order.GetViewModel)); + } + return result; + } + + public List GetFilteredList(OrderSearchModel model) + { + var result = new List(); + if (!model.Id.HasValue) + { + return result; + } + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + result.Add(AccessJewelStorage(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 AccessJewelStorage(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 AccessJewelStorage(newOrder.GetViewModel); + } + + public OrderViewModel? Update(OrderBindingModel model) + { + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + order.Update(model); + return AccessJewelStorage(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 AccessJewelStorage(element.GetViewModel); + } + } + return null; + } + + public OrderViewModel AccessJewelStorage(OrderViewModel model) + { + foreach (var jewel in _source.Jewels) + { + if (jewel.Id == model.JewelId) + { + model.JewelName = jewel.JewelName; + break; + } + } + return model; + } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreListImplement/JewelryStoreListImplement.csproj b/JewelryStore/JewelryStoreListImplement/JewelryStoreListImplement.csproj new file mode 100644 index 0000000..8995315 --- /dev/null +++ b/JewelryStore/JewelryStoreListImplement/JewelryStoreListImplement.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + diff --git a/JewelryStore/JewelryStoreListImplement/Models/Component.cs b/JewelryStore/JewelryStoreListImplement/Models/Component.cs new file mode 100644 index 0000000..4dc4508 --- /dev/null +++ b/JewelryStore/JewelryStoreListImplement/Models/Component.cs @@ -0,0 +1,42 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.ViewModels; +using JewelryStoreDataModels.Models; + +namespace JewelryStoreListImplement.Models +{ + public class Component : IComponentModel + { + public int Id { get; private set; } + public string ComponentName { get; private set; } = string.Empty; + public double Cost { get; set; } + + public static Component? Create(ComponentBindingModel? model) + { + if (model == null) + { + return null; + } + return new Component() + { + Id = model.Id, + ComponentName = model.ComponentName, + Cost = model.Cost + }; + } + public void Update(ComponentBindingModel? model) + { + if (model == null) + { + return; + } + ComponentName = model.ComponentName; + Cost = model.Cost; + } + public ComponentViewModel GetViewModel => new() + { + Id = Id, + ComponentName = ComponentName, + Cost = Cost + }; + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreListImplement/Models/Jewel.cs b/JewelryStore/JewelryStoreListImplement/Models/Jewel.cs new file mode 100644 index 0000000..987ad6c --- /dev/null +++ b/JewelryStore/JewelryStoreListImplement/Models/Jewel.cs @@ -0,0 +1,50 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.ViewModels; +using JewelryStoreDataModels.Models; + +namespace JewelryStoreListImplement.Models +{ + public class Jewel : IJewelModel + { + public int Id { get; private set; } + public string JewelName { get; private set; } = string.Empty; + public double Price { get; private set; } + public Dictionary JewelComponents + { + get; + private set; + } = new Dictionary(); + + public static Jewel? Create(JewelBindingModel? model) + { + if (model == null) + { + return null; + } + return new Jewel() + { + Id = model.Id, + JewelName = model.JewelName, + Price = model.Price, + JewelComponents = model.JewelComponents + }; + } + public void Update(JewelBindingModel? model) + { + if (model == null) + { + return; + } + JewelName = model.JewelName; + Price = model.Price; + JewelComponents = model.JewelComponents; + } + public JewelViewModel GetViewModel => new() + { + Id = Id, + JewelName = JewelName, + Price = Price, + JewelComponents = JewelComponents + }; + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreListImplement/Models/Order.cs b/JewelryStore/JewelryStoreListImplement/Models/Order.cs new file mode 100644 index 0000000..bde0930 --- /dev/null +++ b/JewelryStore/JewelryStoreListImplement/Models/Order.cs @@ -0,0 +1,64 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.ViewModels; +using JewelryStoreDataModels.Enums; +using JewelryStoreDataModels.Models; + +namespace JewelryStoreListImplement.Models +{ + public class Order : IOrderModel // TODO Класс для модели сущности «Заказ» разработать самостоятельно + { + public int Id { get; private set; } + + public int JewelId { get; private set; } + + public int Count { get; private set; } + + public double Sum { get; private set; } + + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + + public DateTime DateCreate { get; private set; } = DateTime.Now; + + public DateTime? DateImplement { get; private set; } + + public static Order? Create(OrderBindingModel? model) + { + if (model == null) + { + return null; + } + return new Order() + { + Id = model.Id, + JewelId = model.JewelId, + Count = model.Count, + Sum = model.Sum, + Status = model.Status, + DateCreate = model.DateCreate, + DateImplement = model.DateImplement + }; + } + public void Update(OrderBindingModel? model) + { + if (model == null) + { + return; + } + Status = model.Status; + if (model.DateImplement.HasValue) + { + DateImplement = model.DateImplement; + } + } + public OrderViewModel GetViewModel => new() + { + Id = Id, + JewelId = JewelId, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement + }; + } +} \ No newline at end of file -- 2.25.1 From 63ae753b2aedae8a1ce288eb83ac66c4bd7bf9fc Mon Sep 17 00:00:00 2001 From: Anastasia Date: Wed, 1 Mar 2023 10:48:21 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D0=98=D1=82=D0=BE=D0=B3=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D0=B9=20=D0=B2=D0=B0=D1=80=D0=B8=D0=B0=D0=BD=D1=82=20+=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D1=84=D0=B0?= =?UTF-8?q?=D0=B9=D0=BB=20nlog.config.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/IComponentModel.cs | 1 - JewelryStore/JewelryStore/FormComponent.cs | 25 +++--- .../JewelryStore/FormComponents.Designer.cs | 24 +++-- JewelryStore/JewelryStore/FormComponents.cs | 33 ++----- .../JewelryStore/FormCreateOrder.Designer.cs | 40 ++++----- JewelryStore/JewelryStore/FormCreateOrder.cs | 12 +-- .../JewelryStore/FormJewel.Designer.cs | 75 ++++++++-------- JewelryStore/JewelryStore/FormJewel.cs | 60 +++++-------- JewelryStore/JewelryStore/FormJewel.resx | 9 ++ .../FormJewelComponent.Designer.cs | 4 +- .../JewelryStore/FormJewelComponent.cs | 13 +-- .../JewelryStore/FormJewels.Designer.cs | 23 +++-- JewelryStore/JewelryStore/FormJewels.cs | 30 ++----- .../JewelryStore/FormMain.Designer.cs | 90 +++++++++---------- JewelryStore/JewelryStore/FormMain.cs | 22 ++--- JewelryStore/JewelryStore/JewelryStore.csproj | 4 + JewelryStore/JewelryStore/nlog.config | 15 ++++ .../BusinessLogics/JewelLogic.cs | 3 +- .../BusinessLogics/OrderLogic.cs | 2 +- .../DataListSingleton.cs | 2 + .../Implements/ComponentStorage.cs | 6 ++ .../Implements/JewelStorage.cs | 3 +- .../Implements/OrderStorage.cs | 3 +- .../Models/Component.cs | 2 + .../JewelryStoreListImplement/Models/Jewel.cs | 2 + .../JewelryStoreListImplement/Models/Order.cs | 10 +-- 26 files changed, 248 insertions(+), 265 deletions(-) create mode 100644 JewelryStore/JewelryStore/nlog.config diff --git a/JewelryStore/JewelryShopDataModels/Models/IComponentModel.cs b/JewelryStore/JewelryShopDataModels/Models/IComponentModel.cs index ea7566c..213f341 100644 --- a/JewelryStore/JewelryShopDataModels/Models/IComponentModel.cs +++ b/JewelryStore/JewelryShopDataModels/Models/IComponentModel.cs @@ -7,5 +7,4 @@ namespace JewelryStoreDataModels.Models string ComponentName { get; } double Cost { get; } } - } \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormComponent.cs b/JewelryStore/JewelryStore/FormComponent.cs index ef76da3..6e964e6 100644 --- a/JewelryStore/JewelryStore/FormComponent.cs +++ b/JewelryStore/JewelryStore/FormComponent.cs @@ -20,13 +20,14 @@ namespace JewelryStore 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) @@ -36,8 +37,7 @@ namespace JewelryStore _logger.LogInformation("Получение компонента"); var view = _logic.ReadElement(new ComponentSearchModel { - Id = - _id.Value + Id = _id.Value }); if (view != null) { @@ -48,17 +48,16 @@ namespace JewelryStore catch (Exception ex) { _logger.LogError(ex, "Ошибка получения компонента"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); + 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); + MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } _logger.LogInformation("Сохранение компонента"); @@ -70,24 +69,22 @@ namespace JewelryStore ComponentName = textBoxName.Text, Cost = Convert.ToDouble(textBoxCost.Text) }; - var operationResult = _id.HasValue ? _logic.Update(model) : - _logic.Create(model); + var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); if (!operationResult) { throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); } - MessageBox.Show("Сохранение прошло успешно", "Сообщение", - MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); DialogResult = DialogResult.OK; Close(); } catch (Exception ex) { _logger.LogError(ex, "Ошибка сохранения компонента"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } + private void ButtonCancel_Click(object sender, EventArgs e) { DialogResult = DialogResult.Cancel; diff --git a/JewelryStore/JewelryStore/FormComponents.Designer.cs b/JewelryStore/JewelryStore/FormComponents.Designer.cs index f4d7e82..3977446 100644 --- a/JewelryStore/JewelryStore/FormComponents.Designer.cs +++ b/JewelryStore/JewelryStore/FormComponents.Designer.cs @@ -30,7 +30,7 @@ { this.dataGridView = new System.Windows.Forms.DataGridView(); this.buttonAdd = new System.Windows.Forms.Button(); - this.buttonRef = new System.Windows.Forms.Button(); + this.buttonRefresh = new System.Windows.Forms.Button(); this.buttonDelete = new System.Windows.Forms.Button(); this.buttonUpdate = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); @@ -46,7 +46,6 @@ this.dataGridView.RowTemplate.Height = 33; this.dataGridView.Size = new System.Drawing.Size(525, 427); this.dataGridView.TabIndex = 0; - this.dataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_CellContentClick); // // buttonAdd // @@ -58,15 +57,15 @@ this.buttonAdd.UseVisualStyleBackColor = true; this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); // - // buttonRef + // buttonRefresh // - this.buttonRef.Location = new System.Drawing.Point(569, 107); - this.buttonRef.Name = "buttonRef"; - this.buttonRef.Size = new System.Drawing.Size(164, 34); - this.buttonRef.TabIndex = 2; - this.buttonRef.Text = "Изменить"; - this.buttonRef.UseVisualStyleBackColor = true; - this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click); + this.buttonRefresh.Location = new System.Drawing.Point(569, 107); + this.buttonRefresh.Name = "buttonRefresh"; + this.buttonRefresh.Size = new System.Drawing.Size(164, 34); + this.buttonRefresh.TabIndex = 2; + this.buttonRefresh.Text = "Изменить"; + this.buttonRefresh.UseVisualStyleBackColor = true; + this.buttonRefresh.Click += new System.EventHandler(this.ButtonRefresh_Click); // // buttonDelete // @@ -95,12 +94,11 @@ this.ClientSize = new System.Drawing.Size(756, 450); this.Controls.Add(this.buttonUpdate); this.Controls.Add(this.buttonDelete); - this.Controls.Add(this.buttonRef); + this.Controls.Add(this.buttonRefresh); this.Controls.Add(this.buttonAdd); this.Controls.Add(this.dataGridView); this.Name = "FormComponents"; this.Text = "Компоненты"; - this.Load += new System.EventHandler(this.FormComponents_Load_1); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); this.ResumeLayout(false); @@ -110,7 +108,7 @@ private DataGridView dataGridView; private Button buttonAdd; - private Button buttonRef; + private Button buttonRefresh; private Button buttonDelete; private Button buttonUpdate; } diff --git a/JewelryStore/JewelryStore/FormComponents.cs b/JewelryStore/JewelryStore/FormComponents.cs index 95dca4b..00a7a46 100644 --- a/JewelryStore/JewelryStore/FormComponents.cs +++ b/JewelryStore/JewelryStore/FormComponents.cs @@ -9,6 +9,7 @@ namespace JewelryStore { private readonly ILogger _logger; private readonly IComponentLogic _logic; + public FormComponents(ILogger logger, IComponentLogic logic) { InitializeComponent(); @@ -20,6 +21,7 @@ namespace JewelryStore { LoadData(); } + private void LoadData() { try @@ -29,16 +31,14 @@ namespace JewelryStore { dataGridView.DataSource = list; dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ComponentName"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; + dataGridView.Columns["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } _logger.LogInformation("Загрузка компонентов"); } catch (Exception ex) { _logger.LogError(ex, "Ошибка загрузки компонентов"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } @@ -63,11 +63,9 @@ namespace JewelryStore { if (dataGridView.SelectedRows.Count == 1) { - if (MessageBox.Show("Удалить запись?", "Вопрос", - MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - int id = - Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); _logger.LogInformation("Удаление компонента"); try { @@ -83,20 +81,17 @@ namespace JewelryStore catch (Exception ex) { _logger.LogError(ex, "Ошибка удаления компонента"); - MessageBox.Show(ex.Message, "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } - } - private void ButtonRef_Click(object sender, EventArgs e) + private void ButtonRefresh_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = - Program.ServiceProvider?.GetService(typeof(FormComponent)); + var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); if (service is FormComponent form) { form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); @@ -107,15 +102,5 @@ namespace JewelryStore } } } - - private void FormComponents_Load_1(object sender, EventArgs e) - { - - } - - private void dataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e) - { - - } } } \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormCreateOrder.Designer.cs b/JewelryStore/JewelryStore/FormCreateOrder.Designer.cs index ac480b2..dd25676 100644 --- a/JewelryStore/JewelryStore/FormCreateOrder.Designer.cs +++ b/JewelryStore/JewelryStore/FormCreateOrder.Designer.cs @@ -29,8 +29,8 @@ private void InitializeComponent() { this.labelJewel = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); + this.labelCount = new System.Windows.Forms.Label(); + this.labelSum = new System.Windows.Forms.Label(); this.comboBoxJewel = new System.Windows.Forms.ComboBox(); this.textBoxCount = new System.Windows.Forms.TextBox(); this.textBoxSum = new System.Windows.Forms.TextBox(); @@ -47,23 +47,23 @@ this.labelJewel.TabIndex = 0; this.labelJewel.Text = "Изделие:"; // - // label2 + // labelCount // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(17, 62); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(111, 25); - this.label2.TabIndex = 1; - this.label2.Text = "Количество:"; + this.labelCount.AutoSize = true; + this.labelCount.Location = new System.Drawing.Point(17, 62); + this.labelCount.Name = "labelCount"; + this.labelCount.Size = new System.Drawing.Size(111, 25); + this.labelCount.TabIndex = 1; + this.labelCount.Text = "Количество:"; // - // label3 + // labelSum // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(17, 107); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(71, 25); - this.label3.TabIndex = 2; - this.label3.Text = "Сумма:"; + this.labelSum.AutoSize = true; + this.labelSum.Location = new System.Drawing.Point(17, 107); + this.labelSum.Name = "labelSum"; + this.labelSum.Size = new System.Drawing.Size(71, 25); + this.labelSum.TabIndex = 2; + this.labelSum.Text = "Сумма:"; // // comboBoxJewel // @@ -120,8 +120,8 @@ this.Controls.Add(this.textBoxSum); this.Controls.Add(this.textBoxCount); this.Controls.Add(this.comboBoxJewel); - this.Controls.Add(this.label3); - this.Controls.Add(this.label2); + this.Controls.Add(this.labelSum); + this.Controls.Add(this.labelCount); this.Controls.Add(this.labelJewel); this.Name = "FormCreateOrder"; this.Text = "Заказ"; @@ -134,8 +134,8 @@ #endregion private Label labelJewel; - private Label label2; - private Label label3; + private Label labelCount; + private Label labelSum; private ComboBox comboBoxJewel; private TextBox textBoxCount; private TextBox textBoxSum; diff --git a/JewelryStore/JewelryStore/FormCreateOrder.cs b/JewelryStore/JewelryStore/FormCreateOrder.cs index d9e0bd9..1f1eab4 100644 --- a/JewelryStore/JewelryStore/FormCreateOrder.cs +++ b/JewelryStore/JewelryStore/FormCreateOrder.cs @@ -12,7 +12,6 @@ namespace JewelryStore private readonly ILogger _logger; private readonly IJewelLogic _logicJ; private readonly IOrderLogic _logicO; - private List? _list; public FormCreateOrder(ILogger logger, IJewelLogic logicJ, IOrderLogic logicO) @@ -89,14 +88,12 @@ namespace JewelryStore { if (string.IsNullOrEmpty(textBoxCount.Text)) { - MessageBox.Show("Заполните поле Количество", "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } if (comboBoxJewel.SelectedValue == null) { - MessageBox.Show("Выберите драгоценность", "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Выберите драгоценность", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } _logger.LogInformation("Создание заказа"); @@ -119,10 +116,8 @@ namespace JewelryStore catch (Exception ex) { _logger.LogError(ex, "Ошибка создания заказа"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } - } private void ComboBoxJewel_SelectedIndexChanged(object sender, EventArgs e) @@ -130,7 +125,6 @@ namespace JewelryStore CalcSum(); } - private void ButtonCancel_Click(object sender, EventArgs e) { DialogResult = DialogResult.Cancel; diff --git a/JewelryStore/JewelryStore/FormJewel.Designer.cs b/JewelryStore/JewelryStore/FormJewel.Designer.cs index 5dfb5ce..f1094b1 100644 --- a/JewelryStore/JewelryStore/FormJewel.Designer.cs +++ b/JewelryStore/JewelryStore/FormJewel.Designer.cs @@ -29,6 +29,9 @@ private void InitializeComponent() { this.dataGridView = new System.Windows.Forms.DataGridView(); + this.JewelId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ComponentName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.labelName = new System.Windows.Forms.Label(); this.labelPrice = new System.Windows.Forms.Label(); this.textBoxName = new System.Windows.Forms.TextBox(); @@ -36,13 +39,10 @@ this.groupBox = new System.Windows.Forms.GroupBox(); this.buttonUpdate = new System.Windows.Forms.Button(); this.buttonDelete = new System.Windows.Forms.Button(); - this.buttonChange = new System.Windows.Forms.Button(); + this.buttonRefresh = new System.Windows.Forms.Button(); this.buttonAdd = new System.Windows.Forms.Button(); this.buttonSave = new System.Windows.Forms.Button(); this.buttonCancel = new System.Windows.Forms.Button(); - this.JewelId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ComponentName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.groupBox.SuspendLayout(); this.SuspendLayout(); @@ -61,7 +61,29 @@ this.dataGridView.RowTemplate.Height = 33; this.dataGridView.Size = new System.Drawing.Size(468, 325); this.dataGridView.TabIndex = 0; - this.dataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_CellContentClick); + // + // JewelId + // + this.JewelId.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.JewelId.HeaderText = "Id"; + this.JewelId.MinimumWidth = 8; + this.JewelId.Name = "JewelId"; + this.JewelId.Visible = false; + this.JewelId.Width = 8; + // + // ComponentName + // + this.ComponentName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.ComponentName.HeaderText = "Компонент"; + this.ComponentName.MinimumWidth = 8; + this.ComponentName.Name = "ComponentName"; + // + // Count + // + this.Count.HeaderText = "Количество"; + this.Count.MinimumWidth = 8; + this.Count.Name = "Count"; + this.Count.Width = 150; // // labelName // @@ -99,7 +121,7 @@ // this.groupBox.Controls.Add(this.buttonUpdate); this.groupBox.Controls.Add(this.buttonDelete); - this.groupBox.Controls.Add(this.buttonChange); + this.groupBox.Controls.Add(this.buttonRefresh); this.groupBox.Controls.Add(this.buttonAdd); this.groupBox.Controls.Add(this.dataGridView); this.groupBox.Location = new System.Drawing.Point(15, 94); @@ -129,15 +151,15 @@ this.buttonDelete.UseVisualStyleBackColor = true; this.buttonDelete.Click += new System.EventHandler(this.ButtonDelete_Click); // - // buttonChange + // buttonRefresh // - this.buttonChange.Location = new System.Drawing.Point(505, 118); - this.buttonChange.Name = "buttonChange"; - this.buttonChange.Size = new System.Drawing.Size(141, 34); - this.buttonChange.TabIndex = 2; - this.buttonChange.Text = "Изменить"; - this.buttonChange.UseVisualStyleBackColor = true; - this.buttonChange.Click += new System.EventHandler(this.ButtonChange_Click); + this.buttonRefresh.Location = new System.Drawing.Point(505, 118); + this.buttonRefresh.Name = "buttonRefresh"; + this.buttonRefresh.Size = new System.Drawing.Size(141, 34); + this.buttonRefresh.TabIndex = 2; + this.buttonRefresh.Text = "Изменить"; + this.buttonRefresh.UseVisualStyleBackColor = true; + this.buttonRefresh.Click += new System.EventHandler(this.ButtonRefresh_Click); // // buttonAdd // @@ -169,29 +191,6 @@ this.buttonCancel.UseVisualStyleBackColor = true; this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); // - // JewelId - // - this.JewelId.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.JewelId.HeaderText = "Id"; - this.JewelId.MinimumWidth = 8; - this.JewelId.Name = "JewelId"; - this.JewelId.Visible = false; - this.JewelId.Width = 8; - // - // ComponentName - // - this.ComponentName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.ComponentName.HeaderText = "Компонент"; - this.ComponentName.MinimumWidth = 8; - this.ComponentName.Name = "ComponentName"; - // - // Count - // - this.Count.HeaderText = "Количество"; - this.Count.MinimumWidth = 8; - this.Count.Name = "Count"; - this.Count.Width = 150; - // // FormJewel // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); @@ -223,7 +222,7 @@ private GroupBox groupBox; private Button buttonUpdate; private Button buttonDelete; - private Button buttonChange; + private Button buttonRefresh; private Button buttonAdd; private Button buttonSave; private Button buttonCancel; diff --git a/JewelryStore/JewelryStore/FormJewel.cs b/JewelryStore/JewelryStore/FormJewel.cs index a4bda25..380cf8d 100644 --- a/JewelryStore/JewelryStore/FormJewel.cs +++ b/JewelryStore/JewelryStore/FormJewel.cs @@ -14,6 +14,7 @@ namespace JewelryStore private int? _id; private Dictionary _JewelComponents; public int Id { set { _id = value; } } + public FormJewel(ILogger logger, IJewelLogic logic) { InitializeComponent(); @@ -26,7 +27,7 @@ namespace JewelryStore { if (_id.HasValue) { - _logger.LogInformation("Загрузка драгоценности"); + _logger.LogInformation("Загрузка изделия"); try { var view = _logic.ReadElement(new JewelSearchModel @@ -37,40 +38,37 @@ namespace JewelryStore { textBoxName.Text = view.JewelName; textBoxPrice.Text = view.Price.ToString(); - _JewelComponents = view.JewelComponents ?? new - Dictionary(); + _JewelComponents = view.JewelComponents ?? new Dictionary(); LoadData(); } } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки драгоценности"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); + _logger.LogError(ex, "Ошибка загрузки изделия"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - } + private void LoadData() { - _logger.LogInformation("Загрузка компонент драгоценности"); + _logger.LogInformation("Загрузка компонентов изделия"); try { if (_JewelComponents != null) { dataGridView.Rows.Clear(); - foreach (var pc in _JewelComponents) + foreach (var jc in _JewelComponents) { - dataGridView.Rows.Add(new object[] { pc.Key, pc.Value.Item1.ComponentName, pc.Value.Item2 }); + dataGridView.Rows.Add(new object[] { jc.Key, jc.Value.Item1.ComponentName, jc.Value.Item2 }); } textBoxPrice.Text = CalcPrice().ToString(); } } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки компонент драгоценности"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); + _logger.LogError(ex, "Ошибка загрузки компонентов изделия"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } @@ -97,10 +95,9 @@ namespace JewelryStore LoadData(); } } - } - private void ButtonChange_Click(object sender, EventArgs e) + private void ButtonRefresh_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { @@ -122,15 +119,13 @@ namespace JewelryStore } } } - } private void ButtonDelete_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - if (MessageBox.Show("Удалить запись?", "Вопрос", - MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { try { @@ -139,8 +134,7 @@ namespace JewelryStore } catch (Exception ex) { - MessageBox.Show(ex.Message, "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } LoadData(); } @@ -156,23 +150,20 @@ namespace JewelryStore { if (string.IsNullOrEmpty(textBoxName.Text)) { - MessageBox.Show("Заполните название", "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } if (string.IsNullOrEmpty(textBoxPrice.Text)) { - MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); + MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } if (_JewelComponents == null || _JewelComponents.Count == 0) { - MessageBox.Show("Заполните компоненты", "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Заполните компоненты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - _logger.LogInformation("Сохранение драгоценности"); + _logger.LogInformation("Сохранение изделия"); try { var model = new JewelBindingModel @@ -182,23 +173,20 @@ namespace JewelryStore Price = Convert.ToDouble(textBoxPrice.Text), JewelComponents = _JewelComponents }; - var operationResult = _id.HasValue ? _logic.Update(model) : - _logic.Create(model); + var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); if (!operationResult) { throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); } - MessageBox.Show("Сохранение прошло успешно", "Сообщение", - MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); DialogResult = DialogResult.OK; Close(); } catch (Exception ex) { - _logger.LogError(ex, "Ошибка сохранения драгоценности"); + _logger.LogError(ex, "Ошибка сохранения изделия"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } - } private void ButtonCancel_Click(object sender, EventArgs e) @@ -206,6 +194,7 @@ namespace JewelryStore DialogResult = DialogResult.Cancel; Close(); } + private double CalcPrice() { double price = 0; @@ -215,10 +204,5 @@ namespace JewelryStore } return Math.Round(price * 1.1, 2); } - - private void dataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e) - { - - } } } \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormJewel.resx b/JewelryStore/JewelryStore/FormJewel.resx index 3983a23..7cc63c3 100644 --- a/JewelryStore/JewelryStore/FormJewel.resx +++ b/JewelryStore/JewelryStore/FormJewel.resx @@ -66,4 +66,13 @@ True + + True + + + True + + + True + \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormJewelComponent.Designer.cs b/JewelryStore/JewelryStore/FormJewelComponent.Designer.cs index 6782f9e..ebe459c 100644 --- a/JewelryStore/JewelryStore/FormJewelComponent.Designer.cs +++ b/JewelryStore/JewelryStore/FormJewelComponent.Designer.cs @@ -77,7 +77,7 @@ this.buttonSave.TabIndex = 4; this.buttonSave.Text = "Сохранить"; this.buttonSave.UseVisualStyleBackColor = true; - this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); // // buttonCancel // @@ -87,7 +87,7 @@ this.buttonCancel.TabIndex = 5; this.buttonCancel.Text = "Отмена"; this.buttonCancel.UseVisualStyleBackColor = true; - this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); + this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); // // FormJewelComponent // diff --git a/JewelryStore/JewelryStore/FormJewelComponent.cs b/JewelryStore/JewelryStore/FormJewelComponent.cs index 3e83f5d..14fe2ee 100644 --- a/JewelryStore/JewelryStore/FormJewelComponent.cs +++ b/JewelryStore/JewelryStore/FormJewelComponent.cs @@ -7,6 +7,7 @@ namespace JewelryStore public partial class FormJewelComponent : Form { private readonly List? _list; + public int Id { get @@ -18,6 +19,7 @@ namespace JewelryStore comboBoxComponent.SelectedValue = value; } } + public IComponentModel? ComponentModel { get @@ -36,6 +38,7 @@ namespace JewelryStore return null; } } + public int Count { get { return Convert.ToInt32(textBoxCount.Text); } @@ -55,18 +58,16 @@ namespace JewelryStore } } - private void buttonSave_Click(object sender, EventArgs e) + private void ButtonSave_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(textBoxCount.Text)) { - MessageBox.Show("Заполните поле Количество", "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } if (comboBoxComponent.SelectedValue == null) { - MessageBox.Show("Выберите компонент", "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Выберите компонент", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } DialogResult = DialogResult.OK; @@ -74,7 +75,7 @@ namespace JewelryStore } - private void buttonCancel_Click(object sender, EventArgs e) + private void ButtonCancel_Click(object sender, EventArgs e) { DialogResult = DialogResult.Cancel; Close(); diff --git a/JewelryStore/JewelryStore/FormJewels.Designer.cs b/JewelryStore/JewelryStore/FormJewels.Designer.cs index b2715da..3d7d620 100644 --- a/JewelryStore/JewelryStore/FormJewels.Designer.cs +++ b/JewelryStore/JewelryStore/FormJewels.Designer.cs @@ -31,7 +31,7 @@ this.dataGridView = new System.Windows.Forms.DataGridView(); this.buttonUpdate = new System.Windows.Forms.Button(); this.buttonDelete = new System.Windows.Forms.Button(); - this.buttonRef = new System.Windows.Forms.Button(); + this.buttonRefresh = new System.Windows.Forms.Button(); this.buttonAdd = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.SuspendLayout(); @@ -47,7 +47,6 @@ this.dataGridView.RowTemplate.Height = 33; this.dataGridView.Size = new System.Drawing.Size(467, 333); this.dataGridView.TabIndex = 0; - this.dataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_CellContentClick); // // buttonUpdate // @@ -69,15 +68,15 @@ this.buttonDelete.UseVisualStyleBackColor = true; this.buttonDelete.Click += new System.EventHandler(this.ButtonDelete_Click); // - // buttonRef + // buttonRefresh // - this.buttonRef.Location = new System.Drawing.Point(516, 120); - this.buttonRef.Name = "buttonRef"; - this.buttonRef.Size = new System.Drawing.Size(164, 34); - this.buttonRef.TabIndex = 6; - this.buttonRef.Text = "Изменить"; - this.buttonRef.UseVisualStyleBackColor = true; - this.buttonRef.Click += new System.EventHandler(this.ButtonChange_Click); + this.buttonRefresh.Location = new System.Drawing.Point(516, 120); + this.buttonRefresh.Name = "buttonRefresh"; + this.buttonRefresh.Size = new System.Drawing.Size(164, 34); + this.buttonRefresh.TabIndex = 6; + this.buttonRefresh.Text = "Изменить"; + this.buttonRefresh.UseVisualStyleBackColor = true; + this.buttonRefresh.Click += new System.EventHandler(this.ButtonRefresh_Click); // // buttonAdd // @@ -96,7 +95,7 @@ this.ClientSize = new System.Drawing.Size(709, 364); this.Controls.Add(this.buttonUpdate); this.Controls.Add(this.buttonDelete); - this.Controls.Add(this.buttonRef); + this.Controls.Add(this.buttonRefresh); this.Controls.Add(this.buttonAdd); this.Controls.Add(this.dataGridView); this.Name = "FormJewels"; @@ -111,7 +110,7 @@ private DataGridView dataGridView; private Button buttonUpdate; private Button buttonDelete; - private Button buttonRef; + private Button buttonRefresh; private Button buttonAdd; } } \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormJewels.cs b/JewelryStore/JewelryStore/FormJewels.cs index 53c72c1..c770810 100644 --- a/JewelryStore/JewelryStore/FormJewels.cs +++ b/JewelryStore/JewelryStore/FormJewels.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging; namespace JewelryStore { - public partial class FormJewels : Form //TODO + public partial class FormJewels : Form { private readonly ILogger _logger; private readonly IJewelLogic _logic; @@ -25,16 +25,14 @@ namespace JewelryStore { dataGridView.DataSource = list; dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["JewelName"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; + dataGridView.Columns["JewelName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } _logger.LogInformation("Загрузка изделий"); } catch (Exception ex) { _logger.LogError(ex, "Ошибка загрузки изделий"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } @@ -50,16 +48,14 @@ namespace JewelryStore } } - private void ButtonChange_Click(object sender, EventArgs e) + private void ButtonRefresh_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = - Program.ServiceProvider?.GetService(typeof(FormJewel)); + var service = Program.ServiceProvider?.GetService(typeof(FormJewel)); if (service is FormJewel form) { - form.Id = - Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); if (form.ShowDialog() == DialogResult.OK) { LoadData(); @@ -72,11 +68,9 @@ namespace JewelryStore { if (dataGridView.SelectedRows.Count == 1) { - if (MessageBox.Show("Удалить запись?", "Вопрос", - MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - int id = - Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); _logger.LogInformation("Удаление изделия"); try { @@ -92,8 +86,7 @@ namespace JewelryStore catch (Exception ex) { _logger.LogError(ex, "Ошибка удаления изделия"); - MessageBox.Show(ex.Message, "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } @@ -108,10 +101,5 @@ namespace JewelryStore { LoadData(); } - - private void dataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e) - { - - } } } \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormMain.Designer.cs b/JewelryStore/JewelryStore/FormMain.Designer.cs index 9150f33..e0e7277 100644 --- a/JewelryStore/JewelryStore/FormMain.Designer.cs +++ b/JewelryStore/JewelryStore/FormMain.Designer.cs @@ -33,10 +33,10 @@ this.КомпонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ИзделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dataGridView = new System.Windows.Forms.DataGridView(); - this.buttonCreate = new System.Windows.Forms.Button(); - this.buttonToWork = new System.Windows.Forms.Button(); - this.buttonReady = new System.Windows.Forms.Button(); - this.buttonPut = new System.Windows.Forms.Button(); + 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.buttonRefresh = new System.Windows.Forms.Button(); this.menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); @@ -87,45 +87,45 @@ this.dataGridView.Size = new System.Drawing.Size(851, 402); this.dataGridView.TabIndex = 1; // - // buttonCreate + // buttonCreateOrder // - this.buttonCreate.Location = new System.Drawing.Point(884, 78); - this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(210, 34); - this.buttonCreate.TabIndex = 2; - this.buttonCreate.Text = "Создать заказ"; - this.buttonCreate.UseVisualStyleBackColor = true; - this.buttonCreate.Click += new System.EventHandler(this.ButtonCreateOrder_Click); + this.buttonCreateOrder.Location = new System.Drawing.Point(884, 78); + this.buttonCreateOrder.Name = "buttonCreateOrder"; + this.buttonCreateOrder.Size = new System.Drawing.Size(210, 34); + this.buttonCreateOrder.TabIndex = 2; + this.buttonCreateOrder.Text = "Создать заказ"; + this.buttonCreateOrder.UseVisualStyleBackColor = true; + this.buttonCreateOrder.Click += new System.EventHandler(this.ButtonCreateOrder_Click); // - // buttonToWork + // buttonTakeOrderInWork // - this.buttonToWork.Location = new System.Drawing.Point(884, 150); - this.buttonToWork.Name = "buttonToWork"; - this.buttonToWork.Size = new System.Drawing.Size(210, 34); - this.buttonToWork.TabIndex = 3; - this.buttonToWork.Text = "Отдать на выполнение"; - this.buttonToWork.UseVisualStyleBackColor = true; - this.buttonToWork.Click += new System.EventHandler(this.ButtonTakeOrderInWork_Click); + this.buttonTakeOrderInWork.Location = new System.Drawing.Point(884, 150); + this.buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; + this.buttonTakeOrderInWork.Size = new System.Drawing.Size(210, 34); + this.buttonTakeOrderInWork.TabIndex = 3; + this.buttonTakeOrderInWork.Text = "Отдать на выполнение"; + this.buttonTakeOrderInWork.UseVisualStyleBackColor = true; + this.buttonTakeOrderInWork.Click += new System.EventHandler(this.ButtonTakeOrderInWork_Click); // - // buttonReady + // buttonOrderReady // - this.buttonReady.Location = new System.Drawing.Point(884, 221); - this.buttonReady.Name = "buttonReady"; - this.buttonReady.Size = new System.Drawing.Size(210, 34); - this.buttonReady.TabIndex = 4; - this.buttonReady.Text = "Заказ готов"; - this.buttonReady.UseVisualStyleBackColor = true; - this.buttonReady.Click += new System.EventHandler(this.ButtonOrderReady_Click); + this.buttonOrderReady.Location = new System.Drawing.Point(884, 221); + this.buttonOrderReady.Name = "buttonOrderReady"; + this.buttonOrderReady.Size = new System.Drawing.Size(210, 34); + this.buttonOrderReady.TabIndex = 4; + this.buttonOrderReady.Text = "Заказ готов"; + this.buttonOrderReady.UseVisualStyleBackColor = true; + this.buttonOrderReady.Click += new System.EventHandler(this.ButtonOrderReady_Click); // - // buttonPut + // buttonIssuedOrder // - this.buttonPut.Location = new System.Drawing.Point(884, 292); - this.buttonPut.Name = "buttonPut"; - this.buttonPut.Size = new System.Drawing.Size(210, 34); - this.buttonPut.TabIndex = 5; - this.buttonPut.Text = "Заказ выдан"; - this.buttonPut.UseVisualStyleBackColor = true; - this.buttonPut.Click += new System.EventHandler(this.ButtonIssuedOrder_Click); + this.buttonIssuedOrder.Location = new System.Drawing.Point(884, 292); + this.buttonIssuedOrder.Name = "buttonIssuedOrder"; + this.buttonIssuedOrder.Size = new System.Drawing.Size(210, 34); + this.buttonIssuedOrder.TabIndex = 5; + this.buttonIssuedOrder.Text = "Заказ выдан"; + this.buttonIssuedOrder.UseVisualStyleBackColor = true; + this.buttonIssuedOrder.Click += new System.EventHandler(this.ButtonIssuedOrder_Click); // // buttonRefresh // @@ -135,7 +135,7 @@ this.buttonRefresh.TabIndex = 6; this.buttonRefresh.Text = "Обновить список"; this.buttonRefresh.UseVisualStyleBackColor = true; - this.buttonRefresh.Click += new System.EventHandler(this.ButtonRef_Click); + this.buttonRefresh.Click += new System.EventHandler(this.ButtonRefresh_Click); // // FormMain // @@ -143,10 +143,10 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1121, 450); this.Controls.Add(this.buttonRefresh); - this.Controls.Add(this.buttonPut); - this.Controls.Add(this.buttonReady); - this.Controls.Add(this.buttonToWork); - this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.buttonIssuedOrder); + this.Controls.Add(this.buttonOrderReady); + this.Controls.Add(this.buttonTakeOrderInWork); + this.Controls.Add(this.buttonCreateOrder); this.Controls.Add(this.dataGridView); this.Controls.Add(this.menuStrip); this.MainMenuStrip = this.menuStrip; @@ -167,10 +167,10 @@ private ToolStripMenuItem КомпонентыToolStripMenuItem; private ToolStripMenuItem ИзделияToolStripMenuItem; private DataGridView dataGridView; - private Button buttonCreate; - private Button buttonToWork; - private Button buttonReady; - private Button buttonPut; + private Button buttonCreateOrder; + private Button buttonTakeOrderInWork; + private Button buttonOrderReady; + private Button buttonIssuedOrder; private Button buttonRefresh; } } \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormMain.cs b/JewelryStore/JewelryStore/FormMain.cs index 5897324..d35464d 100644 --- a/JewelryStore/JewelryStore/FormMain.cs +++ b/JewelryStore/JewelryStore/FormMain.cs @@ -10,16 +10,19 @@ namespace JewelryStore { 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() { try @@ -35,14 +38,13 @@ namespace JewelryStore catch (Exception ex) { _logger.LogError(ex, "Ошибка загрузки заказов"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } + private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e) { - var service = - Program.ServiceProvider?.GetService(typeof(FormComponents)); + var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); if (service is FormComponents form) { form.ShowDialog(); @@ -51,8 +53,7 @@ namespace JewelryStore private void ИзделияToolStripMenuItem_Click(object sender, EventArgs e) { - var service = - Program.ServiceProvider?.GetService(typeof(FormJewels)); + var service = Program.ServiceProvider?.GetService(typeof(FormJewels)); if (service is FormJewels form) { form.ShowDialog(); @@ -68,6 +69,7 @@ namespace JewelryStore LoadData(); } } + private void ButtonTakeOrderInWork_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) @@ -96,8 +98,7 @@ namespace JewelryStore if (dataGridView.SelectedRows.Count == 1) { int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", - id); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id); try { var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id }); @@ -121,8 +122,7 @@ namespace JewelryStore if (dataGridView.SelectedRows.Count == 1) { int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", - id); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id); try { var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel { Id = id }); @@ -141,7 +141,7 @@ namespace JewelryStore } } } - private void ButtonRef_Click(object sender, EventArgs e) + private void ButtonRefresh_Click(object sender, EventArgs e) { LoadData(); } diff --git a/JewelryStore/JewelryStore/JewelryStore.csproj b/JewelryStore/JewelryStore/JewelryStore.csproj index ed17f82..cbfa7e5 100644 --- a/JewelryStore/JewelryStore/JewelryStore.csproj +++ b/JewelryStore/JewelryStore/JewelryStore.csproj @@ -8,6 +8,10 @@ enable + + + + diff --git a/JewelryStore/JewelryStore/nlog.config b/JewelryStore/JewelryStore/nlog.config new file mode 100644 index 0000000..85797a7 --- /dev/null +++ b/JewelryStore/JewelryStore/nlog.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/JewelLogic.cs b/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/JewelLogic.cs index a9b3230..c0dd189 100644 --- a/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/JewelLogic.cs +++ b/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/JewelLogic.cs @@ -7,7 +7,7 @@ using Microsoft.Extensions.Logging; namespace JewelryStoreBusinessLogic.BusinessLogics { - public class JewelLogic : IJewelLogic // TODO реализовать интерфейс идентично componentLogic + public class JewelLogic : IJewelLogic { private readonly ILogger _logger; private readonly IJewelStorage _jewelStorage; @@ -69,6 +69,7 @@ namespace JewelryStoreBusinessLogic.BusinessLogics } return true; } + public bool Delete(JewelBindingModel model) { CheckModel(model, false); diff --git a/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/OrderLogic.cs b/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/OrderLogic.cs index d3e47f1..aeba2c9 100644 --- a/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/OrderLogic.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Logging; namespace JewelryStoreBusinessLogic.BusinessLogics { - public class OrderLogic : IOrderLogic //TODO реализовать интерфейс + public class OrderLogic : IOrderLogic { private readonly ILogger _logger; private readonly IOrderStorage _orderStorage; diff --git a/JewelryStore/JewelryStoreListImplement/DataListSingleton.cs b/JewelryStore/JewelryStoreListImplement/DataListSingleton.cs index 6ddcac3..4630a52 100644 --- a/JewelryStore/JewelryStoreListImplement/DataListSingleton.cs +++ b/JewelryStore/JewelryStoreListImplement/DataListSingleton.cs @@ -8,12 +8,14 @@ namespace JewelryStoreListImplement public List Components { get; set; } public List Orders { get; set; } public List Jewels { get; set; } + private DataListSingleton() { Components = new List(); Orders = new List(); Jewels = new List(); } + public static DataListSingleton GetInstance() { if (_instance == null) diff --git a/JewelryStore/JewelryStoreListImplement/Implements/ComponentStorage.cs b/JewelryStore/JewelryStoreListImplement/Implements/ComponentStorage.cs index fda42e9..5d1f604 100644 --- a/JewelryStore/JewelryStoreListImplement/Implements/ComponentStorage.cs +++ b/JewelryStore/JewelryStoreListImplement/Implements/ComponentStorage.cs @@ -14,6 +14,7 @@ namespace JewelryStoreListImplement.Implements { _source = DataListSingleton.GetInstance(); } + public List GetFullList() { var result = new List(); @@ -23,6 +24,7 @@ namespace JewelryStoreListImplement.Implements } return result; } + public List GetFilteredList(ComponentSearchModel model) { var result = new List(); @@ -39,6 +41,7 @@ namespace JewelryStoreListImplement.Implements } return result; } + public ComponentViewModel? GetElement(ComponentSearchModel model) { if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue) @@ -56,6 +59,7 @@ namespace JewelryStoreListImplement.Implements } return null; } + public ComponentViewModel? Insert(ComponentBindingModel model) { model.Id = 1; @@ -74,6 +78,7 @@ namespace JewelryStoreListImplement.Implements _source.Components.Add(newComponent); return newComponent.GetViewModel; } + public ComponentViewModel? Update(ComponentBindingModel model) { foreach (var component in _source.Components) @@ -86,6 +91,7 @@ namespace JewelryStoreListImplement.Implements } return null; } + public ComponentViewModel? Delete(ComponentBindingModel model) { for (int i = 0; i < _source.Components.Count; ++i) diff --git a/JewelryStore/JewelryStoreListImplement/Implements/JewelStorage.cs b/JewelryStore/JewelryStoreListImplement/Implements/JewelStorage.cs index be5419d..25bcedb 100644 --- a/JewelryStore/JewelryStoreListImplement/Implements/JewelStorage.cs +++ b/JewelryStore/JewelryStoreListImplement/Implements/JewelStorage.cs @@ -6,7 +6,7 @@ using JewelryStoreListImplement.Models; namespace JewelryStoreListImplement.Implements { - public class JewelStorage : IJewelStorage // TODO реализовать интерфейс + public class JewelStorage : IJewelStorage { private readonly DataListSingleton _source; @@ -14,6 +14,7 @@ namespace JewelryStoreListImplement.Implements { _source = DataListSingleton.GetInstance(); } + public List GetFullList() { var result = new List(); diff --git a/JewelryStore/JewelryStoreListImplement/Implements/OrderStorage.cs b/JewelryStore/JewelryStoreListImplement/Implements/OrderStorage.cs index b0f92c3..6d7c8ae 100644 --- a/JewelryStore/JewelryStoreListImplement/Implements/OrderStorage.cs +++ b/JewelryStore/JewelryStoreListImplement/Implements/OrderStorage.cs @@ -6,7 +6,7 @@ using JewelryStoreListImplement.Models; namespace JewelryStoreListImplement.Implements { - public class OrderStorage : IOrderStorage // TODO реализовать интерфейс + public class OrderStorage : IOrderStorage { private readonly DataListSingleton _source; @@ -14,6 +14,7 @@ namespace JewelryStoreListImplement.Implements { _source = DataListSingleton.GetInstance(); } + public List GetFullList() { var result = new List(); diff --git a/JewelryStore/JewelryStoreListImplement/Models/Component.cs b/JewelryStore/JewelryStoreListImplement/Models/Component.cs index 4dc4508..45bc5b4 100644 --- a/JewelryStore/JewelryStoreListImplement/Models/Component.cs +++ b/JewelryStore/JewelryStoreListImplement/Models/Component.cs @@ -23,6 +23,7 @@ namespace JewelryStoreListImplement.Models Cost = model.Cost }; } + public void Update(ComponentBindingModel? model) { if (model == null) @@ -32,6 +33,7 @@ namespace JewelryStoreListImplement.Models ComponentName = model.ComponentName; Cost = model.Cost; } + public ComponentViewModel GetViewModel => new() { Id = Id, diff --git a/JewelryStore/JewelryStoreListImplement/Models/Jewel.cs b/JewelryStore/JewelryStoreListImplement/Models/Jewel.cs index 987ad6c..e9a590d 100644 --- a/JewelryStore/JewelryStoreListImplement/Models/Jewel.cs +++ b/JewelryStore/JewelryStoreListImplement/Models/Jewel.cs @@ -29,6 +29,7 @@ namespace JewelryStoreListImplement.Models JewelComponents = model.JewelComponents }; } + public void Update(JewelBindingModel? model) { if (model == null) @@ -39,6 +40,7 @@ namespace JewelryStoreListImplement.Models Price = model.Price; JewelComponents = model.JewelComponents; } + public JewelViewModel GetViewModel => new() { Id = Id, diff --git a/JewelryStore/JewelryStoreListImplement/Models/Order.cs b/JewelryStore/JewelryStoreListImplement/Models/Order.cs index bde0930..12f5a72 100644 --- a/JewelryStore/JewelryStoreListImplement/Models/Order.cs +++ b/JewelryStore/JewelryStoreListImplement/Models/Order.cs @@ -5,20 +5,14 @@ using JewelryStoreDataModels.Models; namespace JewelryStoreListImplement.Models { - public class Order : IOrderModel // TODO Класс для модели сущности «Заказ» разработать самостоятельно + public class Order : IOrderModel { public int Id { get; private set; } - public int JewelId { get; private set; } - public int Count { get; private set; } - public double Sum { get; private set; } - public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; - public DateTime DateCreate { get; private set; } = DateTime.Now; - public DateTime? DateImplement { get; private set; } public static Order? Create(OrderBindingModel? model) @@ -38,6 +32,7 @@ namespace JewelryStoreListImplement.Models DateImplement = model.DateImplement }; } + public void Update(OrderBindingModel? model) { if (model == null) @@ -50,6 +45,7 @@ namespace JewelryStoreListImplement.Models DateImplement = model.DateImplement; } } + public OrderViewModel GetViewModel => new() { Id = Id, -- 2.25.1