From 37c35dc4359b8947bffc47040b6ae903c8bcd044 Mon Sep 17 00:00:00 2001 From: bekodeg Date: Tue, 7 May 2024 18:07:17 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D1=84=D0=B8=D0=BA=D1=81=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SushiBar/SushiBar/Forms/FormMain.Designer.cs | 34 ++++++++++--------- SushiBar/SushiBar/Forms/FormMain.cs | 7 +++- .../ViewModels/OrderViewModel.cs | 2 +- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/SushiBar/SushiBar/Forms/FormMain.Designer.cs b/SushiBar/SushiBar/Forms/FormMain.Designer.cs index 2c33225..6f128e5 100644 --- a/SushiBar/SushiBar/Forms/FormMain.Designer.cs +++ b/SushiBar/SushiBar/Forms/FormMain.Designer.cs @@ -46,6 +46,7 @@ buttonOrderReady = new Button(); buttonIssuedOrder = new Button(); buttonRef = new Button(); + clientsToolStripMenuItem = new ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); menuStrip1.SuspendLayout(); SuspendLayout(); @@ -59,7 +60,7 @@ dataGridView.RowHeadersWidth = 51; dataGridView.RowTemplate.Height = 29; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView.Size = new Size(992, 422); + dataGridView.Size = new Size(986, 514); dataGridView.TabIndex = 0; // // menuStrip1 @@ -68,13 +69,13 @@ menuStrip1.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, отчётыToolStripMenuItem1 }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; - menuStrip1.Size = new Size(1501, 28); + menuStrip1.Size = new Size(1184, 28); menuStrip1.TabIndex = 1; menuStrip1.Text = "menuStrip1"; // // toolStripMenuItem // - toolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { sushiToolStripMenuItem, componentsToolStripMenuItem }); + toolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { sushiToolStripMenuItem, componentsToolStripMenuItem, clientsToolStripMenuItem }); toolStripMenuItem.Name = "toolStripMenuItem"; toolStripMenuItem.Size = new Size(117, 24); toolStripMenuItem.Text = "Справочники"; @@ -121,13 +122,6 @@ orderReportToolStripMenuItem.Text = "Список заказов"; orderReportToolStripMenuItem.Click += orderReportToolStripMenuItem_Click; // - // clientsToolStripMenuItem - // - clientsToolStripMenuItem.Name = "clientsToolStripMenuItem"; - clientsToolStripMenuItem.Size = new Size(224, 26); - clientsToolStripMenuItem.Text = "Клиенты"; - clientsToolStripMenuItem.Click += clientsToolStripMenuItem_Click; - // // отчётыToolStripMenuItem // отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem"; @@ -151,7 +145,7 @@ // buttonCreateOrder // buttonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonCreateOrder.Location = new Point(998, 31); + buttonCreateOrder.Location = new Point(992, 28); buttonCreateOrder.Name = "buttonCreateOrder"; buttonCreateOrder.Size = new Size(180, 30); buttonCreateOrder.TabIndex = 8; @@ -162,7 +156,7 @@ // buttonTakeOrderInWork // buttonTakeOrderInWork.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonTakeOrderInWork.Location = new Point(998, 67); + buttonTakeOrderInWork.Location = new Point(992, 64); buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; buttonTakeOrderInWork.Size = new Size(180, 30); buttonTakeOrderInWork.TabIndex = 9; @@ -173,7 +167,7 @@ // buttonOrderReady // buttonOrderReady.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonOrderReady.Location = new Point(998, 103); + buttonOrderReady.Location = new Point(992, 100); buttonOrderReady.Name = "buttonOrderReady"; buttonOrderReady.Size = new Size(180, 30); buttonOrderReady.TabIndex = 10; @@ -184,7 +178,7 @@ // buttonIssuedOrder // buttonIssuedOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonIssuedOrder.Location = new Point(998, 139); + buttonIssuedOrder.Location = new Point(992, 136); buttonIssuedOrder.Name = "buttonIssuedOrder"; buttonIssuedOrder.Size = new Size(180, 30); buttonIssuedOrder.TabIndex = 11; @@ -195,7 +189,7 @@ // buttonRef // buttonRef.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonRef.Location = new Point(998, 175); + buttonRef.Location = new Point(992, 172); buttonRef.Name = "buttonRef"; buttonRef.Size = new Size(180, 30); buttonRef.TabIndex = 12; @@ -203,12 +197,19 @@ buttonRef.UseVisualStyleBackColor = true; buttonRef.Click += ButtonRef_Click; // + // clientsToolStripMenuItem + // + clientsToolStripMenuItem.Name = "clientsToolStripMenuItem"; + clientsToolStripMenuItem.Size = new Size(224, 26); + clientsToolStripMenuItem.Text = "Клиенты"; + clientsToolStripMenuItem.Click += clientsToolStripMenuItem_Click; + // // FormMain // AllowDrop = true; AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1501, 724); + ClientSize = new Size(1184, 554); Controls.Add(buttonRef); Controls.Add(buttonIssuedOrder); Controls.Add(buttonOrderReady); @@ -248,5 +249,6 @@ private ToolStripMenuItem sushisReportToolStripMenuItem; private ToolStripMenuItem componentsReportПоСушиToolStripMenuItem; private ToolStripMenuItem orderReportToolStripMenuItem; + private ToolStripMenuItem clientsToolStripMenuItem; } } \ No newline at end of file diff --git a/SushiBar/SushiBar/Forms/FormMain.cs b/SushiBar/SushiBar/Forms/FormMain.cs index 3553e15..d66a865 100644 --- a/SushiBar/SushiBar/Forms/FormMain.cs +++ b/SushiBar/SushiBar/Forms/FormMain.cs @@ -30,6 +30,7 @@ namespace SushiBar.Forms { dataGridView.DataSource = list; dataGridView.Columns["SushiId"].Visible = false; + dataGridView.Columns["ClientId"].Visible = false; dataGridView.Columns["SushiName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } _logger.LogInformation("Загрузка заказов"); @@ -170,7 +171,11 @@ namespace SushiBar.Forms private void clientsToolStripMenuItem_Click(object sender, EventArgs e) { - ClientsToolStripMenuItem_Click(sender, e); + var service = Program.ServiceProvider?.GetService(typeof(FormClients)); + if (service is FormClients form) + { + form.ShowDialog(); + } } } } diff --git a/SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs b/SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs index 65096f9..57227c1 100644 --- a/SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs +++ b/SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs @@ -9,10 +9,10 @@ namespace SushiBarContracts.ViewModels [DisplayName("Номер")] public int Id { get; set; } public int SushiId { get; set; } - [DisplayName("Суши")] public int ClientId { get; set; } [DisplayName("Клиент")] public string ClientFIO { get; set; } = string.Empty; + [DisplayName("Суши")] public string SushiName { get; set; } = string.Empty; [DisplayName("Количество")] public int Count { get; set; }