если б море было пивом...

This commit is contained in:
antoc0der 2024-02-13 20:55:59 +03:00
parent 6a305bb8df
commit d418c821a1
7 changed files with 13 additions and 51 deletions

View File

@ -33,9 +33,6 @@
buttonChange = new Button(); buttonChange = new Button();
buttonRemove = new Button(); buttonRemove = new Button();
buttonReload = new Button(); buttonReload = new Button();
Id = new DataGridViewTextBoxColumn();
Name = new DataGridViewTextBoxColumn();
Price = new DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout(); SuspendLayout();
// //
@ -43,7 +40,6 @@
// //
dataGridView.BackgroundColor = SystemColors.Control; dataGridView.BackgroundColor = SystemColors.Control;
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Columns.AddRange(new DataGridViewColumn[] { Id, Name, Price });
dataGridView.Location = new Point(1, 1); dataGridView.Location = new Point(1, 1);
dataGridView.Name = "dataGridView"; dataGridView.Name = "dataGridView";
dataGridView.RowHeadersWidth = 51; dataGridView.RowHeadersWidth = 51;
@ -91,28 +87,6 @@
buttonReload.UseVisualStyleBackColor = true; buttonReload.UseVisualStyleBackColor = true;
buttonReload.Click += buttonReload_Click; 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 // FormComponents
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
@ -123,7 +97,7 @@
Controls.Add(buttonChange); Controls.Add(buttonChange);
Controls.Add(buttonAdd); Controls.Add(buttonAdd);
Controls.Add(dataGridView); Controls.Add(dataGridView);
//Name = "FormComponents"; Name = "FormComponents";
Text = "Компоненты"; Text = "Компоненты";
Load += FormComponents_Load; Load += FormComponents_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
@ -137,8 +111,5 @@
private Button buttonChange; private Button buttonChange;
private Button buttonRemove; private Button buttonRemove;
private Button buttonReload; private Button buttonReload;
private DataGridViewTextBoxColumn Id;
private DataGridViewTextBoxColumn Name;
private DataGridViewTextBoxColumn Price;
} }
} }

View File

@ -117,13 +117,4 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="Id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Price.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root> </root>

View File

@ -1,4 +1,4 @@
namespace IceCreamShop namespace ProjectFlowerShop
{ {
partial class FormFlowers partial class FormFlowers
{ {
@ -85,7 +85,7 @@
RefreshButton.UseVisualStyleBackColor = true; RefreshButton.UseVisualStyleBackColor = true;
RefreshButton.Click += RefreshButton_Click; RefreshButton.Click += RefreshButton_Click;
// //
// IceCreamsForm // FormFlowers
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
@ -95,8 +95,8 @@
Controls.Add(UpdateButton); Controls.Add(UpdateButton);
Controls.Add(AddButton); Controls.Add(AddButton);
Controls.Add(DataGridView); Controls.Add(DataGridView);
Name = "IceCreamsForm"; Name = "FormFlowers";
Text = "IceCreamsForm"; Text = "FlowersForm";
Load += IceCreamsForm_Load; Load += IceCreamsForm_Load;
((System.ComponentModel.ISupportInitialize)DataGridView).EndInit(); ((System.ComponentModel.ISupportInitialize)DataGridView).EndInit();
ResumeLayout(false); ResumeLayout(false);

View File

@ -12,7 +12,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace IceCreamShop namespace ProjectFlowerShop
{ {
public partial class FormFlowers : Form public partial class FormFlowers : Form
{ {
@ -39,8 +39,8 @@ namespace IceCreamShop
{ {
DataGridView.DataSource = list; DataGridView.DataSource = list;
DataGridView.Columns["Id"].Visible = false; DataGridView.Columns["Id"].Visible = false;
DataGridView.Columns["IceCreamName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; DataGridView.Columns["FlowerName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
DataGridView.Columns["IceCreamComponents"].Visible = false; DataGridView.Columns["FlowerComponents"].Visible = false;
} }
_logger.LogInformation("Загрузка цветов"); _logger.LogInformation("Загрузка цветов");
} }

View File

@ -1,4 +1,4 @@
namespace IceCreamShop namespace ProjectFlowerShop
{ {
partial class MainForm partial class MainForm
{ {

View File

@ -14,7 +14,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace IceCreamShop namespace ProjectFlowerShop
{ {
public partial class MainForm : Form public partial class MainForm : Form
{ {
@ -51,8 +51,8 @@ namespace IceCreamShop
if (list != null) if (list != null)
{ {
DataGridView.DataSource = list; DataGridView.DataSource = list;
DataGridView.Columns["IceCreamId"].Visible = false; DataGridView.Columns["FlowerId"].Visible = false;
DataGridView.Columns["IceCreamName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; DataGridView.Columns["FlowerName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
} }
_logger.LogInformation("Загрузка заказов"); _logger.LogInformation("Загрузка заказов");
} }

View File

@ -2,7 +2,7 @@ using FlowerShopBusinessLogic.BusinessLogic;
using FlowerShopContracts.BusinessLogicsContracts; using FlowerShopContracts.BusinessLogicsContracts;
using FlowerShopContracts.StoragesContracts; using FlowerShopContracts.StoragesContracts;
using FlowerShopListImplement.Implements; using FlowerShopListImplement.Implements;
using IceCreamShop; using ProjectFlowerShop;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging; using NLog.Extensions.Logging;