ПИбд-23 Салин Олег Алексеевич Лабораторная работа №4 (Усложненная) #18

Closed
Oleja123 wants to merge 30 commits from Lab4_Hard into Lab4
11 changed files with 229 additions and 178 deletions
Showing only changes of commit d6f8b1fda4 - Show all commits

View File

@ -38,42 +38,45 @@
//
// NameTextBox
//
NameTextBox.Location = new Point(80, 10);
NameTextBox.Location = new Point(91, 13);
NameTextBox.Margin = new Padding(3, 4, 3, 4);
NameTextBox.Name = "NameTextBox";
NameTextBox.Size = new Size(243, 23);
NameTextBox.Size = new Size(277, 27);
NameTextBox.TabIndex = 0;
//
// CostTextBox
//
CostTextBox.Location = new Point(80, 42);
CostTextBox.Location = new Point(91, 56);
CostTextBox.Margin = new Padding(3, 4, 3, 4);
CostTextBox.Name = "CostTextBox";
CostTextBox.Size = new Size(119, 23);
CostTextBox.Size = new Size(135, 27);
CostTextBox.TabIndex = 1;
//
// NameLabel
//
NameLabel.AutoSize = true;
NameLabel.Location = new Point(7, 20);
NameLabel.Location = new Point(8, 27);
NameLabel.Name = "NameLabel";
NameLabel.Size = new Size(59, 15);
NameLabel.Size = new Size(77, 20);
NameLabel.TabIndex = 2;
NameLabel.Text = "Название";
//
// CostLabel
//
CostLabel.AutoSize = true;
CostLabel.Location = new Point(7, 49);
CostLabel.Location = new Point(8, 65);
CostLabel.Name = "CostLabel";
CostLabel.Size = new Size(35, 15);
CostLabel.Size = new Size(45, 20);
CostLabel.TabIndex = 3;
CostLabel.Text = "Цена";
//
// CancelButton
//
CancelButton.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
CancelButton.Location = new Point(247, 68);
CancelButton.Location = new Point(282, 91);
CancelButton.Margin = new Padding(3, 4, 3, 4);
CancelButton.Name = "CancelButton";
CancelButton.Size = new Size(75, 23);
CancelButton.Size = new Size(86, 31);
CancelButton.TabIndex = 4;
CancelButton.Text = "Отмена";
CancelButton.UseVisualStyleBackColor = true;
@ -82,9 +85,10 @@
// SaveButton
//
SaveButton.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
SaveButton.Location = new Point(165, 68);
SaveButton.Location = new Point(189, 91);
SaveButton.Margin = new Padding(3, 4, 3, 4);
SaveButton.Name = "SaveButton";
SaveButton.Size = new Size(75, 23);
SaveButton.Size = new Size(86, 31);
SaveButton.TabIndex = 5;
SaveButton.Text = "Сохранить";
SaveButton.UseVisualStyleBackColor = true;
@ -92,18 +96,19 @@
//
// ComponentForm
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
AutoSizeMode = AutoSizeMode.GrowAndShrink;
ClientSize = new Size(333, 97);
ClientSize = new Size(381, 129);
Controls.Add(SaveButton);
Controls.Add(CancelButton);
Controls.Add(CostLabel);
Controls.Add(NameLabel);
Controls.Add(CostTextBox);
Controls.Add(NameTextBox);
Margin = new Padding(3, 4, 3, 4);
Name = "ComponentForm";
Text = "ComponentForm";
Text = "Форма компонент";
Load += ComponentForm_Load;
ResumeLayout(false);
PerformLayout();

View File

