diff --git a/SushiBar/Form1.Designer.cs b/SushiBar/Form1.Designer.cs deleted file mode 100644 index 0c36341..0000000 --- a/SushiBar/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace SushiBar -{ - partial class Form1 - { - /// - /// 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.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "Form1"; - } - - #endregion - } -} diff --git a/SushiBar/Form1.cs b/SushiBar/Form1.cs deleted file mode 100644 index 4ac4715..0000000 --- a/SushiBar/Form1.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace SushiBar -{ - public partial class Form1 : Form - { - //create labwork01 - public Form1() - { - InitializeComponent(); - } - } -} diff --git a/SushiBar/FormComponent.Designer.cs b/SushiBar/FormComponent.Designer.cs new file mode 100644 index 0000000..4ca4ffa --- /dev/null +++ b/SushiBar/FormComponent.Designer.cs @@ -0,0 +1,127 @@ +namespace SushiBarView +{ + partial class FormComponent + { + /// + /// 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() + { + labelComponentName = new Label(); + labelCost = new Label(); + textBoxComponentName = new TextBox(); + textBoxComponentCost = new TextBox(); + buttonSaveComponent = new Button(); + buttonCancel = new Button(); + SuspendLayout(); + // + // labelComponentName + // + labelComponentName.AutoSize = true; + labelComponentName.Font = new Font("Candara", 12F); + labelComponentName.Location = new Point(20, 29); + labelComponentName.Margin = new Padding(4, 0, 4, 0); + labelComponentName.Name = "labelComponentName"; + labelComponentName.Size = new Size(93, 24); + labelComponentName.TabIndex = 0; + labelComponentName.Text = "Название"; + // + // labelCost + // + labelCost.AutoSize = true; + labelCost.Font = new Font("Candara", 12F); + labelCost.Location = new Point(29, 111); + labelCost.Margin = new Padding(4, 0, 4, 0); + labelCost.Name = "labelCost"; + labelCost.Size = new Size(53, 24); + labelCost.TabIndex = 1; + labelCost.Text = "Цена"; + // + // textBoxComponentName + // + textBoxComponentName.Anchor = AnchorStyles.Top | AnchorStyles.Right; + textBoxComponentName.Location = new Point(134, 21); + textBoxComponentName.Name = "textBoxComponentName"; + textBoxComponentName.Size = new Size(355, 32); + textBoxComponentName.TabIndex = 2; + // + // textBoxComponentCost + // + textBoxComponentCost.Anchor = AnchorStyles.Top | AnchorStyles.Right; + textBoxComponentCost.Location = new Point(134, 103); + textBoxComponentCost.Name = "textBoxComponentCost"; + textBoxComponentCost.Size = new Size(355, 32); + textBoxComponentCost.TabIndex = 3; + // + // buttonSaveComponent + // + buttonSaveComponent.Anchor = AnchorStyles.Bottom; + buttonSaveComponent.Location = new Point(134, 161); + buttonSaveComponent.Name = "buttonSaveComponent"; + buttonSaveComponent.Size = new Size(116, 39); + buttonSaveComponent.TabIndex = 4; + buttonSaveComponent.Text = "Сохранить"; + buttonSaveComponent.UseVisualStyleBackColor = true; + // + // buttonCancel + // + buttonCancel.Anchor = AnchorStyles.Bottom; + buttonCancel.Location = new Point(373, 161); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(116, 39); + buttonCancel.TabIndex = 5; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; + // + // FormComponents + // + AutoScaleDimensions = new SizeF(11F, 24F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(515, 230); + Controls.Add(buttonCancel); + Controls.Add(buttonSaveComponent); + Controls.Add(textBoxComponentCost); + Controls.Add(textBoxComponentName); + Controls.Add(labelCost); + Controls.Add(labelComponentName); + Font = new Font("Candara", 12F, FontStyle.Regular, GraphicsUnit.Point, 204); + Margin = new Padding(4); + Name = "FormComponents"; + Text = "Компонент"; + Load += FormComponents_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label labelComponentName; + private Label labelCost; + private TextBox textBoxComponentName; + private TextBox textBoxComponentCost; + private Button buttonSaveComponent; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/SushiBar/FormComponent.cs b/SushiBar/FormComponent.cs new file mode 100644 index 0000000..dd966ce --- /dev/null +++ b/SushiBar/FormComponent.cs @@ -0,0 +1,94 @@ + +using Microsoft.Extensions.Logging; +using SushiBarContracts.BindingModel; +using SushiBarContracts.BusinessLogicsContracts; +using SushiBarContracts.SearchModel; +using System.Windows.Forms; + +namespace SushiBarView +{ + public partial class FormComponent : Form + { + private readonly ILogger _logger; + private readonly IComponentLogic _logic; + private int? _id; + public int Id + { + set { _id = value; } + } + public FormComponent(ILogger logger, IComponentLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormComponents_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + try + { + _logger.LogInformation("Получение компонента"); + var view = _logic.ReadElement(new ComponentSearchModel + { + Id = _id.Value + }); + if (view != null) + { + textBoxComponentName.Text = view.ComponentName; + textBoxComponentCost.Text = view.Cost.ToString(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения компонента"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + } + + private void buttonSaveComponent_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxComponentName.Text)) + { + MessageBox.Show("Заполните название", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение компонента"); + try + { + var model = new ComponentBindingModel + { + Id = _id ?? 0, + ComponentName = textBoxComponentName.Text, + Cost = Convert.ToDouble(textBoxComponentCost.Text) + }; + 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/SushiBar/FormComponent.resx b/SushiBar/FormComponent.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/SushiBar/FormComponent.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SushiBar/FormComponents.Designer.cs b/SushiBar/FormComponents.Designer.cs new file mode 100644 index 0000000..b55cd7e --- /dev/null +++ b/SushiBar/FormComponents.Designer.cs @@ -0,0 +1,123 @@ +namespace SushiBarView +{ + partial class FormComponents + { + /// + /// 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(); + buttonAddComponent = new Button(); + buttonUpdateComponent = new Button(); + buttonRemoveComponent = new Button(); + buttonRefreshComponents = new Button(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.BackgroundColor = SystemColors.ActiveCaption; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Dock = DockStyle.Left; + dataGridView.Location = new Point(0, 0); + dataGridView.MultiSelect = false; + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersVisible = false; + dataGridView.RowHeadersWidth = 51; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(569, 521); + dataGridView.TabIndex = 0; + // + // buttonAddComponent + // + buttonAddComponent.Font = new Font("Candara", 12F); + buttonAddComponent.Location = new Point(637, 35); + buttonAddComponent.Name = "buttonAddComponent"; + buttonAddComponent.Size = new Size(121, 46); + buttonAddComponent.TabIndex = 1; + buttonAddComponent.Text = "Добавить"; + buttonAddComponent.UseVisualStyleBackColor = true; + buttonAddComponent.Click += buttonAddComponent_Click; + // + // buttonUpdateComponent + // + buttonUpdateComponent.Font = new Font("Candara", 12F); + buttonUpdateComponent.Location = new Point(637, 167); + buttonUpdateComponent.Name = "buttonUpdateComponent"; + buttonUpdateComponent.Size = new Size(121, 46); + buttonUpdateComponent.TabIndex = 2; + buttonUpdateComponent.Text = "Изменить"; + buttonUpdateComponent.UseVisualStyleBackColor = true; + buttonUpdateComponent.Click += buttonUpdateComponent_Click; + // + // buttonRemoveComponent + // + buttonRemoveComponent.Font = new Font("Candara", 12F); + buttonRemoveComponent.Location = new Point(637, 307); + buttonRemoveComponent.Name = "buttonRemoveComponent"; + buttonRemoveComponent.Size = new Size(121, 46); + buttonRemoveComponent.TabIndex = 3; + buttonRemoveComponent.Text = "Удалить"; + buttonRemoveComponent.UseVisualStyleBackColor = true; + buttonRemoveComponent.Click += buttonUpdateComponent_Click; + // + // buttonRefreshComponents + // + buttonRefreshComponents.Font = new Font("Candara", 12F); + buttonRefreshComponents.Location = new Point(637, 444); + buttonRefreshComponents.Name = "buttonRefreshComponents"; + buttonRefreshComponents.Size = new Size(121, 46); + buttonRefreshComponents.TabIndex = 4; + buttonRefreshComponents.Text = "Обновить"; + buttonRefreshComponents.UseVisualStyleBackColor = true; + buttonRefreshComponents.Click += buttonRefreshComponents_Click; + // + // FormComponents + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 521); + Controls.Add(buttonRefreshComponents); + Controls.Add(buttonRemoveComponent); + Controls.Add(buttonUpdateComponent); + Controls.Add(buttonAddComponent); + Controls.Add(dataGridView); + Name = "FormComponents"; + Text = "Компоненты"; + Load += FormComponents_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridView; + private Button buttonAddComponent; + private Button buttonUpdateComponent; + private Button buttonRemoveComponent; + private Button buttonRefreshComponents; + } +} \ No newline at end of file diff --git a/SushiBar/FormComponents.cs b/SushiBar/FormComponents.cs new file mode 100644 index 0000000..a453798 --- /dev/null +++ b/SushiBar/FormComponents.cs @@ -0,0 +1,123 @@ +using Microsoft.Extensions.Logging; +using SushiBar; +using SushiBarContracts.BindingModel; +using SushiBarContracts.BusinessLogicsContracts; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace SushiBarView +{ + public partial class FormComponents : Form + { + private readonly ILogger _logger; + private readonly IComponentLogic _logic; + private int? _id; + public int Id + { + set { _id = value; } + } + public FormComponents(ILogger logger, IComponentLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormComponents_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["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка компонентов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки компонентов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void buttonAddComponent_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); + if (service is FormComponent form) + { + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + + private void buttonUpdateComponent_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = + Program.ServiceProvider?.GetService(typeof(FormComponent)); + if (service is FormComponent form) + { + form.Id = + Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + + private void buttonRemoveComponent_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 ComponentBindingModel + { + Id = id + })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка удаления компонента"); + MessageBox.Show(ex.Message, "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + + private void buttonRefreshComponents_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/SushiBar/FormComponents.resx b/SushiBar/FormComponents.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/SushiBar/FormComponents.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SushiBar/FormSushi.Designer.cs b/SushiBar/FormSushi.Designer.cs new file mode 100644 index 0000000..1ef515d --- /dev/null +++ b/SushiBar/FormSushi.Designer.cs @@ -0,0 +1,249 @@ +namespace SushiBarView +{ + partial class FormSushi + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + labelName = new Label(); + labelPrice = new Label(); + textBoxName = new TextBox(); + textBoxPrice = new TextBox(); + groupBoxComponents = new GroupBox(); + buttonRefresh = new Button(); + buttonDelete = new Button(); + buttonUpdate = new Button(); + buttonAdd = new Button(); + dataGridView = new DataGridView(); + ColumnId = new DataGridViewTextBoxColumn(); + ColumnName = new DataGridViewTextBoxColumn(); + ColumnCount = new DataGridViewTextBoxColumn(); + buttonSave = new Button(); + buttonCancel = new Button(); + groupBoxComponents.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // labelName + // + labelName.AutoSize = true; + labelName.Location = new Point(26, 16); + labelName.Margin = new Padding(2, 0, 2, 0); + labelName.Name = "labelName"; + labelName.Size = new Size(79, 21); + labelName.TabIndex = 0; + labelName.Text = "Название"; + // + // labelPrice + // + labelPrice.AutoSize = true; + labelPrice.Location = new Point(26, 53); + labelPrice.Margin = new Padding(2, 0, 2, 0); + labelPrice.Name = "labelPrice"; + labelPrice.Size = new Size(90, 21); + labelPrice.TabIndex = 1; + labelPrice.Text = "Стоимость"; + // + // textBoxName + // + textBoxName.Location = new Point(124, 9); + textBoxName.Margin = new Padding(2, 3, 2, 3); + textBoxName.Name = "textBoxName"; + textBoxName.Size = new Size(261, 28); + textBoxName.TabIndex = 2; + // + // textBoxPrice + // + textBoxPrice.Enabled = false; + textBoxPrice.Location = new Point(124, 53); + textBoxPrice.Margin = new Padding(2, 3, 2, 3); + textBoxPrice.Name = "textBoxPrice"; + textBoxPrice.Size = new Size(261, 28); + textBoxPrice.TabIndex = 3; + // + // groupBoxComponents + // + groupBoxComponents.Controls.Add(buttonRefresh); + groupBoxComponents.Controls.Add(buttonDelete); + groupBoxComponents.Controls.Add(buttonUpdate); + groupBoxComponents.Controls.Add(buttonAdd); + groupBoxComponents.Controls.Add(dataGridView); + groupBoxComponents.Location = new Point(26, 94); + groupBoxComponents.Margin = new Padding(2, 3, 2, 3); + groupBoxComponents.Name = "groupBoxComponents"; + groupBoxComponents.Padding = new Padding(2, 3, 2, 3); + groupBoxComponents.Size = new Size(674, 396); + groupBoxComponents.TabIndex = 5; + groupBoxComponents.TabStop = false; + groupBoxComponents.Text = "Компоненты"; + // + // buttonRefresh + // + buttonRefresh.BackColor = Color.FromArgb(255, 192, 192); + buttonRefresh.Location = new Point(483, 330); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(127, 47); + buttonRefresh.TabIndex = 9; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = false; + buttonRefresh.Click += ButtonRef_Click; + // + // buttonDelete + // + buttonDelete.BackColor = Color.FromArgb(255, 192, 192); + buttonDelete.Location = new Point(483, 228); + buttonDelete.Name = "buttonDelete"; + buttonDelete.Size = new Size(127, 47); + buttonDelete.TabIndex = 8; + buttonDelete.Text = "Удалить"; + buttonDelete.UseVisualStyleBackColor = false; + buttonDelete.Click += ButtonDel_Click; + // + // buttonUpdate + // + buttonUpdate.BackColor = Color.FromArgb(255, 192, 192); + buttonUpdate.Location = new Point(483, 125); + buttonUpdate.Name = "buttonUpdate"; + buttonUpdate.Size = new Size(127, 47); + buttonUpdate.TabIndex = 7; + buttonUpdate.Text = "Изменить"; + buttonUpdate.UseVisualStyleBackColor = false; + buttonUpdate.Click += ButtonUpd_Click; + // + // buttonAdd + // + buttonAdd.BackColor = Color.FromArgb(255, 192, 192); + buttonAdd.Location = new Point(483, 27); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(127, 47); + buttonAdd.TabIndex = 6; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = false; + buttonAdd.Click += ButtonAdd_Click; + // + // dataGridView + // + dataGridView.AllowUserToResizeRows = false; + dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + dataGridView.BackgroundColor = Color.FromArgb(255, 192, 192); + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ColumnName, ColumnCount }); + dataGridView.Location = new Point(13, 27); + dataGridView.Margin = new Padding(2, 3, 2, 3); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersVisible = false; + dataGridView.RowHeadersWidth = 51; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(381, 350); + dataGridView.TabIndex = 5; + // + // ColumnId + // + ColumnId.HeaderText = "id"; + ColumnId.MinimumWidth = 6; + ColumnId.Name = "ColumnId"; + ColumnId.Visible = false; + ColumnId.Width = 125; + // + // ColumnName + // + ColumnName.HeaderText = "Компонент"; + ColumnName.MinimumWidth = 6; + ColumnName.Name = "ColumnName"; + ColumnName.Width = 124; + // + // ColumnCount + // + ColumnCount.HeaderText = "Количество"; + ColumnCount.MinimumWidth = 6; + ColumnCount.Name = "ColumnCount"; + ColumnCount.Width = 126; + // + // buttonSave + // + buttonSave.BackColor = Color.FromArgb(255, 192, 192); + buttonSave.Location = new Point(428, 521); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(127, 47); + buttonSave.TabIndex = 10; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = false; + buttonSave.Click += ButtonSave_Click; + // + // buttonCancel + // + buttonCancel.BackColor = Color.FromArgb(255, 192, 192); + buttonCancel.Location = new Point(572, 520); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(127, 47); + buttonCancel.TabIndex = 11; + buttonCancel.Text = "Отменить"; + buttonCancel.UseVisualStyleBackColor = false; + buttonCancel.Click += ButtonCancel_Click; + // + // FormSushi + // + AutoScaleDimensions = new SizeF(9F, 21F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.Cornsilk; + ClientSize = new Size(723, 580); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(groupBoxComponents); + Controls.Add(textBoxPrice); + Controls.Add(textBoxName); + Controls.Add(labelPrice); + Controls.Add(labelName); + Font = new Font("Candara", 10.2F, FontStyle.Regular, GraphicsUnit.Point, 204); + Margin = new Padding(3, 4, 3, 4); + Name = "FormSushi"; + Text = "FormSushi"; + Load += FormSushi_Load; + groupBoxComponents.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label labelName; + private Label labelPrice; + private TextBox textBoxName; + private TextBox textBoxPrice; + private GroupBox groupBoxComponents; + private Button buttonRefresh; + private Button buttonDelete; + private Button buttonUpdate; + private Button buttonAdd; + private DataGridView dataGridView; + private DataGridViewTextBoxColumn ColumnId; + private DataGridViewTextBoxColumn ColumnName; + private DataGridViewTextBoxColumn ColumnCount; + private Button buttonSave; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/SushiBar/FormSushi.cs b/SushiBar/FormSushi.cs new file mode 100644 index 0000000..05431e1 --- /dev/null +++ b/SushiBar/FormSushi.cs @@ -0,0 +1,207 @@ +using Microsoft.Extensions.Logging; +using SushiBar; +using SushiBarContracts.BindingModel; +using SushiBarContracts.BusinessLogicsContracts; +using SushiBarContracts.SearchModel; +using SushiBarDataModels.Models; + + +namespace SushiBarView +{ + public partial class FormSushi : Form + { + private readonly ILogger _logger; + private readonly ISushiLogic _logic; + private int? _id; + private Dictionary _sushiComponents; + public int Id { set { _id = value; } } + public FormSushi(ILogger logger, ISushiLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + _sushiComponents = new Dictionary(); + } + private void FormSushi_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + _logger.LogInformation("Загрузка изделия"); + try + { + var view = _logic.ReadElement(new SushiSearchModel + { + Id = _id.Value + }); + if (view != null) + { + textBoxName.Text = view.SushiName; + textBoxPrice.Text = view.Price.ToString(); + _sushiComponents = view.SushiComponents ?? new Dictionary(); + LoadData(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки изделия"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + private void LoadData() + { + _logger.LogInformation("Загрузка компонент изделия"); + try + { + if (_sushiComponents != null) + { + dataGridView.Rows.Clear(); + foreach (var pc in _sushiComponents) + { + dataGridView.Rows.Add(new object[] { pc.Key, pc.Value.Item1.ComponentName, pc.Value.Item2 }); + } + textBoxPrice.Text = CalcPrice().ToString(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки компонент изделия"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void ButtonAdd_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormSushiComponent)); + if (service is FormSushiComponent form) + { + if (form.ShowDialog() == DialogResult.OK) + { + if (form.ComponentModel == null) + { + return; + } + _logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count}", + form.ComponentModel.ComponentName, form.Count); + if (_sushiComponents.ContainsKey(form.Id)) + { + _sushiComponents[form.Id] = (form.ComponentModel, form.Count); + } + else + { + _sushiComponents.Add(form.Id, (form.ComponentModel, form.Count)); + } + LoadData(); + } + } + } + private void ButtonUpd_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormSushiComponent)); + if (service is FormSushiComponent form) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + form.Id = id; + form.Count = _sushiComponents[id].Item2; + if (form.ShowDialog() == DialogResult.OK) + { + if (form.ComponentModel == null) + { + return; + } + _logger.LogInformation("Изменение компонента: { ComponentName} - { Count} ", + form.ComponentModel.ComponentName, form.Count); + _sushiComponents[form.Id] = (form.ComponentModel, form.Count); + LoadData(); + } + } + } + } + private void ButtonDel_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", + MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + try + { + _logger.LogInformation("Удаление компонента: { ComponentName} - { Count}", + dataGridView.SelectedRows[0].Cells[1].Value); + _sushiComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value)); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + LoadData(); + } + } + } + private void ButtonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + private void ButtonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxName.Text)) + { + MessageBox.Show("Заполните название", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(textBoxPrice.Text)) + { + MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + return; + } + if (_sushiComponents == null || _sushiComponents.Count == 0) + { + MessageBox.Show("Заполните компоненты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение изделия"); + try + { + var model = new SushiBindingModel + { + Id = _id ?? 0, + SushiName = textBoxName.Text, + Price = Convert.ToDouble(textBoxPrice.Text), + SushiComponents = _sushiComponents + }; + 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(); + } + private double CalcPrice() + { + double price = 0; + foreach (var elem in _sushiComponents) + { + price += ((elem.Value.Item1?.Cost ?? 0) * elem.Value.Item2); + } + return Math.Round(price * 1.1, 2); + } + } +} diff --git a/SushiBar/FormSushi.resx b/SushiBar/FormSushi.resx new file mode 100644 index 0000000..fcacbcb --- /dev/null +++ b/SushiBar/FormSushi.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/SushiBar/FormSushiComponent.Designer.cs b/SushiBar/FormSushiComponent.Designer.cs new file mode 100644 index 0000000..b7aa03d --- /dev/null +++ b/SushiBar/FormSushiComponent.Designer.cs @@ -0,0 +1,137 @@ +namespace SushiBarView +{ + partial class FormSushiComponent + { + /// + /// 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() + { + labelComponent = new Label(); + labelCountComponent = new Label(); + buttonSave = new Button(); + textBoxComponentCount = new TextBox(); + comboBoxComponent = new ComboBox(); + buttonCancel = new Button(); + SuspendLayout(); + // + // labelComponent + // + labelComponent.AutoSize = true; + labelComponent.Location = new Point(35, 39); + labelComponent.Margin = new Padding(4, 0, 4, 0); + labelComponent.Name = "labelComponent"; + labelComponent.Size = new Size(107, 24); + labelComponent.TabIndex = 0; + labelComponent.Text = "Компонент"; + // + // labelCountComponent + // + labelCountComponent.AutoSize = true; + labelCountComponent.Location = new Point(35, 128); + labelCountComponent.Margin = new Padding(4, 0, 4, 0); + labelCountComponent.Name = "labelCountComponent"; + labelCountComponent.Size = new Size(112, 24); + labelCountComponent.TabIndex = 1; + labelCountComponent.Text = "Количество"; + // + // buttonSave + // + buttonSave.BackColor = Color.Green; + buttonSave.BackgroundImageLayout = ImageLayout.Center; + buttonSave.Cursor = Cursors.Hand; + buttonSave.ForeColor = SystemColors.ControlLightLight; + buttonSave.Location = new Point(205, 197); + buttonSave.Margin = new Padding(4); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(132, 54); + buttonSave.TabIndex = 2; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = false; + buttonSave.Click += ButtonSave_Click; + // + // textBoxComponentCount + // + textBoxComponentCount.Location = new Point(205, 125); + textBoxComponentCount.Margin = new Padding(4); + textBoxComponentCount.Name = "textBoxComponentCount"; + textBoxComponentCount.Size = new Size(293, 32); + textBoxComponentCount.TabIndex = 3; + // + // comboBoxComponent + // + comboBoxComponent.Cursor = Cursors.Hand; + comboBoxComponent.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxComponent.FormattingEnabled = true; + comboBoxComponent.Location = new Point(205, 36); + comboBoxComponent.Margin = new Padding(4); + comboBoxComponent.Name = "comboBoxComponent"; + comboBoxComponent.Size = new Size(293, 32); + comboBoxComponent.TabIndex = 4; + // + // buttonCancel + // + buttonCancel.BackColor = Color.Green; + buttonCancel.BackgroundImageLayout = ImageLayout.Center; + buttonCancel.Cursor = Cursors.Hand; + buttonCancel.ForeColor = SystemColors.ControlLightLight; + buttonCancel.Location = new Point(362, 197); + buttonCancel.Margin = new Padding(4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(136, 54); + buttonCancel.TabIndex = 5; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = false; + buttonCancel.Click += ButtonCancel_Click; + // + // FormSushiComponent + // + AutoScaleDimensions = new SizeF(11F, 24F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.FromArgb(210, 255, 200); + ClientSize = new Size(542, 280); + Controls.Add(buttonCancel); + Controls.Add(comboBoxComponent); + Controls.Add(textBoxComponentCount); + Controls.Add(buttonSave); + Controls.Add(labelCountComponent); + Controls.Add(labelComponent); + Font = new Font("Candara", 12F, FontStyle.Regular, GraphicsUnit.Point, 204); + Margin = new Padding(4); + Name = "FormSushiComponent"; + Text = "Компонент изделия"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label labelComponent; + private Label labelCountComponent; + private Button buttonSave; + private TextBox textBoxComponentCount; + private ComboBox comboBoxComponent; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/SushiBar/FormSushiComponent.cs b/SushiBar/FormSushiComponent.cs new file mode 100644 index 0000000..c7e8078 --- /dev/null +++ b/SushiBar/FormSushiComponent.cs @@ -0,0 +1,89 @@ +using SushiBarContracts.BusinessLogicsContracts; +using SushiBarContracts.ViewModels; +using SushiBarDataModels.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 SushiBarView +{ + public partial class FormSushiComponent : Form + { + private readonly List? _list; + public int Id + { + get + { + return Convert.ToInt32(comboBoxComponent.SelectedValue); + } + set + { + comboBoxComponent.SelectedValue = value; + } + } + public IComponentModel? ComponentModel + { + get + { + if (_list == null) + { + return null; + } + foreach (var elem in _list) + { + if (elem.Id == Id) + { + return elem; + } + } + return null; + } + } + public int Count + { + get { return Convert.ToInt32(textBoxComponentCount.Text); } + set + { textBoxComponentCount.Text = value.ToString(); } + } + public FormSushiComponent(IComponentLogic logic) + { + InitializeComponent(); + _list = logic.ReadList(null); + if (_list != null) + { + comboBoxComponent.DisplayMember = "ComponentName"; + comboBoxComponent.ValueMember = "Id"; + comboBoxComponent.DataSource = _list; + comboBoxComponent.SelectedItem = null; + } + } + private void ButtonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxComponentCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxComponent.SelectedValue == null) + { + MessageBox.Show("Выберите компонент", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + DialogResult = DialogResult.OK; + Close(); + } + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/SushiBar/FormSushiComponent.resx b/SushiBar/FormSushiComponent.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/SushiBar/FormSushiComponent.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SushiBar/Program.cs b/SushiBar/Program.cs index 402417b..1999b64 100644 --- a/SushiBar/Program.cs +++ b/SushiBar/Program.cs @@ -1,7 +1,20 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using NLog.Extensions.Logging; +using SushiBarBusinessLogic.BusinessLogic; +using SushiBarContracts.BusinessLogicsContracts; +using SushiBarContracts.StoragesContracts; +using SushiBarListImplement.Implements; +using SushiBarView; + namespace SushiBar { internal static class Program { + + private static ServiceProvider? _serviceProvider; + public static ServiceProvider? ServiceProvider => _serviceProvider; + /// /// The main entry point for the application. /// @@ -11,7 +24,33 @@ namespace SushiBar // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new Form1()); + var services = new ServiceCollection(); + ConfigureServices(services); + _serviceProvider = services.BuildServiceProvider(); + //Application.Run(_serviceProvider.GetRequiredService()); + //Application.Run(new Form1()); + } + + private static void ConfigureServices(ServiceCollection services) + { + services.AddLogging(option => + { + option.SetMinimumLevel(LogLevel.Information); + option.AddNLog("nlog.config"); + }); + 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/SushiBar/Properties/Resources.Designer.cs b/SushiBar/Properties/Resources.Designer.cs new file mode 100644 index 0000000..615ff0d --- /dev/null +++ b/SushiBar/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +namespace SushiBarView.Properties { + using System; + + + /// + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. + /// + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SushiBarView.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/SushiBar/Form1.resx b/SushiBar/Properties/Resources.resx similarity index 100% rename from SushiBar/Form1.resx rename to SushiBar/Properties/Resources.resx diff --git a/SushiBar/SushiBar.csproj b/SushiBar/SushiBar.csproj deleted file mode 100644 index 1977ad4..0000000 --- a/SushiBar/SushiBar.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - WinExe - net8.0-windows - enable - true - enable - - - - - - - - - \ No newline at end of file diff --git a/SushiBar/SushiBar.sln b/SushiBar/SushiBar.sln index 9693d30..d4c455e 100644 --- a/SushiBar/SushiBar.sln +++ b/SushiBar/SushiBar.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.8.34525.116 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBar", "SushiBar.csproj", "{57C61C1C-B600-41E0-BEAC-667A8FC14F8C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarView", "SushiBarView.csproj", "{57C61C1C-B600-41E0-BEAC-667A8FC14F8C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SushiBarDataModels", "..\ClassLibrary1SushiBarDataModels\SushiBarDataModels.csproj", "{AEC2E098-CC1B-44E3-BF4F-6532E6712317}" EndProject diff --git a/SushiBar/SushiBarView.csproj b/SushiBar/SushiBarView.csproj new file mode 100644 index 0000000..4a36d5f --- /dev/null +++ b/SushiBar/SushiBarView.csproj @@ -0,0 +1,55 @@ + + + + WinExe + net8.0-windows + enable + true + enable + + + + + + + + + + + + + + + Always + + + + + + + + + + + + + + + + + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + \ No newline at end of file diff --git a/SushiBar/nlog.config b/SushiBar/nlog.config new file mode 100644 index 0000000..cf12ddf --- /dev/null +++ b/SushiBar/nlog.config @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SushiBarListImplement/OrderStorage.cs b/SushiBarListImplement/OrderStorage.cs new file mode 100644 index 0000000..40ecf53 --- /dev/null +++ b/SushiBarListImplement/OrderStorage.cs @@ -0,0 +1,121 @@ +using SushiBarContracts.BindingModel; +using SushiBarContracts.SearchModel; +using SushiBarContracts.StoragesContracts; +using SushiBarContracts.ViewModels; +using SushiBarListImplement.Models; + +namespace SushiBarListImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + private DataListSingleton _source; + + public OrderStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public List GetFullList() + { + var result = new List(); + foreach (var order in _source.Orders) + { + result.Add(AddSushiName(order.GetViewModel)); + } + return result; + } + + public List GetFilteredList(OrderSearchModel model) + { + var result = new List(); + if (model == null || !model.Id.HasValue) + { + return result; + } + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + result.Add(order.GetViewModel); + } + } + return result; + } + + public OrderViewModel? GetElement(OrderSearchModel model) + { + if(!model.Id.HasValue) + { + return null; + } + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + return AddSushiName(order.GetViewModel); + } + } + return null; + } + + public OrderViewModel? Insert(OrderBindingModel model) + { + model.Id = 1; + foreach (var order in _source.Orders) + { + if (model.Id <= order.Id) + { + model.Id = order.Id + 1; + } + } + + var newOrder = Order.Create(model); + if (newOrder == null) + { + return null; + } + _source.Orders.Add(newOrder); + return AddSushiName(newOrder.GetViewModel); + } + + public OrderViewModel? Update(OrderBindingModel model) + { + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + order.Update(model); + return AddSushiName(order.GetViewModel); + } + } + return null; + } + + public OrderViewModel? Delete(OrderBindingModel model) + { + for (int i = 0; i < _source.Orders.Count; ++i) + { + if (_source.Orders[i].Id == model.Id) + { + var element = _source.Orders[i]; + _source.Orders.RemoveAt(i); + return AddSushiName(element.GetViewModel); + } + } + return null; + } + + private OrderViewModel AddSushiName(OrderViewModel model) + { + foreach (var sushi in _source.Sushis) + { + if (sushi.Id == model.SushiId) + { + model.SushiName = sushi.SushiName; + return model; + } + } + return model; + } + } +} diff --git a/SushiBarListImplement/SushiStorage.cs b/SushiBarListImplement/SushiStorage.cs index bd11438..2c0261e 100644 --- a/SushiBarListImplement/SushiStorage.cs +++ b/SushiBarListImplement/SushiStorage.cs @@ -18,9 +18,9 @@ namespace SushiBarListImplement.Implements public List GetFullList() { var result = new List(); - foreach (var component in _source.Sushis) + foreach (var order in _source.Sushis) { - result.Add(component.GetViewModel); + result.Add(order.GetViewModel); } return result; } diff --git a/SushiBarView/SushiBarView.csproj b/SushiBarView/SushiBarView.csproj new file mode 100644 index 0000000..fa71b7a --- /dev/null +++ b/SushiBarView/SushiBarView.csproj @@ -0,0 +1,9 @@ + + + + net8.0 + enable + enable + + +