diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/ClientLogic.cs b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/ClientLogic.cs index 240a663..272530b 100644 --- a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/ClientLogic.cs +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/ClientLogic.cs @@ -19,6 +19,7 @@ namespace FurnitureAssemblyBusinessLogic.BussinessLogic private readonly IClientStorage _clientStorage; + // Конструктор public ClientLogic(ILogger logger, IClientStorage clientStorage) { _logger = logger; diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/WorkModeling.cs b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/WorkModeling.cs index 0ac2172..6d7f567 100644 --- a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/WorkModeling.cs +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/WorkModeling.cs @@ -112,7 +112,7 @@ namespace FurnitureAssemblyBusinessLogic.BussinessLogic }); } - // Ищум заказ, который уже во всю в работе (вдруг прервали исполнителя) + // Ищем заказ, который уже во всю в работе (вдруг прервали исполнителя) private async Task RunOrderInWork(ImplementerViewModel implementer) { if (_orderLogic == null || implementer == null) diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/FurnitureAssemblyBusinessLogic.csproj b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/FurnitureAssemblyBusinessLogic.csproj index b601322..c09ca86 100644 --- a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/FurnitureAssemblyBusinessLogic.csproj +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/FurnitureAssemblyBusinessLogic.csproj @@ -1,19 +1,19 @@  - - net6.0 - enable - enable - + + net6.0 + enable + enable + - - - - - + + + + + - - - + + + diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/WordInfo.cs index ee03ad8..987a54a 100644 --- a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/WordInfo.cs +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/WordInfo.cs @@ -14,7 +14,7 @@ namespace FurnitureAssemblyBusinessLogic.OfficePackage.HelperModels public string Title { get; set; } = string.Empty; - // Список заготовок для вывода и сохранения + //список заготовок для вывода и сохранения public List Furnitures { get; set; } = new(); } } diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs index 1cbaacf..12c062a 100644 --- a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs @@ -12,7 +12,7 @@ namespace FurnitureAssemblyBusinessLogic.OfficePackage.HelperModels // Набор текстов в абзаце (для случая, если в абзаце текст разных стилей) public List<(string, WordTextProperties)> Texts { get; set; } = new(); - // Свойства параграфа, если они есть + //свойства параграфа, если они есть public WordTextProperties? TextProperties { get; set; } } } diff --git a/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/ReportBindingModel.cs b/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/ReportBindingModel.cs index cbb9af9..3afb378 100644 --- a/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/ReportBindingModel.cs +++ b/FurnitureAssembly/FurnitureAssemblyContracts/BindingModels/ReportBindingModel.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; namespace FurnitureAssemblyContracts.BindingModels { + // Реализация сущности "Отчёт" public class ReportBindingModel { public string FileName { get; set; } = string.Empty; diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormReportOrders.cs b/FurnitureAssembly/FurnitureAssemblyView/FormReportOrders.cs index 8f07ccd..16ff935 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormReportOrders.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormReportOrders.cs @@ -35,7 +35,7 @@ namespace FurnitureAssemblyView Dock = DockStyle.Fill }; - reportViewer.LocalReport.LoadReportDefinition(new FileStream("C:\\Users\\NikBe\\source\\repos\\TP\\Lab4\\FurnitureAssembly\\FurnitureAssemblyView\\ReportOrders.rdlc", FileMode.Open)); + reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrders.rdlc", FileMode.Open)); Controls.Clear(); Controls.Add(reportViewer); diff --git a/FurnitureAssembly/FurnitureAssemblyView/FurnitureAssemblyView.csproj b/FurnitureAssembly/FurnitureAssemblyView/FurnitureAssemblyView.csproj index ea7a307..42e1c03 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FurnitureAssemblyView.csproj +++ b/FurnitureAssembly/FurnitureAssemblyView/FurnitureAssemblyView.csproj @@ -27,4 +27,10 @@ + + + Always + + + \ No newline at end of file