@ -39,16 +39,19 @@
// DataGridView
//
DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
DataGridView.Location = new Point(12, 12);
DataGridView.Location = new Point(14, 16);
DataGridView.Margin = new Padding(3, 4, 3, 4);
DataGridView.Name = "DataGridView";
DataGridView.Size = new Size(369, 350);
DataGridView.RowHeadersWidth = 51;
DataGridView.Size = new Size(422, 467);
DataGridView.TabIndex = 0;
//
// AddButton
//
AddButton.Location = new Point(387, 12);
AddButton.Location = new Point(442, 16);
AddButton.Margin = new Padding(3, 4, 3, 4);
AddButton.Name = "AddButton";
AddButton.Size = new Size(126, 23);
AddButton.Size = new Size(144, 31);
AddButton.TabIndex = 1;
AddButton.Text = "Добавить";
AddButton.UseVisualStyleBackColor = true;
@ -56,9 +59,10 @@
//
// ChangeButton
//
ChangeButton.Location = new Point(387, 41);
ChangeButton.Location = new Point(442, 55);
ChangeButton.Margin = new Padding(3, 4, 3, 4);
ChangeButton.Name = "ChangeButton";
ChangeButton.Size = new Size(126, 23);
ChangeButton.Size = new Size(144, 31);
ChangeButton.TabIndex = 2;
ChangeButton.Text = "Изменить";
ChangeButton.UseVisualStyleBackColor = true;
@ -66,9 +70,10 @@
//
// DeleteButton
//
DeleteButton.Location = new Point(387, 70);
DeleteButton.Location = new Point(442, 93);
DeleteButton.Margin = new Padding(3, 4, 3, 4);
DeleteButton.Name = "DeleteButton";
DeleteButton.Size = new Size(126, 23);
DeleteButton.Size = new Size(144, 31);
DeleteButton.TabIndex = 3;
DeleteButton.Text = "Удалить";
DeleteButton.UseVisualStyleBackColor = true;
@ -76,9 +81,10 @@
//
// RefreshButton
//
RefreshButton.Location = new Point(387, 99);
RefreshButton.Location = new Point(442, 132);
RefreshButton.Margin = new Padding(3, 4, 3, 4);
RefreshButton.Name = "RefreshButton";
RefreshButton.Size = new Size(126, 23);
RefreshButton.Size = new Size(144, 31);
RefreshButton.TabIndex = 4;
RefreshButton.Text = "Обновить";
RefreshButton.UseVisualStyleBackColor = true;
@ -86,16 +92,17 @@
//
// ComponentsForm
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(525, 374);
ClientSize = new Size(600, 499);
Controls.Add(RefreshButton);
Controls.Add(DeleteButton);
Controls.Add(ChangeButton);
Controls.Add(AddButton);
Controls.Add(DataGridView);
Margin = new Padding(3, 4, 3, 4);
Name = "ComponentsForm";
Text = "ComponentsForm";
Text = "Форма компонентов";
Load += ComponentsForm_Load;
((System.ComponentModel.ISupportInitialize)DataGridView).EndInit();
ResumeLayout(false);

View File

@ -39,41 +39,44 @@
// ComponentLabel
//
ComponentLabel.AutoSize = true;
ComponentLabel.Location = new Point(12, 9);
ComponentLabel.Location = new Point(14, 12);
ComponentLabel.Name = "ComponentLabel";
ComponentLabel.Size = new Size(69, 15);
ComponentLabel.Size = new Size(88, 20);
ComponentLabel.TabIndex = 0;
ComponentLabel.Text = "Компонент";
//
// CountLabel
//
CountLabel.AutoSize = true;
CountLabel.Location = new Point(12, 40);
CountLabel.Location = new Point(14, 53);
CountLabel.Name = "CountLabel";
CountLabel.Size = new Size(72, 15);
CountLabel.Size = new Size(90, 20);
CountLabel.TabIndex = 1;
CountLabel.Text = "Количество";
//
// CountTextBox
//
CountTextBox.Location = new Point(87, 37);
CountTextBox.Location = new Point(99, 49);
CountTextBox.Margin = new Padding(3, 4, 3, 4);
CountTextBox.Name = "CountTextBox";
CountTextBox.Size = new Size(292, 23);
CountTextBox.Size = new Size(333, 27);
CountTextBox.TabIndex = 2;
//
// ComboBox
//
ComboBox.FormattingEnabled = true;
ComboBox.Location = new Point(87, 6);
ComboBox.Location = new Point(99, 8);
ComboBox.Margin = new Padding(3, 4, 3, 4);
ComboBox.Name = "ComboBox";
ComboBox.Size = new Size(292, 23);
ComboBox.Size = new Size(333, 28);
ComboBox.TabIndex = 3;
//
// SaveButton
//
SaveButton.Location = new Point(218, 66);
SaveButton.Location = new Point(249, 88);
SaveButton.Margin = new Padding(3, 4, 3, 4);
SaveButton.Name = "SaveButton";
SaveButton.Size = new Size(75, 23);
SaveButton.Size = new Size(86, 31);
SaveButton.TabIndex = 4;
SaveButton.Text = "Сохранить";
SaveButton.UseVisualStyleBackColor = true;
@ -81,9 +84,10 @@
//
// CancelButton
//
CancelButton.Location = new Point(299, 66);
CancelButton.Location = new Point(342, 88);
CancelButton.Margin = new Padding(3, 4, 3, 4);
CancelButton.Name = "CancelButton";
CancelButton.Size = new Size(75, 23);
CancelButton.Size = new Size(86, 31);
CancelButton.TabIndex = 5;
CancelButton.Text = "Отмена";
CancelButton.UseVisualStyleBackColor = true;
@ -91,17 +95,18 @@
//
// IceCreamComponentForm
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(391, 96);
ClientSize = new Size(447, 128);
Controls.Add(CancelButton);
Controls.Add(SaveButton);
Controls.Add(ComboBox);
Controls.Add(CountTextBox);
Controls.Add(CountLabel);
Controls.Add(ComponentLabel);
Margin = new Padding(3, 4, 3, 4);
Name = "IceCreamComponentForm";
Text = "IceCreamComponentForm";
Text = "Форма компонент мороженного";
ResumeLayout(false);
PerformLayout();
}

View File

