From 9f481f88798810020bc10bfe8395fd222e87e290 Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Sun, 24 Mar 2024 22:28:06 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=BE=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20=D0=B8=20=D0=B8=D0=B7=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D0=B8=D0=B9=20=D0=B2=20excel=20=D0=BF=D0=BE=20?= =?UTF-8?q?=D1=82=D1=80=D0=B5=D0=B1=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/ReportLogic.cs | 12 ++++----- .../OfficePackage/AbstractSaveToExcel.cs | 4 +-- .../ReportSecureComponentViewModel.cs | 4 +-- .../FormReportSecureComponents.Designer.cs | 27 ++++++++++--------- .../Report/FormReportSecureComponents.cs | 4 +-- .../Report/FormReportSecureComponents.resx | 4 +-- 6 files changed, 28 insertions(+), 27 deletions(-) diff --git a/SecuritySystem/SecuritySystemBusinessLogic/BusinessLogics/ReportLogic.cs b/SecuritySystem/SecuritySystemBusinessLogic/BusinessLogics/ReportLogic.cs index 51ec67b..e6cbc92 100644 --- a/SecuritySystem/SecuritySystemBusinessLogic/BusinessLogics/ReportLogic.cs +++ b/SecuritySystem/SecuritySystemBusinessLogic/BusinessLogics/ReportLogic.cs @@ -34,19 +34,19 @@ namespace SecuritySystemBusinessLogic.BusinessLogics var components = _componentStorage.GetFullList(); var secures = _secureStorage.GetFullList(); var list = new List(); - foreach (var component in components) + foreach (var secure in secures) { var record = new ReportSecureComponentViewModel { - ComponentName = component.ComponentName, - Secures = new List>(), + SecureName = secure.SecureName, + Components = new List>(), TotalCount = 0 }; - foreach (var secure in secures) + foreach (var component in components) { if (secure.SecureComponents.ContainsKey(component.Id)) { - record.Secures.Add(new Tuple(secure.SecureName, secure.SecureComponents[component.Id].Item2)); + record.Components.Add(new Tuple(component.ComponentName, secure.SecureComponents[component.Id].Item2)); record.TotalCount += secure.SecureComponents[component.Id].Item2; } } @@ -97,7 +97,7 @@ namespace SecuritySystemBusinessLogic.BusinessLogics _saveToExcel.CreateReport(new ExcelInfo { FileName = model.FileName, - Title = "Список компонент", + Title = "Список изделий и компонентов", SecureComponents = GetSecureComponent() }); } diff --git a/SecuritySystem/SecuritySystemBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/SecuritySystem/SecuritySystemBusinessLogic/OfficePackage/AbstractSaveToExcel.cs index 42d9ece..1f210a2 100644 --- a/SecuritySystem/SecuritySystemBusinessLogic/OfficePackage/AbstractSaveToExcel.cs +++ b/SecuritySystem/SecuritySystemBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -31,11 +31,11 @@ namespace SecuritySystemBusinessLogic.OfficePackage { ColumnName = "A", RowIndex = rowIndex, - Text = pc.ComponentName, + Text = pc.SecureName, StyleInfo = ExcelStyleInfoType.Text }); rowIndex++; - foreach (var secure in pc.Secures) + foreach (var secure in pc.Components) { InsertCellInWorksheet(new ExcelCellParameters { diff --git a/SecuritySystem/SecuritySystemContracts/ViewModels/ReportSecureComponentViewModel.cs b/SecuritySystem/SecuritySystemContracts/ViewModels/ReportSecureComponentViewModel.cs index 1b4e493..5ee8899 100644 --- a/SecuritySystem/SecuritySystemContracts/ViewModels/ReportSecureComponentViewModel.cs +++ b/SecuritySystem/SecuritySystemContracts/ViewModels/ReportSecureComponentViewModel.cs @@ -2,8 +2,8 @@ { public class ReportSecureComponentViewModel { - public string ComponentName { get; set; } = string.Empty; + public string SecureName { get; set; } = string.Empty; public int TotalCount { get; set; } - public List> Secures { get; set; } = new(); + public List> Components { get; set; } = new(); } } diff --git a/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.Designer.cs b/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.Designer.cs index 606cc76..a35c42e 100644 --- a/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.Designer.cs +++ b/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.Designer.cs @@ -30,8 +30,8 @@ { buttonSaveToExcel = new Button(); dataGridView = new DataGridView(); - ColumnComponent = new DataGridViewTextBoxColumn(); ColumnSecure = new DataGridViewTextBoxColumn(); + ColumnComponent = new DataGridViewTextBoxColumn(); ColumnCount = new DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -50,22 +50,15 @@ // dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnComponent, ColumnSecure, ColumnCount }); + dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnSecure, ColumnComponent, ColumnCount }); dataGridView.Location = new Point(0, 47); dataGridView.Name = "dataGridView"; dataGridView.RowHeadersVisible = false; dataGridView.RowHeadersWidth = 51; dataGridView.RowTemplate.Height = 29; - dataGridView.Size = new Size(800, 403); + dataGridView.Size = new Size(845, 403); dataGridView.TabIndex = 1; // - // ColumnComponent - // - ColumnComponent.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - ColumnComponent.HeaderText = "Компонент"; - ColumnComponent.MinimumWidth = 6; - ColumnComponent.Name = "ColumnComponent"; - // // ColumnSecure // ColumnSecure.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; @@ -73,18 +66,26 @@ ColumnSecure.MinimumWidth = 6; ColumnSecure.Name = "ColumnSecure"; // + // ColumnComponent + // + ColumnComponent.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + ColumnComponent.HeaderText = "Компонент"; + ColumnComponent.MinimumWidth = 6; + ColumnComponent.Name = "ColumnComponent"; + // // ColumnCount // + ColumnCount.AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader; ColumnCount.HeaderText = "Количество"; ColumnCount.MinimumWidth = 6; ColumnCount.Name = "ColumnCount"; - ColumnCount.Width = 266; + ColumnCount.Width = 119; // // FormReportSecureComponents // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); + ClientSize = new Size(845, 450); Controls.Add(dataGridView); Controls.Add(buttonSaveToExcel); Name = "FormReportSecureComponents"; @@ -98,8 +99,8 @@ private Button buttonSaveToExcel; private DataGridView dataGridView; - private DataGridViewTextBoxColumn ColumnComponent; private DataGridViewTextBoxColumn ColumnSecure; + private DataGridViewTextBoxColumn ColumnComponent; private DataGridViewTextBoxColumn ColumnCount; } } \ No newline at end of file diff --git a/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.cs b/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.cs index 3daeeb1..352dd22 100644 --- a/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.cs +++ b/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.cs @@ -24,8 +24,8 @@ namespace SecuritySystemView.Report dataGridView.Rows.Clear(); foreach (var elem in dict) { - dataGridView.Rows.Add(new object[] { elem.ComponentName, "", "" }); - foreach (var listElem in elem.Secures) + dataGridView.Rows.Add(new object[] { elem.SecureName, "", "" }); + foreach (var listElem in elem.Components) { dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 }); } diff --git a/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.resx b/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.resx index 99f6798..04e7ead 100644 --- a/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.resx +++ b/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.resx @@ -117,10 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + True