diff --git a/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.Designer.cs b/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.Designer.cs index 726c504..dde2a1d 100644 --- a/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.Designer.cs +++ b/FurnitureAssembly/FurnitureAssembly/FormCreateOrder.Designer.cs @@ -71,6 +71,7 @@ this.textBoxCount.Name = "textBoxCount"; this.textBoxCount.Size = new System.Drawing.Size(297, 23); this.textBoxCount.TabIndex = 3; + this.textBoxCount.TextChanged += new System.EventHandler(this.TextBoxCount_TextChanged); // // comboBoxProduct // @@ -79,6 +80,7 @@ this.comboBoxProduct.Name = "comboBoxProduct"; this.comboBoxProduct.Size = new System.Drawing.Size(297, 23); this.comboBoxProduct.TabIndex = 4; + this.comboBoxProduct.SelectedIndexChanged += new System.EventHandler(this.ComboBoxProduct_SelectedIndexChanged); // // textBoxSum // diff --git a/FurnitureAssembly/FurnitureAssembly/FormFurniture.Designer.cs b/FurnitureAssembly/FurnitureAssembly/FormFurniture.Designer.cs index f1e7240..b39db36 100644 --- a/FurnitureAssembly/FurnitureAssembly/FormFurniture.Designer.cs +++ b/FurnitureAssembly/FurnitureAssembly/FormFurniture.Designer.cs @@ -130,6 +130,7 @@ this.ButtonRef.TabIndex = 8; this.ButtonRef.Text = "Обновить"; this.ButtonRef.UseVisualStyleBackColor = true; + this.ButtonRef.Click += new System.EventHandler(this.ButtonRef_Click); // // ButtonDel // @@ -139,6 +140,7 @@ this.ButtonDel.TabIndex = 7; this.ButtonDel.Text = "Удалить"; this.ButtonDel.UseVisualStyleBackColor = true; + this.ButtonDel.Click += new System.EventHandler(this.ButtonDel_Click); // // ButtonUpd // @@ -148,6 +150,7 @@ this.ButtonUpd.TabIndex = 6; this.ButtonUpd.Text = "Изменить"; this.ButtonUpd.UseVisualStyleBackColor = true; + this.ButtonUpd.Click += new System.EventHandler(this.ButtonUpd_Click); // // ButtonAdd // @@ -157,6 +160,7 @@ this.ButtonAdd.TabIndex = 5; this.ButtonAdd.Text = "Добавить"; this.ButtonAdd.UseVisualStyleBackColor = true; + this.ButtonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); // // ButtonCancel // @@ -166,6 +170,7 @@ this.ButtonCancel.TabIndex = 9; this.ButtonCancel.Text = "Отмена"; this.ButtonCancel.UseVisualStyleBackColor = true; + this.ButtonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); // // ButtonSave // @@ -175,6 +180,7 @@ this.ButtonSave.TabIndex = 8; this.ButtonSave.Text = "Сохранить"; this.ButtonSave.UseVisualStyleBackColor = true; + this.ButtonSave.Click += new System.EventHandler(this.ButtonSave_Click); // // FormFurniture // diff --git a/FurnitureAssembly/FurnitureAssembly/FormFurnitures.Designer.cs b/FurnitureAssembly/FurnitureAssembly/FormFurnitures.Designer.cs index a2a775f..7e0bc01 100644 --- a/FurnitureAssembly/FurnitureAssembly/FormFurnitures.Designer.cs +++ b/FurnitureAssembly/FurnitureAssembly/FormFurnitures.Designer.cs @@ -29,32 +29,21 @@ private void InitializeComponent() { this.dataGridView = new System.Windows.Forms.DataGridView(); - this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.ButtonAdd = new System.Windows.Forms.Button(); this.ButtonDel = new System.Windows.Forms.Button(); this.ButtonUpd = new System.Windows.Forms.Button(); this.ButtonRef = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // // dataGridView // this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Location = new System.Drawing.Point(-2, 0); + this.dataGridView.Location = new System.Drawing.Point(-1, 1); this.dataGridView.Name = "dataGridView"; this.dataGridView.RowTemplate.Height = 25; this.dataGridView.Size = new System.Drawing.Size(559, 453); - this.dataGridView.TabIndex = 0; - // - // dataGridView1 - // - this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView1.Location = new System.Drawing.Point(-1, 1); - this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.RowTemplate.Height = 25; - this.dataGridView1.Size = new System.Drawing.Size(559, 453); - this.dataGridView1.TabIndex = 5; + this.dataGridView.TabIndex = 5; // // ButtonAdd // @@ -102,23 +91,22 @@ this.Controls.Add(this.ButtonUpd); this.Controls.Add(this.ButtonDel); this.Controls.Add(this.ButtonAdd); - this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.dataGridView); this.Name = "FormFurnitures"; this.Text = "FormFurnitures"; ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.ResumeLayout(false); } #endregion - private DataGridView dataGridView; private DataGridView dataGridView1; private Button ButtonAdd; private Button ButtonDel; private Button ButtonUpd; private Button ButtonRef; + private DataGridView dataGridView; } } \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssembly/FormFurnitures.cs b/FurnitureAssembly/FurnitureAssembly/FormFurnitures.cs index 29ea07d..03d08c5 100644 --- a/FurnitureAssembly/FurnitureAssembly/FormFurnitures.cs +++ b/FurnitureAssembly/FurnitureAssembly/FormFurnitures.cs @@ -39,9 +39,7 @@ namespace FurnitureAssembly dataGridView.DataSource = list; dataGridView.Columns["Id"].Visible = false; dataGridView.Columns["FurnitureName"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["FurnitureCount"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; + DataGridViewAutoSizeColumnMode.Fill; } _logger.LogInformation("Загрузка изделий"); } diff --git a/FurnitureAssembly/FurnitureAssembly/FormMain.cs b/FurnitureAssembly/FurnitureAssembly/FormMain.cs index 6027d16..2a7ec63 100644 --- a/FurnitureAssembly/FurnitureAssembly/FormMain.cs +++ b/FurnitureAssembly/FurnitureAssembly/FormMain.cs @@ -29,8 +29,22 @@ namespace FurnitureAssembly } private void LoadData() { - _logger.LogInformation("Загрузка заказов"); - // прописать логику + try + { + var list = _orderLogic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["FurnitureId"].Visible = false; + } + _logger.LogInformation("Загрузка заказов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки заказов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } } private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e) { @@ -44,7 +58,12 @@ namespace FurnitureAssembly private void ИзделияToolStripMenuItem_Click(object sender, EventArgs e) { - // прописать логику + var service = + Program.ServiceProvider?.GetService(typeof(FormFurnitures)); + if (service is FormFurnitures form) + { + form.ShowDialog(); + } } private void ButtonCreateOrder_Click(object sender, EventArgs e)