diff --git a/GarmentFactory/FormAddTextile.Designer.cs b/GarmentFactory/FormAddTextile.Designer.cs
new file mode 100644
index 0000000..11c88bb
--- /dev/null
+++ b/GarmentFactory/FormAddTextile.Designer.cs
@@ -0,0 +1,144 @@
+namespace GarmentFactoryView
+{
+ partial class FormAddTextile
+ {
+ ///
+ /// 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()
+ {
+ labelShop = new Label();
+ labelCount = new Label();
+ labelTextile = new Label();
+ comboBoxShop = new ComboBox();
+ textBoxCount = new TextBox();
+ comboBoxTextile = new ComboBox();
+ buttonCancel = new Button();
+ buttonSave = new Button();
+ SuspendLayout();
+ //
+ // labelShop
+ //
+ labelShop.AutoSize = true;
+ labelShop.Location = new Point(38, 37);
+ labelShop.Name = "labelShop";
+ labelShop.Size = new Size(72, 20);
+ labelShop.TabIndex = 0;
+ labelShop.Text = "Магазин:";
+ //
+ // labelCount
+ //
+ labelCount.AutoSize = true;
+ labelCount.Location = new Point(29, 123);
+ labelCount.Name = "labelCount";
+ labelCount.Size = new Size(93, 20);
+ labelCount.TabIndex = 3;
+ labelCount.Text = "Количество:";
+ //
+ // labelTextile
+ //
+ labelTextile.AutoSize = true;
+ labelTextile.Location = new Point(38, 79);
+ labelTextile.Name = "labelTextile";
+ labelTextile.Size = new Size(71, 20);
+ labelTextile.TabIndex = 2;
+ labelTextile.Text = "Изделие:";
+ //
+ // comboBoxShop
+ //
+ comboBoxShop.DropDownStyle = ComboBoxStyle.DropDownList;
+ comboBoxShop.FormattingEnabled = true;
+ comboBoxShop.Location = new Point(140, 37);
+ comboBoxShop.Name = "comboBoxShop";
+ comboBoxShop.Size = new Size(262, 28);
+ comboBoxShop.TabIndex = 11;
+ //
+ // textBoxCount
+ //
+ textBoxCount.Location = new Point(140, 123);
+ textBoxCount.Name = "textBoxCount";
+ textBoxCount.Size = new Size(262, 27);
+ textBoxCount.TabIndex = 10;
+ //
+ // comboBoxTextile
+ //
+ comboBoxTextile.DropDownStyle = ComboBoxStyle.DropDownList;
+ comboBoxTextile.FormattingEnabled = true;
+ comboBoxTextile.Location = new Point(140, 79);
+ comboBoxTextile.Name = "comboBoxTextile";
+ comboBoxTextile.Size = new Size(262, 28);
+ comboBoxTextile.TabIndex = 9;
+ //
+ // buttonCancel
+ //
+ buttonCancel.Location = new Point(342, 181);
+ buttonCancel.Name = "buttonCancel";
+ buttonCancel.Size = new Size(94, 29);
+ buttonCancel.TabIndex = 13;
+ buttonCancel.Text = "Отмена";
+ buttonCancel.UseVisualStyleBackColor = true;
+ buttonCancel.Click += ButtonCancel_Click;
+ //
+ // buttonSave
+ //
+ buttonSave.Location = new Point(242, 181);
+ buttonSave.Name = "buttonSave";
+ buttonSave.Size = new Size(94, 29);
+ buttonSave.TabIndex = 12;
+ buttonSave.Text = "Сохранить";
+ buttonSave.UseVisualStyleBackColor = true;
+ buttonSave.Click += ButtonSave_Click;
+ //
+ // FormAddTextile
+ //
+ AutoScaleDimensions = new SizeF(8F, 20F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(455, 222);
+ Controls.Add(buttonCancel);
+ Controls.Add(buttonSave);
+ Controls.Add(comboBoxShop);
+ Controls.Add(textBoxCount);
+ Controls.Add(comboBoxTextile);
+ Controls.Add(labelCount);
+ Controls.Add(labelTextile);
+ Controls.Add(labelShop);
+ Name = "FormAddTextile";
+ Text = "Пополнение магазина";
+ Load += FormAddTextile_Load;
+ ResumeLayout(false);
+ PerformLayout();
+ }
+
+ #endregion
+
+ private Label labelShop;
+ private Label labelCount;
+ private Label labelTextile;
+ private ComboBox comboBoxShop;
+ private TextBox textBoxCount;
+ private ComboBox comboBoxTextile;
+ private Button buttonCancel;
+ private Button buttonSave;
+ }
+}
\ No newline at end of file
diff --git a/GarmentFactory/FormAddTextile.cs b/GarmentFactory/FormAddTextile.cs
new file mode 100644
index 0000000..d234f54
--- /dev/null
+++ b/GarmentFactory/FormAddTextile.cs
@@ -0,0 +1,109 @@
+using GarmentFactoryContracts.BindingModels;
+using GarmentFactoryContracts.BusinessLogicsContracts;
+using GarmentFactoryContracts.SearchModels;
+using GarmentFactoryContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace GarmentFactoryView
+{
+ public partial class FormAddTextile : Form
+ {
+ private readonly ILogger _logger;
+ private readonly ITextileLogic _logicT;
+ private readonly IShopLogic _logicS;
+ //Списки для ComboBox
+ private List _shopList = new List();
+ private List _textileList = new List();
+ public FormAddTextile(ILogger logger, ITextileLogic logicT, IShopLogic logicS)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logicT = logicT;
+ _logicS = logicS;
+ }
+
+ private void FormAddTextile_Load(object sender, EventArgs e)
+ {
+ _shopList = _logicS.ReadList(null);
+ _textileList = _logicT.ReadList(null);
+
+ _logger.LogInformation("Загрузка списка магазинов при пополнении");
+ if (_shopList != null)
+ {
+ comboBoxShop.DisplayMember = "ShopName";
+ comboBoxShop.ValueMember = "Id";
+ comboBoxShop.DataSource = _shopList;
+ comboBoxShop.SelectedItem = null;
+ }
+
+ _logger.LogInformation("Загрузка списка товаров при пополнении");
+ if (_textileList != null)
+ {
+ comboBoxTextile.DisplayMember = "TextileName";
+ comboBoxTextile.ValueMember = "Id";
+ comboBoxTextile.DataSource = _textileList;
+ comboBoxTextile.SelectedItem = null;
+ }
+ }
+
+ private void ButtonSave_Click(object sender, EventArgs e)
+ {
+ if (comboBoxShop.SelectedValue == null)
+ {
+ MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+
+ if (comboBoxTextile.SelectedValue == null)
+ {
+ MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+
+ if (string.IsNullOrEmpty(textBoxCount.Text))
+ {
+ MessageBox.Show("Заполните поле \"Количество\"", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+
+ _logger.LogInformation("Пополнение магазина");
+ try
+ {
+ var operationResult = _logicS.AddTextile(new SupplyBindingModel
+ {
+ ShopId = Convert.ToInt32(comboBoxShop.SelectedValue),
+ TextileId = Convert.ToInt32(comboBoxTextile.SelectedValue),
+ Count = Convert.ToInt32(textBoxCount.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/GarmentFactory/FormAddTextile.resx b/GarmentFactory/FormAddTextile.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/GarmentFactory/FormAddTextile.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/GarmentFactory/FormMain.Designer.cs b/GarmentFactory/FormMain.Designer.cs
index 7b3dbfb..ddc02c3 100644
--- a/GarmentFactory/FormMain.Designer.cs
+++ b/GarmentFactory/FormMain.Designer.cs
@@ -38,6 +38,8 @@
справочникиToolStripMenuItem = new ToolStripMenuItem();
компонентыToolStripMenuItem = new ToolStripMenuItem();
текстилиToolStripMenuItem = new ToolStripMenuItem();
+ магазиныToolStripMenuItem = new ToolStripMenuItem();
+ пополнениеМагазинаToolStripMenuItem = new ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
menuStrip1.SuspendLayout();
SuspendLayout();
@@ -116,7 +118,7 @@
// menuStrip1
//
menuStrip1.ImageScalingSize = new Size(20, 20);
- menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem });
+ menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, пополнениеМагазинаToolStripMenuItem });
menuStrip1.Location = new Point(0, 0);
menuStrip1.Name = "menuStrip1";
menuStrip1.Size = new Size(1169, 28);
@@ -125,7 +127,7 @@
//
// справочникиToolStripMenuItem
//
- справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, текстилиToolStripMenuItem });
+ справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, текстилиToolStripMenuItem, магазиныToolStripMenuItem });
справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
справочникиToolStripMenuItem.Size = new Size(117, 24);
справочникиToolStripMenuItem.Text = "Справочники";
@@ -133,17 +135,31 @@
// компонентыToolStripMenuItem
//
компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
- компонентыToolStripMenuItem.Size = new Size(182, 26);
+ компонентыToolStripMenuItem.Size = new Size(224, 26);
компонентыToolStripMenuItem.Text = "Компоненты";
компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click;
//
// текстилиToolStripMenuItem
//
текстилиToolStripMenuItem.Name = "текстилиToolStripMenuItem";
- текстилиToolStripMenuItem.Size = new Size(182, 26);
+ текстилиToolStripMenuItem.Size = new Size(224, 26);
текстилиToolStripMenuItem.Text = "Текстили";
текстилиToolStripMenuItem.Click += текстилиToolStripMenuItem_Click;
//
+ // магазиныToolStripMenuItem
+ //
+ магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
+ магазиныToolStripMenuItem.Size = new Size(224, 26);
+ магазиныToolStripMenuItem.Text = "Магазины";
+ магазиныToolStripMenuItem.Click += магазиныToolStripMenuItem_Click;
+ //
+ // пополнениеМагазинаToolStripMenuItem
+ //
+ пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem";
+ пополнениеМагазинаToolStripMenuItem.Size = new Size(182, 24);
+ пополнениеМагазинаToolStripMenuItem.Text = "Пополнение магазина";
+ пополнениеМагазинаToolStripMenuItem.Click += пополнениеМагазинаToolStripMenuItem_Click;
+ //
// FormMain
//
AutoScaleDimensions = new SizeF(8F, 20F);
@@ -179,5 +195,7 @@
private ToolStripMenuItem справочникиToolStripMenuItem;
private ToolStripMenuItem компонентыToolStripMenuItem;
private ToolStripMenuItem текстилиToolStripMenuItem;
+ private ToolStripMenuItem магазиныToolStripMenuItem;
+ private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/GarmentFactory/FormMain.cs b/GarmentFactory/FormMain.cs
index b921a1c..41ce8b7 100644
--- a/GarmentFactory/FormMain.cs
+++ b/GarmentFactory/FormMain.cs
@@ -68,6 +68,26 @@ namespace GarmentFactoryView
}
}
+ private void магазиныToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+
+ if (service is FormShops form)
+ {
+ form.ShowDialog();
+ }
+ }
+
+ private void пополнениеМагазинаToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormAddTextile));
+
+ if (service is FormAddTextile form)
+ {
+ form.ShowDialog();
+ }
+ }
+
private void ButtonCreateOrder_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
diff --git a/GarmentFactory/FormShop.Designer.cs b/GarmentFactory/FormShop.Designer.cs
new file mode 100644
index 0000000..b21893c
--- /dev/null
+++ b/GarmentFactory/FormShop.Designer.cs
@@ -0,0 +1,205 @@
+namespace GarmentFactoryView
+{
+ 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);
+ }
+
+ #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()
+ {
+ labelName = new Label();
+ labelAddress = new Label();
+ labelDateOpen = new Label();
+ textBoxName = new TextBox();
+ textBoxAddress = new TextBox();
+ dateTimePicker = new DateTimePicker();
+ groupBoxTextiles = new GroupBox();
+ dataGridView = new DataGridView();
+ ID = new DataGridViewTextBoxColumn();
+ ColumnTextileName = new DataGridViewTextBoxColumn();
+ ColumnCount = new DataGridViewTextBoxColumn();
+ buttonCancel = new Button();
+ buttonSave = new Button();
+ groupBoxTextiles.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+ SuspendLayout();
+ //
+ // labelName
+ //
+ labelName.AutoSize = true;
+ labelName.Location = new Point(30, 21);
+ labelName.Name = "labelName";
+ labelName.Size = new Size(84, 20);
+ labelName.TabIndex = 0;
+ labelName.Text = "Название: ";
+ //
+ // labelAddress
+ //
+ labelAddress.AutoSize = true;
+ labelAddress.Location = new Point(40, 71);
+ labelAddress.Name = "labelAddress";
+ labelAddress.Size = new Size(58, 20);
+ labelAddress.TabIndex = 1;
+ labelAddress.Text = "Адрес: ";
+ //
+ // labelDateOpen
+ //
+ labelDateOpen.AutoSize = true;
+ labelDateOpen.Location = new Point(12, 118);
+ labelDateOpen.Name = "labelDateOpen";
+ labelDateOpen.Size = new Size(117, 20);
+ labelDateOpen.TabIndex = 2;
+ labelDateOpen.Text = "Дата открытия: ";
+ //
+ // textBoxName
+ //
+ textBoxName.Location = new Point(135, 21);
+ textBoxName.Name = "textBoxName";
+ textBoxName.Size = new Size(243, 27);
+ textBoxName.TabIndex = 3;
+ //
+ // textBoxAddress
+ //
+ textBoxAddress.Location = new Point(135, 68);
+ textBoxAddress.Name = "textBoxAddress";
+ textBoxAddress.Size = new Size(243, 27);
+ textBoxAddress.TabIndex = 4;
+ //
+ // dateTimePicker
+ //
+ dateTimePicker.Location = new Point(135, 113);
+ dateTimePicker.Name = "dateTimePicker";
+ dateTimePicker.Size = new Size(243, 27);
+ dateTimePicker.TabIndex = 5;
+ //
+ // groupBoxTextiles
+ //
+ groupBoxTextiles.Controls.Add(dataGridView);
+ groupBoxTextiles.Location = new Point(12, 184);
+ groupBoxTextiles.Name = "groupBoxTextiles";
+ groupBoxTextiles.Size = new Size(651, 306);
+ groupBoxTextiles.TabIndex = 6;
+ groupBoxTextiles.TabStop = false;
+ groupBoxTextiles.Text = "Изделия";
+ //
+ // dataGridView
+ //
+ dataGridView.AllowUserToAddRows = false;
+ dataGridView.AllowUserToDeleteRows = false;
+ dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
+ dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ dataGridView.Columns.AddRange(new DataGridViewColumn[] { ID, ColumnTextileName, ColumnCount });
+ dataGridView.Location = new Point(6, 26);
+ dataGridView.Name = "dataGridView";
+ dataGridView.ReadOnly = true;
+ dataGridView.RowHeadersWidth = 51;
+ dataGridView.RowTemplate.Height = 29;
+ dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
+ dataGridView.Size = new Size(633, 274);
+ dataGridView.TabIndex = 0;
+ //
+ // ID
+ //
+ ID.HeaderText = "ID";
+ ID.MinimumWidth = 6;
+ ID.Name = "ID";
+ ID.ReadOnly = true;
+ ID.Visible = false;
+ //
+ // ColumnTextileName
+ //
+ ColumnTextileName.HeaderText = "Изделие";
+ ColumnTextileName.MinimumWidth = 6;
+ ColumnTextileName.Name = "ColumnTextileName";
+ ColumnTextileName.ReadOnly = true;
+ //
+ // ColumnCount
+ //
+ ColumnCount.HeaderText = "Количество";
+ ColumnCount.MinimumWidth = 6;
+ ColumnCount.Name = "ColumnCount";
+ ColumnCount.ReadOnly = true;
+ //
+ // buttonCancel
+ //
+ buttonCancel.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point);
+ buttonCancel.Location = new Point(544, 521);
+ buttonCancel.Name = "buttonCancel";
+ buttonCancel.Size = new Size(103, 40);
+ buttonCancel.TabIndex = 9;
+ buttonCancel.Text = "Отмена";
+ buttonCancel.UseVisualStyleBackColor = true;
+ buttonCancel.Click += ButtonCancel_Click;
+ //
+ // buttonSave
+ //
+ buttonSave.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point);
+ buttonSave.Location = new Point(426, 521);
+ buttonSave.Name = "buttonSave";
+ buttonSave.Size = new Size(103, 40);
+ buttonSave.TabIndex = 8;
+ buttonSave.Text = "Сохранить";
+ buttonSave.UseVisualStyleBackColor = true;
+ buttonSave.Click += ButtonSave_Click;
+ //
+ // FormShop
+ //
+ AutoScaleDimensions = new SizeF(8F, 20F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(682, 584);
+ Controls.Add(buttonCancel);
+ Controls.Add(buttonSave);
+ Controls.Add(groupBoxTextiles);
+ Controls.Add(dateTimePicker);
+ Controls.Add(textBoxAddress);
+ Controls.Add(textBoxName);
+ Controls.Add(labelDateOpen);
+ Controls.Add(labelAddress);
+ Controls.Add(labelName);
+ Name = "FormShop";
+ Text = "Магазин";
+ Load += FormShop_Load;
+ groupBoxTextiles.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+ ResumeLayout(false);
+ PerformLayout();
+ }
+
+ #endregion
+
+ private Label labelName;
+ private Label labelAddress;
+ private Label labelDateOpen;
+ private TextBox textBoxName;
+ private TextBox textBoxAddress;
+ private DateTimePicker dateTimePicker;
+ private GroupBox groupBoxTextiles;
+ private DataGridView dataGridView;
+ private DataGridViewTextBoxColumn ID;
+ private DataGridViewTextBoxColumn ColumnTextileName;
+ private DataGridViewTextBoxColumn ColumnCount;
+ private Button buttonCancel;
+ private Button buttonSave;
+ }
+}
\ No newline at end of file
diff --git a/GarmentFactory/FormShop.cs b/GarmentFactory/FormShop.cs
new file mode 100644
index 0000000..b09ef63
--- /dev/null
+++ b/GarmentFactory/FormShop.cs
@@ -0,0 +1,133 @@
+using GarmentFactoryContracts.BindingModels;
+using GarmentFactoryContracts.BusinessLogicsContracts;
+using GarmentFactoryContracts.SearchModels;
+using GarmentFactoryDataModels.Models;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace GarmentFactoryView
+{
+ public partial class FormShop : Form
+ {
+ private readonly ILogger _logger;
+
+ private readonly IShopLogic _logic;
+
+ private int? _id;
+
+ public int Id { set { _id = value; } }
+
+ private Dictionary _shopTextiles;
+
+
+ public FormShop(ILogger logger, IShopLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ _shopTextiles = new Dictionary();
+ }
+
+ private void FormShop_Load(object sender, EventArgs e)
+ {
+ if (_id.HasValue)
+ {
+ _logger.LogInformation("Загрузка магазина");
+ try
+ {
+ var view = _logic.ReadElement(new ShopSearchModel
+ {
+ Id = _id.Value
+ });
+ if (view != null)
+ {
+ textBoxName.Text = view.ShopName;
+ textBoxAddress.Text = view.Address.ToString();
+ dateTimePicker.Value = view.DateOpen;
+ _shopTextiles = view.ShopTextiles ?? new Dictionary();
+ LoadData();
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки магазина");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ }
+
+ private void LoadData()
+ {
+ _logger.LogInformation("Загрузка изделий в магазине");
+ try
+ {
+ if (_shopTextiles != null)
+ {
+ dataGridView.Rows.Clear();
+ foreach (var element in _shopTextiles)
+ {
+ dataGridView.Rows.Add(new object[] { element.Key, element.Value.Item1.TextileName, element.Value.Item2 });
+ }
+ }
+ }
+ 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;
+ }
+ 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,
+ DateOpen = dateTimePicker.Value.Date,
+ ShopTextiles = _shopTextiles
+ };
+ 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/GarmentFactory/FormShop.resx b/GarmentFactory/FormShop.resx
new file mode 100644
index 0000000..bc99676
--- /dev/null
+++ b/GarmentFactory/FormShop.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/GarmentFactory/FormShops.Designer.cs b/GarmentFactory/FormShops.Designer.cs
new file mode 100644
index 0000000..1b50209
--- /dev/null
+++ b/GarmentFactory/FormShops.Designer.cs
@@ -0,0 +1,116 @@
+namespace GarmentFactoryView
+{
+ partial class FormShops
+ {
+ ///
+ /// 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();
+ buttonRefresh = new Button();
+ buttonDelete = new Button();
+ buttonUpdate = new Button();
+ buttonAdd = new Button();
+ ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+ SuspendLayout();
+ //
+ // dataGridView
+ //
+ dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ dataGridView.Location = new Point(-3, -4);
+ dataGridView.Name = "dataGridView";
+ dataGridView.ReadOnly = true;
+ dataGridView.RowHeadersWidth = 51;
+ dataGridView.RowTemplate.Height = 29;
+ dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
+ dataGridView.Size = new Size(640, 455);
+ dataGridView.TabIndex = 0;
+ //
+ // buttonRefresh
+ //
+ buttonRefresh.Location = new Point(658, 252);
+ buttonRefresh.Name = "buttonRefresh";
+ buttonRefresh.Size = new Size(120, 40);
+ buttonRefresh.TabIndex = 12;
+ buttonRefresh.Text = "Обновить";
+ buttonRefresh.UseVisualStyleBackColor = true;
+ buttonRefresh.Click += ButtonRefresh_Click;
+ //
+ // buttonDelete
+ //
+ buttonDelete.Location = new Point(658, 183);
+ buttonDelete.Name = "buttonDelete";
+ buttonDelete.Size = new Size(120, 40);
+ buttonDelete.TabIndex = 11;
+ buttonDelete.Text = "Удалить";
+ buttonDelete.UseVisualStyleBackColor = true;
+ buttonDelete.Click += ButtonDelete_Click;
+ //
+ // buttonUpdate
+ //
+ buttonUpdate.Location = new Point(658, 115);
+ buttonUpdate.Name = "buttonUpdate";
+ buttonUpdate.Size = new Size(120, 40);
+ buttonUpdate.TabIndex = 10;
+ buttonUpdate.Text = "Изменить";
+ buttonUpdate.UseVisualStyleBackColor = true;
+ buttonUpdate.Click += ButtonUpdate_Click;
+ //
+ // buttonAdd
+ //
+ buttonAdd.Location = new Point(658, 50);
+ buttonAdd.Name = "buttonAdd";
+ buttonAdd.Size = new Size(120, 40);
+ buttonAdd.TabIndex = 9;
+ buttonAdd.Text = "Добавить";
+ buttonAdd.UseVisualStyleBackColor = true;
+ buttonAdd.Click += ButtonAdd_Click;
+ //
+ // FormShops
+ //
+ AutoScaleDimensions = new SizeF(8F, 20F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(800, 450);
+ Controls.Add(buttonRefresh);
+ Controls.Add(buttonDelete);
+ Controls.Add(buttonUpdate);
+ Controls.Add(buttonAdd);
+ Controls.Add(dataGridView);
+ Name = "FormShops";
+ Text = "Магазины";
+ Load += FormShops_Load;
+ ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private DataGridView dataGridView;
+ private Button buttonRefresh;
+ private Button buttonDelete;
+ private Button buttonUpdate;
+ private Button buttonAdd;
+ }
+}
\ No newline at end of file
diff --git a/GarmentFactory/FormShops.cs b/GarmentFactory/FormShops.cs
new file mode 100644
index 0000000..f8c95d5
--- /dev/null
+++ b/GarmentFactory/FormShops.cs
@@ -0,0 +1,115 @@
+using GarmentFactory;
+using GarmentFactoryContracts.BindingModels;
+using GarmentFactoryContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace GarmentFactoryView
+{
+ public partial class FormShops : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IShopLogic _logic;
+ public FormShops(ILogger logger, IShopLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ }
+
+ private void FormShops_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["ShopTextiles"].Visible = false;
+ dataGridView.Columns["ShopName"].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(FormShop));
+ if (service is FormShop form)
+ {
+ if (form.ShowDialog() == DialogResult.OK)
+ {
+ LoadData();
+ }
+ }
+ }
+
+ private void ButtonUpdate_Click(object sender, EventArgs e)
+ {
+ if (dataGridView.SelectedRows.Count == 1)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormShop));
+ if (service is FormShop form)
+ {
+ form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+ if (form.ShowDialog() == DialogResult.OK)
+ {
+ LoadData();
+ }
+ }
+ }
+ }
+
+ private void ButtonDelete_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 ShopBindingModel
+ {
+ Id = id
+ }))
+ {
+ throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
+ }
+ 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/GarmentFactory/FormShops.resx b/GarmentFactory/FormShops.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/GarmentFactory/FormShops.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/GarmentFactory/FormTextile.Designer.cs b/GarmentFactory/FormTextile.Designer.cs
index 5121014..19d22f8 100644
--- a/GarmentFactory/FormTextile.Designer.cs
+++ b/GarmentFactory/FormTextile.Designer.cs
@@ -138,6 +138,7 @@
//
dataGridView.AllowUserToAddRows = false;
dataGridView.AllowUserToDeleteRows = false;
+ dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Columns.AddRange(new DataGridViewColumn[] { Column1, Column2, Column3 });
dataGridView.Dock = DockStyle.Left;
@@ -159,7 +160,6 @@
Column1.Name = "Column1";
Column1.ReadOnly = true;
Column1.Visible = false;
- Column1.Width = 125;
//
// Column2
//
@@ -167,7 +167,6 @@
Column2.MinimumWidth = 6;
Column2.Name = "Column2";
Column2.ReadOnly = true;
- Column2.Width = 125;
//
// Column3
//
@@ -175,7 +174,6 @@
Column3.MinimumWidth = 6;
Column3.Name = "Column3";
Column3.ReadOnly = true;
- Column3.Width = 125;
//
// buttonSave
//
diff --git a/GarmentFactory/FormTextiles.Designer.cs b/GarmentFactory/FormTextiles.Designer.cs
index 6b41417..a134efe 100644
--- a/GarmentFactory/FormTextiles.Designer.cs
+++ b/GarmentFactory/FormTextiles.Designer.cs
@@ -38,6 +38,9 @@
//
// dataGridView
//
+ dataGridView.AllowUserToAddRows = false;
+ dataGridView.AllowUserToDeleteRows = false;
+ dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Dock = DockStyle.Left;
dataGridView.Location = new Point(0, 0);
diff --git a/GarmentFactory/Program.cs b/GarmentFactory/Program.cs
index 2ff30d3..711a357 100644
--- a/GarmentFactory/Program.cs
+++ b/GarmentFactory/Program.cs
@@ -48,6 +48,11 @@ namespace GarmentFactory
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/GarmentFactoryBusinessLogic/ShopLogic.cs b/GarmentFactoryBusinessLogic/ShopLogic.cs
new file mode 100644
index 0000000..0e30de2
--- /dev/null
+++ b/GarmentFactoryBusinessLogic/ShopLogic.cs
@@ -0,0 +1,189 @@
+using GarmentFactoryContracts.BindingModels;
+using GarmentFactoryContracts.BusinessLogicsContracts;
+using GarmentFactoryContracts.SearchModels;
+using GarmentFactoryContracts.StoragesContracts;
+using GarmentFactoryContracts.ViewModels;
+using GarmentFactoryDataModels.Models;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GarmentFactoryBusinessLogic
+{
+ public class ShopLogic : IShopLogic
+ {
+ private readonly ILogger _logger;
+
+ // Хранилище всех магазинов
+ private readonly IShopStorage _shopStorage;
+
+ private readonly ITextileStorage _textileStorage;
+
+ public ShopLogic(ILogger logger, IShopStorage shopStorage, ITextileStorage textileStorage)
+ {
+ _logger = logger;
+ _shopStorage = shopStorage;
+ _textileStorage = textileStorage;
+ }
+
+ // Чтение конкретного магазина
+ public ShopViewModel? ReadElement(ShopSearchModel model)
+ {
+ if (model == null)
+ {
+ throw new ArgumentNullException(nameof(model));
+ }
+
+ _logger.LogInformation("ReadElement. ShopName:{ShopName}. Id:{Id}", model.ShopName, model.Id);
+ var element = _shopStorage.GetElement(model);
+
+ if (element == null)
+ {
+ _logger.LogWarning("ReadElement element not found");
+
+ return null;
+ }
+
+ _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+
+ return element;
+ }
+
+ // Чтение всех магазинов
+ public List? ReadList(ShopSearchModel? model)
+ {
+ _logger.LogInformation("ReadList. ShopName:{ShopName}. Id: {Id}", model?.ShopName, model?.Id);
+
+ var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model);
+ if (list == null)
+ {
+ _logger.LogWarning("ReadList return null list");
+ return null;
+ }
+ _logger.LogInformation("ReadList. Count:{Count}", list.Count);
+ return list;
+ }
+
+ // Создание магазина
+ public bool Create(ShopBindingModel model)
+ {
+ CheckModel(model);
+
+ if (_shopStorage.Insert(model) == null)
+ {
+ _logger.LogWarning("Insert operation failed");
+ return false;
+ }
+ return true;
+ }
+
+ // Обновление магазина
+ public bool Update(ShopBindingModel model)
+ {
+ CheckModel(model);
+
+ if (_shopStorage.Update(model) == null)
+ {
+ _logger.LogWarning("Update operation failed");
+ return false;
+ }
+ return true;
+ }
+
+ // Удаление магазина
+ public bool Delete(ShopBindingModel model)
+ {
+ CheckModel(model, false);
+ _logger.LogInformation("Delete. Id:{Id}", model.Id);
+
+ if (_shopStorage.Delete(model) == null)
+ {
+ _logger.LogWarning("Delete operation failed");
+
+ return false;
+ }
+ return true;
+ }
+
+ // Пополнение магазина
+ public bool AddTextile(SupplyBindingModel model)
+ {
+ if (model == null)
+ {
+ throw new ArgumentNullException(nameof(model));
+ }
+
+ if (model.Count <= 0)
+ {
+ throw new ArgumentNullException("Количество добавляемых изделий должно быть больше 0");
+ }
+
+ var shop = _shopStorage.GetElement(new ShopSearchModel{ Id = model.ShopId });
+
+ if (shop == null)
+ {
+ throw new ArgumentException($"При добавлении товара в магазин магазин c id={model.ShopId} не найден");
+ }
+
+ // Если такой товар есть, то прибавление переданного кол-ва
+ if (shop.ShopTextiles.ContainsKey(model.TextileId))
+ {
+ var oldValue = shop.ShopTextiles[model.TextileId];
+ oldValue.Item2 += model.Count;
+ shop.ShopTextiles[model.TextileId] = oldValue;
+ }
+ // Если такого товара нет, то кол-во такого товара равно переданному кол-ву
+ else
+ {
+ var textile = _textileStorage.GetElement(new TextileSearchModel{ Id = model.TextileId });
+ if (textile == null)
+ {
+ throw new ArgumentException($"При добавлении товара в магазин товар с id={model.TextileId} не найден");
+ }
+ shop.ShopTextiles.Add(model.TextileId, (textile, model.Count));
+ }
+ return true;
+ }
+
+
+
+ // Проверка данных магазина при добавлении/удалении/обновлении
+ private void CheckModel(ShopBindingModel model, bool withParams = true)
+ {
+ if (model == null)
+ {
+ throw new ArgumentNullException(nameof(model));
+ }
+
+ // При удалении проверка дальше не нужна
+ if (!withParams)
+ {
+ return;
+ }
+
+ // Проверка наличия названия
+ if (string.IsNullOrEmpty(model.ShopName))
+ {
+ throw new ArgumentNullException("Отсутствует название магазина", nameof(model.ShopName));
+ }
+
+ // Проверка наличия адреса
+ if (string.IsNullOrEmpty(model.Address))
+ {
+ throw new ArgumentNullException("Отсутствует адреса магазина", nameof(model.Address));
+ }
+
+ _logger.LogInformation("Shop. ShopName:{ShopName}. Address:{Address}. Id: {Id}", model.ShopName, model.Address, model.Id);
+
+ var element = _shopStorage.GetElement(new ShopSearchModel { ShopName = model.ShopName });
+
+ if (element != null && element.Id != model.Id)
+ {
+ throw new InvalidOperationException("Магазин с таким названием уже есть");
+ }
+ }
+ }
+}
diff --git a/GarmentFactoryContracts/BindingModels/ShopBindingModel.cs b/GarmentFactoryContracts/BindingModels/ShopBindingModel.cs
new file mode 100644
index 0000000..65eb932
--- /dev/null
+++ b/GarmentFactoryContracts/BindingModels/ShopBindingModel.cs
@@ -0,0 +1,22 @@
+using GarmentFactoryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GarmentFactoryContracts.BindingModels
+{
+ public class ShopBindingModel : IShopModel
+ {
+ public int Id { get; set; }
+ public string ShopName { get; set; } = string.Empty;
+
+ public string Address { get; set; } = string.Empty;
+
+ public DateTime DateOpen { get; set; } = DateTime.Now;
+
+ public Dictionary ShopTextiles { get; set; } = new();
+
+ }
+}
diff --git a/GarmentFactoryContracts/BindingModels/SupplyBindingModel.cs b/GarmentFactoryContracts/BindingModels/SupplyBindingModel.cs
new file mode 100644
index 0000000..ba10711
--- /dev/null
+++ b/GarmentFactoryContracts/BindingModels/SupplyBindingModel.cs
@@ -0,0 +1,16 @@
+using GarmentFactoryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GarmentFactoryContracts.BindingModels
+{
+ public class SupplyBindingModel : ISupplyModel
+ {
+ public int ShopId { get; set; }
+ public int TextileId { get; set; }
+ public int Count { get; set; }
+ }
+}
diff --git a/GarmentFactoryContracts/BusinessLogicsContracts/IShopLogic.cs b/GarmentFactoryContracts/BusinessLogicsContracts/IShopLogic.cs
new file mode 100644
index 0000000..034e475
--- /dev/null
+++ b/GarmentFactoryContracts/BusinessLogicsContracts/IShopLogic.cs
@@ -0,0 +1,27 @@
+using GarmentFactoryContracts.BindingModels;
+using GarmentFactoryContracts.SearchModels;
+using GarmentFactoryContracts.ViewModels;
+using GarmentFactoryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GarmentFactoryContracts.BusinessLogicsContracts
+{
+ public interface IShopLogic
+ {
+ List? ReadList(ShopSearchModel? model);
+
+ ShopViewModel? ReadElement(ShopSearchModel model);
+
+ bool Create(ShopBindingModel model);
+
+ bool Update(ShopBindingModel model);
+
+ bool Delete(ShopBindingModel model);
+
+ bool AddTextile(SupplyBindingModel model);
+ }
+}
diff --git a/GarmentFactoryContracts/SearchModels/ShopSearchModel.cs b/GarmentFactoryContracts/SearchModels/ShopSearchModel.cs
new file mode 100644
index 0000000..a04e63f
--- /dev/null
+++ b/GarmentFactoryContracts/SearchModels/ShopSearchModel.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GarmentFactoryContracts.SearchModels
+{
+ public class ShopSearchModel
+ {
+ public int? Id { get; set; }
+ public string? ShopName { get; set; }
+ }
+}
diff --git a/GarmentFactoryContracts/StoragesContracts/IShopStorage.cs b/GarmentFactoryContracts/StoragesContracts/IShopStorage.cs
new file mode 100644
index 0000000..cad0d17
--- /dev/null
+++ b/GarmentFactoryContracts/StoragesContracts/IShopStorage.cs
@@ -0,0 +1,21 @@
+using GarmentFactoryContracts.BindingModels;
+using GarmentFactoryContracts.SearchModels;
+using GarmentFactoryContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GarmentFactoryContracts.StoragesContracts
+{
+ public interface IShopStorage
+ {
+ List GetFullList();
+ List GetFilteredList(ShopSearchModel model);
+ ShopViewModel? GetElement(ShopSearchModel model);
+ ShopViewModel? Insert(ShopBindingModel model);
+ ShopViewModel? Update(ShopBindingModel model);
+ ShopViewModel? Delete(ShopBindingModel model);
+ }
+}
diff --git a/GarmentFactoryContracts/ViewModels/ShopViewModel.cs b/GarmentFactoryContracts/ViewModels/ShopViewModel.cs
new file mode 100644
index 0000000..2645018
--- /dev/null
+++ b/GarmentFactoryContracts/ViewModels/ShopViewModel.cs
@@ -0,0 +1,26 @@
+using GarmentFactoryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GarmentFactoryContracts.ViewModels
+{
+ public class ShopViewModel : IShopModel
+ {
+ public int Id { get; set; }
+
+ [DisplayName("Название магазина")]
+ public string ShopName { get; set; } = string.Empty;
+
+ [DisplayName("Адрес магазина")]
+ public string Address { get; set; } = string.Empty;
+
+ [DisplayName("Дата открытия")]
+ public DateTime DateOpen { get; set; } = DateTime.Now;
+
+ public Dictionary ShopTextiles { get; set; } = new();
+ }
+}
diff --git a/GarmentFactoryDataModels/Models/IShopModel.cs b/GarmentFactoryDataModels/Models/IShopModel.cs
new file mode 100644
index 0000000..23646ea
--- /dev/null
+++ b/GarmentFactoryDataModels/Models/IShopModel.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GarmentFactoryDataModels.Models
+{
+ public interface IShopModel : IId
+ {
+ string ShopName { get; }
+ string Address { get; }
+ DateTime DateOpen { get; }
+ //Изделия в магазине
+ Dictionary ShopTextiles { get; }
+ }
+}
diff --git a/GarmentFactoryDataModels/Models/ISupplyModel.cs b/GarmentFactoryDataModels/Models/ISupplyModel.cs
new file mode 100644
index 0000000..88c2137
--- /dev/null
+++ b/GarmentFactoryDataModels/Models/ISupplyModel.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GarmentFactoryDataModels.Models
+{
+ //Сущность для связи многие-ко-многим между товарами и магазинами
+ public class ISupplyModel
+ {
+ int ShopId { get; }
+ int TextileId { get; }
+ int Count { get; }
+ }
+}
diff --git a/GarmentFactoryListImplement/DataListSingleton.cs b/GarmentFactoryListImplement/DataListSingleton.cs
index 2ae53af..a3e0efb 100644
--- a/GarmentFactoryListImplement/DataListSingleton.cs
+++ b/GarmentFactoryListImplement/DataListSingleton.cs
@@ -8,11 +8,13 @@ namespace GarmentFactoryListImplement
public List Components { get; set; }
public List Orders { get; set; }
public List Textiles { get; set; }
+ public List Shops { get; set; }
private DataListSingleton()
{
Components = new List();
Orders = new List();
Textiles = new List();
+ Shops = new List();
}
public static DataListSingleton GetInstance()
{
diff --git a/GarmentFactoryListImplement/Implements/ShopStorage.cs b/GarmentFactoryListImplement/Implements/ShopStorage.cs
new file mode 100644
index 0000000..a5442ac
--- /dev/null
+++ b/GarmentFactoryListImplement/Implements/ShopStorage.cs
@@ -0,0 +1,113 @@
+using GarmentFactoryContracts.BindingModels;
+using GarmentFactoryContracts.SearchModels;
+using GarmentFactoryContracts.StoragesContracts;
+using GarmentFactoryContracts.ViewModels;
+using GarmentFactoryListImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GarmentFactoryListImplement.Implements
+{
+ public class ShopStorage : IShopStorage
+ {
+ private readonly DataListSingleton _source;
+
+ public ShopStorage()
+ {
+ _source = DataListSingleton.GetInstance();
+ }
+
+ public List GetFullList()
+ {
+ var result = new List();
+ foreach (var shop in _source.Shops)
+ {
+ result.Add(shop.GetViewModel);
+ }
+ return result;
+ }
+
+ public List GetFilteredList(ShopSearchModel model)
+ {
+ var result = new List();
+ if (string.IsNullOrEmpty(model.ShopName))
+ {
+ return result;
+ }
+ foreach (var shop in _source.Shops)
+ {
+ if (shop.ShopName.Contains(model.ShopName))
+ {
+ result.Add(shop.GetViewModel);
+ }
+ }
+ return result;
+ }
+
+ public ShopViewModel? GetElement(ShopSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
+ {
+ return null;
+ }
+ foreach (var shop in _source.Shops)
+ {
+ if ((!string.IsNullOrEmpty(model.ShopName) && shop.ShopName == model.ShopName) ||
+ (model.Id.HasValue && shop.Id == model.Id))
+ {
+ return shop.GetViewModel;
+ }
+ }
+ return null;
+ }
+
+ public ShopViewModel? Insert(ShopBindingModel model)
+ {
+ model.Id = 1;
+ foreach (var shop in _source.Shops)
+ {
+ if (model.Id <= shop.Id)
+ {
+ model.Id = shop.Id + 1;
+ }
+ }
+ var newShop = Shop.Create(model);
+ if (newShop == null)
+ {
+ return null;
+ }
+ _source.Shops.Add(newShop);
+ return newShop.GetViewModel;
+ }
+
+ public ShopViewModel? Update(ShopBindingModel model)
+ {
+ foreach (var shop in _source.Shops)
+ {
+ if (shop.Id == model.Id)
+ {
+ shop.Update(model);
+ return shop.GetViewModel;
+ }
+ }
+ return null;
+ }
+
+ public ShopViewModel? Delete(ShopBindingModel model)
+ {
+ for (int i = 0; i < _source.Shops.Count; ++i)
+ {
+ if (_source.Shops[i].Id == model.Id)
+ {
+ var element = _source.Shops[i];
+ _source.Shops.RemoveAt(i);
+ return element.GetViewModel;
+ }
+ }
+ return null;
+ }
+ }
+}
diff --git a/GarmentFactoryListImplement/Models/Shop.cs b/GarmentFactoryListImplement/Models/Shop.cs
new file mode 100644
index 0000000..c3911ad
--- /dev/null
+++ b/GarmentFactoryListImplement/Models/Shop.cs
@@ -0,0 +1,59 @@
+using GarmentFactoryContracts.BindingModels;
+using GarmentFactoryContracts.ViewModels;
+using GarmentFactoryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GarmentFactoryListImplement.Models
+{
+ public class Shop : IShopModel
+ {
+ public int Id { get; private set; }
+ public string ShopName { get; private set; } = string.Empty;
+
+ public string Address { get; private set; } = string.Empty;
+
+ public DateTime DateOpen { get; private set; }
+
+ public Dictionary ShopTextiles { get; private set; } = new();
+
+ public static Shop? Create(ShopBindingModel? model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+
+ return new Shop()
+ {
+ Id = model.Id,
+ ShopName = model.ShopName,
+ Address = model.Address,
+ DateOpen = model.DateOpen,
+ ShopTextiles = model.ShopTextiles
+ };
+ }
+ public void Update(ShopBindingModel? model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ ShopName = model.ShopName;
+ Address = model.Address;
+ DateOpen = model.DateOpen;
+ ShopTextiles = model.ShopTextiles;
+ }
+ public ShopViewModel GetViewModel => new()
+ {
+ Id = Id,
+ ShopName = ShopName,
+ Address = Address,
+ DateOpen = DateOpen,
+ ShopTextiles = ShopTextiles
+ };
+ }
+}