diff --git a/FurnitureAssembly/FurnitureAssembly.sln b/FurnitureAssembly/FurnitureAssembly.sln index 8edf1d2..fd012a2 100644 --- a/FurnitureAssembly/FurnitureAssembly.sln +++ b/FurnitureAssembly/FurnitureAssembly.sln @@ -3,7 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.4.33103.184 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FurnitureAssembly", "FurnitureAssembly\FurnitureAssembly.csproj", "{3AC381EC-9240-4540-97F6-C0B3248727E7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FurnitureAssemblyView", "FurnitureAssembly\FurnitureAssemblyView.csproj", "{3AC381EC-9240-4540-97F6-C0B3248727E7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FurnitureAssemblyDataModels", "FurnitureAssemblyDataModels\FurnitureAssemblyDataModels.csproj", "{19FD6936-DAB7-440F-8094-E6843CA0E391}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FurnitureAssemblyContracts", "FurnitureAssemblyContracts\FurnitureAssemblyContracts.csproj", "{E2AF65E4-8E5D-4ED3-86DF-C47471A637B1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FurnitureAssemblyListImplement", "FurnitureAssemblyListImplement\FurnitureAssemblyListImplement.csproj", "{8C437D7B-78C2-4CDC-B8AE-FC27943D8DA2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FurnitureAssemblyBusinessLogic", "FurnitureAssemblyBusinessLogic\FurnitureAssemblyBusinessLogic.csproj", "{D5118A99-17DE-4722-AA56-3A358CE0BB62}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,6 +23,22 @@ Global {3AC381EC-9240-4540-97F6-C0B3248727E7}.Debug|Any CPU.Build.0 = Debug|Any CPU {3AC381EC-9240-4540-97F6-C0B3248727E7}.Release|Any CPU.ActiveCfg = Release|Any CPU {3AC381EC-9240-4540-97F6-C0B3248727E7}.Release|Any CPU.Build.0 = Release|Any CPU + {19FD6936-DAB7-440F-8094-E6843CA0E391}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {19FD6936-DAB7-440F-8094-E6843CA0E391}.Debug|Any CPU.Build.0 = Debug|Any CPU + {19FD6936-DAB7-440F-8094-E6843CA0E391}.Release|Any CPU.ActiveCfg = Release|Any CPU + {19FD6936-DAB7-440F-8094-E6843CA0E391}.Release|Any CPU.Build.0 = Release|Any CPU + {E2AF65E4-8E5D-4ED3-86DF-C47471A637B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E2AF65E4-8E5D-4ED3-86DF-C47471A637B1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E2AF65E4-8E5D-4ED3-86DF-C47471A637B1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E2AF65E4-8E5D-4ED3-86DF-C47471A637B1}.Release|Any CPU.Build.0 = Release|Any CPU + {8C437D7B-78C2-4CDC-B8AE-FC27943D8DA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8C437D7B-78C2-4CDC-B8AE-FC27943D8DA2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8C437D7B-78C2-4CDC-B8AE-FC27943D8DA2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8C437D7B-78C2-4CDC-B8AE-FC27943D8DA2}.Release|Any CPU.Build.0 = Release|Any CPU + {D5118A99-17DE-4722-AA56-3A358CE0BB62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5118A99-17DE-4722-AA56-3A358CE0BB62}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5118A99-17DE-4722-AA56-3A358CE0BB62}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5118A99-17DE-4722-AA56-3A358CE0BB62}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/FurnitureAssembly/FurnitureAssembly/Form1.cs b/FurnitureAssembly/FurnitureAssembly/Form1.cs deleted file mode 100644 index c186dd4..0000000 --- a/FurnitureAssembly/FurnitureAssembly/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace FurnitureAssembly -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssembly/Form1.resx b/FurnitureAssembly/FurnitureAssembly/Form1.resx deleted file mode 100644 index 1af7de1..0000000 --- a/FurnitureAssembly/FurnitureAssembly/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/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.Designer.cs b/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.Designer.cs new file mode 100644 index 0000000..1dd1ebe --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.Designer.cs @@ -0,0 +1,145 @@ +namespace FurnitureAssemblyView +{ + 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.ButtonSave = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.comboBoxFurniture = new System.Windows.Forms.ComboBox(); + this.textBoxCount = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.textBoxSum = new System.Windows.Forms.TextBox(); + this.ButtonCancel = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // ButtonSave + // + this.ButtonSave.Location = new System.Drawing.Point(313, 212); + this.ButtonSave.Name = "ButtonSave"; + this.ButtonSave.Size = new System.Drawing.Size(150, 46); + this.ButtonSave.TabIndex = 0; + this.ButtonSave.Text = "Сохранить"; + this.ButtonSave.UseVisualStyleBackColor = true; + this.ButtonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(31, 36); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(114, 32); + this.label1.TabIndex = 1; + this.label1.Text = "Изделие:"; + // + // comboBoxFurniture + // + this.comboBoxFurniture.FormattingEnabled = true; + this.comboBoxFurniture.Location = new System.Drawing.Point(188, 33); + this.comboBoxFurniture.Name = "comboBoxFurniture"; + this.comboBoxFurniture.Size = new System.Drawing.Size(441, 40); + this.comboBoxFurniture.TabIndex = 2; + // + // textBoxCount + // + this.textBoxCount.Location = new System.Drawing.Point(188, 90); + this.textBoxCount.Name = "textBoxCount"; + this.textBoxCount.Size = new System.Drawing.Size(441, 39); + this.textBoxCount.TabIndex = 3; + this.textBoxCount.TextChanged += new System.EventHandler(this.TextBoxCount_TextChanged); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(31, 97); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(149, 32); + this.label2.TabIndex = 4; + this.label2.Text = "Количество:"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(31, 155); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(92, 32); + this.label3.TabIndex = 6; + this.label3.Text = "Сумма:"; + // + // textBoxSum + // + this.textBoxSum.Location = new System.Drawing.Point(188, 152); + this.textBoxSum.Name = "textBoxSum"; + this.textBoxSum.ReadOnly = true; + this.textBoxSum.Size = new System.Drawing.Size(441, 39); + this.textBoxSum.TabIndex = 5; + this.textBoxSum.TextChanged += new System.EventHandler(this.TextBoxCount_TextChanged); + // + // ButtonCancel + // + this.ButtonCancel.Location = new System.Drawing.Point(479, 212); + this.ButtonCancel.Name = "ButtonCancel"; + this.ButtonCancel.Size = new System.Drawing.Size(150, 46); + 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(13F, 32F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(650, 278); + this.Controls.Add(this.ButtonCancel); + this.Controls.Add(this.label3); + this.Controls.Add(this.textBoxSum); + this.Controls.Add(this.label2); + this.Controls.Add(this.textBoxCount); + this.Controls.Add(this.comboBoxFurniture); + this.Controls.Add(this.label1); + this.Controls.Add(this.ButtonSave); + this.Name = "FormCreateOrder"; + this.Text = "Заказ"; + this.Load += new System.EventHandler(this.FormCreateOrder_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Button ButtonSave; + private Label label1; + private ComboBox comboBoxFurniture; + private TextBox textBoxCount; + private Label label2; + private Label label3; + private TextBox textBoxSum; + private Button ButtonCancel; + } +} \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.cs b/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.cs new file mode 100644 index 0000000..b0d432f --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.cs @@ -0,0 +1,145 @@ +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.BusinessLogicsContracts; +using FurnitureAssemblyContracts.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 FurnitureAssemblyView +{ + public partial class FormCreateOrder : Form + { + private readonly ILogger _logger; + + private readonly IFurnitureLogic _logicM; + + private readonly IOrderLogic _logicO; + + public FormCreateOrder(ILogger logger, IFurnitureLogic logicM, IOrderLogic logicO) + { + InitializeComponent(); + + _logger = logger; + _logicM = logicM; + _logicO = logicO; + } + + private void FormCreateOrder_Load(object sender, EventArgs e) + { + _logger.LogInformation("Загрузка изделий для заказа"); + + try + { + var list = _logicM.ReadList(null); + + if (list != null) + { + comboBoxFurniture.DisplayMember = "FurnitureName"; + comboBoxFurniture.ValueMember = "Id"; + comboBoxFurniture.DataSource = list; + comboBoxFurniture.SelectedItem = null; + } + + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки изделий для заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void CalcSum() + { + if (comboBoxFurniture.SelectedValue != null && !string.IsNullOrEmpty(textBoxCount.Text)) + { + try + { + int id = Convert.ToInt32(comboBoxFurniture.SelectedValue); + + var furniture = _logicM.ReadElement(new FurnitureSearchModel + { + Id = id + }); + + int count = Convert.ToInt32(textBoxCount.Text); + + textBoxSum.Text = Math.Round(count * (furniture?.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 ComboBoxFurniture_SelectedIndexChanged(object sender, EventArgs e) + { + CalcSum(); + } + + private void ButtonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + + return; + } + + if (comboBoxFurniture.SelectedValue == null) + { + MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + + return; + } + + _logger.LogInformation("Создание заказа"); + + try + { + var operationResult = _logicO.CreateOrder(new OrderBindingModel + { + FurnitureId = Convert.ToInt32(comboBoxFurniture.SelectedValue), + Count = Convert.ToInt32(textBoxCount.Text), + Sum = Convert.ToDouble(textBoxSum.Text) + }); + + if (!operationResult) + { + throw new Exception("Ошибка при создании заказа. Дополнительная информация в логах."); + } + + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка создания заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.resx b/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/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/FurnitureAssembly/FurnitureAssembly/FormFurniture.Designer.cs b/FurnitureAssembly/FurnitureAssembly/FormFurniture.Designer.cs new file mode 100644 index 0000000..e1940f9 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormFurniture.Designer.cs @@ -0,0 +1,242 @@ +namespace FurnitureAssemblyView +{ + partial class FormFurniture + { + /// + /// 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.textBoxPrice = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.textBoxName = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.ColumnId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ColumnName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.groupBoxWorkpieces = new System.Windows.Forms.GroupBox(); + this.ButtonRef = new System.Windows.Forms.Button(); + this.ButtonDel = new System.Windows.Forms.Button(); + this.ButtonUpd = 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(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.groupBoxWorkpieces.SuspendLayout(); + this.SuspendLayout(); + // + // textBoxPrice + // + this.textBoxPrice.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxPrice.Enabled = false; + this.textBoxPrice.Location = new System.Drawing.Point(180, 103); + this.textBoxPrice.Name = "textBoxPrice"; + this.textBoxPrice.Size = new System.Drawing.Size(178, 39); + this.textBoxPrice.TabIndex = 8; + // + // label2 + // + this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(41, 106); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(136, 32); + this.label2.TabIndex = 7; + this.label2.Text = "Стоимость:"; + // + // textBoxName + // + this.textBoxName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxName.Location = new System.Drawing.Point(180, 38); + this.textBoxName.Name = "textBoxName"; + this.textBoxName.Size = new System.Drawing.Size(328, 39); + this.textBoxName.TabIndex = 6; + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(41, 41); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(125, 32); + this.label1.TabIndex = 5; + this.label1.Text = "Название:"; + // + // dataGridView + // + this.dataGridView.AllowUserToAddRows = false; + this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.ColumnId, + this.ColumnName, + this.ColumnCount}); + this.dataGridView.Location = new System.Drawing.Point(5, 40); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowHeadersVisible = false; + this.dataGridView.RowHeadersWidth = 82; + this.dataGridView.RowTemplate.Height = 41; + this.dataGridView.Size = new System.Drawing.Size(749, 543); + this.dataGridView.TabIndex = 9; + // + // ColumnId + // + this.ColumnId.HeaderText = "Id"; + this.ColumnId.MinimumWidth = 10; + this.ColumnId.Name = "ColumnId"; + this.ColumnId.Visible = false; + // + // ColumnName + // + this.ColumnName.HeaderText = "Заготовка"; + this.ColumnName.MinimumWidth = 10; + this.ColumnName.Name = "ColumnName"; + // + // ColumnCount + // + this.ColumnCount.HeaderText = "Количество"; + this.ColumnCount.MinimumWidth = 10; + this.ColumnCount.Name = "ColumnCount"; + // + // groupBoxWorkpieces + // + this.groupBoxWorkpieces.Controls.Add(this.ButtonRef); + this.groupBoxWorkpieces.Controls.Add(this.ButtonDel); + this.groupBoxWorkpieces.Controls.Add(this.ButtonUpd); + this.groupBoxWorkpieces.Controls.Add(this.ButtonAdd); + this.groupBoxWorkpieces.Controls.Add(this.dataGridView); + this.groupBoxWorkpieces.Location = new System.Drawing.Point(41, 166); + this.groupBoxWorkpieces.Name = "groupBoxWorkpieces"; + this.groupBoxWorkpieces.Size = new System.Drawing.Size(1040, 593); + this.groupBoxWorkpieces.TabIndex = 10; + this.groupBoxWorkpieces.TabStop = false; + this.groupBoxWorkpieces.Text = "Заготовки"; + // + // ButtonRef + // + this.ButtonRef.Location = new System.Drawing.Point(782, 362); + this.ButtonRef.Name = "ButtonRef"; + this.ButtonRef.Size = new System.Drawing.Size(224, 62); + this.ButtonRef.TabIndex = 13; + this.ButtonRef.Text = "Обновить"; + this.ButtonRef.UseVisualStyleBackColor = true; + this.ButtonRef.Click += new System.EventHandler(this.ButtonRef_Click); + // + // ButtonDel + // + this.ButtonDel.Location = new System.Drawing.Point(782, 265); + this.ButtonDel.Name = "ButtonDel"; + this.ButtonDel.Size = new System.Drawing.Size(224, 62); + this.ButtonDel.TabIndex = 12; + this.ButtonDel.Text = "Удалить"; + this.ButtonDel.UseVisualStyleBackColor = true; + this.ButtonDel.Click += new System.EventHandler(this.ButtonDel_Click); + // + // ButtonUpd + // + this.ButtonUpd.Location = new System.Drawing.Point(782, 174); + this.ButtonUpd.Name = "ButtonUpd"; + this.ButtonUpd.Size = new System.Drawing.Size(224, 62); + this.ButtonUpd.TabIndex = 11; + this.ButtonUpd.Text = "Изменить"; + this.ButtonUpd.UseVisualStyleBackColor = true; + this.ButtonUpd.Click += new System.EventHandler(this.ButtonUpd_Click); + // + // ButtonAdd + // + this.ButtonAdd.Location = new System.Drawing.Point(782, 88); + this.ButtonAdd.Name = "ButtonAdd"; + this.ButtonAdd.Size = new System.Drawing.Size(224, 62); + this.ButtonAdd.TabIndex = 10; + this.ButtonAdd.Text = "Добавить"; + this.ButtonAdd.UseVisualStyleBackColor = true; + this.ButtonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); + // + // ButtonSave + // + this.ButtonSave.Location = new System.Drawing.Point(604, 765); + this.ButtonSave.Name = "ButtonSave"; + this.ButtonSave.Size = new System.Drawing.Size(224, 55); + this.ButtonSave.TabIndex = 14; + this.ButtonSave.Text = "Сохранить"; + this.ButtonSave.UseVisualStyleBackColor = true; + this.ButtonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // ButtonCancel + // + this.ButtonCancel.Location = new System.Drawing.Point(857, 765); + this.ButtonCancel.Name = "ButtonCancel"; + this.ButtonCancel.Size = new System.Drawing.Size(224, 55); + this.ButtonCancel.TabIndex = 15; + this.ButtonCancel.Text = "Отмена"; + this.ButtonCancel.UseVisualStyleBackColor = true; + this.ButtonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // FormFurniture + // + this.AutoScaleDimensions = new System.Drawing.SizeF(13F, 32F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1101, 832); + this.Controls.Add(this.ButtonSave); + this.Controls.Add(this.ButtonCancel); + this.Controls.Add(this.groupBoxWorkpieces); + this.Controls.Add(this.textBoxPrice); + this.Controls.Add(this.label2); + this.Controls.Add(this.textBoxName); + this.Controls.Add(this.label1); + this.Name = "FormFurniture"; + this.Text = "Мебель"; + this.Load += new System.EventHandler(this.FormFurniture_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.groupBoxWorkpieces.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private TextBox textBoxPrice; + private Label label2; + private TextBox textBoxName; + private Label label1; + private DataGridView dataGridView; + private DataGridViewTextBoxColumn ColumnId; + private DataGridViewTextBoxColumn ColumnName; + private DataGridViewTextBoxColumn ColumnCount; + private GroupBox groupBoxWorkpieces; + private Button ButtonRef; + private Button ButtonDel; + private Button ButtonUpd; + private Button ButtonAdd; + private Button ButtonSave; + private Button ButtonCancel; + } +} \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssembly/FormFurniture.cs b/FurnitureAssembly/FurnitureAssembly/FormFurniture.cs new file mode 100644 index 0000000..57b7d19 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormFurniture.cs @@ -0,0 +1,214 @@ +using FurnitureAssembly; +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.BusinessLogicsContracts; +using FurnitureAssemblyContracts.SearchModels; +using FurnitureAssemblyDataModels.Models; +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 FurnitureAssemblyView +{ + public partial class FormFurniture : Form + { + private readonly ILogger _logger; + private readonly IFurnitureLogic _logic; + private int? _id; + private Dictionary _productWorkpieces; + public int Id { set { _id = value; } } + public FormFurniture(ILogger logger, IFurnitureLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + _productWorkpieces = new Dictionary(); + } + private void FormFurniture_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + _logger.LogInformation("Загрузка заготовки"); + try + { + var view = _logic.ReadElement(new FurnitureSearchModel { Id =_id.Value }); + if (view != null) + { + textBoxName.Text = view.FurnitureName; + textBoxPrice.Text = view.Price.ToString(); + _productWorkpieces = view.FurnitureWorkpieces ?? new Dictionary(); + LoadData(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки заготовки"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + } + private void LoadData() + { + _logger.LogInformation("Загрузка компонент заготовки"); + try + { + if (_productWorkpieces != null) + { + dataGridView.Rows.Clear(); + foreach (var pc in _productWorkpieces) + { + dataGridView.Rows.Add(new object[] { pc.Key, pc.Value.Item1.WorkpieceName, 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(FormFurnitureWorkpiece)); + if (service is FormFurnitureWorkpiece form) + { + if (form.ShowDialog() == DialogResult.OK) + { + if (form.WorkpieceModel == null) + { + return; + } + _logger.LogInformation("Добавление нового компонента:{ WorkpieceName} - { Count} ", form.WorkpieceModel.WorkpieceName, form.Count); + if (_productWorkpieces.ContainsKey(form.Id)) + { + _productWorkpieces[form.Id] = (form.WorkpieceModel,form.Count); + } + else + { + _productWorkpieces.Add(form.Id, (form.WorkpieceModel,form.Count)); + } + LoadData(); + } + } + } + private void ButtonUpd_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormFurnitureWorkpiece)); + if (service is FormFurnitureWorkpiece form) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + form.Id = id; + form.Count = _productWorkpieces[id].Item2; + if (form.ShowDialog() == DialogResult.OK) + { + if (form.WorkpieceModel == null) + { + return; + } + _logger.LogInformation("Изменение компонента:{ WorkpieceName} - { Count} ", form.WorkpieceModel.WorkpieceName, form.Count); + _productWorkpieces[form.Id] = (form.WorkpieceModel,form.Count); + LoadData(); + } + } + } + } + private void ButtonDel_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", + MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + try + { + _logger.LogInformation("Удаление компонента: { WorkpieceName} - { Count} ", dataGridView.SelectedRows[0].Cells[1].Value); + + _productWorkpieces?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value)); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + LoadData(); + } + } + } + private void ButtonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + private void ButtonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxName.Text)) + { + MessageBox.Show("Заполните название", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(textBoxPrice.Text)) + { + MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + return; + } + if (_productWorkpieces == null || _productWorkpieces.Count == 0) + { + MessageBox.Show("Заполните компоненты", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение заготовки"); + try + { + var model = new FurnitureBindingModel + { + Id = _id ?? 0, FurnitureName = textBoxName.Text, + Price = Convert.ToDouble(textBoxPrice.Text), + FurnitureWorkpieces = _productWorkpieces + }; + 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 _productWorkpieces) + { + price += ((elem.Value.Item1?.Cost ?? 0) * elem.Value.Item2); + } + return Math.Round(price * 1.1, 2); + } + } +} diff --git a/FurnitureAssembly/FurnitureAssembly/FormFurniture.resx b/FurnitureAssembly/FurnitureAssembly/FormFurniture.resx new file mode 100644 index 0000000..72380a4 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormFurniture.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/FurnitureAssembly/FurnitureAssembly/FormFurnitureWorkpiece.Designer.cs b/FurnitureAssembly/FurnitureAssembly/FormFurnitureWorkpiece.Designer.cs new file mode 100644 index 0000000..f865ea7 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormFurnitureWorkpiece.Designer.cs @@ -0,0 +1,121 @@ +namespace FurnitureAssemblyView +{ + partial class FormFurnitureWorkpiece + { + /// + /// 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.textBoxCount = new System.Windows.Forms.TextBox(); + this.comboBoxWorkpiece = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.ButtonSave = new System.Windows.Forms.Button(); + this.ButtonCancel = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // textBoxCount + // + this.textBoxCount.Location = new System.Drawing.Point(191, 114); + this.textBoxCount.Name = "textBoxCount"; + this.textBoxCount.Size = new System.Drawing.Size(409, 39); + this.textBoxCount.TabIndex = 0; + // + // comboBoxWorkpiece + // + this.comboBoxWorkpiece.FormattingEnabled = true; + this.comboBoxWorkpiece.Location = new System.Drawing.Point(191, 42); + this.comboBoxWorkpiece.Name = "comboBoxWorkpiece"; + this.comboBoxWorkpiece.Size = new System.Drawing.Size(409, 40); + this.comboBoxWorkpiece.TabIndex = 1; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(29, 45); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(121, 32); + this.label1.TabIndex = 2; + this.label1.Text = "Изделие: "; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(29, 117); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(156, 32); + this.label2.TabIndex = 3; + this.label2.Text = "Количество: "; + // + // ButtonSave + // + this.ButtonSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonSave.Location = new System.Drawing.Point(282, 185); + this.ButtonSave.Name = "ButtonSave"; + this.ButtonSave.Size = new System.Drawing.Size(150, 46); + this.ButtonSave.TabIndex = 4; + this.ButtonSave.Text = "Сохранить"; + this.ButtonSave.UseVisualStyleBackColor = true; + this.ButtonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // ButtonCancel + // + this.ButtonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonCancel.Location = new System.Drawing.Point(450, 185); + this.ButtonCancel.Name = "ButtonCancel"; + this.ButtonCancel.Size = new System.Drawing.Size(150, 46); + this.ButtonCancel.TabIndex = 5; + this.ButtonCancel.Text = "Отмена"; + this.ButtonCancel.UseVisualStyleBackColor = true; + this.ButtonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // FormFurnitureWorkpiece + // + this.AutoScaleDimensions = new System.Drawing.SizeF(13F, 32F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(622, 243); + this.Controls.Add(this.ButtonCancel); + this.Controls.Add(this.ButtonSave); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.comboBoxWorkpiece); + this.Controls.Add(this.textBoxCount); + this.Name = "FormFurnitureWorkpiece"; + this.Text = "Заготовка мебели"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private TextBox textBoxCount; + private ComboBox comboBoxWorkpiece; + private Label label1; + private Label label2; + private Button ButtonSave; + private Button ButtonCancel; + } +} \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssembly/FormFurnitureWorkpiece.cs b/FurnitureAssembly/FurnitureAssembly/FormFurnitureWorkpiece.cs new file mode 100644 index 0000000..4a19532 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormFurnitureWorkpiece.cs @@ -0,0 +1,91 @@ +using FurnitureAssemblyContracts.BusinessLogicsContracts; +using FurnitureAssemblyContracts.ViewModels; +using FurnitureAssemblyDataModels.Models; +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 FurnitureAssemblyView +{ + public partial class FormFurnitureWorkpiece : Form + { + private readonly List? _list; + public int Id + { + get + { + return + Convert.ToInt32(comboBoxWorkpiece.SelectedValue); + } + set + { + comboBoxWorkpiece.SelectedValue = value; + } + } + public IWorkpieceModel? WorkpieceModel + { + 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 FormFurnitureWorkpiece(IWorkpieceLogic logic) + { + InitializeComponent(); + _list = logic.ReadList(null); + if (_list != null) + { + comboBoxWorkpiece.DisplayMember = "WorkpieceName"; + comboBoxWorkpiece.ValueMember = "Id"; + comboBoxWorkpiece.DataSource = _list; + comboBoxWorkpiece.SelectedItem = null; + } + } + private void ButtonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxWorkpiece.SelectedValue == null) + { + MessageBox.Show("Выберите компонент", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + DialogResult = DialogResult.OK; + Close(); + } + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } + +} diff --git a/FurnitureAssembly/FurnitureAssembly/FormFurnitureWorkpiece.resx b/FurnitureAssembly/FurnitureAssembly/FormFurnitureWorkpiece.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormFurnitureWorkpiece.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/FurnitureAssembly/FurnitureAssembly/FormFurnitures.Designer.cs b/FurnitureAssembly/FurnitureAssembly/FormFurnitures.Designer.cs new file mode 100644 index 0000000..a029a83 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormFurnitures.Designer.cs @@ -0,0 +1,126 @@ +namespace FurnitureAssemblyView +{ + partial class FormFurnitures + { + /// + /// 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.ButtonUpd = new System.Windows.Forms.Button(); + this.ButtonDel = new System.Windows.Forms.Button(); + this.ButtonRef = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // dataGridView + // + this.dataGridView.AllowUserToAddRows = false; + this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Location = new System.Drawing.Point(0, 0); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowHeadersVisible = false; + this.dataGridView.RowHeadersWidth = 82; + this.dataGridView.RowTemplate.Height = 41; + this.dataGridView.Size = new System.Drawing.Size(1033, 753); + this.dataGridView.TabIndex = 0; + // + // ButtonAdd + // + this.ButtonAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonAdd.Location = new System.Drawing.Point(1063, 26); + this.ButtonAdd.Name = "ButtonAdd"; + this.ButtonAdd.Size = new System.Drawing.Size(239, 46); + this.ButtonAdd.TabIndex = 1; + this.ButtonAdd.Text = "Добавить"; + this.ButtonAdd.UseVisualStyleBackColor = true; + this.ButtonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); + // + // ButtonUpd + // + this.ButtonUpd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonUpd.Location = new System.Drawing.Point(1063, 78); + this.ButtonUpd.Name = "ButtonUpd"; + this.ButtonUpd.Size = new System.Drawing.Size(239, 46); + this.ButtonUpd.TabIndex = 2; + this.ButtonUpd.Text = "Изменить"; + this.ButtonUpd.UseVisualStyleBackColor = true; + this.ButtonUpd.Click += new System.EventHandler(this.ButtonUpd_Click); + // + // ButtonDel + // + this.ButtonDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonDel.Location = new System.Drawing.Point(1063, 130); + this.ButtonDel.Name = "ButtonDel"; + this.ButtonDel.Size = new System.Drawing.Size(239, 46); + this.ButtonDel.TabIndex = 3; + this.ButtonDel.Text = "Удалить"; + this.ButtonDel.UseVisualStyleBackColor = true; + this.ButtonDel.Click += new System.EventHandler(this.ButtonDel_Click); + // + // ButtonRef + // + this.ButtonRef.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonRef.Location = new System.Drawing.Point(1063, 182); + this.ButtonRef.Name = "ButtonRef"; + this.ButtonRef.Size = new System.Drawing.Size(239, 46); + this.ButtonRef.TabIndex = 4; + this.ButtonRef.Text = "Обновить список"; + this.ButtonRef.UseVisualStyleBackColor = true; + this.ButtonRef.Click += new System.EventHandler(this.ButtonRef_Click); + // + // FormFurnitures + // + this.AutoScaleDimensions = new System.Drawing.SizeF(13F, 32F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1334, 757); + this.Controls.Add(this.ButtonRef); + this.Controls.Add(this.ButtonDel); + this.Controls.Add(this.ButtonUpd); + this.Controls.Add(this.ButtonAdd); + this.Controls.Add(this.dataGridView); + this.Name = "FormFurnitures"; + this.Text = "Список мебели"; + this.Load += new System.EventHandler(this.FormFurnitures_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView dataGridView; + private Button ButtonAdd; + private Button ButtonUpd; + private Button ButtonDel; + private Button ButtonRef; + } +} \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssembly/FormFurnitures.cs b/FurnitureAssembly/FurnitureAssembly/FormFurnitures.cs new file mode 100644 index 0000000..db7ea95 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormFurnitures.cs @@ -0,0 +1,127 @@ +using FurnitureAssembly; +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.BusinessLogicsContracts; +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 FurnitureAssemblyView +{ + public partial class FormFurnitures : Form + { + private readonly ILogger _logger; + + private readonly IFurnitureLogic _logic; + + public FormFurnitures(ILogger logger, IFurnitureLogic logic) + { + + InitializeComponent(); + + _logger = logger; + _logic = logic; + } + + private void FormFurnitures_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["FurnitureWorkPieces"].Visible = false; + dataGridView.Columns["FurnitureName"].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(FormFurniture)); + + if (service is FormFurniture form) + { + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + + private void ButtonUpd_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormFurniture)); + + if (service is FormFurniture form) + { + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + + private void ButtonDel_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + + _logger.LogInformation("Удаление изделия"); + + try + { + if (!_logic.Delete(new FurnitureBindingModel + { + Id = id + })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка удаления компонента"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + + private void ButtonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/FurnitureAssembly/FurnitureAssembly/FormFurnitures.resx b/FurnitureAssembly/FurnitureAssembly/FormFurnitures.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormFurnitures.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/FurnitureAssembly/FurnitureAssembly/FormMain.Designer.cs b/FurnitureAssembly/FurnitureAssembly/FormMain.Designer.cs new file mode 100644 index 0000000..7ceebba --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormMain.Designer.cs @@ -0,0 +1,189 @@ +namespace FurnitureAssemblyView +{ + 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.menuStrip1 = 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.ButtonCreateOrder = new System.Windows.Forms.Button(); + this.ButtonTakeOrderInWork = new System.Windows.Forms.Button(); + this.ButtonOrderReady = new System.Windows.Forms.Button(); + this.ButtonIssuedOrder = new System.Windows.Forms.Button(); + this.ButtonRef = new System.Windows.Forms.Button(); + this.menuStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // menuStrip1 + // + this.menuStrip1.ImageScalingSize = new System.Drawing.Size(32, 32); + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.справочникиToolStripMenuItem}); + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(1631, 40); + this.menuStrip1.TabIndex = 0; + this.menuStrip1.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(184, 36); + this.справочникиToolStripMenuItem.Text = "Справочники"; + // + // заготовкиToolStripMenuItem + // + this.заготовкиToolStripMenuItem.Name = "заготовкиToolStripMenuItem"; + this.заготовкиToolStripMenuItem.Size = new System.Drawing.Size(258, 44); + this.заготовкиToolStripMenuItem.Text = "Заготовки"; + this.заготовкиToolStripMenuItem.Click += new System.EventHandler(this.ЗаготовкиToolStripMenuItem_Click); + // + // мебельToolStripMenuItem + // + this.мебельToolStripMenuItem.Name = "мебельToolStripMenuItem"; + this.мебельToolStripMenuItem.Size = new System.Drawing.Size(258, 44); + this.мебельToolStripMenuItem.Text = "Мебель"; + this.мебельToolStripMenuItem.Click += new System.EventHandler(this.МебельToolStripMenuItem_Click); + // + // dataGridView + // + this.dataGridView.AllowUserToAddRows = false; + this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Location = new System.Drawing.Point(0, 65); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowHeadersVisible = false; + this.dataGridView.RowHeadersWidth = 82; + this.dataGridView.RowTemplate.Height = 41; + this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView.Size = new System.Drawing.Size(1237, 528); + this.dataGridView.TabIndex = 1; + // + // ButtonCreateOrder + // + this.ButtonCreateOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonCreateOrder.Location = new System.Drawing.Point(1266, 65); + this.ButtonCreateOrder.Name = "ButtonCreateOrder"; + this.ButtonCreateOrder.Size = new System.Drawing.Size(334, 46); + this.ButtonCreateOrder.TabIndex = 2; + this.ButtonCreateOrder.Text = "Создать заказ"; + this.ButtonCreateOrder.UseVisualStyleBackColor = true; + this.ButtonCreateOrder.Click += new System.EventHandler(this.ButtonCreateOrder_Click); + // + // ButtonTakeOrderInWork + // + this.ButtonTakeOrderInWork.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonTakeOrderInWork.Location = new System.Drawing.Point(1266, 119); + this.ButtonTakeOrderInWork.Name = "ButtonTakeOrderInWork"; + this.ButtonTakeOrderInWork.Size = new System.Drawing.Size(334, 46); + this.ButtonTakeOrderInWork.TabIndex = 3; + this.ButtonTakeOrderInWork.Text = "Отдать на выполнение"; + this.ButtonTakeOrderInWork.UseVisualStyleBackColor = true; + this.ButtonTakeOrderInWork.Click += new System.EventHandler(this.ButtonTakeOrderInWork_Click); + // + // ButtonOrderReady + // + this.ButtonOrderReady.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonOrderReady.Location = new System.Drawing.Point(1266, 196); + this.ButtonOrderReady.Name = "ButtonOrderReady"; + this.ButtonOrderReady.Size = new System.Drawing.Size(334, 46); + this.ButtonOrderReady.TabIndex = 4; + this.ButtonOrderReady.Text = "Заказ готов"; + this.ButtonOrderReady.UseVisualStyleBackColor = true; + this.ButtonOrderReady.Click += new System.EventHandler(this.ButtonOrderReady_Click); + // + // ButtonIssuedOrder + // + this.ButtonIssuedOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonIssuedOrder.Location = new System.Drawing.Point(1266, 252); + this.ButtonIssuedOrder.Name = "ButtonIssuedOrder"; + this.ButtonIssuedOrder.Size = new System.Drawing.Size(334, 46); + this.ButtonIssuedOrder.TabIndex = 5; + this.ButtonIssuedOrder.Text = "Заказ выдан"; + this.ButtonIssuedOrder.UseVisualStyleBackColor = true; + this.ButtonIssuedOrder.Click += new System.EventHandler(this.ButtonIssuedOrder_Click); + // + // ButtonRef + // + this.ButtonRef.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonRef.Location = new System.Drawing.Point(1266, 336); + this.ButtonRef.Name = "ButtonRef"; + this.ButtonRef.Size = new System.Drawing.Size(334, 46); + this.ButtonRef.TabIndex = 6; + this.ButtonRef.Text = "Обновить список"; + this.ButtonRef.UseVisualStyleBackColor = true; + this.ButtonRef.Click += new System.EventHandler(this.ButtonRef_Click); + // + // FormMain + // + this.AutoScaleDimensions = new System.Drawing.SizeF(13F, 32F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1631, 594); + this.Controls.Add(this.ButtonRef); + this.Controls.Add(this.ButtonIssuedOrder); + this.Controls.Add(this.ButtonOrderReady); + this.Controls.Add(this.ButtonTakeOrderInWork); + this.Controls.Add(this.ButtonCreateOrder); + this.Controls.Add(this.dataGridView); + this.Controls.Add(this.menuStrip1); + this.MainMenuStrip = this.menuStrip1; + this.Name = "FormMain"; + this.Text = "Сборка мебели"; + this.Load += new System.EventHandler(this.FormMain_Load); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private MenuStrip menuStrip1; + private ToolStripMenuItem справочникиToolStripMenuItem; + private ToolStripMenuItem заготовкиToolStripMenuItem; + private ToolStripMenuItem мебельToolStripMenuItem; + private DataGridView dataGridView; + private Button ButtonCreateOrder; + private Button ButtonTakeOrderInWork; + private Button ButtonOrderReady; + private Button ButtonIssuedOrder; + private Button ButtonRef; + } +} \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssembly/FormMain.cs b/FurnitureAssembly/FurnitureAssembly/FormMain.cs new file mode 100644 index 0000000..0d5c3ee --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormMain.cs @@ -0,0 +1,181 @@ +using FurnitureAssembly; +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.BusinessLogicsContracts; +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 FurnitureAssemblyView +{ + 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() + { + _logger.LogInformation("Загрузка заказов"); + + try + { + var list = _orderLogic.ReadList(null); + + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["FurnitureId"].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(FormWorkpieces)); + + if (service is FormWorkpieces form) + { + form.ShowDialog(); + } + } + + private void МебельToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormFurnitures)); + + if (service is FormFurnitures form) + { + form.ShowDialog(); + } + } + + private void ButtonCreateOrder_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); + + if (service is FormCreateOrder form) + { + form.ShowDialog(); + LoadData(); + } + + } + + private void ButtonTakeOrderInWork_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id); + + try + { + var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel{Id = id}); + + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка передачи заказа в работу"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + private void ButtonOrderReady_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id); + + try + { + var operationResult = _orderLogic.FinishOrder(new OrderBindingModel + { + Id = id + }); + + if (!operationResult) + { + throw new Exception("Заказ не отправлен в сборку. Дополнительная информация в логах."); + } + + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о готовности заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void ButtonIssuedOrder_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id); + + try + { + var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel + { + Id = id + }); + + if (!operationResult) + { + throw new Exception("Заказ не в статусе готовности. Дополнительная информация в логах."); + } + + _logger.LogInformation("Заказ №{id} выдан", id); + + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void ButtonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/FurnitureAssembly/FurnitureAssembly/FormMain.resx b/FurnitureAssembly/FurnitureAssembly/FormMain.resx new file mode 100644 index 0000000..938108a --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/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/FurnitureAssembly/FurnitureAssembly/FormWorkpiece.Designer.cs b/FurnitureAssembly/FurnitureAssembly/FormWorkpiece.Designer.cs new file mode 100644 index 0000000..e1b6498 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormWorkpiece.Designer.cs @@ -0,0 +1,129 @@ +namespace FurnitureAssemblyView +{ + partial class FormWorkpiece + { + /// + /// 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.button1 = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.textBoxName = new System.Windows.Forms.TextBox(); + this.textBoxCost = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.button2 = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // button1 + // + this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.button1.Location = new System.Drawing.Point(335, 208); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(150, 46); + this.button1.TabIndex = 0; + this.button1.Text = "Сохранить"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.ButtonSave_Click); + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(26, 43); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(125, 32); + this.label1.TabIndex = 1; + this.label1.Text = "Название:"; + // + // textBoxName + // + this.textBoxName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxName.Location = new System.Drawing.Point(165, 40); + this.textBoxName.Name = "textBoxName"; + this.textBoxName.Size = new System.Drawing.Size(496, 39); + this.textBoxName.TabIndex = 2; + // + // textBoxCost + // + this.textBoxCost.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxCost.Location = new System.Drawing.Point(165, 105); + this.textBoxCost.Name = "textBoxCost"; + this.textBoxCost.Size = new System.Drawing.Size(245, 39); + this.textBoxCost.TabIndex = 4; + // + // label2 + // + this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(26, 108); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(76, 32); + this.label2.TabIndex = 3; + this.label2.Text = "Цена:"; + // + // button2 + // + this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.button2.Location = new System.Drawing.Point(511, 208); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(150, 46); + this.button2.TabIndex = 5; + this.button2.Text = "Отмена"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // FormWorkpiece + // + this.AutoScaleDimensions = new System.Drawing.SizeF(13F, 32F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(686, 280); + this.Controls.Add(this.button2); + this.Controls.Add(this.textBoxCost); + this.Controls.Add(this.label2); + this.Controls.Add(this.textBoxName); + this.Controls.Add(this.label1); + this.Controls.Add(this.button1); + this.Name = "FormWorkpiece"; + this.Text = "Заготовка"; + this.Load += new System.EventHandler(this.FormComponent_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Button button1; + private Label label1; + private TextBox textBoxName; + private TextBox textBoxCost; + private Label label2; + private Button button2; + } +} \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssembly/FormWorkpiece.cs b/FurnitureAssembly/FurnitureAssembly/FormWorkpiece.cs new file mode 100644 index 0000000..bb52300 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormWorkpiece.cs @@ -0,0 +1,97 @@ +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.BusinessLogicsContracts; +using FurnitureAssemblyContracts.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 FurnitureAssemblyView +{ + public partial class FormWorkpiece : Form + { + private readonly ILogger _logger; + private readonly IWorkpieceLogic _logic; + private int? _id; + public int Id { set { _id = value; } } + public FormWorkpiece(ILogger logger, IWorkpieceLogic + 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 WorkpieceSearchModel + { + Id = + _id.Value + }); + if (view != null) + { + textBoxName.Text = view.WorkpieceName; + 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 WorkpieceBindingModel + { + Id = _id ?? 0, + WorkpieceName = 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/FurnitureAssembly/FurnitureAssembly/FormWorkpiece.resx b/FurnitureAssembly/FurnitureAssembly/FormWorkpiece.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormWorkpiece.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/FurnitureAssembly/FurnitureAssembly/FormWorkpieces.Designer.cs b/FurnitureAssembly/FurnitureAssembly/FormWorkpieces.Designer.cs new file mode 100644 index 0000000..d22997e --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormWorkpieces.Designer.cs @@ -0,0 +1,127 @@ +namespace FurnitureAssemblyView +{ + partial class FormWorkpieces + { + /// + /// 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.ButtonUpd = new System.Windows.Forms.Button(); + this.ButtonDel = new System.Windows.Forms.Button(); + this.ButtonRef = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // dataGridView + // + this.dataGridView.AllowUserToAddRows = false; + this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left; + this.dataGridView.Location = new System.Drawing.Point(0, 0); + this.dataGridView.MultiSelect = false; + this.dataGridView.Name = "dataGridView"; + this.dataGridView.ReadOnly = true; + this.dataGridView.RowHeadersVisible = false; + this.dataGridView.RowHeadersWidth = 82; + this.dataGridView.RowTemplate.Height = 41; + this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView.Size = new System.Drawing.Size(796, 760); + this.dataGridView.TabIndex = 0; + // + // ButtonAdd + // + this.ButtonAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonAdd.Location = new System.Drawing.Point(895, 86); + this.ButtonAdd.Name = "ButtonAdd"; + this.ButtonAdd.Size = new System.Drawing.Size(170, 55); + this.ButtonAdd.TabIndex = 1; + this.ButtonAdd.Text = "Добавить"; + this.ButtonAdd.UseVisualStyleBackColor = true; + this.ButtonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); + // + // ButtonUpd + // + this.ButtonUpd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonUpd.Location = new System.Drawing.Point(895, 170); + this.ButtonUpd.Name = "ButtonUpd"; + this.ButtonUpd.Size = new System.Drawing.Size(170, 55); + this.ButtonUpd.TabIndex = 2; + this.ButtonUpd.Text = "Изменить"; + this.ButtonUpd.UseVisualStyleBackColor = true; + this.ButtonUpd.Click += new System.EventHandler(this.ButtonUpd_Click); + // + // ButtonDel + // + this.ButtonDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonDel.Location = new System.Drawing.Point(895, 256); + this.ButtonDel.Name = "ButtonDel"; + this.ButtonDel.Size = new System.Drawing.Size(170, 55); + this.ButtonDel.TabIndex = 3; + this.ButtonDel.Text = "Удалить"; + this.ButtonDel.UseVisualStyleBackColor = true; + this.ButtonDel.Click += new System.EventHandler(this.ButtonDel_Click); + // + // ButtonRef + // + this.ButtonRef.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonRef.Location = new System.Drawing.Point(895, 351); + this.ButtonRef.Name = "ButtonRef"; + this.ButtonRef.Size = new System.Drawing.Size(170, 55); + this.ButtonRef.TabIndex = 4; + this.ButtonRef.Text = "Обновить"; + this.ButtonRef.UseVisualStyleBackColor = true; + this.ButtonRef.Click += new System.EventHandler(this.ButtonRef_Click); + // + // FormWorkpieces + // + this.AutoScaleDimensions = new System.Drawing.SizeF(13F, 32F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1135, 760); + this.Controls.Add(this.ButtonRef); + this.Controls.Add(this.ButtonDel); + this.Controls.Add(this.ButtonUpd); + this.Controls.Add(this.ButtonAdd); + this.Controls.Add(this.dataGridView); + this.Name = "FormWorkpieces"; + this.Text = "Заготовки"; + this.Load += new System.EventHandler(this.FormWorkpieces_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView dataGridView; + private Button ButtonAdd; + private Button ButtonUpd; + private Button ButtonDel; + private Button ButtonRef; + } +} \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssembly/FormWorkpieces.cs b/FurnitureAssembly/FurnitureAssembly/FormWorkpieces.cs new file mode 100644 index 0000000..fe8d9d5 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormWorkpieces.cs @@ -0,0 +1,111 @@ +using FurnitureAssembly; +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.BusinessLogicsContracts; +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 FurnitureAssemblyView +{ + public partial class FormWorkpieces : Form + { + private readonly ILogger _logger; + private readonly IWorkpieceLogic _logic; + public FormWorkpieces(ILogger logger, IWorkpieceLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + private void FormWorkpieces_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["WorkpieceName"].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(FormWorkpiece)); + if (service is FormWorkpiece form) + { + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + private void ButtonUpd_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormWorkpiece)); + + if (service is FormWorkpiece form) + { + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + + private void ButtonDel_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", + MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Удаление компонента"); + try + { + if (!_logic.Delete(new WorkpieceBindingModel{Id = id})) + { + throw new Exception("Ошибка при удалении.Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка удаления компонента"); + MessageBox.Show(ex.Message, "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + private void ButtonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssembly/FormWorkpieces.resx b/FurnitureAssembly/FurnitureAssembly/FormWorkpieces.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FormWorkpieces.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/FurnitureAssembly/FurnitureAssembly/FurnitureAssembly.csproj b/FurnitureAssembly/FurnitureAssembly/FurnitureAssembly.csproj deleted file mode 100644 index b57c89e..0000000 --- a/FurnitureAssembly/FurnitureAssembly/FurnitureAssembly.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - WinExe - net6.0-windows - enable - true - enable - - - \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssembly/FurnitureAssemblyView.csproj b/FurnitureAssembly/FurnitureAssembly/FurnitureAssemblyView.csproj new file mode 100644 index 0000000..028fb84 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/FurnitureAssemblyView.csproj @@ -0,0 +1,34 @@ + + + + WinExe + net6.0-windows + enable + true + enable + + + + + + + + + Always + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssembly/Program.cs b/FurnitureAssembly/FurnitureAssembly/Program.cs index 22f2995..9e4462b 100644 --- a/FurnitureAssembly/FurnitureAssembly/Program.cs +++ b/FurnitureAssembly/FurnitureAssembly/Program.cs @@ -1,7 +1,20 @@ +using FurnitureAssemblyBusinessLogic; +using FurnitureAssemblyBusinessLogic.BusinessLogics; +using FurnitureAssemblyContracts.BusinessLogicsContracts; +using FurnitureAssemblyContracts.StoragesContracts; +using FurnitureAssemblyListImplement.Implements; +using FurnitureAssemblyView; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using NLog.Extensions.Logging; +using System; + namespace FurnitureAssembly { internal static class Program { + private static ServiceProvider? _serviceProvider; + public static ServiceProvider? ServiceProvider => _serviceProvider; /// /// The main entry point for the application. /// @@ -11,7 +24,34 @@ namespace FurnitureAssembly // 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/FurnitureAssembly/FurnitureAssembly/Form1.Designer.cs b/FurnitureAssembly/FurnitureAssembly/nlog.Designer.config similarity index 74% rename from FurnitureAssembly/FurnitureAssembly/Form1.Designer.cs rename to FurnitureAssembly/FurnitureAssembly/nlog.Designer.config index 83ebd63..3f13a98 100644 --- a/FurnitureAssembly/FurnitureAssembly/Form1.Designer.cs +++ b/FurnitureAssembly/FurnitureAssembly/nlog.Designer.config @@ -1,14 +1,14 @@ -namespace FurnitureAssembly +namespace FurnitureAssemblyView { - partial class Form1 + partial class nlog { /// - /// Required designer variable. + /// Required designer variable. /// private System.ComponentModel.IContainer components = null; /// - /// Clean up any resources being used. + /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. protected override void Dispose(bool disposing) @@ -23,15 +23,15 @@ #region Windows Form Designer generated code /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. + /// 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"; + this.Text = "nlog"; } #endregion diff --git a/FurnitureAssembly/FurnitureAssembly/nlog.config b/FurnitureAssembly/FurnitureAssembly/nlog.config new file mode 100644 index 0000000..90c7601 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssembly/nlog.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/FurnitureAssemblyBusinessLogic.csproj b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/FurnitureAssemblyBusinessLogic.csproj new file mode 100644 index 0000000..e0fd902 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/FurnitureAssemblyBusinessLogic.csproj @@ -0,0 +1,17 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/FurnitureLogic.cs b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/FurnitureLogic.cs new file mode 100644 index 0000000..3fbaf5f --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/FurnitureLogic.cs @@ -0,0 +1,147 @@ +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.BusinessLogicsContracts; +using FurnitureAssemblyContracts.SearchModels; +using FurnitureAssemblyContracts.StoragesContracts; +using FurnitureAssemblyContracts.ViewModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyBusinessLogic +{ + public class FurnitureLogic : IFurnitureLogic + { + private readonly ILogger _logger; + + private readonly IFurnitureStorage _furnitureStorage; + + public FurnitureLogic(ILogger logger, IFurnitureStorage furnitureStorage) + { + _logger = logger; + _furnitureStorage = furnitureStorage; + } + + public List? ReadList(FurnitureSearchModel? model) + { + _logger.LogInformation("ReadList. FurnitureName: {FurnitureName}. Id:{Id}", model?.FurnitureName, model?.Id); + + var list = model == null ? _furnitureStorage.GetFullList() : _furnitureStorage.GetFilteredList(model); + + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + + return null; + } + + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + + return list; + } + + public FurnitureViewModel? ReadElement(FurnitureSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + + _logger.LogInformation("ReadElement. FurnitureName: {FurnitureName}. Id:{Id}", model.FurnitureName, model.Id); + + var element = _furnitureStorage.GetElement(model); + + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + + return null; + } + + _logger.LogInformation("Readelement find. Id:{Id}", model.Id); + + return element; + } + + public bool Create(FurnitureBindingModel model) + { + CheckModel(model); + + if (_furnitureStorage.Insert(model) == null) + { + _logger.LogWarning("Create operation failed"); + + return false; + } + + return true; + } + + public bool Update(FurnitureBindingModel model) + { + CheckModel(model); + + if (_furnitureStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + + return true; + } + + public bool Delete(FurnitureBindingModel model) + { + CheckModel(model, false); + + _logger.LogInformation("Delete, Id:{Id}", model.Id); + + if (_furnitureStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + + return false; + } + + return true; + } + + private void CheckModel(FurnitureBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + + if (!withParams) + { + return; + } + + if (string.IsNullOrEmpty(model.FurnitureName)) + { + throw new ArgumentNullException("Нет названия заготовки", nameof(model.FurnitureName)); + } + + if (model.Price <= 0) + { + throw new ArgumentNullException("Цена заготовки должна быть больше 0", nameof(model.Price)); + } + + _logger.LogInformation("Furniture. FurnitureName:{FurnitureName}. Price:{Price}. Id:{Id}", + model.FurnitureName, model.Price, model.Id); + + var element = _furnitureStorage.GetElement(new FurnitureSearchModel + { + FurnitureName = model.FurnitureName, + }); + + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Изделие с таким названием уже есть"); + } + } + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OrderLogic.cs b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OrderLogic.cs new file mode 100644 index 0000000..3635c52 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OrderLogic.cs @@ -0,0 +1,158 @@ +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.BusinessLogicsContracts; +using FurnitureAssemblyContracts.SearchModels; +using FurnitureAssemblyContracts.StoragesContracts; +using FurnitureAssemblyContracts.ViewModels; +using FurnitureAssemblyDataModels.Enums; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyBusinessLogic +{ + public class OrderLogic : IOrderLogic + { + private readonly ILogger _logger; + + private readonly IOrderStorage _orderStorage; + + public OrderLogic(ILogger logger, IOrderStorage orderStorage) + { + _logger = logger; + _orderStorage = orderStorage; + } + + 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 CreateOrder(OrderBindingModel model) + { + CheckModel(model); + + if (model.Status != OrderStatus.Неизвестен) + { + _logger.LogWarning("Insert operation failed, incorrect order status"); + return false; + } + + model.Status = OrderStatus.Принят; + + if (_orderStorage.Insert(model) == null) + { + model.Status = OrderStatus.Неизвестен; + _logger.LogWarning("Insert operation failed"); + return false; + } + + return true; + } + + public bool TakeOrderInWork(OrderBindingModel model) + { + return StatusUpdate(model, OrderStatus.Выполняется); + } + + public bool FinishOrder(OrderBindingModel model) + { + return StatusUpdate(model, OrderStatus.Готов); + } + + public bool DeliveryOrder(OrderBindingModel model) + { + return StatusUpdate(model, OrderStatus.Выдан); + } + + private void CheckModel(OrderBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + + if (!withParams) + { + return; + } + + if (model.Count <= 0) + { + throw new ArgumentNullException("В заказе не может быть 0 заготовок", nameof(model.Count)); + } + + if (model.Sum <= 0) + { + throw new ArgumentNullException("Суммарная стоимость заказа должна быть больше 0", nameof(model.Sum)); + } + + if (model.FurnitureId < 0) + { + throw new ArgumentNullException("Некорректный id у заготовки", nameof(model.FurnitureId)); + } + + if (model.DateCreate > model.DateImplement) + { + throw new InvalidOperationException("Дата создания должна быть более ранней, нежели дата завершения"); + } + + _logger.LogInformation("Order. OrderId:{Id}, Sum:{Sum}. FurnitureId:{Id}", model.Id, model.Sum, model.FurnitureId); + } + + public bool StatusUpdate(OrderBindingModel model, OrderStatus newOrderStatus) + { + var viewModel = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id }); + + if (viewModel == null) + { + throw new ArgumentNullException(nameof(model)); + } + + if (viewModel.Status + 1 != newOrderStatus) + { + _logger.LogWarning("Status update operation failed. New status " + newOrderStatus.ToString() + "incorrect"); + return false; + } + + model.Status = newOrderStatus; + + if (model.Status == OrderStatus.Выдан) + { + model.DateImplement = DateTime.Now; + } + else + { + model.DateImplement = viewModel.DateImplement; + } + + CheckModel(model, false); + + if (_orderStorage.Update(model) == null) + { + model.Status--; + + _logger.LogWarning("Update operation failed"); + + return false; + } + + return true; + } + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/WorkpieceLogic.cs b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/WorkpieceLogic.cs new file mode 100644 index 0000000..53552ef --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/WorkpieceLogic.cs @@ -0,0 +1,111 @@ +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.BusinessLogicsContracts; +using FurnitureAssemblyContracts.SearchModels; +using FurnitureAssemblyContracts.StoragesContracts; +using FurnitureAssemblyContracts.ViewModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyBusinessLogic.BusinessLogics +{ + public class WorkpieceLogic : IWorkpieceLogic + { + private readonly ILogger _logger; + private readonly IWorkpieceStorage _workpieceStorage; + public WorkpieceLogic(ILogger logger, IWorkpieceStorage workpieceStorage) + { + _logger = logger; + _workpieceStorage = workpieceStorage; + } + public List? ReadList(WorkpieceSearchModel? model) + { + _logger.LogInformation("ReadList. WorkpieceName:{WorkpieceName}.Id:{ Id} ", model?.WorkpieceName, model?.Id); + var list = model == null ? _workpieceStorage.GetFullList() : _workpieceStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + public WorkpieceViewModel? ReadElement(WorkpieceSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. WorkpieceName:{WorkpieceName}.Id:{ Id}", model.WorkpieceName, model.Id); + var element = _workpieceStorage.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(WorkpieceBindingModel model) + { + CheckModel(model); + if (_workpieceStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + public bool Update(WorkpieceBindingModel model) + { + CheckModel(model); + if (_workpieceStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + public bool Delete(WorkpieceBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_workpieceStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + private void CheckModel(WorkpieceBindingModel model, bool withParams = + true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.WorkpieceName)) + { + throw new ArgumentNullException("Нет названия компонента", + nameof(model.WorkpieceName)); + } + if (model.Cost <= 0) + { + throw new ArgumentNullException("Цена компонента должна быть больше 0", nameof(model.Cost)); + } + _logger.LogInformation("Workpiece. WorkpieceName:{WorkpieceName}.Cost:{ Cost}. Id: { Id}", model.WorkpieceName, model.Cost, model.Id); + var element = _workpieceStorage.GetElement(new WorkpieceSearchModel {WorkpieceName = model.WorkpieceName}); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Компонент с таким названием уже есть"); + } + } + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/FurnitureBindingModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/FurnitureBindingModel.cs new file mode 100644 index 0000000..86dd01c --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/FurnitureBindingModel.cs @@ -0,0 +1,17 @@ +using FurnitureAssemblyDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyContracts.BindingModels +{ + public class FurnitureBindingModel : IFurnitureModel + { + public int Id { get; set; } + public string FurnitureName { get; set; } = string.Empty; + public double Price { get; set; } + public Dictionary FurnitureWorkpieces {get; set; } = new(); + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/OrderBindingModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/OrderBindingModel.cs new file mode 100644 index 0000000..280e941 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/OrderBindingModel.cs @@ -0,0 +1,21 @@ +using FurnitureAssemblyDataModels.Enums; +using FurnitureAssemblyDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyContracts.BindingModels +{ + public class OrderBindingModel : IOrderModel + { + public int Id { get; set; } + public int FurnitureId { 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; } + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/WorkpieceBindingModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/WorkpieceBindingModel.cs new file mode 100644 index 0000000..bfc1f55 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/WorkpieceBindingModel.cs @@ -0,0 +1,17 @@ +using FurnitureAssemblyDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyContracts.BindingModels +{ + public class WorkpieceBindingModel : IWorkpieceModel + { + public int Id { get; set; } + public string WorkpieceName { get; set; } = String.Empty; + + public double Cost { get; set; } + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IFurnitureLogic.cs b/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IFurnitureLogic.cs new file mode 100644 index 0000000..de2da34 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IFurnitureLogic.cs @@ -0,0 +1,20 @@ +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.SearchModels; +using FurnitureAssemblyContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyContracts.BusinessLogicsContracts +{ + public interface IFurnitureLogic + { + List? ReadList(FurnitureSearchModel? model); + FurnitureViewModel? ReadElement(FurnitureSearchModel model); + bool Create(FurnitureBindingModel model); + bool Update(FurnitureBindingModel model); + bool Delete(FurnitureBindingModel model); + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IOrderLogic.cs b/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IOrderLogic.cs new file mode 100644 index 0000000..179f3f7 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IOrderLogic.cs @@ -0,0 +1,20 @@ +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.SearchModels; +using FurnitureAssemblyContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyContracts.BusinessLogicsContracts +{ + public interface IOrderLogic + { + List? ReadList(OrderSearchModel? model); + bool CreateOrder(OrderBindingModel model); + bool TakeOrderInWork(OrderBindingModel model); + bool FinishOrder(OrderBindingModel model); + bool DeliveryOrder(OrderBindingModel model); + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IWorkpieceLogic.cs b/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IWorkpieceLogic.cs new file mode 100644 index 0000000..1c93840 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyContracts/BusinessLogicsContracts/IWorkpieceLogic.cs @@ -0,0 +1,20 @@ +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.SearchModels; +using FurnitureAssemblyContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyContracts.BusinessLogicsContracts +{ + public interface IWorkpieceLogic + { + List? ReadList(WorkpieceSearchModel? model); + WorkpieceViewModel? ReadElement(WorkpieceSearchModel model); + bool Create(WorkpieceBindingModel model); + bool Update(WorkpieceBindingModel model); + bool Delete(WorkpieceBindingModel model); + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/FurnitureAssemblyContracts.csproj b/FurnitureAssembly/FurnitureAssemblyContracts/FurnitureAssemblyContracts.csproj new file mode 100644 index 0000000..71e2e97 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyContracts/FurnitureAssemblyContracts.csproj @@ -0,0 +1,13 @@ + + + + net6.0 + enable + enable + + + + + + + diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/FurnitureSearchModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/FurnitureSearchModel.cs new file mode 100644 index 0000000..827fe8f --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/FurnitureSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyContracts.SearchModels +{ + public class FurnitureSearchModel + { + public int? Id { get; set; } + public string? FurnitureName { get; set; } + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/OrderSearchModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/OrderSearchModel.cs new file mode 100644 index 0000000..25dba07 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/OrderSearchModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyContracts.SearchModels +{ + public class OrderSearchModel + { + public int? Id { get; set; } + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/WorkpieceSearchModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/WorkpieceSearchModel.cs new file mode 100644 index 0000000..da2ad46 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/WorkpieceSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyContracts.SearchModels +{ + public class WorkpieceSearchModel + { + public int? Id { get; set; } + public string? WorkpieceName { get; set; } + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/StoragesContracts/IFurnitureStorage.cs b/FurnitureAssembly/FurnitureAssemblyContracts/StoragesContracts/IFurnitureStorage.cs new file mode 100644 index 0000000..b6bd179 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyContracts/StoragesContracts/IFurnitureStorage.cs @@ -0,0 +1,21 @@ +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.SearchModels; +using FurnitureAssemblyContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyContracts.StoragesContracts +{ + public interface IFurnitureStorage + { + List GetFullList(); + List GetFilteredList(FurnitureSearchModel model); + FurnitureViewModel? GetElement(FurnitureSearchModel model); + FurnitureViewModel? Insert(FurnitureBindingModel model); + FurnitureViewModel? Update(FurnitureBindingModel model); + FurnitureViewModel? Delete(FurnitureBindingModel model); + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/StoragesContracts/IOrderStorage.cs b/FurnitureAssembly/FurnitureAssemblyContracts/StoragesContracts/IOrderStorage.cs new file mode 100644 index 0000000..fd843e7 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyContracts/StoragesContracts/IOrderStorage.cs @@ -0,0 +1,21 @@ +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.SearchModels; +using FurnitureAssemblyContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyContracts.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); + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/StoragesContracts/IWorkpieceStorage.cs b/FurnitureAssembly/FurnitureAssemblyContracts/StoragesContracts/IWorkpieceStorage.cs new file mode 100644 index 0000000..a7aef1c --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyContracts/StoragesContracts/IWorkpieceStorage.cs @@ -0,0 +1,21 @@ +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.SearchModels; +using FurnitureAssemblyContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyContracts.StoragesContracts +{ + public interface IWorkpieceStorage + { + List GetFullList(); + List GetFilteredList(WorkpieceSearchModel model); + WorkpieceViewModel? GetElement(WorkpieceSearchModel model); + WorkpieceViewModel? Insert(WorkpieceBindingModel model); + WorkpieceViewModel? Update(WorkpieceBindingModel model); + WorkpieceViewModel? Delete(WorkpieceBindingModel model); + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/FurnitureViewModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/FurnitureViewModel.cs new file mode 100644 index 0000000..82ae56c --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/FurnitureViewModel.cs @@ -0,0 +1,20 @@ +using FurnitureAssemblyDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyContracts.ViewModels +{ + public class FurnitureViewModel : IFurnitureModel + { + public int Id { get; set; } + [DisplayName("Название мебели")] + public string FurnitureName { get; set; } = string.Empty; + [DisplayName("Цена")] + public double Price { get; set; } + public Dictionary FurnitureWorkpieces { get; set;} = new(); + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/OrderViewModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/OrderViewModel.cs new file mode 100644 index 0000000..7f3c0ee --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/OrderViewModel.cs @@ -0,0 +1,34 @@ +using FurnitureAssemblyDataModels.Enums; +using FurnitureAssemblyDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.ComponentModel; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyContracts.ViewModels +{ + public class OrderViewModel : IOrderModel + { + [DisplayName("Номер")] + public int Id { get; set; } + public int FurnitureId { get; set; } + + [DisplayName("Изделие")] + public string FurnitureName { 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; } + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/WorkpieceViewModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/WorkpieceViewModel.cs new file mode 100644 index 0000000..d4563e3 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/WorkpieceViewModel.cs @@ -0,0 +1,19 @@ +using FurnitureAssemblyDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyContracts.ViewModels +{ + public class WorkpieceViewModel : IWorkpieceModel + { + public int Id { get; set; } + [DisplayName("Название заготовки")] + public string WorkpieceName { get; set; } = string.Empty; + [DisplayName("Цена")] + public double Cost { get; set; } + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyDataModels/Enums/OrderStatus.cs b/FurnitureAssembly/FurnitureAssemblyDataModels/Enums/OrderStatus.cs new file mode 100644 index 0000000..0f80752 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyDataModels/Enums/OrderStatus.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyDataModels.Enums +{ + public enum OrderStatus + { + Неизвестен = -1, + Принят = 0, + Выполняется = 1, + Готов = 2, + Выдан = 3 + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyDataModels/FurnitureAssemblyDataModels.csproj b/FurnitureAssembly/FurnitureAssemblyDataModels/FurnitureAssemblyDataModels.csproj new file mode 100644 index 0000000..132c02c --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyDataModels/FurnitureAssemblyDataModels.csproj @@ -0,0 +1,9 @@ + + + + net6.0 + enable + enable + + + diff --git a/FurnitureAssembly/FurnitureAssemblyDataModels/IId.cs b/FurnitureAssembly/FurnitureAssemblyDataModels/IId.cs new file mode 100644 index 0000000..07be087 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyDataModels/IId.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyDataModels +{ + public interface IId + { + int Id { get; } + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IFurnitureModel.cs b/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IFurnitureModel.cs new file mode 100644 index 0000000..416252d --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IFurnitureModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyDataModels.Models +{ + public interface IFurnitureModel : IId + { + string FurnitureName { get; } + double Price { get; } + + Dictionary FurnitureWorkpieces { get; } + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IOrderModel.cs b/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IOrderModel.cs new file mode 100644 index 0000000..32c3ada --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IOrderModel.cs @@ -0,0 +1,24 @@ +using FurnitureAssemblyDataModels.Enums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyDataModels.Models +{ + public interface IOrderModel : IId + { + int FurnitureId { get; } + + int Count { get; } + + double Sum { get; } + + OrderStatus Status { get; } + + DateTime DateCreate { get; } + + DateTime? DateImplement { get; } + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IWorkpieceModel.cs b/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IWorkpieceModel.cs new file mode 100644 index 0000000..2f708c4 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyDataModels/Models/IWorkpieceModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyDataModels.Models +{ + public interface IWorkpieceModel : IId + { + string WorkpieceName { get; } + + double Cost { get; } + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs new file mode 100644 index 0000000..9ff6029 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs @@ -0,0 +1,33 @@ +using FurnitureAssemblyListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyListImplement +{ + internal class DataListSingleton + { + private static DataListSingleton? _instance; + public List Workpieces { get; set; } + public List Orders { get; set; } + public List Furnitures { get; set; } + + private DataListSingleton() + { + Workpieces = new List(); + Orders = new List(); + Furnitures = new List(); + } + + public static DataListSingleton GetInstance() + { + if (_instance == null) + { + _instance = new DataListSingleton(); + } + return _instance; + } + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/FurnitureAssemblyListImplement.csproj b/FurnitureAssembly/FurnitureAssemblyListImplement/FurnitureAssemblyListImplement.csproj new file mode 100644 index 0000000..e35b19b --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyListImplement/FurnitureAssemblyListImplement.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/FurnitureStorage.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/FurnitureStorage.cs new file mode 100644 index 0000000..8e5c465 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/FurnitureStorage.cs @@ -0,0 +1,129 @@ +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.SearchModels; +using FurnitureAssemblyContracts.StoragesContracts; +using FurnitureAssemblyContracts.ViewModels; +using FurnitureAssemblyListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyListImplement.Implements +{ + public class FurnitureStorage : IFurnitureStorage + { + private readonly DataListSingleton _source; + + public FurnitureStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public List GetFullList() + { + var result = new List(); + + foreach (var furniture in _source.Furnitures) + { + result.Add(furniture.GetViewModel); + } + + return result; + } + + public List GetFilteredList(FurnitureSearchModel model) + { + var result = new List(); + + if (string.IsNullOrEmpty(model.FurnitureName)) + { + return result; + } + + foreach (var furniture in _source.Furnitures) + { + if (furniture.FurnitureName.Contains(model.FurnitureName)) + { + result.Add(furniture.GetViewModel); + } + } + + return result; + } + + public FurnitureViewModel? GetElement(FurnitureSearchModel model) + { + if (string.IsNullOrEmpty(model.FurnitureName) && !model.Id.HasValue) + { + return null; + } + + foreach (var furniture in _source.Furnitures) + { + if ((!string.IsNullOrEmpty(model.FurnitureName) && furniture.FurnitureName == model.FurnitureName) || + (model.Id.HasValue && furniture.Id == model.Id)) + { + return furniture.GetViewModel; + } + } + + return null; + } + + public FurnitureViewModel? Insert(FurnitureBindingModel model) + { + model.Id = 1; + + foreach (var furniture in _source.Furnitures) + { + if (model.Id <= furniture.Id) + { + model.Id = furniture.Id + 1; + } + } + + var newFurniture = Furniture.Create(model); + + if (newFurniture == null) + { + return null; + } + + _source.Furnitures.Add(newFurniture); + + return newFurniture.GetViewModel; + } + + public FurnitureViewModel? Update(FurnitureBindingModel model) + { + foreach (var furniture in _source.Furnitures) + { + if (furniture.Id == model.Id) + { + furniture.Update(model); + + return furniture.GetViewModel; + } + } + + return null; + } + + public FurnitureViewModel? Delete(FurnitureBindingModel model) + { + for (int i = 0; i < _source.Furnitures.Count; ++i) + { + if (_source.Furnitures[i].Id == model.Id) + { + var element = _source.Furnitures[i]; + _source.Furnitures.RemoveAt(i); + + return element.GetViewModel; + } + } + + return null; + } + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/OrderStorage.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..e0355bb --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/OrderStorage.cs @@ -0,0 +1,144 @@ +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.SearchModels; +using FurnitureAssemblyContracts.StoragesContracts; +using FurnitureAssemblyContracts.ViewModels; +using FurnitureAssemblyListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyListImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + private readonly DataListSingleton _source; + public OrderStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public List GetFullList() + { + var result = new List(); + + foreach (var order in _source.Orders) + { + result.Add(GetViewModel(order)); + } + + 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(GetViewModel(order)); + } + } + + 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 GetViewModel(order); + } + } + + return null; + } + + private OrderViewModel GetViewModel(Order order) + { + var viewModel = order.GetViewModel; + + foreach (var furniture in _source.Furnitures) + { + if (furniture.Id == order.FurnitureId) + { + viewModel.FurnitureName = furniture.FurnitureName; + + break; + } + } + + return viewModel; + } + + 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 GetViewModel(newOrder); + } + + public OrderViewModel? Update(OrderBindingModel model) + { + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + order.Update(model); + + return GetViewModel(order); + } + } + + 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 GetViewModel(element); + } + } + + return null; + } + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/WorkpieceStorage.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/WorkpieceStorage.cs new file mode 100644 index 0000000..21de925 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/WorkpieceStorage.cs @@ -0,0 +1,107 @@ +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.SearchModels; +using FurnitureAssemblyContracts.StoragesContracts; +using FurnitureAssemblyContracts.ViewModels; +using FurnitureAssemblyListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyListImplement.Implements +{ + public class WorkpieceStorage : IWorkpieceStorage + { + private readonly DataListSingleton _source; + public WorkpieceStorage() + { + _source = DataListSingleton.GetInstance(); + } + public List GetFullList() + { + var result = new List(); + foreach (var Workpiece in _source.Workpieces) + { + result.Add(Workpiece.GetViewModel); + } + return result; + } + public List GetFilteredList(WorkpieceSearchModel model) + { + var result = new List(); + if (string.IsNullOrEmpty(model.WorkpieceName)) + { + return result; + } + foreach (var Workpiece in _source.Workpieces) + { + if (Workpiece.WorkpieceName.Contains(model.WorkpieceName)) + { + result.Add(Workpiece.GetViewModel); + } + } + return result; + } + public WorkpieceViewModel? GetElement(WorkpieceSearchModel model) + { + if (string.IsNullOrEmpty(model.WorkpieceName) && !model.Id.HasValue) + { + return null; + } + foreach (var Workpiece in _source.Workpieces) + { + if ((!string.IsNullOrEmpty(model.WorkpieceName) && + Workpiece.WorkpieceName == model.WorkpieceName) || + (model.Id.HasValue && Workpiece.Id == model.Id)) + { + return Workpiece.GetViewModel; + } + } + return null; + } + public WorkpieceViewModel? Insert(WorkpieceBindingModel model) + { + model.Id = 1; + foreach (var Workpiece in _source.Workpieces) + { + if (model.Id <= Workpiece.Id) + { + model.Id = Workpiece.Id + 1; + } + } + var newWorkpiece = Workpiece.Create(model); + if (newWorkpiece == null) + { + return null; + } + _source.Workpieces.Add(newWorkpiece); + return newWorkpiece.GetViewModel; + } + public WorkpieceViewModel? Update(WorkpieceBindingModel model) + { + foreach (var Workpiece in _source.Workpieces) + { + if (Workpiece.Id == model.Id) + { + Workpiece.Update(model); + return Workpiece.GetViewModel; + } + } + return null; + } + public WorkpieceViewModel? Delete(WorkpieceBindingModel model) + { + for (int i = 0; i < _source.Workpieces.Count; ++i) + { + if (_source.Workpieces[i].Id == model.Id) + { + var element = _source.Workpieces[i]; + _source.Workpieces.RemoveAt(i); + return element.GetViewModel; + } + } + return null; + } + } +} \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Furniture.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Furniture.cs new file mode 100644 index 0000000..70a9b8b --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Furniture.cs @@ -0,0 +1,54 @@ +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.ViewModels; +using FurnitureAssemblyDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyListImplement.Models +{ + public class Furniture : IFurnitureModel + { + public int Id { get; private set; } + public string FurnitureName { get; private set; } = string.Empty; + public double Price { get; private set; } + public Dictionary FurnitureWorkpieces + { + get; + private set; + } = new Dictionary(); + public static Furniture? Create(FurnitureBindingModel? model) + { + if (model == null) + { + return null; + } + return new Furniture() + { + Id = model.Id, + FurnitureName = model.FurnitureName, + Price = model.Price, + FurnitureWorkpieces = model.FurnitureWorkpieces + }; + } + public void Update(FurnitureBindingModel? model) + { + if (model == null) + { + return; + } + FurnitureName = model.FurnitureName; + Price = model.Price; + FurnitureWorkpieces = model.FurnitureWorkpieces; + } + public FurnitureViewModel GetViewModel => new() + { + Id = Id, + FurnitureName = FurnitureName, + Price = Price, + FurnitureWorkpieces = FurnitureWorkpieces + }; + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Order.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Order.cs new file mode 100644 index 0000000..45efeed --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Order.cs @@ -0,0 +1,68 @@ +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.ViewModels; +using FurnitureAssemblyDataModels.Enums; +using FurnitureAssemblyDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyListImplement.Models +{ + public class Order : IOrderModel + { + public int Id { get; private set; } + + public int FurnitureId { get; private set; } + + public int Count { get; private set; } + + public double Sum { get; private set; } + + public OrderStatus Status { get; private set; } + + 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, + FurnitureId = model.FurnitureId, + 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; + DateImplement = model.DateImplement; + } + + public OrderViewModel GetViewModel => new() + { + Id = Id, + FurnitureId = FurnitureId, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement, + }; + } +} diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Workpiece.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Workpiece.cs new file mode 100644 index 0000000..c585e97 --- /dev/null +++ b/FurnitureAssembly/FurnitureAssemblyListImplement/Models/Workpiece.cs @@ -0,0 +1,46 @@ +using FurnitureAssemblyContracts.BindingModels; +using FurnitureAssemblyContracts.ViewModels; +using FurnitureAssemblyDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssemblyListImplement.Models +{ + internal class Workpiece : IWorkpieceModel + { + public int Id { get; private set; } + public string WorkpieceName { get; private set; } = string.Empty; + public double Cost { get; set; } + public static Workpiece? Create(WorkpieceBindingModel? model) + { + if (model == null) + { + return null; + } + return new Workpiece() + { + Id = model.Id, + WorkpieceName = model.WorkpieceName, + Cost = model.Cost + }; + } + public void Update(WorkpieceBindingModel? model) + { + if (model == null) + { + return; + } + WorkpieceName = model.WorkpieceName; + Cost = model.Cost; + } + public WorkpieceViewModel GetViewModel => new() + { + Id = Id, + WorkpieceName = WorkpieceName, + Cost = Cost + }; + } +}