From 633f4a0aca17e4feb3568f50ad004365911145e7 Mon Sep 17 00:00:00 2001 From: antoc0der <1@DESKTOP-K1L8ND3> Date: Sun, 19 May 2024 16:59:59 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BD=D1=83=D0=B6=D0=BD=D1=8B=D0=B5=20=D0=B2?= =?UTF-8?q?=D0=B5=D1=89=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FlowerShopDatabaseImplement/OrderStorage.cs | 4 ++- FlowerShopDatabaseImplement/Shop.cs | 4 +-- ProjectFlowerShop/MainForm.Designer.cs | 32 ++++++++++----------- ProjectFlowerShop/MainForm.cs | 1 + 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/FlowerShopDatabaseImplement/OrderStorage.cs b/FlowerShopDatabaseImplement/OrderStorage.cs index 17a593f..c321b49 100644 --- a/FlowerShopDatabaseImplement/OrderStorage.cs +++ b/FlowerShopDatabaseImplement/OrderStorage.cs @@ -29,7 +29,9 @@ namespace FlowerShopDatabaseImplement.Implements .Where(x => ((!model.Id.HasValue || x.Id == model.Id) && (!model.DateFrom.HasValue || x.DateCreate >= model.DateFrom) && (!model.DateTo.HasValue || x.DateCreate <= model.DateTo) && - (!model.ClientId.HasValue || x.ClientId == model.ClientId))) + (!model.ClientId.HasValue || x.ClientId == model.ClientId)&& + (!model.Status.HasValue || x.Status == model.Status) + )) .Select(x => x.GetViewModel) .ToList(); } diff --git a/FlowerShopDatabaseImplement/Shop.cs b/FlowerShopDatabaseImplement/Shop.cs index cf7ff97..ff71ea3 100644 --- a/FlowerShopDatabaseImplement/Shop.cs +++ b/FlowerShopDatabaseImplement/Shop.cs @@ -15,9 +15,9 @@ namespace FlowerShopDatabaseImplement.Models { public int Id { get; private set; } [Required] - public string ShopName { get; private set; } + public string ShopName { get; private set; } = String.Empty; [Required] - public string Address { get; private set; } + public string Address { get; private set; } = String.Empty; [Required] public DateTime DateOpen { get; private set; } [Required] diff --git a/ProjectFlowerShop/MainForm.Designer.cs b/ProjectFlowerShop/MainForm.Designer.cs index 0482b48..5b02d9a 100644 --- a/ProjectFlowerShop/MainForm.Designer.cs +++ b/ProjectFlowerShop/MainForm.Designer.cs @@ -61,7 +61,7 @@ menuStrip1.Items.AddRange(new ToolStripItem[] { ToolStripMenu, отчетыToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; - menuStrip1.Size = new Size(1296, 28); + menuStrip1.Size = new Size(1414, 28); menuStrip1.TabIndex = 0; menuStrip1.Text = "menuStrip1"; // @@ -75,56 +75,56 @@ // клиентыToolStripMenuItem // клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem"; - клиентыToolStripMenuItem.Size = new Size(224, 26); + клиентыToolStripMenuItem.Size = new Size(193, 26); клиентыToolStripMenuItem.Text = "Клиенты"; клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click; // // КомпонентыStripMenuItem // КомпонентыStripMenuItem.Name = "КомпонентыStripMenuItem"; - КомпонентыStripMenuItem.Size = new Size(224, 26); + КомпонентыStripMenuItem.Size = new Size(193, 26); КомпонентыStripMenuItem.Text = "Компоненты"; КомпонентыStripMenuItem.Click += КомпонентыStripMenuItem_Click; // // ЦветыStripMenuItem // ЦветыStripMenuItem.Name = "ЦветыStripMenuItem"; - ЦветыStripMenuItem.Size = new Size(224, 26); + ЦветыStripMenuItem.Size = new Size(193, 26); ЦветыStripMenuItem.Text = "Цветы"; ЦветыStripMenuItem.Click += ЦветыStripMenuItem_Click; // // магазиныToolStripMenuItem // магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; - магазиныToolStripMenuItem.Size = new Size(224, 26); + магазиныToolStripMenuItem.Size = new Size(193, 26); магазиныToolStripMenuItem.Text = "Магазины"; магазиныToolStripMenuItem.Click += магазиныToolStripMenuItem_Click; // // поставкиToolStripMenuItem // поставкиToolStripMenuItem.Name = "поставкиToolStripMenuItem"; - поставкиToolStripMenuItem.Size = new Size(224, 26); + поставкиToolStripMenuItem.Size = new Size(193, 26); поставкиToolStripMenuItem.Text = "Поставки"; поставкиToolStripMenuItem.Click += поставкиToolStripMenuItem_Click; // // продажиToolStripMenuItem // продажиToolStripMenuItem.Name = "продажиToolStripMenuItem"; - продажиToolStripMenuItem.Size = new Size(224, 26); + продажиToolStripMenuItem.Size = new Size(193, 26); продажиToolStripMenuItem.Text = "Продажи"; продажиToolStripMenuItem.Click += продажиToolStripMenuItem_Click; // // исполнителиToolStripMenuItem // исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; - исполнителиToolStripMenuItem.Size = new Size(224, 26); + исполнителиToolStripMenuItem.Size = new Size(193, 26); исполнителиToolStripMenuItem.Text = "Исполнители"; исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click; // // начатьРаботуToolStripMenuItem // начатьРаботуToolStripMenuItem.Name = "начатьРаботуToolStripMenuItem"; - начатьРаботуToolStripMenuItem.Size = new Size(224, 26); + начатьРаботуToolStripMenuItem.Size = new Size(193, 26); начатьРаботуToolStripMenuItem.Text = "Начать работу"; начатьРаботуToolStripMenuItem.Click += начатьРаботуToolStripMenuItem_Click; // @@ -183,12 +183,12 @@ DataGridView.Location = new Point(12, 31); DataGridView.Name = "DataGridView"; DataGridView.RowHeadersWidth = 51; - DataGridView.Size = new Size(1007, 407); + DataGridView.Size = new Size(1125, 407); DataGridView.TabIndex = 1; // // CreateOrderButton // - CreateOrderButton.Location = new Point(1025, 31); + CreateOrderButton.Location = new Point(1143, 31); CreateOrderButton.Name = "CreateOrderButton"; CreateOrderButton.Size = new Size(259, 29); CreateOrderButton.TabIndex = 2; @@ -198,7 +198,7 @@ // // TakeInWorkButton // - TakeInWorkButton.Location = new Point(1025, 66); + TakeInWorkButton.Location = new Point(1143, 66); TakeInWorkButton.Name = "TakeInWorkButton"; TakeInWorkButton.Size = new Size(259, 29); TakeInWorkButton.TabIndex = 3; @@ -208,7 +208,7 @@ // // ReadyButton // - ReadyButton.Location = new Point(1025, 101); + ReadyButton.Location = new Point(1143, 101); ReadyButton.Name = "ReadyButton"; ReadyButton.Size = new Size(259, 29); ReadyButton.TabIndex = 4; @@ -218,7 +218,7 @@ // // IssuedButton // - IssuedButton.Location = new Point(1025, 136); + IssuedButton.Location = new Point(1143, 136); IssuedButton.Name = "IssuedButton"; IssuedButton.Size = new Size(259, 29); IssuedButton.TabIndex = 5; @@ -228,7 +228,7 @@ // // RefreshButton // - RefreshButton.Location = new Point(1025, 171); + RefreshButton.Location = new Point(1143, 171); RefreshButton.Name = "RefreshButton"; RefreshButton.Size = new Size(259, 29); RefreshButton.TabIndex = 6; @@ -240,7 +240,7 @@ // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1296, 450); + ClientSize = new Size(1414, 450); Controls.Add(RefreshButton); Controls.Add(IssuedButton); Controls.Add(ReadyButton); diff --git a/ProjectFlowerShop/MainForm.cs b/ProjectFlowerShop/MainForm.cs index 1b6cdd3..fa89bb0 100644 --- a/ProjectFlowerShop/MainForm.cs +++ b/ProjectFlowerShop/MainForm.cs @@ -57,6 +57,7 @@ namespace ProjectFlowerShop DataGridView.DataSource = list; DataGridView.Columns["FlowerId"].Visible = false; DataGridView.Columns["ClientId"].Visible = false; + DataGridView.Columns["ImplementerId"].Visible = false; DataGridView.Columns["FlowerName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } _logger.LogInformation("Загрузка заказов");