diff --git a/PlumbingRepair/PlumbingRepair/FormMain.Designer.cs b/PlumbingRepair/PlumbingRepair/FormMain.Designer.cs
index 4c7b59b..64d2253 100644
--- a/PlumbingRepair/PlumbingRepair/FormMain.Designer.cs
+++ b/PlumbingRepair/PlumbingRepair/FormMain.Designer.cs
@@ -40,6 +40,7 @@
buttonIssuedOrder = new Button();
buttonUpdateList = new Button();
StoreReplenishment = new Button();
+ SellWorkButton = new Button();
menuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout();
@@ -50,7 +51,8 @@
menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem });
menuStrip1.Location = new Point(0, 0);
menuStrip1.Name = "menuStrip1";
- menuStrip1.Size = new Size(1053, 28);
+ menuStrip1.Padding = new Padding(8, 2, 0, 2);
+ menuStrip1.Size = new Size(1316, 33);
menuStrip1.TabIndex = 0;
menuStrip1.Text = "menuStrip1";
//
@@ -58,45 +60,47 @@
//
справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, работыToolStripMenuItem, магазинToolStripMenuItem });
справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
- справочникиToolStripMenuItem.Size = new Size(117, 24);
+ справочникиToolStripMenuItem.Size = new Size(139, 29);
справочникиToolStripMenuItem.Text = "Справочники";
//
// компонентыToolStripMenuItem
//
компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
- компонентыToolStripMenuItem.Size = new Size(182, 26);
+ компонентыToolStripMenuItem.Size = new Size(218, 34);
компонентыToolStripMenuItem.Text = "Компоненты";
компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click;
//
// работыToolStripMenuItem
//
работыToolStripMenuItem.Name = "работыToolStripMenuItem";
- работыToolStripMenuItem.Size = new Size(182, 26);
+ работыToolStripMenuItem.Size = new Size(218, 34);
работыToolStripMenuItem.Text = "Работы";
работыToolStripMenuItem.Click += работыToolStripMenuItem_Click;
//
// магазинToolStripMenuItem
//
магазинToolStripMenuItem.Name = "магазинToolStripMenuItem";
- магазинToolStripMenuItem.Size = new Size(32, 19);
+ магазинToolStripMenuItem.Size = new Size(218, 34);
магазинToolStripMenuItem.Text = "Магазины";
- магазинToolStripMenuItem.Click += new System.EventHandler(this.магазинToolStripMenuItem_Click);
+ магазинToolStripMenuItem.Click += магазинToolStripMenuItem_Click;
//
// dataGridView
//
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridView.Location = new Point(0, 31);
+ dataGridView.Location = new Point(0, 39);
+ dataGridView.Margin = new Padding(4, 4, 4, 4);
dataGridView.Name = "dataGridView";
dataGridView.RowHeadersWidth = 51;
dataGridView.RowTemplate.Height = 29;
- dataGridView.Size = new Size(832, 420);
+ dataGridView.Size = new Size(1040, 525);
dataGridView.TabIndex = 1;
//
// buttonCreateOrder
//
- buttonCreateOrder.Location = new Point(850, 54);
+ buttonCreateOrder.Location = new Point(1062, 68);
+ buttonCreateOrder.Margin = new Padding(4, 4, 4, 4);
buttonCreateOrder.Name = "buttonCreateOrder";
- buttonCreateOrder.Size = new Size(170, 29);
+ buttonCreateOrder.Size = new Size(212, 36);
buttonCreateOrder.TabIndex = 2;
buttonCreateOrder.Text = "Создать заказ";
buttonCreateOrder.UseVisualStyleBackColor = true;
@@ -104,9 +108,10 @@
//
// buttonTakeOrderInWork
//
- buttonTakeOrderInWork.Location = new Point(850, 135);
+ buttonTakeOrderInWork.Location = new Point(1062, 138);
+ buttonTakeOrderInWork.Margin = new Padding(4, 4, 4, 4);
buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
- buttonTakeOrderInWork.Size = new Size(170, 50);
+ buttonTakeOrderInWork.Size = new Size(212, 62);
buttonTakeOrderInWork.TabIndex = 3;
buttonTakeOrderInWork.Text = "Отдать на выполнение";
buttonTakeOrderInWork.UseVisualStyleBackColor = true;
@@ -114,9 +119,10 @@
//
// buttonOrderReady
//
- buttonOrderReady.Location = new Point(850, 206);
+ buttonOrderReady.Location = new Point(1062, 239);
+ buttonOrderReady.Margin = new Padding(4, 4, 4, 4);
buttonOrderReady.Name = "buttonOrderReady";
- buttonOrderReady.Size = new Size(170, 29);
+ buttonOrderReady.Size = new Size(212, 36);
buttonOrderReady.TabIndex = 4;
buttonOrderReady.Text = "Заказ готов";
buttonOrderReady.UseVisualStyleBackColor = true;
@@ -124,9 +130,10 @@
//
// buttonIssuedOrder
//
- buttonIssuedOrder.Location = new Point(850, 279);
+ buttonIssuedOrder.Location = new Point(1062, 313);
+ buttonIssuedOrder.Margin = new Padding(4, 4, 4, 4);
buttonIssuedOrder.Name = "buttonIssuedOrder";
- buttonIssuedOrder.Size = new Size(170, 29);
+ buttonIssuedOrder.Size = new Size(212, 36);
buttonIssuedOrder.TabIndex = 5;
buttonIssuedOrder.Text = "Заказ выдан";
buttonIssuedOrder.UseVisualStyleBackColor = true;
@@ -134,9 +141,10 @@
//
// buttonUpdateList
//
- buttonUpdateList.Location = new Point(850, 394);
+ buttonUpdateList.Location = new Point(1062, 528);
+ buttonUpdateList.Margin = new Padding(4, 4, 4, 4);
buttonUpdateList.Name = "buttonUpdateList";
- buttonUpdateList.Size = new Size(170, 29);
+ buttonUpdateList.Size = new Size(212, 36);
buttonUpdateList.TabIndex = 6;
buttonUpdateList.Text = "Обновить список";
buttonUpdateList.UseVisualStyleBackColor = true;
@@ -144,20 +152,33 @@
//
// StoreReplenishment
//
- StoreReplenishment.Location = new Point(879, 327);
+ StoreReplenishment.Location = new Point(1099, 381);
+ StoreReplenishment.Margin = new Padding(4, 4, 4, 4);
StoreReplenishment.Name = "StoreReplenishment";
- StoreReplenishment.Size = new Size(125, 50);
+ StoreReplenishment.Size = new Size(156, 62);
StoreReplenishment.TabIndex = 7;
StoreReplenishment.Text = "Пополнение магазина";
StoreReplenishment.UseVisualStyleBackColor = true;
StoreReplenishment.Click += StoreReplenishment_Click;
//
+ // SellWorkButton
+ //
+ SellWorkButton.Location = new Point(1099, 463);
+ SellWorkButton.Margin = new Padding(4, 4, 4, 4);
+ SellWorkButton.Name = "SellWorkButton";
+ SellWorkButton.Size = new Size(156, 39);
+ SellWorkButton.TabIndex = 8;
+ SellWorkButton.Text = "Продать изделие";
+ SellWorkButton.UseVisualStyleBackColor = true;
+ SellWorkButton.Click += SellWorkButton_Click;
+ //
// FormMain
//
- AutoScaleDimensions = new SizeF(8F, 20F);
+ AutoScaleDimensions = new SizeF(10F, 25F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(1053, 474);
+ ClientSize = new Size(1316, 592);
Controls.Add(StoreReplenishment);
+ Controls.Add(SellWorkButton);
Controls.Add(buttonUpdateList);
Controls.Add(buttonIssuedOrder);
Controls.Add(buttonOrderReady);
@@ -166,6 +187,7 @@
Controls.Add(dataGridView);
Controls.Add(menuStrip1);
MainMenuStrip = menuStrip1;
+ Margin = new Padding(4, 4, 4, 4);
Name = "FormMain";
Text = "Ремонт сантехники";
Load += FormMain_Load;
@@ -190,5 +212,6 @@
private Button StoreReplenishment;
private ToolStripMenuItem компонентыToolStripMenuItem;
private ToolStripMenuItem работыToolStripMenuItem;
+ private Button SellWorkButton;
}
}
\ No newline at end of file
diff --git a/PlumbingRepair/PlumbingRepair/FormMain.cs b/PlumbingRepair/PlumbingRepair/FormMain.cs
index 9353604..48606bd 100644
--- a/PlumbingRepair/PlumbingRepair/FormMain.cs
+++ b/PlumbingRepair/PlumbingRepair/FormMain.cs
@@ -24,6 +24,7 @@ namespace PlumbingRepairView
InitializeComponent();
_logger = logger;
_orderLogic = orderLogic;
+ LoadData();
}
private void FormMain_Load(object sender, EventArgs e)
@@ -215,5 +216,14 @@ namespace PlumbingRepairView
form.ShowDialog();
}
}
+ private void SellWorkButton_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormSellWork));
+
+ if (service is FormSellWork form)
+ {
+ form.ShowDialog();
+ }
+ }
}
}
diff --git a/PlumbingRepair/PlumbingRepair/FormSellWork.Designer.cs b/PlumbingRepair/PlumbingRepair/FormSellWork.Designer.cs
new file mode 100644
index 0000000..48a413b
--- /dev/null
+++ b/PlumbingRepair/PlumbingRepair/FormSellWork.Designer.cs
@@ -0,0 +1,124 @@
+namespace PlumbingRepairView
+{
+ partial class FormSellWork
+ {
+ ///
+ /// 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()
+ {
+ WorkLabel = new Label();
+ QuantityLabel = new Label();
+ WorkСomboBox = new ComboBox();
+ QuantityTextBox = new TextBox();
+ SaveButton = new Button();
+ ButtonCancel = new Button();
+ SuspendLayout();
+ //
+ // WorkLabel
+ //
+ WorkLabel.AutoSize = true;
+ WorkLabel.Location = new Point(14, 24);
+ WorkLabel.Name = "WorkLabel";
+ WorkLabel.Size = new Size(71, 20);
+ WorkLabel.TabIndex = 0;
+ WorkLabel.Text = "Изделие:";
+ //
+ // QuantityLabel
+ //
+ QuantityLabel.AutoSize = true;
+ QuantityLabel.Location = new Point(14, 68);
+ QuantityLabel.Name = "QuantityLabel";
+ QuantityLabel.Size = new Size(93, 20);
+ QuantityLabel.TabIndex = 1;
+ QuantityLabel.Text = "Количество:";
+ //
+ // WorkСomboBox
+ //
+ WorkСomboBox.FormattingEnabled = true;
+ WorkСomboBox.Location = new Point(101, 20);
+ WorkСomboBox.Margin = new Padding(3, 4, 3, 4);
+ WorkСomboBox.Name = "WorkСomboBox";
+ WorkСomboBox.Size = new Size(210, 28);
+ WorkСomboBox.TabIndex = 2;
+ //
+ // QuantityTextBox
+ //
+ QuantityTextBox.Location = new Point(101, 64);
+ QuantityTextBox.Margin = new Padding(3, 4, 3, 4);
+ QuantityTextBox.Name = "QuantityTextBox";
+ QuantityTextBox.Size = new Size(210, 27);
+ QuantityTextBox.TabIndex = 3;
+ //
+ // SaveButton
+ //
+ SaveButton.Location = new Point(82, 133);
+ SaveButton.Margin = new Padding(3, 4, 3, 4);
+ SaveButton.Name = "SaveButton";
+ SaveButton.Size = new Size(111, 39);
+ SaveButton.TabIndex = 4;
+ SaveButton.Text = "Сохранить";
+ SaveButton.UseVisualStyleBackColor = true;
+ SaveButton.Click += SaveButton_Click;
+ //
+ // ButtonCancel
+ //
+ ButtonCancel.Location = new Point(200, 133);
+ ButtonCancel.Margin = new Padding(3, 4, 3, 4);
+ ButtonCancel.Name = "ButtonCancel";
+ ButtonCancel.Size = new Size(111, 39);
+ ButtonCancel.TabIndex = 5;
+ ButtonCancel.Text = "Отмена";
+ ButtonCancel.UseVisualStyleBackColor = true;
+ ButtonCancel.Click += ButtonCancel_Click;
+ //
+ // FormSellWork
+ //
+ AutoScaleDimensions = new SizeF(8F, 20F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(325, 188);
+ Controls.Add(ButtonCancel);
+ Controls.Add(SaveButton);
+ Controls.Add(QuantityTextBox);
+ Controls.Add(WorkСomboBox);
+ Controls.Add(QuantityLabel);
+ Controls.Add(WorkLabel);
+ Margin = new Padding(3, 4, 3, 4);
+ Name = "FormSellWork";
+ Text = "Продать Изделие";
+ Load += FormSellWork_Load;
+ ResumeLayout(false);
+ PerformLayout();
+ }
+
+ #endregion
+
+ private Label WorkLabel;
+ private Label QuantityLabel;
+ private ComboBox WorkСomboBox;
+ private TextBox QuantityTextBox;
+ private Button SaveButton;
+ private Button ButtonCancel;
+ }
+}
\ No newline at end of file
diff --git a/PlumbingRepair/PlumbingRepair/FormSellWork.cs b/PlumbingRepair/PlumbingRepair/FormSellWork.cs
new file mode 100644
index 0000000..627f50a
--- /dev/null
+++ b/PlumbingRepair/PlumbingRepair/FormSellWork.cs
@@ -0,0 +1,103 @@
+using Microsoft.Extensions.Logging;
+using PlumbingRepairContracts.BusinessLogicsContracts;
+using PlumbingRepairContracts.SearchModels;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace PlumbingRepairView
+{
+ public partial class FormSellWork : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IWorkLogic _logicWork;
+ private readonly IStoreLogic _logicStore;
+ public FormSellWork(ILogger logger, IWorkLogic logicPackage, IStoreLogic logicStore)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logicWork = logicPackage;
+ _logicStore = logicStore;
+ LoadData();
+ }
+
+ private void FormSellWork_Load(object sender, EventArgs e)
+ {
+ LoadData();
+ }
+
+ private void LoadData()
+ {
+ _logger.LogInformation("Loading works for sale.");
+
+ try
+ {
+ var list = _logicWork.ReadList(null);
+ if (list != null)
+ {
+ WorkСomboBox.DisplayMember = "WorkName";
+ WorkСomboBox.ValueMember = "Id";
+ WorkСomboBox.DataSource = list;
+ WorkСomboBox.SelectedItem = null;
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "List loading error.");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+
+ private void SaveButton_Click(object sender, EventArgs e)
+ {
+ if (string.IsNullOrEmpty(QuantityTextBox.Text))
+ {
+ MessageBox.Show("Укажите количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+
+ if (WorkСomboBox.SelectedValue == null)
+ {
+ MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+
+ _logger.LogInformation("Work sale.");
+
+ try
+ {
+ var operationResult = _logicStore.SellWork(_logicWork.ReadElement(new WorkSearchModel()
+ {
+ Id = Convert.ToInt32(WorkСomboBox.SelectedValue)
+ })!, Convert.ToInt32(QuantityTextBox.Text));
+
+ if (!operationResult)
+ {
+ throw new Exception("Ошибка при продаже изделия. Дополнительная информация в логах.");
+ }
+
+ MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ DialogResult = DialogResult.OK;
+
+ Close();
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Work sale error.");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+
+ private void ButtonCancel_Click(object sender, EventArgs e)
+ {
+ DialogResult = DialogResult.Cancel;
+ Close();
+ }
+ }
+}
diff --git a/PlumbingRepair/PlumbingRepair/FormSellWork.resx b/PlumbingRepair/PlumbingRepair/FormSellWork.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/PlumbingRepair/PlumbingRepair/FormSellWork.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/PlumbingRepair/PlumbingRepair/FormStore.Designer.cs b/PlumbingRepair/PlumbingRepair/FormStore.Designer.cs
index 519bf67..b301aaf 100644
--- a/PlumbingRepair/PlumbingRepair/FormStore.Designer.cs
+++ b/PlumbingRepair/PlumbingRepair/FormStore.Designer.cs
@@ -28,139 +28,171 @@
///
private void InitializeComponent()
{
- this.StoreNameLabel = new System.Windows.Forms.Label();
- this.StoreAdressLabel = new System.Windows.Forms.Label();
- this.OpeningDateLabel = new System.Windows.Forms.Label();
- this.NameTextBox = new System.Windows.Forms.TextBox();
- this.AdressTextBox = new System.Windows.Forms.TextBox();
- this.DataGridView = new System.Windows.Forms.DataGridView();
- this.WorkName = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.WorkPrice = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.WorkCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.SaveButton = new System.Windows.Forms.Button();
- this.ButtonCancel = new System.Windows.Forms.Button();
- this.OpeningDatePicker = new System.Windows.Forms.DateTimePicker();
- ((System.ComponentModel.ISupportInitialize)(this.DataGridView)).BeginInit();
- this.SuspendLayout();
+ StoreNameLabel = new Label();
+ StoreAdressLabel = new Label();
+ OpeningDateLabel = new Label();
+ NameTextBox = new TextBox();
+ AdressTextBox = new TextBox();
+ DataGridView = new DataGridView();
+ WorkName = new DataGridViewTextBoxColumn();
+ WorkPrice = new DataGridViewTextBoxColumn();
+ WorkCount = new DataGridViewTextBoxColumn();
+ SaveButton = new Button();
+ ButtonCancel = new Button();
+ OpeningDatePicker = new DateTimePicker();
+ VolumeNumericUpDown = new NumericUpDown();
+ WorkMaxCountLable = new Label();
+ ((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)VolumeNumericUpDown).BeginInit();
+ SuspendLayout();
//
// StoreNameLabel
//
- this.StoreNameLabel.AutoSize = true;
- this.StoreNameLabel.Location = new System.Drawing.Point(12, 9);
- this.StoreNameLabel.Name = "StoreNameLabel";
- this.StoreNameLabel.Size = new System.Drawing.Size(119, 15);
- this.StoreNameLabel.TabIndex = 0;
- this.StoreNameLabel.Text = "Название магазина: ";
+ StoreNameLabel.AutoSize = true;
+ StoreNameLabel.Location = new Point(14, 12);
+ StoreNameLabel.Name = "StoreNameLabel";
+ StoreNameLabel.Size = new Size(154, 20);
+ StoreNameLabel.TabIndex = 0;
+ StoreNameLabel.Text = "Название магазина: ";
//
// StoreAdressLabel
//
- this.StoreAdressLabel.AutoSize = true;
- this.StoreAdressLabel.Location = new System.Drawing.Point(12, 40);
- this.StoreAdressLabel.Name = "StoreAdressLabel";
- this.StoreAdressLabel.Size = new System.Drawing.Size(100, 15);
- this.StoreAdressLabel.TabIndex = 1;
- this.StoreAdressLabel.Text = "Адрес магазина: ";
+ StoreAdressLabel.AutoSize = true;
+ StoreAdressLabel.Location = new Point(14, 53);
+ StoreAdressLabel.Name = "StoreAdressLabel";
+ StoreAdressLabel.Size = new Size(128, 20);
+ StoreAdressLabel.TabIndex = 1;
+ StoreAdressLabel.Text = "Адрес магазина: ";
//
// OpeningDateLabel
//
- this.OpeningDateLabel.AutoSize = true;
- this.OpeningDateLabel.Location = new System.Drawing.Point(12, 72);
- this.OpeningDateLabel.Name = "OpeningDateLabel";
- this.OpeningDateLabel.Size = new System.Drawing.Size(93, 15);
- this.OpeningDateLabel.TabIndex = 2;
- this.OpeningDateLabel.Text = "Дата открытия: ";
+ OpeningDateLabel.AutoSize = true;
+ OpeningDateLabel.Location = new Point(14, 96);
+ OpeningDateLabel.Name = "OpeningDateLabel";
+ OpeningDateLabel.Size = new Size(117, 20);
+ OpeningDateLabel.TabIndex = 2;
+ OpeningDateLabel.Text = "Дата открытия: ";
//
- // NameComboBox
+ // NameTextBox
//
- this.NameTextBox.Location = new System.Drawing.Point(137, 6);
- this.NameTextBox.Name = "NameComboBox";
- this.NameTextBox.Size = new System.Drawing.Size(174, 23);
- this.NameTextBox.TabIndex = 3;
+ NameTextBox.Location = new Point(157, 8);
+ NameTextBox.Margin = new Padding(3, 4, 3, 4);
+ NameTextBox.Name = "NameTextBox";
+ NameTextBox.Size = new Size(198, 27);
+ NameTextBox.TabIndex = 3;
//
// AdressTextBox
//
- this.AdressTextBox.Location = new System.Drawing.Point(137, 37);
- this.AdressTextBox.Name = "AdressTextBox";
- this.AdressTextBox.Size = new System.Drawing.Size(174, 23);
- this.AdressTextBox.TabIndex = 4;
+ AdressTextBox.Location = new Point(157, 49);
+ AdressTextBox.Margin = new Padding(3, 4, 3, 4);
+ AdressTextBox.Name = "AdressTextBox";
+ AdressTextBox.Size = new Size(198, 27);
+ AdressTextBox.TabIndex = 4;
//
// DataGridView
//
- this.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.DataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
- this.WorkName,
- this.WorkPrice,
- this.WorkCount});
- this.DataGridView.Location = new System.Drawing.Point(12, 109);
- this.DataGridView.Name = "DataGridView";
- this.DataGridView.RowTemplate.Height = 25;
- this.DataGridView.Size = new System.Drawing.Size(776, 288);
- this.DataGridView.TabIndex = 6;
+ DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ DataGridView.Columns.AddRange(new DataGridViewColumn[] { WorkName, WorkPrice, WorkCount });
+ DataGridView.Location = new Point(14, 145);
+ DataGridView.Margin = new Padding(3, 4, 3, 4);
+ DataGridView.Name = "DataGridView";
+ DataGridView.RowHeadersWidth = 51;
+ DataGridView.RowTemplate.Height = 25;
+ DataGridView.Size = new Size(887, 384);
+ DataGridView.TabIndex = 6;
//
- // PackageName
+ // WorkName
//
- this.WorkName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
- this.WorkName.HeaderText = "Название изделия";
- this.WorkName.Name = "PackageName";
+ WorkName.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+ WorkName.HeaderText = "Название изделия";
+ WorkName.MinimumWidth = 6;
+ WorkName.Name = "WorkName";
//
- // PackagePrice
+ // WorkPrice
//
- this.WorkPrice.HeaderText = "Цена";
- this.WorkPrice.Name = "PackagePrice";
+ WorkPrice.HeaderText = "Цена";
+ WorkPrice.MinimumWidth = 6;
+ WorkPrice.Name = "WorkPrice";
+ WorkPrice.Width = 125;
//
- // PackageCount
+ // WorkCount
//
- this.WorkCount.HeaderText = "Количество";
- this.WorkCount.Name = "PackageCount";
+ WorkCount.HeaderText = "Количество";
+ WorkCount.MinimumWidth = 6;
+ WorkCount.Name = "WorkCount";
+ WorkCount.Width = 125;
//
// SaveButton
//
- this.SaveButton.Location = new System.Drawing.Point(552, 403);
- this.SaveButton.Name = "SaveButton";
- this.SaveButton.Size = new System.Drawing.Size(115, 35);
- this.SaveButton.TabIndex = 7;
- this.SaveButton.Text = "Сохранить";
- this.SaveButton.UseVisualStyleBackColor = true;
- this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click);
+ SaveButton.Location = new Point(631, 537);
+ SaveButton.Margin = new Padding(3, 4, 3, 4);
+ SaveButton.Name = "SaveButton";
+ SaveButton.Size = new Size(131, 47);
+ SaveButton.TabIndex = 7;
+ SaveButton.Text = "Сохранить";
+ SaveButton.UseVisualStyleBackColor = true;
+ SaveButton.Click += SaveButton_Click;
//
// ButtonCancel
//
- this.ButtonCancel.Location = new System.Drawing.Point(673, 403);
- this.ButtonCancel.Name = "ButtonCancel";
- this.ButtonCancel.Size = new System.Drawing.Size(115, 35);
- this.ButtonCancel.TabIndex = 8;
- this.ButtonCancel.Text = "Отменить";
- this.ButtonCancel.UseVisualStyleBackColor = true;
- this.ButtonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+ ButtonCancel.Location = new Point(769, 537);
+ ButtonCancel.Margin = new Padding(3, 4, 3, 4);
+ ButtonCancel.Name = "ButtonCancel";
+ ButtonCancel.Size = new Size(131, 47);
+ ButtonCancel.TabIndex = 8;
+ ButtonCancel.Text = "Отменить";
+ ButtonCancel.UseVisualStyleBackColor = true;
+ ButtonCancel.Click += ButtonCancel_Click;
//
// OpeningDatePicker
//
- this.OpeningDatePicker.Location = new System.Drawing.Point(137, 66);
- this.OpeningDatePicker.Name = "OpeningDatePicker";
- this.OpeningDatePicker.Size = new System.Drawing.Size(174, 23);
- this.OpeningDatePicker.TabIndex = 9;
+ OpeningDatePicker.Location = new Point(157, 88);
+ OpeningDatePicker.Margin = new Padding(3, 4, 3, 4);
+ OpeningDatePicker.Name = "OpeningDatePicker";
+ OpeningDatePicker.Size = new Size(198, 27);
+ OpeningDatePicker.TabIndex = 9;
+ //
+ // VolumeNumericUpDown
+ //
+ VolumeNumericUpDown.Location = new Point(570, 10);
+ VolumeNumericUpDown.Margin = new Padding(3, 4, 3, 4);
+ VolumeNumericUpDown.Name = "VolumeNumericUpDown";
+ VolumeNumericUpDown.Size = new Size(192, 27);
+ VolumeNumericUpDown.TabIndex = 10;
+ //
+ // WorkMaxCountLable
+ //
+ WorkMaxCountLable.AutoSize = true;
+ WorkMaxCountLable.Location = new Point(389, 12);
+ WorkMaxCountLable.Name = "WorkMaxCountLable";
+ WorkMaxCountLable.Size = new Size(177, 20);
+ WorkMaxCountLable.TabIndex = 11;
+ WorkMaxCountLable.Text = "Вместимость магазина: ";
//
// FormStore
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(800, 450);
- this.Controls.Add(this.OpeningDatePicker);
- this.Controls.Add(this.ButtonCancel);
- this.Controls.Add(this.SaveButton);
- this.Controls.Add(this.DataGridView);
- this.Controls.Add(this.AdressTextBox);
- this.Controls.Add(this.NameTextBox);
- this.Controls.Add(this.OpeningDateLabel);
- this.Controls.Add(this.StoreAdressLabel);
- this.Controls.Add(this.StoreNameLabel);
- this.Name = "FormStore";
- this.Text = "Изделия магазина";
- this.Load += new System.EventHandler(this.FormStore_Load);
- ((System.ComponentModel.ISupportInitialize)(this.DataGridView)).EndInit();
- this.ResumeLayout(false);
- this.PerformLayout();
-
+ AutoScaleDimensions = new SizeF(8F, 20F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(914, 600);
+ Controls.Add(WorkMaxCountLable);
+ Controls.Add(VolumeNumericUpDown);
+ Controls.Add(OpeningDatePicker);
+ Controls.Add(ButtonCancel);
+ Controls.Add(SaveButton);
+ Controls.Add(DataGridView);
+ Controls.Add(AdressTextBox);
+ Controls.Add(NameTextBox);
+ Controls.Add(OpeningDateLabel);
+ Controls.Add(StoreAdressLabel);
+ Controls.Add(StoreNameLabel);
+ Margin = new Padding(3, 4, 3, 4);
+ Name = "FormStore";
+ Text = "Изделия магазина";
+ Load += FormStore_Load;
+ ((System.ComponentModel.ISupportInitialize)DataGridView).EndInit();
+ ((System.ComponentModel.ISupportInitialize)VolumeNumericUpDown).EndInit();
+ ResumeLayout(false);
+ PerformLayout();
}
#endregion
@@ -177,5 +209,7 @@
private DataGridViewTextBoxColumn WorkPrice;
private DataGridViewTextBoxColumn WorkCount;
private DateTimePicker OpeningDatePicker;
+ private NumericUpDown VolumeNumericUpDown;
+ private Label WorkMaxCountLable;
}
}
\ No newline at end of file
diff --git a/PlumbingRepair/PlumbingRepair/FormStore.cs b/PlumbingRepair/PlumbingRepair/FormStore.cs
index 0b7e3ac..f97a178 100644
--- a/PlumbingRepair/PlumbingRepair/FormStore.cs
+++ b/PlumbingRepair/PlumbingRepair/FormStore.cs
@@ -1,9 +1,10 @@
using Microsoft.Extensions.Logging;
using PlumbingRepairContracts.BindingModels;
using PlumbingRepairContracts.BusinessLogicsContracts;
+using PlumbingRepairContracts.SearchModels;
using PlumbingRepairContracts.ViewModels;
using PlumbingRepairDataModels.Models;
-using System;
+using System.Reflection;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -17,35 +18,21 @@ namespace PlumbingRepairView
{
public partial class FormStore : Form
{
- private readonly List? _listStores;
private readonly IStoreLogic _logic;
private readonly ILogger _logger;
- public int Id { get; set; }
+
+ private int? _id;
+ private Dictionary _listStores;
+ public int Id { set { _id = value; } }
public FormStore(ILogger logger, IStoreLogic logic)
{
InitializeComponent();
_logger = logger;
- _listStores = logic.ReadList(null);
+ _listStores = new();
_logic = logic;
}
- private IStoreModel? GetStore(int id)
- {
- if (_listStores == null)
- {
- return null;
- }
- foreach (var elem in _listStores)
- {
- if (elem.Id == id)
- {
- return elem;
- }
- }
- return null;
- }
-
private void SaveButton_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(NameTextBox.Text))
@@ -60,29 +47,20 @@ namespace PlumbingRepairView
return;
}
- _logger.LogInformation("Сохранение изделия");
+ _logger.LogInformation("Сохранение магазина");
try
{
- DateTime.TryParse(OpeningDatePicker.Text, out var dateTime);
- StoreBindingModel model = new()
+ var model = new StoreBindingModel
{
+ Id = _id ?? 0,
StoreName = NameTextBox.Text,
StoreAdress = AdressTextBox.Text,
- OpeningDate = dateTime
+ OpeningDate = OpeningDatePicker.Value.Date,
+ WorkMaxCount = (int)VolumeNumericUpDown.Value,
+ StoreWorks = _listStores
};
- var vmodel = GetStore(Id);
- bool operationResult = false;
-
- if (vmodel != null)
- {
- model.Id = vmodel.Id;
- operationResult = _logic.Update(model);
- }
- else
- {
- operationResult = _logic.Create(model);
- }
+ var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
if (!operationResult)
{
@@ -95,7 +73,7 @@ namespace PlumbingRepairView
}
catch (Exception ex)
{
- _logger.LogError(ex, "Ошибка сохранения изделия");
+ _logger.LogError(ex, "Ошибка сохранения магазина");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
@@ -108,37 +86,52 @@ namespace PlumbingRepairView
private void FormStore_Load(object sender, EventArgs e)
{
- LoadData();
+ if (_id.HasValue)
+ {
+ _logger.LogInformation("Загрузка магазина");
+ try
+ {
+ var view = _logic.ReadElement(new StoreSearchModel
+ {
+ Id = _id.Value
+ });
+ if (view != null)
+ {
+ NameTextBox.Text = view.StoreName;
+ AdressTextBox.Text = view.StoreAdress;
+ OpeningDatePicker.Text = view.OpeningDate.ToString();
+ VolumeNumericUpDown.Value = view.WorkMaxCount;
+ _listStores = view.StoreWorks ?? new Dictionary();
+ LoadData();
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки магазина");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+ MessageBoxIcon.Error);
+ }
+ }
}
private void LoadData(bool extendDate = true)
{
+ _logger.LogInformation("Загрузка изделий магазина");
try
{
- var model = GetStore(extendDate ? Id : Convert.ToInt32(NameTextBox.Text));
- if (model != null)
+ if (_listStores != null)
{
- NameTextBox.Text = model.StoreName;
- AdressTextBox.Text = model.StoreAdress;
- OpeningDatePicker.Text = Convert.ToString(model.OpeningDate);
DataGridView.Rows.Clear();
- foreach (var el in model.Works.Values)
+ foreach (var elem in _listStores)
{
- DataGridView.Rows.Add(new object[] { el.Item1.WorkName, el.Item1.Price, el.Item2 });
+ DataGridView.Rows.Add(new object[] { elem.Value.Item1.WorkName, elem.Value.Item1.Price, elem.Value.Item2 });
}
}
- _logger.LogInformation("Загрузка магазинов");
}
catch (Exception ex)
{
- _logger.LogError(ex, "Ошибка загрузки магазинов");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
+ _logger.LogError(ex, "Ошибка загрузки изделий магазина");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
-
- private void NameComboBox_SelectedIndexChanged(object sender, EventArgs e)
- {
- LoadData(false);
- }
}
}
diff --git a/PlumbingRepair/PlumbingRepair/FormStores.cs b/PlumbingRepair/PlumbingRepair/FormStores.cs
index 5462f2f..4d3ff23 100644
--- a/PlumbingRepair/PlumbingRepair/FormStores.cs
+++ b/PlumbingRepair/PlumbingRepair/FormStores.cs
@@ -40,7 +40,7 @@ namespace PlumbingRepairView
DataGridView.DataSource = list;
DataGridView.Columns["Id"].Visible = false;
DataGridView.Columns["StoreName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
- DataGridView.Columns["Works"].Visible = false;
+ DataGridView.Columns["StoreWorks"].Visible = false;
}
_logger.LogInformation("Загрузка магазинов");
diff --git a/PlumbingRepair/PlumbingRepair/FormWork.Designer.cs b/PlumbingRepair/PlumbingRepair/FormWork.Designer.cs
index 7efd0de..96e4ac2 100644
--- a/PlumbingRepair/PlumbingRepair/FormWork.Designer.cs
+++ b/PlumbingRepair/PlumbingRepair/FormWork.Designer.cs
@@ -75,9 +75,9 @@
groupBox1.Controls.Add(buttonAdd);
groupBox1.Controls.Add(dataGridView);
groupBox1.Location = new Point(40, 108);
- groupBox1.Margin = new Padding(4, 4, 4, 4);
+ groupBox1.Margin = new Padding(4);
groupBox1.Name = "groupBox1";
- groupBox1.Padding = new Padding(4, 4, 4, 4);
+ groupBox1.Padding = new Padding(4);
groupBox1.Size = new Size(945, 384);
groupBox1.TabIndex = 2;
groupBox1.TabStop = false;
@@ -86,7 +86,7 @@
// buttonRef
//
buttonRef.Location = new Point(752, 258);
- buttonRef.Margin = new Padding(4, 4, 4, 4);
+ buttonRef.Margin = new Padding(4);
buttonRef.Name = "buttonRef";
buttonRef.Size = new Size(118, 36);
buttonRef.TabIndex = 4;
@@ -97,7 +97,7 @@
// buttonDel
//
buttonDel.Location = new Point(752, 190);
- buttonDel.Margin = new Padding(4, 4, 4, 4);
+ buttonDel.Margin = new Padding(4);
buttonDel.Name = "buttonDel";
buttonDel.Size = new Size(118, 36);
buttonDel.TabIndex = 3;
@@ -108,7 +108,7 @@
// buttonUpd
//
buttonUpd.Location = new Point(752, 122);
- buttonUpd.Margin = new Padding(4, 4, 4, 4);
+ buttonUpd.Margin = new Padding(4);
buttonUpd.Name = "buttonUpd";
buttonUpd.Size = new Size(118, 36);
buttonUpd.TabIndex = 2;
@@ -119,7 +119,7 @@
// buttonAdd
//
buttonAdd.Location = new Point(752, 55);
- buttonAdd.Margin = new Padding(4, 4, 4, 4);
+ buttonAdd.Margin = new Padding(4);
buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(118, 36);
buttonAdd.TabIndex = 1;
@@ -132,7 +132,7 @@
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Columns.AddRange(new DataGridViewColumn[] { ComponentId, ComponentName, Count });
dataGridView.Location = new Point(0, 32);
- dataGridView.Margin = new Padding(4, 4, 4, 4);
+ dataGridView.Margin = new Padding(4);
dataGridView.Name = "dataGridView";
dataGridView.RowHeadersWidth = 51;
dataGridView.RowTemplate.Height = 29;
@@ -164,7 +164,7 @@
// textBoxName
//
textBoxName.Location = new Point(188, 12);
- textBoxName.Margin = new Padding(4, 4, 4, 4);
+ textBoxName.Margin = new Padding(4);
textBoxName.Name = "textBoxName";
textBoxName.Size = new Size(373, 31);
textBoxName.TabIndex = 3;
@@ -172,7 +172,7 @@
// textBoxCost
//
textBoxCost.Location = new Point(188, 61);
- textBoxCost.Margin = new Padding(4, 4, 4, 4);
+ textBoxCost.Margin = new Padding(4);
textBoxCost.Name = "textBoxCost";
textBoxCost.Size = new Size(256, 31);
textBoxCost.TabIndex = 4;
@@ -180,7 +180,7 @@
// buttonCancel
//
buttonCancel.Location = new Point(857, 511);
- buttonCancel.Margin = new Padding(4, 4, 4, 4);
+ buttonCancel.Margin = new Padding(4);
buttonCancel.Name = "buttonCancel";
buttonCancel.Size = new Size(118, 36);
buttonCancel.TabIndex = 5;
@@ -191,7 +191,7 @@
// buttonSave
//
buttonSave.Location = new Point(731, 511);
- buttonSave.Margin = new Padding(4, 4, 4, 4);
+ buttonSave.Margin = new Padding(4);
buttonSave.Name = "buttonSave";
buttonSave.Size = new Size(118, 36);
buttonSave.TabIndex = 6;
@@ -211,9 +211,10 @@
Controls.Add(groupBox1);
Controls.Add(label2);
Controls.Add(label1);
- Margin = new Padding(4, 4, 4, 4);
+ Margin = new Padding(4);
Name = "FormWork";
Text = "Работа";
+ Load += FormWork_Load;
groupBox1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
ResumeLayout(false);
diff --git a/PlumbingRepair/PlumbingRepair/FormWork.resx b/PlumbingRepair/PlumbingRepair/FormWork.resx
index a395bff..af32865 100644
--- a/PlumbingRepair/PlumbingRepair/FormWork.resx
+++ b/PlumbingRepair/PlumbingRepair/FormWork.resx
@@ -18,7 +18,7 @@
System.Resources.ResXResourceReader, System.Windows.Forms, ...
System.Resources.ResXResourceWriter, System.Windows.Forms, ...
this is my long stringthis is a comment
- Blue
+ Blue
[base64 mime encoded serialized .NET Framework object]
diff --git a/PlumbingRepair/PlumbingRepair/FormWorks.cs b/PlumbingRepair/PlumbingRepair/FormWorks.cs
index b09fdda..51e7ded 100644
--- a/PlumbingRepair/PlumbingRepair/FormWorks.cs
+++ b/PlumbingRepair/PlumbingRepair/FormWorks.cs
@@ -23,6 +23,7 @@ namespace PlumbingRepairView
InitializeComponent();
_logger = logger;
_logic = logic;
+ LoadData();
}
private void FormComponents_Load(object sender, EventArgs e)
diff --git a/PlumbingRepair/PlumbingRepair/Program.cs b/PlumbingRepair/PlumbingRepair/Program.cs
index c9c48e3..9958c88 100644
--- a/PlumbingRepair/PlumbingRepair/Program.cs
+++ b/PlumbingRepair/PlumbingRepair/Program.cs
@@ -53,6 +53,7 @@ namespace PlumbingRepairView
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
}
}
}
\ No newline at end of file