ПИбд-23 Салин Олег Алексеевич Лабораторная работа №2 #6

Closed
Oleja123 wants to merge 4 commits from Lab2 into Lab1
8 changed files with 145 additions and 98 deletions
Showing only changes of commit d67130ca15 - 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

@ -146,7 +146,7 @@
Controls.Add(menuStrip1);
MainMenuStrip = menuStrip1;
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

@ -22,7 +22,7 @@ namespace IceCreamShopFileImplement.Implements
public List<OrderViewModel> GetFullList()
{
return source.Orders
.Select(x => x.GetViewModel)
.Select(x => AccessIceCreamStorage(x.GetViewModel))
.ToList();
}
@ -35,7 +35,7 @@ model)
}
return source.Orders
.Where(x => x.Id == model.Id)
.Select(x => x.GetViewModel)
.Select( x => AccessIceCreamStorage( x.GetViewModel))
.ToList();
}
@ -45,8 +45,8 @@ model)
{
return null;
}
return source.Orders
.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
return AccessIceCreamStorage(source.Orders
.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel);
}
public OrderViewModel? Insert(OrderBindingModel model)
@ -59,7 +59,7 @@ model)
}
source.Orders.Add(newOrder);
source.SaveOrders();
return newOrder.GetViewModel;
return AccessIceCreamStorage(newOrder.GetViewModel);
}
public OrderViewModel? Update(OrderBindingModel model)
@ -71,7 +71,7 @@ model)
}
order.Update(model);
source.SaveOrders();
return order.GetViewModel;
return AccessIceCreamStorage(order.GetViewModel);
}
public OrderViewModel? Delete(OrderBindingModel model)
{
@ -81,11 +81,23 @@ model)
{
source.Orders.Remove(element);
source.SaveOrders();
return element.GetViewModel;
return AccessIceCreamStorage(element.GetViewModel);
}
return null;
}
public OrderViewModel AccessIceCreamStorage(OrderViewModel model)
{
foreach (var iceCream in source.IceCreams)
{
if (iceCream.Id == model.IceCreamId)
Review

Значение можно получить через LINQ-запрос

Значение можно получить через LINQ-запрос
{
model.IceCreamName = iceCream.IceCreamName;
break;
}
}
return model;
}
}
}