@ -50,34 +50,36 @@
// NameLabel
//
NameLabel.AutoSize = true;
NameLabel.Location = new Point(12, 9);
NameLabel.Location = new Point(14, 12);
NameLabel.Name = "NameLabel";
NameLabel.Size = new Size(59, 15);
NameLabel.Size = new Size(77, 20);
NameLabel.TabIndex = 0;
NameLabel.Text = "Название";
//
// PriceLabel
//
PriceLabel.AutoSize = true;
PriceLabel.Location = new Point(12, 35);
PriceLabel.Location = new Point(14, 47);
PriceLabel.Name = "PriceLabel";
PriceLabel.Size = new Size(35, 15);
PriceLabel.Size = new Size(45, 20);
PriceLabel.TabIndex = 1;
PriceLabel.Text = "Цена";
//
// NameTextBox
//
NameTextBox.Location = new Point(77, 6);
NameTextBox.Location = new Point(88, 8);
NameTextBox.Margin = new Padding(3, 4, 3, 4);
NameTextBox.Name = "NameTextBox";
NameTextBox.Size = new Size(237, 23);
NameTextBox.Size = new Size(270, 27);
NameTextBox.TabIndex = 2;
//
// PriceTextBox
//
PriceTextBox.Location = new Point(77, 32);
PriceTextBox.Location = new Point(88, 43);
PriceTextBox.Margin = new Padding(3, 4, 3, 4);
PriceTextBox.Name = "PriceTextBox";
PriceTextBox.ReadOnly = true;
PriceTextBox.Size = new Size(100, 23);
PriceTextBox.Size = new Size(114, 27);
PriceTextBox.TabIndex = 3;
//
// ComponentsGroupBox
@ -87,18 +89,21 @@
ComponentsGroupBox.Controls.Add(UpdateButton);
ComponentsGroupBox.Controls.Add(AddButton);
ComponentsGroupBox.Controls.Add(DataGridView);
ComponentsGroupBox.Location = new Point(12, 64);
ComponentsGroupBox.Location = new Point(14, 85);
ComponentsGroupBox.Margin = new Padding(3, 4, 3, 4);
ComponentsGroupBox.Name = "ComponentsGroupBox";
ComponentsGroupBox.Size = new Size(582, 287);
ComponentsGroupBox.Padding = new Padding(3, 4, 3, 4);
ComponentsGroupBox.Size = new Size(665, 383);
ComponentsGroupBox.TabIndex = 4;
ComponentsGroupBox.TabStop = false;
ComponentsGroupBox.Text = "Компоненты";
//
// RefreshButton
//
RefreshButton.Location = new Point(481, 109);
RefreshButton.Location = new Point(550, 145);
RefreshButton.Margin = new Padding(3, 4, 3, 4);
RefreshButton.Name = "RefreshButton";
RefreshButton.Size = new Size(75, 23);
RefreshButton.Size = new Size(86, 31);
RefreshButton.TabIndex = 4;
RefreshButton.Text = "Обновить";
RefreshButton.UseVisualStyleBackColor = true;
@ -106,9 +111,10 @@
//
// DeleteButton
//
DeleteButton.Location = new Point(481, 80);
DeleteButton.Location = new Point(550, 107);
DeleteButton.Margin = new Padding(3, 4, 3, 4);
DeleteButton.Name = "DeleteButton";
DeleteButton.Size = new Size(75, 23);
DeleteButton.Size = new Size(86, 31);
DeleteButton.TabIndex = 3;
DeleteButton.Text = "Удалить";
DeleteButton.UseVisualStyleBackColor = true;
@ -116,9 +122,10 @@
//
// UpdateButton
//
UpdateButton.Location = new Point(481, 51);
UpdateButton.Location = new Point(550, 68);
UpdateButton.Margin = new Padding(3, 4, 3, 4);
UpdateButton.Name = "UpdateButton";
UpdateButton.Size = new Size(75, 23);
UpdateButton.Size = new Size(86, 31);
UpdateButton.TabIndex = 2;
UpdateButton.Text = "Изменить";
UpdateButton.UseVisualStyleBackColor = true;
@ -126,9 +133,10 @@
//
// AddButton
//
AddButton.Location = new Point(481, 22);
AddButton.Location = new Point(550, 29);
AddButton.Margin = new Padding(3, 4, 3, 4);
AddButton.Name = "AddButton";
AddButton.Size = new Size(75, 23);
AddButton.Size = new Size(86, 31);
AddButton.TabIndex = 1;
AddButton.Text = "Добавить";
AddButton.UseVisualStyleBackColor = true;
@ -138,10 +146,11 @@
//
DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
DataGridView.Columns.AddRange(new DataGridViewColumn[] { IdColumn, ComponentNameColumn, CountColumn });
DataGridView.Location = new Point(6, 22);
DataGridView.Location = new Point(7, 29);
DataGridView.Margin = new Padding(3, 4, 3, 4);
DataGridView.Name = "DataGridView";
DataGridView.RowHeadersWidth = 51;
DataGridView.Size = new Size(442, 259);
DataGridView.Size = new Size(505, 345);
DataGridView.TabIndex = 0;
//
// IdColumn
@ -168,9 +177,10 @@
//
// SaveButton
//
SaveButton.Location = new Point(424, 363);
SaveButton.Location = new Point(485, 484);
SaveButton.Margin = new Padding(3, 4, 3, 4);
SaveButton.Name = "SaveButton";
SaveButton.Size = new Size(75, 23);
SaveButton.Size = new Size(86, 31);
SaveButton.TabIndex = 5;
SaveButton.Text = "Сохранить";
SaveButton.UseVisualStyleBackColor = true;
@ -178,18 +188,19 @@
//
// CancelButton
//
CancelButton.Location = new Point(505, 363);
CancelButton.Location = new Point(577, 484);
CancelButton.Margin = new Padding(3, 4, 3, 4);
CancelButton.Name = "CancelButton";
CancelButton.Size = new Size(75, 23);
CancelButton.Size = new Size(86, 31);
CancelButton.TabIndex = 6;
CancelButton.Text = "Отмена";
CancelButton.UseVisualStyleBackColor = true;
//
// IceCreamForm
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(606, 398);
ClientSize = new Size(693, 531);
Controls.Add(CancelButton);
Controls.Add(SaveButton);
Controls.Add(ComponentsGroupBox);
@ -197,8 +208,9 @@
Controls.Add(NameTextBox);
Controls.Add(PriceLabel);
Controls.Add(NameLabel);
Margin = new Padding(3, 4, 3, 4);
Name = "IceCreamForm";
Text = "IceCreamForm";
Text = "Форма мороженного";
Load += IceCreamForm_Load;
ComponentsGroupBox.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)DataGridView).EndInit();

