diff --git a/TravelCompany/TravelCompany/FormCreateSupply.Designer.cs b/TravelCompany/TravelCompany/FormCreateSupply.Designer.cs
new file mode 100644
index 0000000..d7bebf1
--- /dev/null
+++ b/TravelCompany/TravelCompany/FormCreateSupply.Designer.cs
@@ -0,0 +1,143 @@
+namespace TravelCompany.Forms
+{
+ partial class FormCreateSupply
+ {
+ ///
+ /// 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.comboBoxShop = new System.Windows.Forms.ComboBox();
+ this.labelShop = new System.Windows.Forms.Label();
+ this.labelTravel = new System.Windows.Forms.Label();
+ this.comboBoxTravel = new System.Windows.Forms.ComboBox();
+ this.labelCount = new System.Windows.Forms.Label();
+ this.textBoxCount = new System.Windows.Forms.TextBox();
+ this.buttonCancel = new System.Windows.Forms.Button();
+ this.buttonSave = new System.Windows.Forms.Button();
+ this.SuspendLayout();
+ //
+ // comboBoxShop
+ //
+ this.comboBoxShop.FormattingEnabled = true;
+ this.comboBoxShop.Location = new System.Drawing.Point(115, 12);
+ this.comboBoxShop.Name = "comboBoxShop";
+ this.comboBoxShop.Size = new System.Drawing.Size(344, 28);
+ this.comboBoxShop.TabIndex = 0;
+ //
+ // labelShop
+ //
+ this.labelShop.AutoSize = true;
+ this.labelShop.Location = new System.Drawing.Point(12, 15);
+ this.labelShop.Name = "labelShop";
+ this.labelShop.Size = new System.Drawing.Size(76, 20);
+ this.labelShop.TabIndex = 1;
+ this.labelShop.Text = "Магазин: ";
+ //
+ // labelTravel
+ //
+ this.labelTravel.AutoSize = true;
+ this.labelTravel.Location = new System.Drawing.Point(12, 49);
+ this.labelTravel.Name = "labelTravel";
+ this.labelTravel.Size = new System.Drawing.Size(75, 20);
+ this.labelTravel.TabIndex = 2;
+ this.labelTravel.Text = "Изделие: ";
+ //
+ // comboBoxTravel
+ //
+ this.comboBoxTravel.FormattingEnabled = true;
+ this.comboBoxTravel.Location = new System.Drawing.Point(115, 46);
+ this.comboBoxTravel.Name = "comboBoxTravel";
+ this.comboBoxTravel.Size = new System.Drawing.Size(344, 28);
+ this.comboBoxTravel.TabIndex = 3;
+ //
+ // labelCount
+ //
+ this.labelCount.AutoSize = true;
+ this.labelCount.Location = new System.Drawing.Point(12, 83);
+ this.labelCount.Name = "labelCount";
+ this.labelCount.Size = new System.Drawing.Size(97, 20);
+ this.labelCount.TabIndex = 4;
+ this.labelCount.Text = "Количество: ";
+ //
+ // textBoxCount
+ //
+ this.textBoxCount.Location = new System.Drawing.Point(115, 80);
+ this.textBoxCount.Name = "textBoxCount";
+ this.textBoxCount.Size = new System.Drawing.Size(344, 27);
+ this.textBoxCount.TabIndex = 5;
+ //
+ // buttonCancel
+ //
+ this.buttonCancel.Location = new System.Drawing.Point(300, 113);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(116, 39);
+ this.buttonCancel.TabIndex = 6;
+ this.buttonCancel.Text = "Отмена";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+ //
+ // buttonSave
+ //
+ this.buttonSave.Location = new System.Drawing.Point(168, 113);
+ this.buttonSave.Name = "buttonSave";
+ this.buttonSave.Size = new System.Drawing.Size(116, 39);
+ this.buttonSave.TabIndex = 7;
+ this.buttonSave.Text = "Сохранить";
+ this.buttonSave.UseVisualStyleBackColor = true;
+ this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
+ //
+ // FormCreateSupply
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(471, 164);
+ this.Controls.Add(this.buttonSave);
+ this.Controls.Add(this.buttonCancel);
+ this.Controls.Add(this.textBoxCount);
+ this.Controls.Add(this.labelCount);
+ this.Controls.Add(this.comboBoxTravel);
+ this.Controls.Add(this.labelTravel);
+ this.Controls.Add(this.labelShop);
+ this.Controls.Add(this.comboBoxShop);
+ this.Name = "FormCreateSupply";
+ this.Text = "Создание поставки";
+ this.Load += new System.EventHandler(this.FormCreateSupply_Load);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private ComboBox comboBoxShop;
+ private Label labelShop;
+ private Label labelTravel;
+ private ComboBox comboBoxTravel;
+ private Label labelCount;
+ private TextBox textBoxCount;
+ private Button buttonCancel;
+ private Button buttonSave;
+ }
+}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompany/FormCreateSupply.cs b/TravelCompany/TravelCompany/FormCreateSupply.cs
new file mode 100644
index 0000000..6ca4901
--- /dev/null
+++ b/TravelCompany/TravelCompany/FormCreateSupply.cs
@@ -0,0 +1,99 @@
+using Microsoft.Extensions.Logging;
+using TravelCompanyContracts.BindingModels;
+using TravelCompanyContracts.BusinessLogicsContracts;
+using TravelCompanyContracts.ViewModels;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+
+namespace TravelCompany.Forms
+{
+ public partial class FormCreateSupply : Form
+ {
+ private readonly ILogger _logger;
+ private readonly ITravelLogic _logicP;
+ private readonly IShopLogic _logicS;
+ private List _shopList = new List();
+ private List _TravelList = new List();
+
+ public FormCreateSupply(ILogger logger, ITravelLogic logicP, IShopLogic logicS)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logicP = logicP;
+ _logicS = logicS;
+ }
+
+ private void FormCreateSupply_Load(object sender, EventArgs e)
+ {
+ _shopList = _logicS.ReadList(null);
+ _TravelList = _logicP.ReadList(null);
+ if (_shopList != null)
+ {
+ comboBoxShop.DisplayMember = "ShopName";
+ comboBoxShop.ValueMember = "Id";
+ comboBoxShop.DataSource = _shopList;
+ comboBoxShop.SelectedItem = null;
+ _logger.LogInformation("Загрузка магазинов для поставок");
+ }
+ if (_TravelList != null)
+ {
+ comboBoxTravel.DisplayMember = "TravelName";
+ comboBoxTravel.ValueMember = "Id";
+ comboBoxTravel.DataSource = _TravelList;
+ comboBoxTravel.SelectedItem = null;
+ _logger.LogInformation("Загрузка путёвок для поставок");
+ }
+ }
+
+ private void ButtonSave_Click(object sender, EventArgs e)
+ {
+ if (comboBoxShop.SelectedValue == null)
+ {
+ MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ if (comboBoxTravel.SelectedValue == null)
+ {
+ MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ _logger.LogInformation("Создание поставки");
+ try
+ {
+ var operationResult = _logicS.MakeSupply(new SupplyBindingModel
+ {
+ ShopId = Convert.ToInt32(comboBoxShop.SelectedValue),
+ TravelId = Convert.ToInt32(comboBoxTravel.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/TravelCompany/TravelCompany/FormCreateSupply.resx b/TravelCompany/TravelCompany/FormCreateSupply.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/TravelCompany/TravelCompany/FormCreateSupply.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/TravelCompany/TravelCompany/FormMain.Designer.cs b/TravelCompany/TravelCompany/FormMain.Designer.cs
index e2b8f72..0ec9934 100644
--- a/TravelCompany/TravelCompany/FormMain.Designer.cs
+++ b/TravelCompany/TravelCompany/FormMain.Designer.cs
@@ -39,6 +39,10 @@
buttonIssuedOrder = new Button();
buttonRef = new Button();
dataGridView = new DataGridView();
+ operationToolStripMenuItem = new ToolStripMenuItem();
+ transactionToolStripMenuItem = new ToolStripMenuItem();
+ продажаToolStripMenuItem = new ToolStripMenuItem();
+ магазиныToolStripMenuItem = new ToolStripMenuItem();
toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout();
@@ -46,7 +50,7 @@
// toolStrip1
//
toolStrip1.ImageScalingSize = new Size(20, 20);
- toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1 });
+ toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, operationToolStripMenuItem });
toolStrip1.Location = new Point(0, 0);
toolStrip1.Name = "toolStrip1";
toolStrip1.Size = new Size(969, 25);
@@ -56,7 +60,7 @@
// toolStripDropDownButton1
//
toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text;
- toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, ПутёвкиToolStripMenuItem });
+ toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, ПутёвкиToolStripMenuItem, магазиныToolStripMenuItem });
toolStripDropDownButton1.Image = (Image)resources.GetObject("toolStripDropDownButton1.Image");
toolStripDropDownButton1.ImageTransparentColor = Color.Magenta;
toolStripDropDownButton1.Name = "toolStripDropDownButton1";
@@ -66,14 +70,14 @@
// компонентыToolStripMenuItem
//
компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
- компонентыToolStripMenuItem.Size = new Size(174, 22);
+ компонентыToolStripMenuItem.Size = new Size(180, 22);
компонентыToolStripMenuItem.Text = "Компоненты";
компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click;
//
// ПутёвкиToolStripMenuItem
//
ПутёвкиToolStripMenuItem.Name = "ПутёвкиToolStripMenuItem";
- ПутёвкиToolStripMenuItem.Size = new Size(174, 22);
+ ПутёвкиToolStripMenuItem.Size = new Size(180, 22);
ПутёвкиToolStripMenuItem.Text = "Туристич. путёвки";
ПутёвкиToolStripMenuItem.Click += консервыToolStripMenuItem_Click;
//
@@ -139,6 +143,34 @@
dataGridView.Size = new Size(763, 435);
dataGridView.TabIndex = 6;
//
+ // operationToolStripMenuItem
+ //
+ operationToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { transactionToolStripMenuItem, продажаToolStripMenuItem });
+ operationToolStripMenuItem.Name = "operationToolStripMenuItem";
+ operationToolStripMenuItem.Size = new Size(75, 25);
+ operationToolStripMenuItem.Text = "Операции";
+ //
+ // transactionToolStripMenuItem
+ //
+ transactionToolStripMenuItem.Name = "transactionToolStripMenuItem";
+ transactionToolStripMenuItem.Size = new Size(180, 22);
+ transactionToolStripMenuItem.Text = "Поставка";
+ transactionToolStripMenuItem.Click += transactionToolStripMenuItem_Click;
+ //
+ // продажаToolStripMenuItem
+ //
+ продажаToolStripMenuItem.Name = "продажаToolStripMenuItem";
+ продажаToolStripMenuItem.Size = new Size(180, 22);
+ продажаToolStripMenuItem.Text = "Продажа";
+ продажаToolStripMenuItem.Click += SellToolStripMenuItem_Click;
+ //
+ // магазиныToolStripMenuItem
+ //
+ магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
+ магазиныToolStripMenuItem.Size = new Size(180, 22);
+ магазиныToolStripMenuItem.Text = "Магазины";
+ магазиныToolStripMenuItem.Click += shopsToolStripMenuItem_Click;
+ //
// FormMain
//
AutoScaleDimensions = new SizeF(7F, 15F);
@@ -173,5 +205,9 @@
private ToolStripDropDownButton toolStripDropDownButton1;
private ToolStripMenuItem компонентыToolStripMenuItem;
private ToolStripMenuItem ПутёвкиToolStripMenuItem;
+ private ToolStripMenuItem магазиныToolStripMenuItem;
+ private ToolStripMenuItem operationToolStripMenuItem;
+ private ToolStripMenuItem transactionToolStripMenuItem;
+ private ToolStripMenuItem продажаToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompany/FormMain.cs b/TravelCompany/TravelCompany/FormMain.cs
index d25b396..db25bef 100644
--- a/TravelCompany/TravelCompany/FormMain.cs
+++ b/TravelCompany/TravelCompany/FormMain.cs
@@ -151,5 +151,32 @@ namespace TravelCompany.Forms
{
LoadData();
}
+
+ private void shopsToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+ if (service is FormShops form)
+ {
+ form.ShowDialog();
+ }
+ }
+
+ private void transactionToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormCreateSupply));
+ if (service is FormCreateSupply form)
+ {
+ form.ShowDialog();
+ }
+ }
+
+ private void SellToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormSellTravels));
+ if (service is FormSellTravels form)
+ {
+ form.ShowDialog();
+ }
+ }
}
}
diff --git a/TravelCompany/TravelCompany/FormSellTravels.Designer.cs b/TravelCompany/TravelCompany/FormSellTravels.Designer.cs
new file mode 100644
index 0000000..17577cf
--- /dev/null
+++ b/TravelCompany/TravelCompany/FormSellTravels.Designer.cs
@@ -0,0 +1,124 @@
+namespace TravelCompany.Forms
+{
+ partial class FormSellTravels
+ {
+ ///
+ /// 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()
+ {
+ labelTravel = new Label();
+ comboBoxTravel = new ComboBox();
+ labelCount = new Label();
+ textBoxCount = new TextBox();
+ buttonSell = new Button();
+ buttonCancel = new Button();
+ SuspendLayout();
+ //
+ // labelTravel
+ //
+ labelTravel.AutoSize = true;
+ labelTravel.Location = new Point(10, 10);
+ labelTravel.Name = "labelTravel";
+ labelTravel.Size = new Size(57, 15);
+ labelTravel.TabIndex = 0;
+ labelTravel.Text = "Путёвка: ";
+ //
+ // comboBoxTravel
+ //
+ comboBoxTravel.FormattingEnabled = true;
+ comboBoxTravel.Location = new Point(101, 8);
+ comboBoxTravel.Margin = new Padding(3, 2, 3, 2);
+ comboBoxTravel.Name = "comboBoxTravel";
+ comboBoxTravel.Size = new Size(210, 23);
+ comboBoxTravel.TabIndex = 1;
+ //
+ // labelCount
+ //
+ labelCount.AutoSize = true;
+ labelCount.Location = new Point(10, 41);
+ labelCount.Name = "labelCount";
+ labelCount.Size = new Size(78, 15);
+ labelCount.TabIndex = 2;
+ labelCount.Text = "Количество: ";
+ //
+ // textBoxCount
+ //
+ textBoxCount.Location = new Point(101, 39);
+ textBoxCount.Margin = new Padding(3, 2, 3, 2);
+ textBoxCount.Name = "textBoxCount";
+ textBoxCount.Size = new Size(210, 23);
+ textBoxCount.TabIndex = 3;
+ //
+ // buttonSell
+ //
+ buttonSell.Location = new Point(112, 74);
+ buttonSell.Margin = new Padding(3, 2, 3, 2);
+ buttonSell.Name = "buttonSell";
+ buttonSell.Size = new Size(82, 22);
+ buttonSell.TabIndex = 4;
+ buttonSell.Text = "Продать";
+ buttonSell.UseVisualStyleBackColor = true;
+ buttonSell.Click += ButtonSell_Click;
+ //
+ // buttonCancel
+ //
+ buttonCancel.Location = new Point(212, 74);
+ buttonCancel.Margin = new Padding(3, 2, 3, 2);
+ buttonCancel.Name = "buttonCancel";
+ buttonCancel.Size = new Size(82, 22);
+ buttonCancel.TabIndex = 5;
+ buttonCancel.Text = "Отмена";
+ buttonCancel.UseVisualStyleBackColor = true;
+ buttonCancel.Click += ButtonCancel_Click;
+ //
+ // FormSellTravels
+ //
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(320, 105);
+ Controls.Add(buttonCancel);
+ Controls.Add(buttonSell);
+ Controls.Add(textBoxCount);
+ Controls.Add(labelCount);
+ Controls.Add(comboBoxTravel);
+ Controls.Add(labelTravel);
+ Margin = new Padding(3, 2, 3, 2);
+ Name = "FormSellTravels";
+ Text = "Продажа путёвок";
+ Load += FormSellingTravel_Load;
+ ResumeLayout(false);
+ PerformLayout();
+ }
+
+ #endregion
+
+ private Label labelTravel;
+ private ComboBox comboBoxTravel;
+ private Label labelCount;
+ private TextBox textBoxCount;
+ private Button buttonSell;
+ private Button buttonCancel;
+ }
+}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompany/FormSellTravels.cs b/TravelCompany/TravelCompany/FormSellTravels.cs
new file mode 100644
index 0000000..84128c5
--- /dev/null
+++ b/TravelCompany/TravelCompany/FormSellTravels.cs
@@ -0,0 +1,88 @@
+using Microsoft.Extensions.Logging;
+using TravelCompanyContracts.BusinessLogicsContracts;
+using TravelCompanyContracts.SearchModels;
+using TravelCompanyContracts.StoragesContracts;
+using TravelCompanyContracts.ViewModels;
+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 TravelCompany.Forms
+{
+ public partial class FormSellTravels : Form
+ {
+ private readonly ILogger _logger;
+ private readonly ITravelLogic _logicP;
+ private readonly IShopLogic _logicS;
+ private List _TravelList = new List();
+
+ public FormSellTravels(ILogger logger, ITravelLogic logicP, IShopLogic logicS)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logicP = logicP;
+ _logicS = logicS;
+ }
+
+ private void FormSellingTravel_Load(object sender, EventArgs e)
+ {
+ _TravelList = _logicP.ReadList(null);
+ if (_TravelList != null)
+ {
+ comboBoxTravel.DisplayMember = "TravelName";
+ comboBoxTravel.ValueMember = "Id";
+ comboBoxTravel.DataSource = _TravelList;
+ comboBoxTravel.SelectedItem = null;
+ _logger.LogInformation("Загрузка путёвок для продажи");
+ }
+ }
+
+ private void ButtonSell_Click(object sender, EventArgs e)
+ {
+ if (comboBoxTravel.SelectedValue == null)
+ {
+ MessageBox.Show("Выберите пиццу", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ _logger.LogInformation("Создание покупки");
+ try
+ {
+ bool resout = _logicS.Sale(new SupplySearchModel
+ {
+ TravelId = Convert.ToInt32(comboBoxTravel.SelectedValue),
+ Count = Convert.ToInt32(textBoxCount.Text)
+ });
+ if (resout)
+ {
+ _logger.LogInformation("Проверка пройдена, продажа проведена");
+ MessageBox.Show("Продажа проведена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ DialogResult = DialogResult.OK;
+ Close();
+ }
+ else
+ {
+ _logger.LogInformation("Проверка не пройдена");
+ MessageBox.Show("Продажа не может быть создана.", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ }
+ }
+ 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();
+ }
+ }
+}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompany/FormSellTravels.resx b/TravelCompany/TravelCompany/FormSellTravels.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/TravelCompany/TravelCompany/FormSellTravels.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/TravelCompany/TravelCompany/FormShop.Designer.cs b/TravelCompany/TravelCompany/FormShop.Designer.cs
new file mode 100644
index 0000000..3321d32
--- /dev/null
+++ b/TravelCompany/TravelCompany/FormShop.Designer.cs
@@ -0,0 +1,222 @@
+namespace TravelCompany.Forms
+{
+ 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.labelName = new System.Windows.Forms.Label();
+ this.textBoxName = new System.Windows.Forms.TextBox();
+ this.textBoxAdress = new System.Windows.Forms.TextBox();
+ this.labelAdress = new System.Windows.Forms.Label();
+ 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.TravelName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.label1 = new System.Windows.Forms.Label();
+ this.dateTimeOpen = new System.Windows.Forms.DateTimePicker();
+ this.label2 = new System.Windows.Forms.Label();
+ this.numericUpTravelMaxCount = new System.Windows.Forms.NumericUpDown();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpTravelMaxCount)).BeginInit();
+ this.SuspendLayout();
+ //
+ // labelName
+ //
+ this.labelName.AutoSize = true;
+ this.labelName.Location = new System.Drawing.Point(11, 15);
+ this.labelName.Name = "labelName";
+ this.labelName.Size = new System.Drawing.Size(84, 20);
+ this.labelName.TabIndex = 0;
+ this.labelName.Text = "Название: ";
+ //
+ // textBoxName
+ //
+ this.textBoxName.Location = new System.Drawing.Point(102, 12);
+ this.textBoxName.Name = "textBoxName";
+ this.textBoxName.Size = new System.Drawing.Size(276, 27);
+ this.textBoxName.TabIndex = 1;
+ //
+ // textBoxAdress
+ //
+ this.textBoxAdress.Location = new System.Drawing.Point(102, 59);
+ this.textBoxAdress.Name = "textBoxAdress";
+ this.textBoxAdress.Size = new System.Drawing.Size(427, 27);
+ this.textBoxAdress.TabIndex = 3;
+ //
+ // labelAdress
+ //
+ this.labelAdress.AutoSize = true;
+ this.labelAdress.Location = new System.Drawing.Point(11, 61);
+ this.labelAdress.Name = "labelAdress";
+ this.labelAdress.Size = new System.Drawing.Size(58, 20);
+ this.labelAdress.TabIndex = 2;
+ this.labelAdress.Text = "Адрес: ";
+ //
+ // buttonCancel
+ //
+ this.buttonCancel.Location = new System.Drawing.Point(451, 457);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(130, 44);
+ this.buttonCancel.TabIndex = 5;
+ this.buttonCancel.Text = "Отмена";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+ //
+ // buttonSave
+ //
+ this.buttonSave.Location = new System.Drawing.Point(315, 457);
+ this.buttonSave.Name = "buttonSave";
+ this.buttonSave.Size = new System.Drawing.Size(130, 44);
+ this.buttonSave.TabIndex = 6;
+ this.buttonSave.Text = "Сохранить";
+ this.buttonSave.UseVisualStyleBackColor = true;
+ this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
+ //
+ // dataGridView
+ //
+ this.dataGridView.AllowUserToAddRows = false;
+ this.dataGridView.AllowUserToDeleteRows = false;
+ this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+ this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.id,
+ this.TravelName,
+ this.Count});
+ this.dataGridView.Location = new System.Drawing.Point(12, 185);
+ this.dataGridView.Name = "dataGridView";
+ this.dataGridView.ReadOnly = true;
+ this.dataGridView.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
+ this.dataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders;
+ this.dataGridView.RowTemplate.Height = 29;
+ this.dataGridView.Size = new System.Drawing.Size(569, 266);
+ this.dataGridView.TabIndex = 7;
+ //
+ // id
+ //
+ this.id.HeaderText = "id";
+ this.id.MinimumWidth = 6;
+ this.id.Name = "id";
+ this.id.ReadOnly = true;
+ this.id.Visible = false;
+ //
+ // TravelName
+ //
+ this.TravelName.HeaderText = "Пицца";
+ this.TravelName.MinimumWidth = 6;
+ this.TravelName.Name = "TravelName";
+ this.TravelName.ReadOnly = true;
+ //
+ // Count
+ //
+ this.Count.HeaderText = "Количество";
+ this.Count.MinimumWidth = 6;
+ this.Count.Name = "Count";
+ this.Count.ReadOnly = true;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(12, 103);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(110, 20);
+ this.label1.TabIndex = 8;
+ this.label1.Text = "Дата открытия";
+ //
+ // dateTimeOpen
+ //
+ this.dateTimeOpen.Location = new System.Drawing.Point(128, 103);
+ this.dateTimeOpen.Name = "dateTimeOpen";
+ this.dateTimeOpen.Size = new System.Drawing.Size(401, 27);
+ this.dateTimeOpen.TabIndex = 9;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(12, 148);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(100, 20);
+ this.label2.TabIndex = 10;
+ this.label2.Text = "Вместимость";
+ //
+ // numericUpTravelMaxCount
+ //
+ this.numericUpTravelMaxCount.Location = new System.Drawing.Point(128, 146);
+ this.numericUpTravelMaxCount.Maximum = new decimal(new int[] {
+ 10000,
+ 0,
+ 0,
+ 0});
+ this.numericUpTravelMaxCount.Name = "numericUpTravelMaxCount";
+ this.numericUpTravelMaxCount.Size = new System.Drawing.Size(401, 27);
+ this.numericUpTravelMaxCount.TabIndex = 11;
+ //
+ // FormShop
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(593, 513);
+ this.Controls.Add(this.numericUpTravelMaxCount);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.dateTimeOpen);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.dataGridView);
+ this.Controls.Add(this.buttonSave);
+ this.Controls.Add(this.buttonCancel);
+ this.Controls.Add(this.textBoxAdress);
+ this.Controls.Add(this.labelAdress);
+ this.Controls.Add(this.textBoxName);
+ this.Controls.Add(this.labelName);
+ this.Name = "FormShop";
+ this.Text = "Магазин";
+ this.Load += new System.EventHandler(this.FormShop_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpTravelMaxCount)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private Label labelName;
+ private TextBox textBoxName;
+ private TextBox textBoxAdress;
+ private Label labelAdress;
+ private Button buttonCancel;
+ private Button buttonSave;
+ private DataGridView dataGridView;
+ private DataGridViewTextBoxColumn id;
+ private DataGridViewTextBoxColumn TravelName;
+ private DataGridViewTextBoxColumn Count;
+ private Label label1;
+ private DateTimePicker dateTimeOpen;
+ private Label label2;
+ private NumericUpDown numericUpTravelMaxCount;
+ }
+}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompany/FormShop.cs b/TravelCompany/TravelCompany/FormShop.cs
new file mode 100644
index 0000000..e177fe6
--- /dev/null
+++ b/TravelCompany/TravelCompany/FormShop.cs
@@ -0,0 +1,127 @@
+using TravelCompanyDataModels.Models;
+using Microsoft.Extensions.Logging;
+using TravelCompanyContracts.BindingModels;
+using TravelCompanyContracts.BusinessLogicsContracts;
+using TravelCompanyContracts.SearchModels;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace TravelCompany.Forms
+{
+ public partial class FormShop : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IShopLogic _logic;
+ private int? _id;
+ public int Id { set { _id = value; } }
+ private Dictionary _ShopTravels;
+ private DateTime? _openingDate = null;
+ public FormShop(ILogger logger, IShopLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ _ShopTravels = 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;
+ textBoxAdress.Text = view.Adress;
+ dateTimeOpen.Value = view.OpeningDate;
+ numericUpTravelMaxCount.Value = view.TravelMaxCount;
+ _ShopTravels = view.ShopTravels ?? new Dictionary();
+ LoadData();
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки магазина");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ }
+
+ private void LoadData()
+ {
+ _logger.LogInformation("Загрузка изделий в магазине");
+ try
+ {
+ if (_ShopTravels != null)
+ {
+ dataGridView.Rows.Clear();
+ foreach (var sr in _ShopTravels)
+ {
+ dataGridView.Rows.Add(new object[] { sr.Key, sr.Value.Item1.TravelName, sr.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(textBoxAdress.Text))
+ {
+ MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ _logger.LogInformation("Сохранение магазина");
+ try
+ {
+ var model = new ShopBindingModel
+ {
+ Id = _id ?? 0,
+ ShopName = textBoxName.Text,
+ Adress = textBoxAdress.Text,
+ OpeningDate = dateTimeOpen.Value,
+ TravelMaxCount = (int)numericUpTravelMaxCount.Value
+ };
+ var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
+ if (!operationResult)
+ {
+ throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
+ }
+ MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ DialogResult = DialogResult.OK;
+ Close();
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка сохранения магазина");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ private void buttonCancel_Click(object sender, EventArgs e)
+ {
+ DialogResult = DialogResult.Cancel;
+ Close();
+ }
+ }
+}
diff --git a/TravelCompany/TravelCompany/FormShop.resx b/TravelCompany/TravelCompany/FormShop.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/TravelCompany/TravelCompany/FormShop.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/TravelCompany/TravelCompany/FormShops.Designer.cs b/TravelCompany/TravelCompany/FormShops.Designer.cs
new file mode 100644
index 0000000..ddcc07f
--- /dev/null
+++ b/TravelCompany/TravelCompany/FormShops.Designer.cs
@@ -0,0 +1,130 @@
+namespace TravelCompany.Forms
+{
+ 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.ToolsPanel = new System.Windows.Forms.Panel();
+ this.buttonRef = new System.Windows.Forms.Button();
+ this.buttonDel = new System.Windows.Forms.Button();
+ this.buttonUpd = new System.Windows.Forms.Button();
+ this.buttonAdd = new System.Windows.Forms.Button();
+ this.dataGridView = new System.Windows.Forms.DataGridView();
+ this.ToolsPanel.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+ this.SuspendLayout();
+ //
+ // ToolsPanel
+ //
+ this.ToolsPanel.Controls.Add(this.buttonRef);
+ this.ToolsPanel.Controls.Add(this.buttonDel);
+ this.ToolsPanel.Controls.Add(this.buttonUpd);
+ this.ToolsPanel.Controls.Add(this.buttonAdd);
+ this.ToolsPanel.Location = new System.Drawing.Point(608, 12);
+ this.ToolsPanel.Name = "ToolsPanel";
+ this.ToolsPanel.Size = new System.Drawing.Size(180, 426);
+ this.ToolsPanel.TabIndex = 3;
+ //
+ // buttonRef
+ //
+ this.buttonRef.Location = new System.Drawing.Point(31, 206);
+ this.buttonRef.Name = "buttonRef";
+ this.buttonRef.Size = new System.Drawing.Size(126, 36);
+ this.buttonRef.TabIndex = 3;
+ this.buttonRef.Text = "Обновить";
+ this.buttonRef.UseVisualStyleBackColor = true;
+ this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click);
+ //
+ // buttonDel
+ //
+ this.buttonDel.Location = new System.Drawing.Point(31, 142);
+ this.buttonDel.Name = "buttonDel";
+ this.buttonDel.Size = new System.Drawing.Size(126, 36);
+ this.buttonDel.TabIndex = 2;
+ this.buttonDel.Text = "Удалить";
+ this.buttonDel.UseVisualStyleBackColor = true;
+ this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click);
+ //
+ // buttonUpd
+ //
+ this.buttonUpd.Location = new System.Drawing.Point(31, 76);
+ this.buttonUpd.Name = "buttonUpd";
+ this.buttonUpd.Size = new System.Drawing.Size(126, 36);
+ this.buttonUpd.TabIndex = 1;
+ this.buttonUpd.Text = "Изменить";
+ this.buttonUpd.UseVisualStyleBackColor = true;
+ this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click);
+ //
+ // buttonAdd
+ //
+ this.buttonAdd.Location = new System.Drawing.Point(31, 16);
+ this.buttonAdd.Name = "buttonAdd";
+ this.buttonAdd.Size = new System.Drawing.Size(126, 36);
+ this.buttonAdd.TabIndex = 0;
+ this.buttonAdd.Text = "Добавить";
+ this.buttonAdd.UseVisualStyleBackColor = true;
+ this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
+ //
+ // dataGridView
+ //
+ this.dataGridView.AllowUserToAddRows = false;
+ this.dataGridView.AllowUserToDeleteRows = false;
+ this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView.Location = new System.Drawing.Point(12, 12);
+ this.dataGridView.Name = "dataGridView";
+ this.dataGridView.ReadOnly = true;
+ this.dataGridView.RowHeadersWidth = 51;
+ this.dataGridView.RowTemplate.Height = 29;
+ this.dataGridView.Size = new System.Drawing.Size(590, 426);
+ this.dataGridView.TabIndex = 2;
+ //
+ // FormShops
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(800, 450);
+ this.Controls.Add(this.ToolsPanel);
+ this.Controls.Add(this.dataGridView);
+ this.Name = "FormShops";
+ this.Text = "Магазины";
+ this.Load += new System.EventHandler(this.FormShops_Load);
+ this.ToolsPanel.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private Panel ToolsPanel;
+ private Button buttonRef;
+ private Button buttonDel;
+ private Button buttonUpd;
+ private Button buttonAdd;
+ private DataGridView dataGridView;
+ }
+}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompany/FormShops.cs b/TravelCompany/TravelCompany/FormShops.cs
new file mode 100644
index 0000000..14dc763
--- /dev/null
+++ b/TravelCompany/TravelCompany/FormShops.cs
@@ -0,0 +1,117 @@
+using Microsoft.Extensions.Logging;
+using TravelCompany;
+using TravelCompanyContracts.BindingModels;
+using TravelCompanyContracts.BusinessLogicsContracts;
+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 TravelCompany.Forms
+{
+ 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["ShopTravels"].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 ButtonUpd_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 ButtonDel_Click(object sender, EventArgs e)
+ {
+ if (dataGridView.SelectedRows.Count == 1)
+ {
+ if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+ {
+ int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+ _logger.LogInformation("Удаление магазина");
+ try
+ {
+ if (!_logic.Delete(new ShopBindingModel
+ {
+ Id = id
+ }))
+ {
+ throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
+ }
+ LoadData();
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка удаления магазина");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ }
+ }
+
+ private void ButtonRef_Click(object sender, EventArgs e)
+ {
+ LoadData();
+ }
+ }
+}
diff --git a/TravelCompany/TravelCompany/FormShops.resx b/TravelCompany/TravelCompany/FormShops.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/TravelCompany/TravelCompany/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/TravelCompany/TravelCompany/Program.cs b/TravelCompany/TravelCompany/Program.cs
index e4bdf5f..92214ab 100644
--- a/TravelCompany/TravelCompany/Program.cs
+++ b/TravelCompany/TravelCompany/Program.cs
@@ -5,6 +5,7 @@ using TravelCompanyFileImplement.Implements;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
+using TravelCompanyBusinessLogic.BusinessLogics;
namespace TravelCompany.Forms
@@ -50,6 +51,12 @@ namespace TravelCompany.Forms
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
}
}
}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/OrderLogic.cs b/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/OrderLogic.cs
index e7c1295..d357b8a 100644
--- a/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/OrderLogic.cs
+++ b/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/OrderLogic.cs
@@ -21,11 +21,13 @@ namespace TravelCompanyBusinessLogic.BusinessLogic
private readonly ILogger _logger;
private readonly IOrderStorage _orderStorage;
+ private readonly IShopStorage _shopStorage;
- public OrderLogic(ILogger logger, IOrderStorage orderStorage)
+ public OrderLogic(ILogger logger, IOrderStorage orderStorage, IShopStorage shopStorage)
{
_logger = logger;
_orderStorage = orderStorage;
+ _shopStorage = shopStorage;
}
public List? ReadList(OrderSearchModel? model)
@@ -70,6 +72,23 @@ namespace TravelCompanyBusinessLogic.BusinessLogic
public bool DeliveryOrder(OrderBindingModel model)
{
+ var order = _orderStorage.GetElement(new OrderSearchModel
+ {
+ Id = model.Id,
+ });
+ if (order == null)
+ {
+ throw new ArgumentNullException(nameof(order));
+ }
+ if (!_shopStorage.RestockingShops(new SupplyBindingModel
+ {
+ TravelId = order.TravelId,
+ Count = order.Count
+ }))
+ {
+ throw new ArgumentException("Недостаточно места");
+ }
+
return ToNextStatus(model, OrderStatus.Выдан);
}
diff --git a/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/ShopLogic.cs b/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/ShopLogic.cs
new file mode 100644
index 0000000..56cfe73
--- /dev/null
+++ b/TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/ShopLogic.cs
@@ -0,0 +1,192 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TravelCompanyContracts.BindingModels;
+using TravelCompanyContracts.BusinessLogicsContracts;
+using TravelCompanyContracts.SearchModels;
+using TravelCompanyContracts.StoragesContracts;
+using TravelCompanyContracts.ViewModels;
+
+namespace TravelCompanyBusinessLogic.BusinessLogics
+{
+ public class ShopLogic : IShopLogic
+ {
+ private readonly ILogger _logger;
+ private readonly IShopStorage _shopStorage;
+ private readonly ITravelStorage _TravelStorage;
+
+ public ShopLogic(ILogger logger, IShopStorage shopStorage, ITravelStorage TravelStorage)
+ {
+ _logger = logger;
+ _shopStorage = shopStorage;
+ _TravelStorage = TravelStorage;
+ }
+
+ 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 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 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 MakeSupply(SupplyBindingModel model)
+ {
+ if (model == null)
+ {
+ throw new ArgumentNullException(nameof(model));
+ }
+ if (model.Count <= 0)
+ {
+ throw new ArgumentException("Количество изделий должно быть больше 0");
+ }
+ var shop = _shopStorage.GetElement(new ShopSearchModel
+ {
+ Id = model.ShopId
+ });
+ if (shop == null)
+ {
+ throw new ArgumentException("Магазина не существует");
+ }
+ if (shop.ShopTravels.ContainsKey(model.TravelId))
+ {
+ var oldValue = shop.ShopTravels[model.TravelId];
+ oldValue.Item2 += model.Count;
+ shop.ShopTravels[model.TravelId] = oldValue;
+ }
+ else
+ {
+ var Travel = _TravelStorage.GetElement(new TravelSearchModel
+ {
+ Id = model.TravelId
+ });
+ if (Travel == null)
+ {
+ throw new ArgumentException($"Поставка: Товар с id:{model.TravelId} не найденн");
+ }
+ if (shop.ShopTravels.Sum(kv => kv.Value.Item2) + model.Count > shop.TravelMaxCount)
+ {
+ throw new ArgumentException("Превышена максимальная вместимость магазина");
+ }
+ shop.ShopTravels.Add(model.TravelId, (Travel, model.Count));
+ }
+
+ _shopStorage.Update(new ShopBindingModel()
+ {
+ Id = shop.Id,
+ ShopName = shop.ShopName,
+ Adress = shop.Adress,
+ OpeningDate = shop.OpeningDate,
+ ShopTravels = shop.ShopTravels,
+ TravelMaxCount = shop.TravelMaxCount,
+ });
+
+ 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.Adress))
+ {
+ throw new ArgumentException("Адрес магазина длжен быть заполнен", nameof(model.Adress));
+ }
+ if (string.IsNullOrEmpty(model.ShopName))
+ {
+ throw new ArgumentException("Название магазина должно быть заполнено", nameof(model.ShopName));
+ }
+ _logger.LogInformation("Shop. ShopName:{ShopName}.Adres:{Adres}.OpeningDate:{OpeningDate}.Id:{ Id}", model.ShopName, model.Adress, model.OpeningDate, model.Id);
+ var element = _shopStorage.GetElement(new ShopSearchModel
+ {
+ ShopName = model.ShopName
+ });
+ if (element != null && element.Id != model.Id)
+ {
+ throw new InvalidOperationException("Магазин с таким названием уже есть");
+ }
+ }
+
+ public bool Sale(SupplySearchModel model)
+ {
+ if (!model.TravelId.HasValue || !model.Count.HasValue)
+ {
+ return false;
+ }
+ _logger.LogInformation("Check Travel count in all shops");
+ if (_shopStorage.Sale(model))
+ {
+ _logger.LogInformation("Selling sucsess");
+ return true;
+ }
+ _logger.LogInformation("Selling failed");
+ return false;
+ }
+ }
+}
diff --git a/TravelCompany/TravelCompanyContracts/BindingModels/ShopBindingModel.cs b/TravelCompany/TravelCompanyContracts/BindingModels/ShopBindingModel.cs
new file mode 100644
index 0000000..81615fa
--- /dev/null
+++ b/TravelCompany/TravelCompanyContracts/BindingModels/ShopBindingModel.cs
@@ -0,0 +1,19 @@
+using TravelCompanyDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TravelCompanyContracts.BindingModels
+{
+ public class ShopBindingModel : IShopModel
+ {
+ public int Id { get; set; }
+ public string ShopName { get; set; } = string.Empty;
+ public string Adress { get; set; } = string.Empty;
+ public DateTime OpeningDate { get; set; } = DateTime.Now;
+ public Dictionary ShopTravels { get; set; } = new();
+ public int TravelMaxCount { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompanyContracts/BindingModels/SupplyBindingModel.cs b/TravelCompany/TravelCompanyContracts/BindingModels/SupplyBindingModel.cs
new file mode 100644
index 0000000..52ff0c1
--- /dev/null
+++ b/TravelCompany/TravelCompanyContracts/BindingModels/SupplyBindingModel.cs
@@ -0,0 +1,16 @@
+using TravelCompanyDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TravelCompanyContracts.BindingModels
+{
+ public class SupplyBindingModel : ISupplyModel
+ {
+ public int ShopId { get; set; }
+ public int TravelId { get; set; }
+ public int Count { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompanyContracts/BusinessLogicsContracts/IShopLogic.cs b/TravelCompany/TravelCompanyContracts/BusinessLogicsContracts/IShopLogic.cs
new file mode 100644
index 0000000..33b18cf
--- /dev/null
+++ b/TravelCompany/TravelCompanyContracts/BusinessLogicsContracts/IShopLogic.cs
@@ -0,0 +1,22 @@
+using TravelCompanyContracts.BindingModels;
+using TravelCompanyContracts.SearchModels;
+using TravelCompanyContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TravelCompanyContracts.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 MakeSupply(SupplyBindingModel model);
+ bool Sale(SupplySearchModel model);
+ }
+}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompanyContracts/SearchModels/ShopSearchModel.cs b/TravelCompany/TravelCompanyContracts/SearchModels/ShopSearchModel.cs
new file mode 100644
index 0000000..61660af
--- /dev/null
+++ b/TravelCompany/TravelCompanyContracts/SearchModels/ShopSearchModel.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TravelCompanyContracts.SearchModels
+{
+ public class ShopSearchModel
+ {
+ public int? Id { get; set; }
+ public string? ShopName { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompanyContracts/SearchModels/SupplySearchModel.cs b/TravelCompany/TravelCompanyContracts/SearchModels/SupplySearchModel.cs
new file mode 100644
index 0000000..5da7c58
--- /dev/null
+++ b/TravelCompany/TravelCompanyContracts/SearchModels/SupplySearchModel.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TravelCompanyContracts.SearchModels
+{
+ public class SupplySearchModel
+ {
+ public int? TravelId { get; set; }
+ public int? Count { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompanyContracts/StoragesContracts/IShopStorage.cs b/TravelCompany/TravelCompanyContracts/StoragesContracts/IShopStorage.cs
new file mode 100644
index 0000000..c8619c1
--- /dev/null
+++ b/TravelCompany/TravelCompanyContracts/StoragesContracts/IShopStorage.cs
@@ -0,0 +1,23 @@
+using TravelCompanyContracts.BindingModels;
+using TravelCompanyContracts.SearchModels;
+using TravelCompanyContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TravelCompanyContracts.StoragesContracts
+{
+ public interface IShopStorage
+ {
+ List GetFullList();
+ List GetFilteredList(ShopSearchModel model);
+ ShopViewModel? GetElement(ShopSearchModel model);
+ ShopViewModel? Insert(ShopBindingModel model);
+ ShopViewModel? Update(ShopBindingModel model);
+ ShopViewModel? Delete(ShopBindingModel model);
+ bool Sale(SupplySearchModel model);
+ bool RestockingShops(SupplyBindingModel model);
+ }
+}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompanyContracts/ViewModels/ShopViewModel.cs b/TravelCompany/TravelCompanyContracts/ViewModels/ShopViewModel.cs
new file mode 100644
index 0000000..48a091a
--- /dev/null
+++ b/TravelCompany/TravelCompanyContracts/ViewModels/ShopViewModel.cs
@@ -0,0 +1,24 @@
+using TravelCompanyDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TravelCompanyContracts.ViewModels
+{
+ public class ShopViewModel : IShopModel
+ {
+ public int Id { get; set; }
+ [DisplayName("Название")]
+ public string ShopName { get; set; } = string.Empty;
+ [DisplayName("Адрес")]
+ public string Adress { get; set; } = string.Empty;
+ [DisplayName("Дата открытия")]
+ public DateTime OpeningDate { get; set; }
+ public Dictionary ShopTravels { get; set; } = new();
+ [DisplayName("Вместимость")]
+ public int TravelMaxCount { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompanyDataModels/Models/IShopModel.cs b/TravelCompany/TravelCompanyDataModels/Models/IShopModel.cs
new file mode 100644
index 0000000..0e861aa
--- /dev/null
+++ b/TravelCompany/TravelCompanyDataModels/Models/IShopModel.cs
@@ -0,0 +1,19 @@
+using TravelCompanyDataModels;
+using TravelCompanyDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TravelCompanyDataModels.Models
+{
+ public interface IShopModel : IId
+ {
+ string ShopName { get; }
+ string Adress { get; }
+ DateTime OpeningDate { get; }
+ Dictionary ShopTravels { get; }
+ public int TravelMaxCount { get; }
+ }
+}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompanyDataModels/Models/ISupplyModel.cs b/TravelCompany/TravelCompanyDataModels/Models/ISupplyModel.cs
new file mode 100644
index 0000000..907597a
--- /dev/null
+++ b/TravelCompany/TravelCompanyDataModels/Models/ISupplyModel.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TravelCompanyDataModels.Models
+{
+ public interface ISupplyModel
+ {
+ int ShopId { get; }
+ int TravelId { get; }
+ int Count { get; }
+ }
+}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompanyFileImplement/DataFileSingleton.cs b/TravelCompany/TravelCompanyFileImplement/DataFileSingleton.cs
index 1bb27c6..eac4114 100644
--- a/TravelCompany/TravelCompanyFileImplement/DataFileSingleton.cs
+++ b/TravelCompany/TravelCompanyFileImplement/DataFileSingleton.cs
@@ -14,9 +14,11 @@ namespace TravelCompanyFileImplement
private readonly string ComponentFileName = "Component.xml";
private readonly string OrderFileName = "Order.xml";
private readonly string TravelFileName = "Travel.xml";
+ private readonly string ShopFileName = "Shop.xml";
public List Components { get; private set; }
public List Orders { get; private set; }
public List Travels { get; private set; }
+ public List Shops { get; private set; }
public static DataFileSingleton GetInstance()
{
if (instance == null)
@@ -28,11 +30,13 @@ namespace TravelCompanyFileImplement
public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
public void SaveTravels() => SaveData(Travels, TravelFileName, "Travels", x => x.GetXElement);
public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
+ public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
private DataFileSingleton()
{
Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
Travels = LoadData(TravelFileName, "Travel", x => Travel.Create(x)!)!;
Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
+ Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
}
private static List? LoadData(string filename, string xmlNodeName, Func selectFunction)
{
diff --git a/TravelCompany/TravelCompanyFileImplement/Implements/ShopStorage.cs b/TravelCompany/TravelCompanyFileImplement/Implements/ShopStorage.cs
new file mode 100644
index 0000000..ded4265
--- /dev/null
+++ b/TravelCompany/TravelCompanyFileImplement/Implements/ShopStorage.cs
@@ -0,0 +1,154 @@
+using TravelCompanyContracts.BindingModels;
+using TravelCompanyContracts.SearchModels;
+using TravelCompanyContracts.StoragesContracts;
+using TravelCompanyContracts.ViewModels;
+using TravelCompanyFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TravelCompanyFileImplement.Implements
+{
+ public class ShopStorage : IShopStorage
+ {
+ private readonly DataFileSingleton source;
+
+ public ShopStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+
+ public List GetFullList()
+ {
+ return source.Shops.Select(x => x.GetViewModel).ToList();
+ }
+
+ public List GetFilteredList(ShopSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.ShopName))
+ {
+ return new();
+ }
+ return source.Shops.Where(x => x.ShopName.Contains(model.ShopName)).Select(x => x.GetViewModel).ToList();
+ }
+
+ public ShopViewModel? GetElement(ShopSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
+ {
+ return null;
+ }
+ return source.Shops.FirstOrDefault(x =>
+ (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) ||
+ (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+ }
+
+ public ShopViewModel? Insert(ShopBindingModel model)
+ {
+ model.Id = source.Shops.Count > 0 ? source.Shops.Max(x => x.Id) + 1 : 1;
+ var newShop = Shop.Create(model);
+ if (newShop == null)
+ {
+ return null;
+ }
+ source.Shops.Add(newShop);
+ source.SaveShops();
+ return newShop.GetViewModel;
+ }
+
+ public ShopViewModel? Update(ShopBindingModel model)
+ {
+ var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id);
+ if (shop == null)
+ {
+ return null;
+ }
+ shop.Update(model);
+ source.SaveShops();
+ return shop.GetViewModel;
+ }
+
+ public ShopViewModel? Delete(ShopBindingModel model)
+ {
+ var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id);
+ if (shop != null)
+ {
+ source.Shops.Remove(shop);
+ source.SaveShops();
+ return shop.GetViewModel;
+ }
+ return null;
+ }
+
+ public bool Sale(SupplySearchModel model)
+ {
+ if (model == null || !model.TravelId.HasValue || !model.Count.HasValue)
+ return false;
+ int remainingSpace = source.Shops.Select(x => x.Travels.ContainsKey(model.TravelId.Value) ? x.Travels[model.TravelId.Value] : 0).Sum();
+ if (remainingSpace < model.Count)
+ {
+ return false;
+ }
+ var shops = source.Shops.Where(x => x.Travels.ContainsKey(model.TravelId.Value)).OrderByDescending(x => x.Travels[model.TravelId.Value]).ToList();
+ foreach (var shop in shops)
+ {
+ int residue = model.Count.Value - shop.Travels[model.TravelId.Value];
+ if (residue > 0)
+ {
+ shop.Travels.Remove(model.TravelId.Value);
+ shop.TravelsUpdate();
+ model.Count = residue;
+ }
+ else
+ {
+ if (residue == 0)
+ {
+ shop.Travels.Remove(model.TravelId.Value);
+ }
+ else
+ {
+ shop.Travels[model.TravelId.Value] = -residue;
+ }
+ shop.TravelsUpdate();
+ source.SaveShops();
+ return true;
+ }
+ }
+ source.SaveShops();
+ return false;
+ }
+
+ public bool RestockingShops(SupplyBindingModel model)
+ {
+ if (model == null || source.Shops.Select(x => x.TravelMaxCount - x.ShopTravels.Select(y => y.Value.Item2).Sum()).Sum() < model.Count)
+ {
+ return false;
+ }
+ foreach (Shop shop in source.Shops)
+ {
+ int free_places = shop.TravelMaxCount - shop.ShopTravels.Select(x => x.Value.Item2).Sum();
+ if (free_places <= 0)
+ continue;
+ free_places = Math.Min(free_places, model.Count);
+ model.Count -= free_places;
+ if (shop.Travels.ContainsKey(model.TravelId))
+ {
+ shop.Travels[model.TravelId] += free_places;
+ }
+ else
+ {
+ shop.Travels.Add(model.TravelId, free_places);
+ }
+ shop.TravelsUpdate();
+ if (model.Count == 0)
+ {
+ source.SaveShops();
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompanyFileImplement/Models/Shop.cs b/TravelCompany/TravelCompanyFileImplement/Models/Shop.cs
new file mode 100644
index 0000000..03ef8fb
--- /dev/null
+++ b/TravelCompany/TravelCompanyFileImplement/Models/Shop.cs
@@ -0,0 +1,111 @@
+using TravelCompanyDataModels.Models;
+using TravelCompanyContracts.BindingModels;
+using TravelCompanyContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace TravelCompanyFileImplement.Models
+{
+ public class Shop : IShopModel
+ {
+ public int Id { get; private set; }
+ public string ShopName { get; private set; } = string.Empty;
+ public string Adress { get; private set; } = string.Empty;
+ public DateTime OpeningDate { get; private set; }
+ public Dictionary Travels { get; private set; } = new();
+ private Dictionary? _shopTravels = null;
+
+ public Dictionary ShopTravels
+ {
+ get
+ {
+ if (_shopTravels == null)
+ {
+ var source = DataFileSingleton.GetInstance();
+ _shopTravels = Travels.ToDictionary(x => x.Key, y => ((source.Travels.FirstOrDefault(z => z.Id == y.Key) as ITravelModel)!, y.Value));
+ }
+ return _shopTravels;
+ }
+ }
+
+ public int TravelMaxCount { get; private set; }
+
+ public static Shop? Create(ShopBindingModel? model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new Shop()
+ {
+ Id = model.Id,
+ ShopName = model.ShopName,
+ Adress = model.Adress,
+ OpeningDate = model.OpeningDate,
+ Travels = model.ShopTravels.ToDictionary(x => x.Key, x => x.Value.Item2),
+ TravelMaxCount = model.TravelMaxCount
+ };
+ }
+
+ public static Shop? Create(XElement element)
+ {
+ if (element == null)
+ {
+ return null;
+ }
+ return new()
+ {
+ Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+ ShopName = element.Element("ShopName")!.Value,
+ Adress = element.Element("Adress")!.Value,
+ OpeningDate = Convert.ToDateTime(element.Element("OpeningDate")!.Value),
+ Travels = element.Element("ShopTravels")!.Elements("ShopTravel")!.ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value),
+ x => Convert.ToInt32(x.Element("Value")?.Value)),
+ TravelMaxCount = Convert.ToInt32(element.Element("TravelMaxCount")!.Value)
+ };
+ }
+
+ public void Update(ShopBindingModel? model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ ShopName = model.ShopName;
+ Adress = model.Adress;
+ OpeningDate = model.OpeningDate;
+ TravelMaxCount = model.TravelMaxCount;
+ Travels = model.ShopTravels.ToDictionary(x => x.Key, x => x.Value.Item2);
+ _shopTravels = null;
+ }
+
+ public ShopViewModel GetViewModel => new()
+ {
+ Id = Id,
+ ShopName = ShopName,
+ Adress = Adress,
+ OpeningDate = OpeningDate,
+ ShopTravels = ShopTravels,
+ TravelMaxCount = TravelMaxCount
+ };
+
+ public XElement GetXElement => new("Shop",
+ new XAttribute("Id", Id),
+ new XElement("ShopName", ShopName),
+ new XElement("Adress", Adress),
+ new XElement("OpeningDate", OpeningDate.ToString()),
+ new XElement("ShopTravels", Travels.Select(
+ x => new XElement("ShopTravel", new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray()),
+ new XElement("TravelMaxCount", TravelMaxCount.ToString())
+ );
+
+ public void TravelsUpdate()
+ {
+ _shopTravels = null;
+ }
+ }
+}
\ No newline at end of file
diff --git a/TravelCompany/TravelCompanyListImplement/DataListSingleton.cs b/TravelCompany/TravelCompanyListImplement/DataListSingleton.cs
index 01817fb..0416d6e 100644
--- a/TravelCompany/TravelCompanyListImplement/DataListSingleton.cs
+++ b/TravelCompany/TravelCompanyListImplement/DataListSingleton.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using TravelCompanyListImplement.Models;
namespace TravelCompanyListImplement
{
@@ -13,11 +14,13 @@ namespace TravelCompanyListImplement
public List Components { get; set; }
public List Orders { get; set; }
public List Travels { get; set; }
+ public List Shops { get; set; }
private DataListSingleton()
{
Components = new List();
Orders = new List();
Travels = new List();
+ Shops = new List();
}
public static DataListSingleton GetInstance()
{
diff --git a/TravelCompany/TravelCompanyListImplement/Implements/ShopStorage.cs b/TravelCompany/TravelCompanyListImplement/Implements/ShopStorage.cs
new file mode 100644
index 0000000..a785fb2
--- /dev/null
+++ b/TravelCompany/TravelCompanyListImplement/Implements/ShopStorage.cs
@@ -0,0 +1,123 @@
+using TravelCompanyContracts.BindingModels;
+using TravelCompanyContracts.SearchModels;
+using TravelCompanyContracts.StoragesContracts;
+using TravelCompanyContracts.ViewModels;
+using TravelCompanyListImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TravelCompanyListImplement.Implements
+{
+ public class 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;
+ }
+
+ public bool Sale(SupplySearchModel model)
+ {
+ throw new NotImplementedException();
+ }
+
+ public bool RestockingShops(SupplyBindingModel model)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/TravelCompany/TravelCompanyListImplement/Models/Shop.cs b/TravelCompany/TravelCompanyListImplement/Models/Shop.cs
new file mode 100644
index 0000000..11a71b1
--- /dev/null
+++ b/TravelCompany/TravelCompanyListImplement/Models/Shop.cs
@@ -0,0 +1,59 @@
+using TravelCompanyDataModels.Models;
+using TravelCompanyContracts.BindingModels;
+using TravelCompanyContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TravelCompanyListImplement.Models
+{
+ public class Shop : IShopModel
+ {
+ public int Id { get; private set; }
+ public string ShopName { get; private set; } = string.Empty;
+ public string Adress { get; private set; } = string.Empty;
+ public DateTime OpeningDate { get; private set; }
+ public Dictionary ShopTravels { get; private set; } = new();
+ public int TravelMaxCount { get; private set; }
+
+ public static Shop? Create(ShopBindingModel? model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new Shop()
+ {
+ Id = model.Id,
+ ShopName = model.ShopName,
+ Adress = model.Adress,
+ OpeningDate = model.OpeningDate,
+ TravelMaxCount = model.TravelMaxCount,
+ };
+ }
+
+ public void Update(ShopBindingModel? model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ ShopName = model.ShopName;
+ Adress = model.Adress;
+ OpeningDate = model.OpeningDate;
+ TravelMaxCount = model.TravelMaxCount;
+ }
+
+ public ShopViewModel GetViewModel => new()
+ {
+ Id = Id,
+ ShopName = ShopName,
+ Adress = Adress,
+ OpeningDate = OpeningDate,
+ ShopTravels = ShopTravels,
+ TravelMaxCount = TravelMaxCount,
+ };
+ }
+}