diff --git a/Bar/BarBusinessLogic/BarBusinessLogic.csproj b/Bar/BarBusinessLogic/BarBusinessLogic.csproj
index 5f24571..978cc54 100644
--- a/Bar/BarBusinessLogic/BarBusinessLogic.csproj
+++ b/Bar/BarBusinessLogic/BarBusinessLogic.csproj
@@ -7,6 +7,7 @@
+
@@ -17,6 +18,7 @@
+
@@ -24,6 +26,7 @@
+
diff --git a/Bar/BarBusinessLogic/BusinessLogics/ReportLogic.cs b/Bar/BarBusinessLogic/BusinessLogics/ReportLogic.cs
new file mode 100644
index 0000000..fdc7180
--- /dev/null
+++ b/Bar/BarBusinessLogic/BusinessLogics/ReportLogic.cs
@@ -0,0 +1,107 @@
+using BarBusinessLogic.OfficePackage.HelperModels;
+using BarBusinessLogic.OfficePackage;
+using BarContracts.BindingModels;
+using BarContracts.BusinessLogicsContracts;
+using BarContracts.SearchModels;
+using BarContracts.StoragesContracts;
+using BarContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarBusinessLogic.BusinessLogics
+{
+ public class ReportLogic : IReportLogic
+ {
+ private readonly IComponentStorage _componentStorage;
+ private readonly ICocktailStorage _cocktailStorage;
+ private readonly IOrderStorage _orderStorage;
+ private readonly AbstractSaveToExcel _saveToExcel;
+ private readonly AbstractSaveToWord _saveToWord;
+ private readonly AbstractSaveToPdf _saveToPdf;
+ public ReportLogic(IComponentStorage componentStorage, ICocktailStorage cocktailStorage, IOrderStorage orderStorage, AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
+ {
+ _componentStorage = componentStorage;
+ _cocktailStorage = cocktailStorage;
+ _orderStorage = orderStorage;
+ _saveToExcel = saveToExcel;
+ _saveToWord = saveToWord;
+ _saveToPdf = saveToPdf;
+ }
+ public List GetCocktailComponent()
+ {
+ var components = _componentStorage.GetFullList();
+ var cocktails = _cocktailStorage.GetFullList();
+ var list = new List();
+
+ foreach (var cocktail in cocktails)
+ {
+ var record = new ReportCocktailComponentViewModel
+ {
+ CocktailName = cocktail.CocktailName,
+ Components = new List>(),
+ TotalCount = 0
+ };
+ foreach (var component in components)
+ {
+ if (cocktail.CocktailComponents.ContainsKey(component.Id))
+ {
+ record.Components.Add(new Tuple(component.ComponentName, cocktail.CocktailComponents[component.Id].Item2));
+ record.TotalCount += cocktail.CocktailComponents[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,
+ CocktailName = x.CocktailName,
+ Status = x.Status.ToString(),
+ Sum = x.Sum
+ }).ToList();
+ }
+
+ public void SaveComponentsToWordFile(ReportBindingModel model)
+ {
+ _saveToWord.CreateDoc(new WordInfo
+ {
+ FileName = model.FileName,
+ Title = "Список коктейлей",
+ Cocktails = _cocktailStorage.GetFullList()
+ });
+ }
+
+ public void SaveCocktailComponentToExcelFile(ReportBindingModel model)
+ {
+ _saveToExcel.CreateReport(new ExcelInfo
+ {
+ FileName = model.FileName,
+ Title = "Список компонентов",
+ CocktailComponents = GetCocktailComponent()
+ });
+ }
+ 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/Bar/BarBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/Bar/BarBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
new file mode 100644
index 0000000..98c4596
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
@@ -0,0 +1,87 @@
+using BarBusinessLogic.OfficePackage.HelperModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarBusinessLogic.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.CocktailComponents)
+ {
+ InsertCellInWorksheet(new ExcelCellParameters
+ {
+ ColumnName = "A",
+ RowIndex = rowIndex,
+ Text = pc.CocktailName,
+ 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);
+ }
+ 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/Bar/BarBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/Bar/BarBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
new file mode 100644
index 0000000..bb716e9
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
@@ -0,0 +1,46 @@
+using BarBusinessLogic.OfficePackage.HelperModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarBusinessLogic.OfficePackage
+{
+ public abstract class AbstractSaveToPdf
+ {
+ public void CreateDoc(PdfInfo info)
+ {
+ CreatePdf(info);
+ CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
+ CreateParagraph(new PdfParagraph { Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
+
+ CreateTable(new List { "2cm", "3cm", "6cm", "3cm", "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.CocktailName, 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);
+ }
+ 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/Bar/BarBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/Bar/BarBusinessLogic/OfficePackage/AbstractSaveToWord.cs
new file mode 100644
index 0000000..d59f2ee
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/AbstractSaveToWord.cs
@@ -0,0 +1,48 @@
+using BarBusinessLogic.OfficePackage.HelperModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarBusinessLogic.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 cocktail in info.Cocktails)
+ {
+ CreateParagraph(new WordParagraph
+ {
+ Texts = new List<(string, WordTextProperties)> {
+ (cocktail.CocktailName, new WordTextProperties { Size = "24", Bold = true}),
+ ("\t"+cocktail.Price.ToString(), new WordTextProperties{Size = "24"})
+ },
+ TextProperties = new WordTextProperties
+ {
+ Size = "24",
+ JustificationType = WordJustificationType.Both
+ }
+ });
+ }
+
+ SaveWord(info);
+ }
+ protected abstract void CreateWord(WordInfo info);
+ protected abstract void CreateParagraph(WordParagraph paragraph);
+ protected abstract void SaveWord(WordInfo info);
+ }
+}
diff --git a/Bar/BarBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs b/Bar/BarBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs
new file mode 100644
index 0000000..8019b95
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarBusinessLogic.OfficePackage.HelperModels
+{
+ public class ExcelCellParameters
+ {
+ public string ColumnName { get; set; } = string.Empty;
+ public uint RowIndex { get; set; }
+ public string Text { get; set; } = string.Empty;
+ public string CellReference => $"{ColumnName}{RowIndex}";
+ public ExcelStyleInfoType StyleInfo { get; set; }
+ }
+}
diff --git a/Bar/BarBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/Bar/BarBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
new file mode 100644
index 0000000..514d148
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BarContracts.ViewModels;
+
+
+namespace BarBusinessLogic.OfficePackage.HelperModels
+{
+ public class ExcelInfo
+ {
+ public string FileName { get; set; } = string.Empty;
+ public string Title { get; set; } = string.Empty;
+ public List CocktailComponents
+ {
+ get;
+ set;
+ } = new();
+ }
+
+}
diff --git a/Bar/BarBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs b/Bar/BarBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs
new file mode 100644
index 0000000..6203d6d
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarBusinessLogic.OfficePackage.HelperModels
+{
+ public class ExcelMergeParameters
+ {
+ public string CellFromName { get; set; } = string.Empty;
+ public string CellToName { get; set; } = string.Empty;
+ public string Merge => $"{CellFromName}:{CellToName}";
+ }
+}
diff --git a/Bar/BarBusinessLogic/OfficePackage/HelperModels/ExcelStyleInfoType.cs b/Bar/BarBusinessLogic/OfficePackage/HelperModels/ExcelStyleInfoType.cs
new file mode 100644
index 0000000..b42f8ae
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/HelperModels/ExcelStyleInfoType.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarBusinessLogic.OfficePackage.HelperModels
+{
+ public enum ExcelStyleInfoType
+ {
+ Title,
+ Text,
+ TextWithBroder
+ }
+
+}
diff --git a/Bar/BarBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs b/Bar/BarBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
new file mode 100644
index 0000000..6b414ff
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
@@ -0,0 +1,19 @@
+using BarContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarBusinessLogic.OfficePackage.HelperModels
+{
+ public class PdfInfo
+ {
+ public string FileName { get; set; } = string.Empty;
+ public string Title { get; set; } = string.Empty;
+ public DateTime DateFrom { get; set; }
+ public DateTime DateTo { get; set; }
+ public List Orders { get; set; } = new();
+ }
+
+}
diff --git a/Bar/BarBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs b/Bar/BarBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
new file mode 100644
index 0000000..3b05a2d
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarBusinessLogic.OfficePackage.HelperModels
+{
+ public class PdfParagraph
+ {
+ public string Text { get; set; } = string.Empty;
+ public string Style { get; set; } = string.Empty;
+ public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
+ }
+
+}
diff --git a/Bar/BarBusinessLogic/OfficePackage/HelperModels/PdfParagraphAlignmentType.cs b/Bar/BarBusinessLogic/OfficePackage/HelperModels/PdfParagraphAlignmentType.cs
new file mode 100644
index 0000000..361a649
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/HelperModels/PdfParagraphAlignmentType.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarBusinessLogic.OfficePackage.HelperModels
+{
+ public enum PdfParagraphAlignmentType
+ {
+ Center,
+ Left,
+ Rigth
+ }
+}
diff --git a/Bar/BarBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs b/Bar/BarBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs
new file mode 100644
index 0000000..1f7ebe4
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarBusinessLogic.OfficePackage.HelperModels
+{
+ public class PdfRowParameters
+ {
+ public List Texts { get; set; } = new();
+ public string Style { get; set; } = string.Empty;
+ public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
+ }
+
+}
diff --git a/Bar/BarBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/Bar/BarBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
new file mode 100644
index 0000000..d4ed4dc
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
@@ -0,0 +1,16 @@
+using BarContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarBusinessLogic.OfficePackage.HelperModels
+{
+ public class WordInfo
+ {
+ public string FileName { get; set; } = string.Empty;
+ public string Title { get; set; } = string.Empty;
+ public List Cocktails { get; set; } = new();
+ }
+}
diff --git a/Bar/BarBusinessLogic/OfficePackage/HelperModels/WordJustificationType.cs b/Bar/BarBusinessLogic/OfficePackage/HelperModels/WordJustificationType.cs
new file mode 100644
index 0000000..7dba3f5
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/HelperModels/WordJustificationType.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarBusinessLogic.OfficePackage.HelperModels
+{
+ public enum WordJustificationType
+ {
+ Center,
+ Both
+ }
+
+}
diff --git a/Bar/BarBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs b/Bar/BarBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
new file mode 100644
index 0000000..9978886
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarBusinessLogic.OfficePackage.HelperModels
+{
+ public class WordParagraph
+ {
+ public List<(string, WordTextProperties)> Texts { get; set; } = new();
+ public WordTextProperties? TextProperties { get; set; }
+ }
+}
diff --git a/Bar/BarBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs b/Bar/BarBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
new file mode 100644
index 0000000..0445dff
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarBusinessLogic.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/Bar/BarBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/Bar/BarBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
new file mode 100644
index 0000000..61bbfc2
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
@@ -0,0 +1,285 @@
+using BarBusinessLogic.OfficePackage.HelperModels;
+using DocumentFormat.OpenXml.Office2010.Excel;
+using DocumentFormat.OpenXml.Office2013.Excel;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
+using DocumentFormat.OpenXml;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarBusinessLogic.OfficePackage.Implements
+{
+ public class SaveToExcel : AbstractSaveToExcel
+ {
+ private SpreadsheetDocument? _spreadsheetDocument;
+ private SharedStringTablePart? _shareStringPart;
+ private Worksheet? _worksheet;
+
+ private static void CreateStyles(WorkbookPart workbookpart)
+ {
+ var sp = workbookpart.AddNewPart();
+ sp.Stylesheet = new Stylesheet();
+
+ var fonts = new Fonts() { Count = 2U, KnownFonts = true };
+
+ var fontUsual = new Font();
+ fontUsual.Append(new FontSize() { Val = 12D });
+ fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
+ fontUsual.Append(new FontName() { Val = "Times New Roman" });
+ fontUsual.Append(new FontFamilyNumbering() { Val = 2 });
+ fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor });
+
+ var fontTitle = new Font();
+ fontTitle.Append(new Bold());
+ fontTitle.Append(new FontSize() { Val = 14D });
+ fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
+ fontTitle.Append(new FontName() { Val = "Times New Roman" });
+ fontTitle.Append(new FontFamilyNumbering() { Val = 2 });
+ fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor });
+
+ fonts.Append(fontUsual);
+ fonts.Append(fontTitle);
+
+ var fills = new Fills() { Count = 2U };
+
+ var fill1 = new Fill();
+ fill1.Append(new PatternFill() { PatternType = PatternValues.None });
+
+ var fill2 = new Fill();
+ fill2.Append(new PatternFill() { PatternType = PatternValues.Gray125 });
+
+ fills.Append(fill1);
+ fills.Append(fill2);
+
+ var borders = new Borders() { Count = 2U };
+
+ var borderNoBorder = new Border();
+ borderNoBorder.Append(new LeftBorder());
+ borderNoBorder.Append(new RightBorder());
+ borderNoBorder.Append(new TopBorder());
+ borderNoBorder.Append(new BottomBorder());
+ borderNoBorder.Append(new DiagonalBorder());
+
+ var borderThin = new Border();
+
+ var leftBorder = new LeftBorder() { Style = BorderStyleValues.Thin };
+ leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+ var rightBorder = new RightBorder() { Style = BorderStyleValues.Thin };
+ rightBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+ var topBorder = new TopBorder() { Style = BorderStyleValues.Thin };
+ topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+ var bottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin };
+ bottomBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
+
+ borderThin.Append(leftBorder);
+ borderThin.Append(rightBorder);
+ borderThin.Append(topBorder);
+ borderThin.Append(bottomBorder);
+ borderThin.Append(new DiagonalBorder());
+
+ borders.Append(borderNoBorder);
+ borders.Append(borderThin);
+
+ var cellStyleFormats = new CellStyleFormats() { Count = 1U };
+ var cellFormatStyle = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U };
+
+ cellStyleFormats.Append(cellFormatStyle);
+
+ var cellFormats = new CellFormats() { Count = 3U };
+ var cellFormatFont = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U, FormatId = 0U, ApplyFont = true };
+ var cellFormatFontAndBorder = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 1U, FormatId = 0U, ApplyFont = true, ApplyBorder = true };
+ var cellFormatTitle = new CellFormat() { NumberFormatId = 0U, FontId = 1U, FillId = 0U, BorderId = 0U, FormatId = 0U, Alignment = new Alignment() { Vertical = VerticalAlignmentValues.Center, WrapText = true, Horizontal = HorizontalAlignmentValues.Center }, ApplyFont = true };
+
+ cellFormats.Append(cellFormatFont);
+ cellFormats.Append(cellFormatFontAndBorder);
+ cellFormats.Append(cellFormatTitle);
+
+ var cellStyles = new CellStyles() { Count = 1U };
+
+ cellStyles.Append(new CellStyle() { Name = "Normal", FormatId = 0U, BuiltinId = 0U });
+
+ var differentialFormats = new DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats() { Count = 0U };
+
+ var tableStyles = new TableStyles() { Count = 0U, DefaultTableStyle = "TableStyleMedium2", DefaultPivotStyle = "PivotStyleLight16" };
+
+ var stylesheetExtensionList = new StylesheetExtensionList();
+
+ var stylesheetExtension1 = new StylesheetExtension() { Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" };
+ stylesheetExtension1.AddNamespaceDeclaration("x14", "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
+ stylesheetExtension1.Append(new SlicerStyles() { DefaultSlicerStyle = "SlicerStyleLight1" });
+
+ var stylesheetExtension2 = new StylesheetExtension() { Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}" };
+ stylesheetExtension2.AddNamespaceDeclaration("x15", "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main");
+ stylesheetExtension2.Append(new TimelineStyles() { DefaultTimelineStyle = "TimeSlicerStyleLight1" });
+
+ stylesheetExtensionList.Append(stylesheetExtension1);
+ stylesheetExtensionList.Append(stylesheetExtension2);
+
+ sp.Stylesheet.Append(fonts);
+ sp.Stylesheet.Append(fills);
+ sp.Stylesheet.Append(borders);
+ sp.Stylesheet.Append(cellStyleFormats);
+ sp.Stylesheet.Append(cellFormats);
+ sp.Stylesheet.Append(cellStyles);
+ sp.Stylesheet.Append(differentialFormats);
+ sp.Stylesheet.Append(tableStyles);
+ sp.Stylesheet.Append(stylesheetExtensionList);
+ }
+
+ private static uint GetStyleValue(ExcelStyleInfoType styleInfo)
+ {
+ return styleInfo switch
+ {
+ ExcelStyleInfoType.Title => 2U,
+ ExcelStyleInfoType.TextWithBroder => 1U,
+ ExcelStyleInfoType.Text => 0U,
+ _ => 0U,
+ };
+ }
+
+ protected override void CreateExcel(ExcelInfo info)
+ {
+ _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook);
+ // Создаем книгу (в ней хранятся листы)
+ var workbookpart = _spreadsheetDocument.AddWorkbookPart();
+ workbookpart.Workbook = new Workbook();
+
+ CreateStyles(workbookpart);
+
+ // Получаем/создаем хранилище текстов для книги
+ _shareStringPart = _spreadsheetDocument.WorkbookPart!.GetPartsOfType().Any()
+ ? _spreadsheetDocument.WorkbookPart.GetPartsOfType().First()
+ : _spreadsheetDocument.WorkbookPart.AddNewPart();
+
+ // Создаем SharedStringTable, если его нет
+ if (_shareStringPart.SharedStringTable == null)
+ {
+ _shareStringPart.SharedStringTable = new SharedStringTable();
+ }
+
+ // Создаем лист в книгу
+ var worksheetPart = workbookpart.AddNewPart();
+ worksheetPart.Worksheet = new Worksheet(new SheetData());
+
+ // Добавляем лист в книгу
+ var sheets = _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
+ var sheet = new Sheet()
+ {
+ Id = _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
+ SheetId = 1,
+ Name = "Лист"
+ };
+ sheets.Append(sheet);
+
+ _worksheet = worksheetPart.Worksheet;
+ }
+
+ protected override void InsertCellInWorksheet(ExcelCellParameters excelParams)
+ {
+ if (_worksheet == null || _shareStringPart == null)
+ {
+ return;
+ }
+ var sheetData = _worksheet.GetFirstChild();
+ if (sheetData == null)
+ {
+ return;
+ }
+
+ // Ищем строку, либо добавляем ее
+ Row row;
+ if (sheetData.Elements().Where(r => r.RowIndex! == excelParams.RowIndex).Any())
+ {
+ row = sheetData.Elements().Where(r => r.RowIndex! == excelParams.RowIndex).First();
+ }
+ else
+ {
+ row = new Row() { RowIndex = excelParams.RowIndex };
+ sheetData.Append(row);
+ }
+
+ // Ищем нужную ячейку
+ Cell cell;
+ if (row.Elements().Where(c => c.CellReference!.Value == excelParams.CellReference).Any())
+ {
+ cell = row.Elements().Where(c => c.CellReference!.Value == excelParams.CellReference).First();
+ }
+ else
+ {
+ // Все ячейки должны быть последовательно друг за другом расположены
+ // нужно определить, после какой вставлять
+ Cell? refCell = null;
+ foreach (Cell rowCell in row.Elements())
+ {
+ if (string.Compare(rowCell.CellReference!.Value, excelParams.CellReference, true) > 0)
+ {
+ refCell = rowCell;
+ break;
+ }
+ }
+
+ var newCell = new Cell() { CellReference = excelParams.CellReference };
+ row.InsertBefore(newCell, refCell);
+
+ cell = newCell;
+ }
+
+ // вставляем новый текст
+ _shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text)));
+ _shareStringPart.SharedStringTable.Save();
+
+ cell.CellValue = new CellValue((_shareStringPart.SharedStringTable.Elements().Count() - 1).ToString());
+ cell.DataType = new EnumValue(CellValues.SharedString);
+ cell.StyleIndex = GetStyleValue(excelParams.StyleInfo);
+ }
+
+ protected override void MergeCells(ExcelMergeParameters excelParams)
+ {
+ if (_worksheet == null)
+ {
+ return;
+ }
+ MergeCells mergeCells;
+
+ if (_worksheet.Elements().Any())
+ {
+ mergeCells = _worksheet.Elements().First();
+ }
+ else
+ {
+ mergeCells = new MergeCells();
+
+ if (_worksheet.Elements().Any())
+ {
+ _worksheet.InsertAfter(mergeCells, _worksheet.Elements().First());
+ }
+ else
+ {
+ _worksheet.InsertAfter(mergeCells, _worksheet.Elements().First());
+ }
+ }
+
+ var mergeCell = new MergeCell()
+ {
+ Reference = new StringValue(excelParams.Merge)
+ };
+ mergeCells.Append(mergeCell);
+ }
+
+ protected override void SaveExcel(ExcelInfo info)
+ {
+ if (_spreadsheetDocument == null)
+ {
+ return;
+ }
+ _spreadsheetDocument.WorkbookPart!.Workbook.Save();
+ _spreadsheetDocument.Dispose();
+ }
+ }
+}
diff --git a/Bar/BarBusinessLogic/OfficePackage/Implements/SaveToPdf.cs b/Bar/BarBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
new file mode 100644
index 0000000..70bade1
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
@@ -0,0 +1,109 @@
+using MigraDoc.DocumentObjectModel;
+using MigraDoc.DocumentObjectModel.Tables;
+using MigraDoc.Rendering;
+using System.Collections.Generic;
+using BarBusinessLogic.OfficePackage;
+using BarBusinessLogic.OfficePackage.HelperModels;
+
+namespace BarBusinessLogic.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/Bar/BarBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/Bar/BarBusinessLogic/OfficePackage/Implements/SaveToWord.cs
new file mode 100644
index 0000000..168929d
--- /dev/null
+++ b/Bar/BarBusinessLogic/OfficePackage/Implements/SaveToWord.cs
@@ -0,0 +1,120 @@
+using BarBusinessLogic.OfficePackage.HelperModels;
+using System;
+using System.Collections.Generic;
+using System.Drawing.Printing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+
+namespace BarBusinessLogic.OfficePackage.Implements
+{
+ public class SaveToWord : AbstractSaveToWord
+ {
+ private WordprocessingDocument? _wordDocument;
+ private Body? _docBody;
+
+ private static JustificationValues GetJustificationValues(WordJustificationType type)
+ {
+ return type switch
+ {
+ WordJustificationType.Both => JustificationValues.Both,
+ WordJustificationType.Center => JustificationValues.Center,
+ _ => JustificationValues.Left,
+ };
+ }
+ private static SectionProperties CreateSectionProperties()
+ {
+ var properties = new SectionProperties();
+
+ var pageSize = new PageSize
+ {
+ Orient = PageOrientationValues.Portrait
+ };
+
+ properties.AppendChild(pageSize);
+
+ return properties;
+ }
+ private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties)
+ {
+ if (paragraphProperties == null)
+ {
+ return null;
+ }
+
+ var properties = new ParagraphProperties();
+
+ properties.AppendChild(new Justification()
+ {
+ Val = GetJustificationValues(paragraphProperties.JustificationType)
+ });
+
+ properties.AppendChild(new SpacingBetweenLines
+ {
+ LineRule = LineSpacingRuleValues.Auto
+ });
+
+ properties.AppendChild(new Indentation());
+
+ var paragraphMarkRunProperties = new ParagraphMarkRunProperties();
+ if (!string.IsNullOrEmpty(paragraphProperties.Size))
+ {
+ paragraphMarkRunProperties.AppendChild(new FontSize { Val = paragraphProperties.Size });
+ }
+ properties.AppendChild(paragraphMarkRunProperties);
+
+ return properties;
+ }
+ protected override void CreateWord(WordInfo info)
+ {
+ _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document);
+ MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
+ mainPart.Document = new Document();
+ _docBody = mainPart.Document.AppendChild(new Body());
+ }
+ protected override void CreateParagraph(WordParagraph paragraph)
+ {
+ if (_docBody == null || paragraph == null)
+ {
+ return;
+ }
+ var docParagraph = new Paragraph();
+
+ docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
+
+ foreach (var run in paragraph.Texts)
+ {
+ var docRun = new Run();
+
+ var properties = new RunProperties();
+ properties.AppendChild(new FontSize { Val = run.Item2.Size });
+ if (run.Item2.Bold)
+ {
+ properties.AppendChild(new Bold());
+ }
+ docRun.AppendChild(properties);
+
+ docRun.AppendChild(new Text { Text = run.Item1, Space = SpaceProcessingModeValues.Preserve });
+
+ docParagraph.AppendChild(docRun);
+ }
+
+ _docBody.AppendChild(docParagraph);
+ }
+ protected override void SaveWord(WordInfo info)
+ {
+ if (_docBody == null || _wordDocument == null)
+ {
+ return;
+ }
+ _docBody.AppendChild(CreateSectionProperties());
+
+ _wordDocument.MainDocumentPart!.Document.Save();
+
+ _wordDocument.Dispose();
+ }
+ }
+}
diff --git a/Bar/BarContracts/BindingModels/ReportBindingModel.cs b/Bar/BarContracts/BindingModels/ReportBindingModel.cs
new file mode 100644
index 0000000..cff2337
--- /dev/null
+++ b/Bar/BarContracts/BindingModels/ReportBindingModel.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarContracts.BindingModels
+{
+ public class ReportBindingModel
+ {
+ public string FileName { get; set; } = string.Empty;
+ public DateTime? DateFrom { get; set; }
+ public DateTime? DateTo { get; set; }
+ }
+}
diff --git a/Bar/BarContracts/BusinessLogicsContracts/IReportLogic.cs b/Bar/BarContracts/BusinessLogicsContracts/IReportLogic.cs
new file mode 100644
index 0000000..178ee5c
--- /dev/null
+++ b/Bar/BarContracts/BusinessLogicsContracts/IReportLogic.cs
@@ -0,0 +1,19 @@
+using BarContracts.BindingModels;
+using BarContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarContracts.BusinessLogicsContracts
+{
+ public interface IReportLogic
+ {
+ List GetCocktailComponent();
+ List GetOrders(ReportBindingModel model);
+ void SaveComponentsToWordFile(ReportBindingModel model);
+ void SaveCocktailComponentToExcelFile(ReportBindingModel model);
+ void SaveOrdersToPdfFile(ReportBindingModel model);
+ }
+}
diff --git a/Bar/BarContracts/SearchModels/OrderSearchModel.cs b/Bar/BarContracts/SearchModels/OrderSearchModel.cs
index 96ee374..61fe50f 100644
--- a/Bar/BarContracts/SearchModels/OrderSearchModel.cs
+++ b/Bar/BarContracts/SearchModels/OrderSearchModel.cs
@@ -9,5 +9,7 @@ namespace BarContracts.SearchModels
public class OrderSearchModel
{
public int? Id { get; set; }
+ public DateTime? DateFrom { get; set; }
+ public DateTime? DateTo { get; set; }
}
}
diff --git a/Bar/BarContracts/ViewModels/ReportCocktailComponentViewModel.cs b/Bar/BarContracts/ViewModels/ReportCocktailComponentViewModel.cs
new file mode 100644
index 0000000..b2dacf5
--- /dev/null
+++ b/Bar/BarContracts/ViewModels/ReportCocktailComponentViewModel.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarContracts.ViewModels
+{
+ public class ReportCocktailComponentViewModel
+ {
+ public string CocktailName { get; set; } = string.Empty;
+ public int TotalCount { get; set; }
+ public List> Components { get; set; } = new();
+ }
+
+}
diff --git a/Bar/BarContracts/ViewModels/ReportOrdersViewModel.cs b/Bar/BarContracts/ViewModels/ReportOrdersViewModel.cs
new file mode 100644
index 0000000..1715424
--- /dev/null
+++ b/Bar/BarContracts/ViewModels/ReportOrdersViewModel.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarContracts.ViewModels
+{
+ public class ReportOrdersViewModel
+ {
+ public int Id { get; set; }
+ public DateTime DateCreate { get; set; }
+ public string CocktailName { get; set; } = string.Empty;
+ public double Sum { get; set; }
+ public string Status { get; set; } = string.Empty;
+ }
+
+}
diff --git a/Bar/BarDatabaseImplement/BarDatabase.cs b/Bar/BarDatabaseImplement/BarDatabase.cs
index 4820998..f4126ec 100644
--- a/Bar/BarDatabaseImplement/BarDatabase.cs
+++ b/Bar/BarDatabaseImplement/BarDatabase.cs
@@ -14,7 +14,7 @@ namespace BarDatabaseImplement
{
if (optionsBuilder.IsConfigured == false)
{
- optionsBuilder.UseSqlServer(@"Data Source=localhost\SQLEXPRESS;Initial Catalog=BarDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True",
+ optionsBuilder.UseSqlServer(@"Data Source=.\SQLEXPRESS;Initial Catalog=BarDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True",
options => options.EnableRetryOnFailure(
maxRetryCount: 5,
maxRetryDelay: System.TimeSpan.FromSeconds(30),
diff --git a/Bar/BarDatabaseImplement/Implements/OrderStorage.cs b/Bar/BarDatabaseImplement/Implements/OrderStorage.cs
index 9b1b1ef..328d327 100644
--- a/Bar/BarDatabaseImplement/Implements/OrderStorage.cs
+++ b/Bar/BarDatabaseImplement/Implements/OrderStorage.cs
@@ -21,12 +21,15 @@ namespace BarDatabaseImplement.Implements
}
public List GetFilteredList(OrderSearchModel model)
{
- if (!model.Id.HasValue)
+ if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue)
{
return new();
}
using var context = new BarDatabase();
- return context.Orders.Where(x => x.Id == model.Id).Select(x => AcessCocktailsStorage(x.GetViewModel)).ToList();
+ if (model.Id.HasValue)
+ return context.Orders.Where(x => x.Id == model.Id).Select(x => AcessCocktailsStorage(x.GetViewModel)).ToList();
+ else
+ return context.Orders.Where(x => x.DateCreate >= model.DateFrom).Where(x => x.DateCreate <= model.DateTo).Select(x => AcessCocktailsStorage(x.GetViewModel)).ToList();
}
public OrderViewModel? GetElement(OrderSearchModel model)
{
diff --git a/Bar/BarFileImplement/Implements/OrderStorage.cs b/Bar/BarFileImplement/Implements/OrderStorage.cs
index 73c56a2..7e7072b 100644
--- a/Bar/BarFileImplement/Implements/OrderStorage.cs
+++ b/Bar/BarFileImplement/Implements/OrderStorage.cs
@@ -25,9 +25,13 @@ namespace BarFileImplement.Implements
}
public List GetFilteredList(OrderSearchModel model)
{
- return source.Orders.Where(x => x.Id == model.Id)
+ if (model.Id.HasValue)
+ return source.Orders.Where(x => x.Id == model.Id)
.Select(x => AcessCocktailsStorage(x.GetViewModel))
.ToList();
+ else
+ return source.Orders.Where(x => x.DateCreate >= model.DateFrom).Where(x => x.DateCreate <= model.DateTo).Select(x => AcessCocktailsStorage(x.GetViewModel)).ToList();
+
}
public OrderViewModel? GetElement(OrderSearchModel model)
{
diff --git a/Bar/BarListImplement/Implements/OrderStorage.cs b/Bar/BarListImplement/Implements/OrderStorage.cs
index 7fe7513..89f2e93 100644
--- a/Bar/BarListImplement/Implements/OrderStorage.cs
+++ b/Bar/BarListImplement/Implements/OrderStorage.cs
@@ -38,7 +38,11 @@ namespace BarListImplement.Implements
}
foreach (var order in _source.Orders)
{
- if (order.Id == model.Id)
+ if (model.Id.HasValue && order.Id == model.Id)
+ {
+ result.Add(AccessCocktailStorage(order.GetViewModel));
+ }
+ else if (model.DateFrom.HasValue && model.DateFrom <= order.DateCreate && model.DateTo >= order.DateCreate)
{
result.Add(AccessCocktailStorage(order.GetViewModel));
}
@@ -106,11 +110,11 @@ namespace BarListImplement.Implements
public OrderViewModel AccessCocktailStorage(OrderViewModel model)
{
- foreach (var cocktail in _source.Cocktails)
+ foreach (var cockTail in _source.Cocktails)
{
- if (cocktail.Id == model.CocktailId)
+ if (cockTail.Id == model.CocktailId)
{
- model.CocktailName = cocktail.CocktailName;
+ model.CocktailName = cockTail.CocktailName;
break;
}
}
diff --git a/Bar/BarView/BarView.csproj b/Bar/BarView/BarView.csproj
index b764f3f..b1f842a 100644
--- a/Bar/BarView/BarView.csproj
+++ b/Bar/BarView/BarView.csproj
@@ -23,6 +23,7 @@
+
@@ -34,6 +35,8 @@
+
+
| | |
diff --git a/Bar/BarView/FormCocktail.Designer.cs b/Bar/BarView/FormCocktail.Designer.cs
index 7619433..d3acf48 100644
--- a/Bar/BarView/FormCocktail.Designer.cs
+++ b/Bar/BarView/FormCocktail.Designer.cs
@@ -163,7 +163,7 @@
buttonCancel.Text = "Отмена";
buttonCancel.UseVisualStyleBackColor = true;
buttonCancel.Click += ButtonCancel_Click;
- //
+ //
// id
//
id.HeaderText = "id";
diff --git a/Bar/BarView/FormCreateOrder.Designer.cs b/Bar/BarView/FormCreateOrder.Designer.cs
index c4d8c10..d9b1452 100644
--- a/Bar/BarView/FormCreateOrder.Designer.cs
+++ b/Bar/BarView/FormCreateOrder.Designer.cs
@@ -45,7 +45,7 @@
label1.Name = "label1";
label1.Size = new Size(56, 15);
label1.TabIndex = 0;
- label1.Text = "Коктейль:";
+ label1.Text = "Изделие:";
//
// label2
//
@@ -108,7 +108,7 @@
comboBoxCocktail.Name = "comboBoxCocktail";
comboBoxCocktail.Size = new Size(207, 23);
comboBoxCocktail.TabIndex = 8;
- comboBoxCocktail.SelectedIndexChanged += comboBoxCocktail_SelectedIndexChanged;
+ comboBoxCocktail.SelectedIndexChanged += comboBoxComputer_SelectedIndexChanged;
//
// FormCreateOrder
//
diff --git a/Bar/BarView/FormMain.Designer.cs b/Bar/BarView/FormMain.Designer.cs
index 0ecf790..3236259 100644
--- a/Bar/BarView/FormMain.Designer.cs
+++ b/Bar/BarView/FormMain.Designer.cs
@@ -38,6 +38,10 @@
компонентыToolStripMenuItem = new ToolStripMenuItem();
компонентыToolStripMenuItem1 = new ToolStripMenuItem();
коктейлиToolStripMenuItem = new ToolStripMenuItem();
+ отчетыToolStripMenuItem = new ToolStripMenuItem();
+ ComponentsToolStripMenuItem = new ToolStripMenuItem();
+ ComponentCocktailToolStripMenuItem = new ToolStripMenuItem();
+ OrdersToolStripMenuItem = new ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
menuStrip.SuspendLayout();
SuspendLayout();
@@ -104,7 +108,7 @@
//
// menuStrip
//
- menuStrip.Items.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem });
+ menuStrip.Items.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, отчетыToolStripMenuItem });
menuStrip.Location = new Point(0, 0);
menuStrip.Name = "menuStrip";
menuStrip.Size = new Size(921, 24);
@@ -132,6 +136,34 @@
коктейлиToolStripMenuItem.Text = "Коктейли";
коктейлиToolStripMenuItem.Click += КоктейлиToolStripMenuItem_Click;
//
+ // отчетыToolStripMenuItem
+ //
+ отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsToolStripMenuItem, ComponentCocktailToolStripMenuItem, OrdersToolStripMenuItem });
+ отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
+ отчетыToolStripMenuItem.Size = new Size(60, 20);
+ отчетыToolStripMenuItem.Text = "Отчеты";
+ //
+ // ComponentsToolStripMenuItem
+ //
+ ComponentsToolStripMenuItem.Name = "ComponentsToolStripMenuItem";
+ ComponentsToolStripMenuItem.Size = new Size(218, 22);
+ ComponentsToolStripMenuItem.Text = "Список компонентов";
+ ComponentsToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
+ //
+ // ComponentCocktailToolStripMenuItem
+ //
+ ComponentCocktailToolStripMenuItem.Name = "ComponentCocktailToolStripMenuItem";
+ ComponentCocktailToolStripMenuItem.Size = new Size(218, 22);
+ ComponentCocktailToolStripMenuItem.Text = "Компоненты по коктейлим";
+ ComponentCocktailToolStripMenuItem.Click += ComponentCocktailToolStripMenuItem_Click;
+ //
+ // OrdersToolStripMenuItem
+ //
+ OrdersToolStripMenuItem.Name = "OrdersToolStripMenuItem";
+ OrdersToolStripMenuItem.Size = new Size(218, 22);
+ OrdersToolStripMenuItem.Text = "Список заказов";
+ OrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
+ //
// FormMain
//
AutoScaleDimensions = new SizeF(7F, 15F);
@@ -166,5 +198,9 @@
private ToolStripMenuItem компонентыToolStripMenuItem;
private ToolStripMenuItem компонентыToolStripMenuItem1;
private ToolStripMenuItem коктейлиToolStripMenuItem;
+ private ToolStripMenuItem отчетыToolStripMenuItem;
+ private ToolStripMenuItem ComponentsToolStripMenuItem;
+ private ToolStripMenuItem ComponentCocktailToolStripMenuItem;
+ private ToolStripMenuItem OrdersToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/Bar/BarView/FormMain.cs b/Bar/BarView/FormMain.cs
index 6c43ba3..5807de5 100644
--- a/Bar/BarView/FormMain.cs
+++ b/Bar/BarView/FormMain.cs
@@ -1,4 +1,5 @@
-using BarContracts.BindingModels;
+using BarBusinessLogic;
+using BarContracts.BindingModels;
using BarContracts.BusinessLogicsContracts;
using BarDataModels.Enums;
using Microsoft.Extensions.Logging;
@@ -10,11 +11,13 @@ namespace BarView
{
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)
{
@@ -30,7 +33,6 @@ namespace BarView
{
dataGridView.DataSource = list;
dataGridView.Columns["CocktailId"].Visible = false;
- dataGridView.Columns["CocktailName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
}
_logger.LogInformation("Загрузка заказов");
}
@@ -81,7 +83,7 @@ namespace BarView
DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),
};
}
-
+
private void ButtonTakeOrderInWork_Click(object sender, EventArgs e)
{
if (dataGridView.SelectedRows.Count == 1)
@@ -161,6 +163,34 @@ namespace BarView
{
LoadData();
}
+
+ private void ComponentsToolStripMenuItem_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 ComponentCocktailToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportCocktailComponents));
+ if (service is FormReportCocktailComponents 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();
+ }
+ }
}
}
diff --git a/Bar/BarView/FormReportCocktailComponents.Designer.cs b/Bar/BarView/FormReportCocktailComponents.Designer.cs
new file mode 100644
index 0000000..6ed2cce
--- /dev/null
+++ b/Bar/BarView/FormReportCocktailComponents.Designer.cs
@@ -0,0 +1,102 @@
+namespace BarView
+{
+ partial class FormReportCocktailComponents
+ {
+ ///
+ /// 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()
+ {
+ dataGridView = new DataGridView();
+ ComponentName = new DataGridViewTextBoxColumn();
+ CocktailName = new DataGridViewTextBoxColumn();
+ Amount = new DataGridViewTextBoxColumn();
+ ButtonSaveToExcel = new Button();
+ ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+ SuspendLayout();
+ //
+ // dataGridView
+ //
+ dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ dataGridView.Columns.AddRange(new DataGridViewColumn[] { ComponentName, CocktailName, Amount });
+ dataGridView.Location = new Point(3, 43);
+ dataGridView.Name = "dataGridView";
+ dataGridView.RowTemplate.Height = 25;
+ dataGridView.Size = new Size(794, 385);
+ dataGridView.TabIndex = 0;
+ //
+ // ComponentName
+ //
+ ComponentName.HeaderText = "Компонент";
+ ComponentName.Name = "ComponentName";
+ ComponentName.ReadOnly = true;
+ ComponentName.Width = 250;
+ //
+ // CocktailName
+ //
+ CocktailName.HeaderText = "Коктейль";
+ CocktailName.Name = "CocktailName";
+ CocktailName.ReadOnly = true;
+ CocktailName.Width = 250;
+ //
+ // Amount
+ //
+ Amount.HeaderText = "Количество";
+ Amount.Name = "Amount";
+ Amount.ReadOnly = true;
+ Amount.Width = 250;
+ //
+ // ButtonSaveToExcel
+ //
+ ButtonSaveToExcel.Location = new Point(12, 14);
+ ButtonSaveToExcel.Name = "ButtonSaveToExcel";
+ ButtonSaveToExcel.Size = new Size(152, 23);
+ ButtonSaveToExcel.TabIndex = 1;
+ ButtonSaveToExcel.Text = "Сохранить в Excel";
+ ButtonSaveToExcel.UseVisualStyleBackColor = true;
+ ButtonSaveToExcel.Click += ButtonSaveToExcel_Click;
+ //
+ // FormReportCocktailComponents
+ //
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(800, 450);
+ Controls.Add(ButtonSaveToExcel);
+ Controls.Add(dataGridView);
+ Name = "FormReportCocktailComponents";
+ Text = "FormReportCocktailComponents";
+ Load += FormReportCocktailComponents_Load;
+ ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private DataGridView dataGridView;
+ private Button ButtonSaveToExcel;
+ private DataGridViewTextBoxColumn ComponentName;
+ private DataGridViewTextBoxColumn CocktailName;
+ private DataGridViewTextBoxColumn Amount;
+ }
+}
\ No newline at end of file
diff --git a/Bar/BarView/FormReportCocktailComponents.cs b/Bar/BarView/FormReportCocktailComponents.cs
new file mode 100644
index 0000000..b5824e1
--- /dev/null
+++ b/Bar/BarView/FormReportCocktailComponents.cs
@@ -0,0 +1,83 @@
+using BarContracts.BindingModels;
+using BarContracts.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 BarView
+{
+ public partial class FormReportCocktailComponents : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IReportLogic _logic;
+ public FormReportCocktailComponents(ILogger
+ logger, IReportLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ }
+ private void FormReportCocktailComponents_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ var dict = _logic.GetCocktailComponent();
+ if (dict != null)
+ {
+ dataGridView.Rows.Clear();
+ foreach (var elem in dict)
+ {
+ dataGridView.Rows.Add(new object[] { elem.CocktailName, "", "" });
+ 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