From c029ef743671d594407f681dc1a8bdd17e825e17 Mon Sep 17 00:00:00 2001 From: Kristina Date: Fri, 29 Mar 2024 10:44:40 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D1=84=D0=B8=D0=BA=D1=81=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormReportOrders.Designer.cs | 6 +++--- .../BlacksmithWorkshop/FormReportOrders.cs | 15 ------------- .../OfficePackage/AbstractSaveToWord.cs | 21 +++++++------------ .../OfficePackage/Implements/SaveToWord.cs | 20 ++++++------------ 4 files changed, 17 insertions(+), 45 deletions(-) diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.Designer.cs index e4bc8c8..a45a2e1 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.Designer.cs @@ -52,7 +52,7 @@ panelTop.Name = "panelTop"; panelTop.Size = new Size(1109, 71); panelTop.TabIndex = 0; - panelTop.Paint += panelTop_Paint; + //panelTop.Paint += panelTop_Paint; // // ToPdfButton // @@ -111,7 +111,7 @@ dateTimePickerFrom.Name = "dateTimePickerFrom"; dateTimePickerFrom.Size = new Size(284, 31); dateTimePickerFrom.TabIndex = 0; - dateTimePickerFrom.ValueChanged += dateTimePickerFrom_ValueChanged; + //dateTimePickerFrom.ValueChanged += dateTimePickerFrom_ValueChanged; // // panelReport // @@ -120,7 +120,7 @@ panelReport.Name = "panelReport"; panelReport.Size = new Size(1110, 635); panelReport.TabIndex = 1; - panelReport.Paint += panelReport_Paint; + //panelReport.Paint += panelReport_Paint; // // FormReportOrders // diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs index f47f0bf..7d6df8f 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs @@ -96,20 +96,5 @@ namespace BlacksmithWorkshop } } } - - private void panelReport_Paint(object sender, PaintEventArgs e) - { - - } - - private void panelTop_Paint(object sender, PaintEventArgs e) - { - - } - - private void dateTimePickerFrom_ValueChanged(object sender, EventArgs e) - { - - } } } diff --git a/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/AbstractSaveToWord.cs index 5e309a3..2d5efbe 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/AbstractSaveToWord.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/AbstractSaveToWord.cs @@ -10,11 +10,13 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage { public abstract class AbstractSaveToWord { + //создание документа Word public void CreateDoc(WordInfo info) { CreateWord(info); CreateParagraph(new WordParagraph { + //заголовок Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) }, TextProperties = new WordTextProperties { @@ -26,6 +28,7 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage { CreateParagraph(new WordParagraph { + //название жирным Texts = new List<(string, WordTextProperties)> { (manufacture.ManufactureName, new WordTextProperties { Size = "24", Bold = true}), (" - цена " + manufacture.Price.ToString(), new WordTextProperties { Size = "24"}) }, @@ -38,21 +41,13 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage } SaveWord(info); } - /// - /// Создание doc-файла - /// - /// + // Создание doc-файла protected abstract void CreateWord(WordInfo info); - /// - /// Создание абзаца с текстом - /// - /// - /// + + // Создание абзаца с текстом protected abstract void CreateParagraph(WordParagraph paragraph); - /// - /// Сохранение файла - /// - /// + + // Сохранение файла protected abstract void SaveWord(WordInfo info); } } diff --git a/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/Implements/SaveToWord.cs index cf94c74..425a869 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/Implements/SaveToWord.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/Implements/SaveToWord.cs @@ -15,11 +15,8 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage.Implements { private WordprocessingDocument? _wordDocument; private Body? _docBody; - /// - /// Получение типа выравнивания - /// - /// - /// + + // Получение типа выравнивания private static JustificationValues GetJustificationValues(WordJustificationType type) { return type switch @@ -29,10 +26,8 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage.Implements _ => JustificationValues.Left, }; } - /// - /// Настройки страницы - /// - /// + + // Настройки страницы private static SectionProperties CreateSectionProperties() { var properties = new SectionProperties(); @@ -43,11 +38,8 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage.Implements properties.AppendChild(pageSize); return properties; } - /// - /// Задание форматирования для абзаца - /// - /// - /// + + // Задание форматирования для абзаца private static ParagraphProperties? CreateParagraphProperties( WordTextProperties? paragraphProperties) {