diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs index 1a721e2..0e7c108 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs @@ -32,8 +32,6 @@ GuidesToolStripMenuItem = new ToolStripMenuItem(); ComponentsToolStripMenuItem = new ToolStripMenuItem(); ManufacturesToolStripMenuItem = new ToolStripMenuItem(); - ShopsToolStripMenuItem = new ToolStripMenuItem(); - SupplyToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); buttonCreateOrder = new Button(); buttonRefresh = new Button(); @@ -55,7 +53,7 @@ // // GuidesToolStripMenuItem // - GuidesToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsToolStripMenuItem, ManufacturesToolStripMenuItem, ShopsToolStripMenuItem, SupplyToolStripMenuItem }); + GuidesToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsToolStripMenuItem, ManufacturesToolStripMenuItem }); GuidesToolStripMenuItem.Name = "GuidesToolStripMenuItem"; GuidesToolStripMenuItem.Size = new Size(94, 20); GuidesToolStripMenuItem.Text = "Справочники"; @@ -63,31 +61,17 @@ // ComponentsToolStripMenuItem // ComponentsToolStripMenuItem.Name = "ComponentsToolStripMenuItem"; - ComponentsToolStripMenuItem.Size = new Size(198, 22); + ComponentsToolStripMenuItem.Size = new Size(181, 22); ComponentsToolStripMenuItem.Text = "Компоненты"; ComponentsToolStripMenuItem.Click += ComponentsStripMenuItem_Click; // // ManufacturesToolStripMenuItem // ManufacturesToolStripMenuItem.Name = "ManufacturesToolStripMenuItem"; - ManufacturesToolStripMenuItem.Size = new Size(198, 22); + ManufacturesToolStripMenuItem.Size = new Size(181, 22); ManufacturesToolStripMenuItem.Text = "Кузнечные изделия"; ManufacturesToolStripMenuItem.Click += ManufacturesStripMenuItem_Click; // - // ShopsToolStripMenuItem - // - ShopsToolStripMenuItem.Name = "ShopsToolStripMenuItem"; - ShopsToolStripMenuItem.Size = new Size(198, 22); - ShopsToolStripMenuItem.Text = "Магазины"; - ShopsToolStripMenuItem.Click += ShopsToolStripMenuItem_Click; - // - // SupplyToolStripMenuItem - // - SupplyToolStripMenuItem.Name = "SupplyToolStripMenuItem"; - SupplyToolStripMenuItem.Size = new Size(198, 22); - SupplyToolStripMenuItem.Text = "Пополнение магазина"; - SupplyToolStripMenuItem.Click += SupplyToolStripMenuItem_Click; - // // dataGridView // dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -183,7 +167,5 @@ private Button buttonIssued; private Button buttonReady; private Button buttonTakeInWork; - private ToolStripMenuItem ShopsToolStripMenuItem; - private ToolStripMenuItem SupplyToolStripMenuItem; } } \ No newline at end of file diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs index bbfa082..7174015 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs @@ -163,21 +163,5 @@ namespace BlacksmithWorkshop { 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 SupplyToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormSupply)); - if (service is FormSupply form) - { - form.ShowDialog(); - } - } } } diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.Designer.cs deleted file mode 100644 index 1d9d90e..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.Designer.cs +++ /dev/null @@ -1,186 +0,0 @@ -namespace BlacksmithWorkshop -{ - 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() - { - dataGridView = new DataGridView(); - ColumnId = new DataGridViewTextBoxColumn(); - ColumnName = new DataGridViewTextBoxColumn(); - ColumnPrice = new DataGridViewTextBoxColumn(); - ColumnCount = new DataGridViewTextBoxColumn(); - dateTimePicker = new DateTimePicker(); - labelName = new Label(); - labelAddress = new Label(); - labelDate = new Label(); - textBoxName = new TextBox(); - textBoxAddress = new TextBox(); - buttonSave = new Button(); - buttonCancel = new Button(); - ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); - SuspendLayout(); - // - // dataGridView - // - dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ColumnName, ColumnPrice, ColumnCount }); - dataGridView.Location = new Point(12, 101); - dataGridView.Name = "dataGridView"; - dataGridView.RowTemplate.Height = 25; - dataGridView.Size = new Size(553, 281); - dataGridView.TabIndex = 0; - // - // ColumnId - // - ColumnId.HeaderText = ""; - ColumnId.Name = "ColumnId"; - ColumnId.Visible = false; - // - // ColumnName - // - ColumnName.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - ColumnName.HeaderText = "Изделие"; - ColumnName.Name = "ColumnName"; - // - // ColumnPrice - // - ColumnPrice.HeaderText = "Цена"; - ColumnPrice.Name = "ColumnPrice"; - // - // ColumnCount - // - ColumnCount.HeaderText = "Количество"; - ColumnCount.Name = "ColumnCount"; - // - // dateTimePicker - // - dateTimePicker.Location = new Point(150, 63); - dateTimePicker.Name = "dateTimePicker"; - dateTimePicker.Size = new Size(166, 23); - dateTimePicker.TabIndex = 1; - // - // labelName - // - labelName.AutoSize = true; - labelName.Location = new Point(12, 9); - labelName.Name = "labelName"; - labelName.Size = new Size(62, 15); - labelName.TabIndex = 2; - labelName.Text = "Название:"; - // - // labelAddress - // - labelAddress.AutoSize = true; - labelAddress.Location = new Point(12, 38); - labelAddress.Name = "labelAddress"; - labelAddress.Size = new Size(43, 15); - labelAddress.TabIndex = 3; - labelAddress.Text = "Адрес:"; - // - // labelDate - // - labelDate.AutoSize = true; - labelDate.Location = new Point(12, 69); - labelDate.Name = "labelDate"; - labelDate.Size = new Size(90, 15); - labelDate.TabIndex = 4; - labelDate.Text = "Дата открытия:"; - // - // textBoxName - // - textBoxName.Location = new Point(150, 6); - textBoxName.Name = "textBoxName"; - textBoxName.Size = new Size(166, 23); - textBoxName.TabIndex = 5; - // - // textBoxAddress - // - textBoxAddress.Location = new Point(150, 35); - textBoxAddress.Name = "textBoxAddress"; - textBoxAddress.Size = new Size(166, 23); - textBoxAddress.TabIndex = 6; - // - // buttonSave - // - buttonSave.Location = new Point(12, 401); - buttonSave.Name = "buttonSave"; - buttonSave.Size = new Size(123, 25); - buttonSave.TabIndex = 7; - buttonSave.Text = "Сохранить"; - buttonSave.UseVisualStyleBackColor = true; - buttonSave.Click += SaveButton_Click; - // - // buttonCancel - // - buttonCancel.Location = new Point(150, 401); - buttonCancel.Name = "buttonCancel"; - buttonCancel.Size = new Size(123, 25); - buttonCancel.TabIndex = 8; - buttonCancel.Text = "Отмена"; - buttonCancel.UseVisualStyleBackColor = true; - buttonCancel.Click += CancelButton_Click; - // - // FormShop - // - AutoScaleDimensions = new SizeF(7F, 15F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(585, 450); - Controls.Add(buttonCancel); - Controls.Add(buttonSave); - Controls.Add(textBoxAddress); - Controls.Add(textBoxName); - Controls.Add(labelDate); - Controls.Add(labelAddress); - Controls.Add(labelName); - Controls.Add(dateTimePicker); - Controls.Add(dataGridView); - Name = "FormShop"; - StartPosition = FormStartPosition.CenterParent; - Text = "Магазин"; - Load += FormShop_Load; - ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); - ResumeLayout(false); - PerformLayout(); - } - - #endregion - - private DataGridView dataGridView; - private DateTimePicker dateTimePicker; - private Label labelName; - private Label labelAddress; - private Label labelDate; - private TextBox textBoxName; - private TextBox textBoxAddress; - private DataGridViewTextBoxColumn ColumnId; - private DataGridViewTextBoxColumn ColumnName; - private DataGridViewTextBoxColumn ColumnPrice; - private DataGridViewTextBoxColumn ColumnCount; - private Button buttonSave; - private Button buttonCancel; - } -} \ No newline at end of file diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.cs deleted file mode 100644 index 9d551fe..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.cs +++ /dev/null @@ -1,122 +0,0 @@ -using BlacksmithWorkshopContracts.BindingModels; -using BlacksmithWorkshopContracts.BusinessLogicsContracts; -using BlacksmithWorkshopContracts.SearchModels; -using BlacksmithWorkshopDataModels.Models; -using Microsoft.Extensions.Logging; -using Microsoft.VisualBasic.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 BlacksmithWorkshop -{ - public partial class FormShop : Form - { - private readonly ILogger _logger; - private readonly IShopLogic _logic; - public int? _id; - private Dictionary _manufactures; - public FormShop(ILogger logger, IShopLogic logic) - { - InitializeComponent(); - _logger = logger; - _logic = logic; - _manufactures = new(); - } - private void FormShop_Load(object sender, EventArgs e) - { - if (_id.HasValue) - { - _logger.LogInformation("Загрузка магазина"); - try - { - var shop = _logic.ReadElement(new ShopSearchModel { Id = _id }); - if (shop != null) - { - textBoxName.Text = shop.ShopName; - textBoxAddress.Text = shop.Address; - dateTimePicker.Text = shop.OpeningDate.ToString(); - _manufactures = shop.ShopManufactures; - } - LoadData(); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка загрузки магазина"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); - } - } - } - private void LoadData() - { - _logger.LogInformation("Загрузка товаров магазина"); - try - { - if (_manufactures != null) - { - foreach (var manufactures in _manufactures) - { - dataGridView.Rows.Add(new object[] { manufactures.Key, manufactures.Value.Item1.ManufactureName, - manufactures.Value.Item1.Price, manufactures.Value.Item2 }); - } - } - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка загрузки изделий магазина"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); - } - } - private void CancelButton_Click(object sender, EventArgs e) - { - DialogResult = DialogResult.Cancel; - Close(); - } - private void SaveButton_Click(object sender, EventArgs e) - { - if (string.IsNullOrEmpty(textBoxName.Text)) - { - MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - if (string.IsNullOrEmpty(textBoxAddress.Text)) - { - MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - _logger.LogInformation("Сохранение магазина"); - try - { - var model = new ShopBindingModel - { - Id = _id ?? 0, - ShopName = textBoxName.Text, - Address = textBoxAddress.Text, - OpeningDate = dateTimePicker.Value.Date, - ShopManufactures = _manufactures - }; - var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); - if (!operationResult) - { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); - } - MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); - DialogResult = DialogResult.OK; - Close(); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка сохранения магазина"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - } -} diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.resx b/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.resx deleted file mode 100644 index b0c7c5d..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.resx +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - True - - - True - - - True - - \ No newline at end of file diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormShops.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormShops.Designer.cs deleted file mode 100644 index 7755f6d..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormShops.Designer.cs +++ /dev/null @@ -1,114 +0,0 @@ -namespace BlacksmithWorkshop -{ - partial class FormShops - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - dataGridView = new DataGridView(); - buttonAdd = new Button(); - buttonUpdate = new Button(); - buttonDelete = new Button(); - buttonRefresh = new Button(); - ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); - SuspendLayout(); - // - // dataGridView - // - dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Location = new Point(0, 0); - dataGridView.Name = "dataGridView"; - dataGridView.RowTemplate.Height = 25; - dataGridView.Size = new Size(567, 450); - dataGridView.TabIndex = 0; - // - // buttonAdd - // - buttonAdd.Location = new Point(617, 22); - buttonAdd.Name = "buttonAdd"; - buttonAdd.Size = new Size(152, 33); - buttonAdd.TabIndex = 1; - buttonAdd.Text = "Создать"; - buttonAdd.UseVisualStyleBackColor = true; - buttonAdd.Click += AddButton_Click; - // - // buttonUpdate - // - buttonUpdate.Location = new Point(617, 61); - buttonUpdate.Name = "buttonUpdate"; - buttonUpdate.Size = new Size(152, 33); - buttonUpdate.TabIndex = 2; - buttonUpdate.Text = "Изменить"; - buttonUpdate.UseVisualStyleBackColor = true; - buttonUpdate.Click += UpdateButton_Click; - // - // buttonDelete - // - buttonDelete.Location = new Point(617, 100); - buttonDelete.Name = "buttonDelete"; - buttonDelete.Size = new Size(152, 33); - buttonDelete.TabIndex = 3; - buttonDelete.Text = "Удалить"; - buttonDelete.UseVisualStyleBackColor = true; - buttonDelete.Click += DeleteButton_Click; - // - // buttonRefresh - // - buttonRefresh.Location = new Point(617, 139); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(152, 33); - buttonRefresh.TabIndex = 4; - buttonRefresh.Text = "Обновить"; - buttonRefresh.UseVisualStyleBackColor = true; - buttonRefresh.Click += RefreshButton_Click; - // - // FormShops - // - AutoScaleDimensions = new SizeF(7F, 15F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); - Controls.Add(buttonRefresh); - Controls.Add(buttonDelete); - Controls.Add(buttonUpdate); - Controls.Add(buttonAdd); - Controls.Add(dataGridView); - Name = "FormShops"; - StartPosition = FormStartPosition.CenterParent; - Text = "Магазины"; - Load += FormShops_Load; - ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); - ResumeLayout(false); - } - - #endregion - - private DataGridView dataGridView; - private Button buttonAdd; - private Button buttonUpdate; - private Button buttonDelete; - private Button buttonRefresh; - } -} \ No newline at end of file diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormShops.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormShops.cs deleted file mode 100644 index e9fcb99..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormShops.cs +++ /dev/null @@ -1,110 +0,0 @@ -using BlacksmithWorkshopContracts.BindingModels; -using BlacksmithWorkshopContracts.BusinessLogicsContracts; -using Microsoft.Extensions.Logging; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace BlacksmithWorkshop -{ - 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 LoadData() - { - try - { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["Address"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["OpeningDate"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["ShopManufactures"].Visible = false; - } - _logger.LogInformation("Загрузка магазинов"); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка загрузки магазинов"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - private void FormShops_Load(object sender, EventArgs e) - { - LoadData(); - } - private void AddButton_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 UpdateButton_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 RefreshButton_Click(object sender, EventArgs e) - { - LoadData(); - } - private void DeleteButton_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/BlacksmithWorkshop/BlacksmithWorkshop/FormShops.resx b/BlacksmithWorkshop/BlacksmithWorkshop/FormShops.resx deleted file mode 100644 index af32865..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormShops.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.Designer.cs deleted file mode 100644 index 5e2f0fd..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.Designer.cs +++ /dev/null @@ -1,108 +0,0 @@ -namespace BlacksmithWorkshop -{ - partial class FormSupply - { - /// - /// 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() - { - ShopComboBox = new ComboBox(); - ManufactureComboBox = new ComboBox(); - CountTextBox = new TextBox(); - buttonSave = new Button(); - buttonCansel = new Button(); - SuspendLayout(); - // - // ShopComboBox - // - ShopComboBox.DropDownStyle = ComboBoxStyle.DropDownList; - ShopComboBox.FormattingEnabled = true; - ShopComboBox.Location = new Point(12, 12); - ShopComboBox.Name = "ShopComboBox"; - ShopComboBox.Size = new Size(224, 23); - ShopComboBox.TabIndex = 0; - // - // ManufactureComboBox - // - ManufactureComboBox.DropDownStyle = ComboBoxStyle.DropDownList; - ManufactureComboBox.FormattingEnabled = true; - ManufactureComboBox.Location = new Point(242, 12); - ManufactureComboBox.Name = "ManufactureComboBox"; - ManufactureComboBox.Size = new Size(224, 23); - ManufactureComboBox.TabIndex = 1; - // - // CountTextBox - // - CountTextBox.Location = new Point(472, 12); - CountTextBox.Name = "CountTextBox"; - CountTextBox.Size = new Size(224, 23); - CountTextBox.TabIndex = 2; - // - // buttonSave - // - buttonSave.Location = new Point(162, 47); - buttonSave.Name = "buttonSave"; - buttonSave.Size = new Size(157, 28); - buttonSave.TabIndex = 3; - buttonSave.Text = "Сохранить"; - buttonSave.UseVisualStyleBackColor = true; - buttonSave.Click += SaveButton_Click; - // - // buttonCansel - // - buttonCansel.Location = new Point(394, 47); - buttonCansel.Name = "buttonCansel"; - buttonCansel.Size = new Size(157, 28); - buttonCansel.TabIndex = 4; - buttonCansel.Text = "Отмена"; - buttonCansel.UseVisualStyleBackColor = true; - buttonCansel.Click += CancelButton_Click; - // - // FormSupply - // - AutoScaleDimensions = new SizeF(7F, 15F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(707, 87); - Controls.Add(buttonCansel); - Controls.Add(buttonSave); - Controls.Add(CountTextBox); - Controls.Add(ManufactureComboBox); - Controls.Add(ShopComboBox); - Name = "FormSupply"; - StartPosition = FormStartPosition.CenterParent; - Text = "Пополнение магазина"; - ResumeLayout(false); - PerformLayout(); - } - - #endregion - - private ComboBox ShopComboBox; - private ComboBox ManufactureComboBox; - private TextBox CountTextBox; - private Button buttonSave; - private Button buttonCansel; - } -} \ No newline at end of file diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.cs deleted file mode 100644 index 9742c1e..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.cs +++ /dev/null @@ -1,139 +0,0 @@ -using BlacksmithWorkshopContracts.BusinessLogicsContracts; -using BlacksmithWorkshopContracts.SearchModels; -using BlacksmithWorkshopContracts.ViewModels; -using BlacksmithWorkshopDataModels.Models; -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 BlacksmithWorkshop -{ - public partial class FormSupply : Form - { - private readonly List? _manufactureList; - private readonly List? _shopsList; - IShopLogic _shopLogic; - IManufactureLogic _manufactureLogic; - public int ShopId - { - get - { - return Convert.ToInt32(ShopComboBox.SelectedValue); - } - set - { - ShopComboBox.SelectedValue = value; - } - } - public int ManufactureId - { - get - { - return Convert.ToInt32(ManufactureComboBox.SelectedValue); - } - set - { - ManufactureComboBox.SelectedValue = value; - } - } - public IManufactureModel? ManufactureModel - { - get - { - if (_manufactureList == null) - { - return null; - } - foreach (var elem in _manufactureList) - { - if (elem.Id == ManufactureId) - { - return elem; - } - } - return null; - } - } - public int Count - { - get { return Convert.ToInt32(CountTextBox.Text); } - set { CountTextBox.Text = value.ToString(); } - } - public FormSupply(IManufactureLogic ManufactureLogic, IShopLogic shopLogic) - { - InitializeComponent(); - _shopLogic = shopLogic; - _manufactureLogic = ManufactureLogic; - _manufactureList = ManufactureLogic.ReadList(null); - _shopsList = shopLogic.ReadList(null); - if (_manufactureList != null) - { - ManufactureComboBox.DisplayMember = "ManufactureName"; - ManufactureComboBox.ValueMember = "Id"; - ManufactureComboBox.DataSource = _manufactureList; - ManufactureComboBox.SelectedItem = null; - } - if (_shopsList != null) - { - ShopComboBox.DisplayMember = "ShopName"; - ShopComboBox.ValueMember = "Id"; - ShopComboBox.DataSource = _shopsList; - ShopComboBox.SelectedItem = null; - } - } - private void SaveButton_Click(object sender, EventArgs e) - { - if (string.IsNullOrEmpty(CountTextBox.Text)) - { - MessageBox.Show("Заполните поле Количество", "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - if (ManufactureComboBox.SelectedValue == null) - { - MessageBox.Show("Выберите кузнечное изделие", "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - if (ShopComboBox.SelectedValue == null) - { - MessageBox.Show("Выберите магазин", "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - try - { - int count = Convert.ToInt32(CountTextBox.Text); - bool res = _shopLogic.ReplenishManufactures( - new ShopSearchModel() { Id = Convert.ToInt32(ShopComboBox.SelectedValue) }, - _manufactureLogic.ReadElement(new() { Id = Convert.ToInt32(ManufactureComboBox.SelectedValue) }), - count - ); - if (!res) - { - throw new Exception("Ошибка при пополнении. Дополнительная информация в логах"); - } - MessageBox.Show("Пополнение прошло успешно"); - DialogResult = DialogResult.OK; - Close(); - - } - catch (Exception) - { - MessageBox.Show("Ошибка пополнения"); - return; - } - } - private void CancelButton_Click(object sender, EventArgs e) - { - DialogResult = DialogResult.Cancel; - Close(); - } - } -} diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.resx b/BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.resx deleted file mode 100644 index af32865..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/BlacksmithWorkshop/BlacksmithWorkshop/Program.cs b/BlacksmithWorkshop/BlacksmithWorkshop/Program.cs index 46eb659..7769977 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/Program.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/Program.cs @@ -40,18 +40,13 @@ namespace BlacksmithWorkshop services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + services.AddTransient(); 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/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ShopLogic.cs b/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ShopLogic.cs deleted file mode 100644 index 48e1963..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ShopLogic.cs +++ /dev/null @@ -1,161 +0,0 @@ -using BlacksmithWorkshopContracts.BindingModels; -using BlacksmithWorkshopContracts.BusinessLogicsContracts; -using BlacksmithWorkshopContracts.SearchModels; -using BlacksmithWorkshopContracts.StoragesContracts; -using BlacksmithWorkshopContracts.ViewModels; -using BlacksmithWorkshopDataModels.Models; -using Microsoft.Extensions.Logging; -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; - -namespace BlacksmithWorkshopBusinessLogic.BusinessLogics -{ - public class ShopLogic : IShopLogic - { - private readonly ILogger _logger; - private readonly IShopStorage _shopStorage; - public ShopLogic(ILogger logger, IShopStorage ShopStorage) - { - _logger = logger; - _shopStorage = ShopStorage; - } - 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 ReplenishManufactures(ShopSearchModel model, IManufactureModel manufacture, int count) - { - _logger.LogInformation("Try to replenish manufactures. ShopName:{ShopName}. Id:{Id}", model.ShopName, model.Id); - if (model == null) - { - _logger.LogWarning("Read operation failed"); - throw new ArgumentNullException(nameof(model)); - } - ShopViewModel? curModel = ReadElement(model); - if (curModel == null) - { - _logger.LogWarning("Read operation failed"); - throw new ArgumentNullException(nameof(curModel)); - } - if (manufacture == null) - { - _logger.LogWarning("Read operation failed"); - throw new ArgumentNullException(nameof(manufacture)); - } - if (count <= 0) - { - _logger.LogWarning("Read operation failed"); - throw new ArgumentException("Количество должно быть положительным числом"); - } - if (curModel.ShopManufactures.TryGetValue(manufacture.Id, out var pair)) - { - curModel.ShopManufactures[manufacture.Id] = (pair.Item1, pair.Item2 + count); - } - else - { - curModel.ShopManufactures.Add(manufacture.Id, (manufacture, count)); - } - Update(new() - { - Id = curModel.Id, - ShopName = curModel.ShopName, - OpeningDate = curModel.OpeningDate, - Address = curModel.Address, - ShopManufactures = curModel.ShopManufactures, - }); - _logger.LogInformation("Success. ManufactureName:{ManufactureName}. Id:{Id}. Replenish:{count}", - manufacture.ManufactureName, manufacture.Id, count); - return true; - } - private void CheckModel(ShopBindingModel model, bool withParams = true) - { - if (model == null) - { - throw new ArgumentNullException(nameof(model)); - } - if (!withParams) - { - return; - } - if (string.IsNullOrEmpty(model.ShopName)) - { - throw new ArgumentNullException("Нет названия магазина", nameof(model.ShopName)); - } - if (string.IsNullOrEmpty(model.Address)) - { - throw new ArgumentNullException("Нет адреса магазина", nameof(model.Address)); - } - _logger.LogInformation("Shop. ShopName:{ShopName}.Address:{Address}. DateOpen:{DateOpen}. Id: { Id}", - model.ShopName, model.Address, model.OpeningDate, model.Id); - var element = _shopStorage.GetElement(new ShopSearchModel - { - ShopName = model.ShopName - }); - if (element != null && element.Id != model.Id) - { - throw new InvalidOperationException("Магазин с таким названием уже есть"); - } - } - } -} diff --git a/BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/ShopBindingModel.cs b/BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/ShopBindingModel.cs deleted file mode 100644 index 79ff366..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/ShopBindingModel.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using BlacksmithWorkshopDataModels.Models; - -namespace BlacksmithWorkshopContracts.BindingModels -{ - public class ShopBindingModel : IShopModel - { - public int Id { get; set; } - public string ShopName { get; set; } = string.Empty; - public string Address { get; set; } = string.Empty; - public DateTime OpeningDate { get; set; } - public Dictionary ShopManufactures { get; set; } = new(); - } -} diff --git a/BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IShopLogic.cs b/BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IShopLogic.cs deleted file mode 100644 index 5b6358d..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IShopLogic.cs +++ /dev/null @@ -1,22 +0,0 @@ -using BlacksmithWorkshopContracts.BindingModels; -using BlacksmithWorkshopContracts.SearchModels; -using BlacksmithWorkshopContracts.ViewModels; -using BlacksmithWorkshopDataModels.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BlacksmithWorkshopContracts.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 ReplenishManufactures(ShopSearchModel shop, IManufactureModel manufacture, int count); - } -} diff --git a/BlacksmithWorkshop/BlacksmithWorkshopContracts/SearchModels/ShopSearchModel.cs b/BlacksmithWorkshop/BlacksmithWorkshopContracts/SearchModels/ShopSearchModel.cs deleted file mode 100644 index 64a9f62..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshopContracts/SearchModels/ShopSearchModel.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BlacksmithWorkshopContracts.SearchModels -{ - public class ShopSearchModel - { - public int? Id { get; set; } - public string? ShopName { get; set; } - } -} diff --git a/BlacksmithWorkshop/BlacksmithWorkshopContracts/StoragesContracts/IShopStorage.cs b/BlacksmithWorkshop/BlacksmithWorkshopContracts/StoragesContracts/IShopStorage.cs deleted file mode 100644 index c36afa4..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshopContracts/StoragesContracts/IShopStorage.cs +++ /dev/null @@ -1,21 +0,0 @@ -using BlacksmithWorkshopContracts.BindingModels; -using BlacksmithWorkshopContracts.SearchModels; -using BlacksmithWorkshopContracts.ViewModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BlacksmithWorkshopContracts.StoragesContracts -{ - public interface IShopStorage - { - List GetFullList(); - List GetFilteredList(ShopSearchModel model); - ShopViewModel? GetElement(ShopSearchModel model); - ShopViewModel? Insert(ShopBindingModel model); - ShopViewModel? Update(ShopBindingModel model); - ShopViewModel? Delete(ShopBindingModel model); - } -} diff --git a/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ShopViewModel.cs b/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ShopViewModel.cs deleted file mode 100644 index 1a17384..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ShopViewModel.cs +++ /dev/null @@ -1,22 +0,0 @@ -using BlacksmithWorkshopDataModels.Models; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BlacksmithWorkshopContracts.ViewModels -{ - public class ShopViewModel : IShopModel - { - public int Id { get; set; } - [DisplayName("Название магазина")] - public string ShopName { get; set; } = string.Empty; - [DisplayName("Адрес магазина")] - public string Address { get; set; } = string.Empty; - [DisplayName("Дата открытия")] - public DateTime OpeningDate { get; set; } - public Dictionary ShopManufactures { get; set; } = new(); - } -} diff --git a/BlacksmithWorkshop/BlacksmithWorkshopDataModels/Models/IShopModel.cs b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/Models/IShopModel.cs deleted file mode 100644 index 1e742af..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshopDataModels/Models/IShopModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BlacksmithWorkshopDataModels.Models -{ - public interface IShopModel : IId - { - string ShopName { get; } - string Address { get; } - DateTime OpeningDate { get; } - Dictionary ShopManufactures { get; } - } -} diff --git a/BlacksmithWorkshop/BlacksmithWorkshopListImplement/DataListSingleton.cs b/BlacksmithWorkshop/BlacksmithWorkshopListImplement/DataListSingleton.cs index 32ab5b6..71c00d4 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopListImplement/DataListSingleton.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopListImplement/DataListSingleton.cs @@ -13,13 +13,11 @@ namespace BlacksmithWorkshopListImplement public List Components { get; set; } public List Orders { get; set; } public List Manufactures { get; set; } - public List Shops { get; set; } private DataListSingleton() { Components = new List(); Orders = new List(); Manufactures = new List(); - Shops = new List(); } public static DataListSingleton GetInstance() { diff --git a/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/ShopStorage.cs b/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/ShopStorage.cs deleted file mode 100644 index eb418a9..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/ShopStorage.cs +++ /dev/null @@ -1,107 +0,0 @@ -using BlacksmithWorkshopContracts.BindingModels; -using BlacksmithWorkshopContracts.SearchModels; -using BlacksmithWorkshopContracts.StoragesContracts; -using BlacksmithWorkshopContracts.ViewModels; -using BlacksmithWorkshopListImplement.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BlacksmithWorkshopListImplement.Implements -{ - public class ShopStorage : IShopStorage - { - private readonly DataListSingleton _source; - public ShopStorage() - { - _source = DataListSingleton.GetInstance(); - } - public List GetFullList() - { - List result = new List(); - foreach(var Shop in _source.Shops) - { - result.Add(Shop.GetViewModel); - } - return result; - } - public List GetFilteredList(ShopSearchModel model) - { - List result = new(); - 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 (Shop.Id >= model.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/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Models/Shop.cs b/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Models/Shop.cs deleted file mode 100644 index 4c761e4..0000000 --- a/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Models/Shop.cs +++ /dev/null @@ -1,54 +0,0 @@ -using BlacksmithWorkshopContracts.BindingModels; -using BlacksmithWorkshopContracts.ViewModels; -using BlacksmithWorkshopDataModels.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BlacksmithWorkshopListImplement.Models -{ - public class Shop : IShopModel - { - public int Id { get; private set; } - public string ShopName { get; private set; } = string.Empty; - public string Address { get; private set; } = string.Empty; - public DateTime OpeningDate { get; private set; } - public Dictionary ShopManufactures { get; private set; } = new(); - public static Shop? Create(ShopBindingModel? model) - { - if (model == null) - { - return null; - } - return new Shop() - { - Id = model.Id, - ShopName = model.ShopName, - Address = model.Address, - OpeningDate = model.OpeningDate, - ShopManufactures = model.ShopManufactures - }; - } - public void Update(ShopBindingModel? model) - { - if (model == null) - { - return; - } - ShopName = model.ShopName; - Address = model.Address; - OpeningDate = model.OpeningDate; - ShopManufactures = model.ShopManufactures; - } - public ShopViewModel GetViewModel => new ShopViewModel() - { - Id = Id, - ShopName = ShopName, - Address = Address, - OpeningDate = OpeningDate, - ShopManufactures = ShopManufactures - }; - } -}