View File

@ -96,7 +96,7 @@
Controls.Add(AddButton);
Controls.Add(DataGridView);
Name = "IceCreamsForm";
Text = "IceCreamsForm";
Text = "Форма мороженных";
Load += IceCreamsForm_Load;
((System.ComponentModel.ISupportInitialize)DataGridView).EndInit();
ResumeLayout(false);

View File

@ -33,13 +33,13 @@
КомпонентыStripMenuItem = new ToolStripMenuItem();
МороженноеStripMenuItem = new ToolStripMenuItem();
магазиныToolStripMenuItem = new ToolStripMenuItem();
поставкиToolStripMenuItem = new ToolStripMenuItem();
DataGridView = new DataGridView();
CreateOrderButton = new Button();
TakeInWorkButton = new Button();
ReadyButton = new Button();
IssuedButton = new Button();
RefreshButton = new Button();
поставкиToolStripMenuItem = new ToolStripMenuItem();
menuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit();
SuspendLayout();
@ -50,8 +50,8 @@
menuStrip1.Items.AddRange(new ToolStripItem[] { ToolStripMenu });
menuStrip1.Location = new Point(0, 0);
menuStrip1.Name = "menuStrip1";
menuStrip1.Padding = new Padding(5, 2, 0, 2);
menuStrip1.Size = new Size(1134, 24);
menuStrip1.Padding = new Padding(6, 3, 0, 3);
menuStrip1.Size = new Size(1296, 30);
menuStrip1.TabIndex = 0;
menuStrip1.Text = "menuStrip1";
//
@ -59,46 +59,51 @@
//
ToolStripMenu.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыStripMenuItem, МороженноеStripMenuItem, магазиныToolStripMenuItem, поставкиToolStripMenuItem });
ToolStripMenu.Name = "ToolStripMenu";
ToolStripMenu.Size = new Size(94, 20);
ToolStripMenu.Size = new Size(117, 24);
ToolStripMenu.Text = "Справочники";
//
// КомпонентыStripMenuItem
//
КомпонентыStripMenuItem.Name = "КомпонентыStripMenuItem";
КомпонентыStripMenuItem.Size = new Size(180, 22);
КомпонентыStripMenuItem.Size = new Size(186, 26);
КомпонентыStripMenuItem.Text = "Компоненты";
КомпонентыStripMenuItem.Click += КомпонентыStripMenuItem_Click;
//
// МороженноеStripMenuItem
//
МороженноеStripMenuItem.Name = "МороженноеStripMenuItem";
МороженноеStripMenuItem.Size = new Size(180, 22);
МороженноеStripMenuItem.Size = new Size(186, 26);
МороженноеStripMenuItem.Text = "Мороженное";
МороженноеStripMenuItem.Click += МороженноеStripMenuItem_Click;
//
// магазиныToolStripMenuItem
//
магазиныToolStripMenuItem.Name = агазиныToolStripMenuItem";
магазиныToolStripMenuItem.Size = new Size(180, 22);
магазиныToolStripMenuItem.Size = new Size(186, 26);
магазиныToolStripMenuItem.Text = "Магазины";
магазиныToolStripMenuItem.Click += магазиныToolStripMenuItem_Click;
//
// поставкиToolStripMenuItem
//
поставкиToolStripMenuItem.Name = "поставкиToolStripMenuItem";
поставкиToolStripMenuItem.Size = new Size(186, 26);
поставкиToolStripMenuItem.Text = "Поставки";
поставкиToolStripMenuItem.Click += поставкиToolStripMenuItem_Click;
//
// DataGridView
//
DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
DataGridView.Location = new Point(10, 23);
DataGridView.Margin = new Padding(3, 2, 3, 2);
DataGridView.Location = new Point(11, 31);
DataGridView.Name = "DataGridView";
DataGridView.RowHeadersWidth = 51;
DataGridView.Size = new Size(881, 305);
DataGridView.Size = new Size(1007, 407);
DataGridView.TabIndex = 1;
//
// CreateOrderButton
//
CreateOrderButton.Location = new Point(897, 23);
CreateOrderButton.Margin = new Padding(3, 2, 3, 2);
CreateOrderButton.Location = new Point(1025, 31);
CreateOrderButton.Name = "CreateOrderButton";
CreateOrderButton.Size = new Size(227, 22);
CreateOrderButton.Size = new Size(259, 29);
CreateOrderButton.TabIndex = 2;
CreateOrderButton.Text = "Создать заказ";
CreateOrderButton.UseVisualStyleBackColor = true;
@ -106,10 +111,9 @@
//
// TakeInWorkButton
//
TakeInWorkButton.Location = new Point(897, 50);
TakeInWorkButton.Margin = new Padding(3, 2, 3, 2);
TakeInWorkButton.Location = new Point(1025, 67);
TakeInWorkButton.Name = "TakeInWorkButton";
TakeInWorkButton.Size = new Size(227, 22);
TakeInWorkButton.Size = new Size(259, 29);
TakeInWorkButton.TabIndex = 3;
TakeInWorkButton.Text = "Отдать заказ в работу";
TakeInWorkButton.UseVisualStyleBackColor = true;
@ -117,10 +121,9 @@
//
// ReadyButton
//
ReadyButton.Location = new Point(897, 76);
ReadyButton.Margin = new Padding(3, 2, 3, 2);
ReadyButton.Location = new Point(1025, 101);
ReadyButton.Name = "ReadyButton";
ReadyButton.Size = new Size(227, 22);
ReadyButton.Size = new Size(259, 29);
ReadyButton.TabIndex = 4;
ReadyButton.Text = "Заказ готов";
ReadyButton.UseVisualStyleBackColor = true;
@ -128,10 +131,9 @@
//
// IssuedButton
//
IssuedButton.Location = new Point(897, 102);
IssuedButton.Margin = new Padding(3, 2, 3, 2);
IssuedButton.Location = new Point(1025, 136);
IssuedButton.Name = "IssuedButton";
IssuedButton.Size = new Size(227, 22);
IssuedButton.Size = new Size(259, 29);
IssuedButton.TabIndex = 5;
IssuedButton.Text = "Заказ выдан";
IssuedButton.UseVisualStyleBackColor = true;
@ -139,27 +141,19 @@
//
// RefreshButton
//
RefreshButton.Location = new Point(897, 128);
RefreshButton.Margin = new Padding(3, 2, 3, 2);
RefreshButton.Location = new Point(1025, 171);
RefreshButton.Name = "RefreshButton";
RefreshButton.Size = new Size(227, 22);
RefreshButton.Size = new Size(259, 29);
RefreshButton.TabIndex = 6;
RefreshButton.Text = "Обновить";
RefreshButton.UseVisualStyleBackColor = true;
RefreshButton.Click += RefreshButton_Click;
//
// поставкиToolStripMenuItem
//
поставкиToolStripMenuItem.Name = "поставкиToolStripMenuItem";
поставкиToolStripMenuItem.Size = new Size(180, 22);
поставкиToolStripMenuItem.Text = "Поставки";
поставкиToolStripMenuItem.Click += поставкиToolStripMenuItem_Click;
//
// MainForm
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(1134, 338);
ClientSize = new Size(1296, 451);
Controls.Add(RefreshButton);
Controls.Add(IssuedButton);
Controls.Add(ReadyButton);
@ -168,9 +162,8 @@
Controls.Add(DataGridView);
Controls.Add(menuStrip1);
MainMenuStrip = menuStrip1;
Margin = new Padding(3, 2, 3, 2);
Name = "MainForm";
Text = "MainForm";
Text = "Форма главная";
Load += MainForm_Load;
menuStrip1.ResumeLayout(false);
menuStrip1.PerformLayout();

