From dfd99f386e7d3fc355001410c2eed84baae615e5 Mon Sep 17 00:00:00 2001 From: Zakharov_Rostislav Date: Sat, 10 Feb 2024 20:21:10 +0400 Subject: [PATCH] some minor fixes --- .../BlacksmithWorkshop/FormMain.Designer.cs | 20 +++++++++---------- .../BlacksmithWorkshop/FormMain.cs | 4 ++-- .../BlacksmithWorkshop/Program.cs | 2 ++ .../ViewModels/OrderViewModel.cs | 1 - 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs index 57f26e2..34ec0da 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs @@ -47,7 +47,7 @@ menuStrip.Items.AddRange(new ToolStripItem[] { GuidesToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; - menuStrip.Size = new Size(800, 24); + menuStrip.Size = new Size(1011, 24); menuStrip.TabIndex = 0; menuStrip.Text = "menuStrip1"; // @@ -61,14 +61,14 @@ // ComponentsToolStripMenuItem // ComponentsToolStripMenuItem.Name = "ComponentsToolStripMenuItem"; - ComponentsToolStripMenuItem.Size = new Size(180, 22); + ComponentsToolStripMenuItem.Size = new Size(145, 22); ComponentsToolStripMenuItem.Text = "Компоненты"; ComponentsToolStripMenuItem.Click += ComponentsStripMenuItem_Click; // // ManufactureToolStripMenuItem // ManufactureToolStripMenuItem.Name = "ManufactureToolStripMenuItem"; - ManufactureToolStripMenuItem.Size = new Size(180, 22); + ManufactureToolStripMenuItem.Size = new Size(145, 22); ManufactureToolStripMenuItem.Text = "Изделия"; ManufactureToolStripMenuItem.Click += ManufacturesStripMenuItem_Click; // @@ -78,12 +78,12 @@ dataGridView.Location = new Point(0, 23); dataGridView.Name = "dataGridView"; dataGridView.RowTemplate.Height = 25; - dataGridView.Size = new Size(627, 427); + dataGridView.Size = new Size(847, 427); dataGridView.TabIndex = 1; // // buttonCreateOrder // - buttonCreateOrder.Location = new Point(640, 44); + buttonCreateOrder.Location = new Point(853, 38); buttonCreateOrder.Name = "buttonCreateOrder"; buttonCreateOrder.Size = new Size(148, 31); buttonCreateOrder.TabIndex = 2; @@ -93,7 +93,7 @@ // // buttonRefresh // - buttonRefresh.Location = new Point(640, 192); + buttonRefresh.Location = new Point(853, 186); buttonRefresh.Name = "buttonRefresh"; buttonRefresh.Size = new Size(148, 31); buttonRefresh.TabIndex = 3; @@ -103,7 +103,7 @@ // // buttonIssued // - buttonIssued.Location = new Point(640, 155); + buttonIssued.Location = new Point(853, 149); buttonIssued.Name = "buttonIssued"; buttonIssued.Size = new Size(148, 31); buttonIssued.TabIndex = 4; @@ -113,7 +113,7 @@ // // buttonReady // - buttonReady.Location = new Point(640, 118); + buttonReady.Location = new Point(853, 112); buttonReady.Name = "buttonReady"; buttonReady.Size = new Size(148, 31); buttonReady.TabIndex = 5; @@ -123,7 +123,7 @@ // // buttonTakeInWork // - buttonTakeInWork.Location = new Point(640, 81); + buttonTakeInWork.Location = new Point(853, 75); buttonTakeInWork.Name = "buttonTakeInWork"; buttonTakeInWork.Size = new Size(148, 31); buttonTakeInWork.TabIndex = 6; @@ -135,7 +135,7 @@ // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); + ClientSize = new Size(1011, 450); Controls.Add(buttonTakeInWork); Controls.Add(buttonReady); Controls.Add(buttonIssued); diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs index 89406f5..9148d1f 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs @@ -45,8 +45,8 @@ namespace BlacksmithWorkshop if (list != null) { dataGridView.DataSource = list; - dataGridView.Columns["IceCreamId"].Visible = false; - dataGridView.Columns["IceCreamName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + dataGridView.Columns["ManufactureId"].Visible = false; + dataGridView.Columns["ManufactureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } _logger.LogInformation("Загрузка заказов"); } diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/Program.cs b/BlacksmithWorkshop/BlacksmithWorkshop/Program.cs index 72ed2a7..65045db 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/Program.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/Program.cs @@ -3,6 +3,8 @@ using BlacksmithWorkshopContracts.BusinessLogicsContracts; using BlacksmithWorkshopContracts.StoragesContracts; using BlacksmithWorkshopListImplement.Implements; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using NLog.Extensions.Logging; using System; namespace BlacksmithWorkshop diff --git a/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/OrderViewModel.cs b/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/OrderViewModel.cs index f02826f..4bb1c48 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/OrderViewModel.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/OrderViewModel.cs @@ -13,7 +13,6 @@ namespace BlacksmithWorkshopContracts.ViewModels { [DisplayName("Номер")] public int Id { get; set; } - public int ManufactureId { get; set; } [DisplayName("Изделие")] public string ManufactureName { get; set; } = string.Empty;