diff --git a/LawFirm/LawFirm/FormDocument.Designer.cs b/LawFirm/LawFirm/FormDocument.Designer.cs
index a6720be..043516c 100644
--- a/LawFirm/LawFirm/FormDocument.Designer.cs
+++ b/LawFirm/LawFirm/FormDocument.Designer.cs
@@ -38,11 +38,11 @@
this.buttonEdit = new System.Windows.Forms.Button();
this.buttonAdd = new System.Windows.Forms.Button();
this.dataGridView = new System.Windows.Forms.DataGridView();
- this.buttonSave = new System.Windows.Forms.Button();
- this.buttonCancel = new System.Windows.Forms.Button();
this.ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnBlankName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.buttonSave = new System.Windows.Forms.Button();
+ this.buttonCancel = new System.Windows.Forms.Button();
this.groupBoxBlanks.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
this.SuspendLayout();
@@ -148,26 +148,6 @@
this.dataGridView.TabIndex = 0;
this.dataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_CellContentClick);
//
- // buttonSave
- //
- this.buttonSave.Location = new System.Drawing.Point(356, 379);
- this.buttonSave.Name = "buttonSave";
- this.buttonSave.Size = new System.Drawing.Size(155, 29);
- this.buttonSave.TabIndex = 5;
- this.buttonSave.Text = "Сохранить";
- this.buttonSave.UseVisualStyleBackColor = true;
- this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
- //
- // buttonCancel
- //
- this.buttonCancel.Location = new System.Drawing.Point(536, 379);
- this.buttonCancel.Name = "buttonCancel";
- this.buttonCancel.Size = new System.Drawing.Size(155, 29);
- this.buttonCancel.TabIndex = 6;
- this.buttonCancel.Text = "Отмена";
- this.buttonCancel.UseVisualStyleBackColor = true;
- this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
- //
// ID
//
this.ID.HeaderText = "ID";
@@ -192,6 +172,26 @@
this.ColumnCount.Name = "ColumnCount";
this.ColumnCount.Width = 125;
//
+ // buttonSave
+ //
+ this.buttonSave.Location = new System.Drawing.Point(356, 379);
+ this.buttonSave.Name = "buttonSave";
+ this.buttonSave.Size = new System.Drawing.Size(155, 29);
+ this.buttonSave.TabIndex = 5;
+ this.buttonSave.Text = "Сохранить";
+ this.buttonSave.UseVisualStyleBackColor = true;
+ this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
+ //
+ // buttonCancel
+ //
+ this.buttonCancel.Location = new System.Drawing.Point(536, 379);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(155, 29);
+ this.buttonCancel.TabIndex = 6;
+ this.buttonCancel.Text = "Отмена";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+ //
// FormDocument
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
diff --git a/LawFirm/LawFirm/FormMain.Designer.cs b/LawFirm/LawFirm/FormMain.Designer.cs
index 824ad60..f3d664b 100644
--- a/LawFirm/LawFirm/FormMain.Designer.cs
+++ b/LawFirm/LawFirm/FormMain.Designer.cs
@@ -32,12 +32,14 @@
this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.бланкиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.документыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.магазиныToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dataGridView = new System.Windows.Forms.DataGridView();
this.buttonCreateOrder = new System.Windows.Forms.Button();
this.buttonSetToWork = new System.Windows.Forms.Button();
this.buttonSetToDone = new System.Windows.Forms.Button();
this.buttonSetToFinish = new System.Windows.Forms.Button();
this.buttonUpdate = new System.Windows.Forms.Button();
+ this.buttonSupplyShop = new System.Windows.Forms.Button();
this.menuStrip.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
this.SuspendLayout();
@@ -57,7 +59,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(117, 24);
this.справочникиToolStripMenuItem.Text = "Справочники";
@@ -65,17 +68,24 @@
// бланкиToolStripMenuItem
//
this.бланкиToolStripMenuItem.Name = "бланкиToolStripMenuItem";
- this.бланкиToolStripMenuItem.Size = new System.Drawing.Size(170, 26);
+ this.бланкиToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
this.бланкиToolStripMenuItem.Text = "Бланки";
this.бланкиToolStripMenuItem.Click += new System.EventHandler(this.бланкиToolStripMenuItem_Click);
//
// документыToolStripMenuItem
//
this.документыToolStripMenuItem.Name = "документыToolStripMenuItem";
- this.документыToolStripMenuItem.Size = new System.Drawing.Size(170, 26);
+ this.документыToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
this.документыToolStripMenuItem.Text = "Документы";
this.документыToolStripMenuItem.Click += new System.EventHandler(this.документыToolStripMenuItem_Click);
//
+ // магазиныToolStripMenuItem
+ //
+ this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
+ this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
+ this.магазиныToolStripMenuItem.Text = "Магазины";
+ this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.магазиныToolStripMenuItem_Click);
+ //
// dataGridView
//
this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
@@ -136,11 +146,22 @@
this.buttonUpdate.UseVisualStyleBackColor = true;
this.buttonUpdate.Click += new System.EventHandler(this.buttonUpdate_Click);
//
+ // buttonSupplyShop
+ //
+ this.buttonSupplyShop.Location = new System.Drawing.Point(933, 185);
+ this.buttonSupplyShop.Name = "buttonSupplyShop";
+ this.buttonSupplyShop.Size = new System.Drawing.Size(194, 29);
+ this.buttonSupplyShop.TabIndex = 7;
+ this.buttonSupplyShop.Text = "Пополнение магазина";
+ this.buttonSupplyShop.UseVisualStyleBackColor = true;
+ this.buttonSupplyShop.Click += new System.EventHandler(this.buttonSupplyShop_Click);
+ //
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1139, 450);
+ this.Controls.Add(this.buttonSupplyShop);
this.Controls.Add(this.buttonUpdate);
this.Controls.Add(this.buttonSetToFinish);
this.Controls.Add(this.buttonSetToDone);
@@ -172,5 +193,7 @@
private Button buttonSetToDone;
private Button buttonSetToFinish;
private Button buttonUpdate;
+ private ToolStripMenuItem магазиныToolStripMenuItem;
+ private Button buttonSupplyShop;
}
}
\ No newline at end of file
diff --git a/LawFirm/LawFirm/FormMain.cs b/LawFirm/LawFirm/FormMain.cs
index 7c21f6a..46d6790 100644
--- a/LawFirm/LawFirm/FormMain.cs
+++ b/LawFirm/LawFirm/FormMain.cs
@@ -69,6 +69,15 @@ namespace LawFirmView
}
}
+ private void магазиныToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+ if (service is FormShops form)
+ {
+ form.ShowDialog();
+ }
+ }
+
private void buttonCreateOrder_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
@@ -163,5 +172,14 @@ namespace LawFirmView
{
LoadData();
}
+
+ private void buttonSupplyShop_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormShopSupply));
+ if (service is FormShopSupply form)
+ {
+ form.ShowDialog();
+ }
+ }
}
}
diff --git a/LawFirm/LawFirm/FormShop.Designer.cs b/LawFirm/LawFirm/FormShop.Designer.cs
new file mode 100644
index 0000000..8c908c0
--- /dev/null
+++ b/LawFirm/LawFirm/FormShop.Designer.cs
@@ -0,0 +1,188 @@
+namespace LawFirmView
+{
+ 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.textBoxAddress = new System.Windows.Forms.TextBox();
+ this.textBoxName = new System.Windows.Forms.TextBox();
+ this.labelAddress = new System.Windows.Forms.Label();
+ this.labelName = new System.Windows.Forms.Label();
+ this.labelOpeningDate = new System.Windows.Forms.Label();
+ this.dateTimePicker = new System.Windows.Forms.DateTimePicker();
+ this.dataGridView = new System.Windows.Forms.DataGridView();
+ this.buttonCancel = new System.Windows.Forms.Button();
+ this.buttonSave = new System.Windows.Forms.Button();
+ this.ColumnId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ColumnDocumentName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+ this.SuspendLayout();
+ //
+ // textBoxAddress
+ //
+ this.textBoxAddress.Location = new System.Drawing.Point(100, 45);
+ this.textBoxAddress.Name = "textBoxAddress";
+ this.textBoxAddress.Size = new System.Drawing.Size(315, 27);
+ this.textBoxAddress.TabIndex = 7;
+ //
+ // textBoxName
+ //
+ this.textBoxName.Location = new System.Drawing.Point(100, 12);
+ this.textBoxName.Name = "textBoxName";
+ this.textBoxName.Size = new System.Drawing.Size(315, 27);
+ this.textBoxName.TabIndex = 6;
+ //
+ // labelAddress
+ //
+ this.labelAddress.AutoSize = true;
+ this.labelAddress.Location = new System.Drawing.Point(14, 51);
+ this.labelAddress.Name = "labelAddress";
+ this.labelAddress.Size = new System.Drawing.Size(54, 20);
+ this.labelAddress.TabIndex = 5;
+ this.labelAddress.Text = "Адрес:";
+ //
+ // labelName
+ //
+ this.labelName.AutoSize = true;
+ this.labelName.Location = new System.Drawing.Point(14, 15);
+ this.labelName.Name = "labelName";
+ this.labelName.Size = new System.Drawing.Size(80, 20);
+ this.labelName.TabIndex = 4;
+ this.labelName.Text = "Название:";
+ //
+ // labelOpeningDate
+ //
+ this.labelOpeningDate.AutoSize = true;
+ this.labelOpeningDate.Location = new System.Drawing.Point(14, 86);
+ this.labelOpeningDate.Name = "labelOpeningDate";
+ this.labelOpeningDate.Size = new System.Drawing.Size(126, 20);
+ this.labelOpeningDate.TabIndex = 8;
+ this.labelOpeningDate.Text = "Время открытия:";
+ //
+ // dateTimePicker
+ //
+ this.dateTimePicker.Location = new System.Drawing.Point(165, 81);
+ this.dateTimePicker.Name = "dateTimePicker";
+ this.dateTimePicker.Size = new System.Drawing.Size(250, 27);
+ this.dateTimePicker.TabIndex = 9;
+ //
+ // dataGridView
+ //
+ this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.ColumnId,
+ this.ColumnDocumentName,
+ this.ColumnCount});
+ this.dataGridView.Location = new System.Drawing.Point(14, 138);
+ this.dataGridView.Name = "dataGridView";
+ this.dataGridView.RowHeadersWidth = 51;
+ this.dataGridView.RowTemplate.Height = 29;
+ this.dataGridView.Size = new System.Drawing.Size(401, 300);
+ this.dataGridView.TabIndex = 10;
+ //
+ // buttonCancel
+ //
+ this.buttonCancel.Location = new System.Drawing.Point(228, 448);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(155, 29);
+ this.buttonCancel.TabIndex = 12;
+ this.buttonCancel.Text = "Отмена";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+ //
+ // buttonSave
+ //
+ this.buttonSave.Location = new System.Drawing.Point(48, 448);
+ this.buttonSave.Name = "buttonSave";
+ this.buttonSave.Size = new System.Drawing.Size(155, 29);
+ this.buttonSave.TabIndex = 11;
+ this.buttonSave.Text = "Сохранить";
+ this.buttonSave.UseVisualStyleBackColor = true;
+ this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
+ //
+ // ColumnId
+ //
+ this.ColumnId.HeaderText = "ID";
+ this.ColumnId.MinimumWidth = 6;
+ this.ColumnId.Name = "ColumnId";
+ this.ColumnId.Visible = false;
+ this.ColumnId.Width = 125;
+ //
+ // ColumnDocumentName
+ //
+ this.ColumnDocumentName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.ColumnDocumentName.HeaderText = "Документ";
+ this.ColumnDocumentName.MinimumWidth = 6;
+ this.ColumnDocumentName.Name = "ColumnDocumentName";
+ //
+ // ColumnCount
+ //
+ this.ColumnCount.HeaderText = "Количество";
+ this.ColumnCount.MinimumWidth = 6;
+ this.ColumnCount.Name = "ColumnCount";
+ this.ColumnCount.Width = 125;
+ //
+ // FormShop
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(445, 489);
+ this.Controls.Add(this.buttonCancel);
+ this.Controls.Add(this.buttonSave);
+ this.Controls.Add(this.dataGridView);
+ this.Controls.Add(this.dateTimePicker);
+ this.Controls.Add(this.labelOpeningDate);
+ this.Controls.Add(this.textBoxAddress);
+ this.Controls.Add(this.textBoxName);
+ this.Controls.Add(this.labelAddress);
+ this.Controls.Add(this.labelName);
+ this.Name = "FormShop";
+ this.Text = "Магазин";
+ this.Load += new System.EventHandler(this.FormShop_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private TextBox textBoxAddress;
+ private TextBox textBoxName;
+ private Label labelAddress;
+ private Label labelName;
+ private Label labelOpeningDate;
+ private DateTimePicker dateTimePicker;
+ private DataGridView dataGridView;
+ private Button buttonCancel;
+ private Button buttonSave;
+ private DataGridViewTextBoxColumn ColumnId;
+ private DataGridViewTextBoxColumn ColumnDocumentName;
+ private DataGridViewTextBoxColumn ColumnCount;
+ }
+}
\ No newline at end of file
diff --git a/LawFirm/LawFirm/FormShop.cs b/LawFirm/LawFirm/FormShop.cs
new file mode 100644
index 0000000..8091c6a
--- /dev/null
+++ b/LawFirm/LawFirm/FormShop.cs
@@ -0,0 +1,137 @@
+using LawFirmContracts.BindingModels;
+using LawFirmContracts.BusinessLogicContracts;
+using LawFirmContracts.SearchModels;
+using LawFirmContracts.ViewModels;
+using LawFirmDataModels.Models;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace LawFirmView
+{
+ public partial class FormShop : Form
+ {
+
+ private readonly IShopLogic _logic;
+ private readonly ILogger _logger;
+ private Dictionary _shopDocuments;
+ private int? _id;
+ public int Id { set { _id = value; } }
+
+ public FormShop(ILogger logger, IShopLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ _shopDocuments = new();
+ }
+
+ 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.Name;
+ textBoxAddress.Text = view.Adress;
+ _shopDocuments = view.ShopDocuments ?? new Dictionary();
+ LoadData();
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки магазина");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+ MessageBoxIcon.Error);
+ }
+ }
+ }
+
+ private void LoadData()
+ {
+ _logger.LogInformation("Загрузка документов магазина");
+ try
+ {
+ if (_shopDocuments != null)
+ {
+ dataGridView.Rows.Clear();
+ foreach (var pc in _shopDocuments)
+ {
+ dataGridView.Rows.Add(new object[]
+ {
+ pc.Key,
+ pc.Value.Item1.DocumentName,
+ pc.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,
+ Name = textBoxName.Text,
+ Adress = textBoxAddress.Text,
+ OpeningDate = dateTimePicker.Value.Date
+ };
+ 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/LawFirm/LawFirm/FormShop.resx b/LawFirm/LawFirm/FormShop.resx
new file mode 100644
index 0000000..71f1c74
--- /dev/null
+++ b/LawFirm/LawFirm/FormShop.resx
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ True
+
+
+ True
+
+
+ True
+
+
\ No newline at end of file
diff --git a/LawFirm/LawFirm/FormShopSupply.Designer.cs b/LawFirm/LawFirm/FormShopSupply.Designer.cs
new file mode 100644
index 0000000..76e20f5
--- /dev/null
+++ b/LawFirm/LawFirm/FormShopSupply.Designer.cs
@@ -0,0 +1,144 @@
+namespace LawFirmView
+{
+ partial class FormShopSupply
+ {
+ ///
+ /// 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.labelDocument = new System.Windows.Forms.Label();
+ this.labelDocumentCount = new System.Windows.Forms.Label();
+ this.comboBoxShop = new System.Windows.Forms.ComboBox();
+ this.comboBoxDocument = new System.Windows.Forms.ComboBox();
+ this.textBoxCount = new System.Windows.Forms.TextBox();
+ this.buttonCancel = new System.Windows.Forms.Button();
+ this.buttonSave = new System.Windows.Forms.Button();
+ this.SuspendLayout();
+ //
+ // labelShop
+ //
+ this.labelShop.AutoSize = true;
+ this.labelShop.Location = new System.Drawing.Point(26, 19);
+ this.labelShop.Name = "labelShop";
+ this.labelShop.RightToLeft = System.Windows.Forms.RightToLeft.No;
+ this.labelShop.Size = new System.Drawing.Size(72, 20);
+ this.labelShop.TabIndex = 0;
+ this.labelShop.Text = "Магазин:";
+ //
+ // labelDocument
+ //
+ this.labelDocument.AutoSize = true;
+ this.labelDocument.Location = new System.Drawing.Point(26, 72);
+ this.labelDocument.Name = "labelDocument";
+ this.labelDocument.Size = new System.Drawing.Size(79, 20);
+ this.labelDocument.TabIndex = 1;
+ this.labelDocument.Text = "Документ:";
+ //
+ // labelDocumentCount
+ //
+ this.labelDocumentCount.AutoSize = true;
+ this.labelDocumentCount.Location = new System.Drawing.Point(26, 122);
+ this.labelDocumentCount.Name = "labelDocumentCount";
+ this.labelDocumentCount.Size = new System.Drawing.Size(93, 20);
+ this.labelDocumentCount.TabIndex = 2;
+ this.labelDocumentCount.Text = "Количество:";
+ //
+ // comboBoxShop
+ //
+ this.comboBoxShop.FormattingEnabled = true;
+ this.comboBoxShop.Location = new System.Drawing.Point(148, 19);
+ this.comboBoxShop.Name = "comboBoxShop";
+ this.comboBoxShop.Size = new System.Drawing.Size(251, 28);
+ this.comboBoxShop.TabIndex = 3;
+ //
+ // comboBoxDocument
+ //
+ this.comboBoxDocument.FormattingEnabled = true;
+ this.comboBoxDocument.Location = new System.Drawing.Point(148, 69);
+ this.comboBoxDocument.Name = "comboBoxDocument";
+ this.comboBoxDocument.Size = new System.Drawing.Size(251, 28);
+ this.comboBoxDocument.TabIndex = 4;
+ //
+ // textBoxCount
+ //
+ this.textBoxCount.Location = new System.Drawing.Point(148, 122);
+ this.textBoxCount.Name = "textBoxCount";
+ this.textBoxCount.Size = new System.Drawing.Size(125, 27);
+ this.textBoxCount.TabIndex = 5;
+ //
+ // buttonCancel
+ //
+ this.buttonCancel.Location = new System.Drawing.Point(305, 183);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(94, 29);
+ this.buttonCancel.TabIndex = 9;
+ this.buttonCancel.Text = "Отмена";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+ //
+ // buttonSave
+ //
+ this.buttonSave.Location = new System.Drawing.Point(205, 183);
+ this.buttonSave.Name = "buttonSave";
+ this.buttonSave.Size = new System.Drawing.Size(94, 29);
+ this.buttonSave.TabIndex = 8;
+ this.buttonSave.Text = "Сохранить";
+ this.buttonSave.UseVisualStyleBackColor = true;
+ this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
+ //
+ // FormShopSupply
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(436, 243);
+ this.Controls.Add(this.buttonCancel);
+ this.Controls.Add(this.buttonSave);
+ this.Controls.Add(this.textBoxCount);
+ this.Controls.Add(this.comboBoxDocument);
+ this.Controls.Add(this.comboBoxShop);
+ this.Controls.Add(this.labelDocumentCount);
+ this.Controls.Add(this.labelDocument);
+ this.Controls.Add(this.labelShop);
+ this.Name = "FormShopSupply";
+ this.Text = "Пополнение магазина";
+ this.Load += new System.EventHandler(this.FormShopSupply_Load);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private Label labelShop;
+ private Label labelDocument;
+ private Label labelDocumentCount;
+ private ComboBox comboBoxShop;
+ private ComboBox comboBoxDocument;
+ private TextBox textBoxCount;
+ private Button buttonCancel;
+ private Button buttonSave;
+ }
+}
\ No newline at end of file
diff --git a/LawFirm/LawFirm/FormShopSupply.cs b/LawFirm/LawFirm/FormShopSupply.cs
new file mode 100644
index 0000000..1b2ee53
--- /dev/null
+++ b/LawFirm/LawFirm/FormShopSupply.cs
@@ -0,0 +1,125 @@
+using LawFirmContracts.BindingModels;
+using LawFirmContracts.BusinessLogicContracts;
+using LawFirmContracts.SearchModels;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace LawFirmView
+{
+ public partial class FormShopSupply : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IDocumentLogic _logicD;
+ private readonly IShopLogic _logicS;
+ public FormShopSupply(ILogger logger, IDocumentLogic logicD, IShopLogic logicS)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logicD = logicD;
+ _logicS = logicS;
+ }
+
+ private void FormShopSupply_Load(object sender, EventArgs e)
+ {
+ _logger.LogInformation("Загрузка документов для пополнения");
+ try
+ {
+ var list = _logicD.ReadList(null);
+ if (list != null)
+ {
+ comboBoxDocument.DisplayMember = "DocumentName";
+ comboBoxDocument.ValueMember = "Id";
+ comboBoxDocument.DataSource = list;
+ comboBoxDocument.SelectedItem = null;
+ }
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки списка документов");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+
+ _logger.LogInformation("Загрузка магазинов для пополнения");
+ try
+ {
+ var list = _logicS.ReadList(null);
+ if (list != null)
+ {
+ comboBoxShop.DisplayMember = "Name";
+ comboBoxShop.ValueMember = "Id";
+ comboBoxShop.DataSource = list;
+ comboBoxShop.SelectedItem = null;
+ }
+
+ }
+ 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(textBoxCount.Text))
+ {
+ MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ if (comboBoxDocument.SelectedValue == null)
+ {
+ MessageBox.Show("Выберите документ", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ if (comboBoxShop.SelectedValue== null)
+ {
+ MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ _logger.LogInformation("Создание поставки");
+ try
+ {
+ var operationResult = _logicS.SupplyDocuments(
+ new ShopSearchModel
+ {
+ Id = Convert.ToInt32(comboBoxShop.SelectedValue),
+ Name = comboBoxShop.Text
+ },
+ new DocumentBindingModel
+ {
+ Id = Convert.ToInt32(comboBoxDocument.SelectedValue),
+ DocumentName = comboBoxDocument.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);
+ }
+ }
+
+ private void buttonCancel_Click(object sender, EventArgs e)
+ {
+ DialogResult = DialogResult.Cancel;
+ Close();
+ }
+ }
+}
diff --git a/LawFirm/LawFirm/FormShopSupply.resx b/LawFirm/LawFirm/FormShopSupply.resx
new file mode 100644
index 0000000..f298a7b
--- /dev/null
+++ b/LawFirm/LawFirm/FormShopSupply.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/LawFirm/LawFirm/FormShops.Designer.cs b/LawFirm/LawFirm/FormShops.Designer.cs
new file mode 100644
index 0000000..0e93fe0
--- /dev/null
+++ b/LawFirm/LawFirm/FormShops.Designer.cs
@@ -0,0 +1,115 @@
+namespace LawFirmView
+{
+ 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.dataGridView = new System.Windows.Forms.DataGridView();
+ this.buttonUpdate = new System.Windows.Forms.Button();
+ this.buttonDelete = new System.Windows.Forms.Button();
+ this.buttonEdit = new System.Windows.Forms.Button();
+ this.buttonAdd = new System.Windows.Forms.Button();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+ this.SuspendLayout();
+ //
+ // dataGridView
+ //
+ this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView.Location = new System.Drawing.Point(12, 12);
+ this.dataGridView.Name = "dataGridView";
+ this.dataGridView.RowHeadersWidth = 51;
+ this.dataGridView.RowTemplate.Height = 29;
+ this.dataGridView.Size = new System.Drawing.Size(561, 426);
+ this.dataGridView.TabIndex = 0;
+ //
+ // buttonUpdate
+ //
+ this.buttonUpdate.Location = new System.Drawing.Point(627, 409);
+ this.buttonUpdate.Name = "buttonUpdate";
+ this.buttonUpdate.Size = new System.Drawing.Size(152, 29);
+ this.buttonUpdate.TabIndex = 9;
+ this.buttonUpdate.Text = "Обновить";
+ this.buttonUpdate.UseVisualStyleBackColor = true;
+ this.buttonUpdate.Click += new System.EventHandler(this.buttonUpdate_Click);
+ //
+ // buttonDelete
+ //
+ this.buttonDelete.Location = new System.Drawing.Point(627, 82);
+ this.buttonDelete.Name = "buttonDelete";
+ this.buttonDelete.Size = new System.Drawing.Size(152, 29);
+ this.buttonDelete.TabIndex = 8;
+ this.buttonDelete.Text = "Удалить";
+ this.buttonDelete.UseVisualStyleBackColor = true;
+ this.buttonDelete.Click += new System.EventHandler(this.buttonDelete_Click);
+ //
+ // buttonEdit
+ //
+ this.buttonEdit.Location = new System.Drawing.Point(627, 47);
+ this.buttonEdit.Name = "buttonEdit";
+ this.buttonEdit.Size = new System.Drawing.Size(152, 29);
+ this.buttonEdit.TabIndex = 7;
+ this.buttonEdit.Text = "Изменить";
+ this.buttonEdit.UseVisualStyleBackColor = true;
+ this.buttonEdit.Click += new System.EventHandler(this.buttonEdit_Click);
+ //
+ // buttonAdd
+ //
+ this.buttonAdd.Location = new System.Drawing.Point(627, 12);
+ this.buttonAdd.Name = "buttonAdd";
+ this.buttonAdd.Size = new System.Drawing.Size(152, 29);
+ this.buttonAdd.TabIndex = 6;
+ this.buttonAdd.Text = "Добавить";
+ this.buttonAdd.UseVisualStyleBackColor = true;
+ this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click);
+ //
+ // 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.buttonUpdate);
+ this.Controls.Add(this.buttonDelete);
+ this.Controls.Add(this.buttonEdit);
+ this.Controls.Add(this.buttonAdd);
+ this.Controls.Add(this.dataGridView);
+ this.Name = "FormShops";
+ this.Text = "Магазины";
+ this.Load += new System.EventHandler(this.FormShops_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DataGridView dataGridView;
+ private Button buttonUpdate;
+ private Button buttonDelete;
+ private Button buttonEdit;
+ private Button buttonAdd;
+ }
+}
\ No newline at end of file
diff --git a/LawFirm/LawFirm/FormShops.cs b/LawFirm/LawFirm/FormShops.cs
new file mode 100644
index 0000000..c1cce99
--- /dev/null
+++ b/LawFirm/LawFirm/FormShops.cs
@@ -0,0 +1,124 @@
+using LawFirm;
+using LawFirmContracts.BindingModels;
+using LawFirmContracts.BusinessLogicContracts;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace LawFirmView
+{
+ 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["Name"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+ dataGridView.Columns["ShopDocuments"].Visible = false;
+ }
+
+ _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 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();
+ }
+ }
+ }
+ }
+
+ private void buttonDelete_Click(object sender, EventArgs e)
+ {
+ if (dataGridView.SelectedRows.Count == 1)
+ {
+ if (MessageBox.Show("Удалить магазин?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+ {
+ int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+ _logger.LogInformation("Удаление магазина");
+
+ try
+ {
+ if (!_logic.Delete(new ShopBindingModel
+ {
+ Id = id
+ }))
+ {
+ throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
+ }
+
+ LoadData();
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка удаления изделия");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/LawFirm/LawFirm/FormShops.resx b/LawFirm/LawFirm/FormShops.resx
new file mode 100644
index 0000000..f298a7b
--- /dev/null
+++ b/LawFirm/LawFirm/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/LawFirm/LawFirm/Program.cs b/LawFirm/LawFirm/Program.cs
index 09dd87f..60500aa 100644
--- a/LawFirm/LawFirm/Program.cs
+++ b/LawFirm/LawFirm/Program.cs
@@ -41,11 +41,11 @@ namespace LawFirm
services.AddTransient();
services.AddTransient();
services.AddTransient();
-
+ services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
-
+ services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
@@ -53,6 +53,9 @@ namespace LawFirm
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
}
}
diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogics/ShopLogic.cs b/LawFirm/LawFirmBusinessLogic/BusinessLogics/ShopLogic.cs
new file mode 100644
index 0000000..b5de351
--- /dev/null
+++ b/LawFirm/LawFirmBusinessLogic/BusinessLogics/ShopLogic.cs
@@ -0,0 +1,168 @@
+using LawFirmContracts.BindingModels;
+using LawFirmContracts.BusinessLogicContracts;
+using LawFirmContracts.SearchModels;
+using LawFirmContracts.StorageContracts;
+using LawFirmContracts.ViewModels;
+using LawFirmDataModels.Models;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace LawFirmBusinessLogic.BusinessLogics
+{
+ public class ShopLogic : IShopLogic
+ {
+ private readonly ILogger _logger;
+ private readonly IShopStorage _shopStorage;
+
+ public ShopLogic(ILogger logger, IShopStorage shopStorage)
+ {
+ _logger = logger;
+ _shopStorage = shopStorage;
+ }
+
+ public ShopViewModel? ReadElement(ShopSearchModel model)
+ {
+ if (model == null)
+ {
+ throw new ArgumentNullException(nameof(model));
+ }
+ _logger.LogInformation("ReadElement. Shop Name:{0}.ID:{1}", model.Name, 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. Shop Name:{0}.ID:{1} ", model?.Name, 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 SupplyDocuments(ShopSearchModel model, IDocumentModel document, int count)
+ {
+ if (model == null)
+ {
+ throw new ArgumentNullException(nameof(model));
+ }
+
+ if (document == null)
+ {
+ throw new ArgumentNullException(nameof(document));
+ }
+
+ if (count <= 0)
+ {
+ throw new ArgumentNullException("Count of documents in supply myst be more than 0", nameof(count));
+ }
+
+ var shopElement = _shopStorage.GetElement(model);
+ if (shopElement == null)
+ {
+ _logger.LogWarning("Required shop element not found in storage");
+ return false;
+ }
+ _logger.LogInformation("Shop element found. ID: {0}, Name: {1}", shopElement.Id, shopElement.Name);
+
+ if (shopElement.ShopDocuments.TryGetValue(document.Id, out var sameDocument))
+ {
+ shopElement.ShopDocuments[document.Id] = (document, sameDocument.Item2 + count);
+ _logger.LogInformation("Same document found by supply. Added {0} of {1} in {2} shop", count, document.DocumentName, shopElement.Name);
+ }
+ else
+ {
+ shopElement.ShopDocuments[document.Id] = (document, count);
+ _logger.LogInformation("New document added by supply. Added {0} of {1} in {2} shop", count, document.DocumentName, shopElement.Name);
+ }
+
+ _shopStorage.Update(new()
+ {
+ Id = shopElement.Id,
+ Name = shopElement.Name,
+ Adress = shopElement.Adress,
+ OpeningDate = shopElement.OpeningDate,
+ ShopDocuments = shopElement.ShopDocuments
+ });
+
+ return true;
+ }
+
+ 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);
+ if (_shopStorage.Delete(model) == null)
+ {
+ _logger.LogWarning("Delete 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.Name))
+ {
+ throw new ArgumentNullException("Нет названия магазина!", nameof(model.Name));
+ }
+ _logger.LogInformation("Shop. Name: {0}, Adress: {1}, ID: {2}", model.Name, model.Adress, model.Id);
+ var element = _shopStorage.GetElement(new ShopSearchModel
+ {
+ Name = model.Name
+ });
+ if (element != null && element.Id != model.Id)
+ {
+ throw new InvalidOperationException("Магазин с таким названием уже есть");
+ }
+ }
+ }
+}
diff --git a/LawFirm/LawFirmContracts/BindingModels/ShopBindingModel.cs b/LawFirm/LawFirmContracts/BindingModels/ShopBindingModel.cs
new file mode 100644
index 0000000..167e727
--- /dev/null
+++ b/LawFirm/LawFirmContracts/BindingModels/ShopBindingModel.cs
@@ -0,0 +1,22 @@
+using LawFirmDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LawFirmContracts.BindingModels
+{
+ public class ShopBindingModel : IShopModel
+ {
+ public string Name { get; set; } = string.Empty;
+
+ public string Adress { get; set; } = string.Empty;
+
+ public DateTime OpeningDate { get; set; }
+
+ public Dictionary ShopDocuments { get; set; } = new();
+
+ public int Id { get; set; }
+ }
+}
diff --git a/LawFirm/LawFirmContracts/BusinessLogicContracts/IShopLogic.cs b/LawFirm/LawFirmContracts/BusinessLogicContracts/IShopLogic.cs
new file mode 100644
index 0000000..0b47a27
--- /dev/null
+++ b/LawFirm/LawFirmContracts/BusinessLogicContracts/IShopLogic.cs
@@ -0,0 +1,22 @@
+using LawFirmContracts.BindingModels;
+using LawFirmContracts.SearchModels;
+using LawFirmContracts.ViewModels;
+using LawFirmDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LawFirmContracts.BusinessLogicContracts
+{
+ public interface IShopLogic
+ {
+ ShopViewModel? ReadElement(ShopSearchModel model);
+ List? ReadList(ShopSearchModel? model);
+ bool Create(ShopBindingModel model);
+ bool Update(ShopBindingModel model);
+ bool Delete(ShopBindingModel model);
+ bool SupplyDocuments(ShopSearchModel model, IDocumentModel document, int count);
+ }
+}
diff --git a/LawFirm/LawFirmContracts/SearchModels/ShopSearchModel.cs b/LawFirm/LawFirmContracts/SearchModels/ShopSearchModel.cs
new file mode 100644
index 0000000..27422a2
--- /dev/null
+++ b/LawFirm/LawFirmContracts/SearchModels/ShopSearchModel.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LawFirmContracts.SearchModels
+{
+ public class ShopSearchModel
+ {
+ public int? Id { get; set; }
+ public string? Name { get; set; }
+ }
+}
diff --git a/LawFirm/LawFirmContracts/StorageContracts/IShopStorage.cs b/LawFirm/LawFirmContracts/StorageContracts/IShopStorage.cs
new file mode 100644
index 0000000..f84055a
--- /dev/null
+++ b/LawFirm/LawFirmContracts/StorageContracts/IShopStorage.cs
@@ -0,0 +1,21 @@
+using LawFirmContracts.BindingModels;
+using LawFirmContracts.SearchModels;
+using LawFirmContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LawFirmContracts.StorageContracts
+{
+ public interface IShopStorage
+ {
+ ShopViewModel? GetElement(ShopSearchModel model);
+ List GetFullList();
+ List GetFilteredList(ShopSearchModel model);
+ ShopViewModel? Insert(ShopBindingModel model);
+ ShopViewModel? Update(ShopBindingModel model);
+ ShopViewModel? Delete(ShopBindingModel model);
+ }
+}
diff --git a/LawFirm/LawFirmContracts/ViewModels/ShopViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/ShopViewModel.cs
new file mode 100644
index 0000000..8912255
--- /dev/null
+++ b/LawFirm/LawFirmContracts/ViewModels/ShopViewModel.cs
@@ -0,0 +1,24 @@
+using LawFirmDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LawFirmContracts.ViewModels
+{
+ public class ShopViewModel : IShopModel
+ {
+ [DisplayName("Название магазина")]
+ public string Name { get; set; } = string.Empty;
+ [DisplayName("Адрес")]
+ public string Adress { get; set; } = string.Empty;
+ [DisplayName("Дата открытия")]
+ public DateTime OpeningDate { get; set; }
+
+ public Dictionary ShopDocuments { get; set; } = new();
+
+ public int Id { get; set; }
+ }
+}
diff --git a/LawFirm/LawFirmDataModels/Models/IShopModel.cs b/LawFirm/LawFirmDataModels/Models/IShopModel.cs
new file mode 100644
index 0000000..9f7b436
--- /dev/null
+++ b/LawFirm/LawFirmDataModels/Models/IShopModel.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LawFirmDataModels.Models
+{
+ public interface IShopModel : IId
+ {
+ String Name { get; }
+ String Adress { get; }
+ DateTime OpeningDate { get; }
+ Dictionary ShopDocuments { get; }
+ }
+}
diff --git a/LawFirm/LawFirmListImplements/DataListSingleton.cs b/LawFirm/LawFirmListImplements/DataListSingleton.cs
index dbbf993..8020567 100644
--- a/LawFirm/LawFirmListImplements/DataListSingleton.cs
+++ b/LawFirm/LawFirmListImplements/DataListSingleton.cs
@@ -14,11 +14,13 @@ namespace LawFirmListImplements
public List Blanks { get; set; }
public List Orders { get; set; }
public List Documents { get; set; }
+ public List Shops { get; set; }
private DataListSingleton()
{
Blanks = new List();
Orders = new List();
Documents = new List();
+ Shops = new List();
}
public static DataListSingleton GetInstance()
{
diff --git a/LawFirm/LawFirmListImplements/Implements/ShopStorage.cs b/LawFirm/LawFirmListImplements/Implements/ShopStorage.cs
new file mode 100644
index 0000000..11f9ac9
--- /dev/null
+++ b/LawFirm/LawFirmListImplements/Implements/ShopStorage.cs
@@ -0,0 +1,120 @@
+using LawFirmContracts.BindingModels;
+using LawFirmContracts.SearchModels;
+using LawFirmContracts.StorageContracts;
+using LawFirmContracts.ViewModels;
+using LawFirmListImplements.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static System.Formats.Asn1.AsnWriter;
+
+namespace LawFirmListImplements.Implements
+{
+ public class ShopStorage : IShopStorage
+ {
+ private readonly DataListSingleton _source;
+
+ public ShopStorage()
+ {
+ _source = DataListSingleton.GetInstance();
+ }
+
+ public ShopViewModel? GetElement(ShopSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.Name) && !model.Id.HasValue)
+ {
+ return null;
+ }
+ foreach (var shop in _source.Shops)
+ {
+ if ((!string.IsNullOrEmpty(model.Name) && shop.Name == model.Name) || (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.Name))
+ {
+ return result;
+ }
+ foreach (var shop in _source.Shops)
+ {
+ if (shop.Name.Contains(model.Name))
+ {
+ 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;
+ }
+ public ShopViewModel? Delete(ShopBindingModel model)
+ {
+ for (int i = 0; i < _source.Shops.Count; ++i)
+ {
+ if (_source.Shops[i].Id == model.Id)
+ {
+ var element = _source.Shops[i];
+ _source.Shops.RemoveAt(i);
+ return element.GetViewModel;
+ }
+ }
+ return null;
+ }
+
+ }
+}
diff --git a/LawFirm/LawFirmListImplements/Models/Shop.cs b/LawFirm/LawFirmListImplements/Models/Shop.cs
new file mode 100644
index 0000000..82805db
--- /dev/null
+++ b/LawFirm/LawFirmListImplements/Models/Shop.cs
@@ -0,0 +1,63 @@
+using LawFirmContracts.BindingModels;
+using LawFirmContracts.ViewModels;
+using LawFirmDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+using System.Threading.Tasks;
+using static System.Formats.Asn1.AsnWriter;
+
+namespace LawFirmListImplements.Models
+{
+ public class Shop : IShopModel
+ {
+ public int Id { get; private set; }
+
+ public string Name { get; private set; } = string.Empty;
+
+ public string Adress { get; private set; } = string.Empty;
+
+ public DateTime OpeningDate { get; private set; }
+
+ public Dictionary ShopDocuments { get; private set; } = new();
+
+ public static Shop? Create (ShopBindingModel model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new Shop()
+ {
+ Id = model.Id,
+ Name = model.Name,
+ Adress = model.Adress,
+ OpeningDate = model.OpeningDate,
+ ShopDocuments = new()
+ };
+ }
+
+ public void Update(ShopBindingModel? model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ Name = model.Name;
+ Adress = model.Adress;
+ OpeningDate = model.OpeningDate;
+ ShopDocuments = model.ShopDocuments;
+ }
+
+ public ShopViewModel GetViewModel => new()
+ {
+ Id = Id,
+ Name = Name,
+ Adress = Adress,
+ OpeningDate = OpeningDate,
+ ShopDocuments = ShopDocuments
+ };
+ }
+}