From 0311b850f6c341eae8d3fbc6dc43eb79678ea2cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B0=D1=88=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA=D1=81?= =?UTF-8?q?=D0=B8=D0=BC?= Date: Mon, 27 Mar 2023 11:00:22 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A8=D0=B0=D0=B3=20=D0=BA=D0=B0=D0=BA=D0=BE?= =?UTF-8?q?=D0=B9-=D1=82=D0=BE=20=D1=82=D0=B0=D0=BC.=20Reinforcedies=20->?= =?UTF-8?q?=20Reinforceds?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PrecastConcretePlant/PrecastConcretePlant/FormMain.cs | 2 +- .../BusinessLogic/ReportLogic.cs | 8 ++++---- .../OfficePackage/AbstractSaveToWord.cs | 2 +- .../OfficePackage/HelperModels/WordInfo.cs | 2 +- .../BusinessLogicsContracts/IReportLogic.cs | 2 +- ...ion.Designer.cs => 20230327065744_Restart.Designer.cs} | 4 ++-- ...6175226_InitMigration.cs => 20230327065744_Restart.cs} | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) rename PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/{20230226175226_InitMigration.Designer.cs => 20230327065744_Restart.Designer.cs} (98%) rename PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/{20230226175226_InitMigration.cs => 20230327065744_Restart.cs} (99%) diff --git a/PrecastConcretePlant/PrecastConcretePlant/FormMain.cs b/PrecastConcretePlant/PrecastConcretePlant/FormMain.cs index e2c309e..27bd923 100644 --- a/PrecastConcretePlant/PrecastConcretePlant/FormMain.cs +++ b/PrecastConcretePlant/PrecastConcretePlant/FormMain.cs @@ -205,7 +205,7 @@ namespace PrecastConcretePlantView using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; if (dialog.ShowDialog() == DialogResult.OK) { - _reportLogic.SaveReinforcediesToWordFile(new ReportBindingModel + _reportLogic.SaveReinforcedsToWordFile(new ReportBindingModel { FileName = dialog.FileName }); diff --git a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/ReportLogic.cs b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/ReportLogic.cs index 4509982..657a345 100644 --- a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/ReportLogic.cs +++ b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/ReportLogic.cs @@ -34,9 +34,9 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic public List GetReinforcedComponents() { var components = _componentStorage.GetFullList(); - var reinforcedies = _reinforcedStorage.GetFullList(); + var reinforceds = _reinforcedStorage.GetFullList(); var list = new List(); - foreach (var reinforced in reinforcedies) + foreach (var reinforced in reinforceds) { var record = new ReportReinforcedComponentViewModel { @@ -75,13 +75,13 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic .ToList(); } - public void SaveReinforcediesToWordFile(ReportBindingModel model) + public void SaveReinforcedsToWordFile(ReportBindingModel model) { _saveToWord.CreateDoc(new WordInfo { FileName = model.FileName, Title = "Список документов", - Reinforcedies = _reinforcedStorage.GetFullList() + Reinforceds = _reinforcedStorage.GetFullList() }); } public void SaveReinforcedComponentToExcelFile(ReportBindingModel model) diff --git a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs index feb38c4..033f1b0 100644 --- a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs +++ b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs @@ -22,7 +22,7 @@ namespace PrecastConcretePlantBusinessLogic.OfficePackage JustificationType = WordJustificationType.Center } }); - foreach (var reinforced in info.Reinforcedies) + foreach (var reinforced in info.Reinforceds) { CreateParagraph(new WordParagraph { diff --git a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/OfficePackage/HelperModels/WordInfo.cs index 7f35891..48a059e 100644 --- a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/OfficePackage/HelperModels/WordInfo.cs +++ b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/OfficePackage/HelperModels/WordInfo.cs @@ -11,6 +11,6 @@ namespace PrecastConcretePlantBusinessLogic.OfficePackage.HelperModels { public string FileName { get; set; } = string.Empty; public string Title { get; set; } = string.Empty; - public List Reinforcedies { get; set; } = new(); + public List Reinforceds { get; set; } = new(); } } diff --git a/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IReportLogic.cs b/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IReportLogic.cs index 0c63b71..176f587 100644 --- a/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IReportLogic.cs +++ b/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IReportLogic.cs @@ -12,7 +12,7 @@ namespace PrecastConcretePlantContracts.BusinessLogicsContracts { List GetReinforcedComponents(); List GetOrders(ReportBindingModel model); - void SaveReinforcediesToWordFile(ReportBindingModel model); + void SaveReinforcedsToWordFile(ReportBindingModel model); void SaveReinforcedComponentToExcelFile(ReportBindingModel model); void SaveOrdersToPdfFile(ReportBindingModel model); } diff --git a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230226175226_InitMigration.Designer.cs b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230327065744_Restart.Designer.cs similarity index 98% rename from PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230226175226_InitMigration.Designer.cs rename to PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230327065744_Restart.Designer.cs index 20c2331..dd0a7df 100644 --- a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230226175226_InitMigration.Designer.cs +++ b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230327065744_Restart.Designer.cs @@ -12,8 +12,8 @@ using PrecastConcretePlantDatabaseImplement; namespace PrecastConcretePlantDatabaseImplement.Migrations { [DbContext(typeof(PrecastConcretePlantDataBase))] - [Migration("20230226175226_InitMigration")] - partial class InitMigration + [Migration("20230327065744_Restart")] + partial class Restart { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) diff --git a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230226175226_InitMigration.cs b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230327065744_Restart.cs similarity index 99% rename from PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230226175226_InitMigration.cs rename to PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230327065744_Restart.cs index b82c188..d6af164 100644 --- a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230226175226_InitMigration.cs +++ b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Migrations/20230327065744_Restart.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace PrecastConcretePlantDatabaseImplement.Migrations { /// - public partial class InitMigration : Migration + public partial class Restart : Migration { /// protected override void Up(MigrationBuilder migrationBuilder)