View File

@ -41,34 +41,38 @@
// IceCreamComboBox
//
IceCreamComboBox.FormattingEnabled = true;
IceCreamComboBox.Location = new Point(103, 12);
IceCreamComboBox.Location = new Point(118, 16);
IceCreamComboBox.Margin = new Padding(3, 4, 3, 4);
IceCreamComboBox.Name = "IceCreamComboBox";
IceCreamComboBox.Size = new Size(232, 23);
IceCreamComboBox.Size = new Size(265, 28);
IceCreamComboBox.TabIndex = 0;
IceCreamComboBox.SelectedIndexChanged += IceCreamComboBox_SelectedIndexChanged;
//
// CountTextBox
//
CountTextBox.Location = new Point(103, 41);
CountTextBox.Location = new Point(118, 55);
CountTextBox.Margin = new Padding(3, 4, 3, 4);
CountTextBox.Name = "CountTextBox";
CountTextBox.Size = new Size(232, 23);
CountTextBox.Size = new Size(265, 27);
CountTextBox.TabIndex = 1;
CountTextBox.TextChanged += CountTextBox_TextChanged;
//
// SumTextBox
//
SumTextBox.Location = new Point(103, 70);
SumTextBox.Location = new Point(118, 93);
SumTextBox.Margin = new Padding(3, 4, 3, 4);
SumTextBox.Name = "SumTextBox";
SumTextBox.ReadOnly = true;
SumTextBox.Size = new Size(232, 23);
SumTextBox.Size = new Size(265, 27);
SumTextBox.TabIndex = 2;
SumTextBox.TextChanged += SumTextBox_TextChanged;
//
// SaveButton
//
SaveButton.Location = new Point(173, 99);
SaveButton.Location = new Point(198, 132);
SaveButton.Margin = new Padding(3, 4, 3, 4);
SaveButton.Name = "SaveButton";
SaveButton.Size = new Size(81, 23);
SaveButton.Size = new Size(93, 31);
SaveButton.TabIndex = 3;
SaveButton.Text = "Сохранить";
SaveButton.UseVisualStyleBackColor = true;
@ -76,9 +80,10 @@
//
// CancelButton
//
CancelButton.Location = new Point(260, 99);
CancelButton.Location = new Point(297, 132);
CancelButton.Margin = new Padding(3, 4, 3, 4);
CancelButton.Name = "CancelButton";
CancelButton.Size = new Size(75, 23);
CancelButton.Size = new Size(86, 31);
CancelButton.TabIndex = 4;
CancelButton.Text = "Отмена";
CancelButton.UseVisualStyleBackColor = true;
@ -87,35 +92,35 @@
// IceCreamLabel
//
IceCreamLabel.AutoSize = true;
IceCreamLabel.Location = new Point(12, 15);
IceCreamLabel.Location = new Point(14, 20);
IceCreamLabel.Name = "IceCreamLabel";
IceCreamLabel.Size = new Size(81, 15);
IceCreamLabel.Size = new Size(103, 20);
IceCreamLabel.TabIndex = 5;
IceCreamLabel.Text = "Мороженное";
//
// CountLabel
//
CountLabel.AutoSize = true;
CountLabel.Location = new Point(12, 44);
CountLabel.Location = new Point(14, 59);
CountLabel.Name = "CountLabel";
CountLabel.Size = new Size(72, 15);
CountLabel.Size = new Size(90, 20);
CountLabel.TabIndex = 6;
CountLabel.Text = "Количество";
//
// SumLabel
//
SumLabel.AutoSize = true;
SumLabel.Location = new Point(12, 73);
SumLabel.Location = new Point(14, 97);
SumLabel.Name = "SumLabel";
SumLabel.Size = new Size(45, 15);
SumLabel.Size = new Size(55, 20);
SumLabel.TabIndex = 7;
SumLabel.Text = "Сумма";
//
// OrderForm
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(348, 128);
ClientSize = new Size(398, 171);
Controls.Add(SumLabel);
Controls.Add(CountLabel);
Controls.Add(IceCreamLabel);
@ -124,8 +129,9 @@
Controls.Add(SumTextBox);
Controls.Add(CountTextBox);
Controls.Add(IceCreamComboBox);
Margin = new Padding(3, 4, 3, 4);
Name = "OrderForm";
Text = "OrderForm";
Text = "Форма заказа";
Load += OrderForm_Load;
ResumeLayout(false);
PerformLayout();

View File

@ -46,57 +46,61 @@
//
// DateTimePicker
//
DateTimePicker.Location = new Point(85, 70);
DateTimePicker.Location = new Point(97, 93);
DateTimePicker.Margin = new Padding(3, 4, 3, 4);
DateTimePicker.Name = "DateTimePicker";
DateTimePicker.Size = new Size(318, 23);
DateTimePicker.Size = new Size(363, 27);
DateTimePicker.TabIndex = 0;
//
// NameTextBox
//
NameTextBox.Location = new Point(85, 12);
NameTextBox.Location = new Point(97, 16);
NameTextBox.Margin = new Padding(3, 4, 3, 4);
NameTextBox.Name = "NameTextBox";
NameTextBox.Size = new Size(318, 23);
NameTextBox.Size = new Size(363, 27);
NameTextBox.TabIndex = 1;
//
// AddressTextBox
//
AddressTextBox.Location = new Point(85, 41);
AddressTextBox.Location = new Point(97, 55);
AddressTextBox.Margin = new Padding(3, 4, 3, 4);
AddressTextBox.Name = "AddressTextBox";
AddressTextBox.Size = new Size(318, 23);
AddressTextBox.Size = new Size(363, 27);
AddressTextBox.TabIndex = 2;
//
// NameLabel
//
NameLabel.AutoSize = true;
NameLabel.Location = new Point(12, 15);
NameLabel.Location = new Point(14, 20);
NameLabel.Name = "NameLabel";
NameLabel.Size = new Size(59, 15);
NameLabel.Size = new Size(77, 20);
NameLabel.TabIndex = 3;
NameLabel.Text = "Название";
//
// AdressLabel
//
AdressLabel.AutoSize = true;
AdressLabel.Location = new Point(12, 44);
AdressLabel.Location = new Point(14, 59);
AdressLabel.Name = "AdressLabel";
AdressLabel.Size = new Size(40, 15);
AdressLabel.Size = new Size(51, 20);
AdressLabel.TabIndex = 4;
AdressLabel.Text = "Адрес";
//
// DateLabel
//
DateLabel.AutoSize = true;
DateLabel.Location = new Point(12, 76);
DateLabel.Location = new Point(14, 101);
DateLabel.Name = "DateLabel";
DateLabel.Size = new Size(32, 15);
DateLabel.Size = new Size(41, 20);
DateLabel.TabIndex = 5;
DateLabel.Text = "Дата";
//
// SaveButton
//
SaveButton.Location = new Point(247, 255);
SaveButton.Location = new Point(282, 340);
SaveButton.Margin = new Padding(3, 4, 3, 4);
SaveButton.Name = "SaveButton";
SaveButton.Size = new Size(75, 23);
SaveButton.Size = new Size(86, 31);
SaveButton.TabIndex = 6;
SaveButton.Text = "Сохранить";
SaveButton.UseVisualStyleBackColor = true;
@ -104,9 +108,10 @@
//
// CancelButton
//
CancelButton.Location = new Point(328, 255);
CancelButton.Location = new Point(375, 340);
CancelButton.Margin = new Padding(3, 4, 3, 4);
CancelButton.Name = "CancelButton";
CancelButton.Size = new Size(75, 23);
CancelButton.Size = new Size(86, 31);
CancelButton.TabIndex = 7;
CancelButton.Text = "Отмена";
CancelButton.UseVisualStyleBackColor = true;
@ -116,20 +121,25 @@
//
DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
DataGridView.Columns.AddRange(new DataGridViewColumn[] { Column1, Название, Цена, Количество });
DataGridView.Location = new Point(12, 99);
DataGridView.Location = new Point(14, 132);
DataGridView.Margin = new Padding(3, 4, 3, 4);
DataGridView.Name = "DataGridView";
DataGridView.Size = new Size(391, 150);
DataGridView.RowHeadersWidth = 51;
DataGridView.Size = new Size(447, 200);
DataGridView.TabIndex = 8;
//
// Column1
//
Column1.HeaderText = "Column1";
Column1.MinimumWidth = 6;
Column1.Name = "Column1";
Column1.Visible = false;
Column1.Width = 125;
//
// Название
//
Название.HeaderText = "Название";
Название.MinimumWidth = 6;
Название.Name = "Название";
Название.ReadOnly = true;
Название.Width = 150;
@ -137,20 +147,24 @@
// Цена
//
Цена.HeaderText = "Цена";
Цена.MinimumWidth = 6;
Цена.Name = "Цена";
Цена.ReadOnly = true;
Цена.Width = 125;
//
// Количество
//
Количество.HeaderText = "Количество";
Количество.MinimumWidth = 6;
Количество.Name = "Количество";
Количество.ReadOnly = true;
Количество.Width = 125;
//
// ShopForm
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(411, 285);
ClientSize = new Size(470, 380);
Controls.Add(DataGridView);
Controls.Add(CancelButton);
Controls.Add(SaveButton);
@ -160,8 +174,9 @@
Controls.Add(AddressTextBox);
Controls.Add(NameTextBox);
Controls.Add(DateTimePicker);
Margin = new Padding(3, 4, 3, 4);
Name = "ShopForm";
Text = "ShopForm";
Text = "Форма магазина";
Load += ShopForm_Load;
((System.ComponentModel.ISupportInitialize)DataGridView).EndInit();
ResumeLayout(false);

