diff --git a/FoodOrders/FoodOrders/FormDeliveryDishes.Designer.cs b/FoodOrders/FoodOrders/FormDeliveryDishes.Designer.cs
new file mode 100644
index 0000000..49657e2
--- /dev/null
+++ b/FoodOrders/FoodOrders/FormDeliveryDishes.Designer.cs
@@ -0,0 +1,143 @@
+namespace FoodOrdersView
+{
+ partial class FormDeliveryDishes
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.labelShop = new System.Windows.Forms.Label();
+ this.labelDish = new System.Windows.Forms.Label();
+ this.labelCount = new System.Windows.Forms.Label();
+ this.comboBoxShop = new System.Windows.Forms.ComboBox();
+ this.comboBoxDish = new System.Windows.Forms.ComboBox();
+ this.textBoxCount = new System.Windows.Forms.TextBox();
+ this.buttonSave = new System.Windows.Forms.Button();
+ this.buttonCancel = new System.Windows.Forms.Button();
+ this.SuspendLayout();
+ //
+ // labelShop
+ //
+ this.labelShop.AutoSize = true;
+ this.labelShop.Location = new System.Drawing.Point(12, 25);
+ this.labelShop.Name = "labelShop";
+ this.labelShop.Size = new System.Drawing.Size(54, 15);
+ this.labelShop.TabIndex = 0;
+ this.labelShop.Text = "Магазин";
+ //
+ // labelDish
+ //
+ this.labelDish.AutoSize = true;
+ this.labelDish.Location = new System.Drawing.Point(12, 66);
+ this.labelDish.Name = "labelDish";
+ this.labelDish.Size = new System.Drawing.Size(76, 15);
+ this.labelDish.TabIndex = 1;
+ this.labelDish.Text = "Блюдо";
+ //
+ // labelCount
+ //
+ this.labelCount.AutoSize = true;
+ this.labelCount.Location = new System.Drawing.Point(12, 110);
+ this.labelCount.Name = "labelCount";
+ this.labelCount.Size = new System.Drawing.Size(72, 15);
+ this.labelCount.TabIndex = 2;
+ this.labelCount.Text = "Количество";
+ //
+ // comboBoxShop
+ //
+ this.comboBoxShop.FormattingEnabled = true;
+ this.comboBoxShop.Location = new System.Drawing.Point(99, 22);
+ this.comboBoxShop.Name = "comboBoxShop";
+ this.comboBoxShop.Size = new System.Drawing.Size(286, 23);
+ this.comboBoxShop.TabIndex = 3;
+ //
+ // comboBoxDish
+ //
+ this.comboBoxDish.FormattingEnabled = true;
+ this.comboBoxDish.Location = new System.Drawing.Point(99, 63);
+ this.comboBoxDish.Name = "comboBoxDish";
+ this.comboBoxDish.Size = new System.Drawing.Size(286, 23);
+ this.comboBoxDish.TabIndex = 4;
+ //
+ // textBoxCount
+ //
+ this.textBoxCount.Location = new System.Drawing.Point(99, 107);
+ this.textBoxCount.Name = "textBoxCount";
+ this.textBoxCount.Size = new System.Drawing.Size(286, 23);
+ this.textBoxCount.TabIndex = 5;
+ //
+ // buttonSave
+ //
+ this.buttonSave.Location = new System.Drawing.Point(223, 154);
+ this.buttonSave.Name = "buttonSave";
+ this.buttonSave.Size = new System.Drawing.Size(75, 23);
+ this.buttonSave.TabIndex = 6;
+ this.buttonSave.Text = "Сохранить";
+ this.buttonSave.UseVisualStyleBackColor = true;
+ this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
+ //
+ // buttonCancel
+ //
+ this.buttonCancel.Location = new System.Drawing.Point(310, 154);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(75, 23);
+ this.buttonCancel.TabIndex = 7;
+ this.buttonCancel.Text = "Отмена";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+ //
+ // FormDeliveryDishes
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(397, 206);
+ this.Controls.Add(this.buttonCancel);
+ this.Controls.Add(this.buttonSave);
+ this.Controls.Add(this.textBoxCount);
+ this.Controls.Add(this.comboBoxDish);
+ this.Controls.Add(this.comboBoxShop);
+ this.Controls.Add(this.labelCount);
+ this.Controls.Add(this.labelDish);
+ this.Controls.Add(this.labelShop);
+ this.Name = "FormDeliveryDishes";
+ this.Text = "Поступление блюд";
+ this.Load += new System.EventHandler(this.FormDeliveryDishes_Load);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private Label labelShop;
+ private Label labelDish;
+ private Label labelCount;
+ private ComboBox comboBoxShop;
+ private ComboBox comboBoxDish;
+ private TextBox textBoxCount;
+ private Button buttonSave;
+ private Button buttonCancel;
+ }
+}
\ No newline at end of file
diff --git a/FoodOrders/FoodOrders/FormDeliveryDishes.cs b/FoodOrders/FoodOrders/FormDeliveryDishes.cs
new file mode 100644
index 0000000..a12c9ae
--- /dev/null
+++ b/FoodOrders/FoodOrders/FormDeliveryDishes.cs
@@ -0,0 +1,95 @@
+using FoodOrdersContracts.BusinessLogicsContracts;
+using FoodOrdersContracts.SearchModels;
+using Microsoft.Extensions.Logging;
+namespace FoodOrdersView
+{
+ public partial class FormDeliveryDishes : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IDishLogic _logicD;
+ private readonly IShopLogic _logicS;
+ public FormDeliveryDishes(ILogger logger, IDishLogic logicC, IShopLogic logicS)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logicD = logicC;
+ _logicS = logicS;
+ }
+ private void FormDeliveryDishes_Load(object sender, EventArgs e)
+ {
+ _logger.LogInformation("Загрузка магазина");
+ try
+ {
+ var list = _logicS.ReadList(null);
+ if (list != null)
+ {
+ comboBoxShop.DisplayMember = "ShopName";
+ comboBoxShop.ValueMember = "Id";
+ comboBoxShop.DataSource = list;
+ comboBoxShop.SelectedItem = null;
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки списка магазинов");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ _logger.LogInformation("Загрузка блюд");
+ try
+ {
+ var list = _logicD.ReadList(null);
+ if (list != null)
+ {
+ comboBoxDish.DisplayMember = "DishName";
+ comboBoxDish.ValueMember = "Id";
+ comboBoxDish.DataSource = list;
+ comboBoxDish.SelectedItem = null;
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки списка блюд");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ private void ButtonCancel_Click(object sender, EventArgs e)
+ {
+ DialogResult = DialogResult.Cancel;
+ Close();
+ }
+ private void ButtonSave_Click(object sender, EventArgs e)
+ {
+ if (comboBoxShop.SelectedValue == null)
+ {
+ MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ if (comboBoxDish.SelectedValue == null)
+ {
+ MessageBox.Show("Выберите блюдо", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ _logger.LogInformation("Пополнение магазина");
+ try
+ {
+ var operationResult = _logicS.DeliveryDishes(
+ new ShopSearchModel { ShopName = comboBoxShop.Text,},
+ _logicD.ReadElement(new DishSearchModel{ DishName = comboBoxDish.Text })!,
+ 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);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/FoodOrders/FoodOrders/FormDeliveryDishes.resx b/FoodOrders/FoodOrders/FormDeliveryDishes.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/FoodOrders/FoodOrders/FormDeliveryDishes.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/FoodOrders/FoodOrders/FormMain.Designer.cs b/FoodOrders/FoodOrders/FormMain.Designer.cs
index a9f671f..feb5d2d 100644
--- a/FoodOrders/FoodOrders/FormMain.Designer.cs
+++ b/FoodOrders/FoodOrders/FormMain.Designer.cs
@@ -38,6 +38,8 @@
this.buttonSetToWork = new System.Windows.Forms.Button();
this.buttonCreateOrder = new System.Windows.Forms.Button();
this.dataGridView = new System.Windows.Forms.DataGridView();
+ this.button1 = new System.Windows.Forms.Button();
+ this.магазиныToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
this.SuspendLayout();
@@ -56,7 +58,8 @@
//
this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.БлюдаToolStripMenuItem,
- this.наборблюдToolStripMenuItem});
+ this.наборблюдToolStripMenuItem,
+ this.магазиныToolStripMenuItem});
this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 20);
this.справочникиToolStripMenuItem.Text = "Справочники";
@@ -64,14 +67,14 @@
// БлюдаToolStripMenuItem
//
this.БлюдаToolStripMenuItem.Name = "БлюдаToolStripMenuItem";
- this.БлюдаToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+ this.БлюдаToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.БлюдаToolStripMenuItem.Text = "Блюда";
this.БлюдаToolStripMenuItem.Click += new System.EventHandler(this.ComponentsToolStripMenuItem_Click);
//
- // набор блюдToolStripMenuItem
+ // наборблюдToolStripMenuItem
//
- this.наборблюдToolStripMenuItem.Name = "набор блюдToolStripMenuItem";
- this.наборблюдToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+ this.наборблюдToolStripMenuItem.Name = "наборблюдToolStripMenuItem";
+ this.наборблюдToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.наборблюдToolStripMenuItem.Text = "Набор блюд";
this.наборблюдToolStripMenuItem.Click += new System.EventHandler(this.DishToolStripMenuItem_Click);
//
@@ -142,11 +145,30 @@
this.dataGridView.Size = new System.Drawing.Size(755, 426);
this.dataGridView.TabIndex = 7;
//
+ // button1
+ //
+ this.button1.Location = new System.Drawing.Point(780, 376);
+ this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(170, 58);
+ this.button1.TabIndex = 13;
+ this.button1.Text = "Пополнение магазина";
+ this.button1.UseVisualStyleBackColor = true;
+ this.button1.Click += new System.EventHandler(this.ButtonDeliveryDish_Click);
+ //
+ // магазиныToolStripMenuItem
+ //
+ this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
+ this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.магазиныToolStripMenuItem.Text = "Магазины";
+ this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.ShopsToolStripMenuItem_Click);
+ //
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(975, 450);
+ this.Controls.Add(this.button1);
this.Controls.Add(this.buttonUpdate);
this.Controls.Add(this.buttonSetToFinish);
this.Controls.Add(this.buttonSetToDone);
@@ -178,5 +200,7 @@
private Button buttonSetToWork;
private Button buttonCreateOrder;
private DataGridView dataGridView;
+ private Button button1;
+ private ToolStripMenuItem магазиныToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/FoodOrders/FoodOrders/FormMain.cs b/FoodOrders/FoodOrders/FormMain.cs
index c001a6b..ff1f765 100644
--- a/FoodOrders/FoodOrders/FormMain.cs
+++ b/FoodOrders/FoodOrders/FormMain.cs
@@ -158,5 +158,23 @@ namespace FoodOrdersView
{
LoadData();
}
+
+ private void ButtonDeliveryDish_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormDeliveryDishes));
+ if (service is FormDeliveryDishes form)
+ {
+ form.ShowDialog();
+ }
+ }
+
+ private void ShopsToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+ if (service is FormShops form)
+ {
+ form.ShowDialog();
+ }
+ }
}
}
\ No newline at end of file
diff --git a/FoodOrders/FoodOrders/FormMain.resx b/FoodOrders/FoodOrders/FormMain.resx
index f298a7b..81a9e3d 100644
--- a/FoodOrders/FoodOrders/FormMain.resx
+++ b/FoodOrders/FoodOrders/FormMain.resx
@@ -57,4 +57,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 17, 17
+
\ No newline at end of file
diff --git a/FoodOrders/FoodOrders/FormShop.Designer.cs b/FoodOrders/FoodOrders/FormShop.Designer.cs
new file mode 100644
index 0000000..0c9e0f4
--- /dev/null
+++ b/FoodOrders/FoodOrders/FormShop.Designer.cs
@@ -0,0 +1,198 @@
+namespace FoodOrdersView
+{
+ 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()
+ {
+ this.groupBox = new System.Windows.Forms.GroupBox();
+ this.buttonCancel = new System.Windows.Forms.Button();
+ this.buttonSave = new System.Windows.Forms.Button();
+ this.dataGridView = new System.Windows.Forms.DataGridView();
+ this.ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ColumnDishName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.labelName = new System.Windows.Forms.Label();
+ this.labelAddress = new System.Windows.Forms.Label();
+ this.textBoxName = new System.Windows.Forms.TextBox();
+ this.textBoxAddress = new System.Windows.Forms.TextBox();
+ this.labelDateOfOpening = new System.Windows.Forms.Label();
+ this.dateTimePicker = new System.Windows.Forms.DateTimePicker();
+ this.groupBox.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+ this.SuspendLayout();
+ //
+ // groupBox
+ //
+ this.groupBox.Controls.Add(this.buttonCancel);
+ this.groupBox.Controls.Add(this.buttonSave);
+ this.groupBox.Controls.Add(this.dataGridView);
+ this.groupBox.Location = new System.Drawing.Point(12, 120);
+ this.groupBox.Name = "groupBox";
+ this.groupBox.Size = new System.Drawing.Size(615, 203);
+ this.groupBox.TabIndex = 0;
+ this.groupBox.TabStop = false;
+ this.groupBox.Text = "Блюда";
+ //
+ // buttonCancel
+ //
+ this.buttonCancel.Location = new System.Drawing.Point(448, 144);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(161, 23);
+ this.buttonCancel.TabIndex = 2;
+ this.buttonCancel.Text = "Отмена";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+ //
+ // buttonSave
+ //
+ this.buttonSave.Location = new System.Drawing.Point(448, 62);
+ this.buttonSave.Name = "buttonSave";
+ this.buttonSave.Size = new System.Drawing.Size(161, 23);
+ this.buttonSave.TabIndex = 1;
+ this.buttonSave.Text = "Сохранить";
+ this.buttonSave.UseVisualStyleBackColor = true;
+ this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
+ //
+ // dataGridView
+ //
+ this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.ID,
+ this.ColumnDishName,
+ this.ColumnCount});
+ this.dataGridView.Location = new System.Drawing.Point(18, 22);
+ this.dataGridView.Name = "dataGridView";
+ this.dataGridView.RowTemplate.Height = 25;
+ this.dataGridView.Size = new System.Drawing.Size(424, 175);
+ this.dataGridView.TabIndex = 0;
+ //
+ // ID
+ //
+ this.ID.HeaderText = "ID";
+ this.ID.Name = "ID";
+ this.ID.Visible = false;
+ //
+ // ColumnDishName
+ //
+ this.ColumnDishName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.ColumnDishName.HeaderText = "Блюдо";
+ this.ColumnDishName.Name = "ColumnDishName";
+ //
+ // ColumnCount
+ //
+ this.ColumnCount.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+ this.ColumnCount.HeaderText = "Количество";
+ this.ColumnCount.Name = "ColumnCount";
+ this.ColumnCount.Width = 281;
+ //
+ // labelName
+ //
+ this.labelName.AutoSize = true;
+ this.labelName.Location = new System.Drawing.Point(30, 23);
+ this.labelName.Name = "labelName";
+ this.labelName.Size = new System.Drawing.Size(59, 15);
+ this.labelName.TabIndex = 1;
+ this.labelName.Text = "Название";
+ //
+ // labelAddress
+ //
+ this.labelAddress.AutoSize = true;
+ this.labelAddress.Location = new System.Drawing.Point(30, 60);
+ this.labelAddress.Name = "labelAddress";
+ this.labelAddress.Size = new System.Drawing.Size(40, 15);
+ this.labelAddress.TabIndex = 2;
+ this.labelAddress.Text = "Адрес";
+ //
+ // textBoxName
+ //
+ this.textBoxName.Location = new System.Drawing.Point(95, 20);
+ this.textBoxName.Name = "textBoxName";
+ this.textBoxName.Size = new System.Drawing.Size(211, 23);
+ this.textBoxName.TabIndex = 3;
+ //
+ // textBoxAddress
+ //
+ this.textBoxAddress.Location = new System.Drawing.Point(95, 57);
+ this.textBoxAddress.Name = "textBoxAddress";
+ this.textBoxAddress.Size = new System.Drawing.Size(211, 23);
+ this.textBoxAddress.TabIndex = 4;
+ //
+ // labelDateOfOpening
+ //
+ this.labelDateOfOpening.AutoSize = true;
+ this.labelDateOfOpening.Location = new System.Drawing.Point(324, 23);
+ this.labelDateOfOpening.Name = "labelDateOfOpening";
+ this.labelDateOfOpening.Size = new System.Drawing.Size(87, 15);
+ this.labelDateOfOpening.TabIndex = 5;
+ this.labelDateOfOpening.Text = "Дата открытия";
+ //
+ // dateTimePicker
+ //
+ this.dateTimePicker.Location = new System.Drawing.Point(417, 20);
+ this.dateTimePicker.Name = "dateTimePicker";
+ this.dateTimePicker.Size = new System.Drawing.Size(200, 23);
+ this.dateTimePicker.TabIndex = 6;
+ //
+ // FormShop
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(639, 335);
+ this.Controls.Add(this.dateTimePicker);
+ this.Controls.Add(this.labelDateOfOpening);
+ this.Controls.Add(this.textBoxAddress);
+ this.Controls.Add(this.textBoxName);
+ this.Controls.Add(this.labelAddress);
+ this.Controls.Add(this.labelName);
+ this.Controls.Add(this.groupBox);
+ this.Name = "FormShop";
+ this.Text = "Магазин";
+ this.Load += new System.EventHandler(this.FormShop_Load);
+ this.groupBox.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private GroupBox groupBox;
+ private DataGridView dataGridView;
+ private Button buttonSave;
+ private Button buttonCancel;
+ private DataGridViewTextBoxColumn ID;
+ private DataGridViewTextBoxColumn ColumnDishName;
+ private DataGridViewTextBoxColumn ColumnCount;
+ private Label labelName;
+ private Label labelAddress;
+ private TextBox textBoxName;
+ private TextBox textBoxAddress;
+ private Label labelDateOfOpening;
+ private DateTimePicker dateTimePicker;
+ }
+}
\ No newline at end of file
diff --git a/FoodOrders/FoodOrders/FormShop.cs b/FoodOrders/FoodOrders/FormShop.cs
new file mode 100644
index 0000000..0a43012
--- /dev/null
+++ b/FoodOrders/FoodOrders/FormShop.cs
@@ -0,0 +1,116 @@
+using FoodOrdersContracts.BindingModels;
+using FoodOrdersContracts.BusinessLogicsContracts;
+using FoodOrdersContracts.SearchModels;
+using FoodOrdersDataModels.Models;
+using Microsoft.Extensions.Logging;
+namespace FoodOrdersView
+{
+ public partial class FormShop : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IShopLogic _logicS;
+ private int? _id;
+ private Dictionary _shopDishes;
+ public int Id { set { _id = value; } }
+ public FormShop(ILogger logger, IShopLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logicS = logic;
+ _shopDishes = new Dictionary();
+ }
+ private void FormShop_Load(object sender, EventArgs e)
+ {
+ if (_id.HasValue)
+ {
+ _logger.LogInformation("Загрузка магазина");
+ try
+ {
+ var view = _logicS.ReadElement(new ShopSearchModel
+ {
+ Id = _id.Value
+ });
+ if (view != null)
+ {
+ textBoxName.Text = view.ShopName;
+ textBoxAddress.Text = view.Address;
+ dateTimePicker.Value = view.DateOfOpening;
+ _shopDishes = view.ShopDishes ?? new Dictionary();
+ LoadData();
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки магазина");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+ MessageBoxIcon.Error);
+ }
+ }
+ }
+ private void LoadData()
+ {
+ _logger.LogInformation("Загрузка блюд в магазине");
+ try
+ {
+ if (_shopDishes != null)
+ {
+ dataGridView.Rows.Clear();
+ foreach (var sc in _shopDishes)
+ {
+ dataGridView.Rows.Add(new object[] { sc.Key, sc.Value.Item1.DishName, sc.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,
+ DateOfOpening = dateTimePicker.Value.Date,
+ ShopDishes = _shopDishes
+ };
+ var operationResult = _id.HasValue ? _logicS.Update(model) : _logicS.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/FoodOrders/FoodOrders/FormShop.resx b/FoodOrders/FoodOrders/FormShop.resx
new file mode 100644
index 0000000..1766e37
--- /dev/null
+++ b/FoodOrders/FoodOrders/FormShop.resx
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+ True
+
+
\ No newline at end of file
diff --git a/FoodOrders/FoodOrders/FormShops.Designer.cs b/FoodOrders/FoodOrders/FormShops.Designer.cs
new file mode 100644
index 0000000..8994dc4
--- /dev/null
+++ b/FoodOrders/FoodOrders/FormShops.Designer.cs
@@ -0,0 +1,114 @@
+namespace FoodOrdersView
+{
+ 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()
+ {
+ this.buttonAdd = new System.Windows.Forms.Button();
+ this.buttonEdit = new System.Windows.Forms.Button();
+ this.buttonDelete = new System.Windows.Forms.Button();
+ this.buttonUpdate = new System.Windows.Forms.Button();
+ this.dataGridView = new System.Windows.Forms.DataGridView();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+ this.SuspendLayout();
+ //
+ // buttonAdd
+ //
+ this.buttonAdd.Location = new System.Drawing.Point(409, 99);
+ this.buttonAdd.Name = "buttonAdd";
+ this.buttonAdd.Size = new System.Drawing.Size(133, 23);
+ this.buttonAdd.TabIndex = 0;
+ this.buttonAdd.Text = "Добавить";
+ this.buttonAdd.UseVisualStyleBackColor = true;
+ this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
+ //
+ // buttonEdit
+ //
+ this.buttonEdit.Location = new System.Drawing.Point(409, 140);
+ this.buttonEdit.Name = "buttonEdit";
+ this.buttonEdit.Size = new System.Drawing.Size(133, 23);
+ this.buttonEdit.TabIndex = 1;
+ this.buttonEdit.Text = "Изменить";
+ this.buttonEdit.UseVisualStyleBackColor = true;
+ this.buttonEdit.Click += new System.EventHandler(this.ButtonEdit_Click);
+ //
+ // buttonDelete
+ //
+ this.buttonDelete.Location = new System.Drawing.Point(409, 181);
+ this.buttonDelete.Name = "buttonDelete";
+ this.buttonDelete.Size = new System.Drawing.Size(133, 23);
+ this.buttonDelete.TabIndex = 2;
+ this.buttonDelete.Text = "Удалить";
+ this.buttonDelete.UseVisualStyleBackColor = true;
+ this.buttonDelete.Click += new System.EventHandler(this.ButtonDelete_Click);
+ //
+ // buttonUpdate
+ //
+ this.buttonUpdate.Location = new System.Drawing.Point(409, 223);
+ this.buttonUpdate.Name = "buttonUpdate";
+ this.buttonUpdate.Size = new System.Drawing.Size(133, 23);
+ this.buttonUpdate.TabIndex = 3;
+ this.buttonUpdate.Text = "Обновить";
+ this.buttonUpdate.UseVisualStyleBackColor = true;
+ this.buttonUpdate.Click += new System.EventHandler(this.ButtonUpdate_Click);
+ //
+ // dataGridView
+ //
+ this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView.Location = new System.Drawing.Point(-1, 0);
+ this.dataGridView.Name = "dataGridView";
+ this.dataGridView.RowTemplate.Height = 25;
+ this.dataGridView.Size = new System.Drawing.Size(404, 342);
+ this.dataGridView.TabIndex = 4;
+ //
+ // FormShops
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(554, 342);
+ this.Controls.Add(this.dataGridView);
+ this.Controls.Add(this.buttonUpdate);
+ this.Controls.Add(this.buttonDelete);
+ this.Controls.Add(this.buttonEdit);
+ this.Controls.Add(this.buttonAdd);
+ this.Name = "FormShops";
+ this.Text = "Список магазинов";
+ this.Load += new System.EventHandler(this.FormShops_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private Button buttonAdd;
+ private Button buttonEdit;
+ private Button buttonDelete;
+ private Button buttonUpdate;
+ private DataGridView dataGridView;
+ }
+}
\ No newline at end of file
diff --git a/FoodOrders/FoodOrders/FormShops.cs b/FoodOrders/FoodOrders/FormShops.cs
new file mode 100644
index 0000000..10fd11a
--- /dev/null
+++ b/FoodOrders/FoodOrders/FormShops.cs
@@ -0,0 +1,99 @@
+using FoodOrdersContracts.BindingModels;
+using FoodOrdersContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+namespace FoodOrdersView
+{
+ public partial class FormShops : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IShopLogic _logicS;
+ public FormShops(ILogger logger, IShopLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logicS = logic;
+ }
+ private void FormShops_Load(object sender, EventArgs e)
+ {
+ LoadData();
+ }
+ private void LoadData()
+ {
+ try
+ {
+ var list = _logicS.ReadList(null);
+ if (list != null)
+ {
+ dataGridView.DataSource = list;
+ dataGridView.Columns["Id"].Visible = false;
+ dataGridView.Columns["ShopDishes"].Visible = false;
+ dataGridView.Columns["DateOfOpening"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+ }
+ _logger.LogInformation("Загрузка магазинов");
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки магазинов");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+ MessageBoxIcon.Error);
+ }
+ }
+ private void ButtonUpdate_Click(object sender, EventArgs e)
+ {
+ 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 (!_logicS.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 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 ButtonEdit_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();
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/FoodOrders/FoodOrders/FormShops.resx b/FoodOrders/FoodOrders/FormShops.resx
new file mode 100644
index 0000000..f298a7b
--- /dev/null
+++ b/FoodOrders/FoodOrders/FormShops.resx
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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/FoodOrders/FoodOrders/Program.cs b/FoodOrders/FoodOrders/Program.cs
index f14ca71..65e685f 100644
--- a/FoodOrders/FoodOrders/Program.cs
+++ b/FoodOrders/FoodOrders/Program.cs
@@ -39,9 +39,11 @@ namespace FoodOrdersView
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
@@ -49,6 +51,9 @@ namespace FoodOrdersView
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
}
}
}
\ No newline at end of file
diff --git a/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/ShopLogic.cs b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/ShopLogic.cs
new file mode 100644
index 0000000..d78a7ef
--- /dev/null
+++ b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/ShopLogic.cs
@@ -0,0 +1,148 @@
+using FoodOrdersContracts.BindingModels;
+using FoodOrdersContracts.BusinessLogicsContracts;
+using FoodOrdersContracts.SearchModels;
+using FoodOrdersContracts.StoragesContracts;
+using FoodOrdersContracts.ViewModels;
+using FoodOrdersDataModels.Models;
+using Microsoft.Extensions.Logging;
+using System.Text;
+
+namespace FoodOrdersBusinessLogic.BusinessLogics
+{
+ public class ShopLogic : IShopLogic
+ {
+ private readonly ILogger _logger;
+ private readonly IShopStorage _shopStorage;
+ public ShopLogic(ILogger logger, IShopStorage shopStorage)
+ {
+ _logger = logger;
+ _shopStorage = shopStorage;
+ }
+ public bool Create(ShopBindingModel model)
+ {
+ CheckModel(model);
+ if (_shopStorage.Insert(model) == null)
+ {
+ _logger.LogWarning("Insert 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 DeliveryDishes(ShopSearchModel model, IDishModel dish, int count)
+ {
+ if (model == null)
+ {
+ throw new ArgumentNullException(nameof(model));
+ }
+ if (dish == null)
+ {
+ throw new ArgumentNullException(nameof(dish));
+ }
+ if(count <= 0)
+ {
+ throw new ArgumentNullException("Количество должно быть больше 0", nameof(count));
+ }
+ _logger.LogInformation("DeliveryDishes. ShopName:{ShopName}.Id:{Id}", model.ShopName, model.Id);
+ var element = _shopStorage.GetElement(model);
+ if(element == null)
+ {
+ _logger.LogWarning("Shop not found");
+ return false;
+ }
+ if (element.ShopDishes.ContainsKey(dish.Id))
+ {
+ element.ShopDishes[dish.Id] = (dish, element.ShopDishes[dish.Id].Item2 + count);
+ }
+ else
+ {
+ element.ShopDishes[dish.Id] = (dish, count);
+ }
+ _shopStorage.Update(new ShopBindingModel
+ {
+ Id = element.Id,
+ ShopName = element.ShopName,
+ Address = element.Address,
+ DateOfOpening = element.DateOfOpening,
+ ShopDishes = element.ShopDishes
+ });
+ return true;
+ }
+ 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 Update(ShopBindingModel model)
+ {
+ CheckModel(model);
+ if (_shopStorage.Update(model) == null)
+ {
+ _logger.LogWarning("Update operation failed");
+ return false;
+ }
+ 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/FoodOrders/FoodOrdersContracts/BindingModels/ShopBindingModel.cs b/FoodOrders/FoodOrdersContracts/BindingModels/ShopBindingModel.cs
new file mode 100644
index 0000000..75da34d
--- /dev/null
+++ b/FoodOrders/FoodOrdersContracts/BindingModels/ShopBindingModel.cs
@@ -0,0 +1,13 @@
+using FoodOrdersDataModels.Models;
+
+namespace FoodOrdersContracts.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 DateOfOpening { get; set; } = DateTime.Now;
+ public Dictionary ShopDishes { get; set; } = new();
+ }
+}
diff --git a/FoodOrders/FoodOrdersContracts/BuisnessLogicsContracts/IShopLogic.cs b/FoodOrders/FoodOrdersContracts/BuisnessLogicsContracts/IShopLogic.cs
new file mode 100644
index 0000000..061a8ad
--- /dev/null
+++ b/FoodOrders/FoodOrdersContracts/BuisnessLogicsContracts/IShopLogic.cs
@@ -0,0 +1,17 @@
+using FoodOrdersContracts.BindingModels;
+using FoodOrdersContracts.SearchModels;
+using FoodOrdersContracts.ViewModels;
+using FoodOrdersDataModels.Models;
+
+namespace FoodOrdersContracts.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 DeliveryDishes(ShopSearchModel model, IDishModel dish, int count);
+ }
+}
diff --git a/FoodOrders/FoodOrdersContracts/SearchModels/ShopSearchModel.cs b/FoodOrders/FoodOrdersContracts/SearchModels/ShopSearchModel.cs
new file mode 100644
index 0000000..ea916d2
--- /dev/null
+++ b/FoodOrders/FoodOrdersContracts/SearchModels/ShopSearchModel.cs
@@ -0,0 +1,8 @@
+namespace FoodOrdersContracts.SearchModels
+{
+ public class ShopSearchModel
+ {
+ public int? Id { get; set; }
+ public string? ShopName { get; set; }
+ }
+}
diff --git a/FoodOrders/FoodOrdersContracts/StoragesContracts/IShopStorage.cs b/FoodOrders/FoodOrdersContracts/StoragesContracts/IShopStorage.cs
new file mode 100644
index 0000000..c444d49
--- /dev/null
+++ b/FoodOrders/FoodOrdersContracts/StoragesContracts/IShopStorage.cs
@@ -0,0 +1,16 @@
+using FoodOrdersContracts.BindingModels;
+using FoodOrdersContracts.SearchModels;
+using FoodOrdersContracts.ViewModels;
+
+namespace FoodOrdersContracts.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/FoodOrders/FoodOrdersContracts/ViewModels/DishViewModel.cs b/FoodOrders/FoodOrdersContracts/ViewModels/DishViewModel.cs
index 76e4723..a811938 100644
--- a/FoodOrders/FoodOrdersContracts/ViewModels/DishViewModel.cs
+++ b/FoodOrders/FoodOrdersContracts/ViewModels/DishViewModel.cs
@@ -6,7 +6,7 @@ namespace FoodOrdersContracts.ViewModels
public class DishViewModel : IDishModel
{
public int Id { get; set; }
- [DisplayName("Название изделия")]
+ [DisplayName("Название компонента")]
public string DishName { get; set; } = string.Empty;
[DisplayName("Цена")]
public double Price { get; set; }
diff --git a/FoodOrders/FoodOrdersContracts/ViewModels/ShopViewModel.cs b/FoodOrders/FoodOrdersContracts/ViewModels/ShopViewModel.cs
new file mode 100644
index 0000000..b60ab86
--- /dev/null
+++ b/FoodOrders/FoodOrdersContracts/ViewModels/ShopViewModel.cs
@@ -0,0 +1,17 @@
+using FoodOrdersDataModels.Models;
+using System.ComponentModel;
+
+namespace FoodOrdersContracts.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 DateOfOpening { get; set; } = DateTime.Now;
+ public Dictionary ShopDishes { get; set; } = new();
+ }
+}
diff --git a/FoodOrders/FoodOrdersDataModels/Models/IShopModel.cs b/FoodOrders/FoodOrdersDataModels/Models/IShopModel.cs
new file mode 100644
index 0000000..7e46be9
--- /dev/null
+++ b/FoodOrders/FoodOrdersDataModels/Models/IShopModel.cs
@@ -0,0 +1,10 @@
+namespace FoodOrdersDataModels.Models
+{
+ public interface IShopModel : IId
+ {
+ string ShopName { get; }
+ string Address { get; }
+ DateTime DateOfOpening { get; }
+ Dictionary ShopDishes { get; }
+ }
+}
diff --git a/FoodOrders/FoodOrdersListImplement/DataListSingleton.cs b/FoodOrders/FoodOrdersListImplement/DataListSingleton.cs
index 87ce9fe..53e7bab 100644
--- a/FoodOrders/FoodOrdersListImplement/DataListSingleton.cs
+++ b/FoodOrders/FoodOrdersListImplement/DataListSingleton.cs
@@ -8,11 +8,13 @@ namespace FoodOrdersListImplement
public List Components { get; set; }
public List Orders { get; set; }
public List Dishes { get; set; }
+ public List Shops { get; set; }
private DataListSingleton()
{
Components = new List();
Orders = new List();
Dishes = new List();
+ Shops = new List();
}
public static DataListSingleton GetInstance()
{
diff --git a/FoodOrders/FoodOrdersListImplement/Implements/ShopStorage.cs b/FoodOrders/FoodOrdersListImplement/Implements/ShopStorage.cs
new file mode 100644
index 0000000..f8f414a
--- /dev/null
+++ b/FoodOrders/FoodOrdersListImplement/Implements/ShopStorage.cs
@@ -0,0 +1,100 @@
+using FoodOrdersContracts.BindingModels;
+using FoodOrdersContracts.SearchModels;
+using FoodOrdersContracts.StoragesContracts;
+using FoodOrdersContracts.ViewModels;
+using FoodOrdersListImplement.Models;
+
+namespace FoodOrdersListImplement.Implements
+{
+ public class ShopStorage : IShopStorage
+ {
+ private readonly DataListSingleton _source;
+ public ShopStorage()
+ {
+ _source = DataListSingleton.GetInstance();
+ }
+ 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;
+ }
+ 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 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 List GetFullList()
+ {
+ var result = new List();
+ foreach (var shop in _source.Shops)
+ {
+ result.Add(shop.GetViewModel);
+ }
+ return result;
+ }
+ 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;
+ }
+ }
+}
diff --git a/FoodOrders/FoodOrdersListImplement/Models/Shop.cs b/FoodOrders/FoodOrdersListImplement/Models/Shop.cs
new file mode 100644
index 0000000..04d3119
--- /dev/null
+++ b/FoodOrders/FoodOrdersListImplement/Models/Shop.cs
@@ -0,0 +1,51 @@
+using FoodOrdersContracts.BindingModels;
+using FoodOrdersContracts.ViewModels;
+using FoodOrdersDataModels.Models;
+using System.Reflection;
+using System.Xml.Linq;
+
+namespace FoodOrdersListImplement.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 DateOfOpening { get; private set; } = DateTime.Now;
+ public Dictionary ShopDishes { get; private set; } = new Dictionary();
+ public static Shop? Create(ShopBindingModel? model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new Shop()
+ {
+ Id = model.Id,
+ ShopName = model.ShopName,
+ Address = model.Address,
+ DateOfOpening = model.DateOfOpening,
+ ShopDishes = model.ShopDishes
+ };
+ }
+ public void Update(ShopBindingModel? model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ ShopName = model.ShopName;
+ Address = model.Address;
+ DateOfOpening = model.DateOfOpening;
+ ShopDishes = model.ShopDishes;
+ }
+ public ShopViewModel GetViewModel => new()
+ {
+ Id = Id,
+ ShopName = ShopName,
+ Address = Address,
+ DateOfOpening = DateOfOpening,
+ ShopDishes = ShopDishes
+ };
+ }
+}