From aaa9486e2e6a7a50ef33255d41915b4b89f85321 Mon Sep 17 00:00:00 2001 From: tellsense Date: Sat, 4 May 2024 18:14:10 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewModels/OrderViewModel.cs | 14 +++---- SushiBar/SushiBarView/FormMain.Designer.cs | 37 ++++++++++--------- SushiBar/SushiBarView/FormMain.cs | 3 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs b/SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs index 324d643..1413876 100644 --- a/SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs +++ b/SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs @@ -13,17 +13,17 @@ namespace SushiBarContracts.ViewModels { [DisplayName("Номер")] public int Id { get; set; } + public int SushiId { get; set; } public int ClientId { get; set; } - [DisplayName("ФИО клиента")] - public string ClientFIO { get; set; } = string.Empty; public int? ImplementerId { get; set; } + [DisplayName("Клиент")] + public string ClientFIO { get; set; } = string.Empty; + [DisplayName("Изделие")] + public string SushiName { get; set; } = string.Empty; [DisplayName("Исполнитель")] public string? ImplementerFIO { get; set; } = null; - public int SushiId { get; set; } - [DisplayName("Изделие")] - public string SushiName { get; set; } = string.Empty; - [DisplayName("Количество")] - public int Count { get; set; } + [DisplayName("Количество")] + public int Count { get; set; } [DisplayName("Сумма")] public double Sum { get; set; } [DisplayName("Статус")] diff --git a/SushiBar/SushiBarView/FormMain.Designer.cs b/SushiBar/SushiBarView/FormMain.Designer.cs index 3aa7df2..916fd67 100644 --- a/SushiBar/SushiBarView/FormMain.Designer.cs +++ b/SushiBar/SushiBarView/FormMain.Designer.cs @@ -39,28 +39,29 @@ componentsToolStripMenuItem = new ToolStripMenuItem(); sushiToolStripMenuItem = new ToolStripMenuItem(); clientToolStripMenuItem = new ToolStripMenuItem(); + employersToolStripMenuItem = new ToolStripMenuItem(); ReportsToolStripMenuItem = new ToolStripMenuItem(); ComponentsListToolStripMenuItem = new ToolStripMenuItem(); ComponentSushisToolStripMenuItem = new ToolStripMenuItem(); OrdersToolStripMenuItem = new ToolStripMenuItem(); startWorkToolStripMenuItem = new ToolStripMenuItem(); - employersToolStripMenuItem = new ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); menuStrip.SuspendLayout(); SuspendLayout(); // // dataGridView // + dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; dataGridView.BackgroundColor = SystemColors.Window; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.Location = new Point(1, 29); dataGridView.Name = "dataGridView"; - dataGridView.Size = new Size(1080, 307); + dataGridView.Size = new Size(1206, 307); dataGridView.TabIndex = 0; // // ButtonCreateOrder // - ButtonCreateOrder.Location = new Point(1087, 41); + ButtonCreateOrder.Location = new Point(1213, 41); ButtonCreateOrder.Name = "ButtonCreateOrder"; ButtonCreateOrder.Size = new Size(147, 33); ButtonCreateOrder.TabIndex = 1; @@ -70,7 +71,7 @@ // // ButtonTakeOrderInWork // - ButtonTakeOrderInWork.Location = new Point(1087, 80); + ButtonTakeOrderInWork.Location = new Point(1213, 80); ButtonTakeOrderInWork.Name = "ButtonTakeOrderInWork"; ButtonTakeOrderInWork.Size = new Size(147, 33); ButtonTakeOrderInWork.TabIndex = 2; @@ -80,7 +81,7 @@ // // ButtonOrderReady // - ButtonOrderReady.Location = new Point(1087, 119); + ButtonOrderReady.Location = new Point(1213, 119); ButtonOrderReady.Name = "ButtonOrderReady"; ButtonOrderReady.Size = new Size(147, 33); ButtonOrderReady.TabIndex = 3; @@ -90,7 +91,7 @@ // // ButtonIssuedOrder // - ButtonIssuedOrder.Location = new Point(1087, 158); + ButtonIssuedOrder.Location = new Point(1213, 158); ButtonIssuedOrder.Name = "ButtonIssuedOrder"; ButtonIssuedOrder.Size = new Size(147, 33); ButtonIssuedOrder.TabIndex = 4; @@ -100,7 +101,7 @@ // // ButtonRef // - ButtonRef.Location = new Point(1087, 197); + ButtonRef.Location = new Point(1213, 197); ButtonRef.Name = "ButtonRef"; ButtonRef.Size = new Size(147, 33); ButtonRef.TabIndex = 5; @@ -113,7 +114,7 @@ menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, ReportsToolStripMenuItem, startWorkToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; - menuStrip.Size = new Size(1265, 24); + menuStrip.Size = new Size(1381, 24); menuStrip.TabIndex = 6; menuStrip.Text = "menuStrip1"; // @@ -127,24 +128,30 @@ // componentsToolStripMenuItem // componentsToolStripMenuItem.Name = "componentsToolStripMenuItem"; - componentsToolStripMenuItem.Size = new Size(180, 22); + componentsToolStripMenuItem.Size = new Size(149, 22); componentsToolStripMenuItem.Text = "Компоненты"; componentsToolStripMenuItem.Click += componentsToolStripMenuItem_Click; // // sushiToolStripMenuItem // sushiToolStripMenuItem.Name = "sushiToolStripMenuItem"; - sushiToolStripMenuItem.Size = new Size(180, 22); + sushiToolStripMenuItem.Size = new Size(149, 22); sushiToolStripMenuItem.Text = "Суши"; sushiToolStripMenuItem.Click += sushiToolStripMenuItem_Click; // // clientToolStripMenuItem // clientToolStripMenuItem.Name = "clientToolStripMenuItem"; - clientToolStripMenuItem.Size = new Size(180, 22); + clientToolStripMenuItem.Size = new Size(149, 22); clientToolStripMenuItem.Text = "Клиент"; clientToolStripMenuItem.Click += clientToolStripMenuItem_Click; // + // employersToolStripMenuItem + // + employersToolStripMenuItem.Name = "employersToolStripMenuItem"; + employersToolStripMenuItem.Size = new Size(149, 22); + employersToolStripMenuItem.Text = "Исполнители"; + // // ReportsToolStripMenuItem // ReportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsListToolStripMenuItem, ComponentSushisToolStripMenuItem, OrdersToolStripMenuItem }); @@ -179,17 +186,11 @@ startWorkToolStripMenuItem.Size = new Size(92, 20); startWorkToolStripMenuItem.Text = "Запуск работ"; // - // employersToolStripMenuItem - // - employersToolStripMenuItem.Name = "employersToolStripMenuItem"; - employersToolStripMenuItem.Size = new Size(180, 22); - employersToolStripMenuItem.Text = "Исполнители"; - // // FormMain // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1265, 337); + ClientSize = new Size(1381, 337); Controls.Add(ButtonRef); Controls.Add(ButtonIssuedOrder); Controls.Add(ButtonOrderReady); diff --git a/SushiBar/SushiBarView/FormMain.cs b/SushiBar/SushiBarView/FormMain.cs index 8dc3b72..56424cc 100644 --- a/SushiBar/SushiBarView/FormMain.cs +++ b/SushiBar/SushiBarView/FormMain.cs @@ -43,8 +43,7 @@ namespace SushiBarView dataGridView.DataSource = list; dataGridView.Columns["SushiId"].Visible = false; dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["SushiName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - + dataGridView.Columns["ImplementerId"].Visible = false; } _logger.LogInformation("Загрузка заказов"); }