From f15280cae588402d3560ea4dbace67447ddf2e9e Mon Sep 17 00:00:00 2001 From: Sergey Kozyrev Date: Thu, 18 Apr 2024 23:00:19 +0400 Subject: [PATCH] check --- .../Implements/ImplementStorage.cs | 2 +- .../SewingDressesView/MainForm.Designer.cs | 28 +++++++++++++++---- SewingDresses/SewingDressesView/MainForm.cs | 15 ++++++++-- SewingDresses/SewingDressesView/Program.cs | 1 + 4 files changed, 36 insertions(+), 10 deletions(-) diff --git a/SewingDresses/SewingDressesDatabaseImplement/Implements/ImplementStorage.cs b/SewingDresses/SewingDressesDatabaseImplement/Implements/ImplementStorage.cs index 81a1396..7683b04 100644 --- a/SewingDresses/SewingDressesDatabaseImplement/Implements/ImplementStorage.cs +++ b/SewingDresses/SewingDressesDatabaseImplement/Implements/ImplementStorage.cs @@ -48,7 +48,7 @@ namespace SewingDressesDatabaseImplement.Implements if (string.IsNullOrEmpty(model.ImplementFIO) && !model.Id.HasValue) return null; using var context = new SewingDressesDatabase(); - return context.Implements.FirstOrDefault(x => !(string.IsNullOrEmpty(model.ImplementFIO) && x.ImplementFIO.Contains(model.ImplementFIO)) || (model.Id.HasValue && model.Id == x.Id))?.GetViewModel; + return context.Implements.FirstOrDefault(x => (string.IsNullOrEmpty(model.ImplementFIO) || x.ImplementFIO.Equals(model.ImplementFIO)) && (!model.Id.HasValue && model.Id == x.Id))?.GetViewModel; } public List GetFullList() { diff --git a/SewingDresses/SewingDressesView/MainForm.Designer.cs b/SewingDresses/SewingDressesView/MainForm.Designer.cs index 431d392..bcd9258 100644 --- a/SewingDresses/SewingDressesView/MainForm.Designer.cs +++ b/SewingDresses/SewingDressesView/MainForm.Designer.cs @@ -42,6 +42,8 @@ DressesReportToolStripMenuItem = new ToolStripMenuItem(); компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem(); списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); + toolStripMenuItem1 = new ToolStripMenuItem(); + запускРаботToolStripMenuItem = new ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); menuStrip1.SuspendLayout(); SuspendLayout(); @@ -89,7 +91,7 @@ // menuStrip1 // menuStrip1.ImageScalingSize = new Size(20, 20); - menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem }); + menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, toolStripMenuItem1, запускРаботToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; menuStrip1.Size = new Size(1096, 28); @@ -106,30 +108,30 @@ // компонентыToolStripMenuItem // компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(224, 26); + компонентыToolStripMenuItem.Size = new Size(185, 26); компонентыToolStripMenuItem.Text = "Компоненты"; компонентыToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click; // // платьяToolStripMenuItem // платьяToolStripMenuItem.Name = "платьяToolStripMenuItem"; - платьяToolStripMenuItem.Size = new Size(224, 26); + платьяToolStripMenuItem.Size = new Size(185, 26); платьяToolStripMenuItem.Text = "Платья"; платьяToolStripMenuItem.Click += DressesToolStripMenuItem_Click; // // clientsToolStripMenuItem // clientsToolStripMenuItem.Name = "clientsToolStripMenuItem"; - clientsToolStripMenuItem.Size = new Size(224, 26); + clientsToolStripMenuItem.Size = new Size(185, 26); clientsToolStripMenuItem.Text = "Клиенты"; clientsToolStripMenuItem.Click += clientsToolStripMenuItem_Click; // // исполнителиToolStripMenuItem // исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; - исполнителиToolStripMenuItem.Size = new Size(224, 26); + исполнителиToolStripMenuItem.Size = new Size(185, 26); исполнителиToolStripMenuItem.Text = "Исполнители"; - исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click; + исполнителиToolStripMenuItem.Click += ImplementToolStripMenuItem_Click; // // отчетыToolStripMenuItem // @@ -159,6 +161,18 @@ списокЗаказовToolStripMenuItem.Text = "Список заказов"; списокЗаказовToolStripMenuItem.Click += OrdersToolStripMenuItemReport_Click; // + // toolStripMenuItem1 + // + toolStripMenuItem1.Name = "toolStripMenuItem1"; + toolStripMenuItem1.Size = new Size(14, 24); + // + // запускРаботToolStripMenuItem + // + запускРаботToolStripMenuItem.Name = "запускРаботToolStripMenuItem"; + запускРаботToolStripMenuItem.Size = new Size(114, 24); + запускРаботToolStripMenuItem.Text = "Запуск работ"; + запускРаботToolStripMenuItem.Click += запускРаботToolStripMenuItem_Click; + // // MainForm // AutoScaleDimensions = new SizeF(8F, 20F); @@ -196,5 +210,7 @@ private ToolStripMenuItem списокЗаказовToolStripMenuItem; private ToolStripMenuItem clientsToolStripMenuItem; private ToolStripMenuItem исполнителиToolStripMenuItem; + private ToolStripMenuItem toolStripMenuItem1; + private ToolStripMenuItem запускРаботToolStripMenuItem; } } \ No newline at end of file diff --git a/SewingDresses/SewingDressesView/MainForm.cs b/SewingDresses/SewingDressesView/MainForm.cs index c0f38ff..ad966dd 100644 --- a/SewingDresses/SewingDressesView/MainForm.cs +++ b/SewingDresses/SewingDressesView/MainForm.cs @@ -11,12 +11,14 @@ namespace SewingDressesView private readonly ILogger _logger; private readonly IOrderLogic _orderLogic; private readonly IReportLogic _reportLogic; - public MainForm(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic) + private readonly IWorkProcess _workProcess; + public MainForm(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess) { InitializeComponent(); _logger = logger; _orderLogic = orderLogic; _reportLogic = reportLogic; + _workProcess = workProcess; } private void LoadData() { @@ -139,13 +141,20 @@ namespace SewingDressesView } } - private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e) + private void ImplementToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(ClientsForm)); + var service = Program.ServiceProvider?.GetService(typeof(ImplementsForm)); if (service is ImplementsForm form) { form.ShowDialog(); } } + + private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e) + { + _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementLogic)) as IImplementLogic)!, _orderLogic); + MessageBox.Show("Процесс обработки запущен", "Сообщение", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } } } diff --git a/SewingDresses/SewingDressesView/Program.cs b/SewingDresses/SewingDressesView/Program.cs index fe669f0..4352870 100644 --- a/SewingDresses/SewingDressesView/Program.cs +++ b/SewingDresses/SewingDressesView/Program.cs @@ -42,6 +42,7 @@ namespace SewingDressesView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient();