From e196b106ec3142cb7becb5d3701f6ffc835d6830 Mon Sep 17 00:00:00 2001
From: antoc0der <1@DESKTOP-K1L8ND3>
Date: Tue, 26 Mar 2024 16:57:52 +0400
Subject: [PATCH 01/12] =?UTF-8?q?=D0=B4=D0=BE=D1=88=D0=B5=D0=BB=20=D0=B4?=
=?UTF-8?q?=D0=BE=20=D0=B0=D0=B1=D1=81=D1=82=D1=80=D0=B0=D0=BA=D1=82=D0=BD?=
=?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0=20?=
=?UTF-8?q?=D0=BF=D0=B4=D1=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FlowerShopBusinessLogic.csproj | 1 +
.../OfficePackage/AbstractSaveToExcel.cs | 103 +++++
.../OfficePackage/AbstractSaveToPdf.cs | 80 ++++
.../OfficePackage/AbstractSaveToWord.cs | 56 +++
.../HelperEnums/ExcelStyleInfoType.cs | 15 +
.../HelperEnums/PdfParagraphAlignmentType.cs | 16 +
.../HelperEnums/WordJustificationType.cs | 14 +
.../HelperModels/ExcelCellParametres.cs | 18 +
.../OfficePackage/HelperModels/ExcelInfo.cs | 16 +
.../HelperModels/ExcelMergeParametres.cs | 15 +
.../OfficePackage/HelperModels/PdfInfo.cs | 18 +
.../HelperModels/PdfParagraph.cs | 15 +
.../HelperModels/PdfRowParametres.cs | 15 +
.../OfficePackage/HelperModels/WordInfo.cs | 16 +
.../HelperModels/WordParagraph.cs | 14 +
.../HelperModels/WordTextProperties.cs | 16 +
.../OfficePackage/Implements/SaveToExcel.cs | 356 ++++++++++++++++++
.../OfficePackage/Implements/SaveToWord.cs | 121 ++++++
.../BindingModels/ReportBindingModel.cs | 15 +
.../BusinessLogicsContracts/IReportLogic.cs | 40 ++
.../FlowerShopContracts.csproj | 1 +
.../ReportFlowerComponentViewModel.cs | 15 +
.../ViewModels/ReportOrdersViewModel.cs | 17 +
.../FlowerShopDataModels.csproj | 1 +
.../FlowerShopDatabaseImplement.csproj | 1 +
FlowerShopDatabaseImplement/Order.cs | 5 +-
FlowerShopDatabaseImplement/OrderStorage.cs | 36 +-
.../FlowerShopFileImplement.csproj | 4 +
.../FlowerShopListImplement.csproj | 4 +
ProjectFlowerShop/ProjectFlowerShop.csproj | 1 +
30 files changed, 1017 insertions(+), 28 deletions(-)
create mode 100644 FlowerShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
create mode 100644 FlowerShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
create mode 100644 FlowerShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs
create mode 100644 FlowerShopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
create mode 100644 FlowerShopBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs
create mode 100644 FlowerShopBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs
create mode 100644 FlowerShopBusinessLogic/OfficePackage/HelperModels/ExcelCellParametres.cs
create mode 100644 FlowerShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
create mode 100644 FlowerShopBusinessLogic/OfficePackage/HelperModels/ExcelMergeParametres.cs
create mode 100644 FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
create mode 100644 FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
create mode 100644 FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfRowParametres.cs
create mode 100644 FlowerShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
create mode 100644 FlowerShopBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
create mode 100644 FlowerShopBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
create mode 100644 FlowerShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
create mode 100644 FlowerShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs
create mode 100644 FlowerShopContracts/BindingModels/ReportBindingModel.cs
create mode 100644 FlowerShopContracts/BusinessLogicsContracts/IReportLogic.cs
create mode 100644 FlowerShopContracts/ViewModels/ReportFlowerComponentViewModel.cs
create mode 100644 FlowerShopContracts/ViewModels/ReportOrdersViewModel.cs
diff --git a/FlowerShopBusinessLogic/FlowerShopBusinessLogic.csproj b/FlowerShopBusinessLogic/FlowerShopBusinessLogic.csproj
index e3db8e7..9edf3a6 100644
--- a/FlowerShopBusinessLogic/FlowerShopBusinessLogic.csproj
+++ b/FlowerShopBusinessLogic/FlowerShopBusinessLogic.csproj
@@ -7,6 +7,7 @@
+
diff --git a/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
new file mode 100644
index 0000000..3b36e74
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
@@ -0,0 +1,103 @@
+using FlowerShopBusinessLogic.OfficePackage.HelperEnums;
+using FlowerShopBusinessLogic.OfficePackage.HelperModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopBusinessLogic.OfficePackage
+{
+ public abstract class AbstractSaveToExcel
+ {
+ ///
+ /// Создание отчета
+ ///
+ ///
+ public void CreateReport(ExcelInfo info)
+ {
+ CreateExcel(info);
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "A",
+ RowIndex = 1,
+ Text = info.Title,
+ StyleInfo = ExcelStyleInfoType.Title
+ });
+ MergeCells(new ExcelMergeParameters
+ {
+ CellFromName = "A1",
+ CellToName = "C1"
+ });
+ uint rowIndex = 2;
+ foreach (var pc in info.FlowerComponents)
+ {
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "A",
+ RowIndex = rowIndex,
+ Text = pc.ComponentName,
+ StyleInfo = ExcelStyleInfoType.Text
+ });
+ rowIndex++;
+ foreach (var product in pc.Flowers)
+ {
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "B",
+ RowIndex = rowIndex,
+ Text = product.Item1,
+ StyleInfo =
+ ExcelStyleInfoType.TextWithBroder
+ });
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "C",
+ RowIndex = rowIndex,
+ Text = product.Item2.ToString(),
+ StyleInfo =
+ ExcelStyleInfoType.TextWithBroder
+ });
+ rowIndex++;
+ }
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "A",
+ RowIndex = rowIndex,
+ Text = "Итого",
+ StyleInfo = ExcelStyleInfoType.Text
+ });
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "C",
+ RowIndex = rowIndex,
+ Text = pc.TotalCount.ToString(),
+ StyleInfo = ExcelStyleInfoType.Text
+ });
+ rowIndex++;
+ }
+ SaveExcel(info);
+ }
+ ///
+ /// Создание excel-файла
+ ///
+ ///
+ protected abstract void CreateExcel(ExcelInfo info);
+ ///
+ /// Добавляем новую ячейку в лист
+ ///
+ ///
+ protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams);
+ ///
+ /// Объединение ячеек
+ ///
+ ///
+ protected abstract void MergeCells(ExcelMergeParameters excelParams);
+ ///
+ /// Сохранение файла
+ ///
+ ///
+ protected abstract void SaveExcel(ExcelInfo info);
+ }
+
+}
diff --git a/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
new file mode 100644
index 0000000..b0eea1a
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
@@ -0,0 +1,80 @@
+using FlowerShopBusinessLogic.OfficePackage.HelperEnums;
+using FlowerShopBusinessLogic.OfficePackage.HelperModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopBusinessLogic.OfficePackage
+{
+ public abstract class AbstractSaveToPdf
+ {
+ public void CreateDoc(PdfInfo info)
+ {
+ CreatePdf(info);
+ CreateParagraph(new PdfParagraph
+ {
+ Text = info.Title,
+ Style ="NormalTitle",
+ ParagraphAlignment = PdfParagraphAlignmentType.Center
+ });
+ CreateParagraph(new PdfParagraph
+ {
+ Text = $"с { info.DateFrom.ToShortDateString() } по { info.DateTo.ToShortDateString() }", Style = "Normal",
+ ParagraphAlignment = PdfParagraphAlignmentType.Center
+ });
+ CreateTable(new List { "2cm", "3cm", "6cm", "3cm" });
+ CreateRow(new PdfRowParameters
+ {
+ Texts = new List { "Номер", "Дата заказа", "Изделие","Сумма" },
+ Style = "NormalTitle",
+ ParagraphAlignment = PdfParagraphAlignmentType.Center
+ });
+ foreach (var order in info.Orders)
+ {
+ CreateRow(new PdfRowParameters
+ {
+ Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.FlowerName, order.Sum.ToString() },
+ Style = "Normal",
+ ParagraphAlignment = PdfParagraphAlignmentType.Left
+ });
+ }
+ CreateParagraph(new PdfParagraph
+ {
+ Text = $"Итого: {info.Orders.Sum(x=> x.Sum)}\t",
+ Style = "Normal",
+ ParagraphAlignment = PdfParagraphAlignmentType.Right
+ });
+ SavePdf(info);
+ }
+ ///
+ /// Создание doc-файла
+ ///
+ ///
+ protected abstract void CreatePdf(PdfInfo info);
+ ///
+ /// Создание параграфа с текстом
+ ///
+ ///
+ ///
+ protected abstract void CreateParagraph(PdfParagraph paragraph);
+ ///
+ /// Создание таблицы
+ ///
+ ///
+ ///
+ protected abstract void CreateTable(List columns);
+ ///
+ /// Создание и заполнение строки
+ ///
+ ///
+ protected abstract void CreateRow(PdfRowParameters rowParameters);
+ ///
+ /// Сохранение файла
+ ///
+ ///
+ protected abstract void SavePdf(PdfInfo info);
+ }
+
+}
diff --git a/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs
new file mode 100644
index 0000000..f59357c
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs
@@ -0,0 +1,56 @@
+using FlowerShopBusinessLogic.OfficePackage.HelperEnums;
+using FlowerShopBusinessLogic.OfficePackage.HelperModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopBusinessLogic.OfficePackage
+{
+ public abstract class AbstractSaveToWord
+ {
+ 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
+ {
+ Size = "24",
+ JustificationType = WordJustificationType.Center
+ }
+ });
+ foreach (var component in info.Components)
+ {
+ CreateParagraph(new WordParagraph
+ {
+ Texts = new List<(string, WordTextProperties)> { (component.ComponentName, new WordTextProperties { Size = "24", }) },
+ TextProperties = new WordTextProperties
+ {
+ Size = "24",
+ JustificationType = WordJustificationType.Both
+ }
+ });
+ }
+ SaveWord(info);
+ }
+ ///
+ /// Создание doc-файла
+ ///
+ ///
+ protected abstract void CreateWord(WordInfo info);
+ ///
+ /// Создание абзаца с текстом
+ ///
+ ///
+ ///
+ protected abstract void CreateParagraph(WordParagraph paragraph);
+ ///
+ /// Сохранение файла
+ ///
+ ///
+ protected abstract void SaveWord(WordInfo info);
+ }
+}
diff --git a/FlowerShopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs b/FlowerShopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
new file mode 100644
index 0000000..0a91444
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopBusinessLogic.OfficePackage.HelperEnums
+{
+ public enum ExcelStyleInfoType
+ {
+ Title,
+ Text,
+ TextWithBroder
+ }
+}
diff --git a/FlowerShopBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs b/FlowerShopBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs
new file mode 100644
index 0000000..8125cf3
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopBusinessLogic.OfficePackage.HelperEnums
+{
+ public enum PdfParagraphAlignmentType
+ {
+ Center,
+ Left,
+
+ Right
+ }
+}
diff --git a/FlowerShopBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs b/FlowerShopBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs
new file mode 100644
index 0000000..ba1ea71
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopBusinessLogic.OfficePackage.HelperEnums
+{
+ public enum WordJustificationType
+ {
+ Center,
+ Both
+ }
+}
diff --git a/FlowerShopBusinessLogic/OfficePackage/HelperModels/ExcelCellParametres.cs b/FlowerShopBusinessLogic/OfficePackage/HelperModels/ExcelCellParametres.cs
new file mode 100644
index 0000000..ca0d84c
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/HelperModels/ExcelCellParametres.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using FlowerShopBusinessLogic.OfficePackage.HelperEnums;
+
+namespace FlowerShopBusinessLogic.OfficePackage.HelperModels
+{
+ public class ExcelCellParameters
+ {
+ public string ColumnName { get; set; } = string.Empty;
+ public uint RowIndex { get; set; }
+ public string Text { get; set; } = string.Empty;
+ public string CellReference => $"{ColumnName}{RowIndex}";
+ public ExcelStyleInfoType StyleInfo { get; set; }
+ }
+}
diff --git a/FlowerShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/FlowerShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
new file mode 100644
index 0000000..378f150
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using FlowerShopContracts.ViewModels;
+
+namespace FlowerShopBusinessLogic.OfficePackage.HelperModels
+{
+ public class ExcelInfo
+ {
+ public string FileName { get; set; } = string.Empty;
+ public string Title { get; set; } = string.Empty;
+ public List FlowerComponents { get; set; } = new();
+ }
+}
diff --git a/FlowerShopBusinessLogic/OfficePackage/HelperModels/ExcelMergeParametres.cs b/FlowerShopBusinessLogic/OfficePackage/HelperModels/ExcelMergeParametres.cs
new file mode 100644
index 0000000..2658b1f
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/HelperModels/ExcelMergeParametres.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopBusinessLogic.OfficePackage.HelperModels
+{
+ public class ExcelMergeParameters
+ {
+ public string CellFromName { get; set; } = string.Empty;
+ public string CellToName { get; set; } = string.Empty;
+ public string Merge => $"{CellFromName}:{CellToName}";
+ }
+}
diff --git a/FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs b/FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
new file mode 100644
index 0000000..bd8b32f
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
@@ -0,0 +1,18 @@
+using FlowerShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopBusinessLogic.OfficePackage.HelperModels
+{
+ public class PdfInfo
+ {
+ public string FileName { get; set; } = string.Empty;
+ public string Title { get; set; } = string.Empty;
+ public DateTime DateFrom { get; set; }
+ public DateTime DateTo { get; set; }
+ public List Orders { get; set; } = new();
+ }
+}
diff --git a/FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs b/FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
new file mode 100644
index 0000000..33c0a55
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopBusinessLogic.OfficePackage.HelperModels
+{
+ public class PdfParagraph
+ {
+ public string Text { get; set; } = string.Empty;
+ public string Style { get; set; } = string.Empty;
+ public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
+ }
+}
diff --git a/FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfRowParametres.cs b/FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfRowParametres.cs
new file mode 100644
index 0000000..bfcbeff
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfRowParametres.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopBusinessLogic.OfficePackage.HelperModels
+{
+ public class PdfRowParameters
+ {
+ public List Texts { get; set; } = new();
+ public string Style { get; set; } = string.Empty;
+ public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
+ }
+}
diff --git a/FlowerShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/FlowerShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
new file mode 100644
index 0000000..248cacd
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
@@ -0,0 +1,16 @@
+using FlowerShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopBusinessLogic.OfficePackage.HelperModels
+{
+ public class WordInfo
+ {
+ public string FileName { get; set; } = string.Empty;
+ public string Title { get; set; } = string.Empty;
+ public List Components { get; set; } = new();
+ }
+}
diff --git a/FlowerShopBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs b/FlowerShopBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
new file mode 100644
index 0000000..6c594c5
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopBusinessLogic.OfficePackage.HelperModels
+{
+ public class WordParagraph
+ {
+ public List<(string, WordTextProperties)> Texts { get; set; } = new();
+ public WordTextProperties? TextProperties { get; set; }
+ }
+}
diff --git a/FlowerShopBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs b/FlowerShopBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
new file mode 100644
index 0000000..fbaecb4
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using FlowerShopBusinessLogic.OfficePackage.HelperEnums;
+
+namespace FlowerShopBusinessLogic.OfficePackage.HelperModels
+{
+ public class WordTextProperties
+ {
+ public string Size { get; set; } = string.Empty;
+ public bool Bold { get; set; }
+ public WordJustificationType JustificationType { get; set; }
+ }
+}
diff --git a/FlowerShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/FlowerShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
new file mode 100644
index 0000000..501e2be
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
@@ -0,0 +1,356 @@
+using DocumentFormat.OpenXml.Office2010.Excel;
+using DocumentFormat.OpenXml.Office2013.Excel;
+using DocumentFormat.OpenXml.Office2016.Excel;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
+using DocumentFormat.OpenXml;
+using FlowerShopBusinessLogic.OfficePackage.HelperEnums;
+using FlowerShopBusinessLogic.OfficePackage.HelperModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopBusinessLogic.OfficePackage.Implements
+{
+ public class SaveToExcel : AbstractSaveToExcel
+ {
+ private SpreadsheetDocument? _spreadsheetDocument;
+ private SharedStringTablePart? _shareStringPart;
+ private Worksheet? _worksheet;
+ ///
+ /// Настройка стилей для файла
+ ///
+ ///
+ private static void CreateStyles(WorkbookPart workbookpart)
+ {
+ var sp = workbookpart.AddNewPart();
+ sp.Stylesheet = new Stylesheet();
+ var fonts = new Fonts() { Count = 2U, KnownFonts = true };
+ var fontUsual = new Font();
+ fontUsual.Append(new FontSize() { Val = 12D });
+ fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+ { Theme = 1U });
+ fontUsual.Append(new FontName() { Val = "Times New Roman" });
+ fontUsual.Append(new FontFamilyNumbering() { Val = 2 });
+ fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor });
+ var fontTitle = new Font();
+ fontTitle.Append(new Bold());
+ fontTitle.Append(new FontSize() { Val = 14D });
+ fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+ { Theme = 1U });
+ fontTitle.Append(new FontName() { Val = "Times New Roman" });
+ fontTitle.Append(new FontFamilyNumbering() { Val = 2 });
+ fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor });
+ fonts.Append(fontUsual);
+ fonts.Append(fontTitle);
+ var fills = new Fills() { Count = 2U };
+ var fill1 = new Fill();
+ fill1.Append(new PatternFill() { PatternType = PatternValues.None });
+ var fill2 = new Fill();
+ fill2.Append(new PatternFill()
+ {
+ PatternType = PatternValues.Gray125
+ });
+ fills.Append(fill1);
+ fills.Append(fill2);
+ var borders = new Borders() { Count = 2U };
+ var borderNoBorder = new Border();
+ borderNoBorder.Append(new LeftBorder());
+ borderNoBorder.Append(new RightBorder());
+ borderNoBorder.Append(new TopBorder());
+ borderNoBorder.Append(new BottomBorder());
+ borderNoBorder.Append(new DiagonalBorder());
+ var borderThin = new Border();
+ var leftBorder = new LeftBorder() { Style = BorderStyleValues.Thin };
+ leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+ { Indexed = 64U });
+ var rightBorder = new RightBorder()
+ {
+ Style = BorderStyleValues.Thin
+ };
+ rightBorder.Append(new
+ DocumentFormat.OpenXml.Office2010.Excel.Color()
+ { Indexed = 64U });
+ var topBorder = new TopBorder() { Style = BorderStyleValues.Thin };
+ topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+ { Indexed = 64U });
+ var bottomBorder = new BottomBorder()
+ {
+ Style =
+ BorderStyleValues.Thin
+ };
+ bottomBorder.Append(new
+ DocumentFormat.OpenXml.Office2010.Excel.Color()
+ { Indexed = 64U });
+ borderThin.Append(leftBorder);
+ borderThin.Append(rightBorder);
+ borderThin.Append(topBorder);
+ borderThin.Append(bottomBorder);
+ borderThin.Append(new DiagonalBorder());
+ borders.Append(borderNoBorder);
+ borders.Append(borderThin);
+ var cellStyleFormats = new CellStyleFormats() { Count = 1U };
+ var cellFormatStyle = new CellFormat()
+ {
+ NumberFormatId = 0U,
+ FontId
+ = 0U,
+ FillId = 0U,
+ BorderId = 0U
+ };
+ cellStyleFormats.Append(cellFormatStyle);
+ var cellFormats = new CellFormats() { Count = 3U };
+ var cellFormatFont = new CellFormat()
+ {
+ NumberFormatId = 0U,
+ FontId =
+ 0U,
+ FillId = 0U,
+ BorderId = 0U,
+ FormatId = 0U,
+ ApplyFont = true
+ };
+ var cellFormatFontAndBorder = new CellFormat()
+ {
+ NumberFormatId = 0U,
+ FontId = 0U,
+ FillId = 0U,
+ BorderId = 1U,
+ FormatId = 0U,
+ ApplyFont = true,
+ ApplyBorder = true
+ };
+ var cellFormatTitle = new CellFormat()
+ {
+ NumberFormatId = 0U,
+ FontId
+ = 1U,
+ FillId = 0U,
+ BorderId = 0U,
+ FormatId = 0U,
+ Alignment = new Alignment()
+ {
+ Vertical = VerticalAlignmentValues.Center,
+ WrapText = true,
+ Horizontal =
+ HorizontalAlignmentValues.Center
+ },
+ ApplyFont = true
+ };
+ cellFormats.Append(cellFormatFont);
+ cellFormats.Append(cellFormatFontAndBorder);
+ cellFormats.Append(cellFormatTitle);
+ var cellStyles = new CellStyles() { Count = 1U };
+ cellStyles.Append(new CellStyle()
+ {
+ Name = "Normal",
+ FormatId = 0U,
+ BuiltinId = 0U
+ });
+ var differentialFormats = new
+ DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats()
+ { Count = 0U };
+
+ var tableStyles = new TableStyles()
+ {
+ Count = 0U,
+ DefaultTableStyle =
+ "TableStyleMedium2",
+ DefaultPivotStyle = "PivotStyleLight16"
+ };
+ var stylesheetExtensionList = new StylesheetExtensionList();
+ var stylesheetExtension1 = new StylesheetExtension()
+ {
+ Uri =
+ "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}"
+ };
+ stylesheetExtension1.AddNamespaceDeclaration("x14",
+ "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
+ stylesheetExtension1.Append(new SlicerStyles()
+ {
+ DefaultSlicerStyle =
+ "SlicerStyleLight1"
+ });
+ var stylesheetExtension2 = new StylesheetExtension()
+ {
+ Uri =
+ "{9260A510-F301-46a8-8635-F512D64BE5F5}"
+ };
+ stylesheetExtension2.AddNamespaceDeclaration("x15",
+ "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main");
+ stylesheetExtension2.Append(new TimelineStyles()
+ {
+ DefaultTimelineStyle = "TimeSlicerStyleLight1"
+ });
+ stylesheetExtensionList.Append(stylesheetExtension1);
+ stylesheetExtensionList.Append(stylesheetExtension2);
+ sp.Stylesheet.Append(fonts);
+ sp.Stylesheet.Append(fills);
+ sp.Stylesheet.Append(borders);
+ sp.Stylesheet.Append(cellStyleFormats);
+ sp.Stylesheet.Append(cellFormats);
+ sp.Stylesheet.Append(cellStyles);
+ sp.Stylesheet.Append(differentialFormats);
+ sp.Stylesheet.Append(tableStyles);
+ sp.Stylesheet.Append(stylesheetExtensionList);
+ }
+ ///
+ /// Получение номера стиля из типа
+ ///
+ ///
+ ///
+ private static uint GetStyleValue(ExcelStyleInfoType styleInfo)
+ {
+ return styleInfo switch
+ {
+ ExcelStyleInfoType.Title => 2U,
+ ExcelStyleInfoType.TextWithBroder => 1U,
+ ExcelStyleInfoType.Text => 0U,
+ _ => 0U,
+ };
+ }
+ protected override void CreateExcel(ExcelInfo info)
+ {
+ _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName,
+ SpreadsheetDocumentType.Workbook);
+ // Создаем книгу (в ней хранятся листы)
+ var workbookpart = _spreadsheetDocument.AddWorkbookPart();
+ workbookpart.Workbook = new Workbook();
+ CreateStyles(workbookpart);
+ // Получаем/создаем хранилище текстов для книги
+ _shareStringPart =
+ _spreadsheetDocument.WorkbookPart!.GetPartsOfType().Any()
+ ?
+ _spreadsheetDocument.WorkbookPart.GetPartsOfType().First()
+ :
+ _spreadsheetDocument.WorkbookPart.AddNewPart();
+ // Создаем SharedStringTable, если его нет
+ if (_shareStringPart.SharedStringTable == null)
+ {
+ _shareStringPart.SharedStringTable = new SharedStringTable();
+ }
+ // Создаем лист в книгу
+ var worksheetPart = workbookpart.AddNewPart();
+ worksheetPart.Worksheet = new Worksheet(new SheetData());
+ // Добавляем лист в книгу
+ var sheets =
+ _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
+ var sheet = new Sheet()
+ {
+ Id =
+ _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
+ SheetId = 1,
+ Name = "Лист"
+ };
+ sheets.Append(sheet);
+ _worksheet = worksheetPart.Worksheet;
+ }
+ protected override void InsertCellInWorksheet(ExcelCellParameters
+ excelParams)
+ {
+ if (_worksheet == null || _shareStringPart == null)
+ {
+ return;
+ }
+ var sheetData = _worksheet.GetFirstChild();
+ if (sheetData == null)
+ {
+ return;
+ }
+ // Ищем строку, либо добавляем ее
+ Row row;
+ if (sheetData.Elements().Where(r => r.RowIndex! ==
+ excelParams.RowIndex).Any())
+ {
+ row = sheetData.Elements().Where(r => r.RowIndex! ==
+ excelParams.RowIndex).First();
+ }
+ else
+ {
+ row = new Row() { RowIndex = excelParams.RowIndex };
+ sheetData.Append(row);
+ }
+ // Ищем нужную ячейку
+ Cell cell;
+ if (row.Elements().Where(c => c.CellReference!.Value ==
+ excelParams.CellReference).Any())
+ {
+ cell = row.Elements().Where(c => c.CellReference!.Value ==
+ excelParams.CellReference).First();
+ }
+ else
+ {
+ // Все ячейки должны быть последовательно друг за другом расположены
+ // нужно определить, после какой вставлять
+ Cell? refCell = null;
+ foreach (Cell rowCell in row.Elements())
+ {
+ if (string.Compare(rowCell.CellReference!.Value,
+ excelParams.CellReference, true) > 0)
+ {
+ refCell = rowCell;
+ break;
+ }
+ }
+ var newCell = new Cell()
+ {
+ CellReference =
+ excelParams.CellReference
+ };
+ row.InsertBefore(newCell, refCell);
+ cell = newCell;
+ }
+ // вставляем новый текст
+ _shareStringPart.SharedStringTable.AppendChild(new
+ SharedStringItem(new Text(excelParams.Text)));
+ _shareStringPart.SharedStringTable.Save();
+ cell.CellValue = new
+ CellValue((_shareStringPart.SharedStringTable.Elements().Count(
+ ) - 1).ToString());
+ cell.DataType = new EnumValue(CellValues.SharedString);
+ cell.StyleIndex = GetStyleValue(excelParams.StyleInfo);
+ }
+ protected override void MergeCells(ExcelMergeParameters excelParams)
+ {
+ if (_worksheet == null)
+ {
+ return;
+ }
+ MergeCells mergeCells;
+ if (_worksheet.Elements().Any())
+ {
+ mergeCells = _worksheet.Elements().First();
+ }
+ else
+ {
+ mergeCells = new MergeCells();
+ if (_worksheet.Elements().Any())
+ {
+ _worksheet.InsertAfter(mergeCells,
+ _worksheet.Elements().First());
+ }
+ else
+ {
+ _worksheet.InsertAfter(mergeCells,
+ _worksheet.Elements().First());
+ }
+ }
+ var mergeCell = new MergeCell()
+ {
+ Reference = new StringValue(excelParams.Merge)
+ };
+ mergeCells.Append(mergeCell);
+ }
+ protected override void SaveExcel(ExcelInfo info)
+ {
+ if (_spreadsheetDocument == null)
+ {
+ return;
+ }
+ _spreadsheetDocument.WorkbookPart!.Workbook.Save();
+ _spreadsheetDocument.Dispose();
+ }
+ }
+}
diff --git a/FlowerShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/FlowerShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs
new file mode 100644
index 0000000..df65399
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs
@@ -0,0 +1,121 @@
+using FlowerShopBusinessLogic.OfficePackage.HelperEnums;
+using FlowerShopBusinessLogic.OfficePackage.HelperModels;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+
+
+namespace FlowerShopBusinessLogic.OfficePackage.Implements
+{
+ public class SaveToWord : AbstractSaveToWord
+ {
+ private WordprocessingDocument? _wordDocument;
+ private Body? _docBody;
+ ///
+ /// Получение типа выравнивания
+ ///
+ ///
+ ///
+ private static JustificationValues GetJustificationValues(WordJustificationType type)
+ {
+ return type switch
+ {
+ WordJustificationType.Both => JustificationValues.Both,
+ WordJustificationType.Center => JustificationValues.Center,
+ _ => JustificationValues.Left,
+ };
+ }
+ ///
+ /// Настройки страницы
+ ///
+ ///
+ private static SectionProperties CreateSectionProperties()
+ {
+ var properties = new SectionProperties();
+ var pageSize = new PageSize
+ {
+ Orient = PageOrientationValues.Portrait
+ };
+ properties.AppendChild(pageSize);
+ return properties;
+ }
+ ///
+ /// Задание форматирования для абзаца
+ ///
+ ///
+ ///
+ private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties)
+ {
+ if (paragraphProperties == null)
+ {
+ return null;
+ }
+ var properties = new ParagraphProperties();
+ properties.AppendChild(new Justification()
+ {
+ Val = GetJustificationValues(paragraphProperties.JustificationType)
+ });
+ properties.AppendChild(new SpacingBetweenLines
+ {
+ LineRule = LineSpacingRuleValues.Auto
+ });
+ properties.AppendChild(new Indentation());
+ var paragraphMarkRunProperties = new ParagraphMarkRunProperties();
+ if (!string.IsNullOrEmpty(paragraphProperties.Size))
+ {
+ paragraphMarkRunProperties.AppendChild(new FontSize
+ {
+ Val = paragraphProperties.Size
+ });
+ }
+ properties.AppendChild(paragraphMarkRunProperties);
+ return properties;
+ }
+ protected override void CreateWord(WordInfo info)
+ {
+ _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document);
+ MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
+ mainPart.Document = new Document();
+ _docBody = mainPart.Document.AppendChild(new Body());
+ }
+ protected override void CreateParagraph(WordParagraph paragraph)
+ {
+ if (_docBody == null || paragraph == null)
+ {
+ return;
+ }
+ var docParagraph = new Paragraph();
+
+ docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
+ foreach (var run in paragraph.Texts)
+ {
+ var docRun = new Run();
+ var properties = new RunProperties();
+ properties.AppendChild(new FontSize { Val = run.Item2.Size });
+ if (run.Item2.Bold)
+ {
+ properties.AppendChild(new Bold());
+ }
+ docRun.AppendChild(properties);
+ docRun.AppendChild(new Text
+ {
+ Text = run.Item1,
+ Space = SpaceProcessingModeValues.Preserve
+ });
+ docParagraph.AppendChild(docRun);
+ }
+ _docBody.AppendChild(docParagraph);
+ }
+ protected override void SaveWord(WordInfo info)
+ {
+ if (_docBody == null || _wordDocument == null)
+ {
+ return;
+ }
+ _docBody.AppendChild(CreateSectionProperties());
+ _wordDocument.MainDocumentPart!.Document.Save();
+ _wordDocument.Dispose();
+ }
+
+ }
+}
diff --git a/FlowerShopContracts/BindingModels/ReportBindingModel.cs b/FlowerShopContracts/BindingModels/ReportBindingModel.cs
new file mode 100644
index 0000000..b0f9795
--- /dev/null
+++ b/FlowerShopContracts/BindingModels/ReportBindingModel.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopContracts.BindingModels
+{
+ public class ReportBindingModel
+ {
+ public string FileName { get; set; } = string.Empty;
+ public DateTime? DateFrom { get; set; }
+ public DateTime? DateTo { get; set; }
+ }
+}
diff --git a/FlowerShopContracts/BusinessLogicsContracts/IReportLogic.cs b/FlowerShopContracts/BusinessLogicsContracts/IReportLogic.cs
new file mode 100644
index 0000000..154de41
--- /dev/null
+++ b/FlowerShopContracts/BusinessLogicsContracts/IReportLogic.cs
@@ -0,0 +1,40 @@
+using FlowerShopContracts.BindingModels;
+using FlowerShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopContracts.BusinessLogicsContracts
+{
+ public interface IReportLogic
+ {
+ ///
+ /// Получение списка компонент с указанием, в каких изделиях используются
+ ///
+ ///
+ List GetFlowerComponent();
+ ///
+ /// Получение списка заказов за определенный период
+ ///
+ ///
+ ///
+ List GetOrders(ReportBindingModel model);
+ ///
+ /// Сохранение компонент в файл-Word
+ ///
+ ///
+ void SaveComponentsToWordFile(ReportBindingModel model);
+ ///
+ /// Сохранение компонент с указаеним продуктов в файл-Excel
+ ///
+ ///
+ void SaveProductComponentToExcelFile(ReportBindingModel model);
+ ///
+ /// Сохранение заказов в файл-Pdf
+ ///
+ ///
+ void SaveOrdersToPdfFile(ReportBindingModel model);
+ }
+}
diff --git a/FlowerShopContracts/FlowerShopContracts.csproj b/FlowerShopContracts/FlowerShopContracts.csproj
index 901b7f6..0da3f46 100644
--- a/FlowerShopContracts/FlowerShopContracts.csproj
+++ b/FlowerShopContracts/FlowerShopContracts.csproj
@@ -7,6 +7,7 @@
+
diff --git a/FlowerShopContracts/ViewModels/ReportFlowerComponentViewModel.cs b/FlowerShopContracts/ViewModels/ReportFlowerComponentViewModel.cs
new file mode 100644
index 0000000..670209e
--- /dev/null
+++ b/FlowerShopContracts/ViewModels/ReportFlowerComponentViewModel.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopContracts.ViewModels
+{
+ public class ReportFlowerComponentViewModel
+ {
+ public string ComponentName { get; set; } = string.Empty;
+ public int TotalCount { get; set; }
+ public List> Flowers { get; set; } = new();
+ }
+}
diff --git a/FlowerShopContracts/ViewModels/ReportOrdersViewModel.cs b/FlowerShopContracts/ViewModels/ReportOrdersViewModel.cs
new file mode 100644
index 0000000..65079c4
--- /dev/null
+++ b/FlowerShopContracts/ViewModels/ReportOrdersViewModel.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopContracts.ViewModels
+{
+ public class ReportOrdersViewModel
+ {
+ public int Id { get; set; }
+ public DateTime DateCreate { get; set; }
+ public string FlowerName { get; set; } = string.Empty;
+ public double Sum { get; set; }
+ }
+
+}
diff --git a/FlowerShopDataModels/FlowerShopDataModels.csproj b/FlowerShopDataModels/FlowerShopDataModels.csproj
index dce9680..da2f558 100644
--- a/FlowerShopDataModels/FlowerShopDataModels.csproj
+++ b/FlowerShopDataModels/FlowerShopDataModels.csproj
@@ -7,6 +7,7 @@
+
diff --git a/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj b/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj
index 43c2b67..ba493d6 100644
--- a/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj
+++ b/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj
@@ -7,6 +7,7 @@
+
diff --git a/FlowerShopDatabaseImplement/Order.cs b/FlowerShopDatabaseImplement/Order.cs
index 66b3063..dc5f0b8 100644
--- a/FlowerShopDatabaseImplement/Order.cs
+++ b/FlowerShopDatabaseImplement/Order.cs
@@ -11,7 +11,7 @@ using System.Text;
using System.Threading.Tasks;
using FlowerShopDataModels.Enums;
-namespace FlowerShopDatabaseImplement
+namespace FlowerShopDatabaseImplement.Models
{
public class Order : IOrderModel
{
@@ -27,7 +27,7 @@ namespace FlowerShopDatabaseImplement
public DateTime? DateImplement { get; private set; }
[Required]
public int FlowerId { get; private set; }
-
+ public virtual Flower? Flower { get; set; }
public static Order? Create(OrderBindingModel model)
{
if (model == null)
@@ -64,6 +64,7 @@ namespace FlowerShopDatabaseImplement
Status = Status,
DateCreate = DateCreate,
DateImplement = DateImplement,
+ FlowerName = Flower?.FlowerName ?? String.Empty,
Id = Id,
};
diff --git a/FlowerShopDatabaseImplement/OrderStorage.cs b/FlowerShopDatabaseImplement/OrderStorage.cs
index 6e7996b..a467e15 100644
--- a/FlowerShopDatabaseImplement/OrderStorage.cs
+++ b/FlowerShopDatabaseImplement/OrderStorage.cs
@@ -18,8 +18,8 @@ namespace FlowerShopDatabaseImplement.Implements
public List GetFullList()
{
using var context = new FlowerShopDataBase();
- return context.Orders
- .Select(x => AccessFlowerStorage(x.GetViewModel))
+ return context.Orders.Include(x => x.Flower)
+ .Select(x => x.GetViewModel)
.ToList();
}
public List GetFilteredList(OrderSearchModel model)
@@ -29,9 +29,9 @@ namespace FlowerShopDatabaseImplement.Implements
return new();
}
using var context = new FlowerShopDataBase();
- return context.Orders
+ return context.Orders.Include(x => x.Flower)
.Where(x => x.Id == model.Id)
- .Select(x => AccessFlowerStorage(x.GetViewModel))
+ .Select(x => x.GetViewModel)
.ToList();
}
public OrderViewModel? GetElement(OrderSearchModel model)
@@ -41,7 +41,7 @@ namespace FlowerShopDatabaseImplement.Implements
return null;
}
using var context = new FlowerShopDataBase();
- return AccessFlowerStorage(context.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel);
+ return context.Orders.Include(x => x.Flower).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
}
public OrderViewModel? Insert(OrderBindingModel model)
{
@@ -53,12 +53,12 @@ namespace FlowerShopDatabaseImplement.Implements
using var context = new FlowerShopDataBase();
context.Orders.Add(newOrder);
context.SaveChanges();
- return AccessFlowerStorage(newOrder.GetViewModel);
+ return newOrder.GetViewModel;
}
public OrderViewModel? Update(OrderBindingModel model)
{
using var context = new FlowerShopDataBase();
- var order = context.Orders.FirstOrDefault(x => x.Id ==
+ var order = context.Orders.Include(x => x.Flower).FirstOrDefault(x => x.Id ==
model.Id);
if (order == null)
{
@@ -66,36 +66,20 @@ namespace FlowerShopDatabaseImplement.Implements
}
order.Update(model);
context.SaveChanges();
- return AccessFlowerStorage(order.GetViewModel);
+ return order.GetViewModel;
}
public OrderViewModel? Delete(OrderBindingModel model)
{
using var context = new FlowerShopDataBase();
- var element = context.Orders.FirstOrDefault(rec => rec.Id ==
+ var element = context.Orders.Include(x => x.Flower).FirstOrDefault(rec => rec.Id ==
model.Id);
if (element != null)
{
context.Orders.Remove(element);
context.SaveChanges();
- return AccessFlowerStorage(element.GetViewModel);
+ return element.GetViewModel;
}
return null;
}
-
- public static OrderViewModel AccessFlowerStorage(OrderViewModel model)
- {
- if (model == null)
- return null;
- using var context = new FlowerShopDataBase();
- foreach (var flower in context.Flowers)
- {
- if (flower.Id == model.FlowerId)
- {
- model.FlowerName = flower.FlowerName;
- break;
- }
- }
- return model;
- }
}
}
diff --git a/FlowerShopFileImplement/FlowerShopFileImplement.csproj b/FlowerShopFileImplement/FlowerShopFileImplement.csproj
index ca6fa62..a2d5f45 100644
--- a/FlowerShopFileImplement/FlowerShopFileImplement.csproj
+++ b/FlowerShopFileImplement/FlowerShopFileImplement.csproj
@@ -6,6 +6,10 @@
enable
+
+
+
+
diff --git a/FlowerShopListImplement/FlowerShopListImplement.csproj b/FlowerShopListImplement/FlowerShopListImplement.csproj
index ca6fa62..a2d5f45 100644
--- a/FlowerShopListImplement/FlowerShopListImplement.csproj
+++ b/FlowerShopListImplement/FlowerShopListImplement.csproj
@@ -6,6 +6,10 @@
enable
+
+
+
+
diff --git a/ProjectFlowerShop/ProjectFlowerShop.csproj b/ProjectFlowerShop/ProjectFlowerShop.csproj
index 5116ff2..e7c6257 100644
--- a/ProjectFlowerShop/ProjectFlowerShop.csproj
+++ b/ProjectFlowerShop/ProjectFlowerShop.csproj
@@ -9,6 +9,7 @@
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
--
2.25.1
From 71bf37ebc836171372e6192cdc5376b7a1dc95c5 Mon Sep 17 00:00:00 2001
From: antoc0der <1@DESKTOP-K1L8ND3>
Date: Tue, 26 Mar 2024 17:10:28 +0400
Subject: [PATCH 02/12] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
=?UTF-8?q?=D0=BB=20=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8?=
=?UTF-8?q?=D1=8E=20=D0=BF=D0=B4=D1=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FlowerShopBusinessLogic.csproj | 1 +
.../HelperModels/PdfParagraph.cs | 1 +
.../HelperModels/PdfRowParametres.cs | 1 +
.../OfficePackage/Implements/SaveToPdf.cs | 107 ++++++++++++++++++
.../FlowerShopContracts.csproj | 1 +
.../FlowerShopDataModels.csproj | 1 +
.../FlowerShopDatabaseImplement.csproj | 1 +
.../FlowerShopFileImplement.csproj | 1 +
.../FlowerShopListImplement.csproj | 1 +
ProjectFlowerShop/ProjectFlowerShop.csproj | 1 +
10 files changed, 116 insertions(+)
create mode 100644 FlowerShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
diff --git a/FlowerShopBusinessLogic/FlowerShopBusinessLogic.csproj b/FlowerShopBusinessLogic/FlowerShopBusinessLogic.csproj
index 9edf3a6..762007e 100644
--- a/FlowerShopBusinessLogic/FlowerShopBusinessLogic.csproj
+++ b/FlowerShopBusinessLogic/FlowerShopBusinessLogic.csproj
@@ -9,6 +9,7 @@
+
diff --git a/FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs b/FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
index 33c0a55..a8a47bc 100644
--- a/FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
+++ b/FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using FlowerShopBusinessLogic.OfficePackage.HelperEnums;
namespace FlowerShopBusinessLogic.OfficePackage.HelperModels
{
diff --git a/FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfRowParametres.cs b/FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfRowParametres.cs
index bfcbeff..be5e5e9 100644
--- a/FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfRowParametres.cs
+++ b/FlowerShopBusinessLogic/OfficePackage/HelperModels/PdfRowParametres.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using FlowerShopBusinessLogic.OfficePackage.HelperEnums;
namespace FlowerShopBusinessLogic.OfficePackage.HelperModels
{
diff --git a/FlowerShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs b/FlowerShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
new file mode 100644
index 0000000..23c13c3
--- /dev/null
+++ b/FlowerShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
@@ -0,0 +1,107 @@
+
+using FlowerShopBusinessLogic.OfficePackage.HelperEnums;
+using FlowerShopBusinessLogic.OfficePackage.HelperModels;
+using MigraDoc.DocumentObjectModel;
+using MigraDoc.DocumentObjectModel.Tables;
+using MigraDoc.Rendering;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopBusinessLogic.OfficePackage.Implements
+{
+ public class SaveToPdf : AbstractSaveToPdf
+ {
+ private Document? _document;
+ private Section? _section;
+ private Table? _table;
+ private static ParagraphAlignment
+ GetParagraphAlignment(PdfParagraphAlignmentType type)
+ {
+ return type switch
+ {
+ PdfParagraphAlignmentType.Center => ParagraphAlignment.Center,
+ PdfParagraphAlignmentType.Left => ParagraphAlignment.Left,
+ PdfParagraphAlignmentType.Right => ParagraphAlignment.Right,
+ _ => ParagraphAlignment.Justify,
+ };
+ }
+ ///
+ /// Создание стилей для документа
+ ///
+ ///
+ private static void DefineStyles(Document document)
+ {
+ var style = document.Styles["Normal"];
+ style.Font.Name = "Times New Roman";
+ style.Font.Size = 14;
+ style = document.Styles.AddStyle("NormalTitle", "Normal");
+ style.Font.Bold = true;
+ }
+ protected override void CreatePdf(PdfInfo info)
+ {
+ _document = new Document();
+ DefineStyles(_document);
+ _section = _document.AddSection();
+ }
+ protected override void CreateParagraph(PdfParagraph pdfParagraph)
+ {
+ if (_section == null)
+ {
+ return;
+ }
+ var paragraph = _section.AddParagraph(pdfParagraph.Text);
+ paragraph.Format.SpaceAfter = "1cm";
+ paragraph.Format.Alignment =
+ GetParagraphAlignment(pdfParagraph.ParagraphAlignment);
+ paragraph.Style = pdfParagraph.Style;
+ }
+ protected override void CreateTable(List columns)
+ {
+ if (_document == null)
+ {
+ return;
+ }
+ _table = _document.LastSection.AddTable();
+ foreach (var elem in columns)
+ {
+ _table.AddColumn(elem);
+ }
+ }
+ protected override void CreateRow(PdfRowParameters rowParameters)
+ {
+ if (_table == null)
+ {
+ return;
+ }
+ var row = _table.AddRow();
+ for (int i = 0; i < rowParameters.Texts.Count; ++i)
+ {
+ row.Cells[i].AddParagraph(rowParameters.Texts[i]);
+ if (!string.IsNullOrEmpty(rowParameters.Style))
+ {
+ row.Cells[i].Style = rowParameters.Style;
+ }
+ Unit borderWidth = 0.5;
+ row.Cells[i].Borders.Left.Width = borderWidth;
+ row.Cells[i].Borders.Right.Width = borderWidth;
+ row.Cells[i].Borders.Top.Width = borderWidth;
+ row.Cells[i].Borders.Bottom.Width = borderWidth;
+ row.Cells[i].Format.Alignment = GetParagraphAlignment(rowParameters.ParagraphAlignment);
+ row.Cells[i].VerticalAlignment = VerticalAlignment.Center;
+ }
+ }
+ protected override void SavePdf(PdfInfo info)
+ {
+ var renderer = new PdfDocumentRenderer(true)
+ {
+ Document = _document
+ };
+ renderer.RenderDocument();
+ renderer.PdfDocument.Save(info.FileName);
+ }
+ }
+
+}
diff --git a/FlowerShopContracts/FlowerShopContracts.csproj b/FlowerShopContracts/FlowerShopContracts.csproj
index 0da3f46..c4f7d06 100644
--- a/FlowerShopContracts/FlowerShopContracts.csproj
+++ b/FlowerShopContracts/FlowerShopContracts.csproj
@@ -9,6 +9,7 @@
+
diff --git a/FlowerShopDataModels/FlowerShopDataModels.csproj b/FlowerShopDataModels/FlowerShopDataModels.csproj
index da2f558..bf4416c 100644
--- a/FlowerShopDataModels/FlowerShopDataModels.csproj
+++ b/FlowerShopDataModels/FlowerShopDataModels.csproj
@@ -9,6 +9,7 @@
+
diff --git a/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj b/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj
index ba493d6..a09130b 100644
--- a/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj
+++ b/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj
@@ -14,6 +14,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
+
diff --git a/FlowerShopFileImplement/FlowerShopFileImplement.csproj b/FlowerShopFileImplement/FlowerShopFileImplement.csproj
index a2d5f45..c181cd2 100644
--- a/FlowerShopFileImplement/FlowerShopFileImplement.csproj
+++ b/FlowerShopFileImplement/FlowerShopFileImplement.csproj
@@ -8,6 +8,7 @@
+
diff --git a/FlowerShopListImplement/FlowerShopListImplement.csproj b/FlowerShopListImplement/FlowerShopListImplement.csproj
index a2d5f45..c181cd2 100644
--- a/FlowerShopListImplement/FlowerShopListImplement.csproj
+++ b/FlowerShopListImplement/FlowerShopListImplement.csproj
@@ -8,6 +8,7 @@
+
diff --git a/ProjectFlowerShop/ProjectFlowerShop.csproj b/ProjectFlowerShop/ProjectFlowerShop.csproj
index e7c6257..40c73e5 100644
--- a/ProjectFlowerShop/ProjectFlowerShop.csproj
+++ b/ProjectFlowerShop/ProjectFlowerShop.csproj
@@ -16,6 +16,7 @@
+
--
2.25.1
From e911493961e2210b3f1fee645ca34cbbe6ddfabf Mon Sep 17 00:00:00 2001
From: antoc0der <1@DESKTOP-K1L8ND3>
Date: Tue, 26 Mar 2024 18:10:51 +0400
Subject: [PATCH 03/12] =?UTF-8?q?=D1=87=D1=82=D0=BE=20=D1=82=D1=83=D1=82?=
=?UTF-8?q?=20=D1=81=D0=BA=D0=B0=D0=B6=D0=B5=D1=88=D1=8C=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
FlowerShopBusinessLogic/ReportLogic.cs | 129 ++++++++++++++++
.../BusinessLogicsContracts/IReportLogic.cs | 2 +-
.../SearchModels/OrderSearchModel.cs | 2 +
.../FormReportFlowerComponent.Designer.cs | 103 +++++++++++++
.../FormReportFlowerComponent.cs | 88 +++++++++++
.../FormReportFlowerComponent.resx | 138 ++++++++++++++++++
ProjectFlowerShop/MainForm.Designer.cs | 39 ++++-
7 files changed, 497 insertions(+), 4 deletions(-)
create mode 100644 FlowerShopBusinessLogic/ReportLogic.cs
create mode 100644 ProjectFlowerShop/FormReportFlowerComponent.Designer.cs
create mode 100644 ProjectFlowerShop/FormReportFlowerComponent.cs
create mode 100644 ProjectFlowerShop/FormReportFlowerComponent.resx
diff --git a/FlowerShopBusinessLogic/ReportLogic.cs b/FlowerShopBusinessLogic/ReportLogic.cs
new file mode 100644
index 0000000..6362773
--- /dev/null
+++ b/FlowerShopBusinessLogic/ReportLogic.cs
@@ -0,0 +1,129 @@
+using FlowerShopBusinessLogic.OfficePackage.HelperModels;
+using FlowerShopBusinessLogic.OfficePackage;
+using FlowerShopContracts.BindingModels;
+using FlowerShopContracts.BusinessLogicsContracts;
+using FlowerShopContracts.SearchModels;
+using FlowerShopContracts.StoragesContracts;
+using FlowerShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowerShopBusinessLogic
+{
+ public class ReportLogic : IReportLogic
+ {
+ private readonly IComponentStorage _componentStorage;
+ private readonly IFlowerStorage _flowerStorage;
+ private readonly IOrderStorage _orderStorage;
+ private readonly AbstractSaveToExcel _saveToExcel;
+ private readonly AbstractSaveToWord _saveToWord;
+ private readonly AbstractSaveToPdf _saveToPdf;
+ public ReportLogic(IFlowerStorage flowerStorage, IComponentStorage
+ componentStorage, IOrderStorage orderStorage,
+ AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord,
+ AbstractSaveToPdf saveToPdf)
+ {
+ _flowerStorage = flowerStorage;
+ _componentStorage = componentStorage;
+ _orderStorage = orderStorage;
+ _saveToExcel = saveToExcel;
+ _saveToWord = saveToWord;
+ _saveToPdf = saveToPdf;
+ }
+ ///
+ /// Получение списка компонент с указанием, в каких изделиях используются
+ ///
+ ///
+ public List GetFlowerComponent()
+ {
+ var components = _componentStorage.GetFullList();
+ var flowers = _flowerStorage.GetFullList();
+ var list = new List();
+ foreach (var component in components)
+ {
+ var record = new ReportFlowerComponentViewModel
+ {
+ ComponentName = component.ComponentName,
+ Flowers = new List>(),
+ TotalCount = 0
+ };
+ foreach (var flower in flowers)
+ {
+ if (flower.FlowerComponents.ContainsKey(component.Id))
+ {
+ record.Flowers.Add(new Tuple(flower.FlowerName, flower.FlowerComponents[component.Id].Item2));
+ record.TotalCount +=flower.FlowerComponents[component.Id].Item2;
+ }
+ }
+ list.Add(record);
+ }
+ return list;
+ }
+ ///
+ /// Получение списка заказов за определенный период
+ ///
+ ///
+ ///
+ public List GetOrders(ReportBindingModel model)
+ {
+ return _orderStorage.GetFilteredList(new OrderSearchModel
+ {
+ DateFrom
+ = model.DateFrom,
+ DateTo = model.DateTo
+ })
+ .Select(x => new ReportOrdersViewModel
+ {
+ Id = x.Id,
+ DateCreate = x.DateCreate,
+ FlowerName = x.FlowerName,
+ Sum = x.Sum
+ })
+ .ToList();
+ }
+ ///
+ /// Сохранение компонент в файл-Word
+ ///
+ ///
+ public void SaveComponentsToWordFile(ReportBindingModel model)
+ {
+ _saveToWord.CreateDoc(new WordInfo
+ {
+ FileName = model.FileName,
+ Title = "Список компонент",
+ Components = _componentStorage.GetFullList()
+ });
+ }
+ ///
+ /// Сохранение компонент с указаеним продуктов в файл-Excel
+ ///
+ ///
+ public void SaveFlowerComponentToExcelFile(ReportBindingModel model)
+ {
+ _saveToExcel.CreateReport(new ExcelInfo
+ {
+ FileName = model.FileName,
+ Title = "Список компонент",
+ FlowerComponents = GetFlowerComponent()
+ });
+ }
+ ///
+ /// Сохранение заказов в файл-Pdf
+ ///
+ ///
+ public void SaveOrdersToPdfFile(ReportBindingModel model)
+ {
+ _saveToPdf.CreateDoc(new PdfInfo
+ {
+ FileName = model.FileName,
+ Title = "Список заказов",
+ DateFrom = model.DateFrom!.Value,
+ DateTo = model.DateTo!.Value,
+ Orders = GetOrders(model)
+ });
+ }
+ }
+}
diff --git a/FlowerShopContracts/BusinessLogicsContracts/IReportLogic.cs b/FlowerShopContracts/BusinessLogicsContracts/IReportLogic.cs
index 154de41..0b68630 100644
--- a/FlowerShopContracts/BusinessLogicsContracts/IReportLogic.cs
+++ b/FlowerShopContracts/BusinessLogicsContracts/IReportLogic.cs
@@ -30,7 +30,7 @@ namespace FlowerShopContracts.BusinessLogicsContracts
/// Сохранение компонент с указаеним продуктов в файл-Excel
///
///
- void SaveProductComponentToExcelFile(ReportBindingModel model);
+ void SaveFlowerComponentToExcelFile(ReportBindingModel model);
///
/// Сохранение заказов в файл-Pdf
///
diff --git a/FlowerShopContracts/SearchModels/OrderSearchModel.cs b/FlowerShopContracts/SearchModels/OrderSearchModel.cs
index 5b569de..c8cd5d3 100644
--- a/FlowerShopContracts/SearchModels/OrderSearchModel.cs
+++ b/FlowerShopContracts/SearchModels/OrderSearchModel.cs
@@ -9,5 +9,7 @@ namespace FlowerShopContracts.SearchModels
public class OrderSearchModel
{
public int? Id { get; set; }
+ public DateTime? DateFrom { get; set; }
+ public DateTime? DateTo { get; set; }
}
}
diff --git a/ProjectFlowerShop/FormReportFlowerComponent.Designer.cs b/ProjectFlowerShop/FormReportFlowerComponent.Designer.cs
new file mode 100644
index 0000000..112e00a
--- /dev/null
+++ b/ProjectFlowerShop/FormReportFlowerComponent.Designer.cs
@@ -0,0 +1,103 @@
+namespace ProjectFlowerShop
+{
+ partial class FormReportFlowerComponent
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ buttonSaveToExcel = new Button();
+ dataGridView = new DataGridView();
+ Component = new DataGridViewTextBoxColumn();
+ Flower = new DataGridViewTextBoxColumn();
+ Count = new DataGridViewTextBoxColumn();
+ ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+ SuspendLayout();
+ //
+ // buttonSaveToExcel
+ //
+ buttonSaveToExcel.Location = new Point(12, 21);
+ buttonSaveToExcel.Name = "buttonSaveToExcel";
+ buttonSaveToExcel.Size = new Size(207, 29);
+ buttonSaveToExcel.TabIndex = 0;
+ buttonSaveToExcel.Text = "Сохранить в Excel";
+ buttonSaveToExcel.UseVisualStyleBackColor = true;
+ buttonSaveToExcel.Click += buttonSaveToExcel_Click;
+ //
+ // dataGridView
+ //
+ dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ dataGridView.Columns.AddRange(new DataGridViewColumn[] { Component, Flower, Count });
+ dataGridView.Location = new Point(12, 65);
+ dataGridView.Name = "dataGridView";
+ dataGridView.RowHeadersWidth = 51;
+ dataGridView.RowTemplate.Height = 29;
+ dataGridView.Size = new Size(812, 359);
+ dataGridView.TabIndex = 1;
+ //
+ // Component
+ //
+ Component.HeaderText = "Компонент";
+ Component.MinimumWidth = 6;
+ Component.Name = "Component";
+ Component.Width = 250;
+ //
+ // Flower
+ //
+ Flower.HeaderText = "Изделие";
+ Flower.MinimumWidth = 6;
+ Flower.Name = "Flower";
+ Flower.Width = 250;
+ //
+ // Count
+ //
+ Count.HeaderText = "Количество";
+ Count.MinimumWidth = 6;
+ Count.Name = "Count";
+ Count.Width = 250;
+ //
+ // FormReportFlowerComponent
+ //
+ AutoScaleDimensions = new SizeF(8F, 20F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(836, 450);
+ Controls.Add(dataGridView);
+ Controls.Add(buttonSaveToExcel);
+ Name = "FormReportFlowerComponent";
+ Text = "FormReportFlowerComponent";
+ Load += FormReportFlowerComponent_Load;
+ ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private Button buttonSaveToExcel;
+ private DataGridView dataGridView;
+ private DataGridViewTextBoxColumn Component;
+ private DataGridViewTextBoxColumn Flower;
+ private DataGridViewTextBoxColumn Count;
+ }
+}
\ No newline at end of file
diff --git a/ProjectFlowerShop/FormReportFlowerComponent.cs b/ProjectFlowerShop/FormReportFlowerComponent.cs
new file mode 100644
index 0000000..ceb3959
--- /dev/null
+++ b/ProjectFlowerShop/FormReportFlowerComponent.cs
@@ -0,0 +1,88 @@
+using FlowerShopContracts.BusinessLogicsContracts;
+using FlowerShopContracts.BindingModels;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Microsoft.Extensions.Logging;
+
+
+namespace ProjectFlowerShop
+{
+ public partial class FormReportFlowerComponent : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IReportLogic _logic;
+
+ public FormReportFlowerComponent(ILogger logger, IReportLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ }
+
+ private void buttonSaveToExcel_Click(object sender, EventArgs e)
+ {
+ using var dialog = new SaveFileDialog
+ {
+ Filter = "xlsx|*.xlsx"
+ };
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ try
+ {
+ _logic.SaveFlowerComponentToExcelFile(new ReportBindingModel
+ {
+ FileName = dialog.FileName
+ });
+ _logger.LogInformation("Сохранение списка изделий покомпонентам");
+
+ MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK,
+ MessageBoxIcon.Information);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка сохранения списка изделий покомпонентам");
+
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+ MessageBoxIcon.Error);
+ }
+ }
+ }
+
+ private void FormReportFlowerComponent_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ var dict = _logic.GetFlowerComponent();
+ if (dict != null)
+ {
+ dataGridView.Rows.Clear();
+ foreach (var elem in dict)
+ {
+ dataGridView.Rows.Add(new object[] { elem.ComponentName, "", "" });
+ foreach (var listElem in elem.Flowers)
+ {
+ dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
+ }
+ dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount });
+ dataGridView.Rows.Add(Array.Empty
--
2.25.1
From 16986cf1a58036bf7308749492bb25c064a280fc Mon Sep 17 00:00:00 2001
From: antoc0der <1@DESKTOP-K1L8ND3>
Date: Tue, 26 Mar 2024 19:46:22 +0400
Subject: [PATCH 05/12] =?UTF-8?q?=D1=81=D0=BA=D0=BE=D1=80=D0=BE=20=D0=B1?=
=?UTF-8?q?=D1=83=D0=B4=D0=B5=D1=82=20=D0=BA=D0=BE=D0=BD=D0=B5=D1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FormReportOrders.Designer.cs | 117 ++++
ProjectFlowerShop/FormReportOrders.cs | 105 +++
ProjectFlowerShop/FormReportOrders.resx | 120 ++++
ProjectFlowerShop/MainForm.Designer.cs | 65 +-
ProjectFlowerShop/MainForm.cs | 40 +-
ProjectFlowerShop/ReportOrders.rdlc | 600 ++++++++++++++++++
6 files changed, 1014 insertions(+), 33 deletions(-)
create mode 100644 ProjectFlowerShop/FormReportOrders.Designer.cs
create mode 100644 ProjectFlowerShop/FormReportOrders.cs
create mode 100644 ProjectFlowerShop/FormReportOrders.resx
create mode 100644 ProjectFlowerShop/ReportOrders.rdlc
diff --git a/ProjectFlowerShop/FormReportOrders.Designer.cs b/ProjectFlowerShop/FormReportOrders.Designer.cs
new file mode 100644
index 0000000..14f6f40
--- /dev/null
+++ b/ProjectFlowerShop/FormReportOrders.Designer.cs
@@ -0,0 +1,117 @@
+namespace ProjectFlowerShop
+{
+ partial class FormReportOrders
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ dateTimePickerFrom = new DateTimePicker();
+ dateTimePickerTo = new DateTimePicker();
+ labelS = new Label();
+ labelPo = new Label();
+ buttonMake = new Button();
+ buttonToPdf = new Button();
+ SuspendLayout();
+ //
+ // dateTimePickerFrom
+ //
+ dateTimePickerFrom.Location = new Point(51, 10);
+ dateTimePickerFrom.Name = "dateTimePickerFrom";
+ dateTimePickerFrom.Size = new Size(250, 27);
+ dateTimePickerFrom.TabIndex = 0;
+ //
+ // dateTimePickerTo
+ //
+ dateTimePickerTo.Location = new Point(363, 10);
+ dateTimePickerTo.Name = "dateTimePickerTo";
+ dateTimePickerTo.Size = new Size(250, 27);
+ dateTimePickerTo.TabIndex = 1;
+ //
+ // labelS
+ //
+ labelS.AutoSize = true;
+ labelS.Location = new Point(12, 15);
+ labelS.Name = "labelS";
+ labelS.Size = new Size(18, 20);
+ labelS.TabIndex = 2;
+ labelS.Text = "С";
+ //
+ // labelPo
+ //
+ labelPo.AutoSize = true;
+ labelPo.Location = new Point(317, 15);
+ labelPo.Name = "labelPo";
+ labelPo.Size = new Size(29, 20);
+ labelPo.TabIndex = 3;
+ labelPo.Text = "По";
+ //
+ // buttonMake
+ //
+ buttonMake.Location = new Point(649, 11);
+ buttonMake.Name = "buttonMake";
+ buttonMake.Size = new Size(139, 29);
+ buttonMake.TabIndex = 4;
+ buttonMake.Text = "Сформировать";
+ buttonMake.UseVisualStyleBackColor = true;
+ buttonMake.Click += buttonMake_Click;
+ //
+ // buttonToPdf
+ //
+ buttonToPdf.Location = new Point(1078, 11);
+ buttonToPdf.Name = "buttonToPdf";
+ buttonToPdf.Size = new Size(94, 29);
+ buttonToPdf.TabIndex = 5;
+ buttonToPdf.Text = "В ПДФ";
+ buttonToPdf.UseVisualStyleBackColor = true;
+ buttonToPdf.Click += buttonToPdf_Click;
+ //
+ // FormReportOrders
+ //
+ AutoScaleDimensions = new SizeF(8F, 20F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(1184, 217);
+ Controls.Add(buttonToPdf);
+ Controls.Add(buttonMake);
+ Controls.Add(labelPo);
+ Controls.Add(labelS);
+ Controls.Add(dateTimePickerTo);
+ Controls.Add(dateTimePickerFrom);
+ Name = "FormReportOrders";
+ Text = "FormReportOrders";
+ ResumeLayout(false);
+ PerformLayout();
+ }
+
+ #endregion
+
+ private DateTimePicker dateTimePickerFrom;
+ private DateTimePicker dateTimePickerTo;
+ private Label labelS;
+ private Label labelPo;
+ private Button buttonMake;
+ private Button buttonToPdf;
+ }
+}
\ No newline at end of file
diff --git a/ProjectFlowerShop/FormReportOrders.cs b/ProjectFlowerShop/FormReportOrders.cs
new file mode 100644
index 0000000..8bf126c
--- /dev/null
+++ b/ProjectFlowerShop/FormReportOrders.cs
@@ -0,0 +1,105 @@
+using FlowerShopContracts.BindingModels;
+using FlowerShopContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+using Microsoft.Reporting.WinForms;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ProjectFlowerShop
+{
+ public partial class FormReportOrders : Form
+ {
+ private readonly ReportViewer reportViewer;
+ private readonly ILogger _logger;
+ private readonly IReportLogic _logic;
+ public FormReportOrders(ILogger logger, IReportLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ reportViewer = new ReportViewer
+ {
+ Dock = DockStyle.Fill
+ };
+ reportViewer.LocalReport.LoadReportDefinition(new
+ FileStream("ReportOrders.rdlc", FileMode.Open));
+ Controls.Clear();
+ Controls.Add(reportViewer);
+
+ }
+
+ private void buttonMake_Click(object sender, EventArgs e)
+ {
+ if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
+ {
+ MessageBox.Show("Дата начала должна быть меньше даты окончания",
+ "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ try
+ {
+ var dataSource = _logic.GetOrders(new ReportBindingModel
+ {
+ DateFrom = dateTimePickerFrom.Value,
+ DateTo = dateTimePickerTo.Value
+ });
+ var source = new ReportDataSource("DataSetOrders", dataSource);
+ reportViewer.LocalReport.DataSources.Clear();
+ reportViewer.LocalReport.DataSources.Add(source);
+ var parameters = new[] { new ReportParameter("ReportParameterPeriod", $"c {dateTimePickerFrom.Value.ToShortDateString()} по {dateTimePickerTo.Value.ToShortDateString()}") }; reportViewer.LocalReport.SetParameters(parameters);
+ reportViewer.RefreshReport();
+ _logger.LogInformation("Загрузка списка заказов на период {From}-{ To}", dateTimePickerFrom.Value.ToShortDateString(),
+ dateTimePickerTo.Value.ToShortDateString());
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки списка заказов на период");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+ MessageBoxIcon.Error);
+ }
+ }
+
+ private void buttonToPdf_Click(object sender, EventArgs e)
+ {
+ if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
+ {
+ MessageBox.Show("Дата начала должна быть меньше даты окончания",
+ "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ using var dialog = new SaveFileDialog
+ {
+ Filter = "pdf|*.pdf"
+ };
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ try
+ {
+ _logic.SaveOrdersToPdfFile(new ReportBindingModel
+ {
+ FileName = dialog.FileName,
+ DateFrom = dateTimePickerFrom.Value,
+ DateTo = dateTimePickerTo.Value
+ });
+ _logger.LogInformation("Сохранение списка заказов на период { From} -{ To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
+ MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK,
+ MessageBoxIcon.Information);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка сохранения списка заказов на период");
+
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+ MessageBoxIcon.Error);
+ }
+ }
+ }
+ }
+}
diff --git a/ProjectFlowerShop/FormReportOrders.resx b/ProjectFlowerShop/FormReportOrders.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/ProjectFlowerShop/FormReportOrders.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/ProjectFlowerShop/MainForm.Designer.cs b/ProjectFlowerShop/MainForm.Designer.cs
index 7a3c43d..0a9dee0 100644
--- a/ProjectFlowerShop/MainForm.Designer.cs
+++ b/ProjectFlowerShop/MainForm.Designer.cs
@@ -32,16 +32,16 @@
ToolStripMenu = new ToolStripMenuItem();
КомпонентыStripMenuItem = new ToolStripMenuItem();
ЦветыStripMenuItem = new ToolStripMenuItem();
+ отчетыToolStripMenuItem = new ToolStripMenuItem();
+ списокКомпонентовToolStripMenuItem = new ToolStripMenuItem();
+ компонентыToolStripMenuItem = new ToolStripMenuItem();
+ списокЗаказовToolStripMenuItem = new ToolStripMenuItem();
DataGridView = new DataGridView();
CreateOrderButton = new Button();
TakeInWorkButton = new Button();
ReadyButton = new Button();
IssuedButton = new Button();
RefreshButton = new Button();
- отчетыToolStripMenuItem = new ToolStripMenuItem();
- списокКомпонентовToolStripMenuItem = new ToolStripMenuItem();
- компонентыToolStripMenuItem = new ToolStripMenuItem();
- списокЗаказовToolStripMenuItem = new ToolStripMenuItem();
menuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit();
SuspendLayout();
@@ -66,17 +66,45 @@
// КомпонентыStripMenuItem
//
КомпонентыStripMenuItem.Name = "КомпонентыStripMenuItem";
- КомпонентыStripMenuItem.Size = new Size(224, 26);
+ КомпонентыStripMenuItem.Size = new Size(182, 26);
КомпонентыStripMenuItem.Text = "Компоненты";
КомпонентыStripMenuItem.Click += КомпонентыStripMenuItem_Click;
//
// ЦветыStripMenuItem
//
ЦветыStripMenuItem.Name = "ЦветыStripMenuItem";
- ЦветыStripMenuItem.Size = new Size(224, 26);
+ ЦветыStripMenuItem.Size = new Size(182, 26);
ЦветыStripMenuItem.Text = "Цветы";
ЦветыStripMenuItem.Click += ЦветыStripMenuItem_Click;
//
+ // отчетыToolStripMenuItem
+ //
+ отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокКомпонентовToolStripMenuItem, компонентыToolStripMenuItem, списокЗаказовToolStripMenuItem });
+ отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
+ отчетыToolStripMenuItem.Size = new Size(73, 24);
+ отчетыToolStripMenuItem.Text = "Отчеты";
+ //
+ // списокКомпонентовToolStripMenuItem
+ //
+ списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem";
+ списокКомпонентовToolStripMenuItem.Size = new Size(280, 26);
+ списокКомпонентовToolStripMenuItem.Text = "Список компонентов";
+ списокКомпонентовToolStripMenuItem.Click += списокКомпонентовToolStripMenuItem_Click;
+ //
+ // компонентыToolStripMenuItem
+ //
+ компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
+ компонентыToolStripMenuItem.Size = new Size(280, 26);
+ компонентыToolStripMenuItem.Text = "Компоненты по изделиям ";
+ компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click;
+ //
+ // списокЗаказовToolStripMenuItem
+ //
+ списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem";
+ списокЗаказовToolStripMenuItem.Size = new Size(280, 26);
+ списокЗаказовToolStripMenuItem.Text = "Список заказов";
+ списокЗаказовToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click;
+ //
// DataGridView
//
DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
@@ -136,31 +164,6 @@
RefreshButton.UseVisualStyleBackColor = true;
RefreshButton.Click += RefreshButton_Click;
//
- // отчетыToolStripMenuItem
- //
- отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокКомпонентовToolStripMenuItem, компонентыToolStripMenuItem, списокЗаказовToolStripMenuItem });
- отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
- отчетыToolStripMenuItem.Size = new Size(73, 24);
- отчетыToolStripMenuItem.Text = "Отчеты";
- //
- // списокКомпонентовToolStripMenuItem
- //
- списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem";
- списокКомпонентовToolStripMenuItem.Size = new Size(280, 26);
- списокКомпонентовToolStripMenuItem.Text = "Список компонентов";
- //
- // компонентыToolStripMenuItem
- //
- компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
- компонентыToolStripMenuItem.Size = new Size(280, 26);
- компонентыToolStripMenuItem.Text = "Компоненты по изделиям ";
- //
- // списокЗаказовToolStripMenuItem
- //
- списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem";
- списокЗаказовToolStripMenuItem.Size = new Size(280, 26);
- списокЗаказовToolStripMenuItem.Text = "Список заказов";
- //
// MainForm
//
AutoScaleDimensions = new SizeF(8F, 20F);
diff --git a/ProjectFlowerShop/MainForm.cs b/ProjectFlowerShop/MainForm.cs
index 13fab38..f7f2661 100644
--- a/ProjectFlowerShop/MainForm.cs
+++ b/ProjectFlowerShop/MainForm.cs
@@ -1,4 +1,5 @@
-using FlowerShopContracts.BindingModels;
+using FlowerShopBusinessLogic;
+using FlowerShopContracts.BindingModels;
using FlowerShopContracts.BusinessLogicsContracts;
using FlowerShopDataModels;
using FlowerShopDataModels.Enums;
@@ -20,11 +21,13 @@ namespace ProjectFlowerShop
{
private readonly ILogger _logger;
private readonly IOrderLogic _orderLogic;
- public MainForm(ILogger logger, IOrderLogic orderLogic)
+ private readonly IReportLogic _reportLogic;
+ public MainForm(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic)
{
InitializeComponent();
_logger = logger;
_orderLogic = orderLogic;
+ _reportLogic = reportLogic;
}
private void КомпонентыStripMenuItem_Click(object sender, EventArgs e)
@@ -179,5 +182,38 @@ namespace ProjectFlowerShop
{
LoadData();
}
+
+ private void списокКомпонентовToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ _reportLogic.SaveComponentsToWordFile(new ReportBindingModel
+ {
+ FileName = dialog.FileName
+ });
+ MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK,
+ MessageBoxIcon.Information);
+ }
+ }
+
+ private void компонентыToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportFlowerComponent));
+ if (service is FormReportFlowerComponent form)
+ {
+ form.ShowDialog();
+ }
+
+ }
+
+ private void списокЗаказовToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
+ if (service is FormReportOrders form)
+ {
+ form.ShowDialog();
+ }
+ }
}
}
diff --git a/ProjectFlowerShop/ReportOrders.rdlc b/ProjectFlowerShop/ReportOrders.rdlc
new file mode 100644
index 0000000..29f1693
--- /dev/null
+++ b/ProjectFlowerShop/ReportOrders.rdlc
@@ -0,0 +1,600 @@
+
+
+ 0
+
+
+
+ System.Data.DataSet
+ /* Local Connection */
+
+ 47cb53f0-7dde-4717-ba03-866a0bc4f4dd
+
+
+
+
+
+ FlowerShopContractsViewModels
+ /* Local Query */
+
+
+
+ Id
+ System.Int32
+
+
+ DateCreate
+ System.DateTime
+
+
+ FlowerName
+ System.String
+
+
+ Sum
+ System.Decimal
+
+
+ OrderStatus
+ FlowerShopDataModels.OrderStatus
+
+
+
+ FlowerShopContracts.ViewModels
+ ReportOrderViewModel
+ FlowerShopContracts.ViewModels.ReportOrderViewModel, FlowerShopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Parameters!ReportParameterPeriod.Value
+
+
+
+
+
+
+ ReportParameterPeriod
+ 1cm
+ 1cm
+ 21cm
+
+
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ Заказы
+
+
+
+
+
+
+ 1cm
+ 21cm
+ 1
+
+
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+ 2.5cm
+
+
+ 3.21438cm
+
+
+ 8.23317cm
+
+
+ 2.5cm
+
+
+ 2.5cm
+
+
+
+
+ 0.6cm
+
+
+
+
+ true
+ true
+
+
+
+
+ Номер
+
+
+
+
+
+
+ Textbox5
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Дата создания
+
+
+
+
+
+
+ Textbox1
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Цветы
+
+
+
+
+
+
+ Textbox3
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Статус Заказа
+
+
+
+
+
+
+ Textbox2
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Сумма
+
+
+
+
+
+
+ Textbox7
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ 0.6cm
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!Id.Value
+
+
+
+
+
+
+ Id
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!DateCreate.Value
+
+
+
+
+
+
+ DateCreate
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!FlowerName.Value
+
+
+
+
+
+
+ FlowerName
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!OrderStatus.Value
+
+
+
+
+
+
+ OrderStatus
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+ true
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!Sum.Value
+
+
+
+
+
+
+ Sum
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ After
+
+
+
+
+
+
+ DataSetOrders
+ 2.48391cm
+ 0.55245cm
+ 1.2cm
+ 18.94755cm
+ 2
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Итого:
+
+
+
+
+
+
+ 4cm
+ 12cm
+ 0.6cm
+ 2.5cm
+ 3
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =Sum(Fields!Sum.Value, "DataSetOrders")
+
+
+
+
+
+
+ 4cm
+ 14.5cm
+ 0.6cm
+ 2.5cm
+ 4
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ 5.72875cm
+
+
+ 21cm
+
+ 29.7cm
+ 21cm
+ 2cm
+ 2cm
+ 2cm
+ 2cm
+ 0.13cm
+
+
+
+
+
+
+ String
+ true
+ ReportParameter1
+
+
+
+
+ 5
+ 2
+
+
+ 0
+ 0
+ ReportParameterPeriod
+
+
+
+
+ Cm
+ 1c0c12af-b9e8-41db-8d1f-26d1acbf91cc
+
--
2.25.1
From 0e8bd52b641fa42277b51448fe1da086defa87be Mon Sep 17 00:00:00 2001
From: antoc0der <1@DESKTOP-K1L8ND3>
Date: Tue, 26 Mar 2024 20:44:18 +0400
Subject: [PATCH 06/12] =?UTF-8?q?4=20=D1=81=20=D0=BF=D0=BE=D0=BB=D0=BE?=
=?UTF-8?q?=D0=B2=D0=B8=D0=BD=D0=BE=D0=B9=20=D1=87=D0=B0=D1=81=D0=B0=20?=
=?UTF-8?q?=D0=B1=D0=B5=D0=B7=D1=83=D0=B4=D0=B5=D1=80=D0=B6=D0=BD=D0=BE?=
=?UTF-8?q?=D0=B3=D0=BE=20=D0=B2=D0=B5=D1=81=D0=B5=D0=BB=D1=8C=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FlowerShopBusinessLogic.csproj | 2 +-
.../OfficePackage/AbstractSaveToPdf.cs | 6 +-
.../FlowerShopContracts.csproj | 2 +-
.../ViewModels/ReportOrdersViewModel.cs | 1 +
.../FlowerShopDataModels.csproj | 2 +-
.../FlowerShopDatabaseImplement.csproj | 2 +-
FlowerShopDatabaseImplement/OrderStorage.cs | 4 +-
.../FlowerShopFileImplement.csproj | 2 +-
.../FlowerShopListImplement.csproj | 2 +-
.../FormReportOrders.Designer.cs | 50 +-
ProjectFlowerShop/FormReportOrders.cs | 8 +-
ProjectFlowerShop/Program.cs | 9 +
ProjectFlowerShop/ProjectFlowerShop.csproj | 2 +-
ProjectFlowerShop/ReportOrders.rdlc | 1195 ++++++++---------
14 files changed, 659 insertions(+), 628 deletions(-)
diff --git a/FlowerShopBusinessLogic/FlowerShopBusinessLogic.csproj b/FlowerShopBusinessLogic/FlowerShopBusinessLogic.csproj
index 762007e..2d181f3 100644
--- a/FlowerShopBusinessLogic/FlowerShopBusinessLogic.csproj
+++ b/FlowerShopBusinessLogic/FlowerShopBusinessLogic.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
index b0eea1a..abb41fd 100644
--- a/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
+++ b/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
@@ -24,10 +24,10 @@ namespace FlowerShopBusinessLogic.OfficePackage
Text = $"с { info.DateFrom.ToShortDateString() } по { info.DateTo.ToShortDateString() }", Style = "Normal",
ParagraphAlignment = PdfParagraphAlignmentType.Center
});
- CreateTable(new List { "2cm", "3cm", "6cm", "3cm" });
+ CreateTable(new List { "2cm", "3cm", "6cm", "3cm", "4cm" });
CreateRow(new PdfRowParameters
{
- Texts = new List { "Номер", "Дата заказа", "Изделие","Сумма" },
+ Texts = new List { "Номер", "Дата заказа", "Изделие","Сумма", "Статус" },
Style = "NormalTitle",
ParagraphAlignment = PdfParagraphAlignmentType.Center
});
@@ -35,7 +35,7 @@ namespace FlowerShopBusinessLogic.OfficePackage
{
CreateRow(new PdfRowParameters
{
- Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.FlowerName, order.Sum.ToString() },
+ Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.FlowerName, order.Sum.ToString(), order.OrderStatus.ToString() },
Style = "Normal",
ParagraphAlignment = PdfParagraphAlignmentType.Left
});
diff --git a/FlowerShopContracts/FlowerShopContracts.csproj b/FlowerShopContracts/FlowerShopContracts.csproj
index c4f7d06..6618f44 100644
--- a/FlowerShopContracts/FlowerShopContracts.csproj
+++ b/FlowerShopContracts/FlowerShopContracts.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/FlowerShopContracts/ViewModels/ReportOrdersViewModel.cs b/FlowerShopContracts/ViewModels/ReportOrdersViewModel.cs
index 65079c4..02ce353 100644
--- a/FlowerShopContracts/ViewModels/ReportOrdersViewModel.cs
+++ b/FlowerShopContracts/ViewModels/ReportOrdersViewModel.cs
@@ -11,6 +11,7 @@ namespace FlowerShopContracts.ViewModels
public int Id { get; set; }
public DateTime DateCreate { get; set; }
public string FlowerName { get; set; } = string.Empty;
+ public string OrderStatus { get; set; } = string.Empty;
public double Sum { get; set; }
}
diff --git a/FlowerShopDataModels/FlowerShopDataModels.csproj b/FlowerShopDataModels/FlowerShopDataModels.csproj
index bf4416c..0abf16a 100644
--- a/FlowerShopDataModels/FlowerShopDataModels.csproj
+++ b/FlowerShopDataModels/FlowerShopDataModels.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj b/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj
index a09130b..a71811d 100644
--- a/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj
+++ b/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj
@@ -14,7 +14,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/FlowerShopDatabaseImplement/OrderStorage.cs b/FlowerShopDatabaseImplement/OrderStorage.cs
index a467e15..f0d107a 100644
--- a/FlowerShopDatabaseImplement/OrderStorage.cs
+++ b/FlowerShopDatabaseImplement/OrderStorage.cs
@@ -30,7 +30,9 @@ namespace FlowerShopDatabaseImplement.Implements
}
using var context = new FlowerShopDataBase();
return context.Orders.Include(x => x.Flower)
- .Where(x => x.Id == model.Id)
+ .Where(x => ((!model.Id.HasValue || x.Id == model.Id) &&
+ (!model.DateFrom.HasValue || x.DateCreate >= model.DateFrom) &&
+ (!model.DateTo.HasValue || x.DateCreate <= model.DateTo)))
.Select(x => x.GetViewModel)
.ToList();
}
diff --git a/FlowerShopFileImplement/FlowerShopFileImplement.csproj b/FlowerShopFileImplement/FlowerShopFileImplement.csproj
index c181cd2..bd45863 100644
--- a/FlowerShopFileImplement/FlowerShopFileImplement.csproj
+++ b/FlowerShopFileImplement/FlowerShopFileImplement.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/FlowerShopListImplement/FlowerShopListImplement.csproj b/FlowerShopListImplement/FlowerShopListImplement.csproj
index c181cd2..bd45863 100644
--- a/FlowerShopListImplement/FlowerShopListImplement.csproj
+++ b/FlowerShopListImplement/FlowerShopListImplement.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/ProjectFlowerShop/FormReportOrders.Designer.cs b/ProjectFlowerShop/FormReportOrders.Designer.cs
index 14f6f40..1fd958c 100644
--- a/ProjectFlowerShop/FormReportOrders.Designer.cs
+++ b/ProjectFlowerShop/FormReportOrders.Designer.cs
@@ -34,18 +34,21 @@
labelPo = new Label();
buttonMake = new Button();
buttonToPdf = new Button();
+ panel = new Panel();
+ panel1 = new Panel();
+ panel.SuspendLayout();
SuspendLayout();
//
// dateTimePickerFrom
//
- dateTimePickerFrom.Location = new Point(51, 10);
+ dateTimePickerFrom.Location = new Point(48, 15);
dateTimePickerFrom.Name = "dateTimePickerFrom";
dateTimePickerFrom.Size = new Size(250, 27);
dateTimePickerFrom.TabIndex = 0;
//
// dateTimePickerTo
//
- dateTimePickerTo.Location = new Point(363, 10);
+ dateTimePickerTo.Location = new Point(359, 15);
dateTimePickerTo.Name = "dateTimePickerTo";
dateTimePickerTo.Size = new Size(250, 27);
dateTimePickerTo.TabIndex = 1;
@@ -53,7 +56,7 @@
// labelS
//
labelS.AutoSize = true;
- labelS.Location = new Point(12, 15);
+ labelS.Location = new Point(8, 20);
labelS.Name = "labelS";
labelS.Size = new Size(18, 20);
labelS.TabIndex = 2;
@@ -62,7 +65,7 @@
// labelPo
//
labelPo.AutoSize = true;
- labelPo.Location = new Point(317, 15);
+ labelPo.Location = new Point(315, 22);
labelPo.Name = "labelPo";
labelPo.Size = new Size(29, 20);
labelPo.TabIndex = 3;
@@ -70,7 +73,7 @@
//
// buttonMake
//
- buttonMake.Location = new Point(649, 11);
+ buttonMake.Location = new Point(637, 13);
buttonMake.Name = "buttonMake";
buttonMake.Size = new Size(139, 29);
buttonMake.TabIndex = 4;
@@ -80,7 +83,7 @@
//
// buttonToPdf
//
- buttonToPdf.Location = new Point(1078, 11);
+ buttonToPdf.Location = new Point(1050, 11);
buttonToPdf.Name = "buttonToPdf";
buttonToPdf.Size = new Size(94, 29);
buttonToPdf.TabIndex = 5;
@@ -88,21 +91,38 @@
buttonToPdf.UseVisualStyleBackColor = true;
buttonToPdf.Click += buttonToPdf_Click;
//
+ // panel
+ //
+ panel.Controls.Add(dateTimePickerFrom);
+ panel.Controls.Add(buttonToPdf);
+ panel.Controls.Add(labelS);
+ panel.Controls.Add(buttonMake);
+ panel.Controls.Add(dateTimePickerTo);
+ panel.Controls.Add(labelPo);
+ panel.Location = new Point(12, 2);
+ panel.Name = "panel";
+ panel.Size = new Size(1160, 56);
+ panel.TabIndex = 6;
+ //
+ // panel1
+ //
+ panel1.Location = new Point(15, 69);
+ panel1.Name = "panel1";
+ panel1.Size = new Size(1158, 479);
+ panel1.TabIndex = 7;
+ //
// FormReportOrders
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(1184, 217);
- Controls.Add(buttonToPdf);
- Controls.Add(buttonMake);
- Controls.Add(labelPo);
- Controls.Add(labelS);
- Controls.Add(dateTimePickerTo);
- Controls.Add(dateTimePickerFrom);
+ ClientSize = new Size(1184, 567);
+ Controls.Add(panel1);
+ Controls.Add(panel);
Name = "FormReportOrders";
Text = "FormReportOrders";
+ panel.ResumeLayout(false);
+ panel.PerformLayout();
ResumeLayout(false);
- PerformLayout();
}
#endregion
@@ -113,5 +133,7 @@
private Label labelPo;
private Button buttonMake;
private Button buttonToPdf;
+ private Panel panel;
+ private Panel panel1;
}
}
\ No newline at end of file
diff --git a/ProjectFlowerShop/FormReportOrders.cs b/ProjectFlowerShop/FormReportOrders.cs
index 8bf126c..d04d75f 100644
--- a/ProjectFlowerShop/FormReportOrders.cs
+++ b/ProjectFlowerShop/FormReportOrders.cs
@@ -28,10 +28,8 @@ namespace ProjectFlowerShop
{
Dock = DockStyle.Fill
};
- reportViewer.LocalReport.LoadReportDefinition(new
- FileStream("ReportOrders.rdlc", FileMode.Open));
- Controls.Clear();
- Controls.Add(reportViewer);
+ panel1.Controls.Add(reportViewer);
+ reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrders.rdlc", FileMode.Open));
}
@@ -95,7 +93,7 @@ namespace ProjectFlowerShop
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка сохранения списка заказов на период");
-
+
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
MessageBoxIcon.Error);
}
diff --git a/ProjectFlowerShop/Program.cs b/ProjectFlowerShop/Program.cs
index 8ed9b73..cbca06d 100644
--- a/ProjectFlowerShop/Program.cs
+++ b/ProjectFlowerShop/Program.cs
@@ -8,6 +8,9 @@ using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
using System;
using System.Drawing;
+using FlowerShopBusinessLogic;
+using FlowerShopBusinessLogic.OfficePackage.Implements;
+using FlowerShopBusinessLogic.OfficePackage;
namespace ProjectFlowerShop
{
@@ -40,6 +43,7 @@ namespace ProjectFlowerShop
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
@@ -47,6 +51,11 @@ namespace ProjectFlowerShop
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
}
}
diff --git a/ProjectFlowerShop/ProjectFlowerShop.csproj b/ProjectFlowerShop/ProjectFlowerShop.csproj
index 7c69f51..2d7d1c5 100644
--- a/ProjectFlowerShop/ProjectFlowerShop.csproj
+++ b/ProjectFlowerShop/ProjectFlowerShop.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/ProjectFlowerShop/ReportOrders.rdlc b/ProjectFlowerShop/ReportOrders.rdlc
index 29f1693..967bf8c 100644
--- a/ProjectFlowerShop/ReportOrders.rdlc
+++ b/ProjectFlowerShop/ReportOrders.rdlc
@@ -1,600 +1,599 @@
- 0
-
-
-
- System.Data.DataSet
- /* Local Connection */
-
- 47cb53f0-7dde-4717-ba03-866a0bc4f4dd
-
-
-
-
-
- FlowerShopContractsViewModels
- /* Local Query */
-
-
-
- Id
- System.Int32
-
-
- DateCreate
- System.DateTime
-
-
- FlowerName
- System.String
-
-
- Sum
- System.Decimal
-
-
- OrderStatus
- FlowerShopDataModels.OrderStatus
-
-
-
- FlowerShopContracts.ViewModels
- ReportOrderViewModel
- FlowerShopContracts.ViewModels.ReportOrderViewModel, FlowerShopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Parameters!ReportParameterPeriod.Value
-
-
-
-
-
-
- ReportParameterPeriod
- 1cm
- 1cm
- 21cm
-
-
- Middle
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
- true
- true
-
-
-
-
- Заказы
-
-
-
-
-
-
- 1cm
- 21cm
- 1
-
-
- Middle
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
- 2.5cm
-
-
- 3.21438cm
-
-
- 8.23317cm
-
-
- 2.5cm
-
-
- 2.5cm
-
-
-
-
- 0.6cm
-
-
-
-
- true
- true
-
-
-
-
- Номер
-
-
-
-
-
-
- Textbox5
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- Дата создания
-
-
-
-
-
-
- Textbox1
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- Цветы
-
-
-
-
-
-
- Textbox3
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- Статус Заказа
-
-
-
-
-
-
- Textbox2
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- Сумма
-
-
-
-
-
-
- Textbox7
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- 0.6cm
-
-
-
-
- true
- true
-
-
-
-
- =Fields!Id.Value
-
-
-
-
-
-
- Id
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Fields!DateCreate.Value
-
-
-
-
-
-
- DateCreate
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Fields!FlowerName.Value
-
-
-
-
-
-
- FlowerName
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
- true
- true
-
-
-
-
- =Fields!OrderStatus.Value
-
-
-
-
-
-
- OrderStatus
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
- true
-
-
-
-
-
- true
- true
-
-
-
-
- =Fields!Sum.Value
-
-
-
-
-
-
- Sum
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- After
-
-
-
-
-
-
- DataSetOrders
- 2.48391cm
- 0.55245cm
- 1.2cm
- 18.94755cm
- 2
-
-
-
-
-
- true
- true
-
-
-
-
- Итого:
-
-
-
-
-
-
- 4cm
- 12cm
- 0.6cm
- 2.5cm
- 3
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
- true
- true
-
-
-
-
- =Sum(Fields!Sum.Value, "DataSetOrders")
-
-
-
-
-
-
- 4cm
- 14.5cm
- 0.6cm
- 2.5cm
- 4
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
- 5.72875cm
-
-
- 21cm
-
- 29.7cm
- 21cm
- 2cm
- 2cm
- 2cm
- 2cm
- 0.13cm
-
-
-
-
-
-
- String
- true
- ReportParameter1
-
-
-
-
- 5
- 2
-
-
- 0
- 0
- ReportParameterPeriod
-
-
-
-
- Cm
- 1c0c12af-b9e8-41db-8d1f-26d1acbf91cc
-
+ 0
+
+
+
+ System.Data.DataSet
+ /* Local Connection */
+
+ 47cb53f0-7dde-4717-ba03-866a0bc4f4dd
+
+
+
+
+
+ FlowerShopContractsViewModels
+ /* Local Query */
+
+
+
+ Id
+ System.Int32
+
+
+ DateCreate
+ System.DateTime
+
+
+ FlowerName
+ System.String
+
+
+ Sum
+ System.Decimal
+
+
+ OrderStatus
+ FlowerShopDataModels.OrderStatus
+
+
+
+ FlowerShopContracts.ViewModels
+ ReportOrderViewModel
+ FlowerShopContracts.ViewModels.ReportOrderViewModel, FlowerShopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Parameters!ReportParameterPeriod.Value
+
+
+
+
+
+
+ ReportParameterPeriod
+ 1cm
+ 1cm
+ 21cm
+
+
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ Заказы
+
+
+
+
+
+
+ 1cm
+ 21cm
+ 1
+
+
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+ 2.5cm
+
+
+ 3.21438cm
+
+
+ 8.23317cm
+
+
+ 2.5cm
+
+
+ 2.5cm
+
+
+
+
+ 0.6cm
+
+
+
+
+ true
+ true
+
+
+
+
+ Номер
+
+
+
+
+
+
+ Textbox5
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Дата создания
+
+
+
+
+
+
+ Textbox1
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Цветы
+
+
+
+
+
+
+ Textbox3
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Статус Заказа
+
+
+
+
+
+
+ Textbox2
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Сумма
+
+
+
+
+
+
+ Textbox7
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ 0.6cm
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!Id.Value
+
+
+
+
+
+
+ Id
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!DateCreate.Value
+
+
+
+
+
+
+ DateCreate
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!FlowerName.Value
+
+
+
+
+
+
+ FlowerName
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!OrderStatus.Value
+
+
+
+
+
+
+ OrderStatus
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!Sum.Value
+
+
+
+
+
+
+ Sum
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ After
+
+
+
+
+
+
+ DataSetOrders
+ 2.48391cm
+ 0.55245cm
+ 1.2cm
+ 18.94755cm
+ 2
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Итого:
+
+
+
+
+
+
+ 4cm
+ 12cm
+ 0.6cm
+ 2.5cm
+ 3
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =Sum(Fields!Sum.Value, "DataSetOrders")
+
+
+
+
+
+
+ 4cm
+ 14.5cm
+ 0.6cm
+ 2.5cm
+ 4
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ 5.72875cm
+
+
+ 21cm
+
+ 29.7cm
+ 21cm
+ 2cm
+ 2cm
+ 2cm
+ 2cm
+ 0.13cm
+
+
+
+
+
+
+ String
+ true
+ ReportParameter1
+
+
+
+
+ 5
+ 2
+
+
+ 0
+ 0
+ ReportParameterPeriod
+
+
+
+
+ Cm
+ 1c0c12af-b9e8-41db-8d1f-26d1acbf91cc
+
\ No newline at end of file
--
2.25.1
From 6e76a639884030433782cf8d5ef535287a032ee8 Mon Sep 17 00:00:00 2001
From: antoc0der <1@DESKTOP-K1L8ND3>
Date: Tue, 26 Mar 2024 20:53:44 +0400
Subject: [PATCH 07/12] =?UTF-8?q?=D1=87=D1=82=D0=BE=20=D1=82=D0=BE=20?=
=?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
FlowerShopBusinessLogic/ReportLogic.cs | 1 +
1 file changed, 1 insertion(+)
diff --git a/FlowerShopBusinessLogic/ReportLogic.cs b/FlowerShopBusinessLogic/ReportLogic.cs
index 6362773..0c2e114 100644
--- a/FlowerShopBusinessLogic/ReportLogic.cs
+++ b/FlowerShopBusinessLogic/ReportLogic.cs
@@ -80,6 +80,7 @@ namespace FlowerShopBusinessLogic
Id = x.Id,
DateCreate = x.DateCreate,
FlowerName = x.FlowerName,
+ OrderStatus = x.Status.ToString(),
Sum = x.Sum
})
.ToList();
--
2.25.1
From 110b91bd1ba3e5b27f610295f1baadf56244b971 Mon Sep 17 00:00:00 2001
From: antoc0der <1@DESKTOP-K1L8ND3>
Date: Tue, 26 Mar 2024 22:55:11 +0400
Subject: [PATCH 08/12] =?UTF-8?q?=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0?=
=?UTF-8?q?=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0?=
=?UTF-8?q?=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0?=
=?UTF-8?q?=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0?=
=?UTF-8?q?=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0?=
=?UTF-8?q?=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0?=
=?UTF-8?q?=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0?=
=?UTF-8?q?=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0?=
=?UTF-8?q?=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0?=
=?UTF-8?q?=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0?=
=?UTF-8?q?=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0?=
=?UTF-8?q?=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0=D0=B0?=
=?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../OfficePackage/AbstractSaveToExcel.cs | 8 +++---
.../OfficePackage/AbstractSaveToWord.cs | 4 +--
.../OfficePackage/HelperModels/WordInfo.cs | 2 +-
FlowerShopBusinessLogic/ReportLogic.cs | 25 +++++++++----------
.../ReportFlowerComponentViewModel.cs | 4 +--
FlowerShopDatabaseImplement/OrderStorage.cs | 6 ++---
FlowerShopFileImplement/OrderStorage.cs | 4 ++-
FlowerShopListImplement/OrderStorage.cs | 2 +-
.../FormReportFlowerComponent.Designer.cs | 22 ++++++++--------
.../FormReportFlowerComponent.cs | 8 +++---
.../FormReportFlowerComponent.resx | 11 +-------
.../FormReportOrders.Designer.cs | 2 +-
12 files changed, 44 insertions(+), 54 deletions(-)
diff --git a/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
index 3b36e74..1f6abe9 100644
--- a/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
+++ b/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
@@ -36,17 +36,17 @@ namespace FlowerShopBusinessLogic.OfficePackage
{
ColumnName = "A",
RowIndex = rowIndex,
- Text = pc.ComponentName,
+ Text = pc.FlowerName,
StyleInfo = ExcelStyleInfoType.Text
});
rowIndex++;
- foreach (var product in pc.Flowers)
+ foreach (var component in pc.Components)
{
InsertCellInWorksheet(new ExcelCellParameters
{
ColumnName = "B",
RowIndex = rowIndex,
- Text = product.Item1,
+ Text = component.Item1,
StyleInfo =
ExcelStyleInfoType.TextWithBroder
});
@@ -54,7 +54,7 @@ namespace FlowerShopBusinessLogic.OfficePackage
{
ColumnName = "C",
RowIndex = rowIndex,
- Text = product.Item2.ToString(),
+ Text = component.Item2.ToString(),
StyleInfo =
ExcelStyleInfoType.TextWithBroder
});
diff --git a/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs
index f59357c..4d00419 100644
--- a/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs
+++ b/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs
@@ -22,11 +22,11 @@ namespace FlowerShopBusinessLogic.OfficePackage
JustificationType = WordJustificationType.Center
}
});
- foreach (var component in info.Components)
+ foreach (var flower in info.Flowers)
{
CreateParagraph(new WordParagraph
{
- Texts = new List<(string, WordTextProperties)> { (component.ComponentName, new WordTextProperties { Size = "24", }) },
+ Texts = new List<(string, WordTextProperties)> { (flower.FlowerName, new WordTextProperties { Size = "24", }) },
TextProperties = new WordTextProperties
{
Size = "24",
diff --git a/FlowerShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/FlowerShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
index 248cacd..6d8fc83 100644
--- a/FlowerShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
+++ b/FlowerShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
@@ -11,6 +11,6 @@ namespace FlowerShopBusinessLogic.OfficePackage.HelperModels
{
public string FileName { get; set; } = string.Empty;
public string Title { get; set; } = string.Empty;
- public List Components { get; set; } = new();
+ public List Flowers { get; set; } = new();
}
}
diff --git a/FlowerShopBusinessLogic/ReportLogic.cs b/FlowerShopBusinessLogic/ReportLogic.cs
index 0c2e114..6a6903f 100644
--- a/FlowerShopBusinessLogic/ReportLogic.cs
+++ b/FlowerShopBusinessLogic/ReportLogic.cs
@@ -39,24 +39,23 @@ namespace FlowerShopBusinessLogic
///
public List GetFlowerComponent()
{
- var components = _componentStorage.GetFullList();
+ //var components = _componentStorage.GetFullList();
var flowers = _flowerStorage.GetFullList();
var list = new List();
- foreach (var component in components)
+ foreach (var flower in flowers)
{
var record = new ReportFlowerComponentViewModel
{
- ComponentName = component.ComponentName,
- Flowers = new List>(),
+ FlowerName = flower.FlowerName,
+ Components = new List>(),
TotalCount = 0
};
- foreach (var flower in flowers)
+ foreach (var component in flower.FlowerComponents)
{
- if (flower.FlowerComponents.ContainsKey(component.Id))
- {
- record.Flowers.Add(new Tuple(flower.FlowerName, flower.FlowerComponents[component.Id].Item2));
- record.TotalCount +=flower.FlowerComponents[component.Id].Item2;
- }
+ record.Components.Add(new Tuple(component.Value.Item1.ComponentName, component.Value.Item2));
+ record.TotalCount +=
+ component.Value.Item2;
}
list.Add(record);
}
@@ -94,8 +93,8 @@ namespace FlowerShopBusinessLogic
_saveToWord.CreateDoc(new WordInfo
{
FileName = model.FileName,
- Title = "Список компонент",
- Components = _componentStorage.GetFullList()
+ Title = "Список цветов",
+ Flowers = _flowerStorage.GetFullList()
});
}
///
@@ -107,7 +106,7 @@ namespace FlowerShopBusinessLogic
_saveToExcel.CreateReport(new ExcelInfo
{
FileName = model.FileName,
- Title = "Список компонент",
+ Title = "Список компонентов",
FlowerComponents = GetFlowerComponent()
});
}
diff --git a/FlowerShopContracts/ViewModels/ReportFlowerComponentViewModel.cs b/FlowerShopContracts/ViewModels/ReportFlowerComponentViewModel.cs
index 670209e..895e6e3 100644
--- a/FlowerShopContracts/ViewModels/ReportFlowerComponentViewModel.cs
+++ b/FlowerShopContracts/ViewModels/ReportFlowerComponentViewModel.cs
@@ -8,8 +8,8 @@ namespace FlowerShopContracts.ViewModels
{
public class ReportFlowerComponentViewModel
{
- public string ComponentName { get; set; } = string.Empty;
+ public string FlowerName { get; set; } = string.Empty;
public int TotalCount { get; set; }
- public List> Flowers { get; set; } = new();
+ public List> Components { get; set; } = new();
}
}
diff --git a/FlowerShopDatabaseImplement/OrderStorage.cs b/FlowerShopDatabaseImplement/OrderStorage.cs
index f0d107a..e510260 100644
--- a/FlowerShopDatabaseImplement/OrderStorage.cs
+++ b/FlowerShopDatabaseImplement/OrderStorage.cs
@@ -24,10 +24,8 @@ namespace FlowerShopDatabaseImplement.Implements
}
public List GetFilteredList(OrderSearchModel model)
{
- if (!model.Id.HasValue)
- {
- return new();
- }
+
+
using var context = new FlowerShopDataBase();
return context.Orders.Include(x => x.Flower)
.Where(x => ((!model.Id.HasValue || x.Id == model.Id) &&
diff --git a/FlowerShopFileImplement/OrderStorage.cs b/FlowerShopFileImplement/OrderStorage.cs
index 65a5196..3419e98 100644
--- a/FlowerShopFileImplement/OrderStorage.cs
+++ b/FlowerShopFileImplement/OrderStorage.cs
@@ -34,7 +34,9 @@ namespace FlowerShopFileImplement.Implements
return new();
}
return source.Orders
- .Where(x => x.Id == model.Id)
+ .Where(x => ((!model.Id.HasValue || x.Id == model.Id) &&
+ (!model.DateFrom.HasValue || x.DateCreate >= model.DateFrom) &&
+ (!model.DateTo.HasValue || x.DateCreate <= model.DateTo)))
.Select(x => AccessFlowerStorage(x.GetViewModel))
.ToList();
}
diff --git a/FlowerShopListImplement/OrderStorage.cs b/FlowerShopListImplement/OrderStorage.cs
index 4e2d6e7..8a06835 100644
--- a/FlowerShopListImplement/OrderStorage.cs
+++ b/FlowerShopListImplement/OrderStorage.cs
@@ -37,7 +37,7 @@ namespace FlowerShopListImplement.Implements
}
foreach (var order in _source.Orders)
{
- if (order.Id == model.Id)
+ if (order.Id == model.Id && model.DateFrom <= order.DateCreate && model.DateTo >= order.DateCreate)
{
result.Add(AccessFlowerStorage(order.GetViewModel));
}
diff --git a/ProjectFlowerShop/FormReportFlowerComponent.Designer.cs b/ProjectFlowerShop/FormReportFlowerComponent.Designer.cs
index 112e00a..72886e0 100644
--- a/ProjectFlowerShop/FormReportFlowerComponent.Designer.cs
+++ b/ProjectFlowerShop/FormReportFlowerComponent.Designer.cs
@@ -30,8 +30,8 @@
{
buttonSaveToExcel = new Button();
dataGridView = new DataGridView();
+ Flowerr = new DataGridViewTextBoxColumn();
Component = new DataGridViewTextBoxColumn();
- Flower = new DataGridViewTextBoxColumn();
Count = new DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout();
@@ -49,7 +49,7 @@
// dataGridView
//
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridView.Columns.AddRange(new DataGridViewColumn[] { Component, Flower, Count });
+ dataGridView.Columns.AddRange(new DataGridViewColumn[] { Flowerr, Component, Count });
dataGridView.Location = new Point(12, 65);
dataGridView.Name = "dataGridView";
dataGridView.RowHeadersWidth = 51;
@@ -57,6 +57,13 @@
dataGridView.Size = new Size(812, 359);
dataGridView.TabIndex = 1;
//
+ // Flowerr
+ //
+ Flowerr.HeaderText = "Цветок";
+ Flowerr.MinimumWidth = 6;
+ Flowerr.Name = "Flowerr";
+ Flowerr.Width = 250;
+ //
// Component
//
Component.HeaderText = "Компонент";
@@ -64,13 +71,6 @@
Component.Name = "Component";
Component.Width = 250;
//
- // Flower
- //
- Flower.HeaderText = "Изделие";
- Flower.MinimumWidth = 6;
- Flower.Name = "Flower";
- Flower.Width = 250;
- //
// Count
//
Count.HeaderText = "Количество";
@@ -86,7 +86,7 @@
Controls.Add(dataGridView);
Controls.Add(buttonSaveToExcel);
Name = "FormReportFlowerComponent";
- Text = "FormReportFlowerComponent";
+ Text = "Компоненты цветов";
Load += FormReportFlowerComponent_Load;
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
ResumeLayout(false);
@@ -96,8 +96,8 @@
private Button buttonSaveToExcel;
private DataGridView dataGridView;
+ private DataGridViewTextBoxColumn Flowerr;
private DataGridViewTextBoxColumn Component;
- private DataGridViewTextBoxColumn Flower;
private DataGridViewTextBoxColumn Count;
}
}
\ No newline at end of file
diff --git a/ProjectFlowerShop/FormReportFlowerComponent.cs b/ProjectFlowerShop/FormReportFlowerComponent.cs
index 22ebc96..b00888c 100644
--- a/ProjectFlowerShop/FormReportFlowerComponent.cs
+++ b/ProjectFlowerShop/FormReportFlowerComponent.cs
@@ -42,14 +42,14 @@ namespace ProjectFlowerShop
FileName = dialog.FileName
});
_logger.LogInformation("Сохранение списка изделий по компонентам");
-
+
MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK,
MessageBoxIcon.Information);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка сохранения списка изделий по компонентам");
-
+
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
MessageBoxIcon.Error);
}
@@ -66,8 +66,8 @@ namespace ProjectFlowerShop
dataGridView.Rows.Clear();
foreach (var elem in dict)
{
- dataGridView.Rows.Add(new object[] { elem.ComponentName, "", "" });
- foreach (var listElem in elem.Flowers)
+ dataGridView.Rows.Add(new object[] { elem.FlowerName, "", "" });
+ foreach (var listElem in elem.Components)
{
dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
}
diff --git a/ProjectFlowerShop/FormReportFlowerComponent.resx b/ProjectFlowerShop/FormReportFlowerComponent.resx
index bbda938..75ff82b 100644
--- a/ProjectFlowerShop/FormReportFlowerComponent.resx
+++ b/ProjectFlowerShop/FormReportFlowerComponent.resx
@@ -117,21 +117,12 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- True
-
-
- True
-
-
+
True
True
-
- True
-
True
diff --git a/ProjectFlowerShop/FormReportOrders.Designer.cs b/ProjectFlowerShop/FormReportOrders.Designer.cs
index 1fd958c..79ddb6f 100644
--- a/ProjectFlowerShop/FormReportOrders.Designer.cs
+++ b/ProjectFlowerShop/FormReportOrders.Designer.cs
@@ -119,7 +119,7 @@
Controls.Add(panel1);
Controls.Add(panel);
Name = "FormReportOrders";
- Text = "FormReportOrders";
+ Text = "Отчет по заказам";
panel.ResumeLayout(false);
panel.PerformLayout();
ResumeLayout(false);
--
2.25.1
From 8867ed2e7d48ac360bc29eb0b1f5e25f2df2cb09 Mon Sep 17 00:00:00 2001
From: antoc0der <1@DESKTOP-K1L8ND3>
Date: Wed, 27 Mar 2024 11:50:55 +0400
Subject: [PATCH 09/12] =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=20?=
=?UTF-8?q?=D0=B3=D0=BD=D0=B5=D0=B2=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../OfficePackage/AbstractSaveToWord.cs | 3 +-
.../OfficePackage/Implements/SaveToExcel.cs | 44 +++++++------------
2 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs
index 4d00419..619115a 100644
--- a/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs
+++ b/FlowerShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs
@@ -26,7 +26,8 @@ namespace FlowerShopBusinessLogic.OfficePackage
{
CreateParagraph(new WordParagraph
{
- Texts = new List<(string, WordTextProperties)> { (flower.FlowerName, new WordTextProperties { Size = "24", }) },
+ Texts = new List<(string, WordTextProperties)> { (flower.FlowerName, new WordTextProperties { Size = "24", Bold = true }),
+ (" - цена " + flower.Price.ToString(), new WordTextProperties { Size = "24" }) },
TextProperties = new WordTextProperties
{
Size = "24",
diff --git a/FlowerShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/FlowerShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
index 501e2be..d7e53fa 100644
--- a/FlowerShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
+++ b/FlowerShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
@@ -156,30 +156,24 @@ namespace FlowerShopBusinessLogic.OfficePackage.Implements
var tableStyles = new TableStyles()
{
Count = 0U,
- DefaultTableStyle =
- "TableStyleMedium2",
+ DefaultTableStyle ="TableStyleMedium2",
DefaultPivotStyle = "PivotStyleLight16"
};
var stylesheetExtensionList = new StylesheetExtensionList();
var stylesheetExtension1 = new StylesheetExtension()
{
- Uri =
- "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}"
+ Uri ="{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}"
};
- stylesheetExtension1.AddNamespaceDeclaration("x14",
- "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
+ stylesheetExtension1.AddNamespaceDeclaration("x14", "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
stylesheetExtension1.Append(new SlicerStyles()
{
- DefaultSlicerStyle =
- "SlicerStyleLight1"
+ DefaultSlicerStyle = "SlicerStyleLight1"
});
var stylesheetExtension2 = new StylesheetExtension()
{
- Uri =
- "{9260A510-F301-46a8-8635-F512D64BE5F5}"
+ Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}"
};
- stylesheetExtension2.AddNamespaceDeclaration("x15",
- "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main");
+ stylesheetExtension2.AddNamespaceDeclaration("x15", "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main");
stylesheetExtension2.Append(new TimelineStyles()
{
DefaultTimelineStyle = "TimeSlicerStyleLight1"
@@ -211,6 +205,8 @@ namespace FlowerShopBusinessLogic.OfficePackage.Implements
_ => 0U,
};
}
+
+ // создаем книгу, добавляем туда листы
protected override void CreateExcel(ExcelInfo info)
{
_spreadsheetDocument = SpreadsheetDocument.Create(info.FileName,
@@ -235,8 +231,7 @@ namespace FlowerShopBusinessLogic.OfficePackage.Implements
var worksheetPart = workbookpart.AddNewPart();
worksheetPart.Worksheet = new Worksheet(new SheetData());
// Добавляем лист в книгу
- var sheets =
- _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
+ var sheets = _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
var sheet = new Sheet()
{
Id =
@@ -247,8 +242,8 @@ namespace FlowerShopBusinessLogic.OfficePackage.Implements
sheets.Append(sheet);
_worksheet = worksheetPart.Worksheet;
}
- protected override void InsertCellInWorksheet(ExcelCellParameters
- excelParams)
+
+ protected override void InsertCellInWorksheet(ExcelCellParameters excelParams)
{
if (_worksheet == null || _shareStringPart == null)
{
@@ -261,8 +256,7 @@ namespace FlowerShopBusinessLogic.OfficePackage.Implements
}
// Ищем строку, либо добавляем ее
Row row;
- if (sheetData.Elements().Where(r => r.RowIndex! ==
- excelParams.RowIndex).Any())
+ if (sheetData.Elements().Where(r => r.RowIndex! == excelParams.RowIndex).Any())
{
row = sheetData.Elements().Where(r => r.RowIndex! ==
excelParams.RowIndex).First();
@@ -274,11 +268,9 @@ namespace FlowerShopBusinessLogic.OfficePackage.Implements
}
// Ищем нужную ячейку
Cell cell;
- if (row.Elements().Where(c => c.CellReference!.Value ==
- excelParams.CellReference).Any())
+ if (row.Elements().Where(c => c.CellReference!.Value == excelParams.CellReference).Any())
{
- cell = row.Elements().Where(c => c.CellReference!.Value ==
- excelParams.CellReference).First();
+ cell = row.Elements().Where(c => c.CellReference!.Value == excelParams.CellReference).First();
}
else
{
@@ -303,15 +295,13 @@ namespace FlowerShopBusinessLogic.OfficePackage.Implements
cell = newCell;
}
// вставляем новый текст
- _shareStringPart.SharedStringTable.AppendChild(new
- SharedStringItem(new Text(excelParams.Text)));
+ _shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text)));
_shareStringPart.SharedStringTable.Save();
- cell.CellValue = new
- CellValue((_shareStringPart.SharedStringTable.Elements().Count(
- ) - 1).ToString());
+ cell.CellValue = new CellValue((_shareStringPart.SharedStringTable.Elements().Count() - 1).ToString());
cell.DataType = new EnumValue(CellValues.SharedString);
cell.StyleIndex = GetStyleValue(excelParams.StyleInfo);
}
+ // объединение ячеек
protected override void MergeCells(ExcelMergeParameters excelParams)
{
if (_worksheet == null)
--
2.25.1
From adf6cd67dd5fc6cf15e6a39190bb349e068cec63 Mon Sep 17 00:00:00 2001
From: antoc0der <1@DESKTOP-K1L8ND3>
Date: Wed, 27 Mar 2024 15:18:21 +0400
Subject: [PATCH 10/12] =?UTF-8?q?=D0=BC=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20?=
=?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
FlowerShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/FlowerShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs b/FlowerShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
index 23c13c3..7a95b63 100644
--- a/FlowerShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
+++ b/FlowerShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
@@ -54,8 +54,7 @@ namespace FlowerShopBusinessLogic.OfficePackage.Implements
}
var paragraph = _section.AddParagraph(pdfParagraph.Text);
paragraph.Format.SpaceAfter = "1cm";
- paragraph.Format.Alignment =
- GetParagraphAlignment(pdfParagraph.ParagraphAlignment);
+ paragraph.Format.Alignment = GetParagraphAlignment(pdfParagraph.ParagraphAlignment);
paragraph.Style = pdfParagraph.Style;
}
protected override void CreateTable(List columns)
--
2.25.1
From c8348bc6ce26725ce37573afba44eb05f91fbf37 Mon Sep 17 00:00:00 2001
From: antoc0der <1@DESKTOP-K1L8ND3>
Date: Sun, 31 Mar 2024 11:25:19 +0400
Subject: [PATCH 11/12] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BB?=
=?UTF-8?q?=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?=
=?UTF-8?q?=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
FlowerShopContracts/FlowerShopContracts.csproj | 2 --
FlowerShopDataModels/FlowerShopDataModels.csproj | 2 --
.../FlowerShopDatabaseImplement.csproj | 2 --
FlowerShopFileImplement/FlowerShopFileImplement.csproj | 5 -----
FlowerShopListImplement/FlowerShopListImplement.csproj | 5 -----
5 files changed, 16 deletions(-)
diff --git a/FlowerShopContracts/FlowerShopContracts.csproj b/FlowerShopContracts/FlowerShopContracts.csproj
index 6618f44..901b7f6 100644
--- a/FlowerShopContracts/FlowerShopContracts.csproj
+++ b/FlowerShopContracts/FlowerShopContracts.csproj
@@ -7,9 +7,7 @@
-
-
diff --git a/FlowerShopDataModels/FlowerShopDataModels.csproj b/FlowerShopDataModels/FlowerShopDataModels.csproj
index 0abf16a..dce9680 100644
--- a/FlowerShopDataModels/FlowerShopDataModels.csproj
+++ b/FlowerShopDataModels/FlowerShopDataModels.csproj
@@ -7,9 +7,7 @@
-
-
diff --git a/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj b/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj
index a71811d..43c2b67 100644
--- a/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj
+++ b/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj
@@ -7,14 +7,12 @@
-
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
diff --git a/FlowerShopFileImplement/FlowerShopFileImplement.csproj b/FlowerShopFileImplement/FlowerShopFileImplement.csproj
index bd45863..ca6fa62 100644
--- a/FlowerShopFileImplement/FlowerShopFileImplement.csproj
+++ b/FlowerShopFileImplement/FlowerShopFileImplement.csproj
@@ -6,11 +6,6 @@
enable
-
-
-
-
-
diff --git a/FlowerShopListImplement/FlowerShopListImplement.csproj b/FlowerShopListImplement/FlowerShopListImplement.csproj
index bd45863..ca6fa62 100644
--- a/FlowerShopListImplement/FlowerShopListImplement.csproj
+++ b/FlowerShopListImplement/FlowerShopListImplement.csproj
@@ -6,11 +6,6 @@
enable
-
-
-
-
-
--
2.25.1
From 8a64257355c0f635992d5f3a1c5a9d3fcc6ad4d4 Mon Sep 17 00:00:00 2001
From: antoc0der <1@DESKTOP-K1L8ND3>
Date: Thu, 4 Apr 2024 09:47:36 +0400
Subject: [PATCH 12/12] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
=?UTF-8?q?=D0=B8=D0=BB=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
FlowerShopBusinessLogic/ReportLogic.cs | 1 -
1 file changed, 1 deletion(-)
diff --git a/FlowerShopBusinessLogic/ReportLogic.cs b/FlowerShopBusinessLogic/ReportLogic.cs
index 6a6903f..68be034 100644
--- a/FlowerShopBusinessLogic/ReportLogic.cs
+++ b/FlowerShopBusinessLogic/ReportLogic.cs
@@ -39,7 +39,6 @@ namespace FlowerShopBusinessLogic
///
public List GetFlowerComponent()
{
- //var components = _componentStorage.GetFullList();
var flowers = _flowerStorage.GetFullList();
var list = new List();
foreach (var flower in flowers)
--
2.25.1
| | | | | | |