diff --git a/CarpentryWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs b/CarpentryWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs
new file mode 100644
index 0000000..63b20a2
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs
@@ -0,0 +1,131 @@
+using CarpentryWorkshopBusinessLogic.OfficePackage;
+using CarpentryWorkshopBusinessLogic.OfficePackage.HelperModels;
+using CarpentryWorkshopContracts.BindingModels;
+using CarpentryWorkshopContracts.BusinessLogicsContracts;
+using CarpentryWorkshopContracts.SearchModels;
+using CarpentryWorkshopContracts.StoragesContracts;
+using CarpentryWorkshopContracts.ViewModels;
+
+namespace CarpentryWorkshopBusinessLogic.BusinessLogics
+{
+ public class ReportLogic : IReportLogic
+ {
+ private readonly IComponentStorage _componentStorage;
+
+ private readonly IWoodStorage _woodStorage;
+
+ private readonly IOrderStorage _orderStorage;
+
+ private readonly AbstractSaveToExcel _saveToExcel;
+
+ private readonly AbstractSaveToWord _saveToWord;
+
+ private readonly AbstractSaveToPdf _saveToPdf;
+
+ public ReportLogic(IWoodStorage woodStorage, IComponentStorage componentStorage, IOrderStorage orderStorage,
+ AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
+ {
+ _woodStorage = woodStorage;
+ _componentStorage = componentStorage;
+ _orderStorage = orderStorage;
+
+ _saveToExcel = saveToExcel;
+ _saveToWord = saveToWord;
+ _saveToPdf = saveToPdf;
+ }
+
+ ///
+ /// Получение списка компонент с указанием, в каких изделиях используются
+ ///
+ ///
+ public List GetWoodComponent()
+ {
+
+ var woods = _woodStorage.GetFullList();
+
+ var list = new List();
+
+ foreach (var wood in woods)
+ {
+ var record = new ReportWoodComponentViewModel
+ {
+ WoodName = wood.WoodName,
+ Components = new List<(string, int)>(),
+ TotalCount = 0
+ };
+ foreach (var component in wood.WoodComponents)
+ {
+ record.Components.Add(new (component.Value.Item1.ComponentName, component.Value.Item2));
+ record.TotalCount += component.Value.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,
+ WoodName = x.WoodName,
+ Status = x.Status.ToString(),
+ Sum = x.Sum
+ })
+ .ToList();
+ }
+
+ ///
+ /// Сохранение компонент в файл-Word
+ ///
+ ///
+ public void SaveComponentsToWordFile(ReportBindingModel model)
+ {
+ _saveToWord.CreateDoc(new WordInfo
+ {
+ FileName = model.FileName,
+ Title = "Список изделий",
+ Woods = _woodStorage.GetFullList()
+ });
+ }
+
+ ///
+ /// Сохранение компонент с указаеним продуктов в файл-Excel
+ ///
+ ///
+ public void SaveWoodComponentToExcelFile(ReportBindingModel model)
+ {
+ _saveToExcel.CreateReport(new ExcelInfo
+ {
+ FileName = model.FileName,
+ Title = "Список изделий",
+ WoodComponents = GetWoodComponent()
+ });
+ }
+
+ ///
+ /// Сохранение заказов в файл-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)
+ });
+ }
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopBusinessLogic/CarpentryWorkshopBusinessLogic.csproj b/CarpentryWorkshopBusinessLogic/CarpentryWorkshopBusinessLogic.csproj
index b1c716c..af9f9f4 100644
--- a/CarpentryWorkshopBusinessLogic/CarpentryWorkshopBusinessLogic.csproj
+++ b/CarpentryWorkshopBusinessLogic/CarpentryWorkshopBusinessLogic.csproj
@@ -7,11 +7,19 @@
+
+
+
+
+
+
+
+
diff --git a/CarpentryWorkshopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
new file mode 100644
index 0000000..80b0b51
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
@@ -0,0 +1,107 @@
+using CarpentryWorkshopBusinessLogic.OfficePackage.HelperEnums;
+using CarpentryWorkshopBusinessLogic.OfficePackage.HelperModels;
+
+namespace CarpentryWorkshopBusinessLogic.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.WoodComponents)
+ {
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "A",
+ RowIndex = rowIndex,
+ Text = pc.WoodName,
+ StyleInfo = ExcelStyleInfoType.Text
+ });
+ rowIndex++;
+
+ foreach (var (Component, Count) in pc.Components)
+ {
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "B",
+ RowIndex = rowIndex,
+ Text = Component,
+ StyleInfo = ExcelStyleInfoType.TextWithBroder
+ });
+
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "C",
+ RowIndex = rowIndex,
+ Text = Count.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);
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
new file mode 100644
index 0000000..41382af
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
@@ -0,0 +1,69 @@
+using CarpentryWorkshopBusinessLogic.OfficePackage.HelperEnums;
+using CarpentryWorkshopBusinessLogic.OfficePackage.HelperModels;
+
+namespace CarpentryWorkshopBusinessLogic.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", "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.WoodName, order.Status.ToString(), order.Sum.ToString() },
+ Style = "Normal",
+ ParagraphAlignment = PdfParagraphAlignmentType.Left
+ });
+ }
+ CreateParagraph(new PdfParagraph { Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Rigth });
+
+ 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/CarpentryWorkshopBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/AbstractSaveToWord.cs
new file mode 100644
index 0000000..15a0549
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/AbstractSaveToWord.cs
@@ -0,0 +1,59 @@
+using CarpentryWorkshopBusinessLogic.OfficePackage.HelperEnums;
+using CarpentryWorkshopBusinessLogic.OfficePackage.HelperModels;
+
+namespace CarpentryWorkshopBusinessLogic.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 wood in info.Woods)
+ {
+ CreateParagraph(new WordParagraph
+ {
+ Texts = new List<(string, WordTextProperties)> {
+ (wood.WoodName + ": ", new WordTextProperties { Size = "24", Bold = true }),
+ (Convert.ToInt32(wood.Price).ToString(), 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);
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
new file mode 100644
index 0000000..12f1607
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
@@ -0,0 +1,11 @@
+namespace CarpentryWorkshopBusinessLogic.OfficePackage.HelperEnums
+{
+ public enum ExcelStyleInfoType
+ {
+ Title,
+
+ Text,
+
+ TextWithBroder
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs
new file mode 100644
index 0000000..6caf099
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs
@@ -0,0 +1,11 @@
+namespace CarpentryWorkshopBusinessLogic.OfficePackage.HelperEnums
+{
+ public enum PdfParagraphAlignmentType
+ {
+ Center,
+
+ Left,
+
+ Rigth
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs
new file mode 100644
index 0000000..bb1988f
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs
@@ -0,0 +1,9 @@
+namespace CarpentryWorkshopBusinessLogic.OfficePackage.HelperEnums
+{
+ public enum WordJustificationType
+ {
+ Center,
+
+ Both
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs
new file mode 100644
index 0000000..8ec565a
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs
@@ -0,0 +1,17 @@
+using CarpentryWorkshopBusinessLogic.OfficePackage.HelperEnums;
+
+namespace CarpentryWorkshopBusinessLogic.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; }
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
new file mode 100644
index 0000000..d783376
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
@@ -0,0 +1,13 @@
+using CarpentryWorkshopContracts.ViewModels;
+
+namespace CarpentryWorkshopBusinessLogic.OfficePackage.HelperModels
+{
+ public class ExcelInfo
+ {
+ public string FileName { get; set; } = string.Empty;
+
+ public string Title { get; set; } = string.Empty;
+
+ public List WoodComponents { get; set; } = new();
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs
new file mode 100644
index 0000000..a41a075
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs
@@ -0,0 +1,11 @@
+namespace CarpentryWorkshopBusinessLogic.OfficePackage.HelperModels
+{
+ public class ExcelMergeParameters
+ {
+ public string CellFromName { get; set; } = string.Empty;
+
+ public string CellToName { get; set; } = string.Empty;
+
+ public string Merge => $"{CellFromName}:{CellToName}";
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
new file mode 100644
index 0000000..1416fbe
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
@@ -0,0 +1,17 @@
+using CarpentryWorkshopContracts.ViewModels;
+
+namespace CarpentryWorkshopBusinessLogic.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();
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
new file mode 100644
index 0000000..e978723
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
@@ -0,0 +1,13 @@
+using CarpentryWorkshopBusinessLogic.OfficePackage.HelperEnums;
+
+namespace CarpentryWorkshopBusinessLogic.OfficePackage.HelperModels
+{
+ public class PdfParagraph
+ {
+ public string Text { get; set; } = string.Empty;
+
+ public string Style { get; set; } = string.Empty;
+
+ public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs
new file mode 100644
index 0000000..a5a6ab0
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs
@@ -0,0 +1,13 @@
+using CarpentryWorkshopBusinessLogic.OfficePackage.HelperEnums;
+
+namespace CarpentryWorkshopBusinessLogic.OfficePackage.HelperModels
+{
+ public class PdfRowParameters
+ {
+ public List Texts { get; set; } = new();
+
+ public string Style { get; set; } = string.Empty;
+
+ public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
new file mode 100644
index 0000000..d123670
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
@@ -0,0 +1,13 @@
+using CarpentryWorkshopContracts.ViewModels;
+
+namespace CarpentryWorkshopBusinessLogic.OfficePackage.HelperModels
+{
+ public class WordInfo
+ {
+ public string FileName { get; set; } = string.Empty;
+
+ public string Title { get; set; } = string.Empty;
+
+ public List Woods { get; set; } = new();
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
new file mode 100644
index 0000000..5401078
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
@@ -0,0 +1,9 @@
+namespace CarpentryWorkshopBusinessLogic.OfficePackage.HelperModels
+{
+ public class WordParagraph
+ {
+ public List<(string, WordTextProperties)> Texts { get; set; } = new();
+
+ public WordTextProperties? TextProperties { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
new file mode 100644
index 0000000..471f538
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
@@ -0,0 +1,13 @@
+using CarpentryWorkshopBusinessLogic.OfficePackage.HelperEnums;
+
+namespace CarpentryWorkshopBusinessLogic.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/CarpentryWorkshopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
new file mode 100644
index 0000000..02d2526
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
@@ -0,0 +1,294 @@
+using CarpentryWorkshopBusinessLogic.OfficePackage.HelperEnums;
+using CarpentryWorkshopBusinessLogic.OfficePackage.HelperModels;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Office2010.Excel;
+using DocumentFormat.OpenXml.Office2013.Excel;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace CarpentryWorkshopBusinessLogic.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.Close();
+ }
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
new file mode 100644
index 0000000..639ade9
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
@@ -0,0 +1,114 @@
+using CarpentryWorkshopBusinessLogic.OfficePackage.HelperEnums;
+using CarpentryWorkshopBusinessLogic.OfficePackage.HelperModels;
+using MigraDoc.DocumentObjectModel;
+using MigraDoc.DocumentObjectModel.Tables;
+using MigraDoc.Rendering;
+
+namespace CarpentryWorkshopBusinessLogic.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.Rigth => 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);
+ }
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/CarpentryWorkshopBusinessLogic/OfficePackage/Implements/SaveToWord.cs
new file mode 100644
index 0000000..20f6ab0
--- /dev/null
+++ b/CarpentryWorkshopBusinessLogic/OfficePackage/Implements/SaveToWord.cs
@@ -0,0 +1,135 @@
+using CarpentryWorkshopBusinessLogic.OfficePackage.HelperEnums;
+using CarpentryWorkshopBusinessLogic.OfficePackage.HelperModels;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+
+namespace CarpentryWorkshopBusinessLogic.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.Close();
+ }
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopContracts/BindingModels/ReportBindingModel.cs b/CarpentryWorkshopContracts/BindingModels/ReportBindingModel.cs
new file mode 100644
index 0000000..fc5699a
--- /dev/null
+++ b/CarpentryWorkshopContracts/BindingModels/ReportBindingModel.cs
@@ -0,0 +1,11 @@
+namespace CarpentryWorkshopContracts.BindingModels
+{
+ public class ReportBindingModel
+ {
+ public string FileName { get; set; } = string.Empty;
+
+ public DateTime? DateFrom { get; set; }
+
+ public DateTime? DateTo { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopContracts/BusinessLogicsContracts/IReportLogic.cs b/CarpentryWorkshopContracts/BusinessLogicsContracts/IReportLogic.cs
new file mode 100644
index 0000000..ee939f1
--- /dev/null
+++ b/CarpentryWorkshopContracts/BusinessLogicsContracts/IReportLogic.cs
@@ -0,0 +1,39 @@
+using CarpentryWorkshopContracts.BindingModels;
+using CarpentryWorkshopContracts.ViewModels;
+
+namespace CarpentryWorkshopContracts.BusinessLogicsContracts
+{
+ public interface IReportLogic
+ {
+ ///
+ /// Получение списка компонент с указанием, в каких изделиях используются
+ ///
+ ///
+ List GetWoodComponent();
+
+ ///
+ /// Получение списка заказов за определенный период
+ ///
+ ///
+ ///
+ List GetOrders(ReportBindingModel model);
+
+ ///
+ /// Сохранение компонент в файл-Word
+ ///
+ ///
+ void SaveComponentsToWordFile(ReportBindingModel model);
+
+ ///
+ /// Сохранение компонент с указаеним продуктов в файл-Excel
+ ///
+ ///
+ void SaveWoodComponentToExcelFile(ReportBindingModel model);
+
+ ///
+ /// Сохранение заказов в файл-Pdf
+ ///
+ ///
+ void SaveOrdersToPdfFile(ReportBindingModel model);
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopContracts/SearchModels/OrderSearchModel.cs b/CarpentryWorkshopContracts/SearchModels/OrderSearchModel.cs
index 3742a76..03d3143 100644
--- a/CarpentryWorkshopContracts/SearchModels/OrderSearchModel.cs
+++ b/CarpentryWorkshopContracts/SearchModels/OrderSearchModel.cs
@@ -9,5 +9,7 @@ namespace CarpentryWorkshopContracts.SearchModels
public class OrderSearchModel
{
public int? Id { get; set; }
+ public DateTime? DateFrom { get; set; }
+ public DateTime? DateTo { get; set; }
}
}
diff --git a/CarpentryWorkshopContracts/ViewModels/ReportOrdersViewModel.cs b/CarpentryWorkshopContracts/ViewModels/ReportOrdersViewModel.cs
new file mode 100644
index 0000000..06c2ff1
--- /dev/null
+++ b/CarpentryWorkshopContracts/ViewModels/ReportOrdersViewModel.cs
@@ -0,0 +1,16 @@
+using CarpentryWorkshopDataModels.Enums;
+
+namespace CarpentryWorkshopContracts.ViewModels
+{
+ public class ReportOrdersViewModel
+ {
+ public int Id { get; set; }
+
+ public DateTime DateCreate { get; set; }
+
+ public string WoodName { get; set; } = string.Empty;
+
+ public double Sum { get; set; }
+ public string Status { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopContracts/ViewModels/ReportWoodComponentViewModel.cs b/CarpentryWorkshopContracts/ViewModels/ReportWoodComponentViewModel.cs
new file mode 100644
index 0000000..7e27214
--- /dev/null
+++ b/CarpentryWorkshopContracts/ViewModels/ReportWoodComponentViewModel.cs
@@ -0,0 +1,11 @@
+namespace CarpentryWorkshopContracts.ViewModels
+{
+ public class ReportWoodComponentViewModel
+ {
+ public string WoodName { get; set; } = string.Empty;
+
+ public int TotalCount { get; set; }
+
+ public List<(string Component, int Count)> Components { get; set; } = new();
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopDatabaseImplement/Implements/OrderStorage.cs b/CarpentryWorkshopDatabaseImplement/Implements/OrderStorage.cs
index f6d7a2d..4effbe1 100644
--- a/CarpentryWorkshopDatabaseImplement/Implements/OrderStorage.cs
+++ b/CarpentryWorkshopDatabaseImplement/Implements/OrderStorage.cs
@@ -3,6 +3,7 @@ using CarpentryWorkshopContracts.SearchModels;
using CarpentryWorkshopContracts.StoragesContracts;
using CarpentryWorkshopContracts.ViewModels;
using CarpentryWorkshopDatabaseImplement.Models;
+using Microsoft.EntityFrameworkCore;
namespace CarpentryWorkshopDatabaseImplement.Implements
{
@@ -17,11 +18,18 @@ namespace CarpentryWorkshopDatabaseImplement.Implements
}
public List GetFilteredList(OrderSearchModel model)
{
- if (model.Id == null)
+ if (!model.Id.HasValue && !model.DateFrom.HasValue)
{
return new();
}
using var context = new CarpentryWorkshopDatabase();
+ if (model.DateFrom.HasValue)
+ {
+ return context.Orders
+ .Where(x => (x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo))
+ .Select(x => x.GetViewModel)
+ .ToList();
+ }
return context.Orders
.Where(x => x.Id == model.Id)
.Select(x => x.GetViewModel)
diff --git a/CarpentryWorkshopDatabaseImplement/Migrations/20230308161934_InitialCreate.Designer.cs b/CarpentryWorkshopDatabaseImplement/Migrations/20230308161934_InitialCreate.Designer.cs
index a4c9303..30ae454 100644
--- a/CarpentryWorkshopDatabaseImplement/Migrations/20230308161934_InitialCreate.Designer.cs
+++ b/CarpentryWorkshopDatabaseImplement/Migrations/20230308161934_InitialCreate.Designer.cs
@@ -20,7 +20,7 @@ namespace CarpentryWorkshopDatabaseImplement.Migrations
{
#pragma warning disable 612, 618
modelBuilder
- .HasAnnotation("ProductVersion", "7.0.3")
+ .HasAnnotation("WoodVersion", "7.0.3")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
diff --git a/CarpentryWorkshopDatabaseImplement/Migrations/CarpentryWorkshopDatabaseModelSnapshot.cs b/CarpentryWorkshopDatabaseImplement/Migrations/CarpentryWorkshopDatabaseModelSnapshot.cs
index fe39ae1..977152d 100644
--- a/CarpentryWorkshopDatabaseImplement/Migrations/CarpentryWorkshopDatabaseModelSnapshot.cs
+++ b/CarpentryWorkshopDatabaseImplement/Migrations/CarpentryWorkshopDatabaseModelSnapshot.cs
@@ -17,7 +17,7 @@ namespace CarpentryWorkshopDatabaseImplement.Migrations
{
#pragma warning disable 612, 618
modelBuilder
- .HasAnnotation("ProductVersion", "7.0.3")
+ .HasAnnotation("WoodVersion", "7.0.3")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
diff --git a/CarpentryWorkshopFileImplement/Implements/OrderStorage.cs b/CarpentryWorkshopFileImplement/Implements/OrderStorage.cs
index 39f7ba2..2fe0f89 100644
--- a/CarpentryWorkshopFileImplement/Implements/OrderStorage.cs
+++ b/CarpentryWorkshopFileImplement/Implements/OrderStorage.cs
@@ -26,11 +26,18 @@ namespace CarpentryWorkshopFileImplement.Implements
}
public List GetFilteredList(OrderSearchModel model)
{
- if (model.Id == null)
+ if (!model.Id.HasValue && !model.DateFrom.HasValue)
{
return new();
}
- return source.Orders
+ if (model.DateFrom.HasValue)
+ {
+ return source.Orders
+ .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
+ .Select(x => x.GetViewModel)
+ .ToList();
+ }
+ return source.Orders
.Where(x => x.Id == model.Id)
.Select(x => x.GetViewModel)
.ToList();
diff --git a/CarpentryWorkshopListImplement/Implements/OrderStorage.cs b/CarpentryWorkshopListImplement/Implements/OrderStorage.cs
index 937e23b..9f7ec52 100644
--- a/CarpentryWorkshopListImplement/Implements/OrderStorage.cs
+++ b/CarpentryWorkshopListImplement/Implements/OrderStorage.cs
@@ -30,11 +30,21 @@ namespace CarpentryWorkshopListImplement.Implements
public List GetFilteredList(OrderSearchModel model)
{
var result = new List();
- if (model.Id == null)
+ if (!model.Id.HasValue && !model.DateFrom.HasValue)
{
return result;
}
- foreach (var order in _source.Orders)
+ if (model.DateFrom.HasValue)
+ {
+ foreach (var order in _source.Orders)
+ {
+ if (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo)
+ {
+ result.Add(order.GetViewModel);
+ }
+ }
+ }
+ foreach (var order in _source.Orders)
{
if (order.Id.Equals(model.Id))
{
diff --git a/CarpentryWorkshopView/CarpentryWorkshopView.csproj b/CarpentryWorkshopView/CarpentryWorkshopView.csproj
index 1afade8..16918c1 100644
--- a/CarpentryWorkshopView/CarpentryWorkshopView.csproj
+++ b/CarpentryWorkshopView/CarpentryWorkshopView.csproj
@@ -17,6 +17,7 @@
+
@@ -24,8 +25,6 @@
-
-
\ No newline at end of file
diff --git a/CarpentryWorkshopView/FormMain.Designer.cs b/CarpentryWorkshopView/FormMain.Designer.cs
index efe7222..8b984b4 100644
--- a/CarpentryWorkshopView/FormMain.Designer.cs
+++ b/CarpentryWorkshopView/FormMain.Designer.cs
@@ -28,137 +28,165 @@
///
private void InitializeComponent()
{
- this.menuStrip1 = new System.Windows.Forms.MenuStrip();
- this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.КомпонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.ИзделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.dataGridView = new System.Windows.Forms.DataGridView();
- this.ButtonCreateOrder = new System.Windows.Forms.Button();
- this.ButtonTakeOrderInWork = new System.Windows.Forms.Button();
- this.ButtonOrderReady = new System.Windows.Forms.Button();
- this.ButtonIssuedOrder = new System.Windows.Forms.Button();
- this.ButtonRef = new System.Windows.Forms.Button();
- this.menuStrip1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
- this.SuspendLayout();
+ menuStrip1 = new MenuStrip();
+ справочникиToolStripMenuItem = new ToolStripMenuItem();
+ КомпонентыToolStripMenuItem = new ToolStripMenuItem();
+ ИзделияToolStripMenuItem = new ToolStripMenuItem();
+ отчётыToolStripMenuItem = new ToolStripMenuItem();
+ списокИзделийToolStripMenuItem = new ToolStripMenuItem();
+ изделияПоКомпонентамToolStripMenuItem = new ToolStripMenuItem();
+ списокЗаказовToolStripMenuItem = new ToolStripMenuItem();
+ dataGridView = new DataGridView();
+ ButtonCreateOrder = new Button();
+ ButtonTakeOrderInWork = new Button();
+ ButtonOrderReady = new Button();
+ ButtonIssuedOrder = new Button();
+ ButtonRef = new Button();
+ menuStrip1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+ SuspendLayout();
//
// menuStrip1
//
- this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.справочникиToolStripMenuItem});
- this.menuStrip1.Location = new System.Drawing.Point(0, 0);
- this.menuStrip1.Name = "menuStrip1";
- this.menuStrip1.Size = new System.Drawing.Size(896, 24);
- this.menuStrip1.TabIndex = 0;
- this.menuStrip1.Text = "menuStrip1";
+ menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчётыToolStripMenuItem });
+ menuStrip1.Location = new Point(0, 0);
+ menuStrip1.Name = "menuStrip1";
+ menuStrip1.Size = new Size(896, 24);
+ menuStrip1.TabIndex = 0;
+ menuStrip1.Text = "menuStrip1";
//
// справочникиToolStripMenuItem
//
- this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.КомпонентыToolStripMenuItem,
- this.ИзделияToolStripMenuItem});
- this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
- this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 20);
- this.справочникиToolStripMenuItem.Text = "Справочники";
+ справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, ИзделияToolStripMenuItem });
+ справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
+ справочникиToolStripMenuItem.Size = new Size(94, 20);
+ справочникиToolStripMenuItem.Text = "Справочники";
//
// КомпонентыToolStripMenuItem
//
- this.КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
- this.КомпонентыToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
- this.КомпонентыToolStripMenuItem.Text = "Компоненты";
- this.КомпонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click);
+ КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
+ КомпонентыToolStripMenuItem.Size = new Size(145, 22);
+ КомпонентыToolStripMenuItem.Text = "Компоненты";
+ КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
//
// ИзделияToolStripMenuItem
//
- this.ИзделияToolStripMenuItem.Name = "ИзделияToolStripMenuItem";
- this.ИзделияToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
- this.ИзделияToolStripMenuItem.Text = "Изделия";
- this.ИзделияToolStripMenuItem.Click += new System.EventHandler(this.ИзделияToolStripMenuItem_Click);
+ ИзделияToolStripMenuItem.Name = "ИзделияToolStripMenuItem";
+ ИзделияToolStripMenuItem.Size = new Size(145, 22);
+ ИзделияToolStripMenuItem.Text = "Изделия";
+ ИзделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
+ //
+ // отчётыToolStripMenuItem
+ //
+ отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокИзделийToolStripMenuItem, изделияПоКомпонентамToolStripMenuItem, списокЗаказовToolStripMenuItem });
+ отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem";
+ отчётыToolStripMenuItem.Size = new Size(60, 20);
+ отчётыToolStripMenuItem.Text = "Отчёты";
+ //
+ // списокИзделийToolStripMenuItem
+ //
+ списокИзделийToolStripMenuItem.Name = "списокИзделийToolStripMenuItem";
+ списокИзделийToolStripMenuItem.Size = new Size(218, 22);
+ списокИзделийToolStripMenuItem.Text = "Список изделий";
+ списокИзделийToolStripMenuItem.Click += списокИзделийToolStripMenuItem_Click;
+ //
+ // изделияПоКомпонентамToolStripMenuItem
+ //
+ изделияПоКомпонентамToolStripMenuItem.Name = "изделияПоКомпонентамToolStripMenuItem";
+ изделияПоКомпонентамToolStripMenuItem.Size = new Size(218, 22);
+ изделияПоКомпонентамToolStripMenuItem.Text = "Компоненты по изделиям";
+ изделияПоКомпонентамToolStripMenuItem.Click += изделияПоКомпонентамToolStripMenuItem_Click;
+ //
+ // списокЗаказовToolStripMenuItem
+ //
+ списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem";
+ списокЗаказовToolStripMenuItem.Size = new Size(218, 22);
+ списокЗаказовToolStripMenuItem.Text = "Список заказов";
+ списокЗаказовToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click;
//
// dataGridView
//
- this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ButtonHighlight;
- this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.dataGridView.EnableHeadersVisualStyles = false;
- this.dataGridView.Location = new System.Drawing.Point(1, 32);
- this.dataGridView.MultiSelect = false;
- this.dataGridView.Name = "dataGridView";
- this.dataGridView.RowTemplate.Height = 25;
- this.dataGridView.Size = new System.Drawing.Size(755, 243);
- this.dataGridView.TabIndex = 1;
+ dataGridView.BackgroundColor = SystemColors.ButtonHighlight;
+ dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ dataGridView.EnableHeadersVisualStyles = false;
+ dataGridView.Location = new Point(1, 32);
+ dataGridView.MultiSelect = false;
+ dataGridView.Name = "dataGridView";
+ dataGridView.RowTemplate.Height = 25;
+ dataGridView.Size = new Size(755, 243);
+ dataGridView.TabIndex = 1;
//
// ButtonCreateOrder
//
- this.ButtonCreateOrder.Location = new System.Drawing.Point(762, 44);
- this.ButtonCreateOrder.Name = "ButtonCreateOrder";
- this.ButtonCreateOrder.Size = new System.Drawing.Size(122, 23);
- this.ButtonCreateOrder.TabIndex = 2;
- this.ButtonCreateOrder.Text = "Создать заказ";
- this.ButtonCreateOrder.UseVisualStyleBackColor = true;
- this.ButtonCreateOrder.Click += new System.EventHandler(this.ButtonCreateOrder_Click);
+ ButtonCreateOrder.Location = new Point(762, 44);
+ ButtonCreateOrder.Name = "ButtonCreateOrder";
+ ButtonCreateOrder.Size = new Size(122, 23);
+ ButtonCreateOrder.TabIndex = 2;
+ ButtonCreateOrder.Text = "Создать заказ";
+ ButtonCreateOrder.UseVisualStyleBackColor = true;
+ ButtonCreateOrder.Click += ButtonCreateOrder_Click;
//
// ButtonTakeOrderInWork
//
- this.ButtonTakeOrderInWork.Location = new System.Drawing.Point(762, 73);
- this.ButtonTakeOrderInWork.Name = "ButtonTakeOrderInWork";
- this.ButtonTakeOrderInWork.Size = new System.Drawing.Size(122, 42);
- this.ButtonTakeOrderInWork.TabIndex = 3;
- this.ButtonTakeOrderInWork.Text = "Отдать на выполнение";
- this.ButtonTakeOrderInWork.UseVisualStyleBackColor = true;
- this.ButtonTakeOrderInWork.Click += new System.EventHandler(this.ButtonTakeOrderInWork_Click);
+ ButtonTakeOrderInWork.Location = new Point(762, 73);
+ ButtonTakeOrderInWork.Name = "ButtonTakeOrderInWork";
+ ButtonTakeOrderInWork.Size = new Size(122, 42);
+ ButtonTakeOrderInWork.TabIndex = 3;
+ ButtonTakeOrderInWork.Text = "Отдать на выполнение";
+ ButtonTakeOrderInWork.UseVisualStyleBackColor = true;
+ ButtonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click;
//
// ButtonOrderReady
//
- this.ButtonOrderReady.Location = new System.Drawing.Point(762, 121);
- this.ButtonOrderReady.Name = "ButtonOrderReady";
- this.ButtonOrderReady.Size = new System.Drawing.Size(122, 23);
- this.ButtonOrderReady.TabIndex = 4;
- this.ButtonOrderReady.Text = "Заказ готов";
- this.ButtonOrderReady.UseVisualStyleBackColor = true;
- this.ButtonOrderReady.Click += new System.EventHandler(this.ButtonOrderReady_Click);
+ ButtonOrderReady.Location = new Point(762, 121);
+ ButtonOrderReady.Name = "ButtonOrderReady";
+ ButtonOrderReady.Size = new Size(122, 23);
+ ButtonOrderReady.TabIndex = 4;
+ ButtonOrderReady.Text = "Заказ готов";
+ ButtonOrderReady.UseVisualStyleBackColor = true;
+ ButtonOrderReady.Click += ButtonOrderReady_Click;
//
// ButtonIssuedOrder
//
- this.ButtonIssuedOrder.Location = new System.Drawing.Point(762, 150);
- this.ButtonIssuedOrder.Name = "ButtonIssuedOrder";
- this.ButtonIssuedOrder.Size = new System.Drawing.Size(122, 23);
- this.ButtonIssuedOrder.TabIndex = 5;
- this.ButtonIssuedOrder.Text = "Заказ выдан";
- this.ButtonIssuedOrder.UseVisualStyleBackColor = true;
- this.ButtonIssuedOrder.Click += new System.EventHandler(this.ButtonIssuedOrder_Click);
+ ButtonIssuedOrder.Location = new Point(762, 150);
+ ButtonIssuedOrder.Name = "ButtonIssuedOrder";
+ ButtonIssuedOrder.Size = new Size(122, 23);
+ ButtonIssuedOrder.TabIndex = 5;
+ ButtonIssuedOrder.Text = "Заказ выдан";
+ ButtonIssuedOrder.UseVisualStyleBackColor = true;
+ ButtonIssuedOrder.Click += ButtonIssuedOrder_Click;
//
// ButtonRef
//
- this.ButtonRef.Location = new System.Drawing.Point(762, 179);
- this.ButtonRef.Name = "ButtonRef";
- this.ButtonRef.Size = new System.Drawing.Size(122, 23);
- this.ButtonRef.TabIndex = 6;
- this.ButtonRef.Text = "Обновить список";
- this.ButtonRef.UseVisualStyleBackColor = true;
- this.ButtonRef.Click += new System.EventHandler(this.ButtonRef_Click);
+ ButtonRef.Location = new Point(762, 179);
+ ButtonRef.Name = "ButtonRef";
+ ButtonRef.Size = new Size(122, 23);
+ ButtonRef.TabIndex = 6;
+ ButtonRef.Text = "Обновить список";
+ ButtonRef.UseVisualStyleBackColor = true;
+ ButtonRef.Click += ButtonRef_Click;
//
// FormMain
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(896, 280);
- this.Controls.Add(this.ButtonRef);
- this.Controls.Add(this.ButtonIssuedOrder);
- this.Controls.Add(this.ButtonOrderReady);
- this.Controls.Add(this.ButtonTakeOrderInWork);
- this.Controls.Add(this.ButtonCreateOrder);
- this.Controls.Add(this.dataGridView);
- this.Controls.Add(this.menuStrip1);
- this.MainMenuStrip = this.menuStrip1;
- this.Name = "FormMain";
- this.Text = "Сборка Набора";
- this.Load += new System.EventHandler(this.FormMain_Load);
- this.menuStrip1.ResumeLayout(false);
- this.menuStrip1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
- this.ResumeLayout(false);
- this.PerformLayout();
-
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(896, 280);
+ Controls.Add(ButtonRef);
+ Controls.Add(ButtonIssuedOrder);
+ Controls.Add(ButtonOrderReady);
+ Controls.Add(ButtonTakeOrderInWork);
+ Controls.Add(ButtonCreateOrder);
+ Controls.Add(dataGridView);
+ Controls.Add(menuStrip1);
+ MainMenuStrip = menuStrip1;
+ Name = "FormMain";
+ Text = "Сборка Набора";
+ Load += FormMain_Load;
+ menuStrip1.ResumeLayout(false);
+ menuStrip1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+ ResumeLayout(false);
+ PerformLayout();
}
#endregion
@@ -172,5 +200,9 @@
private System.Windows.Forms.Button ButtonRef;
private System.Windows.Forms.ToolStripMenuItem КомпонентыToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ИзделияToolStripMenuItem;
+ private ToolStripMenuItem отчётыToolStripMenuItem;
+ private ToolStripMenuItem списокИзделийToolStripMenuItem;
+ private ToolStripMenuItem изделияПоКомпонентамToolStripMenuItem;
+ private ToolStripMenuItem списокЗаказовToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/CarpentryWorkshopView/FormMain.cs b/CarpentryWorkshopView/FormMain.cs
index 89a244e..1ce67ed 100644
--- a/CarpentryWorkshopView/FormMain.cs
+++ b/CarpentryWorkshopView/FormMain.cs
@@ -17,11 +17,14 @@ namespace CarpentryWorkshopView
{
private readonly ILogger _logger;
private readonly IOrderLogic _orderLogic;
- public FormMain(ILogger logger, IOrderLogic orderLogic)
+ private readonly IReportLogic _reportLogic;
+
+ public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic)
{
InitializeComponent();
_logger = logger;
_orderLogic = orderLogic;
+ _reportLogic = reportLogic;
}
private void FormMain_Load(object sender, EventArgs e)
{
@@ -144,5 +147,33 @@ namespace CarpentryWorkshopView
{
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(FormReportWoodComponents));
+ if (service is FormReportWoodComponents 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/CarpentryWorkshopView/FormReportOrders.Designer.cs b/CarpentryWorkshopView/FormReportOrders.Designer.cs
new file mode 100644
index 0000000..8a4481e
--- /dev/null
+++ b/CarpentryWorkshopView/FormReportOrders.Designer.cs
@@ -0,0 +1,141 @@
+namespace CarpentryWorkshopView
+{
+ 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()
+ {
+ this.panel = new System.Windows.Forms.Panel();
+ this.buttonToPdf = new System.Windows.Forms.Button();
+ this.buttonMake = new System.Windows.Forms.Button();
+ this.dateTimePickerTo = new System.Windows.Forms.DateTimePicker();
+ this.labelTo = new System.Windows.Forms.Label();
+ this.dateTimePickerFrom = new System.Windows.Forms.DateTimePicker();
+ this.labelFrom = new System.Windows.Forms.Label();
+ this.panel.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // panel
+ //
+ this.panel.Controls.Add(this.buttonToPdf);
+ this.panel.Controls.Add(this.buttonMake);
+ this.panel.Controls.Add(this.dateTimePickerTo);
+ this.panel.Controls.Add(this.labelTo);
+ this.panel.Controls.Add(this.dateTimePickerFrom);
+ this.panel.Controls.Add(this.labelFrom);
+ this.panel.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel.Location = new System.Drawing.Point(0, 0);
+ this.panel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.panel.Name = "panel";
+ this.panel.Size = new System.Drawing.Size(1031, 40);
+ this.panel.TabIndex = 0;
+ //
+ // buttonToPdf
+ //
+ this.buttonToPdf.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonToPdf.Location = new System.Drawing.Point(878, 8);
+ this.buttonToPdf.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.buttonToPdf.Name = "buttonToPdf";
+ this.buttonToPdf.Size = new System.Drawing.Size(139, 27);
+ this.buttonToPdf.TabIndex = 5;
+ this.buttonToPdf.Text = "В Pdf";
+ this.buttonToPdf.UseVisualStyleBackColor = true;
+ this.buttonToPdf.Click += new System.EventHandler(this.ButtonToPdf_Click);
+ //
+ // buttonMake
+ //
+ this.buttonMake.Location = new System.Drawing.Point(476, 8);
+ this.buttonMake.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.buttonMake.Name = "buttonMake";
+ this.buttonMake.Size = new System.Drawing.Size(139, 27);
+ this.buttonMake.TabIndex = 4;
+ this.buttonMake.Text = "Сформировать";
+ this.buttonMake.UseVisualStyleBackColor = true;
+ this.buttonMake.Click += new System.EventHandler(this.ButtonMake_Click);
+ //
+ // dateTimePickerTo
+ //
+ this.dateTimePickerTo.Location = new System.Drawing.Point(237, 7);
+ this.dateTimePickerTo.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.dateTimePickerTo.Name = "dateTimePickerTo";
+ this.dateTimePickerTo.Size = new System.Drawing.Size(163, 23);
+ this.dateTimePickerTo.TabIndex = 3;
+ //
+ // labelTo
+ //
+ this.labelTo.AutoSize = true;
+ this.labelTo.Location = new System.Drawing.Point(208, 10);
+ this.labelTo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelTo.Name = "labelTo";
+ this.labelTo.Size = new System.Drawing.Size(21, 15);
+ this.labelTo.TabIndex = 2;
+ this.labelTo.Text = "по";
+ //
+ // dateTimePickerFrom
+ //
+ this.dateTimePickerFrom.Location = new System.Drawing.Point(37, 7);
+ this.dateTimePickerFrom.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.dateTimePickerFrom.Name = "dateTimePickerFrom";
+ this.dateTimePickerFrom.Size = new System.Drawing.Size(163, 23);
+ this.dateTimePickerFrom.TabIndex = 1;
+ //
+ // labelFrom
+ //
+ this.labelFrom.AutoSize = true;
+ this.labelFrom.Location = new System.Drawing.Point(14, 10);
+ this.labelFrom.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelFrom.Name = "labelFrom";
+ this.labelFrom.Size = new System.Drawing.Size(15, 15);
+ this.labelFrom.TabIndex = 0;
+ this.labelFrom.Text = "С";
+ //
+ // FormReportOrders
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1031, 647);
+ this.Controls.Add(this.panel);
+ this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.Name = "FormReportOrders";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "Заказы";
+ this.panel.ResumeLayout(false);
+ this.panel.PerformLayout();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Panel panel;
+ private System.Windows.Forms.Button buttonToPdf;
+ private System.Windows.Forms.Button buttonMake;
+ private System.Windows.Forms.DateTimePicker dateTimePickerTo;
+ private System.Windows.Forms.Label labelTo;
+ private System.Windows.Forms.DateTimePicker dateTimePickerFrom;
+ private System.Windows.Forms.Label labelFrom;
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopView/FormReportOrders.cs b/CarpentryWorkshopView/FormReportOrders.cs
new file mode 100644
index 0000000..c4ccccf
--- /dev/null
+++ b/CarpentryWorkshopView/FormReportOrders.cs
@@ -0,0 +1,100 @@
+using CarpentryWorkshopContracts.BindingModels;
+using CarpentryWorkshopContracts.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 CarpentryWorkshopView
+{
+ 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);
+ Controls.Add(panel);
+ }
+
+ 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/CarpentryWorkshopView/FormReportOrders.resx b/CarpentryWorkshopView/FormReportOrders.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/CarpentryWorkshopView/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/CarpentryWorkshopView/FormReportWoodComponents.Designer.cs b/CarpentryWorkshopView/FormReportWoodComponents.Designer.cs
new file mode 100644
index 0000000..9035a72
--- /dev/null
+++ b/CarpentryWorkshopView/FormReportWoodComponents.Designer.cs
@@ -0,0 +1,114 @@
+namespace CarpentryWorkshopView
+{
+ partial class FormReportWoodComponents
+ {
+ ///
+ /// 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()
+ {
+ this.dataGridView = new System.Windows.Forms.DataGridView();
+ this.buttonSaveToExcel = new System.Windows.Forms.Button();
+ this.ColumnComponent = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ColumnWood = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+ this.SuspendLayout();
+ //
+ // dataGridView
+ //
+ this.dataGridView.AllowUserToAddRows = false;
+ this.dataGridView.AllowUserToDeleteRows = false;
+ this.dataGridView.AllowUserToOrderColumns = true;
+ this.dataGridView.AllowUserToResizeColumns = false;
+ this.dataGridView.AllowUserToResizeRows = false;
+ this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
+ this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.ColumnComponent,
+ this.ColumnWood,
+ this.ColumnCount});
+ this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.dataGridView.Location = new System.Drawing.Point(0, 41);
+ this.dataGridView.MultiSelect = false;
+ this.dataGridView.Name = "dataGridView";
+ this.dataGridView.ReadOnly = true;
+ this.dataGridView.RowHeadersVisible = false;
+ this.dataGridView.Size = new System.Drawing.Size(528, 442);
+ this.dataGridView.TabIndex = 0;
+ //
+ // buttonSaveToExcel
+ //
+ this.buttonSaveToExcel.Location = new System.Drawing.Point(12, 12);
+ this.buttonSaveToExcel.Name = "buttonSaveToExcel";
+ this.buttonSaveToExcel.Size = new System.Drawing.Size(159, 23);
+ this.buttonSaveToExcel.TabIndex = 1;
+ this.buttonSaveToExcel.Text = "Сохранить в Excel";
+ this.buttonSaveToExcel.UseVisualStyleBackColor = true;
+ this.buttonSaveToExcel.Click += new System.EventHandler(this.ButtonSaveToExcel_Click);
+ //
+ // ColumnComponent
+ //
+ this.ColumnComponent.HeaderText = "Изделие";
+ this.ColumnComponent.Name = "ColumnWood";
+ this.ColumnComponent.ReadOnly = true;
+ this.ColumnComponent.Width = 200;
+ //
+ // ColumnWood
+ //
+ this.ColumnWood.HeaderText = "Компонент";
+ this.ColumnWood.Name = "ColumnComponent";
+ this.ColumnWood.ReadOnly = true;
+ this.ColumnWood.Width = 200;
+ //
+ // ColumnCount
+ //
+ this.ColumnCount.HeaderText = "Количество";
+ this.ColumnCount.Name = "ColumnCount";
+ this.ColumnCount.ReadOnly = true;
+ //
+ // FormReportWoodComponents
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(528, 483);
+ this.Controls.Add(this.buttonSaveToExcel);
+ this.Controls.Add(this.dataGridView);
+ this.Name = "FormReportWoodComponents";
+ this.Text = "Компоненты по изделиям";
+ this.Load += new System.EventHandler(this.FormReportWoodComponents_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.DataGridView dataGridView;
+ private System.Windows.Forms.Button buttonSaveToExcel;
+ private System.Windows.Forms.DataGridViewTextBoxColumn ColumnComponent;
+ private System.Windows.Forms.DataGridViewTextBoxColumn ColumnWood;
+ private System.Windows.Forms.DataGridViewTextBoxColumn ColumnCount;
+ }
+}
\ No newline at end of file
diff --git a/CarpentryWorkshopView/FormReportWoodComponents.cs b/CarpentryWorkshopView/FormReportWoodComponents.cs
new file mode 100644
index 0000000..d401b62
--- /dev/null
+++ b/CarpentryWorkshopView/FormReportWoodComponents.cs
@@ -0,0 +1,79 @@
+using CarpentryWorkshopContracts.BindingModels;
+using CarpentryWorkshopContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+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 CarpentryWorkshopView
+{
+ public partial class FormReportWoodComponents : Form
+ {
+ private readonly ILogger _logger;
+
+ private readonly IReportLogic _logic;
+
+ public FormReportWoodComponents(ILogger logger, IReportLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ }
+
+ private void FormReportWoodComponents_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ var dict = _logic.GetWoodComponent();
+ if (dict != null)
+ {
+ dataGridView.Rows.Clear();
+ foreach (var elem in dict)
+ {
+ dataGridView.Rows.Add(new object[] { elem.WoodName, "", "" });
+ foreach (var listElem in elem.Components)
+ {
+ dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
+ }
+ dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount });
+ dataGridView.Rows.Add(Array.Empty | | |