From 3e34afb54bad3aa7d2de29146ba3f59b8306b71e Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Mon, 26 Feb 2024 00:47:21 +0400 Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B0=D0=B3=20=D1=81=20=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20?= =?UTF-8?q?=D1=83=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B5=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SecuritySystemView/FormComponent.Designer.cs | 1 + .../SecuritySystemView/FormComponents.Designer.cs | 1 + SecuritySystem/SecuritySystemView/FormComponents.cs | 3 +-- .../SecuritySystemView/FormCreateOrder.Designer.cs | 1 + SecuritySystem/SecuritySystemView/FormMain.Designer.cs | 5 +++-- SecuritySystem/SecuritySystemView/FormSecure.Designer.cs | 1 + SecuritySystem/SecuritySystemView/FormSecure.resx | 9 --------- .../SecuritySystemView/FormSecures.Designer.cs | 1 + SecuritySystem/SecuritySystemView/FormSecures.cs | 1 + 9 files changed, 10 insertions(+), 13 deletions(-) diff --git a/SecuritySystem/SecuritySystemView/FormComponent.Designer.cs b/SecuritySystem/SecuritySystemView/FormComponent.Designer.cs index 289b744..88d104e 100644 --- a/SecuritySystem/SecuritySystemView/FormComponent.Designer.cs +++ b/SecuritySystem/SecuritySystemView/FormComponent.Designer.cs @@ -101,6 +101,7 @@ Controls.Add(textBoxComponentName); Name = "FormComponent"; Text = "Компонент"; + Load += FormComponent_Load; ResumeLayout(false); PerformLayout(); } diff --git a/SecuritySystem/SecuritySystemView/FormComponents.Designer.cs b/SecuritySystem/SecuritySystemView/FormComponents.Designer.cs index bab7e50..348cb47 100644 --- a/SecuritySystem/SecuritySystemView/FormComponents.Designer.cs +++ b/SecuritySystem/SecuritySystemView/FormComponents.Designer.cs @@ -107,6 +107,7 @@ Controls.Add(dataGridViewComponents); Name = "FormComponents"; Text = "Компоненты"; + Load += FormComponents_Load; ((System.ComponentModel.ISupportInitialize)dataGridViewComponents).EndInit(); ResumeLayout(false); } diff --git a/SecuritySystem/SecuritySystemView/FormComponents.cs b/SecuritySystem/SecuritySystemView/FormComponents.cs index b6b3efb..182e508 100644 --- a/SecuritySystem/SecuritySystemView/FormComponents.cs +++ b/SecuritySystem/SecuritySystemView/FormComponents.cs @@ -56,8 +56,7 @@ namespace SecuritySystemView var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); if (service is FormComponent form) { - form.Id = - Convert.ToInt32(dataGridViewComponents.SelectedRows[0].Cells["Id"].Value); + form.Id = Convert.ToInt32(dataGridViewComponents.SelectedRows[0].Cells["Id"].Value); if (form.ShowDialog() == DialogResult.OK) { LoadData(); diff --git a/SecuritySystem/SecuritySystemView/FormCreateOrder.Designer.cs b/SecuritySystem/SecuritySystemView/FormCreateOrder.Designer.cs index 0595ed5..02cc0fb 100644 --- a/SecuritySystem/SecuritySystemView/FormCreateOrder.Designer.cs +++ b/SecuritySystem/SecuritySystemView/FormCreateOrder.Designer.cs @@ -126,6 +126,7 @@ Controls.Add(labelSecureName); Name = "FormCreateOrder"; Text = "Создание заказа"; + Load += FormCreateOrder_Load; ResumeLayout(false); PerformLayout(); } diff --git a/SecuritySystem/SecuritySystemView/FormMain.Designer.cs b/SecuritySystem/SecuritySystemView/FormMain.Designer.cs index 9d83640..a5be78c 100644 --- a/SecuritySystem/SecuritySystemView/FormMain.Designer.cs +++ b/SecuritySystem/SecuritySystemView/FormMain.Designer.cs @@ -62,14 +62,14 @@ // ComponentsToolStripMenuItem // ComponentsToolStripMenuItem.Name = "ComponentsToolStripMenuItem"; - ComponentsToolStripMenuItem.Size = new Size(224, 26); + ComponentsToolStripMenuItem.Size = new Size(182, 26); ComponentsToolStripMenuItem.Text = "Компоненты"; ComponentsToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click; // // SecuresToolStripMenuItem // SecuresToolStripMenuItem.Name = "SecuresToolStripMenuItem"; - SecuresToolStripMenuItem.Size = new Size(224, 26); + SecuresToolStripMenuItem.Size = new Size(182, 26); SecuresToolStripMenuItem.Text = "Изделия"; SecuresToolStripMenuItem.Click += SecuresToolStripMenuItem_Click; // @@ -154,6 +154,7 @@ MainMenuStrip = menuStrip; Name = "FormMain"; Text = "Системы безопасности"; + Load += FormMain_Load; menuStrip.ResumeLayout(false); menuStrip.PerformLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); diff --git a/SecuritySystem/SecuritySystemView/FormSecure.Designer.cs b/SecuritySystem/SecuritySystemView/FormSecure.Designer.cs index 4fb4f68..fae0dc5 100644 --- a/SecuritySystem/SecuritySystemView/FormSecure.Designer.cs +++ b/SecuritySystem/SecuritySystemView/FormSecure.Designer.cs @@ -202,6 +202,7 @@ Controls.Add(labelSecureName); Name = "FormSecure"; Text = "Изделие"; + Load += FormSecure_Load; groupBoxComponentsControl.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ResumeLayout(false); diff --git a/SecuritySystem/SecuritySystemView/FormSecure.resx b/SecuritySystem/SecuritySystemView/FormSecure.resx index 0f9f3e9..e524ea4 100644 --- a/SecuritySystem/SecuritySystemView/FormSecure.resx +++ b/SecuritySystem/SecuritySystemView/FormSecure.resx @@ -126,13 +126,4 @@ True - - True - - - True - - - True - \ No newline at end of file diff --git a/SecuritySystem/SecuritySystemView/FormSecures.Designer.cs b/SecuritySystem/SecuritySystemView/FormSecures.Designer.cs index 5aee437..3590462 100644 --- a/SecuritySystem/SecuritySystemView/FormSecures.Designer.cs +++ b/SecuritySystem/SecuritySystemView/FormSecures.Designer.cs @@ -105,6 +105,7 @@ Controls.Add(dataGridView); Name = "FormSecures"; Text = "Иделия"; + Load += FormSecures_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ResumeLayout(false); } diff --git a/SecuritySystem/SecuritySystemView/FormSecures.cs b/SecuritySystem/SecuritySystemView/FormSecures.cs index 23313f4..36b76ba 100644 --- a/SecuritySystem/SecuritySystemView/FormSecures.cs +++ b/SecuritySystem/SecuritySystemView/FormSecures.cs @@ -28,6 +28,7 @@ namespace SecuritySystemView dataGridView.DataSource = list; dataGridView.Columns["Id"].Visible = false; dataGridView.Columns["SecureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + dataGridView.Columns["SecureComponents"].Visible = false; } _logger.LogInformation("Загрузка изделий"); }