From 39b607df292c71d7ebf80d6645f0f810bf71cc56 Mon Sep 17 00:00:00 2001 From: dyakonovr Date: Sun, 3 Mar 2024 18:37:52 +0400 Subject: [PATCH 1/2] All done --- SoftwareInstallation/SoftwareInstallation.sln | 16 ++- .../SoftwareInstallation/FormComponents.cs | 1 + .../SoftwareInstallation/FormMain.Designer.cs | 36 +++--- .../SoftwareInstallation/FormMain.cs | 1 + .../SoftwareInstallation/FormMain.resx | 2 +- .../FormPackage.Designer.cs | 32 +++--- .../SoftwareInstallation/FormPackage.cs | 14 +-- .../SoftwareInstallation/FormPackage.resx | 9 -- .../SoftwareInstallation/Program.cs | 2 +- .../SoftwareInstallationView.csproj | 1 + .../BusinessLogics/OrderLogic.cs | 1 - .../DataFileSingleton.cs | 54 +++++++++ .../Implements/ComponentStorage.cs | 81 ++++++++++++++ .../Implements/OrderStorage.cs | 105 ++++++++++++++++++ .../Implements/PackageStorage.cs | 94 ++++++++++++++++ .../Models/Component.cs | 64 +++++++++++ .../Models/Order.cs | 94 ++++++++++++++++ .../Models/Package.cs | 95 ++++++++++++++++ .../SoftwareInstallationFileImplement.csproj | 14 +++ .../Models/Order.cs | 7 ++ 20 files changed, 665 insertions(+), 58 deletions(-) create mode 100644 SoftwareInstallation/SoftwareInstallationFileImplement/DataFileSingleton.cs create mode 100644 SoftwareInstallation/SoftwareInstallationFileImplement/Implements/ComponentStorage.cs create mode 100644 SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs create mode 100644 SoftwareInstallation/SoftwareInstallationFileImplement/Implements/PackageStorage.cs create mode 100644 SoftwareInstallation/SoftwareInstallationFileImplement/Models/Component.cs create mode 100644 SoftwareInstallation/SoftwareInstallationFileImplement/Models/Order.cs create mode 100644 SoftwareInstallation/SoftwareInstallationFileImplement/Models/Package.cs create mode 100644 SoftwareInstallation/SoftwareInstallationFileImplement/SoftwareInstallationFileImplement.csproj diff --git a/SoftwareInstallation/SoftwareInstallation.sln b/SoftwareInstallation/SoftwareInstallation.sln index 404a0d4..3ba76bb 100644 --- a/SoftwareInstallation/SoftwareInstallation.sln +++ b/SoftwareInstallation/SoftwareInstallation.sln @@ -3,15 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.8.34408.163 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoftwareInstallationView", "SoftwareInstallation\SoftwareInstallationView.csproj", "{953D2A36-3A8C-411D-A7EB-650E2508A9C1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftwareInstallationView", "SoftwareInstallation\SoftwareInstallationView.csproj", "{953D2A36-3A8C-411D-A7EB-650E2508A9C1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoftwareInstallationDataModels", "SoftwareInstallationDataModels\SoftwareInstallationDataModels.csproj", "{4FE3D032-B5DD-4B3F-90FC-B6B3BCAEB0F3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftwareInstallationDataModels", "SoftwareInstallationDataModels\SoftwareInstallationDataModels.csproj", "{4FE3D032-B5DD-4B3F-90FC-B6B3BCAEB0F3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoftwareInstallationContracts", "SoftwareInstallationContracts\SoftwareInstallationContracts.csproj", "{FF58CE99-D5AF-4033-BBCB-B9C218891FFB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftwareInstallationContracts", "SoftwareInstallationContracts\SoftwareInstallationContracts.csproj", "{FF58CE99-D5AF-4033-BBCB-B9C218891FFB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoftwareInstallationListImplement", "SoftwareInstallationListImplement\SoftwareInstallationListImplement.csproj", "{4784E414-2B47-43D0-AD65-19132F85C7EA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftwareInstallationListImplement", "SoftwareInstallationListImplement\SoftwareInstallationListImplement.csproj", "{4784E414-2B47-43D0-AD65-19132F85C7EA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoftwareInstallationBusinessLogic", "SoftwareInstallationBusinessLogic\SoftwareInstallationBusinessLogic.csproj", "{7F4E4DE0-F13B-4F3B-B86C-2C7017AD6CF3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftwareInstallationBusinessLogic", "SoftwareInstallationBusinessLogic\SoftwareInstallationBusinessLogic.csproj", "{7F4E4DE0-F13B-4F3B-B86C-2C7017AD6CF3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoftwareInstallationFileImplement", "SoftwareInstallationFileImplement\SoftwareInstallationFileImplement.csproj", "{B50E488D-DBCB-4C5F-BAB5-795ABF9C0112}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -39,6 +41,10 @@ Global {7F4E4DE0-F13B-4F3B-B86C-2C7017AD6CF3}.Debug|Any CPU.Build.0 = Debug|Any CPU {7F4E4DE0-F13B-4F3B-B86C-2C7017AD6CF3}.Release|Any CPU.ActiveCfg = Release|Any CPU {7F4E4DE0-F13B-4F3B-B86C-2C7017AD6CF3}.Release|Any CPU.Build.0 = Release|Any CPU + {B50E488D-DBCB-4C5F-BAB5-795ABF9C0112}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B50E488D-DBCB-4C5F-BAB5-795ABF9C0112}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B50E488D-DBCB-4C5F-BAB5-795ABF9C0112}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B50E488D-DBCB-4C5F-BAB5-795ABF9C0112}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SoftwareInstallation/SoftwareInstallation/FormComponents.cs b/SoftwareInstallation/SoftwareInstallation/FormComponents.cs index 43046a2..e6fb7fa 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormComponents.cs +++ b/SoftwareInstallation/SoftwareInstallation/FormComponents.cs @@ -23,6 +23,7 @@ namespace SoftwareInstallationView InitializeComponent(); _logger = logger; _logic = logic; + LoadData(); } private void FormComponents_Load(object sender, EventArgs e) { diff --git a/SoftwareInstallation/SoftwareInstallation/FormMain.Designer.cs b/SoftwareInstallation/SoftwareInstallation/FormMain.Designer.cs index 7566509..26b30db 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormMain.Designer.cs +++ b/SoftwareInstallation/SoftwareInstallation/FormMain.Designer.cs @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - menuStrip = new MenuStrip(); + menuStrip1 = new MenuStrip(); справочникиToolStripMenuItem = new ToolStripMenuItem(); компонентыToolStripMenuItem = new ToolStripMenuItem(); изделияToolStripMenuItem = new ToolStripMenuItem(); @@ -38,20 +38,20 @@ buttonOrderReady = new Button(); buttonIssuedOrder = new Button(); buttonRefresh = new Button(); - menuStrip.SuspendLayout(); + menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); // - // menuStrip + // menuStrip1 // - menuStrip.ImageScalingSize = new Size(20, 20); - menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem }); - menuStrip.Location = new Point(0, 0); - menuStrip.Name = "menuStrip"; - menuStrip.Padding = new Padding(7, 3, 0, 3); - menuStrip.Size = new Size(1077, 30); - menuStrip.TabIndex = 0; - menuStrip.Text = "menuStrip1"; + menuStrip1.ImageScalingSize = new Size(20, 20); + menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem }); + menuStrip1.Location = new Point(0, 0); + menuStrip1.Name = "menuStrip1"; + menuStrip1.Padding = new Padding(7, 3, 0, 3); + menuStrip1.Size = new Size(1077, 30); + menuStrip1.TabIndex = 0; + menuStrip1.Text = "menuStrip1"; // // справочникиToolStripMenuItem // @@ -63,14 +63,14 @@ // компонентыToolStripMenuItem // компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(182, 26); + компонентыToolStripMenuItem.Size = new Size(224, 26); компонентыToolStripMenuItem.Text = "Компоненты"; компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; // // изделияToolStripMenuItem // изделияToolStripMenuItem.Name = "изделияToolStripMenuItem"; - изделияToolStripMenuItem.Size = new Size(182, 26); + изделияToolStripMenuItem.Size = new Size(224, 26); изделияToolStripMenuItem.Text = "Изделия"; изделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click; // @@ -161,14 +161,14 @@ Controls.Add(buttonTakeOrderInWork); Controls.Add(buttonCreateOrder); Controls.Add(dataGridView); - Controls.Add(menuStrip); - MainMenuStrip = menuStrip; + Controls.Add(menuStrip1); + MainMenuStrip = menuStrip1; Margin = new Padding(3, 4, 3, 4); Name = "FormMain"; Text = "Установка ПО"; Load += FormMain_Load; - menuStrip.ResumeLayout(false); - menuStrip.PerformLayout(); + menuStrip1.ResumeLayout(false); + menuStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ResumeLayout(false); PerformLayout(); @@ -176,7 +176,7 @@ #endregion - private MenuStrip menuStrip; + private MenuStrip menuStrip1; private ToolStripMenuItem справочникиToolStripMenuItem; private ToolStripMenuItem компонентыToolStripMenuItem; private ToolStripMenuItem изделияToolStripMenuItem; diff --git a/SoftwareInstallation/SoftwareInstallation/FormMain.cs b/SoftwareInstallation/SoftwareInstallation/FormMain.cs index 0a42aae..107d13b 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormMain.cs +++ b/SoftwareInstallation/SoftwareInstallation/FormMain.cs @@ -23,6 +23,7 @@ namespace SoftwareInstallationView InitializeComponent(); _logger = logger; _orderLogic = orderLogic; + LoadData(); } private void FormMain_Load(object sender, EventArgs e) { diff --git a/SoftwareInstallation/SoftwareInstallation/FormMain.resx b/SoftwareInstallation/SoftwareInstallation/FormMain.resx index 6c82d08..a0623c8 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormMain.resx +++ b/SoftwareInstallation/SoftwareInstallation/FormMain.resx @@ -117,7 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallation/FormPackage.Designer.cs b/SoftwareInstallation/SoftwareInstallation/FormPackage.Designer.cs index 096bb9d..157ef22 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormPackage.Designer.cs +++ b/SoftwareInstallation/SoftwareInstallation/FormPackage.Designer.cs @@ -37,14 +37,14 @@ buttonDelete = new Button(); buttonUpdate = new Button(); buttonAdd = new Button(); - componentsDataGridView = new DataGridView(); + dataGridView = new DataGridView(); ColumnId = new DataGridViewTextBoxColumn(); ColumnComponent = new DataGridViewTextBoxColumn(); ColumnCount = new DataGridViewTextBoxColumn(); buttonSave = new Button(); buttonCancel = new Button(); componentsGroupBox.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)componentsDataGridView).BeginInit(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); // // labelName @@ -88,7 +88,7 @@ componentsGroupBox.Controls.Add(buttonDelete); componentsGroupBox.Controls.Add(buttonUpdate); componentsGroupBox.Controls.Add(buttonAdd); - componentsGroupBox.Controls.Add(componentsDataGridView); + componentsGroupBox.Controls.Add(dataGridView); componentsGroupBox.Location = new Point(14, 115); componentsGroupBox.Margin = new Padding(3, 4, 3, 4); componentsGroupBox.Name = "componentsGroupBox"; @@ -142,18 +142,18 @@ buttonAdd.UseVisualStyleBackColor = true; buttonAdd.Click += ButtonAdd_Click; // - // componentsDataGridView + // dataGridView // - componentsDataGridView.AllowUserToAddRows = false; - componentsDataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - componentsDataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ColumnComponent, ColumnCount }); - componentsDataGridView.Location = new Point(7, 29); - componentsDataGridView.Margin = new Padding(3, 4, 3, 4); - componentsDataGridView.Name = "componentsDataGridView"; - componentsDataGridView.RowHeadersVisible = false; - componentsDataGridView.RowHeadersWidthSizeMode = DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders; - componentsDataGridView.Size = new Size(505, 332); - componentsDataGridView.TabIndex = 0; + dataGridView.AllowUserToAddRows = false; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ColumnComponent, ColumnCount }); + dataGridView.Location = new Point(7, 29); + dataGridView.Margin = new Padding(3, 4, 3, 4); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersVisible = false; + dataGridView.RowHeadersWidthSizeMode = DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders; + dataGridView.Size = new Size(505, 332); + dataGridView.TabIndex = 0; // // ColumnId // @@ -216,7 +216,7 @@ Text = "Изделие"; Load += FormPackage_Load; componentsGroupBox.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)componentsDataGridView).EndInit(); + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ResumeLayout(false); PerformLayout(); } @@ -229,7 +229,7 @@ private TextBox textBoxPrice; private GroupBox componentsGroupBox; private Button buttonAdd; - private DataGridView componentsDataGridView; + private DataGridView dataGridView; private Button buttonRefresh; private Button buttonDelete; private Button buttonUpdate; diff --git a/SoftwareInstallation/SoftwareInstallation/FormPackage.cs b/SoftwareInstallation/SoftwareInstallation/FormPackage.cs index 39a5ca8..45262af 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormPackage.cs +++ b/SoftwareInstallation/SoftwareInstallation/FormPackage.cs @@ -65,10 +65,10 @@ namespace SoftwareInstallationView { if (_PackageComponents != null) { - componentsDataGridView.Rows.Clear(); + dataGridView.Rows.Clear(); foreach (var pc in _PackageComponents) { - componentsDataGridView.Rows.Add(new object[] { pc.Key, pc.Value.Item1.ComponentName, pc.Value.Item2 }); + dataGridView.Rows.Add(new object[] { pc.Key, pc.Value.Item1.ComponentName, pc.Value.Item2 }); } textBoxPrice.Text = CalcPrice().ToString(); } @@ -109,14 +109,14 @@ namespace SoftwareInstallationView } private void ButtonUpd_Click(object sender, EventArgs e) { - if (componentsDataGridView.SelectedRows.Count == 1) + if (dataGridView.SelectedRows.Count == 1) { var service = Program.ServiceProvider?.GetService(typeof(FormPackageComponent)); if (service is FormPackageComponent form) { int id = - Convert.ToInt32(componentsDataGridView.SelectedRows[0].Cells[0].Value); + Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); form.Id = id; form.Count = _PackageComponents[id].Item2; if (form.ShowDialog() == DialogResult.OK) @@ -135,15 +135,15 @@ namespace SoftwareInstallationView } private void ButtonDel_Click(object sender, EventArgs e) { - if (componentsDataGridView.SelectedRows.Count == 1) + if (dataGridView.SelectedRows.Count == 1) { if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { try { - _logger.LogInformation("Удаление компонента: {ComponentName} - {Count}", componentsDataGridView.SelectedRows[0].Cells[1].Value); - _PackageComponents?.Remove(Convert.ToInt32(componentsDataGridView.SelectedRows[0].Cells[0].Value)); + _logger.LogInformation("Удаление компонента: {ComponentName} - {Count}", dataGridView.SelectedRows[0].Cells[1].Value); + _PackageComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value)); } catch (Exception ex) { diff --git a/SoftwareInstallation/SoftwareInstallation/FormPackage.resx b/SoftwareInstallation/SoftwareInstallation/FormPackage.resx index 5c6df87..524a4e1 100644 --- a/SoftwareInstallation/SoftwareInstallation/FormPackage.resx +++ b/SoftwareInstallation/SoftwareInstallation/FormPackage.resx @@ -126,13 +126,4 @@ True - - True - - - True - - - True - \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallation/Program.cs b/SoftwareInstallation/SoftwareInstallation/Program.cs index 07a18a6..3c94573 100644 --- a/SoftwareInstallation/SoftwareInstallation/Program.cs +++ b/SoftwareInstallation/SoftwareInstallation/Program.cs @@ -4,7 +4,7 @@ using NLog.Extensions.Logging; using SoftwareInstallationBusinessLogic.BusinessLogics; using SoftwareInstallationContracts.BusinessLogicContracts; using SoftwareInstallationContracts.StoragesContracts; -using SoftwareInstallationListImplement.Implements; +using SoftwareInstallationFileImplement.Implements; using SoftwareInstallationView; namespace SoftwareInstallation diff --git a/SoftwareInstallation/SoftwareInstallation/SoftwareInstallationView.csproj b/SoftwareInstallation/SoftwareInstallation/SoftwareInstallationView.csproj index 28d9b44..e8917fb 100644 --- a/SoftwareInstallation/SoftwareInstallation/SoftwareInstallationView.csproj +++ b/SoftwareInstallation/SoftwareInstallation/SoftwareInstallationView.csproj @@ -28,6 +28,7 @@ + diff --git a/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/OrderLogic.cs b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/OrderLogic.cs index 56248de..cd11bd1 100644 --- a/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/OrderLogic.cs @@ -71,7 +71,6 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogics model.Count = viewModel.Count; model.PackageId = viewModel.PackageId; - CheckModel(model, false); if (_orderStorage.Update(model) == null) { diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/DataFileSingleton.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/DataFileSingleton.cs new file mode 100644 index 0000000..6c1a577 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/DataFileSingleton.cs @@ -0,0 +1,54 @@ +using SoftwareInstallationFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace SoftwareInstallationFileImplement +{ + internal class DataFileSingleton + { + private static DataFileSingleton? instance; + private readonly string ComponentFileName = "Component.xml"; + private readonly string OrderFileName = "Order.xml"; + private readonly string PackageFileName = "Package.xml"; + public List Components { get; private set; } + public List Orders { get; private set; } + public List Packages { 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 SavePackages() => SaveData(Packages, PackageFileName, "Packages", x => x.GetXElement); + public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + private DataFileSingleton() + { + Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; + Packages = LoadData(PackageFileName, "Package", x => Package.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/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/ComponentStorage.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..2730296 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/ComponentStorage.cs @@ -0,0 +1,81 @@ +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.SearchModels; +using SoftwareInstallationContracts.StoragesContracts; +using SoftwareInstallationContracts.ViewModels; +using SoftwareInstallationFileImplement; +using SoftwareInstallationFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationFileImplement.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/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..b555ea6 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs @@ -0,0 +1,105 @@ +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.SearchModels; +using SoftwareInstallationContracts.StoragesContracts; +using SoftwareInstallationContracts.ViewModels; +using SoftwareInstallationFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationFileImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + private readonly DataFileSingleton source; + + public OrderStorage() + { + source = DataFileSingleton.GetInstance(); + } + + 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 element.GetViewModel; + } + + return null; + } + + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return null; + } + + return source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public List GetFilteredList(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return new(); + } + + return source.Orders.Where(x => x.Id == model.Id).Select(x => GetPackageName(x.GetViewModel)).ToList(); + } + + public List GetFullList() + { + return source.Orders.Select(x => GetPackageName(x.GetViewModel)).ToList(); + } + + 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 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 order.GetViewModel; + } + private OrderViewModel GetPackageName(OrderViewModel viewModel) + { + foreach (var package in source.Packages) + { + if (package.Id == viewModel.PackageId) + { + viewModel.PackageName = package.PackageName; + } + } + return viewModel; + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/PackageStorage.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/PackageStorage.cs new file mode 100644 index 0000000..139c2b2 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/PackageStorage.cs @@ -0,0 +1,94 @@ +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.SearchModels; +using SoftwareInstallationContracts.StoragesContracts; +using SoftwareInstallationContracts.ViewModels; +using SoftwareInstallationFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationFileImplement.Implements +{ + public class PackageStorage : IPackageStorage + { + private readonly DataFileSingleton source; + + public PackageStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public PackageViewModel? Delete(PackageBindingModel model) + { + var element = source.Packages.FirstOrDefault(x => x.Id == model.Id); + + if (element != null) + { + source.Packages.Remove(element); + source.SavePackages(); + + return element.GetViewModel; + } + + return null; + } + + public PackageViewModel? GetElement(PackageSearchModel model) + { + if (string.IsNullOrEmpty(model.PackageName) && !model.Id.HasValue) + { + return null; + } + + return source.Packages.FirstOrDefault(x => (!string.IsNullOrEmpty(model.PackageName) && x.PackageName == model.PackageName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public List GetFilteredList(PackageSearchModel model) + { + if (string.IsNullOrEmpty(model.PackageName)) + { + return new(); + } + + return source.Packages.Where(x => x.PackageName.Contains(model.PackageName)).Select(x => x.GetViewModel).ToList(); + } + + public List GetFullList() + { + return source.Packages.Select(x => x.GetViewModel).ToList(); + } + + public PackageViewModel? Insert(PackageBindingModel model) + { + model.Id = source.Packages.Count > 0 ? source.Packages.Max(x => x.Id) + 1 : 1; + var newPackage = Package.Create(model); + + if (newPackage == null) + { + return null; + } + + source.Packages.Add(newPackage); + source.SavePackages(); + + return newPackage.GetViewModel; + } + + public PackageViewModel? Update(PackageBindingModel model) + { + var package = source.Packages.FirstOrDefault(x => x.Id == model.Id); + + if (package == null) + { + return null; + } + + package.Update(model); + source.SavePackages(); + + return package.GetViewModel; + } + } +} \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Component.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Component.cs new file mode 100644 index 0000000..421b1ab --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Component.cs @@ -0,0 +1,64 @@ +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.ViewModels; +using SoftwareInstallationDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace SoftwareInstallationFileImplement.Models +{ + public class Component : IComponentModel + { + public int Id { get; private set; } + public string ComponentName { get; private 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/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Order.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Order.cs new file mode 100644 index 0000000..d101ba7 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Order.cs @@ -0,0 +1,94 @@ +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.ViewModels; +using SoftwareInstallationDataModels.Enums; +using SoftwareInstallationDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace SoftwareInstallationFileImplement.Models +{ + public class Order : IOrderModel + { + public int PackageId { get; private set; } + public int Count { get; private set; } + public double Sum { get; private set; } + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + public DateTime DateCreate { get; private set; } = DateTime.Now; + public DateTime? DateImplement { get; private set; } + public int Id { get; private set; } + public static Order? Create(OrderBindingModel model) + { + if (model == null) + { + return null; + } + return new Order() + { + Id = model.Id, + PackageId = model.PackageId, + 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; + } + + var order = new Order() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + PackageId = Convert.ToInt32(element.Element("PackageId")!.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), + DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null) + }; + + DateTime.TryParse(element.Element("DateImplement")!.Value, out DateTime dateImpl); + order.DateImplement = dateImpl; + + return order; + } + public void Update(OrderBindingModel model) + { + if (model == null) + { + return; + } + PackageId = model.PackageId; + Count = model.Count; + Sum = model.Sum; + Status = model.Status; + DateCreate = model.DateCreate; + DateImplement = model.DateImplement; + } + public OrderViewModel GetViewModel => new() + { + Id = Id, + PackageId = PackageId, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement + }; + public XElement GetXElement => new("Order", + new XAttribute("Id", Id), + new XElement("PackageId", PackageId.ToString()), + new XElement("Count", Count.ToString()), + new XElement("Sum", Sum.ToString()), + new XElement("Status", Status.ToString()), + new XElement("DateCreate", DateCreate.ToString()), + new XElement("DateImplement", DateImplement.ToString())); + } +} diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Package.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Package.cs new file mode 100644 index 0000000..7ae17ff --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Package.cs @@ -0,0 +1,95 @@ +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.ViewModels; +using SoftwareInstallationDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace SoftwareInstallationFileImplement.Models +{ + public class Package : IPackageModel + { + public int Id { get; private set; } + public string PackageName { get; private set; } = string.Empty; + public double Price { get; private set; } + public Dictionary Components { get; private set; } = new(); + private Dictionary? _PackageComponents = null; + public Dictionary PackageComponents + { + get + { + if (_PackageComponents == null) + { + var source = DataFileSingleton.GetInstance(); + _PackageComponents = Components.ToDictionary(x => x.Key, y => + ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, + y.Value)); + } + return _PackageComponents; + } + } + public static Package? Create(PackageBindingModel model) + { + if (model == null) + { + return null; + } + return new Package() + { + Id = model.Id, + PackageName = model.PackageName, + Price = model.Price, + Components = model.PackageComponents.ToDictionary(x => x.Key, x + => x.Value.Item2) + }; + } + public static Package? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Package() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + PackageName = element.Element("PackageName")!.Value, + Price = Convert.ToDouble(element.Element("Price")!.Value), + Components = element.Element("PackageComponents")!.Elements("PackageComponent") + .ToDictionary(x => + Convert.ToInt32(x.Element("Key")?.Value), x => + Convert.ToInt32(x.Element("Value")?.Value)) + }; + } + public void Update(PackageBindingModel model) + { + if (model == null) + { + return; + } + PackageName = model.PackageName; + Price = model.Price; + Components = model.PackageComponents.ToDictionary(x => x.Key, x => x.Value.Item2); + _PackageComponents = null; + } + public PackageViewModel GetViewModel => new() + { + Id = Id, + PackageName = PackageName, + Price = Price, + PackageComponents = PackageComponents + }; + public XElement GetXElement => new("Package", + new XAttribute("Id", Id), + new XElement("PackageName", PackageName), + new XElement("Price", Price.ToString()), + new XElement("PackageComponents", Components.Select(x => + new XElement("PackageComponent", + new XElement("Key", x.Key), + new XElement("Value", x.Value))) + .ToArray())); + } +} + diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/SoftwareInstallationFileImplement.csproj b/SoftwareInstallation/SoftwareInstallationFileImplement/SoftwareInstallationFileImplement.csproj new file mode 100644 index 0000000..d544409 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/SoftwareInstallationFileImplement.csproj @@ -0,0 +1,14 @@ + + + + net8.0 + enable + enable + + + + + + + + diff --git a/SoftwareInstallation/SoftwareInstallationListImplement/Models/Order.cs b/SoftwareInstallation/SoftwareInstallationListImplement/Models/Order.cs index ed4840e..281cebb 100644 --- a/SoftwareInstallation/SoftwareInstallationListImplement/Models/Order.cs +++ b/SoftwareInstallation/SoftwareInstallationListImplement/Models/Order.cs @@ -15,10 +15,15 @@ namespace SoftwareInstallationListImplement.Models public int PackageId { get; private set; } public int Count { get; private set; } public double Sum { get; private set; } + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + public DateTime DateCreate { get; private set; } = DateTime.Now; + public DateTime? DateImplement { get; private set; } + public int Id { get; private set; } + public static Order? Create(OrderBindingModel? model) { if (model == null) return null; @@ -33,6 +38,7 @@ namespace SoftwareInstallationListImplement.Models Id = model.Id, }; } + public void Update(OrderBindingModel model) { if (model == null) @@ -52,5 +58,6 @@ namespace SoftwareInstallationListImplement.Models DateCreate = DateCreate, DateImplement = DateImplement }; + } } -- 2.25.1 From 2424828f2e52e775346e8facb464b80636d4202e Mon Sep 17 00:00:00 2001 From: dyakonovr Date: Fri, 12 Apr 2024 21:08:39 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20=D0=B8=D0=B7=20?= =?UTF-8?q?PR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implements/OrderStorage.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs index b555ea6..5512397 100644 --- a/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs @@ -92,12 +92,9 @@ namespace SoftwareInstallationFileImplement.Implements } private OrderViewModel GetPackageName(OrderViewModel viewModel) { - foreach (var package in source.Packages) - { - if (package.Id == viewModel.PackageId) - { - viewModel.PackageName = package.PackageName; - } + var package = source.Packages.FirstOrDefault(x => x.Id == viewModel.PackageId); + if (package != null) { + viewModel.PackageName = package.PackageName; } return viewModel; } -- 2.25.1