diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.Designer.cs
index 1d9d90e..509d542 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.Designer.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.Designer.cs
@@ -1,186 +1,186 @@
namespace BlacksmithWorkshop
{
- partial class FormShop
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
+ partial class FormShop
+ {
+ ///
+ /// 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);
- }
+ ///
+ /// 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
+ #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();
- ColumnId = new DataGridViewTextBoxColumn();
- ColumnName = new DataGridViewTextBoxColumn();
- ColumnPrice = new DataGridViewTextBoxColumn();
- ColumnCount = new DataGridViewTextBoxColumn();
- dateTimePicker = new DateTimePicker();
- labelName = new Label();
- labelAddress = new Label();
- labelDate = new Label();
- textBoxName = new TextBox();
- textBoxAddress = new TextBox();
- buttonSave = new Button();
- buttonCancel = new Button();
- ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
- SuspendLayout();
- //
- // dataGridView
- //
- dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ColumnName, ColumnPrice, ColumnCount });
- dataGridView.Location = new Point(12, 101);
- dataGridView.Name = "dataGridView";
- dataGridView.RowTemplate.Height = 25;
- dataGridView.Size = new Size(553, 281);
- dataGridView.TabIndex = 0;
- //
- // ColumnId
- //
- ColumnId.HeaderText = "";
- ColumnId.Name = "ColumnId";
- ColumnId.Visible = false;
- //
- // ColumnName
- //
- ColumnName.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
- ColumnName.HeaderText = "Изделие";
- ColumnName.Name = "ColumnName";
- //
- // ColumnPrice
- //
- ColumnPrice.HeaderText = "Цена";
- ColumnPrice.Name = "ColumnPrice";
- //
- // ColumnCount
- //
- ColumnCount.HeaderText = "Количество";
- ColumnCount.Name = "ColumnCount";
- //
- // dateTimePicker
- //
- dateTimePicker.Location = new Point(150, 63);
- dateTimePicker.Name = "dateTimePicker";
- dateTimePicker.Size = new Size(166, 23);
- dateTimePicker.TabIndex = 1;
- //
- // labelName
- //
- labelName.AutoSize = true;
- labelName.Location = new Point(12, 9);
- labelName.Name = "labelName";
- labelName.Size = new Size(62, 15);
- labelName.TabIndex = 2;
- labelName.Text = "Название:";
- //
- // labelAddress
- //
- labelAddress.AutoSize = true;
- labelAddress.Location = new Point(12, 38);
- labelAddress.Name = "labelAddress";
- labelAddress.Size = new Size(43, 15);
- labelAddress.TabIndex = 3;
- labelAddress.Text = "Адрес:";
- //
- // labelDate
- //
- labelDate.AutoSize = true;
- labelDate.Location = new Point(12, 69);
- labelDate.Name = "labelDate";
- labelDate.Size = new Size(90, 15);
- labelDate.TabIndex = 4;
- labelDate.Text = "Дата открытия:";
- //
- // textBoxName
- //
- textBoxName.Location = new Point(150, 6);
- textBoxName.Name = "textBoxName";
- textBoxName.Size = new Size(166, 23);
- textBoxName.TabIndex = 5;
- //
- // textBoxAddress
- //
- textBoxAddress.Location = new Point(150, 35);
- textBoxAddress.Name = "textBoxAddress";
- textBoxAddress.Size = new Size(166, 23);
- textBoxAddress.TabIndex = 6;
- //
- // buttonSave
- //
- buttonSave.Location = new Point(12, 401);
- buttonSave.Name = "buttonSave";
- buttonSave.Size = new Size(123, 25);
- buttonSave.TabIndex = 7;
- buttonSave.Text = "Сохранить";
- buttonSave.UseVisualStyleBackColor = true;
- buttonSave.Click += SaveButton_Click;
- //
- // buttonCancel
- //
- buttonCancel.Location = new Point(150, 401);
- buttonCancel.Name = "buttonCancel";
- buttonCancel.Size = new Size(123, 25);
- buttonCancel.TabIndex = 8;
- buttonCancel.Text = "Отмена";
- buttonCancel.UseVisualStyleBackColor = true;
- buttonCancel.Click += CancelButton_Click;
- //
- // FormShop
- //
- AutoScaleDimensions = new SizeF(7F, 15F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(585, 450);
- Controls.Add(buttonCancel);
- Controls.Add(buttonSave);
- Controls.Add(textBoxAddress);
- Controls.Add(textBoxName);
- Controls.Add(labelDate);
- Controls.Add(labelAddress);
- Controls.Add(labelName);
- Controls.Add(dateTimePicker);
- Controls.Add(dataGridView);
- Name = "FormShop";
- StartPosition = FormStartPosition.CenterParent;
- Text = "Магазин";
- Load += FormShop_Load;
- ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
- ResumeLayout(false);
- PerformLayout();
- }
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ dataGridView = new DataGridView();
+ ColumnId = new DataGridViewTextBoxColumn();
+ ColumnName = new DataGridViewTextBoxColumn();
+ ColumnPrice = new DataGridViewTextBoxColumn();
+ ColumnCount = new DataGridViewTextBoxColumn();
+ dateTimePicker = new DateTimePicker();
+ labelName = new Label();
+ labelAddress = new Label();
+ labelDate = new Label();
+ textBoxName = new TextBox();
+ textBoxAddress = new TextBox();
+ buttonSave = new Button();
+ buttonCancel = new Button();
+ ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+ SuspendLayout();
+ //
+ // dataGridView
+ //
+ dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ColumnName, ColumnPrice, ColumnCount });
+ dataGridView.Location = new Point(12, 101);
+ dataGridView.Name = "dataGridView";
+ dataGridView.RowTemplate.Height = 25;
+ dataGridView.Size = new Size(553, 281);
+ dataGridView.TabIndex = 0;
+ //
+ // ColumnId
+ //
+ ColumnId.HeaderText = "";
+ ColumnId.Name = "ColumnId";
+ ColumnId.Visible = false;
+ //
+ // ColumnName
+ //
+ ColumnName.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+ ColumnName.HeaderText = "Изделие";
+ ColumnName.Name = "ColumnName";
+ //
+ // ColumnPrice
+ //
+ ColumnPrice.HeaderText = "Цена";
+ ColumnPrice.Name = "ColumnPrice";
+ //
+ // ColumnCount
+ //
+ ColumnCount.HeaderText = "Количество";
+ ColumnCount.Name = "ColumnCount";
+ //
+ // dateTimePicker
+ //
+ dateTimePicker.Location = new Point(150, 63);
+ dateTimePicker.Name = "dateTimePicker";
+ dateTimePicker.Size = new Size(166, 23);
+ dateTimePicker.TabIndex = 1;
+ //
+ // labelName
+ //
+ labelName.AutoSize = true;
+ labelName.Location = new Point(12, 9);
+ labelName.Name = "labelName";
+ labelName.Size = new Size(62, 15);
+ labelName.TabIndex = 2;
+ labelName.Text = "Название:";
+ //
+ // labelAddress
+ //
+ labelAddress.AutoSize = true;
+ labelAddress.Location = new Point(12, 38);
+ labelAddress.Name = "labelAddress";
+ labelAddress.Size = new Size(43, 15);
+ labelAddress.TabIndex = 3;
+ labelAddress.Text = "Адрес:";
+ //
+ // labelDate
+ //
+ labelDate.AutoSize = true;
+ labelDate.Location = new Point(12, 69);
+ labelDate.Name = "labelDate";
+ labelDate.Size = new Size(90, 15);
+ labelDate.TabIndex = 4;
+ labelDate.Text = "Дата открытия:";
+ //
+ // textBoxName
+ //
+ textBoxName.Location = new Point(150, 6);
+ textBoxName.Name = "textBoxName";
+ textBoxName.Size = new Size(166, 23);
+ textBoxName.TabIndex = 5;
+ //
+ // textBoxAddress
+ //
+ textBoxAddress.Location = new Point(150, 35);
+ textBoxAddress.Name = "textBoxAddress";
+ textBoxAddress.Size = new Size(166, 23);
+ textBoxAddress.TabIndex = 6;
+ //
+ // buttonSave
+ //
+ buttonSave.Location = new Point(12, 401);
+ buttonSave.Name = "buttonSave";
+ buttonSave.Size = new Size(123, 25);
+ buttonSave.TabIndex = 7;
+ buttonSave.Text = "Сохранить";
+ buttonSave.UseVisualStyleBackColor = true;
+ buttonSave.Click += SaveButton_Click;
+ //
+ // buttonCancel
+ //
+ buttonCancel.Location = new Point(150, 401);
+ buttonCancel.Name = "buttonCancel";
+ buttonCancel.Size = new Size(123, 25);
+ buttonCancel.TabIndex = 8;
+ buttonCancel.Text = "Отмена";
+ buttonCancel.UseVisualStyleBackColor = true;
+ buttonCancel.Click += CancelButton_Click;
+ //
+ // FormShop
+ //
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(585, 450);
+ Controls.Add(buttonCancel);
+ Controls.Add(buttonSave);
+ Controls.Add(textBoxAddress);
+ Controls.Add(textBoxName);
+ Controls.Add(labelDate);
+ Controls.Add(labelAddress);
+ Controls.Add(labelName);
+ Controls.Add(dateTimePicker);
+ Controls.Add(dataGridView);
+ Name = "FormShop";
+ StartPosition = FormStartPosition.CenterParent;
+ Text = "Магазин";
+ Load += FormShop_Load;
+ ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+ ResumeLayout(false);
+ PerformLayout();
+ }
- #endregion
+ #endregion
- private DataGridView dataGridView;
- private DateTimePicker dateTimePicker;
- private Label labelName;
- private Label labelAddress;
- private Label labelDate;
- private TextBox textBoxName;
- private TextBox textBoxAddress;
- private DataGridViewTextBoxColumn ColumnId;
- private DataGridViewTextBoxColumn ColumnName;
- private DataGridViewTextBoxColumn ColumnPrice;
- private DataGridViewTextBoxColumn ColumnCount;
- private Button buttonSave;
- private Button buttonCancel;
- }
+ private DataGridView dataGridView;
+ private DateTimePicker dateTimePicker;
+ private Label labelName;
+ private Label labelAddress;
+ private Label labelDate;
+ private TextBox textBoxName;
+ private TextBox textBoxAddress;
+ private DataGridViewTextBoxColumn ColumnId;
+ private DataGridViewTextBoxColumn ColumnName;
+ private DataGridViewTextBoxColumn ColumnPrice;
+ private DataGridViewTextBoxColumn ColumnCount;
+ private Button buttonSave;
+ private Button buttonCancel;
+ }
}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.cs
index 9d551fe..33eeeb4 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.cs
@@ -16,107 +16,107 @@ using System.Windows.Forms;
namespace BlacksmithWorkshop
{
- public partial class FormShop : Form
- {
- private readonly ILogger _logger;
- private readonly IShopLogic _logic;
- public int? _id;
- private Dictionary _manufactures;
- public FormShop(ILogger logger, IShopLogic logic)
- {
- InitializeComponent();
- _logger = logger;
- _logic = logic;
- _manufactures = new();
- }
- private void FormShop_Load(object sender, EventArgs e)
- {
- if (_id.HasValue)
- {
- _logger.LogInformation("Загрузка магазина");
- try
- {
- var shop = _logic.ReadElement(new ShopSearchModel { Id = _id });
- if (shop != null)
- {
- textBoxName.Text = shop.ShopName;
- textBoxAddress.Text = shop.Address;
- dateTimePicker.Text = shop.OpeningDate.ToString();
- _manufactures = shop.ShopManufactures;
- }
- LoadData();
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка загрузки магазина");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- }
- }
- }
- private void LoadData()
- {
- _logger.LogInformation("Загрузка товаров магазина");
- try
- {
- if (_manufactures != null)
- {
- foreach (var manufactures in _manufactures)
- {
- dataGridView.Rows.Add(new object[] { manufactures.Key, manufactures.Value.Item1.ManufactureName,
- manufactures.Value.Item1.Price, manufactures.Value.Item2 });
- }
- }
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка загрузки изделий магазина");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- }
- }
- private void CancelButton_Click(object sender, EventArgs e)
- {
- DialogResult = DialogResult.Cancel;
- Close();
- }
- private void SaveButton_Click(object sender, EventArgs e)
- {
- if (string.IsNullOrEmpty(textBoxName.Text))
- {
- MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- if (string.IsNullOrEmpty(textBoxAddress.Text))
- {
- MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- _logger.LogInformation("Сохранение магазина");
- try
- {
- var model = new ShopBindingModel
- {
- Id = _id ?? 0,
- ShopName = textBoxName.Text,
- Address = textBoxAddress.Text,
- OpeningDate = dateTimePicker.Value.Date,
- ShopManufactures = _manufactures
- };
- 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);
- }
- }
- }
+ public partial class FormShop : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IShopLogic _logic;
+ public int? _id;
+ private Dictionary _manufactures;
+ public FormShop(ILogger logger, IShopLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ _manufactures = new();
+ }
+ private void FormShop_Load(object sender, EventArgs e)
+ {
+ if (_id.HasValue)
+ {
+ _logger.LogInformation("Загрузка магазина");
+ try
+ {
+ var shop = _logic.ReadElement(new ShopSearchModel { Id = _id });
+ if (shop != null)
+ {
+ textBoxName.Text = shop.ShopName;
+ textBoxAddress.Text = shop.Address;
+ dateTimePicker.Text = shop.OpeningDate.ToString();
+ _manufactures = shop.ShopManufactures;
+ }
+ LoadData();
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки магазина");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+ MessageBoxIcon.Error);
+ }
+ }
+ }
+ private void LoadData()
+ {
+ _logger.LogInformation("Загрузка товаров магазина");
+ try
+ {
+ if (_manufactures != null)
+ {
+ foreach (var manufactures in _manufactures)
+ {
+ dataGridView.Rows.Add(new object[] { manufactures.Key, manufactures.Value.Item1.ManufactureName,
+ manufactures.Value.Item1.Price, manufactures.Value.Item2 });
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки изделий магазина");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+ MessageBoxIcon.Error);
+ }
+ }
+ private void CancelButton_Click(object sender, EventArgs e)
+ {
+ DialogResult = DialogResult.Cancel;
+ Close();
+ }
+ private void SaveButton_Click(object sender, EventArgs e)
+ {
+ if (string.IsNullOrEmpty(textBoxName.Text))
+ {
+ MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ if (string.IsNullOrEmpty(textBoxAddress.Text))
+ {
+ MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ _logger.LogInformation("Сохранение магазина");
+ try
+ {
+ var model = new ShopBindingModel
+ {
+ Id = _id ?? 0,
+ ShopName = textBoxName.Text,
+ Address = textBoxAddress.Text,
+ OpeningDate = dateTimePicker.Value.Date,
+ ShopManufactures = _manufactures
+ };
+ 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);
+ }
+ }
+ }
}