From c872fc718294d37f1b49813a38418b309c4d700b Mon Sep 17 00:00:00 2001 From: "a.puchkina" Date: Mon, 26 Feb 2024 16:16:51 +0400 Subject: [PATCH 1/5] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=20=D1=84=D0=BE=D1=80=D0=BC=D0=BE=D1=87=D0=BA=D0=B8,=20=D0=BD?= =?UTF-8?q?=D0=B0=D0=B4=D0=BE=20=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TravelCompany/TravelCompany.sln | 26 +- TravelCompany/TravelCompany/Form1.Designer.cs | 39 --- TravelCompany/TravelCompany/Form1.cs | 10 - .../TravelCompany/FormComponent.Designer.cs | 117 +++++++++ TravelCompany/TravelCompany/FormComponent.cs | 84 +++++++ .../TravelCompany/FormComponent.resx | 120 +++++++++ .../TravelCompany/FormComponents.Designer.cs | 115 +++++++++ TravelCompany/TravelCompany/FormComponents.cs | 106 ++++++++ .../TravelCompany/FormComponents.resx | 120 +++++++++ .../TravelCompany/FormCreateOrder.Designer.cs | 138 +++++++++++ .../TravelCompany/FormCreateOrder.cs | 122 +++++++++ .../TravelCompany/FormCreateOrder.resx | 120 +++++++++ .../TravelCompany/FormMain.Designer.cs | 174 +++++++++++++ TravelCompany/TravelCompany/FormMain.cs | 156 ++++++++++++ TravelCompany/TravelCompany/FormMain.resx | 135 ++++++++++ .../TravelCompany/FormTravel.Designer.cs | 232 ++++++++++++++++++ TravelCompany/TravelCompany/FormTravel.cs | 206 ++++++++++++++++ TravelCompany/TravelCompany/FormTravel.resx | 129 ++++++++++ .../FormTravelComponent.Designer.cs | 118 +++++++++ .../TravelCompany/FormTravelComponent.cs | 89 +++++++ .../TravelCompany/FormTravelComponent.resx | 120 +++++++++ .../TravelCompany/FormTravels.Designer.cs | 113 +++++++++ TravelCompany/TravelCompany/FormTravels.cs | 115 +++++++++ TravelCompany/TravelCompany/FormTravels.resx | 120 +++++++++ TravelCompany/TravelCompany/Program.cs | 38 ++- .../Properties/Resources.Designer.cs | 63 +++++ .../{Form1.resx => Properties/Resources.resx} | 0 .../TravelCompany/TravelCompanyView.csproj | 41 ++++ TravelCompany/TravelCompany/nlog.config | 15 ++ .../BusinessLogic/ComponentLogic.cs | 113 +++++++++ .../BusinessLogic/OrderLogic.cs | 141 +++++++++++ .../BusinessLogic/TravelLogic.cs | 118 +++++++++ .../TravelCompanyBusinessLogic.csproj | 22 ++ .../BindingModels/ComponentBindingModel.cs | 16 ++ .../BindingModels/OrderBindingModel.cs | 21 ++ .../BindingModels/TravelBindingModel.cs | 17 ++ .../BusinessLogicContracts/IComponentLogic.cs | 21 ++ .../BusinessLogicContracts/IOrderLogic.cs | 30 +++ .../BusinessLogicContracts/ITravelLogic.cs | 20 ++ .../SearchModels/ComponentSearchModel.cs | 14 ++ .../SearchModels/OrderSearchModel.cs | 13 + .../SearchModels/TravelSearchModel.cs | 14 ++ .../StoragesContracts/IComponentStorage.cs | 22 ++ .../StoragesContracts/IOrderStorage.cs | 21 ++ .../StoragesContracts/ITravelStorage.cs | 21 ++ .../TravelCompanyContracts.csproj | 22 ++ .../ViewModels/ComponentViewModel.cs | 19 ++ .../ViewModels/OrderViewModel.cs | 29 +++ .../ViewModels/TravelViewModel.cs | 21 ++ .../Enums/OrderStatus.cs | 11 + TravelCompany/TravelCompanyDataModels/IId.cs | 13 + .../Models/IComponentModel.cs | 8 + .../Models/IOrderModel.cs | 14 ++ .../Models/ITravelModel.cs | 9 + .../TravelCompanyDataModels.csproj | 18 ++ .../DataListSingleton.cs | 31 +++ .../Implements/ComponentStorage.cs | 106 ++++++++ .../Implements/OrderStorage.cs | 125 ++++++++++ .../Implements/TravelStorage.cs | 112 +++++++++ .../Models/Component.cs | 41 ++++ .../Models/Order.cs | 64 +++++ .../Models/Travel.cs | 55 +++++ .../TravelCompanyListImplement.csproj | 23 ++ .../TravelCompanyDataModels.sln | 25 ++ .../Enums/OrderStatus.cs | 11 + .../TravelCompanyDataModels/IId.cs | 12 + .../Models/IComponentModel.cs | 10 + .../Models/IOrderModel.cs | 12 + .../Models/ITravelModel.cs | 12 + .../TravelCompanyDataModels.csproj | 8 +- 70 files changed, 4360 insertions(+), 56 deletions(-) delete mode 100644 TravelCompany/TravelCompany/Form1.Designer.cs delete mode 100644 TravelCompany/TravelCompany/Form1.cs create mode 100644 TravelCompany/TravelCompany/FormComponent.Designer.cs create mode 100644 TravelCompany/TravelCompany/FormComponent.cs create mode 100644 TravelCompany/TravelCompany/FormComponent.resx create mode 100644 TravelCompany/TravelCompany/FormComponents.Designer.cs create mode 100644 TravelCompany/TravelCompany/FormComponents.cs create mode 100644 TravelCompany/TravelCompany/FormComponents.resx create mode 100644 TravelCompany/TravelCompany/FormCreateOrder.Designer.cs create mode 100644 TravelCompany/TravelCompany/FormCreateOrder.cs create mode 100644 TravelCompany/TravelCompany/FormCreateOrder.resx create mode 100644 TravelCompany/TravelCompany/FormMain.Designer.cs create mode 100644 TravelCompany/TravelCompany/FormMain.cs create mode 100644 TravelCompany/TravelCompany/FormMain.resx create mode 100644 TravelCompany/TravelCompany/FormTravel.Designer.cs create mode 100644 TravelCompany/TravelCompany/FormTravel.cs create mode 100644 TravelCompany/TravelCompany/FormTravel.resx create mode 100644 TravelCompany/TravelCompany/FormTravelComponent.Designer.cs create mode 100644 TravelCompany/TravelCompany/FormTravelComponent.cs create mode 100644 TravelCompany/TravelCompany/FormTravelComponent.resx create mode 100644 TravelCompany/TravelCompany/FormTravels.Designer.cs create mode 100644 TravelCompany/TravelCompany/FormTravels.cs create mode 100644 TravelCompany/TravelCompany/FormTravels.resx create mode 100644 TravelCompany/TravelCompany/Properties/Resources.Designer.cs rename TravelCompany/TravelCompany/{Form1.resx => Properties/Resources.resx} (100%) create mode 100644 TravelCompany/TravelCompany/TravelCompanyView.csproj create mode 100644 TravelCompany/TravelCompany/nlog.config create mode 100644 TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/ComponentLogic.cs create mode 100644 TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/OrderLogic.cs create mode 100644 TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/TravelLogic.cs create mode 100644 TravelCompany/TravelCompanyBusinessLogic/TravelCompanyBusinessLogic.csproj create mode 100644 TravelCompany/TravelCompanyContracts/BindingModels/ComponentBindingModel.cs create mode 100644 TravelCompany/TravelCompanyContracts/BindingModels/OrderBindingModel.cs create mode 100644 TravelCompany/TravelCompanyContracts/BindingModels/TravelBindingModel.cs create mode 100644 TravelCompany/TravelCompanyContracts/BusinessLogicContracts/IComponentLogic.cs create mode 100644 TravelCompany/TravelCompanyContracts/BusinessLogicContracts/IOrderLogic.cs create mode 100644 TravelCompany/TravelCompanyContracts/BusinessLogicContracts/ITravelLogic.cs create mode 100644 TravelCompany/TravelCompanyContracts/SearchModels/ComponentSearchModel.cs create mode 100644 TravelCompany/TravelCompanyContracts/SearchModels/OrderSearchModel.cs create mode 100644 TravelCompany/TravelCompanyContracts/SearchModels/TravelSearchModel.cs create mode 100644 TravelCompany/TravelCompanyContracts/StoragesContracts/IComponentStorage.cs create mode 100644 TravelCompany/TravelCompanyContracts/StoragesContracts/IOrderStorage.cs create mode 100644 TravelCompany/TravelCompanyContracts/StoragesContracts/ITravelStorage.cs create mode 100644 TravelCompany/TravelCompanyContracts/TravelCompanyContracts.csproj create mode 100644 TravelCompany/TravelCompanyContracts/ViewModels/ComponentViewModel.cs create mode 100644 TravelCompany/TravelCompanyContracts/ViewModels/OrderViewModel.cs create mode 100644 TravelCompany/TravelCompanyContracts/ViewModels/TravelViewModel.cs create mode 100644 TravelCompany/TravelCompanyDataModels/Enums/OrderStatus.cs create mode 100644 TravelCompany/TravelCompanyDataModels/IId.cs create mode 100644 TravelCompany/TravelCompanyDataModels/Models/IComponentModel.cs create mode 100644 TravelCompany/TravelCompanyDataModels/Models/IOrderModel.cs create mode 100644 TravelCompany/TravelCompanyDataModels/Models/ITravelModel.cs create mode 100644 TravelCompany/TravelCompanyDataModels/TravelCompanyDataModels.csproj create mode 100644 TravelCompany/TravelCompanyListImplement/DataListSingleton.cs create mode 100644 TravelCompany/TravelCompanyListImplement/Implements/ComponentStorage.cs create mode 100644 TravelCompany/TravelCompanyListImplement/Implements/OrderStorage.cs create mode 100644 TravelCompany/TravelCompanyListImplement/Implements/TravelStorage.cs create mode 100644 TravelCompany/TravelCompanyListImplement/Models/Component.cs create mode 100644 TravelCompany/TravelCompanyListImplement/Models/Order.cs create mode 100644 TravelCompany/TravelCompanyListImplement/Models/Travel.cs create mode 100644 TravelCompany/TravelCompanyListImplement/TravelCompanyListImplement.csproj create mode 100644 TravelCompanyDataModels/TravelCompanyDataModels.sln create mode 100644 TravelCompanyDataModels/TravelCompanyDataModels/Enums/OrderStatus.cs create mode 100644 TravelCompanyDataModels/TravelCompanyDataModels/IId.cs create mode 100644 TravelCompanyDataModels/TravelCompanyDataModels/Models/IComponentModel.cs create mode 100644 TravelCompanyDataModels/TravelCompanyDataModels/Models/IOrderModel.cs create mode 100644 TravelCompanyDataModels/TravelCompanyDataModels/Models/ITravelModel.cs rename TravelCompany/TravelCompany/TravelCompany.csproj => TravelCompanyDataModels/TravelCompanyDataModels/TravelCompanyDataModels.csproj (51%) diff --git a/TravelCompany/TravelCompany.sln b/TravelCompany/TravelCompany.sln index 60502bb..fca5002 100644 --- a/TravelCompany/TravelCompany.sln +++ b/TravelCompany/TravelCompany.sln @@ -3,7 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.7.34024.191 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TravelCompany", "TravelCompany\TravelCompany.csproj", "{79A26973-2BA2-4D07-9217-3564BC783C40}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TravelCompanyView", "TravelCompany\TravelCompanyView.csproj", "{79A26973-2BA2-4D07-9217-3564BC783C40}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TravelCompanyDataModels", "TravelCompanyDataModels\TravelCompanyDataModels.csproj", "{1D4AB34B-67FC-47D8-AF5F-D049519B42A9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TravelCompanyContracts", "TravelCompanyContracts\TravelCompanyContracts.csproj", "{F5360FD0-02FD-4549-956C-87BE43698D5B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TravelCompanyBusinessLogic", "TravelCompanyBusinessLogic\TravelCompanyBusinessLogic.csproj", "{DC7EB4DD-9023-416F-A718-A8596B80A587}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TravelCompanyListImplement", "TravelCompanyListImplement\TravelCompanyListImplement.csproj", "{9D85E556-67A1-44D5-B46B-5C880935118D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,6 +23,22 @@ Global {79A26973-2BA2-4D07-9217-3564BC783C40}.Debug|Any CPU.Build.0 = Debug|Any CPU {79A26973-2BA2-4D07-9217-3564BC783C40}.Release|Any CPU.ActiveCfg = Release|Any CPU {79A26973-2BA2-4D07-9217-3564BC783C40}.Release|Any CPU.Build.0 = Release|Any CPU + {1D4AB34B-67FC-47D8-AF5F-D049519B42A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1D4AB34B-67FC-47D8-AF5F-D049519B42A9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1D4AB34B-67FC-47D8-AF5F-D049519B42A9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1D4AB34B-67FC-47D8-AF5F-D049519B42A9}.Release|Any CPU.Build.0 = Release|Any CPU + {F5360FD0-02FD-4549-956C-87BE43698D5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F5360FD0-02FD-4549-956C-87BE43698D5B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F5360FD0-02FD-4549-956C-87BE43698D5B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F5360FD0-02FD-4549-956C-87BE43698D5B}.Release|Any CPU.Build.0 = Release|Any CPU + {DC7EB4DD-9023-416F-A718-A8596B80A587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DC7EB4DD-9023-416F-A718-A8596B80A587}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DC7EB4DD-9023-416F-A718-A8596B80A587}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DC7EB4DD-9023-416F-A718-A8596B80A587}.Release|Any CPU.Build.0 = Release|Any CPU + {9D85E556-67A1-44D5-B46B-5C880935118D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9D85E556-67A1-44D5-B46B-5C880935118D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9D85E556-67A1-44D5-B46B-5C880935118D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9D85E556-67A1-44D5-B46B-5C880935118D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/TravelCompany/TravelCompany/Form1.Designer.cs b/TravelCompany/TravelCompany/Form1.Designer.cs deleted file mode 100644 index 0ed38d9..0000000 --- a/TravelCompany/TravelCompany/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace TravelCompany -{ - partial class Form1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "Form1"; - } - - #endregion - } -} \ No newline at end of file diff --git a/TravelCompany/TravelCompany/Form1.cs b/TravelCompany/TravelCompany/Form1.cs deleted file mode 100644 index b2169b8..0000000 --- a/TravelCompany/TravelCompany/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace TravelCompany -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/TravelCompany/TravelCompany/FormComponent.Designer.cs b/TravelCompany/TravelCompany/FormComponent.Designer.cs new file mode 100644 index 0000000..a67e2dd --- /dev/null +++ b/TravelCompany/TravelCompany/FormComponent.Designer.cs @@ -0,0 +1,117 @@ +namespace TravelCompanyView +{ + 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() + { + buttonSave = new Button(); + buttonCancel = new Button(); + label1 = new Label(); + label2 = new Label(); + textBoxName = new TextBox(); + textBoxCost = new TextBox(); + SuspendLayout(); + // + // buttonSave + // + buttonSave.Location = new Point(170, 138); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(105, 29); + buttonSave.TabIndex = 0; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(296, 138); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(105, 29); + buttonCancel.TabIndex = 1; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(19, 19); + label1.Name = "label1"; + label1.Size = new Size(80, 20); + label1.TabIndex = 2; + label1.Text = "Название:"; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(19, 86); + label2.Name = "label2"; + label2.Size = new Size(48, 20); + label2.TabIndex = 3; + label2.Text = "Цена:"; + // + // textBoxName + // + textBoxName.Location = new Point(114, 12); + textBoxName.Name = "textBoxName"; + textBoxName.Size = new Size(287, 27); + textBoxName.TabIndex = 4; + // + // textBoxCost + // + textBoxCost.Location = new Point(114, 79); + textBoxCost.Name = "textBoxCost"; + textBoxCost.Size = new Size(287, 27); + textBoxCost.TabIndex = 5; + // + // FormComponent + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(432, 180); + Controls.Add(textBoxCost); + Controls.Add(textBoxName); + Controls.Add(label2); + Controls.Add(label1); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Name = "FormComponent"; + Text = "Компонент"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Button buttonSave; + private Button buttonCancel; + private Label label1; + private Label label2; + private TextBox textBoxName; + private TextBox textBoxCost; + } +} \ No newline at end of file diff --git a/TravelCompany/TravelCompany/FormComponent.cs b/TravelCompany/TravelCompany/FormComponent.cs new file mode 100644 index 0000000..50489ad --- /dev/null +++ b/TravelCompany/TravelCompany/FormComponent.cs @@ -0,0 +1,84 @@ +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.BusinessLogicsContracts; +using TravelCompanyContracts.SearchModels; +using Microsoft.Extensions.Logging; + +namespace TravelCompanyView +{ + public partial class FormComponent : Form + { + private readonly ILogger _logger; + private readonly IComponentLogic _logic; + private int? _id; + public int Id { set { _id = value; } } + public FormComponent(ILogger logger, IComponentLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + private void FormComponent_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + try + { + _logger.LogInformation("Получение компонента"); + var view = _logic.ReadElement(new ComponentSearchModel + { + Id = _id.Value + }); + if (view != null) + { + textBoxName.Text = view.ComponentName; + textBoxCost.Text = view.Cost.ToString(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения компонента"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + } + + private void buttonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxName.Text)) + { + MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение компонента"); + try + { + var model = new ComponentBindingModel + { + Id = _id ?? 0, + ComponentName = textBoxName.Text, + Cost = Convert.ToDouble(textBoxCost.Text) + }; + var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения компонента"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void buttonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/TravelCompany/TravelCompany/FormComponent.resx b/TravelCompany/TravelCompany/FormComponent.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/TravelCompany/TravelCompany/FormComponent.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/TravelCompany/TravelCompany/FormComponents.Designer.cs b/TravelCompany/TravelCompany/FormComponents.Designer.cs new file mode 100644 index 0000000..0c3c4a2 --- /dev/null +++ b/TravelCompany/TravelCompany/FormComponents.Designer.cs @@ -0,0 +1,115 @@ +namespace TravelCompanyView +{ + 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(); + buttonAdd = new Button(); + buttonRef = new Button(); + buttonDel = new Button(); + buttonUpd = new Button(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Location = new Point(-2, -5); + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 29; + dataGridView.Size = new Size(626, 460); + dataGridView.TabIndex = 0; + // + // buttonAdd + // + buttonAdd.Location = new Point(651, 37); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(125, 44); + buttonAdd.TabIndex = 1; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; + // + // buttonRef + // + buttonRef.Location = new Point(651, 188); + buttonRef.Name = "buttonRef"; + buttonRef.Size = new Size(125, 44); + buttonRef.TabIndex = 3; + buttonRef.Text = "Обновить"; + buttonRef.UseVisualStyleBackColor = true; + buttonRef.Click += buttonRef_Click; + // + // buttonDel + // + buttonDel.Location = new Point(651, 138); + buttonDel.Name = "buttonDel"; + buttonDel.Size = new Size(125, 44); + buttonDel.TabIndex = 4; + buttonDel.Text = "Удалить"; + buttonDel.UseVisualStyleBackColor = true; + buttonDel.Click += buttonDel_Click; + // + // buttonUpd + // + buttonUpd.Location = new Point(651, 88); + buttonUpd.Name = "buttonUpd"; + buttonUpd.Size = new Size(125, 44); + buttonUpd.TabIndex = 5; + buttonUpd.Text = "Изменить"; + buttonUpd.UseVisualStyleBackColor = true; + buttonUpd.Click += buttonUpd_Click; + // + // FormComponents + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(buttonUpd); + Controls.Add(buttonDel); + Controls.Add(buttonRef); + Controls.Add(buttonAdd); + Controls.Add(dataGridView); + Name = "FormComponents"; + Text = "Список компонентов"; + Load += FormComponents_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridView; + private Button buttonAdd; + private Button buttonRef; + private Button buttonDel; + private Button buttonUpd; + } +} \ No newline at end of file diff --git a/TravelCompany/TravelCompany/FormComponents.cs b/TravelCompany/TravelCompany/FormComponents.cs new file mode 100644 index 0000000..8a7c957 --- /dev/null +++ b/TravelCompany/TravelCompany/FormComponents.cs @@ -0,0 +1,106 @@ +using Microsoft.Extensions.Logging; +using TravelCompanyContracts.BusinessLogicsContracts; +using Microsoft.VisualBasic.Logging; +using TravelCompanyContracts.SearchModels; +using TravelCompanyContracts.BindingModels; +using System.Windows.Forms; +using TravelCompany; + +namespace TravelCompanyView +{ + public partial class FormComponents : Form + { + private readonly ILogger _logger; + private readonly IComponentLogic _logic; + public FormComponents(ILogger logger, IComponentLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormComponents_Load(object sender, EventArgs e) + { + LoadData(); + } + private void LoadData() + { + try + { + var list = _logic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["Id"].Visible = false; + dataGridView.Columns["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка компонентов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки компонентов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void buttonAdd_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); + if (service is FormComponent form) + { + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + private void buttonUpd_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); + if (service is FormComponent form) + { + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + + private void buttonDel_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + int id = + Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Удаление компонента"); + try + { + if (!_logic.Delete(new ComponentBindingModel + { + Id = id + })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка удаления компонента"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + private void buttonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/TravelCompany/TravelCompany/FormComponents.resx b/TravelCompany/TravelCompany/FormComponents.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/TravelCompany/TravelCompany/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/TravelCompany/TravelCompany/FormCreateOrder.Designer.cs b/TravelCompany/TravelCompany/FormCreateOrder.Designer.cs new file mode 100644 index 0000000..61d1dc6 --- /dev/null +++ b/TravelCompany/TravelCompany/FormCreateOrder.Designer.cs @@ -0,0 +1,138 @@ +namespace TravelCompanyView +{ + 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() + { + label1 = new Label(); + label2 = new Label(); + label3 = new Label(); + comboBoxTravel = new ComboBox(); + textBoxCount = new TextBox(); + textBoxSum = new TextBox(); + buttonSave = new Button(); + buttonCancel = new Button(); + SuspendLayout(); + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(12, 9); + label1.Name = "label1"; + label1.Size = new Size(71, 20); + label1.TabIndex = 0; + label1.Text = "Изделие:"; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(12, 52); + label2.Name = "label2"; + label2.Size = new Size(93, 20); + label2.TabIndex = 1; + label2.Text = "Количество:"; + // + // label3 + // + label3.AutoSize = true; + label3.Location = new Point(12, 95); + label3.Name = "label3"; + label3.Size = new Size(58, 20); + label3.TabIndex = 2; + label3.Text = "Сумма:"; + // + // comboBoxTravel + // + comboBoxTravel.FormattingEnabled = true; + comboBoxTravel.Location = new Point(125, 6); + comboBoxTravel.Name = "comboBoxTravel"; + comboBoxTravel.Size = new Size(278, 28); + comboBoxTravel.TabIndex = 3; + // + // textBoxCount + // + textBoxCount.Location = new Point(125, 49); + textBoxCount.Name = "textBoxCount"; + textBoxCount.Size = new Size(278, 27); + textBoxCount.TabIndex = 4; + // + // textBoxSum + // + textBoxSum.Location = new Point(125, 92); + textBoxSum.Name = "textBoxSum"; + textBoxSum.Size = new Size(278, 27); + textBoxSum.TabIndex = 5; + // + // buttonSave + // + buttonSave.Location = new Point(181, 148); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(94, 29); + buttonSave.TabIndex = 6; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + // + // buttonCancel + // + buttonCancel.Location = new Point(309, 148); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(94, 29); + buttonCancel.TabIndex = 7; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + // + // FormCreateOrder + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(423, 200); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(textBoxSum); + Controls.Add(textBoxCount); + Controls.Add(comboBoxTravel); + Controls.Add(label3); + Controls.Add(label2); + Controls.Add(label1); + Name = "FormCreateOrder"; + Text = "Заказ"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label label1; + private Label label2; + private Label label3; + private ComboBox comboBoxTravel; + private TextBox textBoxCount; + private TextBox textBoxSum; + private Button buttonSave; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/TravelCompany/TravelCompany/FormCreateOrder.cs b/TravelCompany/TravelCompany/FormCreateOrder.cs new file mode 100644 index 0000000..04ecdc5 --- /dev/null +++ b/TravelCompany/TravelCompany/FormCreateOrder.cs @@ -0,0 +1,122 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.BusinessLogicsContracts; +using TravelCompanyContracts.SearchModels; + +namespace TravelCompanyView +{ + public partial class FormCreateOrder : Form + { + private readonly ILogger _logger; + private readonly ITravelLogic _logicP; + private readonly IOrderLogic _logicO; + public FormCreateOrder(ILogger logger, ITravelLogic logicP, IOrderLogic logicO) + { + InitializeComponent(); + _logger = logger; + _logicP = logicP; + _logicO = logicO; + } + + private void FormCreateOrder_Load(object sender, EventArgs e) + { + try + { + var list = _logicP.ReadList(null); + if (list != null) + { + comboBoxTravel.DisplayMember = "TravelName"; + comboBoxTravel.ValueMember = "Id"; + comboBoxTravel.DataSource = list; + comboBoxTravel.SelectedItem = null; + _logger.LogInformation("Загрузка изделий для заказа"); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка изделий"); + } + } + private void CalcSum() + { + if (comboBoxTravel.SelectedValue != null && !string.IsNullOrEmpty(textBoxCount.Text)) + { + try + { + int id = Convert.ToInt32(comboBoxTravel.SelectedValue); + var Travel = _logicP.ReadElement(new TravelSearchModel + { + Id = id + }); + int count = Convert.ToInt32(textBoxCount.Text); + textBoxSum.Text = Math.Round(count * (Travel?.Price ?? 0), 2).ToString(); + _logger.LogInformation("Расчет суммы заказа"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка расчета суммы заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + private void textBoxCount_TextChanged(object sender, EventArgs e) + { + CalcSum(); + } + + private void ComboBoxTravel_SelectedIndexChanged(object sender, EventArgs e) + { + CalcSum(); + } + + private void buttonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxTravel.SelectedValue == null) + { + MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Создание заказа"); + try + { + var operationResult = _logicO.CreateOrder(new OrderBindingModel + { + TravelId = Convert.ToInt32(comboBoxTravel.SelectedValue), + Count = Convert.ToInt32(textBoxCount.Text), + Sum = Convert.ToDouble(textBoxSum.Text) + }); + if (!operationResult) + { + throw new Exception("Ошибка при создании заказа. Дополнительная информация в логах."); + } + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка создания заказа"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void buttonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/TravelCompany/TravelCompany/FormCreateOrder.resx b/TravelCompany/TravelCompany/FormCreateOrder.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/TravelCompany/TravelCompany/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/TravelCompany/TravelCompany/FormMain.Designer.cs b/TravelCompany/TravelCompany/FormMain.Designer.cs new file mode 100644 index 0000000..bdf68d6 --- /dev/null +++ b/TravelCompany/TravelCompany/FormMain.Designer.cs @@ -0,0 +1,174 @@ +namespace TravelCompanyView +{ + partial class FormMain + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain)); + dataGridView = new DataGridView(); + toolStrip1 = new ToolStrip(); + toolStripDropDownButton1 = new ToolStripDropDownButton(); + компонентыToolStripMenuItem = new ToolStripMenuItem(); + туристическиеПутевкиToolStripMenuItem = new ToolStripMenuItem(); + buttonCreateeOrder = new Button(); + buttonTakeOrderInWork = new Button(); + buttonOrderReady = new Button(); + buttonIssuedOrder = new Button(); + buttonRefresh = new Button(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + toolStrip1.SuspendLayout(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Location = new Point(1, 41); + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 29; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(877, 569); + dataGridView.TabIndex = 0; + // + // toolStrip1 + // + toolStrip1.ImageScalingSize = new Size(20, 20); + toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1 }); + toolStrip1.Location = new Point(0, 0); + toolStrip1.Name = "toolStrip1"; + toolStrip1.Size = new Size(1063, 27); + toolStrip1.TabIndex = 1; + toolStrip1.Text = "toolStrip1"; + // + // toolStripDropDownButton1 + // + toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text; + toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, туристическиеПутевкиToolStripMenuItem }); + toolStripDropDownButton1.Image = (Image)resources.GetObject("toolStripDropDownButton1.Image"); + toolStripDropDownButton1.ImageTransparentColor = Color.Magenta; + toolStripDropDownButton1.Name = "toolStripDropDownButton1"; + toolStripDropDownButton1.Size = new Size(108, 24); + toolStripDropDownButton1.Text = "Справочник"; + // + // компонентыToolStripMenuItem + // + компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; + компонентыToolStripMenuItem.Size = new Size(252, 26); + компонентыToolStripMenuItem.Text = "Компоненты"; + // + // туристическиеПутевкиToolStripMenuItem + // + туристическиеПутевкиToolStripMenuItem.Name = "туристическиеПутевкиToolStripMenuItem"; + туристическиеПутевкиToolStripMenuItem.Size = new Size(252, 26); + туристическиеПутевкиToolStripMenuItem.Text = "Туристические путевки"; + // + // buttonCreateeOrder + // + buttonCreateeOrder.Location = new Point(891, 103); + buttonCreateeOrder.Name = "buttonCreateeOrder"; + buttonCreateeOrder.Size = new Size(155, 39); + buttonCreateeOrder.TabIndex = 2; + buttonCreateeOrder.Text = "Создать заказ"; + buttonCreateeOrder.UseVisualStyleBackColor = true; + buttonCreateeOrder.Click += buttonCreateOrder_Click; + // + // buttonTakeOrderInWork + // + buttonTakeOrderInWork.Location = new Point(891, 148); + buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; + buttonTakeOrderInWork.Size = new Size(155, 53); + buttonTakeOrderInWork.TabIndex = 3; + buttonTakeOrderInWork.Text = "Отдать на выполнение"; + buttonTakeOrderInWork.UseVisualStyleBackColor = true; + buttonTakeOrderInWork.Click += buttonTakeOrderInWork_Click; + // + // buttonOrderReady + // + buttonOrderReady.Location = new Point(891, 207); + buttonOrderReady.Name = "buttonOrderReady"; + buttonOrderReady.Size = new Size(155, 39); + buttonOrderReady.TabIndex = 4; + buttonOrderReady.Text = "Заказ готов"; + buttonOrderReady.UseVisualStyleBackColor = true; + buttonOrderReady.Click += buttonOrderReady_Click; + // + // buttonIssuedOrder + // + buttonIssuedOrder.Location = new Point(891, 252); + buttonIssuedOrder.Name = "buttonIssuedOrder"; + buttonIssuedOrder.Size = new Size(155, 39); + buttonIssuedOrder.TabIndex = 5; + buttonIssuedOrder.Text = "Заказ выдан"; + buttonIssuedOrder.UseVisualStyleBackColor = true; + buttonIssuedOrder.Click += buttonIssuedOrder_Click; + // + // buttonRefresh + // + buttonRefresh.Location = new Point(891, 297); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(155, 39); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить список"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += buttonRefresh_Click; + // + // FormMain + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1063, 610); + Controls.Add(buttonRefresh); + Controls.Add(buttonIssuedOrder); + Controls.Add(buttonOrderReady); + Controls.Add(buttonTakeOrderInWork); + Controls.Add(buttonCreateeOrder); + Controls.Add(toolStrip1); + Controls.Add(dataGridView); + Name = "FormMain"; + Text = "Туристическая фирма"; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + toolStrip1.ResumeLayout(false); + toolStrip1.PerformLayout(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private DataGridView dataGridView; + private ToolStrip toolStrip1; + private ToolStripDropDownButton toolStripDropDownButton1; + private ToolStripMenuItem компонентыToolStripMenuItem; + private ToolStripMenuItem туристическиеПутевкиToolStripMenuItem; + private Button buttonCreateeOrder; + private Button buttonTakeOrderInWork; + private Button buttonOrderReady; + private Button buttonIssuedOrder; + private Button buttonRefresh; + } +} \ No newline at end of file diff --git a/TravelCompany/TravelCompany/FormMain.cs b/TravelCompany/TravelCompany/FormMain.cs new file mode 100644 index 0000000..ffe5060 --- /dev/null +++ b/TravelCompany/TravelCompany/FormMain.cs @@ -0,0 +1,156 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using TravelCompany; +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.BusinessLogicsContracts; + +namespace TravelCompanyView +{ + public partial class FormMain : Form + { + private readonly ILogger _logger; + private readonly IOrderLogic _orderLogic; + public FormMain(ILogger logger, IOrderLogic orderLogic) + { + InitializeComponent(); + _logger = logger; + _orderLogic = orderLogic; + } + private void FormMain_Load(object sender, EventArgs e) + { + LoadData(); + } + private void LoadData() + { + _logger.LogInformation("Загрузка заказов"); + try + { + var list = _orderLogic.ReadList(null); + + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["TravelId"].Visible = false; + dataGridView.Columns["TravelName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + + _logger.LogInformation("Загрузка заказов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки заказов"); + } + } + private void компонентыToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); + if (service is FormComponents form) + { + form.ShowDialog(); + } + } + private void консервыToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormTravels)); + + if (service is FormTravels form) + { + form.ShowDialog(); + } + } + private void buttonCreateOrder_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); + if (service is FormCreateOrder form) + { + form.ShowDialog(); + LoadData(); + } + } + private void buttonTakeOrderInWork_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id); + try + { + var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel + { + Id = id, + }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка передачи заказа в работу"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + private void buttonOrderReady_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = + Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id); + try + { + var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о готовности заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + private void buttonIssuedOrder_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id); + try + { + var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel + { + Id = id + }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + _logger.LogInformation("Заказ №{id} выдан", id); + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + private void buttonRefresh_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/TravelCompany/TravelCompany/FormMain.resx b/TravelCompany/TravelCompany/FormMain.resx new file mode 100644 index 0000000..dbd8207 --- /dev/null +++ b/TravelCompany/TravelCompany/FormMain.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEKSURBVEhL3ZG9DsFQHMXvczDZvIOtXsHObuhqkViI3Quw + 6CYmNoMYJJ0NBiFFIoIytOuf0+TeXP3yde+iyS+3OcP53Z4y3/dJJ4HAsiwyTVMp6BQCBIZhKAWdEcHV + vSlBmeB82NFy1KLluEWOPRC5MoHdMWhazwi4RJlALgf4EuT6BI+5kCsTrGddUY658E+QvyXYHq9UnRyC + U87f4aUApcXhnrI9Jzg/laQKFntXlHM+lSQK5psL5fvbp/JvJLGCQqmSWM5JkiCT84igXGtSrruKLQ0T + luAdmZxHBG37FFuWBC/j5XKOmX8WAH7rcI6ZMffPgjQwN2bXJgDo/COBTpjneQ2dML0PY3cISreGe8HM + qgAAAABJRU5ErkJggg== + + + \ No newline at end of file diff --git a/TravelCompany/TravelCompany/FormTravel.Designer.cs b/TravelCompany/TravelCompany/FormTravel.Designer.cs new file mode 100644 index 0000000..39214b1 --- /dev/null +++ b/TravelCompany/TravelCompany/FormTravel.Designer.cs @@ -0,0 +1,232 @@ +namespace TravelCompanyView +{ + partial class FormTravel + { + /// + /// 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() + { + textBoxPrice = new TextBox(); + textBoxName = new TextBox(); + label2 = new Label(); + label1 = new Label(); + groupBox1 = new GroupBox(); + buttonRef = new Button(); + buttonDel = new Button(); + buttonUpd = new Button(); + buttonAdd = new Button(); + dataGridView = new DataGridView(); + Number = new DataGridViewTextBoxColumn(); + Component = new DataGridViewTextBoxColumn(); + Count = new DataGridViewTextBoxColumn(); + buttonCancel = new Button(); + buttonSave = new Button(); + groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // textBoxPrice + // + textBoxPrice.Location = new Point(123, 45); + textBoxPrice.Name = "textBoxPrice"; + textBoxPrice.Size = new Size(169, 27); + textBoxPrice.TabIndex = 9; + // + // textBoxName + // + textBoxName.Location = new Point(123, 12); + textBoxName.Name = "textBoxName"; + textBoxName.Size = new Size(287, 27); + textBoxName.TabIndex = 8; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(28, 52); + label2.Name = "label2"; + label2.Size = new Size(86, 20); + label2.TabIndex = 7; + label2.Text = "Стоимость:"; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(28, 19); + label1.Name = "label1"; + label1.Size = new Size(80, 20); + label1.TabIndex = 6; + label1.Text = "Название:"; + // + // groupBox1 + // + groupBox1.Controls.Add(buttonRef); + groupBox1.Controls.Add(buttonDel); + groupBox1.Controls.Add(buttonUpd); + groupBox1.Controls.Add(buttonAdd); + groupBox1.Controls.Add(dataGridView); + groupBox1.Location = new Point(12, 93); + groupBox1.Name = "groupBox1"; + groupBox1.Size = new Size(743, 433); + groupBox1.TabIndex = 10; + groupBox1.TabStop = false; + groupBox1.Text = "Компоненты"; + // + // buttonRef + // + buttonRef.Location = new Point(615, 224); + buttonRef.Margin = new Padding(3, 4, 3, 4); + buttonRef.Name = "buttonRef"; + buttonRef.Size = new Size(111, 37); + buttonRef.TabIndex = 7; + buttonRef.Text = "Обновить"; + buttonRef.UseVisualStyleBackColor = true; + buttonRef.Click += buttonDel_Click; + // + // buttonDel + // + buttonDel.Location = new Point(615, 172); + buttonDel.Margin = new Padding(3, 4, 3, 4); + buttonDel.Name = "buttonDel"; + buttonDel.Size = new Size(111, 37); + buttonDel.TabIndex = 6; + buttonDel.Text = "Удалить"; + buttonDel.UseVisualStyleBackColor = true; + buttonDel.Click += buttonDel_Click; + // + // buttonUpd + // + buttonUpd.Location = new Point(615, 113); + buttonUpd.Margin = new Padding(3, 4, 3, 4); + buttonUpd.Name = "buttonUpd"; + buttonUpd.Size = new Size(111, 37); + buttonUpd.TabIndex = 5; + buttonUpd.Text = "Изменить"; + buttonUpd.UseVisualStyleBackColor = true; + buttonUpd.Click += buttonUpd_Click; + // + // buttonAdd + // + buttonAdd.Location = new Point(615, 52); + buttonAdd.Margin = new Padding(3, 4, 3, 4); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(111, 37); + buttonAdd.TabIndex = 4; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; + // + // dataGridView + // + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Columns.AddRange(new DataGridViewColumn[] { Number, Component, Count }); + dataGridView.Location = new Point(0, 26); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 29; + dataGridView.Size = new Size(598, 407); + dataGridView.TabIndex = 0; + // + // Number + // + Number.HeaderText = "Номер"; + Number.MinimumWidth = 6; + Number.Name = "Number"; + Number.Width = 60; + // + // Component + // + Component.HeaderText = "Компонент"; + Component.MinimumWidth = 6; + Component.Name = "Component"; + Component.Width = 125; + // + // Count + // + Count.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + Count.HeaderText = "Количество"; + Count.MinimumWidth = 6; + Count.Name = "Count"; + // + // buttonCancel + // + buttonCancel.Location = new Point(617, 562); + buttonCancel.Margin = new Padding(3, 4, 3, 4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(130, 37); + buttonCancel.TabIndex = 11; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; + // + // buttonSave + // + buttonSave.Location = new Point(462, 562); + buttonSave.Margin = new Padding(3, 4, 3, 4); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(130, 37); + buttonSave.TabIndex = 12; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; + // + // FormTravel + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(759, 612); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(groupBox1); + Controls.Add(textBoxPrice); + Controls.Add(textBoxName); + Controls.Add(label2); + Controls.Add(label1); + Name = "FormTravel"; + Text = "Туристическая путевка"; + groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private TextBox textBoxPrice; + private TextBox textBoxName; + private Label label2; + private Label label1; + private GroupBox groupBox1; + private Button buttonRef; + private Button buttonDel; + private Button buttonUpd; + private Button buttonAdd; + private DataGridView dataGridView; + private Button buttonCancel; + private Button buttonSave; + private DataGridViewTextBoxColumn Number; + private DataGridViewTextBoxColumn Component; + private DataGridViewTextBoxColumn Count; + } +} \ No newline at end of file diff --git a/TravelCompany/TravelCompany/FormTravel.cs b/TravelCompany/TravelCompany/FormTravel.cs new file mode 100644 index 0000000..2bd7c7d --- /dev/null +++ b/TravelCompany/TravelCompany/FormTravel.cs @@ -0,0 +1,206 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using TravelCompany; +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.BusinessLogicsContracts; +using TravelCompanyContracts.SearchModels; +using TravelCompanyDataModels.Models; + +namespace TravelCompanyView +{ + public partial class FormTravel : Form + { + private readonly ILogger _logger; + private readonly ITravelLogic _logic; + private int? _id; + private Dictionary _productComponents; + public int Id { set { _id = value; } } + public FormTravel(ILogger logger, ITravelLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + _productComponents = new Dictionary(); + } + private void FormTravel_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + _logger.LogInformation("Загрузка изделия"); + try + { + var view = _logic.ReadElement(new TravelSearchModel + { + Id = _id.Value + }); + if (view != null) + { + textBoxName.Text = view.TravelName; + textBoxPrice.Text = view.Price.ToString(); + _productComponents = view.TravelComponents ?? new Dictionary(); + LoadData(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки изделия"); + } + } + } + private void LoadData() + { + _logger.LogInformation("Загрузка компонент изделия"); + try + { + if (_productComponents != null) + { + dataGridView.Rows.Clear(); + foreach (var pc in _productComponents) + { + dataGridView.Rows.Add(new object[] { pc.Key, pc.Value.Item1.ComponentName, pc.Value.Item2 }); + } + textBoxPrice.Text = CalcPrice().ToString(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки компонент изделия"); + } + } + private void buttonAdd_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormTravelComponent)); + if (service is FormTravelComponent form) + { + if (form.ShowDialog() == DialogResult.OK) + { + if (form.ComponentModel == null) + { + return; + } + _logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count} ", form.ComponentModel.ComponentName, form.Count); + if (_productComponents.ContainsKey(form.Id)) + { + _productComponents[form.Id] = (form.ComponentModel, form.Count); + } + else + { + _productComponents.Add(form.Id, (form.ComponentModel, form.Count)); + } + LoadData(); + } + } + } + private void buttonUpd_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormTravelComponent)); + if (service is FormTravelComponent form) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + form.Id = id; + form.Count = _productComponents[id].Item2; + if (form.ShowDialog() == DialogResult.OK) + { + if (form.ComponentModel == null) + { + return; + } + _logger.LogInformation("Изменение компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); + _productComponents[form.Id] = (form.ComponentModel, form.Count); + LoadData(); + } + } + } + } + private void buttonDel_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + try + { + _logger.LogInformation("Удаление компонента: { ComponentName} - { Count}", dataGridView.SelectedRows[0].Cells[1].Value); + _productComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value)); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + LoadData(); + } + } + } + private void buttonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + private void buttonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxName.Text)) + { + MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(textBoxPrice.Text)) + { + MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (_productComponents == null || _productComponents.Count == 0) + { + MessageBox.Show("Заполните компоненты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение изделия"); + try + { + var model = new TravelBindingModel + { + Id = _id ?? 0, + TravelName = textBoxName.Text, + Price = Convert.ToDouble(textBoxPrice.Text), + TravelComponents = _productComponents + }; + var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения изделия"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void buttonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + + private double CalcPrice() + { + double price = 0; + foreach (var elem in _productComponents) + { + price += ((elem.Value.Item1?.Cost ?? 0) * elem.Value.Item2); + } + return Math.Round(price * 1.1, 2); + } + } +} diff --git a/TravelCompany/TravelCompany/FormTravel.resx b/TravelCompany/TravelCompany/FormTravel.resx new file mode 100644 index 0000000..5052aba --- /dev/null +++ b/TravelCompany/TravelCompany/FormTravel.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/TravelCompany/TravelCompany/FormTravelComponent.Designer.cs b/TravelCompany/TravelCompany/FormTravelComponent.Designer.cs new file mode 100644 index 0000000..7fc690b --- /dev/null +++ b/TravelCompany/TravelCompany/FormTravelComponent.Designer.cs @@ -0,0 +1,118 @@ +namespace TravelCompanyView +{ + partial class FormTravelComponent + { + /// + /// 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() + { + buttonSave = new Button(); + buttonCancel = new Button(); + label2 = new Label(); + label1 = new Label(); + comboBoxComponent = new ComboBox(); + textBoxCount = new TextBox(); + SuspendLayout(); + // + // buttonSave + // + buttonSave.Location = new Point(198, 104); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(94, 29); + buttonSave.TabIndex = 0; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(298, 104); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(94, 29); + buttonCancel.TabIndex = 1; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(12, 61); + label2.Name = "label2"; + label2.Size = new Size(93, 20); + label2.TabIndex = 5; + label2.Text = "Количество:"; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(12, 21); + label1.Name = "label1"; + label1.Size = new Size(91, 20); + label1.TabIndex = 4; + label1.Text = "Компонент:"; + // + // comboBoxComponent + // + comboBoxComponent.FormattingEnabled = true; + comboBoxComponent.Location = new Point(120, 13); + comboBoxComponent.Name = "comboBoxComponent"; + comboBoxComponent.Size = new Size(272, 28); + comboBoxComponent.TabIndex = 6; + // + // textBoxCount + // + textBoxCount.Location = new Point(120, 54); + textBoxCount.Name = "textBoxCount"; + textBoxCount.Size = new Size(272, 27); + textBoxCount.TabIndex = 7; + // + // FormTravelComponentcs + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(424, 146); + Controls.Add(textBoxCount); + Controls.Add(comboBoxComponent); + Controls.Add(label2); + Controls.Add(label1); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Name = "FormTravelComponentcs"; + Text = "Компонент туристической путевки"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Button buttonSave; + private Button buttonCancel; + private Label label2; + private Label label1; + private ComboBox comboBoxComponent; + private TextBox textBoxCount; + } +} \ No newline at end of file diff --git a/TravelCompany/TravelCompany/FormTravelComponent.cs b/TravelCompany/TravelCompany/FormTravelComponent.cs new file mode 100644 index 0000000..9abfe02 --- /dev/null +++ b/TravelCompany/TravelCompany/FormTravelComponent.cs @@ -0,0 +1,89 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using TravelCompanyContracts.BusinessLogicsContracts; +using TravelCompanyContracts.ViewModels; +using TravelCompanyDataModels.Models; + +namespace TravelCompanyView +{ + public partial class FormTravelComponent : Form + { + private readonly List? _list; + public int Id + { + get + { + return Convert.ToInt32(comboBoxComponent.SelectedValue); + } + set + { + comboBoxComponent.SelectedValue = value; + } + } + public IComponentModel? ComponentModel + { + get + { + if (_list == null) + { + return null; + } + foreach (var elem in _list) + { + if (elem.Id == Id) + { + return elem; + } + } + return null; + } + } + public int Count + { + get { return Convert.ToInt32(textBoxCount.Text); } + set { textBoxCount.Text = value.ToString(); } + } + + public FormTravelComponent(IComponentLogic logic) + { + InitializeComponent(); + + _list = logic.ReadList(null); + if (_list != null) + { + comboBoxComponent.DisplayMember = "ComponentName"; + comboBoxComponent.ValueMember = "Id"; + comboBoxComponent.DataSource = _list; + comboBoxComponent.SelectedItem = null; + } + } + + private void buttonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxComponent.SelectedValue == null) + { + MessageBox.Show("Выберите компонент", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + DialogResult = DialogResult.OK; + Close(); + } + private void buttonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/TravelCompany/TravelCompany/FormTravelComponent.resx b/TravelCompany/TravelCompany/FormTravelComponent.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/TravelCompany/TravelCompany/FormTravelComponent.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/TravelCompany/TravelCompany/FormTravels.Designer.cs b/TravelCompany/TravelCompany/FormTravels.Designer.cs new file mode 100644 index 0000000..dcaf76b --- /dev/null +++ b/TravelCompany/TravelCompany/FormTravels.Designer.cs @@ -0,0 +1,113 @@ +namespace TravelCompanyView +{ + partial class FormTravels + { + /// + /// 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(); + buttonAdd = new Button(); + buttonUpd = new Button(); + buttonDel = new Button(); + buttonRef = new Button(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Location = new Point(1, 0); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 29; + dataGridView.Size = new Size(710, 566); + dataGridView.TabIndex = 0; + // + // buttonAdd + // + buttonAdd.Location = new Point(725, 64); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(156, 35); + buttonAdd.TabIndex = 1; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; + // + // buttonUpd + // + buttonUpd.Location = new Point(725, 105); + buttonUpd.Name = "buttonUpd"; + buttonUpd.Size = new Size(156, 35); + buttonUpd.TabIndex = 2; + buttonUpd.Text = "Изменить"; + buttonUpd.UseVisualStyleBackColor = true; + buttonUpd.Click += buttonUpd_Click; + // + // buttonDel + // + buttonDel.Location = new Point(725, 146); + buttonDel.Name = "buttonDel"; + buttonDel.Size = new Size(156, 35); + buttonDel.TabIndex = 3; + buttonDel.Text = "Удалить"; + buttonDel.UseVisualStyleBackColor = true; + buttonDel.Click += buttonDel_Click; + // + // buttonRef + // + buttonRef.Location = new Point(725, 187); + buttonRef.Name = "buttonRef"; + buttonRef.Size = new Size(156, 35); + buttonRef.TabIndex = 4; + buttonRef.Text = "Обновить"; + buttonRef.UseVisualStyleBackColor = true; + buttonRef.Click += buttonRef_Click; + // + // FormTravels + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(896, 567); + Controls.Add(buttonRef); + Controls.Add(buttonDel); + Controls.Add(buttonUpd); + Controls.Add(buttonAdd); + Controls.Add(dataGridView); + Name = "FormTravels"; + Text = "Список туристических путевок"; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridView; + private Button buttonAdd; + private Button buttonUpd; + private Button buttonDel; + private Button buttonRef; + } +} \ No newline at end of file diff --git a/TravelCompany/TravelCompany/FormTravels.cs b/TravelCompany/TravelCompany/FormTravels.cs new file mode 100644 index 0000000..185e21a --- /dev/null +++ b/TravelCompany/TravelCompany/FormTravels.cs @@ -0,0 +1,115 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using TravelCompany; +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.BusinessLogicsContracts; + +namespace TravelCompanyView +{ + public partial class FormTravels : Form + { + private readonly ILogger _logger; + private readonly ITravelLogic _logic; + public FormTravels(ILogger logger, ITravelLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormTravels_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["TravelComponents"].Visible = false; + dataGridView.Columns["TravelName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка путёвок"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки компонентов"); + } + } + + private void buttonAdd_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormTravel)); + if (service is FormTravel form) + { + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + + private void buttonUpd_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormTravel)); + if (service is FormTravel form) + { + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + + private void buttonDel_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + int id = + Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Удаление путёвок"); + try + { + if (!_logic.Delete(new TravelBindingModel + { + Id = id + })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка удаления путевки"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + + private void buttonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/TravelCompany/TravelCompany/FormTravels.resx b/TravelCompany/TravelCompany/FormTravels.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/TravelCompany/TravelCompany/FormTravels.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/TravelCompany/TravelCompany/Program.cs b/TravelCompany/TravelCompany/Program.cs index 9429054..d9d35e6 100644 --- a/TravelCompany/TravelCompany/Program.cs +++ b/TravelCompany/TravelCompany/Program.cs @@ -1,7 +1,18 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using NLog.Extensions.Logging; +using TravelCompanyBusinessLogic.BusinessLogic; +using TravelCompanyContracts.BusinessLogicsContracts; +using TravelCompanyContracts.StoragesContracts; +using TravelCompanyListImplement.Implements; +using TravelCompanyView; + namespace TravelCompany { internal static class Program { + private static ServiceProvider? _serviceProvider; + public static ServiceProvider? ServiceProvider => _serviceProvider; /// /// The main entry point for the application. /// @@ -11,7 +22,32 @@ namespace TravelCompany // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new Form1()); + var services = new ServiceCollection(); + ConfigureServices(services); + _serviceProvider = services.BuildServiceProvider(); + + Application.Run(_serviceProvider.GetRequiredService()); + } + private static void ConfigureServices(ServiceCollection services) + { + services.AddLogging(option => + { + option.SetMinimumLevel(LogLevel.Information); + option.AddNLog("nlog.config"); + }); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/TravelCompany/TravelCompany/Properties/Resources.Designer.cs b/TravelCompany/TravelCompany/Properties/Resources.Designer.cs new file mode 100644 index 0000000..14dbbc1 --- /dev/null +++ b/TravelCompany/TravelCompany/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +namespace TravelCompanyView.Properties { + using System; + + + /// + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. + /// + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TravelCompanyView.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/TravelCompany/TravelCompany/Form1.resx b/TravelCompany/TravelCompany/Properties/Resources.resx similarity index 100% rename from TravelCompany/TravelCompany/Form1.resx rename to TravelCompany/TravelCompany/Properties/Resources.resx diff --git a/TravelCompany/TravelCompany/TravelCompanyView.csproj b/TravelCompany/TravelCompany/TravelCompanyView.csproj new file mode 100644 index 0000000..f1ce2a6 --- /dev/null +++ b/TravelCompany/TravelCompany/TravelCompanyView.csproj @@ -0,0 +1,41 @@ + + + + WinExe + net6.0-windows + enable + true + enable + + + + + + + + + + + + + + + + + + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + \ No newline at end of file diff --git a/TravelCompany/TravelCompany/nlog.config b/TravelCompany/TravelCompany/nlog.config new file mode 100644 index 0000000..af70d20 --- /dev/null +++ b/TravelCompany/TravelCompany/nlog.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/ComponentLogic.cs b/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/ComponentLogic.cs new file mode 100644 index 0000000..c3112f3 --- /dev/null +++ b/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/ComponentLogic.cs @@ -0,0 +1,113 @@ +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.BusinessLogicsContracts; +using TravelCompanyContracts.SearchModels; +using TravelCompanyContracts.StoragesContracts; +using TravelCompanyContracts.ViewModels; +using Microsoft.Extensions.Logging; + +namespace TravelCompanyBusinessLogic.BusinessLogic +{ + public class ComponentLogic : IComponentLogic + { + private readonly ILogger _logger; + private readonly IComponentStorage _componentStorage; + public ComponentLogic(ILogger logger, IComponentStorage + componentStorage) + { + _logger = logger; + _componentStorage = componentStorage; + } + public List? ReadList(ComponentSearchModel? model) + { + _logger.LogInformation("ReadList. ComponentName:{ComponentName}.Id:{Id}", model?.ComponentName, model?.Id); + var list = model == null ? _componentStorage.GetFullList() : _componentStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + + public ComponentViewModel? ReadElement(ComponentSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. ComponentName:{ComponentName}.Id:{Id}", model.ComponentName, model.Id); + var element = _componentStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); + return element; + } + + public bool Create(ComponentBindingModel model) + { + CheckModel(model); + if (_componentStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool Update(ComponentBindingModel model) + { + CheckModel(model); + if (_componentStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + + public bool Delete(ComponentBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_componentStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + + private void CheckModel(ComponentBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.ComponentName)) + { + throw new ArgumentNullException("Нет названия компонента", nameof(model.ComponentName)); + } + if (model.Cost <= 0) + { + throw new ArgumentNullException("Цена компонента должна быть больше 0", nameof(model.Cost)); + } + _logger.LogInformation("Component. ComponentName:{ComponentName}.Cost:{Cost}. Id: {Id}", model.ComponentName, model.Cost, model.Id); + var element = _componentStorage.GetElement(new ComponentSearchModel + { + ComponentName = model.ComponentName + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Компонент с таким названием уже есть"); + } + } + } +} \ No newline at end of file diff --git a/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/OrderLogic.cs b/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/OrderLogic.cs new file mode 100644 index 0000000..e7c1295 --- /dev/null +++ b/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/OrderLogic.cs @@ -0,0 +1,141 @@ +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.BusinessLogicsContracts; +using TravelCompanyContracts.SearchModels; +using TravelCompanyContracts.StoragesContracts; +using TravelCompanyContracts.ViewModels; +using TravelCompanyDataModels.Enums; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyBusinessLogic.BusinessLogic +{ + 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. OrderId:{Id}", model?.Id); + var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + + public bool CreateOrder(OrderBindingModel model) + { + CheckModel(model); + + if (model.Status != OrderStatus.Неизвестен) + return false; + model.Status = OrderStatus.Принят; + + if (_orderStorage.Insert(model) == null) + { + model.Status = OrderStatus.Неизвестен; + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool TakeOrderInWork(OrderBindingModel model) + { + return ToNextStatus(model, OrderStatus.Выполняется); + } + + public bool FinishOrder(OrderBindingModel model) + { + return ToNextStatus(model, OrderStatus.Готов); + } + + public bool DeliveryOrder(OrderBindingModel model) + { + return ToNextStatus(model, OrderStatus.Выдан); + } + + public bool ToNextStatus(OrderBindingModel model, OrderStatus orderStatus) + { + CheckModel(model, false); + var element = _orderStorage.GetElement(new OrderSearchModel() + { + Id = model.Id + }); + if (element == null) + { + throw new ArgumentNullException(nameof(element)); + } + + model.TravelId = element.TravelId; + model.DateCreate = element.DateCreate; + model.DateImplement = element.DateImplement; + model.Status = element.Status; + model.Count = element.Count; + model.Sum = element.Sum; + + if (model.Status != orderStatus - 1) + { + _logger.LogWarning("Status update to " + orderStatus + " operation failed"); + return false; + } + model.Status = orderStatus; + + if (model.Status == OrderStatus.Выдан) + { + model.DateImplement = DateTime.Now; + } + + if (_orderStorage.Update(model) == null) + { + model.Status--; + _logger.LogWarning("Changing status operation faled"); + 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)); + } + if (model.DateImplement.HasValue && model.DateImplement < model.DateCreate) + { + throw new ArithmeticException($"Дата выдачи заказа {model.DateImplement} должна быть позже даты его создания {model.DateCreate}"); + } + _logger.LogInformation("Travel. TravelId:{TravelId}.Count:{Count}.Sum:{Sum}Id:{Id}", model.TravelId, model.Count, model.Sum, model.Id); + } + } +} diff --git a/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/TravelLogic.cs b/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/TravelLogic.cs new file mode 100644 index 0000000..1e5348b --- /dev/null +++ b/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/TravelLogic.cs @@ -0,0 +1,118 @@ +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.BusinessLogicsContracts; +using TravelCompanyContracts.SearchModels; +using TravelCompanyContracts.StoragesContracts; +using TravelCompanyContracts.ViewModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyBusinessLogic.BusinessLogic +{ + public class TravelLogic : TravelCompanyContracts.BusinessLogicsContracts.ITravelLogic + { + private readonly ILogger _logger; + private readonly ITravelStorage _TravelStorage; + public TravelLogic(ILogger logger, ITravelStorage + TravelStorage) + { + _logger = logger; + _TravelStorage = TravelStorage; + } + public List? ReadList(TravelSearchModel? model) + { + _logger.LogInformation("ReadList. TravelName:{TravelName}.Id:{Id}", model?.TravelName, model?.Id); + var list = model == null ? _TravelStorage.GetFullList() : _TravelStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + + public TravelViewModel? ReadElement(TravelSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. TravelName:{TravelName}.Id:{Id}", model.TravelName, model.Id); + var element = _TravelStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); + return element; + } + + public bool Create(TravelBindingModel model) + { + CheckModel(model); + if (_TravelStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool Update(TravelBindingModel model) + { + CheckModel(model); + if (_TravelStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + + public bool Delete(TravelBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_TravelStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + + private void CheckModel(TravelBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.TravelName)) + { + throw new ArgumentNullException("Нет названия изделия", nameof(model.TravelName)); + } + if (model.Price <= 0) + { + throw new ArgumentNullException("Цена изделия должна быть больше 0", nameof(model.Price)); + } + _logger.LogInformation("Travel. TravelName:{TravelName}.Price:{Cost}. Id: {Id}", model.TravelName, model.Price, model.Id); + var element = _TravelStorage.GetElement(new TravelSearchModel + { + TravelName = model.TravelName + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Изделие с таким названием уже есть"); + } + } + } +} diff --git a/TravelCompany/TravelCompanyBusinessLogic/TravelCompanyBusinessLogic.csproj b/TravelCompany/TravelCompanyBusinessLogic/TravelCompanyBusinessLogic.csproj new file mode 100644 index 0000000..901b63b --- /dev/null +++ b/TravelCompany/TravelCompanyBusinessLogic/TravelCompanyBusinessLogic.csproj @@ -0,0 +1,22 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + + + + + diff --git a/TravelCompany/TravelCompanyContracts/BindingModels/ComponentBindingModel.cs b/TravelCompany/TravelCompanyContracts/BindingModels/ComponentBindingModel.cs new file mode 100644 index 0000000..ee3837f --- /dev/null +++ b/TravelCompany/TravelCompanyContracts/BindingModels/ComponentBindingModel.cs @@ -0,0 +1,16 @@ +using TravelCompanyDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyContracts.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/TravelCompany/TravelCompanyContracts/BindingModels/OrderBindingModel.cs b/TravelCompany/TravelCompanyContracts/BindingModels/OrderBindingModel.cs new file mode 100644 index 0000000..20802d2 --- /dev/null +++ b/TravelCompany/TravelCompanyContracts/BindingModels/OrderBindingModel.cs @@ -0,0 +1,21 @@ +using TravelCompanyDataModels.Enums; +using TravelCompanyDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyContracts.BindingModels +{ + public class OrderBindingModel : IOrderModel + { + public int Id { get; set; } + public int TravelId { get; set; } + public int Count { get; set; } + public double Sum { get; set; } + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + public DateTime DateCreate { get; set; } = DateTime.Now; + public DateTime? DateImplement { get; set; } + } +} diff --git a/TravelCompany/TravelCompanyContracts/BindingModels/TravelBindingModel.cs b/TravelCompany/TravelCompanyContracts/BindingModels/TravelBindingModel.cs new file mode 100644 index 0000000..49993f0 --- /dev/null +++ b/TravelCompany/TravelCompanyContracts/BindingModels/TravelBindingModel.cs @@ -0,0 +1,17 @@ +using TravelCompanyDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyContracts.BindingModels +{ + public class TravelBindingModel : ITravelModel + { + public int Id { get; set; } + public string TravelName { get; set; } = string.Empty; + public double Price { get; set; } + public Dictionary TravelComponents { get; set; } = new(); + } +} diff --git a/TravelCompany/TravelCompanyContracts/BusinessLogicContracts/IComponentLogic.cs b/TravelCompany/TravelCompanyContracts/BusinessLogicContracts/IComponentLogic.cs new file mode 100644 index 0000000..f7af27c --- /dev/null +++ b/TravelCompany/TravelCompanyContracts/BusinessLogicContracts/IComponentLogic.cs @@ -0,0 +1,21 @@ +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.SearchModels; +using TravelCompanyContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyContracts.BusinessLogicsContracts +{ + 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/TravelCompany/TravelCompanyContracts/BusinessLogicContracts/IOrderLogic.cs b/TravelCompany/TravelCompanyContracts/BusinessLogicContracts/IOrderLogic.cs new file mode 100644 index 0000000..03a4beb --- /dev/null +++ b/TravelCompany/TravelCompanyContracts/BusinessLogicContracts/IOrderLogic.cs @@ -0,0 +1,30 @@ +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.SearchModels; +using TravelCompanyContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyContracts.BusinessLogicsContracts +{ + public interface IOrderLogic + { + List? ReadList(OrderSearchModel? model); + bool CreateOrder(OrderBindingModel model); + bool TakeOrderInWork(OrderBindingModel model); + /// + /// Готов + /// + /// + /// + bool FinishOrder(OrderBindingModel model); + /// + /// Доставлен + /// + /// + /// + bool DeliveryOrder(OrderBindingModel model); + } +} diff --git a/TravelCompany/TravelCompanyContracts/BusinessLogicContracts/ITravelLogic.cs b/TravelCompany/TravelCompanyContracts/BusinessLogicContracts/ITravelLogic.cs new file mode 100644 index 0000000..d499914 --- /dev/null +++ b/TravelCompany/TravelCompanyContracts/BusinessLogicContracts/ITravelLogic.cs @@ -0,0 +1,20 @@ +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.SearchModels; +using TravelCompanyContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyContracts.BusinessLogicsContracts +{ + public interface ITravelLogic + { + List? ReadList(TravelSearchModel? model); + TravelViewModel? ReadElement(TravelSearchModel model); + bool Create(TravelBindingModel model); + bool Update(TravelBindingModel model); + bool Delete(TravelBindingModel model); + } +} diff --git a/TravelCompany/TravelCompanyContracts/SearchModels/ComponentSearchModel.cs b/TravelCompany/TravelCompanyContracts/SearchModels/ComponentSearchModel.cs new file mode 100644 index 0000000..9d6102f --- /dev/null +++ b/TravelCompany/TravelCompanyContracts/SearchModels/ComponentSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyContracts.SearchModels +{ + public class ComponentSearchModel + { + public int? Id { get; set; } + public string? ComponentName { get; set; } + } +} diff --git a/TravelCompany/TravelCompanyContracts/SearchModels/OrderSearchModel.cs b/TravelCompany/TravelCompanyContracts/SearchModels/OrderSearchModel.cs new file mode 100644 index 0000000..d2c7549 --- /dev/null +++ b/TravelCompany/TravelCompanyContracts/SearchModels/OrderSearchModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyContracts.SearchModels +{ + public class OrderSearchModel + { + public int? Id { get; set; } + } +} diff --git a/TravelCompany/TravelCompanyContracts/SearchModels/TravelSearchModel.cs b/TravelCompany/TravelCompanyContracts/SearchModels/TravelSearchModel.cs new file mode 100644 index 0000000..6b13d69 --- /dev/null +++ b/TravelCompany/TravelCompanyContracts/SearchModels/TravelSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyContracts.SearchModels +{ + public class TravelSearchModel + { + public int? Id { get; set; } + public string? TravelName { get; set; } + } +} diff --git a/TravelCompany/TravelCompanyContracts/StoragesContracts/IComponentStorage.cs b/TravelCompany/TravelCompanyContracts/StoragesContracts/IComponentStorage.cs new file mode 100644 index 0000000..617243a --- /dev/null +++ b/TravelCompany/TravelCompanyContracts/StoragesContracts/IComponentStorage.cs @@ -0,0 +1,22 @@ +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.SearchModels; +using TravelCompanyContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyContracts.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/TravelCompany/TravelCompanyContracts/StoragesContracts/IOrderStorage.cs b/TravelCompany/TravelCompanyContracts/StoragesContracts/IOrderStorage.cs new file mode 100644 index 0000000..b4d8462 --- /dev/null +++ b/TravelCompany/TravelCompanyContracts/StoragesContracts/IOrderStorage.cs @@ -0,0 +1,21 @@ +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.SearchModels; +using TravelCompanyContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyContracts.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/TravelCompany/TravelCompanyContracts/StoragesContracts/ITravelStorage.cs b/TravelCompany/TravelCompanyContracts/StoragesContracts/ITravelStorage.cs new file mode 100644 index 0000000..b85d24b --- /dev/null +++ b/TravelCompany/TravelCompanyContracts/StoragesContracts/ITravelStorage.cs @@ -0,0 +1,21 @@ +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.SearchModels; +using TravelCompanyContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyContracts.StoragesContracts +{ + public interface ITravelStorage + { + List GetFullList(); + List GetFilteredList(TravelSearchModel model); + TravelViewModel? GetElement(TravelSearchModel model); + TravelViewModel? Insert(TravelBindingModel model); + TravelViewModel? Update(TravelBindingModel model); + TravelViewModel? Delete(TravelBindingModel model); + } +} diff --git a/TravelCompany/TravelCompanyContracts/TravelCompanyContracts.csproj b/TravelCompany/TravelCompanyContracts/TravelCompanyContracts.csproj new file mode 100644 index 0000000..f3c43e1 --- /dev/null +++ b/TravelCompany/TravelCompanyContracts/TravelCompanyContracts.csproj @@ -0,0 +1,22 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + + + + + diff --git a/TravelCompany/TravelCompanyContracts/ViewModels/ComponentViewModel.cs b/TravelCompany/TravelCompanyContracts/ViewModels/ComponentViewModel.cs new file mode 100644 index 0000000..f865958 --- /dev/null +++ b/TravelCompany/TravelCompanyContracts/ViewModels/ComponentViewModel.cs @@ -0,0 +1,19 @@ +using TravelCompanyDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyContracts.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/TravelCompany/TravelCompanyContracts/ViewModels/OrderViewModel.cs b/TravelCompany/TravelCompanyContracts/ViewModels/OrderViewModel.cs new file mode 100644 index 0000000..022bc49 --- /dev/null +++ b/TravelCompany/TravelCompanyContracts/ViewModels/OrderViewModel.cs @@ -0,0 +1,29 @@ +using TravelCompanyDataModels.Enums; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyContracts.ViewModels +{ + public class OrderViewModel + { + [DisplayName("Номер")] + public int Id { get; set; } + public int TravelId { get; set; } + [DisplayName("Изделие")] + public string TravelName { get; set; } = string.Empty; + [DisplayName("Количество")] + public int Count { get; set; } + [DisplayName("Сумма")] + public double Sum { get; set; } + [DisplayName("Статус")] + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + [DisplayName("Дата создания")] + public DateTime DateCreate { get; set; } = DateTime.Now; + [DisplayName("Дата выполнения")] + public DateTime? DateImplement { get; set; } + } +} diff --git a/TravelCompany/TravelCompanyContracts/ViewModels/TravelViewModel.cs b/TravelCompany/TravelCompanyContracts/ViewModels/TravelViewModel.cs new file mode 100644 index 0000000..d8c1e55 --- /dev/null +++ b/TravelCompany/TravelCompanyContracts/ViewModels/TravelViewModel.cs @@ -0,0 +1,21 @@ +using TravelCompanyDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyContracts.ViewModels +{ + public class TravelViewModel : ITravelModel + { + public int Id { get; set; } + [DisplayName("Название изделия")] + public string TravelName { get; set; } + [DisplayName("Цена")] + public double Price { get; set; } + public Dictionary TravelComponents { get; set; } = new(); + + } +} diff --git a/TravelCompany/TravelCompanyDataModels/Enums/OrderStatus.cs b/TravelCompany/TravelCompanyDataModels/Enums/OrderStatus.cs new file mode 100644 index 0000000..0e8a2ca --- /dev/null +++ b/TravelCompany/TravelCompanyDataModels/Enums/OrderStatus.cs @@ -0,0 +1,11 @@ +namespace TravelCompanyDataModels.Enums +{ + public enum OrderStatus + { + Неизвестен = -1, + Принят = 0, + Выполняется = 1, + Готов = 2, + Выдан = 3, + } +} \ No newline at end of file diff --git a/TravelCompany/TravelCompanyDataModels/IId.cs b/TravelCompany/TravelCompanyDataModels/IId.cs new file mode 100644 index 0000000..cdccdc8 --- /dev/null +++ b/TravelCompany/TravelCompanyDataModels/IId.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyDataModels +{ + public interface IId + { + int Id { get; } + } +} diff --git a/TravelCompany/TravelCompanyDataModels/Models/IComponentModel.cs b/TravelCompany/TravelCompanyDataModels/Models/IComponentModel.cs new file mode 100644 index 0000000..946afa3 --- /dev/null +++ b/TravelCompany/TravelCompanyDataModels/Models/IComponentModel.cs @@ -0,0 +1,8 @@ +namespace TravelCompanyDataModels.Models +{ + public interface IComponentModel : IId + { + string ComponentName { get; } + double Cost { get; } + } +} \ No newline at end of file diff --git a/TravelCompany/TravelCompanyDataModels/Models/IOrderModel.cs b/TravelCompany/TravelCompanyDataModels/Models/IOrderModel.cs new file mode 100644 index 0000000..22a55af --- /dev/null +++ b/TravelCompany/TravelCompanyDataModels/Models/IOrderModel.cs @@ -0,0 +1,14 @@ +using TravelCompanyDataModels.Enums; + +namespace TravelCompanyDataModels.Models +{ + public interface IOrderModel : IId + { + int TravelId { get; } + int Count { get; } + double Sum { get; } + OrderStatus Status { get; } + DateTime DateCreate { get; } + DateTime? DateImplement { get; } + } +} \ No newline at end of file diff --git a/TravelCompany/TravelCompanyDataModels/Models/ITravelModel.cs b/TravelCompany/TravelCompanyDataModels/Models/ITravelModel.cs new file mode 100644 index 0000000..101f593 --- /dev/null +++ b/TravelCompany/TravelCompanyDataModels/Models/ITravelModel.cs @@ -0,0 +1,9 @@ +namespace TravelCompanyDataModels.Models +{ + public interface ITravelModel : IId + { + string TravelName { get; } + double Price { get; } + Dictionary TravelComponents { get; } + } +} \ No newline at end of file diff --git a/TravelCompany/TravelCompanyDataModels/TravelCompanyDataModels.csproj b/TravelCompany/TravelCompanyDataModels/TravelCompanyDataModels.csproj new file mode 100644 index 0000000..d80c28f --- /dev/null +++ b/TravelCompany/TravelCompanyDataModels/TravelCompanyDataModels.csproj @@ -0,0 +1,18 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + diff --git a/TravelCompany/TravelCompanyListImplement/DataListSingleton.cs b/TravelCompany/TravelCompanyListImplement/DataListSingleton.cs new file mode 100644 index 0000000..01817fb --- /dev/null +++ b/TravelCompany/TravelCompanyListImplement/DataListSingleton.cs @@ -0,0 +1,31 @@ +using TravelCompanyListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyListImplement +{ + internal class DataListSingleton + { + private static DataListSingleton? _instance; + public List Components { get; set; } + public List Orders { get; set; } + public List Travels { get; set; } + private DataListSingleton() + { + Components = new List(); + Orders = new List(); + Travels = new List(); + } + public static DataListSingleton GetInstance() + { + if (_instance == null) + { + _instance = new DataListSingleton(); + } + return _instance; + } + } +} diff --git a/TravelCompany/TravelCompanyListImplement/Implements/ComponentStorage.cs b/TravelCompany/TravelCompanyListImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..dddef2b --- /dev/null +++ b/TravelCompany/TravelCompanyListImplement/Implements/ComponentStorage.cs @@ -0,0 +1,106 @@ +using TravelCompanyContracts.StoragesContracts; +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.SearchModels; +using TravelCompanyContracts.ViewModels; +using TravelCompanyListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyListImplement.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/TravelCompany/TravelCompanyListImplement/Implements/OrderStorage.cs b/TravelCompany/TravelCompanyListImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..0676fe2 --- /dev/null +++ b/TravelCompany/TravelCompanyListImplement/Implements/OrderStorage.cs @@ -0,0 +1,125 @@ +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.SearchModels; +using TravelCompanyContracts.StoragesContracts; +using TravelCompanyContracts.ViewModels; +using TravelCompanyListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyListImplement.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(AttachTravelName(order.GetViewModel)); + } + return result; + } + + public List GetFilteredList(OrderSearchModel model) + { + var result = new List(); + if (model == null || !model.Id.HasValue) + { + return result; + } + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + result.Add(AttachTravelName(order.GetViewModel)); + } + } + return result; + } + + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return null; + } + foreach (var order in _source.Orders) + { + if (model.Id.HasValue && order.Id == model.Id) + { + return AttachTravelName(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 AttachTravelName(newOrder.GetViewModel); + } + + public OrderViewModel? Update(OrderBindingModel model) + { + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + order.Update(model); + return AttachTravelName(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 AttachTravelName(element.GetViewModel); + } + } + return null; + } + + private OrderViewModel AttachTravelName(OrderViewModel model) + { + foreach (var Travel in _source.Travels) + { + if (Travel.Id == model.TravelId) + { + model.TravelName = Travel.TravelName; + return model; + } + } + return model; + } + } +} diff --git a/TravelCompany/TravelCompanyListImplement/Implements/TravelStorage.cs b/TravelCompany/TravelCompanyListImplement/Implements/TravelStorage.cs new file mode 100644 index 0000000..7673715 --- /dev/null +++ b/TravelCompany/TravelCompanyListImplement/Implements/TravelStorage.cs @@ -0,0 +1,112 @@ +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.SearchModels; +using TravelCompanyContracts.StoragesContracts; +using TravelCompanyContracts.ViewModels; +using TravelCompanyListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyListImplement.Implements +{ + public class TravelStorage : ITravelStorage + { + private readonly DataListSingleton _source; + public TravelStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public TravelViewModel? Delete(TravelBindingModel model) + { + for (int i = 0; i < _source.Travels.Count; ++i) + { + if (_source.Travels[i].Id == model.Id) + { + var element = _source.Travels[i]; + _source.Travels.RemoveAt(i); + return element.GetViewModel; + } + } + return null; + } + + public TravelViewModel? GetElement(TravelSearchModel model) + { + if (string.IsNullOrEmpty(model.TravelName) && !model.Id.HasValue) + { + return null; + } + foreach (var Travel in _source.Travels) + { + if ((!string.IsNullOrEmpty(model.TravelName) && Travel.TravelName == model.TravelName) || + (model.Id.HasValue && Travel.Id == model.Id)) + { + return Travel.GetViewModel; + } + } + return null; + } + + public List GetFilteredList(TravelSearchModel model) + { + var result = new List(); + if (string.IsNullOrEmpty(model.TravelName)) + { + return result; + } + foreach (var Travel in _source.Travels) + { + if (Travel.TravelName.Contains(model.TravelName)) + { + result.Add(Travel.GetViewModel); + } + } + return result; + } + + public List GetFullList() + { + var result = new List(); + foreach (var Travel in _source.Travels) + { + result.Add(Travel.GetViewModel); + } + return result; + } + + public TravelViewModel? Insert(TravelBindingModel model) + { + model.Id = 1; + foreach (var Travel in _source.Travels) + { + if (model.Id <= Travel.Id) + { + model.Id = Travel.Id + 1; + } + } + var newTravel = Travel.Create(model); + if (newTravel == null) + { + return null; + } + _source.Travels.Add(newTravel); + return newTravel.GetViewModel; + } + + public TravelViewModel? Update(TravelBindingModel model) + { + foreach (var Travel in _source.Travels) + { + if (Travel.Id == model.Id) + { + Travel.Update(model); + return Travel.GetViewModel; + } + } + return null; + } + } +} diff --git a/TravelCompany/TravelCompanyListImplement/Models/Component.cs b/TravelCompany/TravelCompanyListImplement/Models/Component.cs new file mode 100644 index 0000000..1c9f49a --- /dev/null +++ b/TravelCompany/TravelCompanyListImplement/Models/Component.cs @@ -0,0 +1,41 @@ +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.ViewModels; +using TravelCompanyDataModels.Models; + +namespace TravelCompanyListImplement.Models +{ + public class Component : IComponentModel + { + public int Id { get; private set; } + public string ComponentName { get; private set; } = string.Empty; + public double Cost { get; set; } + public static Component? Create(ComponentBindingModel? model) + { + if (model == null) + { + return null; + } + return new Component() + { + Id = model.Id, + ComponentName = model.ComponentName, + Cost = model.Cost + }; + } + public void Update(ComponentBindingModel? model) + { + if (model == null) + { + return; + } + ComponentName = model.ComponentName; + Cost = model.Cost; + } + public ComponentViewModel GetViewModel => new() + { + Id = Id, + ComponentName = ComponentName, + Cost = Cost + }; + } +} \ No newline at end of file diff --git a/TravelCompany/TravelCompanyListImplement/Models/Order.cs b/TravelCompany/TravelCompanyListImplement/Models/Order.cs new file mode 100644 index 0000000..b26f50c --- /dev/null +++ b/TravelCompany/TravelCompanyListImplement/Models/Order.cs @@ -0,0 +1,64 @@ +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.ViewModels; +using TravelCompanyDataModels.Enums; +using TravelCompanyDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyListImplement.Models +{ + public class Order : IOrderModel + { + public int Id { get; private set; } + public int TravelId { get; private set; } + public int Count { get; private set; } + public double Sum { get; private set; } + public OrderStatus Status { get; private set; } + public DateTime DateCreate { get; private set; } + public DateTime? DateImplement { get; private set; } + public static Order? Create(OrderBindingModel? model) + { + if (model == null) + { + return null; + } + return new Order() + { + Id = model.Id, + TravelId = model.TravelId, + Count = model.Count, + Sum = model.Sum, + Status = model.Status, + DateCreate = model.DateCreate, + DateImplement = model.DateImplement, + }; + } + public void Update(OrderBindingModel? model) + { + if (model == null) + { + return; + } + TravelId = model.TravelId; + Count = model.Count; + Sum = model.Sum; + Status = model.Status; + DateCreate = model.DateCreate; + DateImplement = model.DateImplement; + } + public OrderViewModel GetViewModel => new() + { + Id = Id, + TravelId = TravelId, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement, + }; + } +} diff --git a/TravelCompany/TravelCompanyListImplement/Models/Travel.cs b/TravelCompany/TravelCompanyListImplement/Models/Travel.cs new file mode 100644 index 0000000..32ff4bc --- /dev/null +++ b/TravelCompany/TravelCompanyListImplement/Models/Travel.cs @@ -0,0 +1,55 @@ +using TravelCompanyContracts.BindingModels; +using TravelCompanyContracts.ViewModels; +using TravelCompanyDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyListImplement.Models +{ + internal class Travel : ITravelModel + { + public int Id { get; private set; } + public string TravelName { get; private set; } = string.Empty; + public double Price { get; private set; } + public Dictionary TravelComponents + { + get; + private set; + } = new Dictionary(); + public static Travel? Create(TravelBindingModel? model) + { + if (model == null) + { + return null; + } + return new Travel() + { + Id = model.Id, + TravelName = model.TravelName, + Price = model.Price, + TravelComponents = model.TravelComponents + }; + } + public void Update(TravelBindingModel? model) + { + if (model == null) + { + return; + } + TravelName = model.TravelName; + Price = model.Price; + TravelComponents = model.TravelComponents; + } + public TravelViewModel GetViewModel => new() + { + Id = Id, + TravelName = TravelName, + Price = Price, + TravelComponents = TravelComponents + }; + + } +} diff --git a/TravelCompany/TravelCompanyListImplement/TravelCompanyListImplement.csproj b/TravelCompany/TravelCompanyListImplement/TravelCompanyListImplement.csproj new file mode 100644 index 0000000..fd62a0d --- /dev/null +++ b/TravelCompany/TravelCompanyListImplement/TravelCompanyListImplement.csproj @@ -0,0 +1,23 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + + + + + + diff --git a/TravelCompanyDataModels/TravelCompanyDataModels.sln b/TravelCompanyDataModels/TravelCompanyDataModels.sln new file mode 100644 index 0000000..6f4ae04 --- /dev/null +++ b/TravelCompanyDataModels/TravelCompanyDataModels.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.7.34024.191 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TravelCompanyDataModels", "TravelCompanyDataModels\TravelCompanyDataModels.csproj", "{195169D4-7167-4116-AB42-8AAF1D5ED31B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {195169D4-7167-4116-AB42-8AAF1D5ED31B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {195169D4-7167-4116-AB42-8AAF1D5ED31B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {195169D4-7167-4116-AB42-8AAF1D5ED31B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {195169D4-7167-4116-AB42-8AAF1D5ED31B}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {946BD6CC-E6F4-4BF1-98C5-FE9675DF582B} + EndGlobalSection +EndGlobal diff --git a/TravelCompanyDataModels/TravelCompanyDataModels/Enums/OrderStatus.cs b/TravelCompanyDataModels/TravelCompanyDataModels/Enums/OrderStatus.cs new file mode 100644 index 0000000..0e8a2ca --- /dev/null +++ b/TravelCompanyDataModels/TravelCompanyDataModels/Enums/OrderStatus.cs @@ -0,0 +1,11 @@ +namespace TravelCompanyDataModels.Enums +{ + public enum OrderStatus + { + Неизвестен = -1, + Принят = 0, + Выполняется = 1, + Готов = 2, + Выдан = 3, + } +} \ No newline at end of file diff --git a/TravelCompanyDataModels/TravelCompanyDataModels/IId.cs b/TravelCompanyDataModels/TravelCompanyDataModels/IId.cs new file mode 100644 index 0000000..6e78176 --- /dev/null +++ b/TravelCompanyDataModels/TravelCompanyDataModels/IId.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyDataModels +{ + internal class IId + { + } +} diff --git a/TravelCompanyDataModels/TravelCompanyDataModels/Models/IComponentModel.cs b/TravelCompanyDataModels/TravelCompanyDataModels/Models/IComponentModel.cs new file mode 100644 index 0000000..505417f --- /dev/null +++ b/TravelCompanyDataModels/TravelCompanyDataModels/Models/IComponentModel.cs @@ -0,0 +1,10 @@ +using System.Security.Cryptography; + +namespace TravelCompanyDataModels.Models +{ + public interface IComponentModel : IId + { + string ComponentName { get; } + double Cost { get; } + } +} \ No newline at end of file diff --git a/TravelCompanyDataModels/TravelCompanyDataModels/Models/IOrderModel.cs b/TravelCompanyDataModels/TravelCompanyDataModels/Models/IOrderModel.cs new file mode 100644 index 0000000..1623240 --- /dev/null +++ b/TravelCompanyDataModels/TravelCompanyDataModels/Models/IOrderModel.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyDataModels.Models +{ + internal class IOrderModel + { + } +} diff --git a/TravelCompanyDataModels/TravelCompanyDataModels/Models/ITravelModel.cs b/TravelCompanyDataModels/TravelCompanyDataModels/Models/ITravelModel.cs new file mode 100644 index 0000000..1eb835f --- /dev/null +++ b/TravelCompanyDataModels/TravelCompanyDataModels/Models/ITravelModel.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelCompanyDataModels.Models +{ + internal class ITravelModel + { + } +} diff --git a/TravelCompany/TravelCompany/TravelCompany.csproj b/TravelCompanyDataModels/TravelCompanyDataModels/TravelCompanyDataModels.csproj similarity index 51% rename from TravelCompany/TravelCompany/TravelCompany.csproj rename to TravelCompanyDataModels/TravelCompanyDataModels/TravelCompanyDataModels.csproj index b57c89e..27ac386 100644 --- a/TravelCompany/TravelCompany/TravelCompany.csproj +++ b/TravelCompanyDataModels/TravelCompanyDataModels/TravelCompanyDataModels.csproj @@ -1,11 +1,9 @@  - WinExe - net6.0-windows - enable - true + net6.0 enable + enable - \ No newline at end of file + -- 2.25.1 From 92960716b5bd65d3d4d1eaca8235e6bd0a887bc2 Mon Sep 17 00:00:00 2001 From: "a.puchkina" Date: Wed, 28 Feb 2024 01:07:02 +0400 Subject: [PATCH 2/5] =?UTF-8?q?=D1=8F=20=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D0=BB=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TravelCompany/FormCreateOrder.Designer.cs | 47 ++++++++----- .../TravelCompany/FormMain.Designer.cs | 45 ++++++++----- TravelCompany/TravelCompany/FormMain.cs | 2 +- TravelCompany/TravelCompany/FormMain.resx | 2 +- .../TravelCompany/FormTravel.Designer.cs | 66 +++++++++---------- 5 files changed, 91 insertions(+), 71 deletions(-) diff --git a/TravelCompany/TravelCompany/FormCreateOrder.Designer.cs b/TravelCompany/TravelCompany/FormCreateOrder.Designer.cs index 61d1dc6..4f1cdcb 100644 --- a/TravelCompany/TravelCompany/FormCreateOrder.Designer.cs +++ b/TravelCompany/TravelCompany/FormCreateOrder.Designer.cs @@ -41,75 +41,84 @@ // label1 // label1.AutoSize = true; - label1.Location = new Point(12, 9); + label1.Location = new Point(10, 7); label1.Name = "label1"; - label1.Size = new Size(71, 20); + label1.Size = new Size(56, 15); label1.TabIndex = 0; label1.Text = "Изделие:"; // // label2 // label2.AutoSize = true; - label2.Location = new Point(12, 52); + label2.Location = new Point(10, 39); label2.Name = "label2"; - label2.Size = new Size(93, 20); + label2.Size = new Size(75, 15); label2.TabIndex = 1; label2.Text = "Количество:"; // // label3 // label3.AutoSize = true; - label3.Location = new Point(12, 95); + label3.Location = new Point(10, 71); label3.Name = "label3"; - label3.Size = new Size(58, 20); + label3.Size = new Size(48, 15); label3.TabIndex = 2; label3.Text = "Сумма:"; // // comboBoxTravel // comboBoxTravel.FormattingEnabled = true; - comboBoxTravel.Location = new Point(125, 6); + comboBoxTravel.Location = new Point(109, 4); + comboBoxTravel.Margin = new Padding(3, 2, 3, 2); comboBoxTravel.Name = "comboBoxTravel"; - comboBoxTravel.Size = new Size(278, 28); + comboBoxTravel.Size = new Size(244, 23); comboBoxTravel.TabIndex = 3; + comboBoxTravel.SelectedIndexChanged += ComboBoxTravel_SelectedIndexChanged; // // textBoxCount // - textBoxCount.Location = new Point(125, 49); + textBoxCount.Location = new Point(109, 37); + textBoxCount.Margin = new Padding(3, 2, 3, 2); textBoxCount.Name = "textBoxCount"; - textBoxCount.Size = new Size(278, 27); + textBoxCount.Size = new Size(244, 23); textBoxCount.TabIndex = 4; + textBoxCount.TextChanged += textBoxCount_TextChanged; // // textBoxSum // - textBoxSum.Location = new Point(125, 92); + textBoxSum.Location = new Point(109, 69); + textBoxSum.Margin = new Padding(3, 2, 3, 2); textBoxSum.Name = "textBoxSum"; - textBoxSum.Size = new Size(278, 27); + textBoxSum.Size = new Size(244, 23); textBoxSum.TabIndex = 5; // // buttonSave // - buttonSave.Location = new Point(181, 148); + buttonSave.Location = new Point(158, 111); + buttonSave.Margin = new Padding(3, 2, 3, 2); buttonSave.Name = "buttonSave"; - buttonSave.Size = new Size(94, 29); + buttonSave.Size = new Size(82, 22); buttonSave.TabIndex = 6; buttonSave.Text = "Сохранить"; buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; // // buttonCancel // - buttonCancel.Location = new Point(309, 148); + buttonCancel.Location = new Point(270, 111); + buttonCancel.Margin = new Padding(3, 2, 3, 2); buttonCancel.Name = "buttonCancel"; - buttonCancel.Size = new Size(94, 29); + buttonCancel.Size = new Size(82, 22); buttonCancel.TabIndex = 7; buttonCancel.Text = "Отмена"; buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; // // FormCreateOrder // - AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(423, 200); + ClientSize = new Size(370, 150); Controls.Add(buttonCancel); Controls.Add(buttonSave); Controls.Add(textBoxSum); @@ -118,8 +127,10 @@ Controls.Add(label3); Controls.Add(label2); Controls.Add(label1); + Margin = new Padding(3, 2, 3, 2); Name = "FormCreateOrder"; Text = "Заказ"; + Load += FormCreateOrder_Load; ResumeLayout(false); PerformLayout(); } diff --git a/TravelCompany/TravelCompany/FormMain.Designer.cs b/TravelCompany/TravelCompany/FormMain.Designer.cs index bdf68d6..e743bf0 100644 --- a/TravelCompany/TravelCompany/FormMain.Designer.cs +++ b/TravelCompany/TravelCompany/FormMain.Designer.cs @@ -46,13 +46,14 @@ // dataGridView // dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Location = new Point(1, 41); + dataGridView.Location = new Point(1, 31); + dataGridView.Margin = new Padding(3, 2, 3, 2); dataGridView.Name = "dataGridView"; dataGridView.ReadOnly = true; dataGridView.RowHeadersWidth = 51; dataGridView.RowTemplate.Height = 29; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView.Size = new Size(877, 569); + dataGridView.Size = new Size(767, 427); dataGridView.TabIndex = 0; // // toolStrip1 @@ -61,7 +62,7 @@ toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1 }); toolStrip1.Location = new Point(0, 0); toolStrip1.Name = "toolStrip1"; - toolStrip1.Size = new Size(1063, 27); + toolStrip1.Size = new Size(930, 25); toolStrip1.TabIndex = 1; toolStrip1.Text = "toolStrip1"; // @@ -72,26 +73,29 @@ toolStripDropDownButton1.Image = (Image)resources.GetObject("toolStripDropDownButton1.Image"); toolStripDropDownButton1.ImageTransparentColor = Color.Magenta; toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - toolStripDropDownButton1.Size = new Size(108, 24); + toolStripDropDownButton1.Size = new Size(88, 22); toolStripDropDownButton1.Text = "Справочник"; // // компонентыToolStripMenuItem // компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(252, 26); + компонентыToolStripMenuItem.Size = new Size(202, 22); компонентыToolStripMenuItem.Text = "Компоненты"; + компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click; // // туристическиеПутевкиToolStripMenuItem // туристическиеПутевкиToolStripMenuItem.Name = "туристическиеПутевкиToolStripMenuItem"; - туристическиеПутевкиToolStripMenuItem.Size = new Size(252, 26); + туристическиеПутевкиToolStripMenuItem.Size = new Size(202, 22); туристическиеПутевкиToolStripMenuItem.Text = "Туристические путевки"; + туристическиеПутевкиToolStripMenuItem.Click += путевкиToolStripMenuItem_Click; // // buttonCreateeOrder // - buttonCreateeOrder.Location = new Point(891, 103); + buttonCreateeOrder.Location = new Point(780, 77); + buttonCreateeOrder.Margin = new Padding(3, 2, 3, 2); buttonCreateeOrder.Name = "buttonCreateeOrder"; - buttonCreateeOrder.Size = new Size(155, 39); + buttonCreateeOrder.Size = new Size(136, 29); buttonCreateeOrder.TabIndex = 2; buttonCreateeOrder.Text = "Создать заказ"; buttonCreateeOrder.UseVisualStyleBackColor = true; @@ -99,9 +103,10 @@ // // buttonTakeOrderInWork // - buttonTakeOrderInWork.Location = new Point(891, 148); + buttonTakeOrderInWork.Location = new Point(780, 111); + buttonTakeOrderInWork.Margin = new Padding(3, 2, 3, 2); buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; - buttonTakeOrderInWork.Size = new Size(155, 53); + buttonTakeOrderInWork.Size = new Size(136, 40); buttonTakeOrderInWork.TabIndex = 3; buttonTakeOrderInWork.Text = "Отдать на выполнение"; buttonTakeOrderInWork.UseVisualStyleBackColor = true; @@ -109,9 +114,10 @@ // // buttonOrderReady // - buttonOrderReady.Location = new Point(891, 207); + buttonOrderReady.Location = new Point(780, 155); + buttonOrderReady.Margin = new Padding(3, 2, 3, 2); buttonOrderReady.Name = "buttonOrderReady"; - buttonOrderReady.Size = new Size(155, 39); + buttonOrderReady.Size = new Size(136, 29); buttonOrderReady.TabIndex = 4; buttonOrderReady.Text = "Заказ готов"; buttonOrderReady.UseVisualStyleBackColor = true; @@ -119,9 +125,10 @@ // // buttonIssuedOrder // - buttonIssuedOrder.Location = new Point(891, 252); + buttonIssuedOrder.Location = new Point(780, 189); + buttonIssuedOrder.Margin = new Padding(3, 2, 3, 2); buttonIssuedOrder.Name = "buttonIssuedOrder"; - buttonIssuedOrder.Size = new Size(155, 39); + buttonIssuedOrder.Size = new Size(136, 29); buttonIssuedOrder.TabIndex = 5; buttonIssuedOrder.Text = "Заказ выдан"; buttonIssuedOrder.UseVisualStyleBackColor = true; @@ -129,9 +136,10 @@ // // buttonRefresh // - buttonRefresh.Location = new Point(891, 297); + buttonRefresh.Location = new Point(780, 223); + buttonRefresh.Margin = new Padding(3, 2, 3, 2); buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(155, 39); + buttonRefresh.Size = new Size(136, 29); buttonRefresh.TabIndex = 6; buttonRefresh.Text = "Обновить список"; buttonRefresh.UseVisualStyleBackColor = true; @@ -139,9 +147,9 @@ // // FormMain // - AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1063, 610); + ClientSize = new Size(930, 458); Controls.Add(buttonRefresh); Controls.Add(buttonIssuedOrder); Controls.Add(buttonOrderReady); @@ -149,6 +157,7 @@ Controls.Add(buttonCreateeOrder); Controls.Add(toolStrip1); Controls.Add(dataGridView); + Margin = new Padding(3, 2, 3, 2); Name = "FormMain"; Text = "Туристическая фирма"; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); diff --git a/TravelCompany/TravelCompany/FormMain.cs b/TravelCompany/TravelCompany/FormMain.cs index ffe5060..ee57a41 100644 --- a/TravelCompany/TravelCompany/FormMain.cs +++ b/TravelCompany/TravelCompany/FormMain.cs @@ -57,7 +57,7 @@ namespace TravelCompanyView form.ShowDialog(); } } - private void консервыToolStripMenuItem_Click(object sender, EventArgs e) + private void путевкиToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormTravels)); diff --git a/TravelCompany/TravelCompany/FormMain.resx b/TravelCompany/TravelCompany/FormMain.resx index dbd8207..3ecdd3a 100644 --- a/TravelCompany/TravelCompany/FormMain.resx +++ b/TravelCompany/TravelCompany/FormMain.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEKSURBVEhL3ZG9DsFQHMXvczDZvIOtXsHObuhqkViI3Quw + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEKSURBVEhL3ZG9DsFQHMXvczDZvIOtXsHObuhqkViI3Quw 6CYmNoMYJJ0NBiFFIoIytOuf0+TeXP3yde+iyS+3OcP53Z4y3/dJJ4HAsiwyTVMp6BQCBIZhKAWdEcHV vSlBmeB82NFy1KLluEWOPRC5MoHdMWhazwi4RJlALgf4EuT6BI+5kCsTrGddUY658E+QvyXYHq9UnRyC U87f4aUApcXhnrI9Jzg/laQKFntXlHM+lSQK5psL5fvbp/JvJLGCQqmSWM5JkiCT84igXGtSrruKLQ0T diff --git a/TravelCompany/TravelCompany/FormTravel.Designer.cs b/TravelCompany/TravelCompany/FormTravel.Designer.cs index 39214b1..8bd73cb 100644 --- a/TravelCompany/TravelCompany/FormTravel.Designer.cs +++ b/TravelCompany/TravelCompany/FormTravel.Designer.cs @@ -49,33 +49,35 @@ // // textBoxPrice // - textBoxPrice.Location = new Point(123, 45); + textBoxPrice.Location = new Point(108, 34); + textBoxPrice.Margin = new Padding(3, 2, 3, 2); textBoxPrice.Name = "textBoxPrice"; - textBoxPrice.Size = new Size(169, 27); + textBoxPrice.Size = new Size(148, 23); textBoxPrice.TabIndex = 9; // // textBoxName // - textBoxName.Location = new Point(123, 12); + textBoxName.Location = new Point(108, 9); + textBoxName.Margin = new Padding(3, 2, 3, 2); textBoxName.Name = "textBoxName"; - textBoxName.Size = new Size(287, 27); + textBoxName.Size = new Size(252, 23); textBoxName.TabIndex = 8; // // label2 // label2.AutoSize = true; - label2.Location = new Point(28, 52); + label2.Location = new Point(24, 39); label2.Name = "label2"; - label2.Size = new Size(86, 20); + label2.Size = new Size(70, 15); label2.TabIndex = 7; label2.Text = "Стоимость:"; // // label1 // label1.AutoSize = true; - label1.Location = new Point(28, 19); + label1.Location = new Point(24, 14); label1.Name = "label1"; - label1.Size = new Size(80, 20); + label1.Size = new Size(62, 15); label1.TabIndex = 6; label1.Text = "Название:"; // @@ -86,30 +88,30 @@ groupBox1.Controls.Add(buttonUpd); groupBox1.Controls.Add(buttonAdd); groupBox1.Controls.Add(dataGridView); - groupBox1.Location = new Point(12, 93); + groupBox1.Location = new Point(10, 70); + groupBox1.Margin = new Padding(3, 2, 3, 2); groupBox1.Name = "groupBox1"; - groupBox1.Size = new Size(743, 433); + groupBox1.Padding = new Padding(3, 2, 3, 2); + groupBox1.Size = new Size(650, 325); groupBox1.TabIndex = 10; groupBox1.TabStop = false; groupBox1.Text = "Компоненты"; // // buttonRef // - buttonRef.Location = new Point(615, 224); - buttonRef.Margin = new Padding(3, 4, 3, 4); + buttonRef.Location = new Point(538, 168); buttonRef.Name = "buttonRef"; - buttonRef.Size = new Size(111, 37); + buttonRef.Size = new Size(97, 28); buttonRef.TabIndex = 7; buttonRef.Text = "Обновить"; buttonRef.UseVisualStyleBackColor = true; - buttonRef.Click += buttonDel_Click; + buttonRef.Click += buttonRef_Click; // // buttonDel // - buttonDel.Location = new Point(615, 172); - buttonDel.Margin = new Padding(3, 4, 3, 4); + buttonDel.Location = new Point(538, 129); buttonDel.Name = "buttonDel"; - buttonDel.Size = new Size(111, 37); + buttonDel.Size = new Size(97, 28); buttonDel.TabIndex = 6; buttonDel.Text = "Удалить"; buttonDel.UseVisualStyleBackColor = true; @@ -117,10 +119,9 @@ // // buttonUpd // - buttonUpd.Location = new Point(615, 113); - buttonUpd.Margin = new Padding(3, 4, 3, 4); + buttonUpd.Location = new Point(538, 85); buttonUpd.Name = "buttonUpd"; - buttonUpd.Size = new Size(111, 37); + buttonUpd.Size = new Size(97, 28); buttonUpd.TabIndex = 5; buttonUpd.Text = "Изменить"; buttonUpd.UseVisualStyleBackColor = true; @@ -128,10 +129,9 @@ // // buttonAdd // - buttonAdd.Location = new Point(615, 52); - buttonAdd.Margin = new Padding(3, 4, 3, 4); + buttonAdd.Location = new Point(538, 39); buttonAdd.Name = "buttonAdd"; - buttonAdd.Size = new Size(111, 37); + buttonAdd.Size = new Size(97, 28); buttonAdd.TabIndex = 4; buttonAdd.Text = "Добавить"; buttonAdd.UseVisualStyleBackColor = true; @@ -141,11 +141,12 @@ // dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.Columns.AddRange(new DataGridViewColumn[] { Number, Component, Count }); - dataGridView.Location = new Point(0, 26); + dataGridView.Location = new Point(0, 20); + dataGridView.Margin = new Padding(3, 2, 3, 2); dataGridView.Name = "dataGridView"; dataGridView.RowHeadersWidth = 51; dataGridView.RowTemplate.Height = 29; - dataGridView.Size = new Size(598, 407); + dataGridView.Size = new Size(523, 305); dataGridView.TabIndex = 0; // // Number @@ -171,10 +172,9 @@ // // buttonCancel // - buttonCancel.Location = new Point(617, 562); - buttonCancel.Margin = new Padding(3, 4, 3, 4); + buttonCancel.Location = new Point(540, 422); buttonCancel.Name = "buttonCancel"; - buttonCancel.Size = new Size(130, 37); + buttonCancel.Size = new Size(114, 28); buttonCancel.TabIndex = 11; buttonCancel.Text = "Отмена"; buttonCancel.UseVisualStyleBackColor = true; @@ -182,10 +182,9 @@ // // buttonSave // - buttonSave.Location = new Point(462, 562); - buttonSave.Margin = new Padding(3, 4, 3, 4); + buttonSave.Location = new Point(404, 422); buttonSave.Name = "buttonSave"; - buttonSave.Size = new Size(130, 37); + buttonSave.Size = new Size(114, 28); buttonSave.TabIndex = 12; buttonSave.Text = "Сохранить"; buttonSave.UseVisualStyleBackColor = true; @@ -193,9 +192,9 @@ // // FormTravel // - AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(759, 612); + ClientSize = new Size(664, 459); Controls.Add(buttonCancel); Controls.Add(buttonSave); Controls.Add(groupBox1); @@ -203,6 +202,7 @@ Controls.Add(textBoxName); Controls.Add(label2); Controls.Add(label1); + Margin = new Padding(3, 2, 3, 2); Name = "FormTravel"; Text = "Туристическая путевка"; groupBox1.ResumeLayout(false); -- 2.25.1 From 2429e332da8777271e3062b0e844696b3d8e2926 Mon Sep 17 00:00:00 2001 From: "a.puchkina" Date: Wed, 28 Feb 2024 11:01:24 +0400 Subject: [PATCH 3/5] =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D0=BE=20=D0=B3?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B2=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TravelCompany/FormCreateOrder.Designer.cs | 44 ++++++------ .../TravelCompany/FormMain.Designer.cs | 43 +++++------- TravelCompany/TravelCompany/FormMain.cs | 6 +- TravelCompany/TravelCompany/FormMain.resx | 2 +- .../TravelCompany/FormTravel.Designer.cs | 68 ++++++++++--------- .../TravelCompany/FormTravels.Designer.cs | 12 ++-- 6 files changed, 82 insertions(+), 93 deletions(-) diff --git a/TravelCompany/TravelCompany/FormCreateOrder.Designer.cs b/TravelCompany/TravelCompany/FormCreateOrder.Designer.cs index 4f1cdcb..dfda113 100644 --- a/TravelCompany/TravelCompany/FormCreateOrder.Designer.cs +++ b/TravelCompany/TravelCompany/FormCreateOrder.Designer.cs @@ -41,63 +41,59 @@ // label1 // label1.AutoSize = true; - label1.Location = new Point(10, 7); + label1.Location = new Point(11, 13); label1.Name = "label1"; - label1.Size = new Size(56, 15); + label1.Size = new Size(170, 20); label1.TabIndex = 0; - label1.Text = "Изделие:"; + label1.Text = "Туристическая путевка:"; // // label2 // label2.AutoSize = true; - label2.Location = new Point(10, 39); + label2.Location = new Point(88, 52); label2.Name = "label2"; - label2.Size = new Size(75, 15); + label2.Size = new Size(93, 20); label2.TabIndex = 1; label2.Text = "Количество:"; // // label3 // label3.AutoSize = true; - label3.Location = new Point(10, 71); + label3.Location = new Point(123, 99); label3.Name = "label3"; - label3.Size = new Size(48, 15); + label3.Size = new Size(58, 20); label3.TabIndex = 2; label3.Text = "Сумма:"; // // comboBoxTravel // comboBoxTravel.FormattingEnabled = true; - comboBoxTravel.Location = new Point(109, 4); - comboBoxTravel.Margin = new Padding(3, 2, 3, 2); + comboBoxTravel.Location = new Point(191, 5); comboBoxTravel.Name = "comboBoxTravel"; - comboBoxTravel.Size = new Size(244, 23); + comboBoxTravel.Size = new Size(278, 28); comboBoxTravel.TabIndex = 3; comboBoxTravel.SelectedIndexChanged += ComboBoxTravel_SelectedIndexChanged; // // textBoxCount // - textBoxCount.Location = new Point(109, 37); - textBoxCount.Margin = new Padding(3, 2, 3, 2); + textBoxCount.Location = new Point(191, 49); textBoxCount.Name = "textBoxCount"; - textBoxCount.Size = new Size(244, 23); + textBoxCount.Size = new Size(278, 27); textBoxCount.TabIndex = 4; textBoxCount.TextChanged += textBoxCount_TextChanged; // // textBoxSum // - textBoxSum.Location = new Point(109, 69); - textBoxSum.Margin = new Padding(3, 2, 3, 2); + textBoxSum.Location = new Point(191, 92); textBoxSum.Name = "textBoxSum"; - textBoxSum.Size = new Size(244, 23); + textBoxSum.Size = new Size(278, 27); textBoxSum.TabIndex = 5; // // buttonSave // - buttonSave.Location = new Point(158, 111); - buttonSave.Margin = new Padding(3, 2, 3, 2); + buttonSave.Location = new Point(247, 148); buttonSave.Name = "buttonSave"; - buttonSave.Size = new Size(82, 22); + buttonSave.Size = new Size(94, 29); buttonSave.TabIndex = 6; buttonSave.Text = "Сохранить"; buttonSave.UseVisualStyleBackColor = true; @@ -105,10 +101,9 @@ // // buttonCancel // - buttonCancel.Location = new Point(270, 111); - buttonCancel.Margin = new Padding(3, 2, 3, 2); + buttonCancel.Location = new Point(375, 148); buttonCancel.Name = "buttonCancel"; - buttonCancel.Size = new Size(82, 22); + buttonCancel.Size = new Size(94, 29); buttonCancel.TabIndex = 7; buttonCancel.Text = "Отмена"; buttonCancel.UseVisualStyleBackColor = true; @@ -116,9 +111,9 @@ // // FormCreateOrder // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(370, 150); + ClientSize = new Size(496, 200); Controls.Add(buttonCancel); Controls.Add(buttonSave); Controls.Add(textBoxSum); @@ -127,7 +122,6 @@ Controls.Add(label3); Controls.Add(label2); Controls.Add(label1); - Margin = new Padding(3, 2, 3, 2); Name = "FormCreateOrder"; Text = "Заказ"; Load += FormCreateOrder_Load; diff --git a/TravelCompany/TravelCompany/FormMain.Designer.cs b/TravelCompany/TravelCompany/FormMain.Designer.cs index e743bf0..3f3aadc 100644 --- a/TravelCompany/TravelCompany/FormMain.Designer.cs +++ b/TravelCompany/TravelCompany/FormMain.Designer.cs @@ -46,14 +46,13 @@ // dataGridView // dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Location = new Point(1, 31); - dataGridView.Margin = new Padding(3, 2, 3, 2); + dataGridView.Location = new Point(1, 41); dataGridView.Name = "dataGridView"; dataGridView.ReadOnly = true; dataGridView.RowHeadersWidth = 51; dataGridView.RowTemplate.Height = 29; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView.Size = new Size(767, 427); + dataGridView.Size = new Size(1143, 569); dataGridView.TabIndex = 0; // // toolStrip1 @@ -62,7 +61,7 @@ toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1 }); toolStrip1.Location = new Point(0, 0); toolStrip1.Name = "toolStrip1"; - toolStrip1.Size = new Size(930, 25); + toolStrip1.Size = new Size(1328, 27); toolStrip1.TabIndex = 1; toolStrip1.Text = "toolStrip1"; // @@ -73,29 +72,28 @@ toolStripDropDownButton1.Image = (Image)resources.GetObject("toolStripDropDownButton1.Image"); toolStripDropDownButton1.ImageTransparentColor = Color.Magenta; toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - toolStripDropDownButton1.Size = new Size(88, 22); + toolStripDropDownButton1.Size = new Size(108, 24); toolStripDropDownButton1.Text = "Справочник"; // // компонентыToolStripMenuItem // компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(202, 22); + компонентыToolStripMenuItem.Size = new Size(252, 26); компонентыToolStripMenuItem.Text = "Компоненты"; компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click; // // туристическиеПутевкиToolStripMenuItem // туристическиеПутевкиToolStripMenuItem.Name = "туристическиеПутевкиToolStripMenuItem"; - туристическиеПутевкиToolStripMenuItem.Size = new Size(202, 22); + туристическиеПутевкиToolStripMenuItem.Size = new Size(252, 26); туристическиеПутевкиToolStripMenuItem.Text = "Туристические путевки"; туристическиеПутевкиToolStripMenuItem.Click += путевкиToolStripMenuItem_Click; // // buttonCreateeOrder // - buttonCreateeOrder.Location = new Point(780, 77); - buttonCreateeOrder.Margin = new Padding(3, 2, 3, 2); + buttonCreateeOrder.Location = new Point(1161, 99); buttonCreateeOrder.Name = "buttonCreateeOrder"; - buttonCreateeOrder.Size = new Size(136, 29); + buttonCreateeOrder.Size = new Size(155, 39); buttonCreateeOrder.TabIndex = 2; buttonCreateeOrder.Text = "Создать заказ"; buttonCreateeOrder.UseVisualStyleBackColor = true; @@ -103,10 +101,9 @@ // // buttonTakeOrderInWork // - buttonTakeOrderInWork.Location = new Point(780, 111); - buttonTakeOrderInWork.Margin = new Padding(3, 2, 3, 2); + buttonTakeOrderInWork.Location = new Point(1161, 144); buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; - buttonTakeOrderInWork.Size = new Size(136, 40); + buttonTakeOrderInWork.Size = new Size(155, 53); buttonTakeOrderInWork.TabIndex = 3; buttonTakeOrderInWork.Text = "Отдать на выполнение"; buttonTakeOrderInWork.UseVisualStyleBackColor = true; @@ -114,10 +111,9 @@ // // buttonOrderReady // - buttonOrderReady.Location = new Point(780, 155); - buttonOrderReady.Margin = new Padding(3, 2, 3, 2); + buttonOrderReady.Location = new Point(1161, 203); buttonOrderReady.Name = "buttonOrderReady"; - buttonOrderReady.Size = new Size(136, 29); + buttonOrderReady.Size = new Size(155, 39); buttonOrderReady.TabIndex = 4; buttonOrderReady.Text = "Заказ готов"; buttonOrderReady.UseVisualStyleBackColor = true; @@ -125,10 +121,9 @@ // // buttonIssuedOrder // - buttonIssuedOrder.Location = new Point(780, 189); - buttonIssuedOrder.Margin = new Padding(3, 2, 3, 2); + buttonIssuedOrder.Location = new Point(1161, 248); buttonIssuedOrder.Name = "buttonIssuedOrder"; - buttonIssuedOrder.Size = new Size(136, 29); + buttonIssuedOrder.Size = new Size(155, 39); buttonIssuedOrder.TabIndex = 5; buttonIssuedOrder.Text = "Заказ выдан"; buttonIssuedOrder.UseVisualStyleBackColor = true; @@ -136,10 +131,9 @@ // // buttonRefresh // - buttonRefresh.Location = new Point(780, 223); - buttonRefresh.Margin = new Padding(3, 2, 3, 2); + buttonRefresh.Location = new Point(1161, 293); buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(136, 29); + buttonRefresh.Size = new Size(155, 39); buttonRefresh.TabIndex = 6; buttonRefresh.Text = "Обновить список"; buttonRefresh.UseVisualStyleBackColor = true; @@ -147,9 +141,9 @@ // // FormMain // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(930, 458); + ClientSize = new Size(1328, 611); Controls.Add(buttonRefresh); Controls.Add(buttonIssuedOrder); Controls.Add(buttonOrderReady); @@ -157,7 +151,6 @@ Controls.Add(buttonCreateeOrder); Controls.Add(toolStrip1); Controls.Add(dataGridView); - Margin = new Padding(3, 2, 3, 2); Name = "FormMain"; Text = "Туристическая фирма"; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); diff --git a/TravelCompany/TravelCompany/FormMain.cs b/TravelCompany/TravelCompany/FormMain.cs index ee57a41..610314f 100644 --- a/TravelCompany/TravelCompany/FormMain.cs +++ b/TravelCompany/TravelCompany/FormMain.cs @@ -89,7 +89,7 @@ namespace TravelCompanyView }); if (!operationResult) { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + throw new Exception("Ошибка передачи заказа в работу"); } LoadData(); } @@ -112,7 +112,7 @@ namespace TravelCompanyView var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id }); if (!operationResult) { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + throw new Exception("Ошибка отметки о готовности заказа"); } LoadData(); } @@ -137,7 +137,7 @@ namespace TravelCompanyView }); if (!operationResult) { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + throw new Exception("Ошибка отметки о выдачи заказа"); } _logger.LogInformation("Заказ №{id} выдан", id); LoadData(); diff --git a/TravelCompany/TravelCompany/FormMain.resx b/TravelCompany/TravelCompany/FormMain.resx index 3ecdd3a..dbd8207 100644 --- a/TravelCompany/TravelCompany/FormMain.resx +++ b/TravelCompany/TravelCompany/FormMain.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEKSURBVEhL3ZG9DsFQHMXvczDZvIOtXsHObuhqkViI3Quw + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEKSURBVEhL3ZG9DsFQHMXvczDZvIOtXsHObuhqkViI3Quw 6CYmNoMYJJ0NBiFFIoIytOuf0+TeXP3yde+iyS+3OcP53Z4y3/dJJ4HAsiwyTVMp6BQCBIZhKAWdEcHV vSlBmeB82NFy1KLluEWOPRC5MoHdMWhazwi4RJlALgf4EuT6BI+5kCsTrGddUY658E+QvyXYHq9UnRyC U87f4aUApcXhnrI9Jzg/laQKFntXlHM+lSQK5psL5fvbp/JvJLGCQqmSWM5JkiCT84igXGtSrruKLQ0T diff --git a/TravelCompany/TravelCompany/FormTravel.Designer.cs b/TravelCompany/TravelCompany/FormTravel.Designer.cs index 8bd73cb..bf1a6b9 100644 --- a/TravelCompany/TravelCompany/FormTravel.Designer.cs +++ b/TravelCompany/TravelCompany/FormTravel.Designer.cs @@ -1,4 +1,6 @@ -namespace TravelCompanyView +using System.Windows.Forms; + +namespace TravelCompanyView { partial class FormTravel { @@ -49,35 +51,33 @@ // // textBoxPrice // - textBoxPrice.Location = new Point(108, 34); - textBoxPrice.Margin = new Padding(3, 2, 3, 2); + textBoxPrice.Location = new Point(123, 45); textBoxPrice.Name = "textBoxPrice"; - textBoxPrice.Size = new Size(148, 23); + textBoxPrice.Size = new Size(169, 27); textBoxPrice.TabIndex = 9; // // textBoxName // - textBoxName.Location = new Point(108, 9); - textBoxName.Margin = new Padding(3, 2, 3, 2); + textBoxName.Location = new Point(123, 12); textBoxName.Name = "textBoxName"; - textBoxName.Size = new Size(252, 23); + textBoxName.Size = new Size(287, 27); textBoxName.TabIndex = 8; // // label2 // label2.AutoSize = true; - label2.Location = new Point(24, 39); + label2.Location = new Point(27, 52); label2.Name = "label2"; - label2.Size = new Size(70, 15); + label2.Size = new Size(86, 20); label2.TabIndex = 7; label2.Text = "Стоимость:"; // // label1 // label1.AutoSize = true; - label1.Location = new Point(24, 14); + label1.Location = new Point(27, 19); label1.Name = "label1"; - label1.Size = new Size(62, 15); + label1.Size = new Size(80, 20); label1.TabIndex = 6; label1.Text = "Название:"; // @@ -88,20 +88,19 @@ groupBox1.Controls.Add(buttonUpd); groupBox1.Controls.Add(buttonAdd); groupBox1.Controls.Add(dataGridView); - groupBox1.Location = new Point(10, 70); - groupBox1.Margin = new Padding(3, 2, 3, 2); + groupBox1.Location = new Point(11, 93); groupBox1.Name = "groupBox1"; - groupBox1.Padding = new Padding(3, 2, 3, 2); - groupBox1.Size = new Size(650, 325); + groupBox1.Size = new Size(743, 433); groupBox1.TabIndex = 10; groupBox1.TabStop = false; groupBox1.Text = "Компоненты"; // // buttonRef // - buttonRef.Location = new Point(538, 168); + buttonRef.Location = new Point(615, 224); + buttonRef.Margin = new Padding(3, 4, 3, 4); buttonRef.Name = "buttonRef"; - buttonRef.Size = new Size(97, 28); + buttonRef.Size = new Size(111, 37); buttonRef.TabIndex = 7; buttonRef.Text = "Обновить"; buttonRef.UseVisualStyleBackColor = true; @@ -109,9 +108,10 @@ // // buttonDel // - buttonDel.Location = new Point(538, 129); + buttonDel.Location = new Point(615, 172); + buttonDel.Margin = new Padding(3, 4, 3, 4); buttonDel.Name = "buttonDel"; - buttonDel.Size = new Size(97, 28); + buttonDel.Size = new Size(111, 37); buttonDel.TabIndex = 6; buttonDel.Text = "Удалить"; buttonDel.UseVisualStyleBackColor = true; @@ -119,9 +119,10 @@ // // buttonUpd // - buttonUpd.Location = new Point(538, 85); + buttonUpd.Location = new Point(615, 113); + buttonUpd.Margin = new Padding(3, 4, 3, 4); buttonUpd.Name = "buttonUpd"; - buttonUpd.Size = new Size(97, 28); + buttonUpd.Size = new Size(111, 37); buttonUpd.TabIndex = 5; buttonUpd.Text = "Изменить"; buttonUpd.UseVisualStyleBackColor = true; @@ -129,9 +130,10 @@ // // buttonAdd // - buttonAdd.Location = new Point(538, 39); + buttonAdd.Location = new Point(615, 52); + buttonAdd.Margin = new Padding(3, 4, 3, 4); buttonAdd.Name = "buttonAdd"; - buttonAdd.Size = new Size(97, 28); + buttonAdd.Size = new Size(111, 37); buttonAdd.TabIndex = 4; buttonAdd.Text = "Добавить"; buttonAdd.UseVisualStyleBackColor = true; @@ -141,12 +143,11 @@ // dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.Columns.AddRange(new DataGridViewColumn[] { Number, Component, Count }); - dataGridView.Location = new Point(0, 20); - dataGridView.Margin = new Padding(3, 2, 3, 2); + dataGridView.Location = new Point(0, 27); dataGridView.Name = "dataGridView"; dataGridView.RowHeadersWidth = 51; dataGridView.RowTemplate.Height = 29; - dataGridView.Size = new Size(523, 305); + dataGridView.Size = new Size(598, 407); dataGridView.TabIndex = 0; // // Number @@ -172,9 +173,10 @@ // // buttonCancel // - buttonCancel.Location = new Point(540, 422); + buttonCancel.Location = new Point(617, 563); + buttonCancel.Margin = new Padding(3, 4, 3, 4); buttonCancel.Name = "buttonCancel"; - buttonCancel.Size = new Size(114, 28); + buttonCancel.Size = new Size(130, 37); buttonCancel.TabIndex = 11; buttonCancel.Text = "Отмена"; buttonCancel.UseVisualStyleBackColor = true; @@ -182,9 +184,10 @@ // // buttonSave // - buttonSave.Location = new Point(404, 422); + buttonSave.Location = new Point(462, 563); + buttonSave.Margin = new Padding(3, 4, 3, 4); buttonSave.Name = "buttonSave"; - buttonSave.Size = new Size(114, 28); + buttonSave.Size = new Size(130, 37); buttonSave.TabIndex = 12; buttonSave.Text = "Сохранить"; buttonSave.UseVisualStyleBackColor = true; @@ -192,9 +195,9 @@ // // FormTravel // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(664, 459); + ClientSize = new Size(759, 612); Controls.Add(buttonCancel); Controls.Add(buttonSave); Controls.Add(groupBox1); @@ -202,7 +205,6 @@ Controls.Add(textBoxName); Controls.Add(label2); Controls.Add(label1); - Margin = new Padding(3, 2, 3, 2); Name = "FormTravel"; Text = "Туристическая путевка"; groupBox1.ResumeLayout(false); diff --git a/TravelCompany/TravelCompany/FormTravels.Designer.cs b/TravelCompany/TravelCompany/FormTravels.Designer.cs index dcaf76b..78d7579 100644 --- a/TravelCompany/TravelCompany/FormTravels.Designer.cs +++ b/TravelCompany/TravelCompany/FormTravels.Designer.cs @@ -43,12 +43,12 @@ dataGridView.Name = "dataGridView"; dataGridView.RowHeadersWidth = 51; dataGridView.RowTemplate.Height = 29; - dataGridView.Size = new Size(710, 566); + dataGridView.Size = new Size(740, 566); dataGridView.TabIndex = 0; // // buttonAdd // - buttonAdd.Location = new Point(725, 64); + buttonAdd.Location = new Point(766, 72); buttonAdd.Name = "buttonAdd"; buttonAdd.Size = new Size(156, 35); buttonAdd.TabIndex = 1; @@ -58,7 +58,7 @@ // // buttonUpd // - buttonUpd.Location = new Point(725, 105); + buttonUpd.Location = new Point(766, 113); buttonUpd.Name = "buttonUpd"; buttonUpd.Size = new Size(156, 35); buttonUpd.TabIndex = 2; @@ -68,7 +68,7 @@ // // buttonDel // - buttonDel.Location = new Point(725, 146); + buttonDel.Location = new Point(766, 154); buttonDel.Name = "buttonDel"; buttonDel.Size = new Size(156, 35); buttonDel.TabIndex = 3; @@ -78,7 +78,7 @@ // // buttonRef // - buttonRef.Location = new Point(725, 187); + buttonRef.Location = new Point(766, 195); buttonRef.Name = "buttonRef"; buttonRef.Size = new Size(156, 35); buttonRef.TabIndex = 4; @@ -90,7 +90,7 @@ // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(896, 567); + ClientSize = new Size(947, 567); Controls.Add(buttonRef); Controls.Add(buttonDel); Controls.Add(buttonUpd); -- 2.25.1 From 3023dfdb17b2f1cf71b3361ceb0ee89610f1b2cc Mon Sep 17 00:00:00 2001 From: "a.puchkina" Date: Mon, 11 Mar 2024 11:57:48 +0400 Subject: [PATCH 4/5] =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F?= =?UTF-8?q?=201=20=D0=BB=D0=B0=D0=B1=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TravelCompany/TravelCompanyListImplement/Models/Order.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/TravelCompany/TravelCompanyListImplement/Models/Order.cs b/TravelCompany/TravelCompanyListImplement/Models/Order.cs index b26f50c..e9e9705 100644 --- a/TravelCompany/TravelCompanyListImplement/Models/Order.cs +++ b/TravelCompany/TravelCompanyListImplement/Models/Order.cs @@ -43,11 +43,7 @@ namespace TravelCompanyListImplement.Models { return; } - TravelId = model.TravelId; - Count = model.Count; - Sum = model.Sum; Status = model.Status; - DateCreate = model.DateCreate; DateImplement = model.DateImplement; } public OrderViewModel GetViewModel => new() -- 2.25.1 From 78b3fc32cd6e9c7269b342b7f7e4c072d89d9ded Mon Sep 17 00:00:00 2001 From: "a.puchkina" Date: Wed, 27 Mar 2024 11:02:58 +0400 Subject: [PATCH 5/5] =?UTF-8?q?1=20=D0=BB=D0=B0=D0=B1=D0=B0=20=D1=83=D0=B4?= =?UTF-8?q?=D0=B0=D0=BB=D0=B8=D0=BB=D0=B0=20=D0=BF=D0=B0=D0=BF=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TravelCompanyDataModels.sln | 25 ------------------- .../Enums/OrderStatus.cs | 11 -------- .../TravelCompanyDataModels/IId.cs | 12 --------- .../Models/IComponentModel.cs | 10 -------- .../Models/IOrderModel.cs | 12 --------- .../Models/ITravelModel.cs | 12 --------- .../TravelCompanyDataModels.csproj | 9 ------- 7 files changed, 91 deletions(-) delete mode 100644 TravelCompanyDataModels/TravelCompanyDataModels.sln delete mode 100644 TravelCompanyDataModels/TravelCompanyDataModels/Enums/OrderStatus.cs delete mode 100644 TravelCompanyDataModels/TravelCompanyDataModels/IId.cs delete mode 100644 TravelCompanyDataModels/TravelCompanyDataModels/Models/IComponentModel.cs delete mode 100644 TravelCompanyDataModels/TravelCompanyDataModels/Models/IOrderModel.cs delete mode 100644 TravelCompanyDataModels/TravelCompanyDataModels/Models/ITravelModel.cs delete mode 100644 TravelCompanyDataModels/TravelCompanyDataModels/TravelCompanyDataModels.csproj diff --git a/TravelCompanyDataModels/TravelCompanyDataModels.sln b/TravelCompanyDataModels/TravelCompanyDataModels.sln deleted file mode 100644 index 6f4ae04..0000000 --- a/TravelCompanyDataModels/TravelCompanyDataModels.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.7.34024.191 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TravelCompanyDataModels", "TravelCompanyDataModels\TravelCompanyDataModels.csproj", "{195169D4-7167-4116-AB42-8AAF1D5ED31B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {195169D4-7167-4116-AB42-8AAF1D5ED31B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {195169D4-7167-4116-AB42-8AAF1D5ED31B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {195169D4-7167-4116-AB42-8AAF1D5ED31B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {195169D4-7167-4116-AB42-8AAF1D5ED31B}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {946BD6CC-E6F4-4BF1-98C5-FE9675DF582B} - EndGlobalSection -EndGlobal diff --git a/TravelCompanyDataModels/TravelCompanyDataModels/Enums/OrderStatus.cs b/TravelCompanyDataModels/TravelCompanyDataModels/Enums/OrderStatus.cs deleted file mode 100644 index 0e8a2ca..0000000 --- a/TravelCompanyDataModels/TravelCompanyDataModels/Enums/OrderStatus.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace TravelCompanyDataModels.Enums -{ - public enum OrderStatus - { - Неизвестен = -1, - Принят = 0, - Выполняется = 1, - Готов = 2, - Выдан = 3, - } -} \ No newline at end of file diff --git a/TravelCompanyDataModels/TravelCompanyDataModels/IId.cs b/TravelCompanyDataModels/TravelCompanyDataModels/IId.cs deleted file mode 100644 index 6e78176..0000000 --- a/TravelCompanyDataModels/TravelCompanyDataModels/IId.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TravelCompanyDataModels -{ - internal class IId - { - } -} diff --git a/TravelCompanyDataModels/TravelCompanyDataModels/Models/IComponentModel.cs b/TravelCompanyDataModels/TravelCompanyDataModels/Models/IComponentModel.cs deleted file mode 100644 index 505417f..0000000 --- a/TravelCompanyDataModels/TravelCompanyDataModels/Models/IComponentModel.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Security.Cryptography; - -namespace TravelCompanyDataModels.Models -{ - public interface IComponentModel : IId - { - string ComponentName { get; } - double Cost { get; } - } -} \ No newline at end of file diff --git a/TravelCompanyDataModels/TravelCompanyDataModels/Models/IOrderModel.cs b/TravelCompanyDataModels/TravelCompanyDataModels/Models/IOrderModel.cs deleted file mode 100644 index 1623240..0000000 --- a/TravelCompanyDataModels/TravelCompanyDataModels/Models/IOrderModel.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TravelCompanyDataModels.Models -{ - internal class IOrderModel - { - } -} diff --git a/TravelCompanyDataModels/TravelCompanyDataModels/Models/ITravelModel.cs b/TravelCompanyDataModels/TravelCompanyDataModels/Models/ITravelModel.cs deleted file mode 100644 index 1eb835f..0000000 --- a/TravelCompanyDataModels/TravelCompanyDataModels/Models/ITravelModel.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TravelCompanyDataModels.Models -{ - internal class ITravelModel - { - } -} diff --git a/TravelCompanyDataModels/TravelCompanyDataModels/TravelCompanyDataModels.csproj b/TravelCompanyDataModels/TravelCompanyDataModels/TravelCompanyDataModels.csproj deleted file mode 100644 index 27ac386..0000000 --- a/TravelCompanyDataModels/TravelCompanyDataModels/TravelCompanyDataModels.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - net6.0 - enable - enable - - - -- 2.25.1