View File

@ -39,16 +39,19 @@
// DataGridView
//
DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
DataGridView.Location = new Point(12, 12);
DataGridView.Location = new Point(14, 16);
DataGridView.Margin = new Padding(3, 4, 3, 4);
DataGridView.Name = "DataGridView";
DataGridView.Size = new Size(393, 374);
DataGridView.RowHeadersWidth = 51;
DataGridView.Size = new Size(449, 499);
DataGridView.TabIndex = 0;
//
// AddButton
//
AddButton.Location = new Point(411, 12);
AddButton.Location = new Point(470, 16);
AddButton.Margin = new Padding(3, 4, 3, 4);
AddButton.Name = "AddButton";
AddButton.Size = new Size(114, 23);
AddButton.Size = new Size(130, 31);
AddButton.TabIndex = 1;
AddButton.Text = "Добавить";
AddButton.UseVisualStyleBackColor = true;
@ -56,9 +59,10 @@
//
// UpdateButton
//
UpdateButton.Location = new Point(411, 41);
UpdateButton.Location = new Point(470, 55);
UpdateButton.Margin = new Padding(3, 4, 3, 4);
UpdateButton.Name = "UpdateButton";
UpdateButton.Size = new Size(114, 23);
UpdateButton.Size = new Size(130, 31);
UpdateButton.TabIndex = 2;
UpdateButton.Text = "Изменить";
UpdateButton.UseVisualStyleBackColor = true;
@ -66,9 +70,10 @@
//
// RefreshButton
//
RefreshButton.Location = new Point(411, 70);
RefreshButton.Location = new Point(470, 93);
RefreshButton.Margin = new Padding(3, 4, 3, 4);
RefreshButton.Name = "RefreshButton";
RefreshButton.Size = new Size(114, 23);
RefreshButton.Size = new Size(130, 31);
RefreshButton.TabIndex = 3;
RefreshButton.Text = "Обновить";
RefreshButton.UseVisualStyleBackColor = true;
@ -76,9 +81,10 @@
//
// DeleteButton
//
DeleteButton.Location = new Point(411, 99);
DeleteButton.Location = new Point(470, 132);
DeleteButton.Margin = new Padding(3, 4, 3, 4);
DeleteButton.Name = "DeleteButton";
DeleteButton.Size = new Size(114, 23);
DeleteButton.Size = new Size(130, 31);
DeleteButton.TabIndex = 4;
DeleteButton.Text = "Удалить";
DeleteButton.UseVisualStyleBackColor = true;
@ -86,16 +92,17 @@
//
// ShopsForm
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(539, 403);
ClientSize = new Size(616, 537);
Controls.Add(DeleteButton);
Controls.Add(RefreshButton);
Controls.Add(UpdateButton);
Controls.Add(AddButton);
Controls.Add(DataGridView);
Margin = new Padding(3, 4, 3, 4);
Name = "ShopsForm";
Text = "ShopsForm";
Text = "Форма магазинов";
Load += ShopsForm_Load;
((System.ComponentModel.ISupportInitialize)DataGridView).EndInit();
ResumeLayout(false);

