diff --git a/SushiBar/FormClients.cs b/SushiBar/FormClients.cs index 3887657..09cc9d0 100644 --- a/SushiBar/FormClients.cs +++ b/SushiBar/FormClients.cs @@ -17,7 +17,6 @@ namespace SushiBarView { private readonly ILogger _logger; private readonly IClientLogic _clientLogic; - public FormClients(ILogger logger, IClientLogic logic) { _logger = logger; diff --git a/SushiBar/FormImplementer.Designer.cs b/SushiBar/FormImplementer.Designer.cs new file mode 100644 index 0000000..dd38fff --- /dev/null +++ b/SushiBar/FormImplementer.Designer.cs @@ -0,0 +1,175 @@ +namespace SushiBarView +{ + partial class FormImplementer + { + /// + /// 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() + { + labelFIO = new Label(); + labelPassword = new Label(); + labelExperience = new Label(); + labelQualification = new Label(); + textBoxFIO = new TextBox(); + textBoxPassword = new TextBox(); + numericUpDownExperience = new NumericUpDown(); + numericUpDownQualification = new NumericUpDown(); + buttonSave = new Button(); + buttonCancel = new Button(); + ((System.ComponentModel.ISupportInitialize)numericUpDownExperience).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownQualification).BeginInit(); + SuspendLayout(); + // + // labelFIO + // + labelFIO.AutoSize = true; + labelFIO.Location = new Point(0, 8); + labelFIO.Margin = new Padding(4, 0, 4, 0); + labelFIO.Name = "labelFIO"; + labelFIO.Size = new Size(150, 22); + labelFIO.TabIndex = 0; + labelFIO.Text = "ФИО исполнителя"; + // + // labelPassword + // + labelPassword.AutoSize = true; + labelPassword.Location = new Point(0, 73); + labelPassword.Margin = new Padding(4, 0, 4, 0); + labelPassword.Name = "labelPassword"; + labelPassword.Size = new Size(67, 22); + labelPassword.TabIndex = 1; + labelPassword.Text = "Пароль"; + // + // labelExperience + // + labelExperience.AutoSize = true; + labelExperience.Location = new Point(0, 152); + labelExperience.Margin = new Padding(4, 0, 4, 0); + labelExperience.Name = "labelExperience"; + labelExperience.Size = new Size(114, 22); + labelExperience.TabIndex = 2; + labelExperience.Text = "Опыт работы"; + // + // labelQualification + // + labelQualification.AutoSize = true; + labelQualification.Location = new Point(0, 226); + labelQualification.Margin = new Padding(4, 0, 4, 0); + labelQualification.Name = "labelQualification"; + labelQualification.Size = new Size(127, 22); + labelQualification.TabIndex = 3; + labelQualification.Text = "Квалификация"; + // + // textBoxFIO + // + textBoxFIO.Location = new Point(243, 5); + textBoxFIO.Name = "textBoxFIO"; + textBoxFIO.Size = new Size(317, 29); + textBoxFIO.TabIndex = 4; + // + // textBoxPassword + // + textBoxPassword.Location = new Point(243, 73); + textBoxPassword.Name = "textBoxPassword"; + textBoxPassword.Size = new Size(317, 29); + textBoxPassword.TabIndex = 5; + // + // numericUpDownExperience + // + numericUpDownExperience.Location = new Point(243, 145); + numericUpDownExperience.Name = "numericUpDownExperience"; + numericUpDownExperience.Size = new Size(317, 29); + numericUpDownExperience.TabIndex = 6; + // + // numericUpDownQualification + // + numericUpDownQualification.Location = new Point(243, 219); + numericUpDownQualification.Name = "numericUpDownQualification"; + numericUpDownQualification.Size = new Size(317, 29); + numericUpDownQualification.TabIndex = 7; + // + // buttonSave + // + buttonSave.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonSave.Location = new Point(10, 342); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(140, 53); + buttonSave.TabIndex = 8; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; + // + // buttonCancel + // + buttonCancel.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonCancel.Location = new Point(427, 342); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(140, 53); + buttonCancel.TabIndex = 9; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; + // + // FormImplementer + // + AutoScaleDimensions = new SizeF(10F, 22F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = SystemColors.GradientInactiveCaption; + ClientSize = new Size(579, 407); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(numericUpDownQualification); + Controls.Add(numericUpDownExperience); + Controls.Add(textBoxPassword); + Controls.Add(textBoxFIO); + Controls.Add(labelQualification); + Controls.Add(labelExperience); + Controls.Add(labelPassword); + Controls.Add(labelFIO); + Font = new Font("Candara", 10.8F, FontStyle.Regular, GraphicsUnit.Point, 204); + Margin = new Padding(4, 3, 4, 3); + Name = "FormImplementer"; + Text = "Исполнитель"; + Load += FormImplementer_Load; + ((System.ComponentModel.ISupportInitialize)numericUpDownExperience).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownQualification).EndInit(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label labelFIO; + private Label labelPassword; + private Label labelExperience; + private Label labelQualification; + private TextBox textBoxFIO; + private TextBox textBoxPassword; + private NumericUpDown numericUpDownExperience; + private NumericUpDown numericUpDownQualification; + private Button buttonSave; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/SushiBar/FormImplementer.cs b/SushiBar/FormImplementer.cs new file mode 100644 index 0000000..999ddea --- /dev/null +++ b/SushiBar/FormImplementer.cs @@ -0,0 +1,101 @@ +using Microsoft.Extensions.Logging; +using SushiBarContracts.BindingModel; +using SushiBarContracts.BusinessLogicsContracts; +using SushiBarContracts.SearchModel; +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 FormImplementer : Form + { + private readonly ILogger _logger; + private readonly IImplementerLogic _implementerLogic; + private int? _id; + public int Id { set { _id = value; } } + public FormImplementer(ILogger logger, IImplementerLogic implementerLogic) + { + InitializeComponent(); + _logger = logger; + _implementerLogic = implementerLogic; + } + + private void buttonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxPassword.Text)) + { + MessageBox.Show("Заполните пароль", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(textBoxFIO.Text)) + { + MessageBox.Show("Заполните ФИО", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение исполнителя"); + try + { + var model = new ImplementerBindingModel + { + Id = _id ?? 0, + ImplementerFIO = textBoxFIO.Text, + Password = textBoxPassword.Text, + Qualification = (int)numericUpDownQualification.Value, + WorkExperience = (int)numericUpDownExperience.Value, + }; + var operationResult = _id.HasValue ? _implementerLogic.Update(model) : _implementerLogic.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 FormImplementer_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + try + { + _logger.LogInformation("Получение информации исполнителя"); + var view = _implementerLogic.ReadElement(new ImplementerSearchModel + { + Id = _id.Value + }); + if (view != null) + { + textBoxFIO.Text = view.ImplementerFIO; + textBoxPassword.Text = view.Password; + numericUpDownQualification.Value = view.Qualification; + numericUpDownExperience.Value = view.WorkExperience; + } + } + 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/FormImplementer.resx b/SushiBar/FormImplementer.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/SushiBar/FormImplementer.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/FormImplementers.Designer.cs b/SushiBar/FormImplementers.Designer.cs new file mode 100644 index 0000000..5552cf1 --- /dev/null +++ b/SushiBar/FormImplementers.Designer.cs @@ -0,0 +1,125 @@ +namespace SushiBarView +{ + partial class FormImplementers + { + /// + /// 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.BackgroundColor = Color.Plum; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Dock = DockStyle.Left; + dataGridView.Location = new Point(0, 0); + dataGridView.Margin = new Padding(4, 3, 4, 3); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersVisible = false; + dataGridView.RowHeadersWidth = 51; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(731, 495); + dataGridView.TabIndex = 1; + // + // buttonAdd + // + buttonAdd.Location = new Point(801, 34); + buttonAdd.Margin = new Padding(4, 3, 4, 3); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(158, 56); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; + // + // buttonUpdate + // + buttonUpdate.Location = new Point(801, 160); + buttonUpdate.Margin = new Padding(4, 3, 4, 3); + buttonUpdate.Name = "buttonUpdate"; + buttonUpdate.Size = new Size(158, 56); + buttonUpdate.TabIndex = 3; + buttonUpdate.Text = "Изменить"; + buttonUpdate.UseVisualStyleBackColor = true; + buttonUpdate.Click += buttonUpdate_Click; + // + // buttonDelete + // + buttonDelete.Location = new Point(801, 282); + buttonDelete.Margin = new Padding(4, 3, 4, 3); + buttonDelete.Name = "buttonDelete"; + buttonDelete.Size = new Size(158, 56); + buttonDelete.TabIndex = 4; + buttonDelete.Text = "Удалить"; + buttonDelete.UseVisualStyleBackColor = true; + buttonDelete.Click += buttonDelete_Click; + // + // buttonRefresh + // + buttonRefresh.Location = new Point(801, 407); + buttonRefresh.Margin = new Padding(4, 3, 4, 3); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(158, 56); + buttonRefresh.TabIndex = 5; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += buttonRefresh_Click; + // + // FormImplementers + // + AutoScaleDimensions = new SizeF(10F, 22F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.MediumOrchid; + ClientSize = new Size(1000, 495); + Controls.Add(buttonRefresh); + Controls.Add(buttonDelete); + Controls.Add(buttonUpdate); + Controls.Add(buttonAdd); + Controls.Add(dataGridView); + Font = new Font("Candara", 10.8F, FontStyle.Regular, GraphicsUnit.Point, 204); + Margin = new Padding(4, 3, 4, 3); + Name = "FormImplementers"; + Text = "Исполнители"; + Load += FormImplementers_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/SushiBar/FormImplementers.cs b/SushiBar/FormImplementers.cs new file mode 100644 index 0000000..95d8ff5 --- /dev/null +++ b/SushiBar/FormImplementers.cs @@ -0,0 +1,115 @@ +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 FormImplementers : Form + { + private readonly ILogger _logger; + private readonly IImplementerLogic _logic; + + public FormImplementers(ILogger logger, IImplementerLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void buttonAdd_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); + if (service is FormImplementer form) + { + form.ShowDialog(); + } + } + + private void buttonUpdate_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); + if (service is FormImplementer form) + { + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + + private void LoadData() + { + + try + { + var list = _logic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["Id"].Visible = false; + dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка исполнителей"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки исполнителей"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + + } + + private void FormImplementers_Load(object sender, EventArgs e) + { + LoadData(); + } + + private void buttonDelete_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Удаление исполнителя"); + try + { + if (!_logic.Delete(new ImplementerBindingModel + { + Id = id + })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка удаления исполнителя"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + + private void buttonRefresh_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/SushiBar/FormImplementers.resx b/SushiBar/FormImplementers.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/SushiBar/FormImplementers.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/FormMain.Designer.cs b/SushiBar/FormMain.Designer.cs index 1d71b0e..1281eb5 100644 --- a/SushiBar/FormMain.Designer.cs +++ b/SushiBar/FormMain.Designer.cs @@ -37,10 +37,10 @@ компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem(); списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); клиентыToolStripMenuItem = new ToolStripMenuItem(); + исполнителиToolStripMenuItem = new ToolStripMenuItem(); + запускРаботToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); buttonCreateOrder = new Button(); - buttonTakeOrderInWork = new Button(); - buttonOrderReady = new Button(); buttonOrderIssued = new Button(); buttonRefreshOrders = new Button(); menuStrip1.SuspendLayout(); @@ -50,7 +50,7 @@ // menuStrip1 // menuStrip1.ImageScalingSize = new Size(20, 20); - menuStrip1.Items.AddRange(new ToolStripItem[] { ToolStripMenuItemRef, отчетыToolStripMenuItem, клиентыToolStripMenuItem }); + menuStrip1.Items.AddRange(new ToolStripItem[] { ToolStripMenuItemRef, отчетыToolStripMenuItem, клиентыToolStripMenuItem, исполнителиToolStripMenuItem, запускРаботToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; menuStrip1.Size = new Size(1268, 28); @@ -113,6 +113,19 @@ клиентыToolStripMenuItem.Text = "Клиенты"; клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click; // + // исполнителиToolStripMenuItem + // + исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; + исполнителиToolStripMenuItem.Size = new Size(116, 24); + исполнителиToolStripMenuItem.Text = "Исполнители"; + исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click; + // + // запускРаботToolStripMenuItem + // + запускРаботToolStripMenuItem.Name = "запускРаботToolStripMenuItem"; + запускРаботToolStripMenuItem.Size = new Size(114, 24); + запускРаботToolStripMenuItem.Text = "Запуск работ"; + // // dataGridView // dataGridView.BackgroundColor = Color.White; @@ -123,12 +136,13 @@ dataGridView.RowHeadersVisible = false; dataGridView.RowHeadersWidth = 51; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView.Size = new Size(1001, 512); + dataGridView.Size = new Size(1001, 328); dataGridView.TabIndex = 1; // // buttonCreateOrder // - buttonCreateOrder.Location = new Point(1054, 62); + buttonCreateOrder.Anchor = AnchorStyles.Top; + buttonCreateOrder.Location = new Point(1054, 65); buttonCreateOrder.Name = "buttonCreateOrder"; buttonCreateOrder.Size = new Size(171, 52); buttonCreateOrder.TabIndex = 2; @@ -136,29 +150,10 @@ buttonCreateOrder.UseVisualStyleBackColor = true; buttonCreateOrder.Click += buttonCreateOrder_Click; // - // buttonTakeOrderInWork - // - buttonTakeOrderInWork.Location = new Point(1054, 160); - buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; - buttonTakeOrderInWork.Size = new Size(171, 52); - buttonTakeOrderInWork.TabIndex = 3; - buttonTakeOrderInWork.Text = "Отдать на выполнение"; - buttonTakeOrderInWork.UseVisualStyleBackColor = true; - buttonTakeOrderInWork.Click += buttonTakeOrderInWork_Click_1; - // - // buttonOrderReady - // - buttonOrderReady.Location = new Point(1054, 252); - buttonOrderReady.Name = "buttonOrderReady"; - buttonOrderReady.Size = new Size(171, 52); - buttonOrderReady.TabIndex = 4; - buttonOrderReady.Text = "Заказ готов"; - buttonOrderReady.UseVisualStyleBackColor = true; - buttonOrderReady.Click += buttonOrderReady_Click_1; - // // buttonOrderIssued // - buttonOrderIssued.Location = new Point(1054, 350); + buttonOrderIssued.Anchor = AnchorStyles.Bottom; + buttonOrderIssued.Location = new Point(1054, 170); buttonOrderIssued.Name = "buttonOrderIssued"; buttonOrderIssued.Size = new Size(171, 52); buttonOrderIssued.TabIndex = 5; @@ -168,7 +163,8 @@ // // buttonRefreshOrders // - buttonRefreshOrders.Location = new Point(1054, 449); + buttonRefreshOrders.Anchor = AnchorStyles.Bottom; + buttonRefreshOrders.Location = new Point(1054, 274); buttonRefreshOrders.Name = "buttonRefreshOrders"; buttonRefreshOrders.Size = new Size(171, 52); buttonRefreshOrders.TabIndex = 6; @@ -181,11 +177,9 @@ AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; BackColor = Color.FromArgb(210, 255, 210); - ClientSize = new Size(1268, 540); + ClientSize = new Size(1268, 356); Controls.Add(buttonRefreshOrders); Controls.Add(buttonOrderIssued); - Controls.Add(buttonOrderReady); - Controls.Add(buttonTakeOrderInWork); Controls.Add(buttonCreateOrder); Controls.Add(dataGridView); Controls.Add(menuStrip1); @@ -206,8 +200,6 @@ private ToolStripMenuItem ToolStripMenuItemRef; private DataGridView dataGridView; private Button buttonCreateOrder; - private Button buttonTakeOrderInWork; - private Button buttonOrderReady; private Button buttonOrderIssued; private Button buttonRefreshOrders; private ToolStripMenuItem компонентыToolStripMenuItem; @@ -217,5 +209,7 @@ private ToolStripMenuItem компонентыПоИзделиямToolStripMenuItem; private ToolStripMenuItem списокЗаказовToolStripMenuItem; private ToolStripMenuItem клиентыToolStripMenuItem; + private ToolStripMenuItem исполнителиToolStripMenuItem; + private ToolStripMenuItem запускРаботToolStripMenuItem; } } \ No newline at end of file diff --git a/SushiBar/FormMain.cs b/SushiBar/FormMain.cs index 1ae3904..e60a512 100644 --- a/SushiBar/FormMain.cs +++ b/SushiBar/FormMain.cs @@ -35,6 +35,8 @@ namespace SushiBarView dataGridView.Columns["SushiName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; dataGridView.Columns["ClientId"].Visible = false; dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + dataGridView.Columns["ImplementerId"].Visible = false; + dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } _logger.LogInformation("Загрузка заказов"); } @@ -179,7 +181,16 @@ namespace SushiBarView private void клиентыToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormClients)); - if(service is FormClients form) + if (service is FormClients form) + { + form.ShowDialog(); + } + } + + private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); + if (service is FormImplementers form) { form.ShowDialog(); } diff --git a/SushiBar/Program.cs b/SushiBar/Program.cs index 1a4cf40..a759ab1 100644 --- a/SushiBar/Program.cs +++ b/SushiBar/Program.cs @@ -49,12 +49,14 @@ namespace SushiBar services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -70,6 +72,8 @@ namespace SushiBar services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } }