diff --git a/IceCreamShop/IceCreamShop.sln b/IceCreamShop/IceCreamShop.sln
index 70f6641..fee3e3e 100644
--- a/IceCreamShop/IceCreamShop.sln
+++ b/IceCreamShop/IceCreamShop.sln
@@ -5,13 +5,15 @@ VisualStudioVersion = 17.8.34309.116
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IceCreamShop", "IceCreamShop\IceCreamShop.csproj", "{CD111C92-FD71-4F7E-A7E7-03C273B634E6}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IceCreamShopDataModels", "IceCreamShopDataModels\IceCreamShopDataModels.csproj", "{0979632B-BB70-441E-9109-C52DBA5A85B2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IceCreamShopDataModels", "IceCreamShopDataModels\IceCreamShopDataModels.csproj", "{0979632B-BB70-441E-9109-C52DBA5A85B2}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IceCreamShopContracts", "IceCreamShopContracts\IceCreamShopContracts.csproj", "{8D344A7A-951D-496B-BC8A-DF18A06B1DF0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IceCreamShopContracts", "IceCreamShopContracts\IceCreamShopContracts.csproj", "{8D344A7A-951D-496B-BC8A-DF18A06B1DF0}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IceCreamShopBusinessLogic", "IceCreamShopBusinessLogic\IceCreamShopBusinessLogic.csproj", "{6E71A941-D9B0-47F8-A180-78D544754C4F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IceCreamShopBusinessLogic", "IceCreamShopBusinessLogic\IceCreamShopBusinessLogic.csproj", "{6E71A941-D9B0-47F8-A180-78D544754C4F}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IceCreamShopListImplement", "IceCreamShopListImplement\IceCreamShopListImplement.csproj", "{566BA4F5-7316-4747-A745-FCA934EBA9E0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IceCreamShopListImplement", "IceCreamShopListImplement\IceCreamShopListImplement.csproj", "{566BA4F5-7316-4747-A745-FCA934EBA9E0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IceCreamShopFileImplement", "IceCreamShopFileImplement\IceCreamShopFileImplement.csproj", "{A689B62C-67DF-47D8-B265-6C453D1055DA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,6 +41,10 @@ Global
{566BA4F5-7316-4747-A745-FCA934EBA9E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{566BA4F5-7316-4747-A745-FCA934EBA9E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{566BA4F5-7316-4747-A745-FCA934EBA9E0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A689B62C-67DF-47D8-B265-6C453D1055DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A689B62C-67DF-47D8-B265-6C453D1055DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A689B62C-67DF-47D8-B265-6C453D1055DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A689B62C-67DF-47D8-B265-6C453D1055DA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/IceCreamShop/IceCreamShop/ComponentForm.Designer.cs b/IceCreamShop/IceCreamShop/ComponentForm.Designer.cs
index 510512c..c3bb312 100644
--- a/IceCreamShop/IceCreamShop/ComponentForm.Designer.cs
+++ b/IceCreamShop/IceCreamShop/ComponentForm.Designer.cs
@@ -38,7 +38,7 @@
//
// NameTextBox
//
- NameTextBox.Location = new Point(92, 13);
+ NameTextBox.Location = new Point(91, 13);
NameTextBox.Margin = new Padding(3, 4, 3, 4);
NameTextBox.Name = "NameTextBox";
NameTextBox.Size = new Size(277, 27);
@@ -46,7 +46,7 @@
//
// CostTextBox
//
- CostTextBox.Location = new Point(92, 56);
+ CostTextBox.Location = new Point(91, 56);
CostTextBox.Margin = new Padding(3, 4, 3, 4);
CostTextBox.Name = "CostTextBox";
CostTextBox.Size = new Size(135, 27);
@@ -108,7 +108,7 @@
Controls.Add(NameTextBox);
Margin = new Padding(3, 4, 3, 4);
Name = "ComponentForm";
- Text = "Компонент";
+ Text = "Форма компонент";
Load += ComponentForm_Load;
ResumeLayout(false);
PerformLayout();
diff --git a/IceCreamShop/IceCreamShop/ComponentsForm.Designer.cs b/IceCreamShop/IceCreamShop/ComponentsForm.Designer.cs
index 9a2ef3d..f030d2f 100644
--- a/IceCreamShop/IceCreamShop/ComponentsForm.Designer.cs
+++ b/IceCreamShop/IceCreamShop/ComponentsForm.Designer.cs
@@ -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 = "Компоненты";
+ Text = "Форма компонентов";
Load += ComponentsForm_Load;
((System.ComponentModel.ISupportInitialize)DataGridView).EndInit();
ResumeLayout(false);
diff --git a/IceCreamShop/IceCreamShop/IceCreamComponentForm.Designer.cs b/IceCreamShop/IceCreamShop/IceCreamComponentForm.Designer.cs
index cfa4ba4..616115a 100644
--- a/IceCreamShop/IceCreamShop/IceCreamComponentForm.Designer.cs
+++ b/IceCreamShop/IceCreamShop/IceCreamComponentForm.Designer.cs
@@ -106,7 +106,7 @@
Controls.Add(ComponentLabel);
Margin = new Padding(3, 4, 3, 4);
Name = "IceCreamComponentForm";
- Text = "Компонент мороженного";
+ Text = "Форма компонент мороженного";
ResumeLayout(false);
PerformLayout();
}
diff --git a/IceCreamShop/IceCreamShop/IceCreamForm.Designer.cs b/IceCreamShop/IceCreamShop/IceCreamForm.Designer.cs
index 9c2476e..4f50382 100644
--- a/IceCreamShop/IceCreamShop/IceCreamForm.Designer.cs
+++ b/IceCreamShop/IceCreamShop/IceCreamForm.Designer.cs
@@ -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 = "Мороженное";
+ Text = "Форма мороженного";
Load += IceCreamForm_Load;
ComponentsGroupBox.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)DataGridView).EndInit();
diff --git a/IceCreamShop/IceCreamShop/IceCreamShop.csproj b/IceCreamShop/IceCreamShop/IceCreamShop.csproj
index c0a5632..5aaeb5f 100644
--- a/IceCreamShop/IceCreamShop/IceCreamShop.csproj
+++ b/IceCreamShop/IceCreamShop/IceCreamShop.csproj
@@ -16,6 +16,7 @@
+
diff --git a/IceCreamShop/IceCreamShop/IceCreamsForm.Designer.cs b/IceCreamShop/IceCreamShop/IceCreamsForm.Designer.cs
index 4bb5d0d..d61e558 100644
--- a/IceCreamShop/IceCreamShop/IceCreamsForm.Designer.cs
+++ b/IceCreamShop/IceCreamShop/IceCreamsForm.Designer.cs
@@ -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);
diff --git a/IceCreamShop/IceCreamShop/MainForm.Designer.cs b/IceCreamShop/IceCreamShop/MainForm.Designer.cs
index 2b62d4f..a42cf5e 100644
--- a/IceCreamShop/IceCreamShop/MainForm.Designer.cs
+++ b/IceCreamShop/IceCreamShop/MainForm.Designer.cs
@@ -146,7 +146,7 @@
Controls.Add(menuStrip1);
MainMenuStrip = menuStrip1;
Name = "MainForm";
- Text = "MainForm";
+ Text = "Форма главная";
Load += MainForm_Load;
menuStrip1.ResumeLayout(false);
menuStrip1.PerformLayout();
diff --git a/IceCreamShop/IceCreamShop/OrderForm.Designer.cs b/IceCreamShop/IceCreamShop/OrderForm.Designer.cs
index 78d58c6..5149eb0 100644
--- a/IceCreamShop/IceCreamShop/OrderForm.Designer.cs
+++ b/IceCreamShop/IceCreamShop/OrderForm.Designer.cs
@@ -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();
diff --git a/IceCreamShop/IceCreamShop/Program.cs b/IceCreamShop/IceCreamShop/Program.cs
index f670921..27b419a 100644
--- a/IceCreamShop/IceCreamShop/Program.cs
+++ b/IceCreamShop/IceCreamShop/Program.cs
@@ -1,7 +1,7 @@
using IceCreamShopBusinessLogic.BusinessLogic;
using IceCreamShopContracts.BusinessLogicsContracts;
using IceCreamShopContracts.StoragesContracts;
-using IceCreamShopListImplement.Implements;
+using IceCreamShopFileImplement.Implements;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
diff --git a/IceCreamShop/IceCreamShopFileImplement/DataFileSingleton.cs b/IceCreamShop/IceCreamShopFileImplement/DataFileSingleton.cs
new file mode 100644
index 0000000..0bd54c8
--- /dev/null
+++ b/IceCreamShop/IceCreamShopFileImplement/DataFileSingleton.cs
@@ -0,0 +1,67 @@
+using IceCreamShopFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace IceCreamShopFileImplement
+{
+ internal class DataFileSingleton
+ {
+ private static DataFileSingleton? instance;
+ private readonly string ComponentFileName = "Component.xml";
+ private readonly string OrderFileName = "Order.xml";
+ private readonly string IceCreamFileName = "IceCream.xml";
+ public List Components { get; private set; }
+ public List Orders { get; private set; }
+ public List IceCreams { get; private set; }
+
+ public static DataFileSingleton GetInstance()
+ {
+ if (instance == null)
+ {
+ instance = new DataFileSingleton();
+ }
+ return instance;
+ }
+
+ public void SaveComponents() => SaveData(Components, ComponentFileName,
+"Components", x => x.GetXElement);
+ public void SaveIceCreams() => SaveData(IceCreams, IceCreamFileName,
+ "IceCreams", x => x.GetXElement);
+ public void SaveOrders() => SaveData(Orders, OrderFileName,
+ "Orders", x => x.GetXElement);
+ private DataFileSingleton()
+ {
+ Components = LoadData(ComponentFileName, "Component", x =>
+ Component.Create(x)!)!;
+ IceCreams = LoadData(IceCreamFileName, "IceCream", x =>
+ IceCream.Create(x)!)!;
+ Orders = LoadData(OrderFileName, "Order", x =>
+ Order.Create(x)!)!;
+ }
+ private static List? LoadData(string filename, string xmlNodeName,
+ Func selectFunction)
+ {
+ if (File.Exists(filename))
+ {
+ return
+ XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList();
+ }
+ return new List();
+ }
+ private static void SaveData(List data, string filename, string
+ xmlNodeName, Func selectFunction)
+ {
+ if (data != null)
+ {
+ new XDocument(new XElement(xmlNodeName,
+ data.Select(selectFunction).ToArray())).Save(filename);
+ }
+ }
+
+
+ }
+}
diff --git a/IceCreamShop/IceCreamShopFileImplement/IceCreamShopFileImplement.csproj b/IceCreamShop/IceCreamShopFileImplement/IceCreamShopFileImplement.csproj
new file mode 100644
index 0000000..5e48dc2
--- /dev/null
+++ b/IceCreamShop/IceCreamShopFileImplement/IceCreamShopFileImplement.csproj
@@ -0,0 +1,14 @@
+
+
+
+ net8.0
+ enable
+ enable
+
+
+
+
+
+
+
+
diff --git a/IceCreamShop/IceCreamShopFileImplement/Implements/ComponentStorage.cs b/IceCreamShop/IceCreamShopFileImplement/Implements/ComponentStorage.cs
new file mode 100644
index 0000000..96a5665
--- /dev/null
+++ b/IceCreamShop/IceCreamShopFileImplement/Implements/ComponentStorage.cs
@@ -0,0 +1,90 @@
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.SearchModels;
+using IceCreamShopContracts.StoragesContracts;
+using IceCreamShopContracts.ViewModels;
+using IceCreamShopFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IceCreamShopFileImplement.Implements
+{
+ public class ComponentStorage : IComponentStorage
+ {
+ private readonly DataFileSingleton source;
+ public ComponentStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+ public List GetFullList()
+ {
+ return source.Components
+ .Select(x => x.GetViewModel)
+ .ToList();
+ }
+ public List GetFilteredList(ComponentSearchModel
+ model)
+ {
+ if (string.IsNullOrEmpty(model.ComponentName))
+ {
+ return new();
+ }
+ return source.Components
+ .Where(x => x.ComponentName.Contains(model.ComponentName))
+ .Select(x => x.GetViewModel)
+ .ToList();
+ }
+ public ComponentViewModel? GetElement(ComponentSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue)
+ {
+ return null;
+ }
+ return source.Components
+ .FirstOrDefault(x =>
+ (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName ==
+ model.ComponentName) ||
+ (model.Id.HasValue && x.Id == model.Id))
+ ?.GetViewModel;
+ }
+ public ComponentViewModel? Insert(ComponentBindingModel model)
+ {
+ model.Id = source.Components.Count > 0 ? source.Components.Max(x =>
+ x.Id) + 1 : 1;
+ var newComponent = Component.Create(model);
+ if (newComponent == null)
+ {
+ return null;
+ }
+ source.Components.Add(newComponent);
+ source.SaveComponents();
+ return newComponent.GetViewModel;
+ }
+ public ComponentViewModel? Update(ComponentBindingModel model)
+ {
+ var component = source.Components.FirstOrDefault(x => x.Id ==
+ model.Id);
+ if (component == null)
+ {
+ return null;
+ }
+ component.Update(model);
+ source.SaveComponents();
+ return component.GetViewModel;
+ }
+ public ComponentViewModel? Delete(ComponentBindingModel model)
+ {
+ var element = source.Components.FirstOrDefault(x => x.Id ==
+ model.Id);
+ if (element != null)
+ {
+ source.Components.Remove(element);
+ source.SaveComponents();
+ return element.GetViewModel;
+ }
+ return null;
+ }
+ }
+}
diff --git a/IceCreamShop/IceCreamShopFileImplement/Implements/IceCreamStorage.cs b/IceCreamShop/IceCreamShopFileImplement/Implements/IceCreamStorage.cs
new file mode 100644
index 0000000..234bd35
--- /dev/null
+++ b/IceCreamShop/IceCreamShopFileImplement/Implements/IceCreamStorage.cs
@@ -0,0 +1,95 @@
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.SearchModels;
+using IceCreamShopContracts.StoragesContracts;
+using IceCreamShopContracts.ViewModels;
+using IceCreamShopFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IceCreamShopFileImplement.Implements
+{
+ public class IceCreamStorage : IIceCreamStorage
+ {
+ private readonly DataFileSingleton source;
+ public IceCreamStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+ public List GetFullList()
+ {
+ return source.IceCreams
+ .Select(x => x.GetViewModel)
+ .ToList();
+ }
+
+ public List GetFilteredList(IceCreamSearchModel
+model)
+ {
+ if (string.IsNullOrEmpty(model.IceCreamName))
+ {
+ return new();
+ }
+ return source.IceCreams
+ .Where(x => x.IceCreamName.Contains(model.IceCreamName))
+ .Select(x => x.GetViewModel)
+ .ToList();
+ }
+
+ public IceCreamViewModel? GetElement(IceCreamSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.IceCreamName) && !model.Id.HasValue)
+ {
+ return null;
+ }
+ return source.IceCreams
+ .FirstOrDefault(x =>
+ (!string.IsNullOrEmpty(model.IceCreamName) && x.IceCreamName ==
+ model.IceCreamName) ||
+ (model.Id.HasValue && x.Id == model.Id))
+ ?.GetViewModel;
+ }
+
+ public IceCreamViewModel? Insert(IceCreamBindingModel model)
+ {
+ model.Id = source.IceCreams.Count > 0 ? source.IceCreams.Max(x =>
+ x.Id) + 1 : 1;
+ var newIceCream = IceCream.Create(model);
+ if (newIceCream == null)
+ {
+ return null;
+ }
+ source.IceCreams.Add(newIceCream);
+ source.SaveIceCreams();
+ return newIceCream.GetViewModel;
+ }
+
+ public IceCreamViewModel? Update(IceCreamBindingModel model)
+ {
+ var iceCream = source.IceCreams.FirstOrDefault(x => x.Id ==
+ model.Id);
+ if (iceCream == null)
+ {
+ return null;
+ }
+ iceCream.Update(model);
+ source.SaveIceCreams();
+ return iceCream.GetViewModel;
+ }
+ public IceCreamViewModel? Delete(IceCreamBindingModel model)
+ {
+ var iceCream = source.IceCreams.FirstOrDefault(x => x.Id ==
+ model.Id);
+ if (iceCream != null)
+ {
+ source.IceCreams.Remove(iceCream);
+ source.SaveIceCreams();
+ return iceCream.GetViewModel;
+ }
+ return null;
+ }
+
+ }
+}
diff --git a/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs b/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs
new file mode 100644
index 0000000..983f9d1
--- /dev/null
+++ b/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs
@@ -0,0 +1,105 @@
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.SearchModels;
+using IceCreamShopContracts.StoragesContracts;
+using IceCreamShopContracts.ViewModels;
+using IceCreamShopFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IceCreamShopFileImplement.Implements
+{
+ public class OrderStorage : IOrderStorage
+ {
+ private readonly DataFileSingleton source;
+ public OrderStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+
+ public List GetFullList()
+ {
+ return source.Orders
+ .Select(x => AccessIceCreamStorage(x.GetViewModel))
+ .ToList();
+ }
+
+ public List GetFilteredList(OrderSearchModel
+model)
+ {
+ if (!model.Id.HasValue)
+ {
+ return new();
+ }
+ return source.Orders
+ .Where(x => x.Id == model.Id)
+ .Select( x => AccessIceCreamStorage( x.GetViewModel))
+ .ToList();
+ }
+
+ public OrderViewModel? GetElement(OrderSearchModel model)
+ {
+ if (!model.Id.HasValue)
+ {
+ return null;
+ }
+ return AccessIceCreamStorage(source.Orders
+ .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel);
+ }
+
+ public OrderViewModel? Insert(OrderBindingModel model)
+ {
+ model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1;
+ var newOrder = Order.Create(model);
+ if (newOrder == null)
+ {
+ return null;
+ }
+ source.Orders.Add(newOrder);
+ source.SaveOrders();
+ return AccessIceCreamStorage(newOrder.GetViewModel);
+ }
+
+ public OrderViewModel? Update(OrderBindingModel model)
+ {
+ var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+ if (order == null)
+ {
+ return null;
+ }
+ order.Update(model);
+ source.SaveOrders();
+ return AccessIceCreamStorage(order.GetViewModel);
+ }
+ public OrderViewModel? Delete(OrderBindingModel model)
+ {
+ var element = source.Orders.FirstOrDefault(x => x.Id ==
+ model.Id);
+ if (element != null)
+ {
+ source.Orders.Remove(element);
+ source.SaveOrders();
+ return AccessIceCreamStorage(element.GetViewModel);
+ }
+ return null;
+ }
+
+ public OrderViewModel AccessIceCreamStorage(OrderViewModel model)
+ {
+ if (model == null)
+ return null;
+ foreach (var iceCream in source.IceCreams)
+ {
+ if (iceCream.Id == model.IceCreamId)
+ {
+ model.IceCreamName = iceCream.IceCreamName;
+ break;
+ }
+ }
+ return model;
+ }
+
+ }
+}
diff --git a/IceCreamShop/IceCreamShopFileImplement/Models/Component.cs b/IceCreamShop/IceCreamShopFileImplement/Models/Component.cs
new file mode 100644
index 0000000..8f2211b
--- /dev/null
+++ b/IceCreamShop/IceCreamShopFileImplement/Models/Component.cs
@@ -0,0 +1,71 @@
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.ViewModels;
+using IceCreamShopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace IceCreamShopFileImplement.Models
+{
+ public class Component : IComponentModel
+ {
+ public int Id { get; set; }
+ public string ComponentName { get; set; } = string.Empty;
+ public double Cost { get; set; }
+
+ public static Component? Create(ComponentBindingModel model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new Component()
+ {
+ Id = model.Id,
+ ComponentName = model.ComponentName,
+ Cost = model.Cost,
+ };
+ }
+
+ public static Component? Create(XElement element)
+ {
+ if (element == null)
+ {
+ return null;
+ }
+ return new Component()
+ {
+ Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+ ComponentName = element.Element("ComponentName")!.Value,
+ Cost = Convert.ToDouble(element.Element("Cost")!.Value),
+ };
+ }
+
+ public void Update(ComponentBindingModel model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ ComponentName = model.ComponentName;
+ Cost = model.Cost;
+ }
+
+ public ComponentViewModel GetViewModel => new()
+ {
+ Id = Id,
+ ComponentName = ComponentName,
+ Cost = Cost
+ };
+
+ public XElement GetXElement => new("Component",
+ new XAttribute("Id", Id),
+ new XElement("ComponentName", ComponentName),
+ new XElement("Cost", Cost.ToString()));
+
+
+ }
+}
diff --git a/IceCreamShop/IceCreamShopFileImplement/Models/IceCream.cs b/IceCreamShop/IceCreamShopFileImplement/Models/IceCream.cs
new file mode 100644
index 0000000..1de7680
--- /dev/null
+++ b/IceCreamShop/IceCreamShopFileImplement/Models/IceCream.cs
@@ -0,0 +1,105 @@
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.ViewModels;
+using IceCreamShopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace IceCreamShopFileImplement.Models
+{
+ public class IceCream : IIceCreamModel
+ {
+ public int Id { get; private set; }
+ public string IceCreamName { get; private set; } = string.Empty;
+ public double Price { get; private set; }
+ public Dictionary Components { get; private set; } = new();
+ private Dictionary? _iceCreamComponents = null;
+
+ public Dictionary IceCreamComponents
+ {
+ get
+ {
+ if (_iceCreamComponents == null)
+ {
+ var source = DataFileSingleton.GetInstance();
+ _iceCreamComponents = Components.ToDictionary(x => x.Key, y =>
+ ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!,
+ y.Value));
+ }
+ return _iceCreamComponents;
+ }
+ }
+
+ public static IceCream? Create(IceCreamBindingModel model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new IceCream()
+ {
+ Id = model.Id,
+ IceCreamName = model.IceCreamName,
+ Price = model.Price,
+ Components = model.IceCreamComponents.ToDictionary(x => x.Key, x
+ => x.Value.Item2)
+ };
+ }
+
+ public static IceCream? Create(XElement element)
+ {
+ if (element == null)
+ {
+ return null;
+ }
+ return new IceCream()
+ {
+ Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+ IceCreamName = element.Element("IceCreamName")!.Value,
+ Price = Convert.ToDouble(element.Element("Price")!.Value),
+ Components =
+ element.Element("IceCreamComponents")!.Elements("IceCreamComponent")
+ .ToDictionary(x =>
+ Convert.ToInt32(x.Element("Key")?.Value), x =>
+ Convert.ToInt32(x.Element("Value")?.Value))
+ };
+ }
+
+ public void Update(IceCreamBindingModel model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ IceCreamName = model.IceCreamName;
+ Price = model.Price;
+ Components = model.IceCreamComponents.ToDictionary(x => x.Key, x =>
+ x.Value.Item2);
+ _iceCreamComponents = null;
+ }
+
+ public IceCreamViewModel GetViewModel => new()
+ {
+ Id = Id,
+ IceCreamName = IceCreamName,
+ Price = Price,
+ IceCreamComponents = IceCreamComponents
+ };
+
+ public XElement GetXElement => new("IceCream",
+ new XAttribute("Id", Id),
+ new XElement("IceCreamName", IceCreamName),
+ new XElement("Price", Price.ToString()),
+ new XElement("IceCreamComponents", Components.Select(x =>
+new XElement("IceCreamComponent",
+
+new XElement("Key", x.Key),
+
+new XElement("Value", x.Value)))
+
+.ToArray()));
+ }
+}
diff --git a/IceCreamShop/IceCreamShopFileImplement/Models/Order.cs b/IceCreamShop/IceCreamShopFileImplement/Models/Order.cs
new file mode 100644
index 0000000..1cfe9f9
--- /dev/null
+++ b/IceCreamShop/IceCreamShopFileImplement/Models/Order.cs
@@ -0,0 +1,88 @@
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.ViewModels;
+using IceCreamShopDataModels.Enums;
+using IceCreamShopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace IceCreamShopFileImplement.Models
+{
+ public class Order : IOrderModel
+ {
+ public int Id { get; private set; }
+ public int IceCreamId { get; private set; }
+ public int Count { get; private set; }
+ public double Sum { get; private set; }
+ public OrderStatus Status { get; private set; }
+ public DateTime DateCreate { get; private set; }
+ public DateTime? DateImplement { get; private set; }
+
+ public static Order? Create(OrderBindingModel model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new Order()
+ {
+ Id = model.Id,
+ IceCreamId = model.IceCreamId,
+ Count = model.Count,
+ Sum = model.Sum,
+ Status = model.Status,
+ DateCreate = model.DateCreate,
+ DateImplement = model.DateImplement,
+ };
+ }
+ public static Order? Create(XElement element)
+ {
+ if (element == null)
+ {
+ return null;
+ }
+ return new Order()
+ {
+ Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+ IceCreamId = Convert.ToInt32(element.Element("IceCreamId")!.Value),
+ Count = Convert.ToInt32(element.Element("Count")!.Value),
+ Sum = Convert.ToDouble(element.Element("Sum")!.Value),
+ Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value.ToString()),
+ DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
+ DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null : Convert.ToDateTime(element.Element("DateImplement")!.Value)
+ };
+ }
+ public void Update(OrderBindingModel model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ Status = model.Status;
+ DateImplement = model.DateImplement;
+ }
+ public OrderViewModel GetViewModel => new()
+ {
+ Id = Id,
+ IceCreamId = IceCreamId,
+ Count = Count,
+ Sum = Sum,
+ Status = Status,
+ DateCreate = DateCreate,
+ DateImplement = DateImplement,
+ };
+ public XElement GetXElement => new("Order",
+ new XAttribute("Id", Id),
+ new XElement("IceCreamId", IceCreamId),
+ new XElement("Sum", Sum.ToString()),
+ new XElement("Count", Count),
+ new XElement("Status", Status.ToString()),
+ new XElement("DateCreate", DateCreate.ToString()),
+ new XElement("DateImplement", DateImplement.ToString())
+ );
+
+ }
+}