View File

@ -38,31 +38,35 @@
// ShopComboBox
//
ShopComboBox.FormattingEnabled = true;
ShopComboBox.Location = new Point(12, 12);
ShopComboBox.Location = new Point(14, 16);
ShopComboBox.Margin = new Padding(3, 4, 3, 4);
ShopComboBox.Name = "ShopComboBox";
ShopComboBox.Size = new Size(331, 23);
ShopComboBox.Size = new Size(378, 28);
ShopComboBox.TabIndex = 0;
//
// IceCreamComboBox
//
IceCreamComboBox.FormattingEnabled = true;
IceCreamComboBox.Location = new Point(12, 41);
IceCreamComboBox.Location = new Point(14, 55);
IceCreamComboBox.Margin = new Padding(3, 4, 3, 4);
IceCreamComboBox.Name = "IceCreamComboBox";
IceCreamComboBox.Size = new Size(331, 23);
IceCreamComboBox.Size = new Size(378, 28);
IceCreamComboBox.TabIndex = 1;
//
// CountTextBox
//
CountTextBox.Location = new Point(12, 70);
CountTextBox.Location = new Point(14, 93);
CountTextBox.Margin = new Padding(3, 4, 3, 4);
CountTextBox.Name = "CountTextBox";
CountTextBox.Size = new Size(331, 23);
CountTextBox.Size = new Size(378, 27);
CountTextBox.TabIndex = 2;
//
// SaveButton
//
SaveButton.Location = new Point(187, 99);
SaveButton.Location = new Point(214, 132);
SaveButton.Margin = new Padding(3, 4, 3, 4);
SaveButton.Name = "SaveButton";
SaveButton.Size = new Size(75, 23);
SaveButton.Size = new Size(86, 31);
SaveButton.TabIndex = 3;
SaveButton.Text = "Сохранить";
SaveButton.UseVisualStyleBackColor = true;
@ -70,9 +74,10 @@
//
// CancelButton
//
CancelButton.Location = new Point(268, 99);
CancelButton.Location = new Point(306, 132);
CancelButton.Margin = new Padding(3, 4, 3, 4);
CancelButton.Name = "CancelButton";
CancelButton.Size = new Size(75, 23);
CancelButton.Size = new Size(86, 31);
CancelButton.TabIndex = 4;
CancelButton.Text = "Отмена";
CancelButton.UseVisualStyleBackColor = true;
@ -80,16 +85,17 @@
//
// SupplyForm
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(355, 136);
ClientSize = new Size(406, 181);
Controls.Add(CancelButton);
Controls.Add(SaveButton);
Controls.Add(CountTextBox);
Controls.Add(IceCreamComboBox);
Controls.Add(ShopComboBox);
Margin = new Padding(3, 4, 3, 4);
Name = "SupplyForm";
Text = "SupplyForm";
Text = "Форма поставок";
ResumeLayout(false);
PerformLayout();
}

View File

@ -46,12 +46,7 @@ namespace IceCreamShopListImplement.Models
{
return;
}
Id = model.Id;
IceCreamId = model.IceCreamId;
Count = model.Count;
Sum = model.Sum;
Status = model.Status;
DateCreate = model.DateCreate;
DateImplement = model.DateImplement;
}
public OrderViewModel GetViewModel => new()