diff --git a/IceCreamShop/IceCreamBusinessLogic/BusinessLogics/ReportLogic.cs b/IceCreamShop/IceCreamBusinessLogic/BusinessLogics/ReportLogic.cs
new file mode 100644
index 0000000..5f0f0d4
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/BusinessLogics/ReportLogic.cs
@@ -0,0 +1,140 @@
+using IceCreamBusinessLogic.OfficePackage.HelperModels;
+using IceCreamBusinessLogic.OfficePackage;
+using IceCreamShopContracts.BusinessLogicsContracts;
+using IceCreamShopContracts.SearchModels;
+using IceCreamShopContracts.StoragesContracts;
+using IceCreamShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using IceCreamShopContracts.BindingModels;
+
+namespace IceCreamBusinessLogic.BusinessLogics
+{
+ public class ReportLogic : IReportLogic
+ {
+ private readonly IComponentStorage _componentStorage;
+
+ private readonly IIceCreamStorage _iceCreamStorage;
+
+ private readonly IOrderStorage _orderStorage;
+
+ private readonly AbstractSaveToExcel _saveToExcel;
+
+ private readonly AbstractSaveToWord _saveToWord;
+
+ private readonly AbstractSaveToPdf _saveToPdf;
+
+ public ReportLogic(IIceCreamStorage iceCreamStorage, IComponentStorage componentStorage, IOrderStorage orderStorage,
+ AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
+ {
+ _iceCreamStorage = iceCreamStorage;
+ _componentStorage = componentStorage;
+ _orderStorage = orderStorage;
+
+ _saveToExcel = saveToExcel;
+ _saveToWord = saveToWord;
+ _saveToPdf = saveToPdf;
+ }
+
+ ///
+ /// Получение списка компонент с указанием, в каких изделиях используются
+ ///
+ ///
+ public List GetIceCreamComponent()
+ {
+ var components = _componentStorage.GetFullList();
+
+ var iceCreams = _iceCreamStorage.GetFullList();
+
+ var list = new List();
+
+ foreach (var icecream in iceCreams)
+ {
+ var record = new ReportIceCreamComponentViewModel
+ {
+ IceCreamName = icecream.IceCreamName,
+ Components = new List<(string, int)>(),
+ TotalCount = 0
+ };
+ foreach (var component in components)
+ {
+ if (icecream.IceCreamComponents.ContainsKey(component.Id))
+ {
+ record.Components.Add(new(component.ComponentName, icecream.IceCreamComponents[component.Id].Item2));
+ record.TotalCount += icecream.IceCreamComponents[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,
+ IceCreamName = x.IceCreamName,
+ OrderStatus = Convert.ToString(x.Status) ?? String.Empty,
+ Sum = x.Sum
+ })
+ .ToList();
+ }
+
+ ///
+ /// Сохранение компонент в файл-Word
+ ///
+ ///
+ public void SaveIceCreamsToWordFile(ReportBindingModel model)
+ {
+ _saveToWord.CreateDoc(new WordInfo
+ {
+ FileName = model.FileName,
+ Title = "Список изделий",
+ IceCreams = _iceCreamStorage.GetFullList()
+ });
+ }
+
+ ///
+ /// Сохранение компонент с указаеним продуктов в файл-Excel
+ ///
+ ///
+ public void SaveIceCreamComponentToExcelFile(ReportBindingModel model)
+ {
+ _saveToExcel.CreateReport(new ExcelInfo
+ {
+ FileName = model.FileName,
+ Title = "Список изделий",
+ IceCreamComponents = GetIceCreamComponent()
+ });
+ }
+
+ ///
+ /// Сохранение заказов в файл-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/IceCreamShop/IceCreamBusinessLogic/IceCreamBusinessLogic.csproj b/IceCreamShop/IceCreamBusinessLogic/IceCreamBusinessLogic.csproj
index 3165a92..b70c7ba 100644
--- a/IceCreamShop/IceCreamBusinessLogic/IceCreamBusinessLogic.csproj
+++ b/IceCreamShop/IceCreamBusinessLogic/IceCreamBusinessLogic.csproj
@@ -7,8 +7,10 @@
+
+
diff --git a/IceCreamShop/IceCreamBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
new file mode 100644
index 0000000..e0f80fa
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
@@ -0,0 +1,107 @@
+using IceCreamBusinessLogic.OfficePackage.HelperEnums;
+using IceCreamBusinessLogic.OfficePackage.HelperModels;
+
+namespace IceCreamBusinessLogic.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.IceCreamComponents)
+ {
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "A",
+ RowIndex = rowIndex,
+ Text = pc.IceCreamName,
+ StyleInfo = ExcelStyleInfoType.Text
+ });
+ rowIndex++;
+
+ foreach (var (IceCream, Count) in pc.Components)
+ {
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "B",
+ RowIndex = rowIndex,
+ Text = IceCream,
+ 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);
+ }
+}
diff --git a/IceCreamShop/IceCreamBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
new file mode 100644
index 0000000..3e10ed2
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
@@ -0,0 +1,76 @@
+using IceCreamBusinessLogic.OfficePackage.HelperEnums;
+using IceCreamBusinessLogic.OfficePackage.HelperModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IceCreamBusinessLogic.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", "4cm", "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.IceCreamName, Convert.ToString(order.OrderStatus), 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/IceCreamShop/IceCreamBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/AbstractSaveToWord.cs
new file mode 100644
index 0000000..bc73496
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/AbstractSaveToWord.cs
@@ -0,0 +1,60 @@
+using IceCreamBusinessLogic.OfficePackage.HelperEnums;
+using IceCreamBusinessLogic.OfficePackage.HelperModels;
+
+namespace IceCreamBusinessLogic.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 iceCream in info.IceCreams)
+ {
+ CreateParagraph(new WordParagraph
+ {
+ Texts = new List<(string, WordTextProperties)> {
+ (iceCream.IceCreamName, new WordTextProperties { Size = "24", Bold = true}),
+ (" - цена " + iceCream.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);
+ }
+}
diff --git a/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
new file mode 100644
index 0000000..056b55f
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IceCreamBusinessLogic.OfficePackage.HelperEnums
+{
+ public enum ExcelStyleInfoType
+ {
+ Title,
+
+ Text,
+
+ TextWithBroder
+ }
+}
diff --git a/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs
new file mode 100644
index 0000000..1bd4872
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IceCreamBusinessLogic.OfficePackage.HelperEnums
+{
+ public enum PdfParagraphAlignmentType
+ {
+ Center,
+
+ Left,
+
+ Rigth
+ }
+}
diff --git a/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs
new file mode 100644
index 0000000..0e5b33d
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IceCreamBusinessLogic.OfficePackage.HelperEnums
+{
+ public enum WordJustificationType
+ {
+ Center,
+
+ Both
+ }
+}
diff --git a/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs
new file mode 100644
index 0000000..ecdc143
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs
@@ -0,0 +1,17 @@
+using IceCreamBusinessLogic.OfficePackage.HelperEnums;
+
+namespace IceCreamBusinessLogic.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/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
new file mode 100644
index 0000000..6fa1f90
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
@@ -0,0 +1,13 @@
+using IceCreamShopContracts.ViewModels;
+
+namespace IceCreamBusinessLogic.OfficePackage.HelperModels
+{
+ public class ExcelInfo
+ {
+ public string FileName { get; set; } = string.Empty;
+
+ public string Title { get; set; } = string.Empty;
+
+ public List IceCreamComponents { get; set; } = new();
+ }
+}
\ No newline at end of file
diff --git a/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs
new file mode 100644
index 0000000..2e06581
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs
@@ -0,0 +1,11 @@
+namespace IceCreamBusinessLogic.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/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
new file mode 100644
index 0000000..1b604ba
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
@@ -0,0 +1,17 @@
+using IceCreamShopContracts.ViewModels;
+
+namespace IceCreamBusinessLogic.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/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
new file mode 100644
index 0000000..3cec70e
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
@@ -0,0 +1,13 @@
+using IceCreamBusinessLogic.OfficePackage.HelperEnums;
+
+namespace IceCreamBusinessLogic.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/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs
new file mode 100644
index 0000000..858e5e3
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs
@@ -0,0 +1,13 @@
+using IceCreamBusinessLogic.OfficePackage.HelperEnums;
+
+namespace IceCreamBusinessLogic.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/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
new file mode 100644
index 0000000..8e6de3a
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
@@ -0,0 +1,13 @@
+using IceCreamShopContracts.ViewModels;
+
+namespace IceCreamBusinessLogic.OfficePackage.HelperModels
+{
+ public class WordInfo
+ {
+ public string FileName { get; set; } = string.Empty;
+
+ public string Title { get; set; } = string.Empty;
+
+ public List IceCreams { get; set; } = new();
+ }
+}
\ No newline at end of file
diff --git a/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
new file mode 100644
index 0000000..32e69a7
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
@@ -0,0 +1,9 @@
+namespace IceCreamBusinessLogic.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/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
new file mode 100644
index 0000000..dfcd20c
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
@@ -0,0 +1,13 @@
+using IceCreamBusinessLogic.OfficePackage.HelperEnums;
+
+namespace IceCreamBusinessLogic.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/IceCreamShop/IceCreamBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
new file mode 100644
index 0000000..e084785
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
@@ -0,0 +1,293 @@
+using DocumentFormat.OpenXml.Office2010.Excel;
+using DocumentFormat.OpenXml.Office2013.Excel;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
+using DocumentFormat.OpenXml;
+using IceCreamBusinessLogic.OfficePackage.HelperEnums;
+using IceCreamBusinessLogic.OfficePackage.HelperModels;
+
+
+namespace IceCreamBusinessLogic.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();
+ }
+ }
+}
diff --git a/IceCreamShop/IceCreamBusinessLogic/OfficePackage/Implements/SaveToPdf.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
new file mode 100644
index 0000000..5dbc10d
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
@@ -0,0 +1,114 @@
+using IceCreamBusinessLogic.OfficePackage.HelperEnums;
+using IceCreamBusinessLogic.OfficePackage.HelperModels;
+using MigraDoc.DocumentObjectModel;
+using MigraDoc.DocumentObjectModel.Tables;
+using MigraDoc.Rendering;
+
+namespace IceCreamBusinessLogic.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);
+ }
+ }
+}
diff --git a/IceCreamShop/IceCreamBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/Implements/SaveToWord.cs
new file mode 100644
index 0000000..c88af35
--- /dev/null
+++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/Implements/SaveToWord.cs
@@ -0,0 +1,135 @@
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+using IceCreamBusinessLogic.OfficePackage.HelperEnums;
+using IceCreamBusinessLogic.OfficePackage.HelperModels;
+
+namespace IceCreamBusinessLogic.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();
+ }
+ }
+}
diff --git a/IceCreamShop/IceCreamShop/DataSources/IceCreamShopContracts.BusinessLogicsContracts.IComponentLogic.datasource b/IceCreamShop/IceCreamShop/DataSources/IceCreamShopContracts.BusinessLogicsContracts.IComponentLogic.datasource
new file mode 100644
index 0000000..504f619
--- /dev/null
+++ b/IceCreamShop/IceCreamShop/DataSources/IceCreamShopContracts.BusinessLogicsContracts.IComponentLogic.datasource
@@ -0,0 +1,10 @@
+
+
+
+ IceCreamShopContracts.BusinessLogicsContracts.IComponentLogic, IceCreamShopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+
\ No newline at end of file
diff --git a/IceCreamShop/IceCreamShop/FormMain.Designer.cs b/IceCreamShop/IceCreamShop/FormMain.Designer.cs
index 25a564c..ad6a851 100644
--- a/IceCreamShop/IceCreamShop/FormMain.Designer.cs
+++ b/IceCreamShop/IceCreamShop/FormMain.Designer.cs
@@ -38,6 +38,10 @@
this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.мороженоеToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.отчетыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.iceCreamComponentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.iceCreamToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.ordersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.магазиныToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.buttonSupplyShop = new System.Windows.Forms.Button();
this.SellIceCreamButton = new System.Windows.Forms.Button();
@@ -47,10 +51,9 @@
//
// buttonUpdate
//
- this.buttonUpdate.Location = new System.Drawing.Point(878, 294);
- this.buttonUpdate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.buttonUpdate.Location = new System.Drawing.Point(1003, 392);
this.buttonUpdate.Name = "buttonUpdate";
- this.buttonUpdate.Size = new System.Drawing.Size(170, 37);
+ this.buttonUpdate.Size = new System.Drawing.Size(194, 49);
this.buttonUpdate.TabIndex = 13;
this.buttonUpdate.Text = "Обновить";
this.buttonUpdate.UseVisualStyleBackColor = true;
@@ -58,10 +61,11 @@
//
// buttonSetToFinish
//
+ this.buttonSetToFinish.Location = new System.Drawing.Point(1003, 300);
this.buttonSetToFinish.Location = new System.Drawing.Point(878, 149);
this.buttonSetToFinish.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonSetToFinish.Name = "buttonSetToFinish";
- this.buttonSetToFinish.Size = new System.Drawing.Size(170, 37);
+ this.buttonSetToFinish.Size = new System.Drawing.Size(194, 49);
this.buttonSetToFinish.TabIndex = 12;
this.buttonSetToFinish.Text = "Заказ выдан";
this.buttonSetToFinish.UseVisualStyleBackColor = true;
@@ -69,10 +73,11 @@
//
// buttonSetToDone
//
+ this.buttonSetToDone.Location = new System.Drawing.Point(1003, 213);
this.buttonSetToDone.Location = new System.Drawing.Point(878, 108);
this.buttonSetToDone.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonSetToDone.Name = "buttonSetToDone";
- this.buttonSetToDone.Size = new System.Drawing.Size(170, 37);
+ this.buttonSetToDone.Size = new System.Drawing.Size(194, 49);
this.buttonSetToDone.TabIndex = 11;
this.buttonSetToDone.Text = "Заказ готов";
this.buttonSetToDone.UseVisualStyleBackColor = true;
@@ -80,10 +85,11 @@
//
// buttonSetToWork
//
+ this.buttonSetToWork.Location = new System.Drawing.Point(1003, 124);
this.buttonSetToWork.Location = new System.Drawing.Point(878, 67);
this.buttonSetToWork.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonSetToWork.Name = "buttonSetToWork";
- this.buttonSetToWork.Size = new System.Drawing.Size(170, 37);
+ this.buttonSetToWork.Size = new System.Drawing.Size(194, 49);
this.buttonSetToWork.TabIndex = 10;
this.buttonSetToWork.Text = "Отдать на выполнение";
this.buttonSetToWork.UseVisualStyleBackColor = true;
@@ -91,10 +97,9 @@
//
// buttonCreateOrder
//
- this.buttonCreateOrder.Location = new System.Drawing.Point(878, 26);
- this.buttonCreateOrder.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.buttonCreateOrder.Location = new System.Drawing.Point(1003, 35);
this.buttonCreateOrder.Name = "buttonCreateOrder";
- this.buttonCreateOrder.Size = new System.Drawing.Size(170, 37);
+ this.buttonCreateOrder.Size = new System.Drawing.Size(194, 49);
this.buttonCreateOrder.TabIndex = 9;
this.buttonCreateOrder.Text = "Создать заказ";
this.buttonCreateOrder.UseVisualStyleBackColor = true;
@@ -103,23 +108,23 @@
// dataGridView
//
this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.dataGridView.Location = new System.Drawing.Point(12, 26);
- this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.dataGridView.Location = new System.Drawing.Point(14, 35);
this.dataGridView.Name = "dataGridView";
this.dataGridView.RowHeadersWidth = 51;
this.dataGridView.RowTemplate.Height = 29;
- this.dataGridView.Size = new System.Drawing.Size(848, 305);
+ this.dataGridView.Size = new System.Drawing.Size(969, 407);
this.dataGridView.TabIndex = 8;
//
// menuStrip
//
this.menuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.справочникиToolStripMenuItem});
+ this.справочникиToolStripMenuItem,
+ this.отчетыToolStripMenuItem});
this.menuStrip.Location = new System.Drawing.Point(0, 0);
this.menuStrip.Name = "menuStrip";
- this.menuStrip.Padding = new System.Windows.Forms.Padding(5, 2, 0, 2);
- this.menuStrip.Size = new System.Drawing.Size(1072, 24);
+ this.menuStrip.Padding = new System.Windows.Forms.Padding(6, 3, 0, 3);
+ this.menuStrip.Size = new System.Drawing.Size(1225, 30);
this.menuStrip.TabIndex = 7;
this.menuStrip.Text = "Справочники";
//
@@ -130,12 +135,13 @@
this.мороженоеToolStripMenuItem,
this.магазиныToolStripMenuItem});
this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
- this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 20);
+ this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(117, 24);
this.справочникиToolStripMenuItem.Text = "Справочники";
//
// компонентыToolStripMenuItem
//
this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
+ this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.компонентыToolStripMenuItem.Text = "Компоненты";
this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.компонентыToolStripMenuItem_Click);
@@ -143,10 +149,42 @@
// мороженоеToolStripMenuItem
//
this.мороженоеToolStripMenuItem.Name = "мороженоеToolStripMenuItem";
+ this.мороженоеToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
this.мороженоеToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.мороженоеToolStripMenuItem.Text = "Мороженое";
this.мороженоеToolStripMenuItem.Click += new System.EventHandler(this.мороженоеToolStripMenuItem_Click);
//
+ // отчетыToolStripMenuItem
+ //
+ this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.iceCreamComponentsToolStripMenuItem,
+ this.iceCreamToolStripMenuItem,
+ this.ordersToolStripMenuItem});
+ this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
+ this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(73, 24);
+ this.отчетыToolStripMenuItem.Text = "Отчеты";
+ //
+ // iceCreamComponentsToolStripMenuItem
+ //
+ this.iceCreamComponentsToolStripMenuItem.Name = "iceCreamComponentsToolStripMenuItem";
+ this.iceCreamComponentsToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
+ this.iceCreamComponentsToolStripMenuItem.Text = "Список мороженых";
+ this.iceCreamComponentsToolStripMenuItem.Click += new System.EventHandler(this.IceCreamsToolStripMenuItem_Click);
+ //
+ // iceCreamToolStripMenuItem
+ //
+ this.iceCreamToolStripMenuItem.Name = "iceCreamToolStripMenuItem";
+ this.iceCreamToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
+ this.iceCreamToolStripMenuItem.Text = "Мороженые с компонентами";
+ this.iceCreamToolStripMenuItem.Click += new System.EventHandler(this.IceCreamComponentsToolStripMenuItem_Click);
+ //
+ // ordersToolStripMenuItem
+ //
+ this.ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
+ this.ordersToolStripMenuItem.Size = new System.Drawing.Size(299, 26);
+ this.ordersToolStripMenuItem.Text = "Список заказов";
+ this.ordersToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click);
+ //
// магазиныToolStripMenuItem
//
this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
@@ -178,8 +216,9 @@
//
// FormMain
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1225, 463);
this.ClientSize = new System.Drawing.Size(1072, 347);
this.Controls.Add(this.SellIceCreamButton);
this.Controls.Add(this.buttonSupplyShop);
@@ -190,6 +229,7 @@
this.Controls.Add(this.buttonCreateOrder);
this.Controls.Add(this.dataGridView);
this.Controls.Add(this.menuStrip);
+ this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.Name = "FormMain";
this.Text = "Магазин мороженого";
this.Load += new System.EventHandler(this.FormMain_Load);
@@ -213,6 +253,10 @@
private ToolStripMenuItem справочникиToolStripMenuItem;
private ToolStripMenuItem компонентыToolStripMenuItem;
private ToolStripMenuItem мороженоеToolStripMenuItem;
+ private ToolStripMenuItem отчетыToolStripMenuItem;
+ private ToolStripMenuItem iceCreamComponentsToolStripMenuItem;
+ private ToolStripMenuItem iceCreamToolStripMenuItem;
+ private ToolStripMenuItem ordersToolStripMenuItem;
private ToolStripMenuItem магазиныToolStripMenuItem;
private Button buttonSupplyShop;
private Button SellIceCreamButton;
diff --git a/IceCreamShop/IceCreamShop/FormMain.cs b/IceCreamShop/IceCreamShop/FormMain.cs
index 6e91c1d..5146fd3 100644
--- a/IceCreamShop/IceCreamShop/FormMain.cs
+++ b/IceCreamShop/IceCreamShop/FormMain.cs
@@ -1,4 +1,5 @@
using AbstractIceCreamShopDataModels.Enums;
+using IceCreamBusinessLogic.BusinessLogics;
using IceCreamShop;
using IceCreamShopContracts.BindingModels;
using IceCreamShopContracts.BusinessLogicsContracts;
@@ -19,11 +20,13 @@ namespace IceCreamShopView
{
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)
@@ -97,7 +100,7 @@ namespace IceCreamShopView
try
{
var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel
- {
+ {
Id = id,
});
if (!operationResult)
@@ -173,6 +176,34 @@ namespace IceCreamShopView
LoadData();
}
+ private void IceCreamsToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ _reportLogic.SaveIceCreamsToWordFile(new ReportBindingModel { FileName = dialog.FileName });
+ MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ }
+ }
+
+ private void IceCreamComponentsToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportProductComponents));
+ if (service is FormReportProductComponents form)
+ {
+ form.ShowDialog();
+ }
+ }
+
+ private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
+ if (service is FormReportOrders form)
+ {
+ form.ShowDialog();
+ }
+ }
+
private void buttonSupplyShop_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormShopSupply));
diff --git a/IceCreamShop/IceCreamShop/FormReportOrders.Designer.cs b/IceCreamShop/IceCreamShop/FormReportOrders.Designer.cs
new file mode 100644
index 0000000..0b4b768
--- /dev/null
+++ b/IceCreamShop/IceCreamShop/FormReportOrders.Designer.cs
@@ -0,0 +1,140 @@
+namespace IceCreamShopView
+{
+ 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.buttonToPdf = new System.Windows.Forms.Button();
+ this.panel = new System.Windows.Forms.Panel();
+ 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();
+ //
+ // 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(936, 11);
+ this.buttonToPdf.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.buttonToPdf.Name = "buttonToPdf";
+ this.buttonToPdf.Size = new System.Drawing.Size(159, 36);
+ this.buttonToPdf.TabIndex = 6;
+ this.buttonToPdf.Text = "В Pdf";
+ this.buttonToPdf.UseVisualStyleBackColor = true;
+ this.buttonToPdf.Click += new System.EventHandler(this.ButtonToPdf_Click);
+ //
+ // panel
+ //
+ this.panel.Controls.Add(this.buttonMake);
+ this.panel.Controls.Add(this.buttonToPdf);
+ 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(5, 4, 5, 4);
+ this.panel.Name = "panel";
+ this.panel.Size = new System.Drawing.Size(1150, 53);
+ this.panel.TabIndex = 7;
+ //
+ // buttonMake
+ //
+ this.buttonMake.Location = new System.Drawing.Point(544, 11);
+ this.buttonMake.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.buttonMake.Name = "buttonMake";
+ this.buttonMake.Size = new System.Drawing.Size(159, 36);
+ 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(271, 9);
+ this.dateTimePickerTo.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.dateTimePickerTo.Name = "dateTimePickerTo";
+ this.dateTimePickerTo.Size = new System.Drawing.Size(186, 27);
+ this.dateTimePickerTo.TabIndex = 3;
+ //
+ // labelTo
+ //
+ this.labelTo.AutoSize = true;
+ this.labelTo.Location = new System.Drawing.Point(238, 13);
+ this.labelTo.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.labelTo.Name = "labelTo";
+ this.labelTo.Size = new System.Drawing.Size(27, 20);
+ this.labelTo.TabIndex = 2;
+ this.labelTo.Text = "по";
+ //
+ // dateTimePickerFrom
+ //
+ this.dateTimePickerFrom.Location = new System.Drawing.Point(42, 9);
+ this.dateTimePickerFrom.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.dateTimePickerFrom.Name = "dateTimePickerFrom";
+ this.dateTimePickerFrom.Size = new System.Drawing.Size(186, 27);
+ this.dateTimePickerFrom.TabIndex = 1;
+ //
+ // labelFrom
+ //
+ this.labelFrom.AutoSize = true;
+ this.labelFrom.Location = new System.Drawing.Point(16, 13);
+ this.labelFrom.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.labelFrom.Name = "labelFrom";
+ this.labelFrom.Size = new System.Drawing.Size(18, 20);
+ this.labelFrom.TabIndex = 0;
+ this.labelFrom.Text = "С";
+ //
+ // FormReportOrders
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1150, 600);
+ this.Controls.Add(this.panel);
+ this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.Name = "FormReportOrders";
+ this.Text = "Заказы";
+ this.panel.ResumeLayout(false);
+ this.panel.PerformLayout();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private Button buttonToPdf;
+ private Panel panel;
+ private Button buttonMake;
+ private DateTimePicker dateTimePickerTo;
+ private Label labelTo;
+ private DateTimePicker dateTimePickerFrom;
+ private Label labelFrom;
+ }
+}
\ No newline at end of file
diff --git a/IceCreamShop/IceCreamShop/FormReportOrders.cs b/IceCreamShop/IceCreamShop/FormReportOrders.cs
new file mode 100644
index 0000000..c13bbc4
--- /dev/null
+++ b/IceCreamShop/IceCreamShop/FormReportOrders.cs
@@ -0,0 +1,90 @@
+using IceCreamShopContracts.BusinessLogicsContracts;
+using Microsoft.Reporting.WinForms;
+using Microsoft.Extensions.Logging;
+using Microsoft.Reporting.WinForms;
+using IceCreamShopContracts.BindingModels;
+
+namespace IceCreamShopView
+{
+ 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/IceCreamShop/IceCreamShop/FormReportOrders.resx b/IceCreamShop/IceCreamShop/FormReportOrders.resx
new file mode 100644
index 0000000..f298a7b
--- /dev/null
+++ b/IceCreamShop/IceCreamShop/FormReportOrders.resx
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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/IceCreamShop/IceCreamShop/FormReportProductComponents.Designer.cs b/IceCreamShop/IceCreamShop/FormReportProductComponents.Designer.cs
new file mode 100644
index 0000000..ef20031
--- /dev/null
+++ b/IceCreamShop/IceCreamShop/FormReportProductComponents.Designer.cs
@@ -0,0 +1,112 @@
+namespace IceCreamShopView
+{
+ partial class FormReportProductComponents
+ {
+ ///
+ /// 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();
+ ColumnComponent = new DataGridViewTextBoxColumn();
+ ColumnProduct = new DataGridViewTextBoxColumn();
+ ColumnCount = new DataGridViewTextBoxColumn();
+ ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+ SuspendLayout();
+ //
+ // buttonSaveToExcel
+ //
+ buttonSaveToExcel.Location = new Point(13, 12);
+ buttonSaveToExcel.Margin = new Padding(4, 3, 4, 3);
+ buttonSaveToExcel.Name = "buttonSaveToExcel";
+ buttonSaveToExcel.Size = new Size(186, 27);
+ buttonSaveToExcel.TabIndex = 3;
+ buttonSaveToExcel.Text = "Сохранить в Excel";
+ buttonSaveToExcel.UseVisualStyleBackColor = true;
+ buttonSaveToExcel.Click += buttonSaveToExcel_Click;
+ //
+ // dataGridView
+ //
+ dataGridView.AllowUserToAddRows = false;
+ dataGridView.AllowUserToDeleteRows = false;
+ dataGridView.AllowUserToOrderColumns = true;
+ dataGridView.AllowUserToResizeColumns = false;
+ dataGridView.AllowUserToResizeRows = false;
+ dataGridView.BackgroundColor = SystemColors.ControlLightLight;
+ dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnComponent, ColumnProduct, ColumnCount });
+ dataGridView.Dock = DockStyle.Bottom;
+ dataGridView.Location = new Point(0, 53);
+ dataGridView.Margin = new Padding(4, 3, 4, 3);
+ dataGridView.MultiSelect = false;
+ dataGridView.Name = "dataGridView";
+ dataGridView.ReadOnly = true;
+ dataGridView.RowHeadersVisible = false;
+ dataGridView.Size = new Size(800, 510);
+ dataGridView.TabIndex = 4;
+ //
+ // ColumnComponent
+ //
+ ColumnComponent.HeaderText = "Компонент";
+ ColumnComponent.Name = "ColumnComponent";
+ ColumnComponent.ReadOnly = true;
+ ColumnComponent.Width = 200;
+ //
+ // ColumnProduct
+ //
+ ColumnProduct.HeaderText = "Мороженое";
+ ColumnProduct.Name = "ColumnProduct";
+ ColumnProduct.ReadOnly = true;
+ ColumnProduct.Width = 200;
+ //
+ // ColumnCount
+ //
+ ColumnCount.HeaderText = "Количество";
+ ColumnCount.Name = "ColumnCount";
+ ColumnCount.ReadOnly = true;
+ //
+ // FormReportProductComponents
+ //
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(800, 563);
+ Controls.Add(dataGridView);
+ Controls.Add(buttonSaveToExcel);
+ Name = "FormReportProductComponents";
+ Text = "Компоненты по мороженым";
+ Load += FormReportProductComponents_Load;
+ ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private Button buttonSaveToExcel;
+ private DataGridView dataGridView;
+ private DataGridViewTextBoxColumn ColumnComponent;
+ private DataGridViewTextBoxColumn ColumnProduct;
+ private DataGridViewTextBoxColumn ColumnCount;
+ }
+}
\ No newline at end of file
diff --git a/IceCreamShop/IceCreamShop/FormReportProductComponents.cs b/IceCreamShop/IceCreamShop/FormReportProductComponents.cs
new file mode 100644
index 0000000..f64ca4a
--- /dev/null
+++ b/IceCreamShop/IceCreamShop/FormReportProductComponents.cs
@@ -0,0 +1,78 @@
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.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 IceCreamShopView
+{
+ public partial class FormReportProductComponents : Form
+ {
+ private readonly ILogger _logger;
+
+ private readonly IReportLogic _logic;
+ public FormReportProductComponents(ILogger logger, IReportLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ }
+
+ private void FormReportProductComponents_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ var dict = _logic.GetIceCreamComponent();
+ if (dict != null)
+ {
+ dataGridView.Rows.Clear();
+ foreach (var elem in dict)
+ {
+ dataGridView.Rows.Add(new object[] { elem.IceCreamName, "", "" });
+ 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 | | |
@@ -25,4 +26,10 @@
+
+
+ Always
+
+
+
\ No newline at end of file
diff --git a/IceCreamShop/IceCreamShop/Program.cs b/IceCreamShop/IceCreamShop/Program.cs
index e00e63f..b61a5b5 100644
--- a/IceCreamShop/IceCreamShop/Program.cs
+++ b/IceCreamShop/IceCreamShop/Program.cs
@@ -5,6 +5,8 @@ using IceCreamShopView;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
+using IceCreamBusinessLogic.OfficePackage.Implements;
+using IceCreamBusinessLogic.OfficePackage;
using IceCreamShopDatabaseImplement.Implements;
namespace IceCreamShop
@@ -39,10 +41,17 @@ namespace IceCreamShop
services.AddTransient();
services.AddTransient();
services.AddTransient();
+
services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
+
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+
services.AddTransient();
services.AddTransient();
services.AddTransient();
@@ -51,6 +60,8 @@ namespace IceCreamShop
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
diff --git a/IceCreamShop/IceCreamShop/ReportOrders.rdlc b/IceCreamShop/IceCreamShop/ReportOrders.rdlc
new file mode 100644
index 0000000..1712a9f
--- /dev/null
+++ b/IceCreamShop/IceCreamShop/ReportOrders.rdlc
@@ -0,0 +1,600 @@
+
+
+ 0
+
+
+
+ System.Data.DataSet
+ /* Local Connection */
+
+ 47cb53f0-7dde-4717-ba03-866a0bc4f4dd
+
+
+
+
+
+ IceCreamShopContractsViewModels
+ /* Local Query */
+
+
+
+ Id
+ System.Int32
+
+
+ DateCreate
+ System.DateTime
+
+
+ IceCreamName
+ System.String
+
+
+ Sum
+ System.Decimal
+
+
+ OrderStatus
+ IceCreamShopDataModels.OrderStatus
+
+
+
+ IceCreamShopContracts.ViewModels
+ ReportOrderViewModel
+ IceCreamShopContracts.ViewModels.ReportOrderViewModel, IceCreamShopContracts, 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!IceCreamName.Value
+
+
+
+
+
+
+ IceCreamName
+
+
+ 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
+
\ No newline at end of file
diff --git a/IceCreamShop/IceCreamShopContracts/BindingModels/ReportBindingModel.cs b/IceCreamShop/IceCreamShopContracts/BindingModels/ReportBindingModel.cs
new file mode 100644
index 0000000..b90be68
--- /dev/null
+++ b/IceCreamShop/IceCreamShopContracts/BindingModels/ReportBindingModel.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IceCreamShopContracts.BindingModels
+{
+ public class ReportBindingModel
+ {
+ public string FileName { get; set; } = string.Empty;
+
+ public DateTime? DateFrom { get; set; }
+
+ public DateTime? DateTo { get; set; }
+ }
+}
diff --git a/IceCreamShop/IceCreamShopContracts/BusinessLogicsContracts/IReportLogic.cs b/IceCreamShop/IceCreamShopContracts/BusinessLogicsContracts/IReportLogic.cs
new file mode 100644
index 0000000..e49eb0c
--- /dev/null
+++ b/IceCreamShop/IceCreamShopContracts/BusinessLogicsContracts/IReportLogic.cs
@@ -0,0 +1,44 @@
+using IceCreamShopContracts.BindingModels;
+using IceCreamShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IceCreamShopContracts.BusinessLogicsContracts
+{
+ public interface IReportLogic
+ {
+ ///
+ /// Получение списка компонент с указанием, в каких изделиях используются
+ ///
+ ///
+ List GetIceCreamComponent();
+
+ ///
+ /// Получение списка заказов за определенный период
+ ///
+ ///
+ ///
+ List GetOrders(ReportBindingModel model);
+
+ ///
+ /// Сохранение компонент в файл-Word
+ ///
+ ///
+ void SaveIceCreamsToWordFile(ReportBindingModel model);
+
+ ///
+ /// Сохранение компонент с указаеним продуктов в файл-Excel
+ ///
+ ///
+ void SaveIceCreamComponentToExcelFile(ReportBindingModel model);
+
+ ///
+ /// Сохранение заказов в файл-Pdf
+ ///
+ ///
+ void SaveOrdersToPdfFile(ReportBindingModel model);
+ }
+}
diff --git a/IceCreamShop/IceCreamShopContracts/SearchModels/OrderSearchModel.cs b/IceCreamShop/IceCreamShopContracts/SearchModels/OrderSearchModel.cs
index 23043f3..57e19e0 100644
--- a/IceCreamShop/IceCreamShopContracts/SearchModels/OrderSearchModel.cs
+++ b/IceCreamShop/IceCreamShopContracts/SearchModels/OrderSearchModel.cs
@@ -9,5 +9,9 @@ namespace IceCreamShopContracts.SearchModels
public class OrderSearchModel
{
public int? Id { get; set; }
+
+ public DateTime? DateFrom { get; set; }
+
+ public DateTime? DateTo { get; set; }
}
}
diff --git a/IceCreamShop/IceCreamShopContracts/ViewModels/ReportIceCreamComponentViewModel.cs b/IceCreamShop/IceCreamShopContracts/ViewModels/ReportIceCreamComponentViewModel.cs
new file mode 100644
index 0000000..be15f94
--- /dev/null
+++ b/IceCreamShop/IceCreamShopContracts/ViewModels/ReportIceCreamComponentViewModel.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IceCreamShopContracts.ViewModels
+{
+ public class ReportIceCreamComponentViewModel
+ {
+ public string IceCreamName { get; set; } = string.Empty;
+
+ public int TotalCount { get; set; }
+
+ public List<(string IceCream, int Count)> Components { get; set; } = new();
+ }
+}
diff --git a/IceCreamShop/IceCreamShopContracts/ViewModels/ReportOrdersViewModel.cs b/IceCreamShop/IceCreamShopContracts/ViewModels/ReportOrdersViewModel.cs
new file mode 100644
index 0000000..43474c6
--- /dev/null
+++ b/IceCreamShop/IceCreamShopContracts/ViewModels/ReportOrdersViewModel.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IceCreamShopContracts.ViewModels
+{
+ public class ReportOrdersViewModel
+ {
+ public int Id { get; set; }
+
+ public DateTime DateCreate { get; set; }
+
+ public string IceCreamName { get; set; } = string.Empty;
+ public string OrderStatus { get; set; } = string.Empty ;
+
+ public double Sum { get; set; }
+ }
+}
diff --git a/IceCreamShop/IceCreamShopDatabaseImplement/Implements/IceCreamStorage.cs b/IceCreamShop/IceCreamShopDatabaseImplement/Implements/IceCreamStorage.cs
index a34bfe5..2782f13 100644
--- a/IceCreamShop/IceCreamShopDatabaseImplement/Implements/IceCreamStorage.cs
+++ b/IceCreamShop/IceCreamShopDatabaseImplement/Implements/IceCreamStorage.cs
@@ -4,6 +4,7 @@ using IceCreamShopContracts.ViewModels;
using IceCreamShopContracts.BindingModels;
using Microsoft.EntityFrameworkCore;
using IceCreamShopDatabaseImplement.Models;
+using System.Reflection.Metadata;
namespace IceCreamShopDatabaseImplement.Implements
{
@@ -53,14 +54,29 @@ namespace IceCreamShopDatabaseImplement.Implements
public IceCreamViewModel? Insert(IceCreamBindingModel model)
{
using var context = new IceCreamShopDatabase();
- var newIceCream = IceCream.Create(context, model);
- if (newIceCream == null)
+ using var transaction = context.Database.BeginTransaction();
{
- return null;
+ try
+ {
+ var newIceCream = IceCream.Create(context, model);
+ if (newIceCream == null)
+ {
+ transaction.Rollback();
+ return null;
+ }
+ context.IceCreams.Add(newIceCream);
+
+ context.SaveChanges();
+ context.Database.CommitTransaction();
+
+ return newIceCream.GetViewModel;
+ }
+ catch (Exception)
+ {
+ transaction.Rollback();
+ return null;
+ }
}
- context.IceCreams.Add(newIceCream);
- context.SaveChanges();
- return newIceCream.GetViewModel;
}
public IceCreamViewModel? Update(IceCreamBindingModel model)
diff --git a/IceCreamShop/IceCreamShopDatabaseImplement/Implements/OrderStorage.cs b/IceCreamShop/IceCreamShopDatabaseImplement/Implements/OrderStorage.cs
index d0f72db..d99061c 100644
--- a/IceCreamShop/IceCreamShopDatabaseImplement/Implements/OrderStorage.cs
+++ b/IceCreamShop/IceCreamShopDatabaseImplement/Implements/OrderStorage.cs
@@ -3,6 +3,7 @@ using IceCreamShopContracts.SearchModels;
using IceCreamShopContracts.StoragesContracts;
using IceCreamShopContracts.ViewModels;
using IceCreamShopDatabaseImplement.Models;
+using Microsoft.EntityFrameworkCore;
namespace IceCreamShopDatabaseImplement.Implements
{
@@ -33,19 +34,20 @@ namespace IceCreamShopDatabaseImplement.Implements
}
using var context = new IceCreamShopDatabase();
-
return context.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
}
public List GetFilteredList(OrderSearchModel model)
{
+ if (model is null) return new();
+ using var context = new IceCreamShopDatabase();
+
if (!model.Id.HasValue)
{
- return new();
+ return context.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo).
+ Select(x => x.GetViewModel).ToList();
}
- using var context = new IceCreamShopDatabase();
-
return context.Orders.Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList();
}
@@ -70,7 +72,7 @@ namespace IceCreamShopDatabaseImplement.Implements
context.Orders.Add(newOrder);
context.SaveChanges();
- return newOrder.GetViewModel;
+ return context.Orders.FirstOrDefault(x => x.Id == newOrder.Id)?.GetViewModel;
}
public OrderViewModel? Update(OrderBindingModel model)
@@ -87,7 +89,7 @@ namespace IceCreamShopDatabaseImplement.Implements
order.Update(model);
context.SaveChanges();
- return order.GetViewModel;
+ return context.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
}
}
}
diff --git a/IceCreamShop/IceCreamShopDatabaseImplement/Migrations/20230313191542_NewMigration.Designer.cs b/IceCreamShop/IceCreamShopDatabaseImplement/Migrations/20230313191542_NewMigration.Designer.cs
new file mode 100644
index 0000000..ddb4850
--- /dev/null
+++ b/IceCreamShop/IceCreamShopDatabaseImplement/Migrations/20230313191542_NewMigration.Designer.cs
@@ -0,0 +1,171 @@
+//
+using System;
+using IceCreamShopDatabaseImplement;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace IceCreamShopDatabaseImplement.Migrations
+{
+ [DbContext(typeof(IceCreamShopDatabase))]
+ [Migration("20230313191542_NewMigration")]
+ partial class NewMigration
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "7.0.3")
+ .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+ SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+ modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Component", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("ComponentName")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Cost")
+ .HasColumnType("float");
+
+ b.HasKey("Id");
+
+ b.ToTable("Components");
+ });
+
+ modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.IceCream", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("IceCreamName")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Price")
+ .HasColumnType("float");
+
+ b.HasKey("Id");
+
+ b.ToTable("IceCreams");
+ });
+
+ modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.IceCreamComponent", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("ComponentId")
+ .HasColumnType("int");
+
+ b.Property("Count")
+ .HasColumnType("int");
+
+ b.Property("IceCreamId")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ComponentId");
+
+ b.HasIndex("IceCreamId");
+
+ b.ToTable("IceCreamComponents");
+ });
+
+ modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Order", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("Count")
+ .HasColumnType("int");
+
+ b.Property("DateCreate")
+ .HasColumnType("datetime2");
+
+ b.Property("DateImplement")
+ .HasColumnType("datetime2");
+
+ b.Property("IceCreamId")
+ .HasColumnType("int");
+
+ b.Property("Status")
+ .HasColumnType("int");
+
+ b.Property("Sum")
+ .HasColumnType("float");
+
+ b.HasKey("Id");
+
+ b.HasIndex("IceCreamId");
+
+ b.ToTable("Orders");
+ });
+
+ modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.IceCreamComponent", b =>
+ {
+ b.HasOne("IceCreamShopDatabaseImplement.Models.Component", "Component")
+ .WithMany("IceCreamComponents")
+ .HasForeignKey("ComponentId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("IceCreamShopDatabaseImplement.Models.IceCream", "IceCream")
+ .WithMany("Components")
+ .HasForeignKey("IceCreamId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Component");
+
+ b.Navigation("IceCream");
+ });
+
+ modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Order", b =>
+ {
+ b.HasOne("IceCreamShopDatabaseImplement.Models.IceCream", "IceCream")
+ .WithMany("Orders")
+ .HasForeignKey("IceCreamId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("IceCream");
+ });
+
+ modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Component", b =>
+ {
+ b.Navigation("IceCreamComponents");
+ });
+
+ modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.IceCream", b =>
+ {
+ b.Navigation("Components");
+
+ b.Navigation("Orders");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/IceCreamShop/IceCreamShopDatabaseImplement/Migrations/20230313191542_NewMigration.cs b/IceCreamShop/IceCreamShopDatabaseImplement/Migrations/20230313191542_NewMigration.cs
new file mode 100644
index 0000000..9a429e5
--- /dev/null
+++ b/IceCreamShop/IceCreamShopDatabaseImplement/Migrations/20230313191542_NewMigration.cs
@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IceCreamShopDatabaseImplement.Migrations
+{
+ ///
+ public partial class NewMigration : Migration
+ {
+ ///
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+
+ }
+
+ ///
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+
+ }
+ }
+}
diff --git a/IceCreamShop/IceCreamShopDatabaseImplement/Migrations/IceCreamShopDatabaseModelSnapshot.cs b/IceCreamShop/IceCreamShopDatabaseImplement/Migrations/IceCreamShopDatabaseModelSnapshot.cs
index e6ae098..3855662 100644
--- a/IceCreamShop/IceCreamShopDatabaseImplement/Migrations/IceCreamShopDatabaseModelSnapshot.cs
+++ b/IceCreamShop/IceCreamShopDatabaseImplement/Migrations/IceCreamShopDatabaseModelSnapshot.cs
@@ -108,10 +108,6 @@ namespace IceCreamShopDatabaseImplement.Migrations
b.Property("IceCreamId")
.HasColumnType("int");
- b.Property("IceCreamName")
- .IsRequired()
- .HasColumnType("nvarchar(max)");
-
b.Property("Status")
.HasColumnType("int");
@@ -202,6 +198,17 @@ namespace IceCreamShopDatabaseImplement.Migrations
b.Navigation("IceCream");
});
+ modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Order", b =>
+ {
+ b.HasOne("IceCreamShopDatabaseImplement.Models.IceCream", "IceCream")
+ .WithMany("Orders")
+ .HasForeignKey("IceCreamId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("IceCream");
+ });
+
modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Order", b =>
{
b.HasOne("IceCreamShopDatabaseImplement.Models.IceCream", null)
diff --git a/IceCreamShop/IceCreamShopDatabaseImplement/Models/Component.cs b/IceCreamShop/IceCreamShopDatabaseImplement/Models/Component.cs
index ea5c094..40c83db 100644
--- a/IceCreamShop/IceCreamShopDatabaseImplement/Models/Component.cs
+++ b/IceCreamShop/IceCreamShopDatabaseImplement/Models/Component.cs
@@ -20,7 +20,7 @@ namespace IceCreamShopDatabaseImplement.Models
[ForeignKey("ComponentId")]
public virtual List IceCreamComponents { get; set; } = new();
- public static Component? Create(ComponentBindingModel model)
+ public static Component? Create(ComponentBindingModel? model)
{
if (model == null)
{
@@ -33,16 +33,8 @@ namespace IceCreamShopDatabaseImplement.Models
Cost = model.Cost
};
}
- public static Component Create(ComponentViewModel model)
- {
- return new Component
- {
- Id = model.Id,
- ComponentName = model.ComponentName,
- Cost = model.Cost
- };
- }
- public void Update(ComponentBindingModel model)
+
+ public void Update(ComponentBindingModel? model)
{
if (model == null)
{
diff --git a/IceCreamShop/IceCreamShopDatabaseImplement/Models/IceCream.cs b/IceCreamShop/IceCreamShopDatabaseImplement/Models/IceCream.cs
index 360940d..88d801c 100644
--- a/IceCreamShop/IceCreamShopDatabaseImplement/Models/IceCream.cs
+++ b/IceCreamShop/IceCreamShopDatabaseImplement/Models/IceCream.cs
@@ -41,7 +41,7 @@ namespace IceCreamShopDatabaseImplement.Models
[ForeignKey("IceCreamId")]
public virtual List Shops { get; set; } = new();
- public static IceCream Create(IceCreamShopDatabase context, IceCreamBindingModel model)
+ public static IceCream? Create(IceCreamShopDatabase context, IceCreamBindingModel model)
{
return new IceCream()
{
diff --git a/IceCreamShop/IceCreamShopDatabaseImplement/Models/Order.cs b/IceCreamShop/IceCreamShopDatabaseImplement/Models/Order.cs
index 9a28952..48dbc8c 100644
--- a/IceCreamShop/IceCreamShopDatabaseImplement/Models/Order.cs
+++ b/IceCreamShop/IceCreamShopDatabaseImplement/Models/Order.cs
@@ -50,6 +50,7 @@ namespace IceCreamShopDatabaseImplement.Models
return;
}
Status = model.Status;
+ DateImplement = model.DateImplement;
}
public OrderViewModel GetViewModel => new()
diff --git a/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs b/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs
index 9938326..9515131 100644
--- a/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs
+++ b/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs
@@ -26,20 +26,19 @@ namespace IceCreamShopFileImplement.Implements
{
return null;
}
- return source.Orders
- .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+ return GetViewModel(source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id)));
}
public List GetFilteredList(OrderSearchModel model)
{
- if (!model.Id.HasValue)
+ if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue)
{
return new();
}
return source.Orders
- .Where(x => x.Id == model.Id)
- .Select(x => x.GetViewModel)
- .ToList();
+ .Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo)
+ .Select(x => x.GetViewModel)
+ .ToList();
}
public List GetFullList()
@@ -69,7 +68,7 @@ namespace IceCreamShopFileImplement.Implements
}
order.Update(model);
source.SaveOrders();
- return order.GetViewModel;
+ return GetViewModel(order);
}
public OrderViewModel? Delete(OrderBindingModel model)
{
@@ -80,7 +79,18 @@ namespace IceCreamShopFileImplement.Implements
}
order.Update(model);
source.SaveOrders();
- return order.GetViewModel;
+ return GetViewModel(order);
+ }
+
+ private OrderViewModel GetViewModel(Order order)
+ {
+ var viewModel = order.GetViewModel;
+ var icecream = source.IceCreams.FirstOrDefault(x => x.Id == order.IceCreamId);
+ if (icecream != null)
+ {
+ viewModel.IceCreamName = icecream.IceCreamName;
+ }
+ return viewModel;
}
private OrderViewModel GetViewModel(Order order)
diff --git a/IceCreamShop/IceCreamShopFileImplement/Models/Order.cs b/IceCreamShop/IceCreamShopFileImplement/Models/Order.cs
index c70e982..4c21b3d 100644
--- a/IceCreamShop/IceCreamShopFileImplement/Models/Order.cs
+++ b/IceCreamShop/IceCreamShopFileImplement/Models/Order.cs
@@ -16,7 +16,6 @@ namespace IceCreamShopFileImplement.Models
{
public int Id { get; private set; }
public int IceCreamId { get; private set; }
- public string IceCreamName { get; private set; } = string.Empty;
public int Count { get; private set; }
@@ -37,7 +36,6 @@ namespace IceCreamShopFileImplement.Models
{
Id = model.Id,
IceCreamId = model.IceCreamId,
- IceCreamName = model.IceCreamName,
Count = model.Count,
Sum = model.Sum,
Status = model.Status,
@@ -55,7 +53,6 @@ namespace IceCreamShopFileImplement.Models
{
Id = Convert.ToInt32(element.Attribute("Id")!.Value),
IceCreamId = Convert.ToInt32(element.Element("IceCreamId")!.Value),
- IceCreamName = element.Element("IceCreamName")!.Value,
Sum = Convert.ToDouble(element.Element("Sum")!.Value),
Count = Convert.ToInt32(element.Element("Count")!.Value),
Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
@@ -69,20 +66,13 @@ namespace IceCreamShopFileImplement.Models
{
return;
}
- Id = model.Id;
- IceCreamId = model.IceCreamId;
- IceCreamName = model.IceCreamName;
- Count = model.Count;
- Sum = model.Sum;
Status = model.Status;
- DateCreate = model.DateCreate;
DateImplement = model.DateImplement;
}
public OrderViewModel GetViewModel => new()
{
Id = Id,
IceCreamId = IceCreamId,
- IceCreamName = IceCreamName,
Count = Count,
Sum = Sum,
Status = Status,
@@ -93,7 +83,6 @@ namespace IceCreamShopFileImplement.Models
"Order",
new XAttribute("Id", Id),
new XElement("IceCreamId", IceCreamId.ToString()),
- new XElement("IceCreamName", IceCreamName),
new XElement("Count", Count.ToString()),
new XElement("Sum", Sum.ToString()),
new XElement("Status", Status.ToString()),
diff --git a/IceCreamShop/IceCreamShopListImplement/Implements/OrderStorage.cs b/IceCreamShop/IceCreamShopListImplement/Implements/OrderStorage.cs
index db75f3f..50b3dd6 100644
--- a/IceCreamShop/IceCreamShopListImplement/Implements/OrderStorage.cs
+++ b/IceCreamShop/IceCreamShopListImplement/Implements/OrderStorage.cs
@@ -27,7 +27,7 @@ namespace IceCreamShopListImplement.Implements
{
var element = _source.Orders[i];
_source.Orders.RemoveAt(i);
- return element.GetViewModel;
+ return GetViewModel(element);
}
}
return null;
@@ -39,7 +39,7 @@ namespace IceCreamShopListImplement.Implements
foreach (var order in _source.Orders)
{
if (order.Id == model.Id)
- return order.GetViewModel;
+ return GetViewModel(order);
}
return null;
}
@@ -51,8 +51,8 @@ namespace IceCreamShopListImplement.Implements
foreach (var order in _source.Orders)
{
- if (order.Id == model.Id)
- result.Add(order.GetViewModel);
+ if (order.Id == model.Id || model.DateFrom <= order.DateCreate && order.DateCreate <= model.DateTo)
+ result.Add(GetViewModel(order));
}
return result;
}
@@ -62,7 +62,7 @@ namespace IceCreamShopListImplement.Implements
var result = new List();
foreach (var order in _source.Orders)
{
- result.Add(order.GetViewModel);
+ result.Add(GetViewModel(order));
}
return result;
}
@@ -83,7 +83,7 @@ namespace IceCreamShopListImplement.Implements
return null;
}
_source.Orders.Add(newOrder);
- return newOrder.GetViewModel;
+ return GetViewModel(newOrder);
}
public OrderViewModel? Update(OrderBindingModel model)
@@ -93,10 +93,24 @@ namespace IceCreamShopListImplement.Implements
if (order.Id == model.Id)
{
order.Update(model);
- return order.GetViewModel;
+ return GetViewModel(order);
}
}
return null;
}
+
+ private OrderViewModel GetViewModel(Order order)
+ {
+ var viewModel = order.GetViewModel;
+ foreach (var icecream in _source.iceCreams)
+ {
+ if (icecream.Id == order.IceCreamId)
+ {
+ viewModel.IceCreamName = icecream.IceCreamName;
+ break;
+ }
+ }
+ return viewModel;
+ }
}
}
diff --git a/IceCreamShop/IceCreamShopListImplement/Models/Order.cs b/IceCreamShop/IceCreamShopListImplement/Models/Order.cs
index 28e3ad5..cb2834e 100644
--- a/IceCreamShop/IceCreamShopListImplement/Models/Order.cs
+++ b/IceCreamShop/IceCreamShopListImplement/Models/Order.cs
@@ -18,8 +18,6 @@ namespace IceCreamShopListImplement.Models
public int IceCreamId { get; private set; }
- public string IceCreamName { get; private set; } = string.Empty;
-
public int Count { get; private set; }
public double Sum { get; private set; }
@@ -37,7 +35,6 @@ namespace IceCreamShopListImplement.Models
{
Id = model.Id,
IceCreamId = model.IceCreamId,
- IceCreamName = model.IceCreamName,
Count = model.Count,
Sum = model.Sum,
Status = model.Status,
@@ -49,13 +46,7 @@ namespace IceCreamShopListImplement.Models
public void Update(OrderBindingModel? model)
{
if (model == null) return;
- Id = model.Id;
- IceCreamId = model.IceCreamId;
- IceCreamName = model.IceCreamName;
- Count = model.Count;
- Sum = model.Sum;
Status = model.Status;
- DateCreate = model.DateCreate;
DateImplement = model.DateImplement;
}
@@ -63,7 +54,6 @@ namespace IceCreamShopListImplement.Models
{
Id = Id,
IceCreamId = IceCreamId,
- IceCreamName = IceCreamName,
Count = Count,
Sum = Sum,
Status = Status,