From a7d4a712241f4361fdfcbb933ab7b02596d9bdff Mon Sep 17 00:00:00 2001 From: asoc1al Date: Sun, 26 May 2024 12:42:37 +0400 Subject: [PATCH] . --- AutoWorkshop/AutoWorkshop.sln | 25 -- AutoWorkshop/AutoWorkshop/Form1.Designer.cs | 39 --- AutoWorkshop/AutoWorkshop/Form1.cs | 10 - AutoWorkshop/AutoWorkshop/Program.cs | 17 -- AutoWorkshop/AutoWorkshopView.csproj | 19 ++ AutoWorkshop/Forms/FormComponent.Designer.cs | 118 +++++++++ AutoWorkshop/Forms/FormComponent.cs | 96 +++++++ .../Form1.resx => Forms/FormComponent.resx} | 50 ++-- AutoWorkshop/Forms/FormComponents.Designer.cs | 112 +++++++++ AutoWorkshop/Forms/FormComponents.cs | 112 +++++++++ AutoWorkshop/Forms/FormComponents.resx | 120 +++++++++ .../Forms/FormCreateOrder.Designer.cs | 145 +++++++++++ AutoWorkshop/Forms/FormCreateOrder.cs | 133 ++++++++++ AutoWorkshop/Forms/FormCreateOrder.resx | 120 +++++++++ AutoWorkshop/Forms/FormRepair.Designer.cs | 227 +++++++++++++++++ AutoWorkshop/Forms/FormRepair.cs | 237 ++++++++++++++++++ AutoWorkshop/Forms/FormRepair.resx | 120 +++++++++ .../Forms/FormRepairComponent.Designer.cs | 118 +++++++++ AutoWorkshop/Forms/FormRepairComponent.cs | 89 +++++++ AutoWorkshop/Forms/FormRepairComponent.resx | 120 +++++++++ AutoWorkshop/Forms/FormRepairs.Designer.cs | 113 +++++++++ AutoWorkshop/Forms/FormRepairs.cs | 114 +++++++++ AutoWorkshop/MainForm.Designer.cs | 179 +++++++++++++ AutoWorkshop/MainForm.cs | 182 ++++++++++++++ AutoWorkshop/MainForm.resx | 123 +++++++++ AutoWorkshop/Program.cs | 52 ++++ .../AutoWorkshopBusinessLogic.csproj | 17 ++ .../BusinessLogics/ComponentLogic.cs | 125 +++++++++ .../BusinessLogics/OrderLogic.cs | 148 +++++++++++ .../BusinessLogics/RepairLogic.cs | 125 +++++++++ .../AutoWorkshopContracts.csproj | 13 + .../BindingModels/ComponentBindingModel.cs | 11 + .../BindingModels/OrderBindingModel.cs | 16 ++ .../BindingModels/ProductBindingModel.cs | 16 ++ .../BusinessLogicContracts/IComponentLogic.cs | 15 ++ .../BusinessLogicContracts/IOrderLogic.cs | 15 ++ .../BusinessLogicContracts/IRepairLogic.cs | 15 ++ .../SearchModels/ComponentSearchModel.cs | 8 + .../SearchModels/OrderSearchModel.cs | 7 + .../SearchModels/RepairSearchModel.cs | 8 + .../StoragesContracts/IComponentStorage.cs | 16 ++ .../StoragesContracts/IOrderStorage.cs | 16 ++ .../StoragesContracts/IRepairStorage.cs | 16 ++ .../ViewModels/ComponentViewModel.cs | 16 ++ .../ViewModels/OrderViewModel.cs | 32 +++ .../ViewModels/RepairViewModel.cs | 22 ++ .../AutoWorkshopDataModels.csproj | 9 + AutoWorkshopDataModels/Enums/OrderStatus.cs | 11 + .../Models/IComponentModel.cs | 8 + AutoWorkshopDataModels/Models/IId.cs | 7 + AutoWorkshopDataModels/Models/IOrderModel.cs | 14 ++ AutoWorkshopDataModels/Models/IRepairModel.cs | 9 + .../AutoWorkshopListImplement.csproj | 14 ++ AutoWorkshopImplement/DataListSingleton.cs | 32 +++ .../Implements/ComponentStorage.cs | 116 +++++++++ .../Implements/OrderStorage.cs | 116 +++++++++ .../Implements/RepairStorage.cs | 116 +++++++++ AutoWorkshopImplement/Models/Component.cs | 44 ++++ AutoWorkshopImplement/Models/Order.cs | 65 +++++ AutoWorkshopImplement/Models/Repair.cs | 53 ++++ .../AutoWorkshopView.csproj | 5 +- AutoWorkshopView/Class1.cs | 5 + 62 files changed, 3952 insertions(+), 119 deletions(-) delete mode 100644 AutoWorkshop/AutoWorkshop.sln delete mode 100644 AutoWorkshop/AutoWorkshop/Form1.Designer.cs delete mode 100644 AutoWorkshop/AutoWorkshop/Form1.cs delete mode 100644 AutoWorkshop/AutoWorkshop/Program.cs create mode 100644 AutoWorkshop/AutoWorkshopView.csproj create mode 100644 AutoWorkshop/Forms/FormComponent.Designer.cs create mode 100644 AutoWorkshop/Forms/FormComponent.cs rename AutoWorkshop/{AutoWorkshop/Form1.resx => Forms/FormComponent.resx} (93%) create mode 100644 AutoWorkshop/Forms/FormComponents.Designer.cs create mode 100644 AutoWorkshop/Forms/FormComponents.cs create mode 100644 AutoWorkshop/Forms/FormComponents.resx create mode 100644 AutoWorkshop/Forms/FormCreateOrder.Designer.cs create mode 100644 AutoWorkshop/Forms/FormCreateOrder.cs create mode 100644 AutoWorkshop/Forms/FormCreateOrder.resx create mode 100644 AutoWorkshop/Forms/FormRepair.Designer.cs create mode 100644 AutoWorkshop/Forms/FormRepair.cs create mode 100644 AutoWorkshop/Forms/FormRepair.resx create mode 100644 AutoWorkshop/Forms/FormRepairComponent.Designer.cs create mode 100644 AutoWorkshop/Forms/FormRepairComponent.cs create mode 100644 AutoWorkshop/Forms/FormRepairComponent.resx create mode 100644 AutoWorkshop/Forms/FormRepairs.Designer.cs create mode 100644 AutoWorkshop/Forms/FormRepairs.cs create mode 100644 AutoWorkshop/MainForm.Designer.cs create mode 100644 AutoWorkshop/MainForm.cs create mode 100644 AutoWorkshop/MainForm.resx create mode 100644 AutoWorkshop/Program.cs create mode 100644 AutoWorkshopBusinessLogic/AutoWorkshopBusinessLogic.csproj create mode 100644 AutoWorkshopBusinessLogic/BusinessLogics/ComponentLogic.cs create mode 100644 AutoWorkshopBusinessLogic/BusinessLogics/OrderLogic.cs create mode 100644 AutoWorkshopBusinessLogic/BusinessLogics/RepairLogic.cs create mode 100644 AutoWorkshopContracts/AutoWorkshopContracts.csproj create mode 100644 AutoWorkshopContracts/BindingModels/ComponentBindingModel.cs create mode 100644 AutoWorkshopContracts/BindingModels/OrderBindingModel.cs create mode 100644 AutoWorkshopContracts/BindingModels/ProductBindingModel.cs create mode 100644 AutoWorkshopContracts/BusinessLogicContracts/IComponentLogic.cs create mode 100644 AutoWorkshopContracts/BusinessLogicContracts/IOrderLogic.cs create mode 100644 AutoWorkshopContracts/BusinessLogicContracts/IRepairLogic.cs create mode 100644 AutoWorkshopContracts/SearchModels/ComponentSearchModel.cs create mode 100644 AutoWorkshopContracts/SearchModels/OrderSearchModel.cs create mode 100644 AutoWorkshopContracts/SearchModels/RepairSearchModel.cs create mode 100644 AutoWorkshopContracts/StoragesContracts/IComponentStorage.cs create mode 100644 AutoWorkshopContracts/StoragesContracts/IOrderStorage.cs create mode 100644 AutoWorkshopContracts/StoragesContracts/IRepairStorage.cs create mode 100644 AutoWorkshopContracts/ViewModels/ComponentViewModel.cs create mode 100644 AutoWorkshopContracts/ViewModels/OrderViewModel.cs create mode 100644 AutoWorkshopContracts/ViewModels/RepairViewModel.cs create mode 100644 AutoWorkshopDataModels/AutoWorkshopDataModels.csproj create mode 100644 AutoWorkshopDataModels/Enums/OrderStatus.cs create mode 100644 AutoWorkshopDataModels/Models/IComponentModel.cs create mode 100644 AutoWorkshopDataModels/Models/IId.cs create mode 100644 AutoWorkshopDataModels/Models/IOrderModel.cs create mode 100644 AutoWorkshopDataModels/Models/IRepairModel.cs create mode 100644 AutoWorkshopImplement/AutoWorkshopListImplement.csproj create mode 100644 AutoWorkshopImplement/DataListSingleton.cs create mode 100644 AutoWorkshopImplement/Implements/ComponentStorage.cs create mode 100644 AutoWorkshopImplement/Implements/OrderStorage.cs create mode 100644 AutoWorkshopImplement/Implements/RepairStorage.cs create mode 100644 AutoWorkshopImplement/Models/Component.cs create mode 100644 AutoWorkshopImplement/Models/Order.cs create mode 100644 AutoWorkshopImplement/Models/Repair.cs rename AutoWorkshop/AutoWorkshop/AutoWorkshop.csproj => AutoWorkshopView/AutoWorkshopView.csproj (66%) create mode 100644 AutoWorkshopView/Class1.cs diff --git a/AutoWorkshop/AutoWorkshop.sln b/AutoWorkshop/AutoWorkshop.sln deleted file mode 100644 index da928ed..0000000 --- a/AutoWorkshop/AutoWorkshop.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.8.34511.84 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoWorkshop", "AutoWorkshop\AutoWorkshop.csproj", "{839ECA1B-76A2-47C8-A1E6-9521B159678C}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {839ECA1B-76A2-47C8-A1E6-9521B159678C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {839ECA1B-76A2-47C8-A1E6-9521B159678C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {839ECA1B-76A2-47C8-A1E6-9521B159678C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {839ECA1B-76A2-47C8-A1E6-9521B159678C}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {E8A48BA8-9649-47B3-9F42-1545CD5D085F} - EndGlobalSection -EndGlobal diff --git a/AutoWorkshop/AutoWorkshop/Form1.Designer.cs b/AutoWorkshop/AutoWorkshop/Form1.Designer.cs deleted file mode 100644 index 67c2e74..0000000 --- a/AutoWorkshop/AutoWorkshop/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace AutoWorkshop -{ - partial class Form1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "Form1"; - } - - #endregion - } -} diff --git a/AutoWorkshop/AutoWorkshop/Form1.cs b/AutoWorkshop/AutoWorkshop/Form1.cs deleted file mode 100644 index 05474dc..0000000 --- a/AutoWorkshop/AutoWorkshop/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace AutoWorkshop -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} diff --git a/AutoWorkshop/AutoWorkshop/Program.cs b/AutoWorkshop/AutoWorkshop/Program.cs deleted file mode 100644 index 397b3d6..0000000 --- a/AutoWorkshop/AutoWorkshop/Program.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace AutoWorkshop -{ - internal static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - static void Main() - { - // To customize application configuration such as set high DPI settings or default font, - // see https://aka.ms/applicationconfiguration. - ApplicationConfiguration.Initialize(); - Application.Run(new Form1()); - } - } -} \ No newline at end of file diff --git a/AutoWorkshop/AutoWorkshopView.csproj b/AutoWorkshop/AutoWorkshopView.csproj new file mode 100644 index 0000000..3a78229 --- /dev/null +++ b/AutoWorkshop/AutoWorkshopView.csproj @@ -0,0 +1,19 @@ + + + + WinExe + net6.0-windows + enable + true + enable + + + + + + + + + + + \ No newline at end of file diff --git a/AutoWorkshop/Forms/FormComponent.Designer.cs b/AutoWorkshop/Forms/FormComponent.Designer.cs new file mode 100644 index 0000000..e944a75 --- /dev/null +++ b/AutoWorkshop/Forms/FormComponent.Designer.cs @@ -0,0 +1,118 @@ +namespace AutoWorkshopView.Forms +{ + partial class FormComponent + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + ComponentNameLabel = new Label(); + ComponentPriceLabel = new Label(); + ComponentNameTextBox = new TextBox(); + ComponentPriceTextBox = new TextBox(); + CancelButton = new Button(); + SaveButton = new Button(); + SuspendLayout(); + // + // ComponentNameLabel + // + ComponentNameLabel.AutoSize = true; + ComponentNameLabel.Location = new Point(12, 15); + ComponentNameLabel.Name = "ComponentNameLabel"; + ComponentNameLabel.Size = new Size(62, 15); + ComponentNameLabel.TabIndex = 0; + ComponentNameLabel.Text = "Название:"; + // + // ComponentPriceLabel + // + ComponentPriceLabel.AutoSize = true; + ComponentPriceLabel.Location = new Point(12, 44); + ComponentPriceLabel.Name = "ComponentPriceLabel"; + ComponentPriceLabel.Size = new Size(38, 15); + ComponentPriceLabel.TabIndex = 1; + ComponentPriceLabel.Text = "Цена:"; + // + // ComponentNameTextBox + // + ComponentNameTextBox.Location = new Point(80, 12); + ComponentNameTextBox.Name = "ComponentNameTextBox"; + ComponentNameTextBox.Size = new Size(221, 23); + ComponentNameTextBox.TabIndex = 2; + // + // ComponentPriceTextBox + // + ComponentPriceTextBox.Location = new Point(80, 41); + ComponentPriceTextBox.Name = "ComponentPriceTextBox"; + ComponentPriceTextBox.Size = new Size(140, 23); + ComponentPriceTextBox.TabIndex = 3; + // + // CancelButton + // + CancelButton.Location = new Point(226, 74); + CancelButton.Name = "CancelButton"; + CancelButton.Size = new Size(75, 23); + CancelButton.TabIndex = 4; + CancelButton.Text = "Отмена"; + CancelButton.UseVisualStyleBackColor = true; + CancelButton.Click += ButtonCancel_Click; + // + // SaveButton + // + SaveButton.Location = new Point(145, 74); + SaveButton.Name = "SaveButton"; + SaveButton.Size = new Size(75, 23); + SaveButton.TabIndex = 5; + SaveButton.Text = "Сохранить"; + SaveButton.UseVisualStyleBackColor = true; + SaveButton.Click += ButtonSave_Click; + // + // FormComponent + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(324, 110); + Controls.Add(SaveButton); + Controls.Add(CancelButton); + Controls.Add(ComponentPriceTextBox); + Controls.Add(ComponentNameTextBox); + Controls.Add(ComponentPriceLabel); + Controls.Add(ComponentNameLabel); + Name = "FormComponent"; + Text = "Компонент"; + Load += FormComponent_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label ComponentNameLabel; + private Label ComponentPriceLabel; + private TextBox ComponentNameTextBox; + private TextBox ComponentPriceTextBox; + private Button CancelButton; + private Button SaveButton; + } +} \ No newline at end of file diff --git a/AutoWorkshop/Forms/FormComponent.cs b/AutoWorkshop/Forms/FormComponent.cs new file mode 100644 index 0000000..d79e3bf --- /dev/null +++ b/AutoWorkshop/Forms/FormComponent.cs @@ -0,0 +1,96 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.BusinessLogicContracts; +using AutoWorkshopContracts.SearchModels; +using Microsoft.Extensions.Logging; +using System.Windows.Forms; + +namespace AutoWorkshopView.Forms +{ + public partial class FormComponent : Form + { + private readonly ILogger _logger; + + private readonly IComponentLogic _logic; + + private int? _id; + + public int Id { set { _id = value; } } + + public FormComponent(ILogger Logger, IComponentLogic Logic) + { + InitializeComponent(); + + _logger = Logger; + _logic = Logic; + } + + private void FormComponent_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + try + { + _logger.LogInformation("Получение компонента"); + var View = _logic.ReadElement(new ComponentSearchModel + { + Id = _id.Value + }); + + if (View != null) + { + ComponentNameTextBox.Text = View.ComponentName; + ComponentPriceTextBox.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(ComponentNameTextBox.Text)) + { + MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + _logger.LogInformation("Сохранение компонента"); + + try + { + var model = new ComponentBindingModel + { + Id = _id ?? 0, + ComponentName = ComponentNameTextBox.Text, + Cost = Convert.ToDouble(ComponentPriceTextBox.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/AutoWorkshop/AutoWorkshop/Form1.resx b/AutoWorkshop/Forms/FormComponent.resx similarity index 93% rename from AutoWorkshop/AutoWorkshop/Form1.resx rename to AutoWorkshop/Forms/FormComponent.resx index 1af7de1..af32865 100644 --- a/AutoWorkshop/AutoWorkshop/Form1.resx +++ b/AutoWorkshop/Forms/FormComponent.resx @@ -1,17 +1,17 @@  - diff --git a/AutoWorkshop/Forms/FormComponents.Designer.cs b/AutoWorkshop/Forms/FormComponents.Designer.cs new file mode 100644 index 0000000..c22f388 --- /dev/null +++ b/AutoWorkshop/Forms/FormComponents.Designer.cs @@ -0,0 +1,112 @@ +namespace AutoWorkshopView.Forms +{ + partial class FormComponents + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + DataGridView = new DataGridView(); + AddButton = new Button(); + ChangeButton = new Button(); + DeleteButton = new Button(); + RefreshButton = new Button(); + ((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit(); + SuspendLayout(); + // + // DataGridView + // + DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + DataGridView.Location = new Point(12, 12); + DataGridView.Name = "DataGridView"; + DataGridView.Size = new Size(369, 350); + DataGridView.TabIndex = 0; + // + // AddButton + // + AddButton.Location = new Point(387, 12); + AddButton.Name = "AddButton"; + AddButton.Size = new Size(126, 23); + AddButton.TabIndex = 1; + AddButton.Text = "Добавить"; + AddButton.UseVisualStyleBackColor = true; + AddButton.Click += AddButton_Click; + // + // ChangeButton + // + ChangeButton.Location = new Point(387, 41); + ChangeButton.Name = "ChangeButton"; + ChangeButton.Size = new Size(126, 23); + ChangeButton.TabIndex = 2; + ChangeButton.Text = "Изменить"; + ChangeButton.UseVisualStyleBackColor = true; + ChangeButton.Click += ChangeButton_Click; + // + // DeleteButton + // + DeleteButton.Location = new Point(387, 70); + DeleteButton.Name = "DeleteButton"; + DeleteButton.Size = new Size(126, 23); + DeleteButton.TabIndex = 3; + DeleteButton.Text = "Удалить"; + DeleteButton.UseVisualStyleBackColor = true; + DeleteButton.Click += DeleteButton_Click; + // + // RefreshButton + // + RefreshButton.Location = new Point(387, 99); + RefreshButton.Name = "RefreshButton"; + RefreshButton.Size = new Size(126, 23); + RefreshButton.TabIndex = 4; + RefreshButton.Text = "Обновить"; + RefreshButton.UseVisualStyleBackColor = true; + RefreshButton.Click += RefreshButton_Click; + // + // ComponentsForm + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(525, 374); + Controls.Add(RefreshButton); + Controls.Add(DeleteButton); + Controls.Add(ChangeButton); + Controls.Add(AddButton); + Controls.Add(DataGridView); + Name = "ComponentsForm"; + Text = "Компоненты"; + Load += ComponentsForm_Load; + ((System.ComponentModel.ISupportInitialize)DataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView DataGridView; + private Button AddButton; + private Button ChangeButton; + private Button DeleteButton; + private Button RefreshButton; + } +} \ No newline at end of file diff --git a/AutoWorkshop/Forms/FormComponents.cs b/AutoWorkshop/Forms/FormComponents.cs new file mode 100644 index 0000000..1e41122 --- /dev/null +++ b/AutoWorkshop/Forms/FormComponents.cs @@ -0,0 +1,112 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.BusinessLogicContracts; +using Microsoft.Extensions.Logging; + +namespace AutoWorkshopView.Forms +{ + public partial class FormComponents : Form + { + private readonly ILogger _logger; + private readonly IComponentLogic _logic; + + public FormComponents(ILogger Logger, IComponentLogic Logic) + { + InitializeComponent(); + _logger = Logger; + _logic = Logic; + } + + private void ComponentsForm_Load(object sender, EventArgs e) + { + LoadData(); + } + + private void LoadData() + { + try + { + var List = _logic.ReadList(null); + + if (List != null) + { + DataGridView.DataSource = List; + DataGridView.Columns["Id"].Visible = false; + DataGridView.Columns["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + + _logger.LogInformation("Загрузка компонентов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки компонентов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void AddButton_Click(object sender, EventArgs e) + { + var Service = Program.ServiceProvider?.GetService(typeof(FormComponent)); + + if (Service is FormComponent Form) + { + if (Form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + + private void ChangeButton_Click(object sender, EventArgs e) + { + if (DataGridView.SelectedRows.Count == 1) + { + var Service = Program.ServiceProvider?.GetService(typeof(FormComponent)); + if (Service is FormComponent Form) + { + Form.Id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value); + if (Form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + + } + + private void DeleteButton_Click(object sender, EventArgs e) + { + if (DataGridView.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", + MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + int id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Удаление компонента"); + + try + { + if (!_logic.Delete(new ComponentBindingModel + { + Id = id + })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка удаления компонента"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + + private void RefreshButton_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/AutoWorkshop/Forms/FormComponents.resx b/AutoWorkshop/Forms/FormComponents.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/AutoWorkshop/Forms/FormComponents.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/AutoWorkshop/Forms/FormCreateOrder.Designer.cs b/AutoWorkshop/Forms/FormCreateOrder.Designer.cs new file mode 100644 index 0000000..a84b1ea --- /dev/null +++ b/AutoWorkshop/Forms/FormCreateOrder.Designer.cs @@ -0,0 +1,145 @@ +namespace AutoWorkshopView.Forms +{ + 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() + { + RepairComboBox = new ComboBox(); + CountTextBox = new TextBox(); + SumTextBox = new TextBox(); + SaveButton = new Button(); + CancelButton = new Button(); + RepairLabel = new Label(); + CountLabel = new Label(); + SumLabel = new Label(); + SuspendLayout(); + // + // RepairComboBox + // + RepairComboBox.FormattingEnabled = true; + RepairComboBox.Location = new Point(103, 12); + RepairComboBox.Name = "RepairComboBox"; + RepairComboBox.Size = new Size(232, 23); + RepairComboBox.TabIndex = 0; + RepairComboBox.SelectedIndexChanged += RepairComboBox_SelectedIndexChanged; + // + // CountTextBox + // + CountTextBox.Location = new Point(103, 41); + CountTextBox.Name = "CountTextBox"; + CountTextBox.Size = new Size(232, 23); + CountTextBox.TabIndex = 1; + CountTextBox.TextChanged += CountTextBox_TextChanged; + // + // SumTextBox + // + SumTextBox.Location = new Point(103, 70); + SumTextBox.Name = "SumTextBox"; + SumTextBox.ReadOnly = true; + SumTextBox.Size = new Size(232, 23); + SumTextBox.TabIndex = 2; + SumTextBox.TextChanged += SumTextBox_TextChanged; + // + // SaveButton + // + SaveButton.Location = new Point(173, 107); + SaveButton.Name = "SaveButton"; + SaveButton.Size = new Size(81, 23); + SaveButton.TabIndex = 3; + SaveButton.Text = "Сохранить"; + SaveButton.UseVisualStyleBackColor = true; + SaveButton.Click += SaveButton_Click; + // + // CancelButton + // + CancelButton.Location = new Point(260, 107); + CancelButton.Name = "CancelButton"; + CancelButton.Size = new Size(75, 23); + CancelButton.TabIndex = 4; + CancelButton.Text = "Отмена"; + CancelButton.UseVisualStyleBackColor = true; + CancelButton.Click += CancelButton_Click; + // + // RepairLabel + // + RepairLabel.AutoSize = true; + RepairLabel.Location = new Point(12, 15); + RepairLabel.Name = "RepairLabel"; + RepairLabel.Size = new Size(51, 15); + RepairLabel.TabIndex = 5; + RepairLabel.Text = "Ремонт:"; + // + // CountLabel + // + CountLabel.AutoSize = true; + CountLabel.Location = new Point(12, 44); + CountLabel.Name = "CountLabel"; + CountLabel.Size = new Size(75, 15); + CountLabel.TabIndex = 6; + CountLabel.Text = "Количество:"; + // + // SumLabel + // + SumLabel.AutoSize = true; + SumLabel.Location = new Point(12, 73); + SumLabel.Name = "SumLabel"; + SumLabel.Size = new Size(48, 15); + SumLabel.TabIndex = 7; + SumLabel.Text = "Сумма:"; + // + // FormCreateOrder + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(348, 142); + Controls.Add(SumLabel); + Controls.Add(CountLabel); + Controls.Add(RepairLabel); + Controls.Add(CancelButton); + Controls.Add(SaveButton); + Controls.Add(SumTextBox); + Controls.Add(CountTextBox); + Controls.Add(RepairComboBox); + Name = "FormCreateOrder"; + Text = "Создание заказа"; + Load += FormCreateOrder_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private ComboBox RepairComboBox; + private TextBox CountTextBox; + private TextBox SumTextBox; + private Button SaveButton; + private Button CancelButton; + private Label RepairLabel; + private Label CountLabel; + private Label SumLabel; + } +} \ No newline at end of file diff --git a/AutoWorkshop/Forms/FormCreateOrder.cs b/AutoWorkshop/Forms/FormCreateOrder.cs new file mode 100644 index 0000000..1440327 --- /dev/null +++ b/AutoWorkshop/Forms/FormCreateOrder.cs @@ -0,0 +1,133 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.BusinessLogicContracts; +using AutoWorkshopContracts.SearchModels; +using Microsoft.Extensions.Logging; + +namespace AutoWorkshopView.Forms +{ + public partial class FormCreateOrder : Form + { + private readonly ILogger _logger; + private readonly IRepairLogic _logicI; + private readonly IOrderLogic _logicO; + + public FormCreateOrder(ILogger Logger, IRepairLogic LogicI, IOrderLogic LogicO) + { + InitializeComponent(); + + _logger = Logger; + _logicI = LogicI; + _logicO = LogicO; + } + + private void FormCreateOrder_Load(object sender, EventArgs e) + { + _logger.LogInformation("Загрузка ремонта для заказа"); + + try + { + var list = _logicI.ReadList(null); + if (list != null) + { + RepairComboBox.DisplayMember = "RepairName"; + RepairComboBox.ValueMember = "Id"; + RepairComboBox.DataSource = list; + RepairComboBox.SelectedItem = null; + } + + _logger.LogInformation("Ремонт загружен"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки ремонта"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void CalcSum() + { + if (RepairComboBox.SelectedValue != null && !string.IsNullOrEmpty(CountTextBox.Text)) + { + try + { + int id = Convert.ToInt32(RepairComboBox.SelectedValue); + var Repair = _logicI.ReadElement(new RepairSearchModel + { + Id = id + }); + int count = Convert.ToInt32(CountTextBox.Text); + + SumTextBox.Text = Math.Round(count * (Repair?.Price ?? 0), 2).ToString(); + + _logger.LogInformation("Расчет суммы заказа"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка расчета суммы заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void CountTextBox_TextChanged(object sender, EventArgs e) + { + CalcSum(); + } + + private void SumTextBox_TextChanged(object sender, EventArgs e) + { + CalcSum(); + } + + private void SaveButton_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(CountTextBox.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + if (RepairComboBox.SelectedValue == null) + { + MessageBox.Show("Выберите ремонт", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + _logger.LogInformation("Создание заказа"); + + try + { + var OperationResult = _logicO.CreateOrder(new OrderBindingModel + { + RepairId = Convert.ToInt32(RepairComboBox.SelectedValue), + Count = Convert.ToInt32(CountTextBox.Text), + Sum = Convert.ToDouble(SumTextBox.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 CancelButton_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + + private void RepairComboBox_SelectedIndexChanged(object sender, EventArgs e) + { + CalcSum(); + } + } +} diff --git a/AutoWorkshop/Forms/FormCreateOrder.resx b/AutoWorkshop/Forms/FormCreateOrder.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/AutoWorkshop/Forms/FormCreateOrder.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/AutoWorkshop/Forms/FormRepair.Designer.cs b/AutoWorkshop/Forms/FormRepair.Designer.cs new file mode 100644 index 0000000..b8301ef --- /dev/null +++ b/AutoWorkshop/Forms/FormRepair.Designer.cs @@ -0,0 +1,227 @@ +namespace AutoWorkshopView.Forms +{ + partial class FormRepair + { + /// + /// 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() + { + NameLabel = new Label(); + PriceLabel = new Label(); + NameTextBox = new TextBox(); + PriceTextBox = new TextBox(); + ComponentsGroupBox = new GroupBox(); + RefreshButton = new Button(); + DeleteButton = new Button(); + UpdateButton = new Button(); + AddButton = new Button(); + DataGridView = new DataGridView(); + IdColumn = new DataGridViewTextBoxColumn(); + ComponentNameColumn = new DataGridViewTextBoxColumn(); + CountColumn = new DataGridViewTextBoxColumn(); + SaveButton = new Button(); + CancelButton = new Button(); + ComponentsGroupBox.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit(); + SuspendLayout(); + // + // NameLabel + // + NameLabel.AutoSize = true; + NameLabel.Location = new Point(12, 9); + NameLabel.Name = "NameLabel"; + NameLabel.Size = new Size(59, 15); + NameLabel.TabIndex = 0; + NameLabel.Text = "Название"; + // + // PriceLabel + // + PriceLabel.AutoSize = true; + PriceLabel.Location = new Point(12, 35); + PriceLabel.Name = "PriceLabel"; + PriceLabel.Size = new Size(35, 15); + PriceLabel.TabIndex = 1; + PriceLabel.Text = "Цена"; + // + // NameTextBox + // + NameTextBox.Location = new Point(77, 6); + NameTextBox.Name = "NameTextBox"; + NameTextBox.Size = new Size(237, 23); + NameTextBox.TabIndex = 2; + // + // PriceTextBox + // + PriceTextBox.Location = new Point(77, 32); + PriceTextBox.Name = "PriceTextBox"; + PriceTextBox.ReadOnly = true; + PriceTextBox.Size = new Size(100, 23); + PriceTextBox.TabIndex = 3; + // + // ComponentsGroupBox + // + ComponentsGroupBox.Controls.Add(RefreshButton); + ComponentsGroupBox.Controls.Add(DeleteButton); + ComponentsGroupBox.Controls.Add(UpdateButton); + ComponentsGroupBox.Controls.Add(AddButton); + ComponentsGroupBox.Controls.Add(DataGridView); + ComponentsGroupBox.Location = new Point(12, 64); + ComponentsGroupBox.Name = "ComponentsGroupBox"; + ComponentsGroupBox.Size = new Size(582, 287); + ComponentsGroupBox.TabIndex = 4; + ComponentsGroupBox.TabStop = false; + ComponentsGroupBox.Text = "Компоненты"; + // + // RefreshButton + // + RefreshButton.Location = new Point(481, 109); + RefreshButton.Name = "RefreshButton"; + RefreshButton.Size = new Size(75, 23); + RefreshButton.TabIndex = 4; + RefreshButton.Text = "Обновить"; + RefreshButton.UseVisualStyleBackColor = true; + RefreshButton.Click += RefreshButton_Click; + // + // DeleteButton + // + DeleteButton.Location = new Point(481, 80); + DeleteButton.Name = "DeleteButton"; + DeleteButton.Size = new Size(75, 23); + DeleteButton.TabIndex = 3; + DeleteButton.Text = "Удалить"; + DeleteButton.UseVisualStyleBackColor = true; + DeleteButton.Click += DeleteButton_Click; + // + // UpdateButton + // + UpdateButton.Location = new Point(481, 51); + UpdateButton.Name = "UpdateButton"; + UpdateButton.Size = new Size(75, 23); + UpdateButton.TabIndex = 2; + UpdateButton.Text = "Изменить"; + UpdateButton.UseVisualStyleBackColor = true; + UpdateButton.Click += UpdateButton_Click; + // + // AddButton + // + AddButton.Location = new Point(481, 22); + AddButton.Name = "AddButton"; + AddButton.Size = new Size(75, 23); + AddButton.TabIndex = 1; + AddButton.Text = "Добавить"; + AddButton.UseVisualStyleBackColor = true; + AddButton.Click += AddButton_Click; + // + // DataGridView + // + DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + DataGridView.Columns.AddRange(new DataGridViewColumn[] { IdColumn, ComponentNameColumn, CountColumn }); + DataGridView.Location = new Point(6, 22); + DataGridView.Name = "DataGridView"; + DataGridView.RowHeadersWidth = 51; + DataGridView.Size = new Size(442, 259); + DataGridView.TabIndex = 0; + // + // IdColumn + // + IdColumn.HeaderText = "Column1"; + IdColumn.MinimumWidth = 6; + IdColumn.Name = "IdColumn"; + IdColumn.Visible = false; + IdColumn.Width = 6; + // + // ComponentNameColumn + // + ComponentNameColumn.HeaderText = "Компонент"; + ComponentNameColumn.MinimumWidth = 6; + ComponentNameColumn.Name = "ComponentNameColumn"; + ComponentNameColumn.Width = 300; + // + // CountColumn + // + CountColumn.HeaderText = "Количество"; + CountColumn.MinimumWidth = 6; + CountColumn.Name = "CountColumn"; + CountColumn.Width = 125; + // + // SaveButton + // + SaveButton.Location = new Point(438, 363); + SaveButton.Name = "SaveButton"; + SaveButton.Size = new Size(75, 23); + SaveButton.TabIndex = 5; + SaveButton.Text = "Сохранить"; + SaveButton.UseVisualStyleBackColor = true; + SaveButton.Click += SaveButton_Click; + // + // CancelButton + // + CancelButton.Location = new Point(519, 363); + CancelButton.Name = "CancelButton"; + CancelButton.Size = new Size(75, 23); + CancelButton.TabIndex = 6; + CancelButton.Text = "Отмена"; + CancelButton.UseVisualStyleBackColor = true; + // + // FormRepair + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(606, 398); + Controls.Add(CancelButton); + Controls.Add(SaveButton); + Controls.Add(ComponentsGroupBox); + Controls.Add(PriceTextBox); + Controls.Add(NameTextBox); + Controls.Add(PriceLabel); + Controls.Add(NameLabel); + Name = "FormRepair"; + Text = "Ремонт"; + Load += FormRepair_Load; + ComponentsGroupBox.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)DataGridView).EndInit(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label NameLabel; + private Label PriceLabel; + private TextBox NameTextBox; + private TextBox PriceTextBox; + private GroupBox ComponentsGroupBox; + private Button RefreshButton; + private Button DeleteButton; + private Button UpdateButton; + private Button AddButton; + private DataGridView DataGridView; + private DataGridViewTextBoxColumn IdColumn; + private DataGridViewTextBoxColumn ComponentNameColumn; + private DataGridViewTextBoxColumn CountColumn; + private Button SaveButton; + private Button CancelButton; + } +} \ No newline at end of file diff --git a/AutoWorkshop/Forms/FormRepair.cs b/AutoWorkshop/Forms/FormRepair.cs new file mode 100644 index 0000000..422ec24 --- /dev/null +++ b/AutoWorkshop/Forms/FormRepair.cs @@ -0,0 +1,237 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.BusinessLogicContracts; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopDataModels.Models; +using Microsoft.Extensions.Logging; + +namespace AutoWorkshopView.Forms +{ + public partial class FormRepair : Form + { + private readonly ILogger _logger; + + private readonly IRepairLogic _logic; + + private int? _id; + + private Dictionary _repairComponents; + + public int Id { set { _id = value; } } + + public FormRepair(ILogger Logger, IRepairLogic Logic) + { + InitializeComponent(); + _logger = Logger; + _logic = Logic; + _repairComponents = new Dictionary(); + } + + private void FormRepair_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + _logger.LogInformation("Загрузка ремонта"); + + try + { + var View = _logic.ReadElement(new RepairSearchModel + { + Id = _id.Value + }); + + if (View != null) + { + NameTextBox.Text = View.RepairName; + PriceTextBox.Text = View.Price.ToString(); + + _repairComponents = View.RepairComponents ?? new Dictionary(); + LoadData(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки ремонта"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void LoadData() + { + _logger.LogInformation("Загрузка компонентов ремонта"); + + try + { + if (_repairComponents != null) + { + DataGridView.Rows.Clear(); + foreach (var Comp in _repairComponents) + { + DataGridView.Rows.Add(new object[] { Comp.Key, Comp.Value.Item1.ComponentName, Comp.Value.Item2 }); + } + + PriceTextBox.Text = CalcPrice().ToString(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки компонентов ремонта"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void AddButton_Click(object sender, EventArgs e) + { + var Service = Program.ServiceProvider?.GetService(typeof(FormRepairComponent)); + + if (Service is FormRepairComponent Form) + { + if (Form.ShowDialog() == DialogResult.OK) + { + if (Form.ComponentModel == null) + { + return; + } + + _logger.LogInformation("Добавление нового компонента: {ComponentName} - {Count}", Form.ComponentModel.ComponentName, Form.Count); + + if (_repairComponents.ContainsKey(Form.Id)) + { + _repairComponents[Form.Id] = (Form.ComponentModel, + Form.Count); + } + else + { + _repairComponents.Add(Form.Id, (Form.ComponentModel, + Form.Count)); + } + + LoadData(); + } + } + } + + private void UpdateButton_Click(object sender, EventArgs e) + { + if (DataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormRepairComponent)); + if (service is FormRepairComponent Form) + { + int id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells[0].Value); + Form.Id = id; + Form.Count = _repairComponents[id].Item2; + + if (Form.ShowDialog() == DialogResult.OK) + { + if (Form.ComponentModel == null) + { + return; + } + + _logger.LogInformation("Изменение компонента: {ComponentName} - {Count}", Form.ComponentModel.ComponentName, Form.Count); + _repairComponents[Form.Id] = (Form.ComponentModel, Form.Count); + + LoadData(); + } + } + } + } + + private void DeleteButton_Click(object sender, EventArgs e) + { + if (DataGridView.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + try + { + _logger.LogInformation("Удаление компонента: {ComponentName} - {Count}", DataGridView.SelectedRows[0].Cells[1].Value); + + _repairComponents?.Remove(Convert.ToInt32(DataGridView.SelectedRows[0].Cells[0].Value)); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + + LoadData(); + } + } + } + + private void RefreshButton_Click(object sender, EventArgs e) + { + LoadData(); + } + + private void SaveButton_Click(object sender, EventArgs e) + { + + if (string.IsNullOrEmpty(NameTextBox.Text)) + { + MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + if (string.IsNullOrEmpty(PriceTextBox.Text)) + { + MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + if (_repairComponents == null || _repairComponents.Count == 0) + { + MessageBox.Show("Заполните компоненты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + _logger.LogInformation("Сохранение ремонта"); + + try + { + var Мodel = new RepairBindingModel + { + Id = _id ?? 0, + RepairName = NameTextBox.Text, + Price = Convert.ToDouble(PriceTextBox.Text), + RepairComponents = _repairComponents + }; + + var OperationResult = _id.HasValue ? _logic.Update(Мodel) : _logic.Create(Мodel); + + 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 _repairComponents) + { + Price += ((Elem.Value.Item1?.Cost ?? 0) * Elem.Value.Item2); + } + + return Math.Round(Price * 1.1, 2); + } + } +} diff --git a/AutoWorkshop/Forms/FormRepair.resx b/AutoWorkshop/Forms/FormRepair.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/AutoWorkshop/Forms/FormRepair.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/AutoWorkshop/Forms/FormRepairComponent.Designer.cs b/AutoWorkshop/Forms/FormRepairComponent.Designer.cs new file mode 100644 index 0000000..360d6c1 --- /dev/null +++ b/AutoWorkshop/Forms/FormRepairComponent.Designer.cs @@ -0,0 +1,118 @@ +namespace AutoWorkshopView.Forms +{ + partial class FormRepairComponent + { + /// + /// 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() + { + ComponentLabel = new Label(); + CountLabel = new Label(); + CountTextBox = new TextBox(); + ComboBox = new ComboBox(); + SaveButton = new Button(); + CancelButton = new Button(); + SuspendLayout(); + // + // ComponentLabel + // + ComponentLabel.AutoSize = true; + ComponentLabel.Location = new Point(14, 15); + ComponentLabel.Name = "ComponentLabel"; + ComponentLabel.Size = new Size(72, 15); + ComponentLabel.TabIndex = 0; + ComponentLabel.Text = "Компонент:"; + // + // CountLabel + // + CountLabel.AutoSize = true; + CountLabel.Location = new Point(14, 46); + CountLabel.Name = "CountLabel"; + CountLabel.Size = new Size(75, 15); + CountLabel.TabIndex = 1; + CountLabel.Text = "Количество:"; + // + // CountTextBox + // + CountTextBox.Location = new Point(95, 43); + CountTextBox.Name = "CountTextBox"; + CountTextBox.Size = new Size(292, 23); + CountTextBox.TabIndex = 2; + // + // ComboBox + // + ComboBox.FormattingEnabled = true; + ComboBox.Location = new Point(95, 12); + ComboBox.Name = "ComboBox"; + ComboBox.Size = new Size(292, 23); + ComboBox.TabIndex = 3; + // + // SaveButton + // + SaveButton.Location = new Point(231, 81); + SaveButton.Name = "SaveButton"; + SaveButton.Size = new Size(75, 23); + SaveButton.TabIndex = 4; + SaveButton.Text = "Сохранить"; + SaveButton.UseVisualStyleBackColor = true; + SaveButton.Click += ButtonSave_Click; + // + // CancelButton + // + CancelButton.Location = new Point(312, 81); + CancelButton.Name = "CancelButton"; + CancelButton.Size = new Size(75, 23); + CancelButton.TabIndex = 5; + CancelButton.Text = "Отмена"; + CancelButton.UseVisualStyleBackColor = true; + CancelButton.Click += ButtonCancel_Click; + // + // FormRepairComponent + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(407, 120); + Controls.Add(CancelButton); + Controls.Add(SaveButton); + Controls.Add(ComboBox); + Controls.Add(CountTextBox); + Controls.Add(CountLabel); + Controls.Add(ComponentLabel); + Name = "FormRepairComponent"; + Text = "Компонент ремонта"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label ComponentLabel; + private Label CountLabel; + private TextBox CountTextBox; + private ComboBox ComboBox; + private Button SaveButton; + private Button CancelButton; + } +} diff --git a/AutoWorkshop/Forms/FormRepairComponent.cs b/AutoWorkshop/Forms/FormRepairComponent.cs new file mode 100644 index 0000000..97bc27c --- /dev/null +++ b/AutoWorkshop/Forms/FormRepairComponent.cs @@ -0,0 +1,89 @@ +using AutoWorkshopContracts.BusinessLogicContracts; +using AutoWorkshopContracts.ViewModels; +using AutoWorkshopDataModels.Models; + +namespace AutoWorkshopView.Forms +{ + public partial class FormRepairComponent : Form + { + private readonly List? _list; + + public int Id + { + get + { + return Convert.ToInt32(ComboBox.SelectedValue); + } + set + { + ComboBox.SelectedValue = value; + } + } + + public IComponentModel? ComponentModel + { + get + { + if (_list == null) + { + return null; + } + + foreach (var Elem in _list) + { + if (Elem.Id == Id) + { + return Elem; + } + } + + return null; + } + } + + public int Count + { + get { return Convert.ToInt32(CountTextBox.Text); } + set { CountTextBox.Text = value.ToString(); } + } + + public FormRepairComponent(IComponentLogic Logic) + { + InitializeComponent(); + + _list = Logic.ReadList(null); + + if (_list != null) + { + ComboBox.DisplayMember = "ComponentName"; + ComboBox.ValueMember = "Id"; + ComboBox.DataSource = _list; + ComboBox.SelectedItem = null; + } + } + + private void ButtonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(CountTextBox.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + if (ComboBox.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/AutoWorkshop/Forms/FormRepairComponent.resx b/AutoWorkshop/Forms/FormRepairComponent.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/AutoWorkshop/Forms/FormRepairComponent.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/AutoWorkshop/Forms/FormRepairs.Designer.cs b/AutoWorkshop/Forms/FormRepairs.Designer.cs new file mode 100644 index 0000000..d530879 --- /dev/null +++ b/AutoWorkshop/Forms/FormRepairs.Designer.cs @@ -0,0 +1,113 @@ +namespace AutoWorkshopView.Forms +{ + partial class FormRepairs + { + /// + /// 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() + { + DataGridView = new DataGridView(); + AddButton = new Button(); + UpdateButton = new Button(); + DeleteButton = new Button(); + RefreshButton = new Button(); + ((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit(); + SuspendLayout(); + // + // DataGridView + // + DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + DataGridView.Location = new Point(12, 12); + DataGridView.Name = "DataGridView"; + DataGridView.RowHeadersWidth = 51; + DataGridView.Size = new Size(379, 426); + DataGridView.TabIndex = 0; + // + // AddButton + // + AddButton.Location = new Point(397, 12); + AddButton.Name = "AddButton"; + AddButton.Size = new Size(148, 29); + AddButton.TabIndex = 1; + AddButton.Text = "Добавить"; + AddButton.UseVisualStyleBackColor = true; + AddButton.Click += AddButton_Click; + // + // UpdateButton + // + UpdateButton.Location = new Point(397, 47); + UpdateButton.Name = "UpdateButton"; + UpdateButton.Size = new Size(148, 29); + UpdateButton.TabIndex = 2; + UpdateButton.Text = "Изменить"; + UpdateButton.UseVisualStyleBackColor = true; + UpdateButton.Click += UpdateButton_Click; + // + // DeleteButton + // + DeleteButton.Location = new Point(397, 82); + DeleteButton.Name = "DeleteButton"; + DeleteButton.Size = new Size(148, 29); + DeleteButton.TabIndex = 3; + DeleteButton.Text = "Удалить"; + DeleteButton.UseVisualStyleBackColor = true; + DeleteButton.Click += DeleteButton_Click; + // + // RefreshButton + // + RefreshButton.Location = new Point(397, 117); + RefreshButton.Name = "RefreshButton"; + RefreshButton.Size = new Size(148, 29); + RefreshButton.TabIndex = 4; + RefreshButton.Text = "Обновить"; + RefreshButton.UseVisualStyleBackColor = true; + RefreshButton.Click += RefreshButton_Click; + // + // FormRepairs + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(557, 450); + Controls.Add(RefreshButton); + Controls.Add(DeleteButton); + Controls.Add(UpdateButton); + Controls.Add(AddButton); + Controls.Add(DataGridView); + Name = "FormRepairs"; + Text = "FormRepairs"; + Load += FormRepairs_Load; + ((System.ComponentModel.ISupportInitialize)DataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView DataGridView; + private Button AddButton; + private Button UpdateButton; + private Button DeleteButton; + private Button RefreshButton; + } +} \ No newline at end of file diff --git a/AutoWorkshop/Forms/FormRepairs.cs b/AutoWorkshop/Forms/FormRepairs.cs new file mode 100644 index 0000000..1032f63 --- /dev/null +++ b/AutoWorkshop/Forms/FormRepairs.cs @@ -0,0 +1,114 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.BusinessLogicContracts; +using Microsoft.Extensions.Logging; + +namespace AutoWorkshopView.Forms +{ + public partial class FormRepairs : Form + { + private readonly ILogger _logger; + private readonly IRepairLogic _logic; + + public FormRepairs(ILogger Logger, IRepairLogic Logic) + { + InitializeComponent(); + + _logger = Logger; + _logic = Logic; + } + + private void FormRepairs_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["RepairName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + DataGridView.Columns["RepairComponents"].Visible = false; + } + + _logger.LogInformation("Загрузка ремонта"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки ремонта"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void AddButton_Click(object sender, EventArgs e) + { + var Service = Program.ServiceProvider?.GetService(typeof(FormRepair)); + + if (Service is FormRepair Form) + { + if (Form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + + private void UpdateButton_Click(object sender, EventArgs e) + { + if (DataGridView.SelectedRows.Count == 1) + { + var Service = Program.ServiceProvider?.GetService(typeof(FormRepair)); + + if (Service is FormRepair Form) + { + var Temp = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value); + Form.Id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value); + + if (Form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + + private void DeleteButton_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 RepairBindingModel + { + Id = id + })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка удаления ремонта"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + + private void RefreshButton_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/AutoWorkshop/MainForm.Designer.cs b/AutoWorkshop/MainForm.Designer.cs new file mode 100644 index 0000000..ff58bb9 --- /dev/null +++ b/AutoWorkshop/MainForm.Designer.cs @@ -0,0 +1,179 @@ +namespace AutoWorkshopView +{ + partial class MainForm + { + /// + /// 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() + { + MenuStrip = new MenuStrip(); + ToolStripMenu = new ToolStripMenuItem(); + ComponentsStripMenuItem = new ToolStripMenuItem(); + RepairStripMenuItem = new ToolStripMenuItem(); + DataGridView = new DataGridView(); + CreateOrderButton = new Button(); + TakeInWorkButton = new Button(); + ReadyButton = new Button(); + IssuedButton = new Button(); + RefreshButton = new Button(); + MenuStrip.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit(); + SuspendLayout(); + // + // MenuStrip + // + MenuStrip.ImageScalingSize = new Size(20, 20); + MenuStrip.Items.AddRange(new ToolStripItem[] { ToolStripMenu }); + MenuStrip.Location = new Point(0, 0); + MenuStrip.Name = "MenuStrip"; + MenuStrip.Padding = new Padding(5, 2, 0, 2); + MenuStrip.Size = new Size(1134, 24); + MenuStrip.TabIndex = 0; + MenuStrip.Text = "menuStrip1"; + // + // ToolStripMenu + // + ToolStripMenu.DropDownItems.AddRange(new ToolStripItem[] { ComponentsStripMenuItem, RepairStripMenuItem }); + ToolStripMenu.Name = "ToolStripMenu"; + ToolStripMenu.Size = new Size(94, 20); + ToolStripMenu.Text = "Справочники"; + // + // ComponentsStripMenuItem + // + ComponentsStripMenuItem.Name = "ComponentsStripMenuItem"; + ComponentsStripMenuItem.Size = new Size(180, 22); + ComponentsStripMenuItem.Text = "Компоненты"; + ComponentsStripMenuItem.Click += КомпонентыStripMenuItem_Click; + // + // RepairStripMenuItem + // + RepairStripMenuItem.Name = "RepairStripMenuItem"; + RepairStripMenuItem.Size = new Size(180, 22); + RepairStripMenuItem.Text = "Ремонты"; + RepairStripMenuItem.Click += МороженноеStripMenuItem_Click; + // + // DataGridView + // + DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + DataGridView.Location = new Point(10, 23); + DataGridView.Margin = new Padding(3, 2, 3, 2); + DataGridView.Name = "DataGridView"; + DataGridView.RowHeadersWidth = 51; + DataGridView.Size = new Size(881, 305); + DataGridView.TabIndex = 1; + // + // CreateOrderButton + // + CreateOrderButton.Location = new Point(897, 23); + CreateOrderButton.Margin = new Padding(3, 2, 3, 2); + CreateOrderButton.Name = "CreateOrderButton"; + CreateOrderButton.Size = new Size(227, 30); + CreateOrderButton.TabIndex = 2; + CreateOrderButton.Text = "Создать заказ"; + CreateOrderButton.UseVisualStyleBackColor = true; + CreateOrderButton.Click += CreateOrderButton_Click; + // + // TakeInWorkButton + // + TakeInWorkButton.Location = new Point(897, 57); + TakeInWorkButton.Margin = new Padding(3, 2, 3, 2); + TakeInWorkButton.Name = "TakeInWorkButton"; + TakeInWorkButton.Size = new Size(227, 30); + TakeInWorkButton.TabIndex = 3; + TakeInWorkButton.Text = "Отдать заказ в работу"; + TakeInWorkButton.UseVisualStyleBackColor = true; + TakeInWorkButton.Click += TakeInWorkButton_Click; + // + // ReadyButton + // + ReadyButton.Location = new Point(897, 91); + ReadyButton.Margin = new Padding(3, 2, 3, 2); + ReadyButton.Name = "ReadyButton"; + ReadyButton.Size = new Size(227, 30); + ReadyButton.TabIndex = 4; + ReadyButton.Text = "Заказ готов"; + ReadyButton.UseVisualStyleBackColor = true; + ReadyButton.Click += ReadyButton_Click; + // + // IssuedButton + // + IssuedButton.Location = new Point(897, 125); + IssuedButton.Margin = new Padding(3, 2, 3, 2); + IssuedButton.Name = "IssuedButton"; + IssuedButton.Size = new Size(227, 30); + IssuedButton.TabIndex = 5; + IssuedButton.Text = "Заказ выдан"; + IssuedButton.UseVisualStyleBackColor = true; + IssuedButton.Click += IssuedButton_Click; + // + // RefreshButton + // + RefreshButton.Location = new Point(897, 159); + RefreshButton.Margin = new Padding(3, 2, 3, 2); + RefreshButton.Name = "RefreshButton"; + RefreshButton.Size = new Size(227, 30); + RefreshButton.TabIndex = 6; + RefreshButton.Text = "Обновить"; + RefreshButton.UseVisualStyleBackColor = true; + RefreshButton.Click += RefreshButton_Click; + // + // MainForm + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1134, 338); + Controls.Add(RefreshButton); + Controls.Add(IssuedButton); + Controls.Add(ReadyButton); + Controls.Add(TakeInWorkButton); + Controls.Add(CreateOrderButton); + Controls.Add(DataGridView); + Controls.Add(MenuStrip); + MainMenuStrip = MenuStrip; + Margin = new Padding(3, 2, 3, 2); + Name = "MainForm"; + Text = "MainForm"; + Load += MainForm_Load; + MenuStrip.ResumeLayout(false); + MenuStrip.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)DataGridView).EndInit(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private MenuStrip MenuStrip; + private ToolStripMenuItem ToolStripMenu; + private ToolStripMenuItem ComponentsStripMenuItem; + private ToolStripMenuItem RepairStripMenuItem; + private DataGridView DataGridView; + private Button CreateOrderButton; + private Button TakeInWorkButton; + private Button ReadyButton; + private Button IssuedButton; + private Button RefreshButton; + } +} \ No newline at end of file diff --git a/AutoWorkshop/MainForm.cs b/AutoWorkshop/MainForm.cs new file mode 100644 index 0000000..0df3bc2 --- /dev/null +++ b/AutoWorkshop/MainForm.cs @@ -0,0 +1,182 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.BusinessLogicContracts; +using AutoWorkshopDataModels.Enums; +using AutoWorkshopView.Forms; +using Microsoft.Extensions.Logging; + +namespace AutoWorkshopView +{ + public partial class MainForm : Form + { + private readonly ILogger _logger; + private readonly IOrderLogic _orderLogic; + public MainForm(ILogger Logger, IOrderLogic OrderLogic) + { + InitializeComponent(); + + _logger = Logger; + _orderLogic = OrderLogic; + } + + private void КомпонентыStripMenuItem_Click(object sender, EventArgs e) + { + var Service = Program.ServiceProvider?.GetService(typeof(FormComponents)); + + if (Service is FormComponents Form) + { + Form.ShowDialog(); + } + } + + private void MainForm_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["RepairId"].Visible = false; + DataGridView.Columns["RepairName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + + _logger.LogInformation("Загрузка заказов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки заказов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void МороженноеStripMenuItem_Click(object sender, EventArgs e) + { + var Service = Program.ServiceProvider?.GetService(typeof(FormRepairs)); + + if (Service is FormRepairs Form) + { + Form.ShowDialog(); + } + } + + private void CreateOrderButton_Click(object sender, EventArgs e) + { + var Service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); + + if (Service is FormCreateOrder Form) + { + Form.ShowDialog(); + LoadData(); + } + } + + private OrderBindingModel CreateBindingModel(int id, bool isDone = false) + { + return new OrderBindingModel + { + Id = id, + RepairId = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["RepairId"].Value), + Status = Enum.Parse(DataGridView.SelectedRows[0].Cells["Status"].Value.ToString()), + Count = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Count"].Value), + Sum = double.Parse(DataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()), + DateCreate = DateTime.Parse(DataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()), + }; + } + + private void TakeInWorkButton_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(CreateBindingModel(id)); + + if (!OperationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка передачи заказа в работу"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + } + + private void ReadyButton_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(CreateBindingModel(id)); + + if (!OperationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о готовности заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void IssuedButton_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(CreateBindingModel(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 RefreshButton_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/AutoWorkshop/MainForm.resx b/AutoWorkshop/MainForm.resx new file mode 100644 index 0000000..cae68fc --- /dev/null +++ b/AutoWorkshop/MainForm.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/AutoWorkshop/Program.cs b/AutoWorkshop/Program.cs new file mode 100644 index 0000000..60e854b --- /dev/null +++ b/AutoWorkshop/Program.cs @@ -0,0 +1,52 @@ +using AutoWorkshopBusinessLogic.BusinessLogics; +using AutoWorkshopContracts.BusinessLogicContracts; +using AutoWorkshopContracts.StoragesContracts; +using AutoWorkshopListImplement.Implements; +using AutoWorkshopView.Forms; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using NLog.Extensions.Logging; + +namespace AutoWorkshopView +{ + internal static class Program + { + private static ServiceProvider? _serviceProvider; + public static ServiceProvider? ServiceProvider => _serviceProvider; + + [STAThread] + static void Main() + { + ApplicationConfiguration.Initialize(); + + 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(); + } + } +} diff --git a/AutoWorkshopBusinessLogic/AutoWorkshopBusinessLogic.csproj b/AutoWorkshopBusinessLogic/AutoWorkshopBusinessLogic.csproj new file mode 100644 index 0000000..8483a93 --- /dev/null +++ b/AutoWorkshopBusinessLogic/AutoWorkshopBusinessLogic.csproj @@ -0,0 +1,17 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + diff --git a/AutoWorkshopBusinessLogic/BusinessLogics/ComponentLogic.cs b/AutoWorkshopBusinessLogic/BusinessLogics/ComponentLogic.cs new file mode 100644 index 0000000..71539e0 --- /dev/null +++ b/AutoWorkshopBusinessLogic/BusinessLogics/ComponentLogic.cs @@ -0,0 +1,125 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.BusinessLogicContracts; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.StoragesContracts; +using AutoWorkshopContracts.ViewModels; +using Microsoft.Extensions.Logging; + +namespace AutoWorkshopBusinessLogic.BusinessLogics +{ + public class ComponentLogic : IComponentLogic + { + private readonly ILogger _logger; + + private readonly IComponentStorage _componentStorage; + + public ComponentLogic(ILogger Logger, IComponentStorage ComponentStorage) + { + _logger = Logger; + _componentStorage = ComponentStorage; + } + + public List? ReadList(ComponentSearchModel? Model) + { + _logger.LogInformation("ReadList. ComponentName:{ComponentName}. Id:{Id}", + Model?.ComponentName, Model?.Id); + + var List = Model is null ? _componentStorage.GetFullList() : _componentStorage.GetFilteredList(Model); + + if (List is null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + + _logger.LogInformation("ReadList. Count:{Count}", List.Count); + return List; + } + + public ComponentViewModel? ReadElement(ComponentSearchModel? Model) + { + if (Model is null) + throw new ArgumentNullException(nameof(Model)); + + _logger.LogInformation("ReadElement. ComponentName:{ComponentName}. Id:{Id}", + Model.ComponentName, Model.Id); + + var Element = _componentStorage.GetElement(Model); + + if (Element is null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + + _logger.LogInformation("ReadElement element found. Id:{Id}", Element.Id); + return Element; + } + + public bool Create(ComponentBindingModel Model) + { + CheckModel(Model); + + if (_componentStorage.Insert(Model) is null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + + return true; + } + + public bool Update(ComponentBindingModel Model) + { + CheckModel(Model); + + if (_componentStorage.Update(Model) is null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + + return true; + } + + public bool Delete(ComponentBindingModel Model) + { + CheckModel(Model); + _logger.LogInformation("Delete. Id:{Id}", Model.Id); + + if (_componentStorage.Delete(Model) is null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + + return true; + } + + private void CheckModel(ComponentBindingModel Model, bool WithParams = true) + { + if (Model == null) + throw new ArgumentNullException(nameof(Model)); + + if (!WithParams) + return; + + if (string.IsNullOrEmpty(Model.ComponentName)) + throw new ArgumentNullException("Нет названия компонента", nameof(Model.ComponentName)); + + if (Model.Cost <= 0) + throw new ArgumentNullException("Цена компонента должна быть больше 0", nameof(Model.Cost)); + + _logger.LogInformation("Repair. ComponentName:{ComponentName}. Cost:{Cost}. Id:{Id}", + Model.ComponentName, Model.Cost, Model.Id); + + var Element = _componentStorage.GetElement(new ComponentSearchModel + { + ComponentName = Model.ComponentName + }); + + if (Element != null && Element.Id != Model.Id) + throw new InvalidOperationException("Компонент с таким названием уже есть"); + } + } +} diff --git a/AutoWorkshopBusinessLogic/BusinessLogics/OrderLogic.cs b/AutoWorkshopBusinessLogic/BusinessLogics/OrderLogic.cs new file mode 100644 index 0000000..9e5cf5a --- /dev/null +++ b/AutoWorkshopBusinessLogic/BusinessLogics/OrderLogic.cs @@ -0,0 +1,148 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.BusinessLogicContracts; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.StoragesContracts; +using AutoWorkshopContracts.ViewModels; +using AutoWorkshopDataModels.Enums; +using Microsoft.Extensions.Logging; + +namespace AutoWorkshopBusinessLogic.BusinessLogics +{ + 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 is null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(Model); + + if (List is 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 (_orderStorage.Insert(Model) is null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + + return true; + } + + public bool TakeOrderInWork(OrderBindingModel Model) + { + CheckModel(Model); + + var Element = _orderStorage.GetElement(new OrderSearchModel + { + Id = Model.Id + }); + + if (Element is null) + throw new InvalidOperationException("Заказ с таким идентификатором не существует"); + + Element.Status = OrderStatus.Accepted; + + if (_orderStorage.Update(Model) is null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + + return true; + } + + public bool FinishOrder(OrderBindingModel Model) + { + CheckModel(Model); + + var Element = _orderStorage.GetElement(new OrderSearchModel + { + Id = Model.Id + }); + + if (Element is null) + throw new InvalidOperationException("Заказ с таким идентификатором не существует"); + + if (Element.Status != OrderStatus.BeingProcessed) + { + _logger.LogWarning("FinishOrder. Invalid status"); + return false; + } + + if (_orderStorage.Update(Model) is null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + + return true; + } + + public bool DeliveryOrder(OrderBindingModel Model) + { + CheckModel(Model); + + var Element = _orderStorage.GetElement(new OrderSearchModel + { + Id = Model.Id + }); + + if (Element is null) + throw new InvalidOperationException("Заказ с таким идентификатором не существует"); + + if (Element.Status != OrderStatus.Ready) + { + _logger.LogWarning("DeliveryOrder. Invalid status"); + return false; + } + + if (_orderStorage.Update(Model) is null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + + return true; + } + + 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)); + + _logger.LogInformation("Order. RepairId:{RepairId}. Count:{Count}. Sum:{Sum}. " + + "Status:{Status}. DateCreate:{DateCreate}. DateImplement:{DateImplement}. Id: {Id}", + Model.RepairId, Model.Count, Model.Sum, Model.Status, Model.DateCreate, + Model.DateImplement, Model.Id); + } + } +} diff --git a/AutoWorkshopBusinessLogic/BusinessLogics/RepairLogic.cs b/AutoWorkshopBusinessLogic/BusinessLogics/RepairLogic.cs new file mode 100644 index 0000000..82ec2cf --- /dev/null +++ b/AutoWorkshopBusinessLogic/BusinessLogics/RepairLogic.cs @@ -0,0 +1,125 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.BusinessLogicContracts; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.StoragesContracts; +using AutoWorkshopContracts.ViewModels; +using Microsoft.Extensions.Logging; + +namespace AutoWorkshopBusinessLogic.BusinessLogics +{ + public class RepairLogic : IRepairLogic + { + private readonly ILogger _logger; + + private readonly IRepairStorage _repairStorage; + + public RepairLogic(ILogger Logger, IRepairStorage RepairStorage) + { + _logger = Logger; + _repairStorage = RepairStorage; + } + + public List? ReadList(RepairSearchModel? Model) + { + _logger.LogInformation("ReadList. RepairName:{RepairName}. Id:{Id}", + Model?.RepairName, Model?.Id); + + var List = Model is null ? _repairStorage.GetFullList() : _repairStorage.GetFilteredList(Model); + + if (List is null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + + _logger.LogInformation("ReadList. Count:{Count}", List.Count); + return List; + } + + public RepairViewModel? ReadElement(RepairSearchModel? Model) + { + if (Model is null) + throw new ArgumentNullException(nameof(Model)); + + _logger.LogInformation("ReadElement. RepairName:{RepairName}. Id:{Id}", + Model.RepairName, Model.Id); + + var Element = _repairStorage.GetElement(Model); + + if (Element is null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + + _logger.LogInformation("ReadElement element found. Id:{Id}", Element.Id); + return Element; + } + + public bool Create(RepairBindingModel Model) + { + CheckModel(Model); + + if (_repairStorage.Insert(Model) is null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + + return true; + } + + public bool Update(RepairBindingModel Model) + { + CheckModel(Model); + + if (_repairStorage.Update(Model) is null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + + return true; + } + + public bool Delete(RepairBindingModel Model) + { + CheckModel(Model); + _logger.LogInformation("Delete. Id:{Id}", Model.Id); + + if (_repairStorage.Delete(Model) is null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + + return true; + } + + private void CheckModel(RepairBindingModel Model, bool WithParams = true) + { + if (Model == null) + throw new ArgumentNullException(nameof(Model)); + + if (!WithParams) + return; + + if (string.IsNullOrEmpty(Model.RepairName)) + throw new ArgumentNullException("Нет названия ремонта", nameof(Model.RepairName)); + + if (Model.Price <= 0) + throw new ArgumentNullException("Стоимость ремонта должна быть больше 0", nameof(Model.Price)); + + _logger.LogInformation("Repair. RepairName:{RepairName}. Price:{Price}. Id: {Id}", + Model.RepairName, Model.Price, Model.Id); + + var Element = _repairStorage.GetElement(new RepairSearchModel + { + RepairName = Model.RepairName + }); + + if (Element != null && Element.Id != Model.Id) + throw new InvalidOperationException("Ремонт с таким названием уже есть"); + } + } +} diff --git a/AutoWorkshopContracts/AutoWorkshopContracts.csproj b/AutoWorkshopContracts/AutoWorkshopContracts.csproj new file mode 100644 index 0000000..7c2e15c --- /dev/null +++ b/AutoWorkshopContracts/AutoWorkshopContracts.csproj @@ -0,0 +1,13 @@ + + + + net6.0 + enable + enable + + + + + + + diff --git a/AutoWorkshopContracts/BindingModels/ComponentBindingModel.cs b/AutoWorkshopContracts/BindingModels/ComponentBindingModel.cs new file mode 100644 index 0000000..082e049 --- /dev/null +++ b/AutoWorkshopContracts/BindingModels/ComponentBindingModel.cs @@ -0,0 +1,11 @@ +using AutoWorkshopDataModels.Models; + +namespace AutoWorkshopContracts.BindingModels +{ + public class ComponentBindingModel : IComponentModel + { + public int Id { get; set; } + public string ComponentName { get; set; } = string.Empty; + public double Cost { get; set; } + } +} diff --git a/AutoWorkshopContracts/BindingModels/OrderBindingModel.cs b/AutoWorkshopContracts/BindingModels/OrderBindingModel.cs new file mode 100644 index 0000000..88305f3 --- /dev/null +++ b/AutoWorkshopContracts/BindingModels/OrderBindingModel.cs @@ -0,0 +1,16 @@ +using AutoWorkshopDataModels.Models; +using AutoWorkshopDataModels.Enums; + +namespace AutoWorkshopContracts.BindingModels +{ + public class OrderBindingModel : IOrderModel + { + public int Id { get; set; } + public int RepairId { get; set; } + public int Count { get; set; } + public double Sum { get; set; } + public OrderStatus Status { get; set; } = OrderStatus.Undefined; + public DateTime DateCreate { get; set; } = DateTime.Now; + public DateTime? DateImplement { get; set; } + } +} diff --git a/AutoWorkshopContracts/BindingModels/ProductBindingModel.cs b/AutoWorkshopContracts/BindingModels/ProductBindingModel.cs new file mode 100644 index 0000000..cfb103f --- /dev/null +++ b/AutoWorkshopContracts/BindingModels/ProductBindingModel.cs @@ -0,0 +1,16 @@ +using AutoWorkshopDataModels.Models; + +namespace AutoWorkshopContracts.BindingModels +{ + public class RepairBindingModel : IRepairModel + { + public int Id { get; set; } + public string RepairName { get; set; } = string.Empty; + public double Price { get; set; } + public Dictionary RepairComponents + { + get; + set; + } = new(); + } +} diff --git a/AutoWorkshopContracts/BusinessLogicContracts/IComponentLogic.cs b/AutoWorkshopContracts/BusinessLogicContracts/IComponentLogic.cs new file mode 100644 index 0000000..a339671 --- /dev/null +++ b/AutoWorkshopContracts/BusinessLogicContracts/IComponentLogic.cs @@ -0,0 +1,15 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.ViewModels; + +namespace AutoWorkshopContracts.BusinessLogicContracts +{ + public interface IComponentLogic + { + List? ReadList(ComponentSearchModel? Model); + ComponentViewModel? ReadElement(ComponentSearchModel Model); + bool Create(ComponentBindingModel Model); + bool Update(ComponentBindingModel Model); + bool Delete(ComponentBindingModel Model); + } +} diff --git a/AutoWorkshopContracts/BusinessLogicContracts/IOrderLogic.cs b/AutoWorkshopContracts/BusinessLogicContracts/IOrderLogic.cs new file mode 100644 index 0000000..6c298b7 --- /dev/null +++ b/AutoWorkshopContracts/BusinessLogicContracts/IOrderLogic.cs @@ -0,0 +1,15 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.ViewModels; + +namespace AutoWorkshopContracts.BusinessLogicContracts +{ + 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/AutoWorkshopContracts/BusinessLogicContracts/IRepairLogic.cs b/AutoWorkshopContracts/BusinessLogicContracts/IRepairLogic.cs new file mode 100644 index 0000000..8476ff2 --- /dev/null +++ b/AutoWorkshopContracts/BusinessLogicContracts/IRepairLogic.cs @@ -0,0 +1,15 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.ViewModels; + +namespace AutoWorkshopContracts.BusinessLogicContracts +{ + public interface IRepairLogic + { + List? ReadList(RepairSearchModel? Model); + RepairViewModel? ReadElement(RepairSearchModel Model); + bool Create(RepairBindingModel Model); + bool Update(RepairBindingModel Model); + bool Delete(RepairBindingModel Model); + } +} diff --git a/AutoWorkshopContracts/SearchModels/ComponentSearchModel.cs b/AutoWorkshopContracts/SearchModels/ComponentSearchModel.cs new file mode 100644 index 0000000..2b35114 --- /dev/null +++ b/AutoWorkshopContracts/SearchModels/ComponentSearchModel.cs @@ -0,0 +1,8 @@ +namespace AutoWorkshopContracts.SearchModels +{ + public class ComponentSearchModel + { + public int? Id { get; set; } + public string? ComponentName { get; set; } + } +} diff --git a/AutoWorkshopContracts/SearchModels/OrderSearchModel.cs b/AutoWorkshopContracts/SearchModels/OrderSearchModel.cs new file mode 100644 index 0000000..a808eae --- /dev/null +++ b/AutoWorkshopContracts/SearchModels/OrderSearchModel.cs @@ -0,0 +1,7 @@ +namespace AutoWorkshopContracts.SearchModels +{ + public class OrderSearchModel + { + public int? Id { get; set; } + } +} diff --git a/AutoWorkshopContracts/SearchModels/RepairSearchModel.cs b/AutoWorkshopContracts/SearchModels/RepairSearchModel.cs new file mode 100644 index 0000000..de5d5d2 --- /dev/null +++ b/AutoWorkshopContracts/SearchModels/RepairSearchModel.cs @@ -0,0 +1,8 @@ +namespace AutoWorkshopContracts.SearchModels +{ + public class RepairSearchModel + { + public int? Id { get; set; } + public string? RepairName { get; set; } + } +} diff --git a/AutoWorkshopContracts/StoragesContracts/IComponentStorage.cs b/AutoWorkshopContracts/StoragesContracts/IComponentStorage.cs new file mode 100644 index 0000000..d4624c3 --- /dev/null +++ b/AutoWorkshopContracts/StoragesContracts/IComponentStorage.cs @@ -0,0 +1,16 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.ViewModels; + +namespace AutoWorkshopContracts.StoragesContracts +{ + public interface IComponentStorage + { + List GetFullList(); + List GetFilteredList(ComponentSearchModel Model); + ComponentViewModel? GetElement(ComponentSearchModel Model); + ComponentViewModel? Insert(ComponentBindingModel Model); + ComponentViewModel? Update(ComponentBindingModel Model); + ComponentViewModel? Delete(ComponentBindingModel Model); + } +} diff --git a/AutoWorkshopContracts/StoragesContracts/IOrderStorage.cs b/AutoWorkshopContracts/StoragesContracts/IOrderStorage.cs new file mode 100644 index 0000000..c5029ad --- /dev/null +++ b/AutoWorkshopContracts/StoragesContracts/IOrderStorage.cs @@ -0,0 +1,16 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.ViewModels; + +namespace AutoWorkshopContracts.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/AutoWorkshopContracts/StoragesContracts/IRepairStorage.cs b/AutoWorkshopContracts/StoragesContracts/IRepairStorage.cs new file mode 100644 index 0000000..6632a01 --- /dev/null +++ b/AutoWorkshopContracts/StoragesContracts/IRepairStorage.cs @@ -0,0 +1,16 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.ViewModels; + +namespace AutoWorkshopContracts.StoragesContracts +{ + public interface IRepairStorage + { + List GetFullList(); + List GetFilteredList(RepairSearchModel Model); + RepairViewModel? GetElement(RepairSearchModel Model); + RepairViewModel? Insert(RepairBindingModel Model); + RepairViewModel? Update(RepairBindingModel Model); + RepairViewModel? Delete(RepairBindingModel Model); + } +} diff --git a/AutoWorkshopContracts/ViewModels/ComponentViewModel.cs b/AutoWorkshopContracts/ViewModels/ComponentViewModel.cs new file mode 100644 index 0000000..6efe022 --- /dev/null +++ b/AutoWorkshopContracts/ViewModels/ComponentViewModel.cs @@ -0,0 +1,16 @@ +using AutoWorkshopDataModels.Models; +using System.ComponentModel; + +namespace AutoWorkshopContracts.ViewModels +{ + public class ComponentViewModel : IComponentModel + { + public int Id { get; set; } + [DisplayName("Название компонента")] + + public string ComponentName { get; set; } = string.Empty; + [DisplayName("Цена")] + + public double Cost { get; set; } + } +} diff --git a/AutoWorkshopContracts/ViewModels/OrderViewModel.cs b/AutoWorkshopContracts/ViewModels/OrderViewModel.cs new file mode 100644 index 0000000..1a4c4fe --- /dev/null +++ b/AutoWorkshopContracts/ViewModels/OrderViewModel.cs @@ -0,0 +1,32 @@ +using AutoWorkshopDataModels.Enums; +using AutoWorkshopDataModels.Models; +using System.ComponentModel; + +namespace AutoWorkshopContracts.ViewModels +{ + public class OrderViewModel : IOrderModel + { + [DisplayName("Номер")] + public int Id { get; set; } + + public int RepairId { get; set; } + + [DisplayName("Ремонт")] + public string RepairName { get; set; } = string.Empty; + + [DisplayName("Количество")] + public int Count { get; set; } + + [DisplayName("Сумма")] + public double Sum { get; set; } + + [DisplayName("Статус")] + public OrderStatus Status { get; set; } = OrderStatus.Undefined; + + [DisplayName("Дата создания")] + public DateTime DateCreate { get; set; } = DateTime.Now; + + [DisplayName("Дата выполнения")] + public DateTime? DateImplement { get; set; } + } +} diff --git a/AutoWorkshopContracts/ViewModels/RepairViewModel.cs b/AutoWorkshopContracts/ViewModels/RepairViewModel.cs new file mode 100644 index 0000000..5551506 --- /dev/null +++ b/AutoWorkshopContracts/ViewModels/RepairViewModel.cs @@ -0,0 +1,22 @@ +using AutoWorkshopDataModels.Models; +using System.ComponentModel; + +namespace AutoWorkshopContracts.ViewModels +{ + public class RepairViewModel : IRepairModel + { + public int Id { get; set; } + [DisplayName("Название изделия")] + + public string RepairName { get; set; } = string.Empty; + [DisplayName("Цена")] + + public double Price { get; set; } + + public Dictionary RepairComponents + { + get; + set; + } = new(); + } +} diff --git a/AutoWorkshopDataModels/AutoWorkshopDataModels.csproj b/AutoWorkshopDataModels/AutoWorkshopDataModels.csproj new file mode 100644 index 0000000..132c02c --- /dev/null +++ b/AutoWorkshopDataModels/AutoWorkshopDataModels.csproj @@ -0,0 +1,9 @@ + + + + net6.0 + enable + enable + + + diff --git a/AutoWorkshopDataModels/Enums/OrderStatus.cs b/AutoWorkshopDataModels/Enums/OrderStatus.cs new file mode 100644 index 0000000..6cddbbe --- /dev/null +++ b/AutoWorkshopDataModels/Enums/OrderStatus.cs @@ -0,0 +1,11 @@ +namespace AutoWorkshopDataModels.Enums +{ + public enum OrderStatus + { + Undefined = -1, + Accepted, + BeingProcessed, + Ready, + Delivered, + } +} diff --git a/AutoWorkshopDataModels/Models/IComponentModel.cs b/AutoWorkshopDataModels/Models/IComponentModel.cs new file mode 100644 index 0000000..a961915 --- /dev/null +++ b/AutoWorkshopDataModels/Models/IComponentModel.cs @@ -0,0 +1,8 @@ +namespace AutoWorkshopDataModels.Models +{ + public interface IComponentModel : IId + { + string ComponentName { get; } + double Cost { get; } + } +} diff --git a/AutoWorkshopDataModels/Models/IId.cs b/AutoWorkshopDataModels/Models/IId.cs new file mode 100644 index 0000000..85dd257 --- /dev/null +++ b/AutoWorkshopDataModels/Models/IId.cs @@ -0,0 +1,7 @@ +namespace AutoWorkshopDataModels.Models +{ + public interface IId + { + int Id { get; } + } +} diff --git a/AutoWorkshopDataModels/Models/IOrderModel.cs b/AutoWorkshopDataModels/Models/IOrderModel.cs new file mode 100644 index 0000000..fbeac67 --- /dev/null +++ b/AutoWorkshopDataModels/Models/IOrderModel.cs @@ -0,0 +1,14 @@ +using AutoWorkshopDataModels.Enums; + +namespace AutoWorkshopDataModels.Models +{ + public interface IOrderModel : IId + { + int RepairId { get; } + int Count { get; } + double Sum { get; } + OrderStatus Status { get; } + DateTime DateCreate { get; } + DateTime? DateImplement { get; } + } +} diff --git a/AutoWorkshopDataModels/Models/IRepairModel.cs b/AutoWorkshopDataModels/Models/IRepairModel.cs new file mode 100644 index 0000000..fb2a3d4 --- /dev/null +++ b/AutoWorkshopDataModels/Models/IRepairModel.cs @@ -0,0 +1,9 @@ +namespace AutoWorkshopDataModels.Models +{ + public interface IRepairModel : IId + { + string RepairName { get; } + double Price { get; } + Dictionary RepairComponents { get; } + } +} diff --git a/AutoWorkshopImplement/AutoWorkshopListImplement.csproj b/AutoWorkshopImplement/AutoWorkshopListImplement.csproj new file mode 100644 index 0000000..6deaaf6 --- /dev/null +++ b/AutoWorkshopImplement/AutoWorkshopListImplement.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + diff --git a/AutoWorkshopImplement/DataListSingleton.cs b/AutoWorkshopImplement/DataListSingleton.cs new file mode 100644 index 0000000..2bec800 --- /dev/null +++ b/AutoWorkshopImplement/DataListSingleton.cs @@ -0,0 +1,32 @@ +using AutoWorkshopListImplement.Models; + +namespace AutoWorkshopListImplement +{ + public class DataListSingleton + { + private static DataListSingleton? _instance; + + public List Components { get; set; } + + public List Orders { get; set; } + + public List Repairs { get; set; } + + private DataListSingleton() + { + Components = new List(); + Orders = new List(); + Repairs = new List(); + } + + public static DataListSingleton GetInstance() + { + if (_instance == null) + { + _instance = new DataListSingleton(); + } + + return _instance; + } + } +} diff --git a/AutoWorkshopImplement/Implements/ComponentStorage.cs b/AutoWorkshopImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..ea9b175 --- /dev/null +++ b/AutoWorkshopImplement/Implements/ComponentStorage.cs @@ -0,0 +1,116 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.StoragesContracts; +using AutoWorkshopContracts.ViewModels; +using AutoWorkshopListImplement.Models; + +namespace AutoWorkshopListImplement.Implements +{ + public class ComponentStorage : IComponentStorage + { + private readonly DataListSingleton _source; + + public ComponentStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public List GetFullList() + { + var Result = new List(); + + foreach (var Component in _source.Components) + { + Result.Add(Component.GetViewModel); + } + + return Result; + } + + public List GetFilteredList(ComponentSearchModel Model) + { + var Result = new List(); + + if (string.IsNullOrEmpty(Model.ComponentName)) + return Result; + + foreach (var Component in _source.Components) + { + if (Component.ComponentName.Contains(Model.ComponentName)) + { + Result.Add(Component.GetViewModel); + } + } + + return Result; + } + + public ComponentViewModel? GetElement(ComponentSearchModel Model) + { + if (string.IsNullOrEmpty(Model.ComponentName) && !Model.Id.HasValue) + return null; + + foreach (var Component in _source.Components) + { + if ((!string.IsNullOrEmpty(Model.ComponentName) + && Component.ComponentName == Model.ComponentName) + || (Model.Id.HasValue && Component.Id == Model.Id)) + { + return Component.GetViewModel; + } + } + + return null; + } + + public ComponentViewModel? Insert(ComponentBindingModel Model) + { + Model.Id = 1; + foreach (var Component in _source.Components) + { + if (Model.Id <= Component.Id) + { + Model.Id = Component.Id + 1; + } + } + + var NewComponent = Component.Create(Model); + + if (NewComponent == null) + return null; + + _source.Components.Add(NewComponent); + return NewComponent.GetViewModel; + } + + public ComponentViewModel? Update(ComponentBindingModel Model) + { + foreach (var Component in _source.Components) + { + if (Component.Id == Model.Id) + { + Component.Update(Model); + return Component.GetViewModel; + } + } + + return null; + } + + public ComponentViewModel? Delete(ComponentBindingModel Model) + { + for (int i = 0; i < _source.Components.Count; ++i) + { + if (_source.Components[i].Id == Model.Id) + { + var Element = _source.Components[i]; + _source.Components.RemoveAt(i); + + return Element.GetViewModel; + } + } + + return null; + } + } +} diff --git a/AutoWorkshopImplement/Implements/OrderStorage.cs b/AutoWorkshopImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..838bd47 --- /dev/null +++ b/AutoWorkshopImplement/Implements/OrderStorage.cs @@ -0,0 +1,116 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.StoragesContracts; +using AutoWorkshopContracts.ViewModels; +using AutoWorkshopListImplement.Models; + +namespace AutoWorkshopListImplement.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(Order.GetViewModel); + } + + return Result; + } + + public List GetFilteredList(OrderSearchModel Model) + { + var Result = new List(); + + if (!Model.Id.HasValue) + return Result; + + foreach (var Order in _source.Orders) + { + if (Order.Id == Model.Id) + { + Result.Add(Order.GetViewModel); + break; + } + } + + return Result; + } + + public OrderViewModel? GetElement(OrderSearchModel Model) + { + if (!Model.Id.HasValue) + return null; + + foreach (var Order in _source.Orders) + { + if (Order.Id == Model.Id) + { + return Order.GetViewModel; + } + } + + return null; + } + + public OrderViewModel? Insert(OrderBindingModel Model) + { + Model.Id = 1; + foreach (var Order in _source.Orders) + { + if (Model.Id <= Order.Id) + { + Model.Id = Order.Id + 1; + } + } + + var NewOrder = Order.Create(Model); + + if (NewOrder == null) + return null; + + _source.Orders.Add(NewOrder); + return NewOrder.GetViewModel; + } + + public OrderViewModel? Update(OrderBindingModel Model) + { + foreach (var Order in _source.Orders) + { + if (Order.Id == Model.Id) + { + Order.Update(Model); + return Order.GetViewModel; + } + } + + return null; + } + + public OrderViewModel? Delete(OrderBindingModel Model) + { + for (int i = 0; i < _source.Orders.Count; ++i) + { + if (_source.Orders[i].Id == Model.Id) + { + var Element = _source.Orders[i]; + _source.Orders.RemoveAt(i); + + return Element.GetViewModel; + } + } + + return null; + } + } +} + \ No newline at end of file diff --git a/AutoWorkshopImplement/Implements/RepairStorage.cs b/AutoWorkshopImplement/Implements/RepairStorage.cs new file mode 100644 index 0000000..3eac8d8 --- /dev/null +++ b/AutoWorkshopImplement/Implements/RepairStorage.cs @@ -0,0 +1,116 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.StoragesContracts; +using AutoWorkshopContracts.ViewModels; +using AutoWorkshopListImplement.Models; + +namespace AutoWorkshopListImplement.Implements +{ + public class RepairStorage : IRepairStorage + { + private readonly DataListSingleton _source; + + public RepairStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public List GetFullList() + { + var Result = new List(); + + foreach (var Repair in _source.Repairs) + { + Result.Add(Repair.GetViewModel); + } + + return Result; + } + + public List GetFilteredList(RepairSearchModel Model) + { + var Result = new List(); + + if (string.IsNullOrEmpty(Model.RepairName)) + return Result; + + foreach (var Repair in _source.Repairs) + { + if (Repair.RepairName.Contains(Model.RepairName)) + { + Result.Add(Repair.GetViewModel); + } + } + + return Result; + } + + public RepairViewModel? GetElement(RepairSearchModel Model) + { + if (string.IsNullOrEmpty(Model.RepairName) && !Model.Id.HasValue) + return null; + + foreach (var Repair in _source.Repairs) + { + if ((!string.IsNullOrEmpty(Model.RepairName) + && Repair.RepairName == Model.RepairName) + || (Model.Id.HasValue && Repair.Id == Model.Id)) + { + return Repair.GetViewModel; + } + } + + return null; + } + + public RepairViewModel? Insert(RepairBindingModel Model) + { + Model.Id = 1; + foreach (var Repair in _source.Repairs) + { + if (Model.Id <= Repair.Id) + { + Model.Id = Repair.Id + 1; + } + } + + var NewRepair = Repair.Create(Model); + + if (NewRepair == null) + return null; + + _source.Repairs.Add(NewRepair); + return NewRepair.GetViewModel; + } + + public RepairViewModel? Update(RepairBindingModel Model) + { + foreach (var Repair in _source.Repairs) + { + if (Repair.Id == Model.Id) + { + Repair.Update(Model); + return Repair.GetViewModel; + } + } + + return null; + } + + public RepairViewModel? Delete(RepairBindingModel Model) + { + for (int i = 0; i < _source.Repairs.Count; ++i) + { + if (_source.Repairs[i].Id == Model.Id) + { + var Element = _source.Repairs[i]; + _source.Repairs.RemoveAt(i); + + return Element.GetViewModel; + } + } + + return null; + } + } +} diff --git a/AutoWorkshopImplement/Models/Component.cs b/AutoWorkshopImplement/Models/Component.cs new file mode 100644 index 0000000..915c645 --- /dev/null +++ b/AutoWorkshopImplement/Models/Component.cs @@ -0,0 +1,44 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.ViewModels; +using AutoWorkshopDataModels.Models; + +namespace AutoWorkshopListImplement.Models +{ + public class Component : IComponentModel + { + public int Id { get; private set; } + + public string ComponentName { get; private set; } = string.Empty; + + public double Cost { get; set; } + + public static Component? Create(ComponentBindingModel? Model) + { + if (Model is null) + return null; + + return new Component() + { + Id = Model.Id, + ComponentName = Model.ComponentName, + Cost = Model.Cost + }; + } + + public void Update(ComponentBindingModel? Model) + { + if (Model is null) + return; + + ComponentName = Model.ComponentName; + Cost = Model.Cost; + } + + public ComponentViewModel GetViewModel => new() + { + Id = Id, + ComponentName = ComponentName, + Cost = Cost + }; + } +} diff --git a/AutoWorkshopImplement/Models/Order.cs b/AutoWorkshopImplement/Models/Order.cs new file mode 100644 index 0000000..aa58b80 --- /dev/null +++ b/AutoWorkshopImplement/Models/Order.cs @@ -0,0 +1,65 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.ViewModels; +using AutoWorkshopDataModels.Enums; +using AutoWorkshopDataModels.Models; + +namespace AutoWorkshopListImplement.Models +{ + public class Order : IOrderModel + { + public int Id { get; private set; } + + public int RepairId { get; private set; } + + public int Count { get; private set; } + + public double Sum { get; private set; } + + public OrderStatus Status { get; private set; } = OrderStatus.Undefined; + + public DateTime DateCreate { get; private set; } + + public DateTime? DateImplement { get; private set; } + + public static Order? Create(OrderBindingModel? Model) + { + if (Model is null) + return null; + + return new Order() + { + Id = Model.Id, + RepairId = Model.RepairId, + Count = Model.Count, + Sum = Model.Sum, + Status = Model.Status, + DateCreate = Model.DateCreate, + DateImplement = Model.DateImplement + }; + } + + public void Update(OrderBindingModel? Model) + { + if (Model == null) + return; + + RepairId = Model.RepairId; + Count = Model.Count; + Sum = Model.Sum; + Status = Model.Status; + DateCreate = Model.DateCreate; + DateImplement = Model.DateImplement; + } + + public OrderViewModel GetViewModel => new() + { + Id = Id, + RepairId = RepairId, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement + }; + } +} diff --git a/AutoWorkshopImplement/Models/Repair.cs b/AutoWorkshopImplement/Models/Repair.cs new file mode 100644 index 0000000..44abb20 --- /dev/null +++ b/AutoWorkshopImplement/Models/Repair.cs @@ -0,0 +1,53 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.ViewModels; +using AutoWorkshopDataModels.Models; + +namespace AutoWorkshopListImplement.Models +{ + public class Repair : IRepairModel + { + public int Id { get; private set; } + + public string RepairName { get; private set; } = string.Empty; + + public double Price { get; private set; } + + public Dictionary RepairComponents + { + get; + private set; + } = new Dictionary(); + + public static Repair? Create(RepairBindingModel? Model) + { + if (Model is null) + return null; + + return new Repair() + { + Id = Model.Id, + RepairName = Model.RepairName, + Price = Model.Price, + RepairComponents = Model.RepairComponents + }; + } + + public void Update(RepairBindingModel? Model) + { + if (Model is null) + return; + + RepairName = Model.RepairName; + Price = Model.Price; + RepairComponents = Model.RepairComponents; + } + + public RepairViewModel GetViewModel => new() + { + Id = Id, + RepairName = RepairName, + Price = Price, + RepairComponents = RepairComponents + }; + } +} diff --git a/AutoWorkshop/AutoWorkshop/AutoWorkshop.csproj b/AutoWorkshopView/AutoWorkshopView.csproj similarity index 66% rename from AutoWorkshop/AutoWorkshop/AutoWorkshop.csproj rename to AutoWorkshopView/AutoWorkshopView.csproj index 663fdb8..060aa1c 100644 --- a/AutoWorkshop/AutoWorkshop/AutoWorkshop.csproj +++ b/AutoWorkshopView/AutoWorkshopView.csproj @@ -1,11 +1,10 @@  - WinExe - net8.0-windows + net6.0-windows enable true enable - \ No newline at end of file + diff --git a/AutoWorkshopView/Class1.cs b/AutoWorkshopView/Class1.cs new file mode 100644 index 0000000..7439ed6 --- /dev/null +++ b/AutoWorkshopView/Class1.cs @@ -0,0 +1,5 @@ +namespace AutoWorkshopView; + +public class Class1 +{ +}