diff --git a/ProjectFlowerShop/FormComponents.Designer.cs b/ProjectFlowerShop/FormComponents.Designer.cs index e3fffa7..536794f 100644 --- a/ProjectFlowerShop/FormComponents.Designer.cs +++ b/ProjectFlowerShop/FormComponents.Designer.cs @@ -33,9 +33,6 @@ buttonChange = new Button(); buttonRemove = new Button(); buttonReload = new Button(); - Id = new DataGridViewTextBoxColumn(); - Name = new DataGridViewTextBoxColumn(); - Price = new DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); // @@ -43,7 +40,6 @@ // dataGridView.BackgroundColor = SystemColors.Control; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Columns.AddRange(new DataGridViewColumn[] { Id, Name, Price }); dataGridView.Location = new Point(1, 1); dataGridView.Name = "dataGridView"; dataGridView.RowHeadersWidth = 51; @@ -91,28 +87,6 @@ buttonReload.UseVisualStyleBackColor = true; buttonReload.Click += buttonReload_Click; // - // Id - // - Id.HeaderText = "Id"; - Id.MinimumWidth = 6; - Id.Name = "Id"; - Id.Visible = false; - Id.Width = 200; - // - // Name - // - Name.HeaderText = "Name"; - Name.MinimumWidth = 6; - Name.Name = "Name"; - Name.Width = 380; - // - // Price - // - Price.HeaderText = "Price"; - Price.MinimumWidth = 6; - Price.Name = "Price"; - Price.Width = 125; - // // FormComponents // AutoScaleDimensions = new SizeF(8F, 20F); @@ -123,7 +97,7 @@ Controls.Add(buttonChange); Controls.Add(buttonAdd); Controls.Add(dataGridView); - //Name = "FormComponents"; + Name = "FormComponents"; Text = "Компоненты"; Load += FormComponents_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); @@ -137,8 +111,5 @@ private Button buttonChange; private Button buttonRemove; private Button buttonReload; - private DataGridViewTextBoxColumn Id; - private DataGridViewTextBoxColumn Name; - private DataGridViewTextBoxColumn Price; } } \ No newline at end of file diff --git a/ProjectFlowerShop/FormComponents.resx b/ProjectFlowerShop/FormComponents.resx index d1d25ab..af32865 100644 --- a/ProjectFlowerShop/FormComponents.resx +++ b/ProjectFlowerShop/FormComponents.resx @@ -117,13 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - - - True - \ No newline at end of file diff --git a/ProjectFlowerShop/FormFlowers.Designer.cs b/ProjectFlowerShop/FormFlowers.Designer.cs index 6d482c9..5d3d3e7 100644 --- a/ProjectFlowerShop/FormFlowers.Designer.cs +++ b/ProjectFlowerShop/FormFlowers.Designer.cs @@ -1,4 +1,4 @@ -namespace IceCreamShop +namespace ProjectFlowerShop { partial class FormFlowers { @@ -85,7 +85,7 @@ RefreshButton.UseVisualStyleBackColor = true; RefreshButton.Click += RefreshButton_Click; // - // IceCreamsForm + // FormFlowers // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; @@ -95,8 +95,8 @@ Controls.Add(UpdateButton); Controls.Add(AddButton); Controls.Add(DataGridView); - Name = "IceCreamsForm"; - Text = "IceCreamsForm"; + Name = "FormFlowers"; + Text = "FlowersForm"; Load += IceCreamsForm_Load; ((System.ComponentModel.ISupportInitialize)DataGridView).EndInit(); ResumeLayout(false); diff --git a/ProjectFlowerShop/FormFlowers.cs b/ProjectFlowerShop/FormFlowers.cs index 9fdcfd2..5d5b18c 100644 --- a/ProjectFlowerShop/FormFlowers.cs +++ b/ProjectFlowerShop/FormFlowers.cs @@ -12,7 +12,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace IceCreamShop +namespace ProjectFlowerShop { public partial class FormFlowers : Form { @@ -39,8 +39,8 @@ namespace IceCreamShop { DataGridView.DataSource = list; DataGridView.Columns["Id"].Visible = false; - DataGridView.Columns["IceCreamName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - DataGridView.Columns["IceCreamComponents"].Visible = false; + DataGridView.Columns["FlowerName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + DataGridView.Columns["FlowerComponents"].Visible = false; } _logger.LogInformation("Загрузка цветов"); } diff --git a/ProjectFlowerShop/MainForm.Designer.cs b/ProjectFlowerShop/MainForm.Designer.cs index d5dc8d4..56eb0e9 100644 --- a/ProjectFlowerShop/MainForm.Designer.cs +++ b/ProjectFlowerShop/MainForm.Designer.cs @@ -1,4 +1,4 @@ -namespace IceCreamShop +namespace ProjectFlowerShop { partial class MainForm { diff --git a/ProjectFlowerShop/MainForm.cs b/ProjectFlowerShop/MainForm.cs index 41f131a..5d70efb 100644 --- a/ProjectFlowerShop/MainForm.cs +++ b/ProjectFlowerShop/MainForm.cs @@ -14,7 +14,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace IceCreamShop +namespace ProjectFlowerShop { public partial class MainForm : Form { @@ -51,8 +51,8 @@ namespace IceCreamShop if (list != null) { DataGridView.DataSource = list; - DataGridView.Columns["IceCreamId"].Visible = false; - DataGridView.Columns["IceCreamName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + DataGridView.Columns["FlowerId"].Visible = false; + DataGridView.Columns["FlowerName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } _logger.LogInformation("Загрузка заказов"); } diff --git a/ProjectFlowerShop/Program.cs b/ProjectFlowerShop/Program.cs index 0ba0c05..d423dcb 100644 --- a/ProjectFlowerShop/Program.cs +++ b/ProjectFlowerShop/Program.cs @@ -2,7 +2,7 @@ using FlowerShopBusinessLogic.BusinessLogic; using FlowerShopContracts.BusinessLogicsContracts; using FlowerShopContracts.StoragesContracts; using FlowerShopListImplement.Implements; -using IceCreamShop; +using ProjectFlowerShop; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging;