diff --git a/RenovationWork/RenovationWorkBusinessLogic/BusinessLogic/ReportLogic.cs b/RenovationWork/RenovationWorkBusinessLogic/BusinessLogic/ReportLogic.cs
new file mode 100644
index 0000000..3798896
--- /dev/null
+++ b/RenovationWork/RenovationWorkBusinessLogic/BusinessLogic/ReportLogic.cs
@@ -0,0 +1,143 @@
+using RenovationWorkBusinessLogic.OfficePackage.HelperModels;
+using RenovationWorkBusinessLogic.OfficePackage;
+using RenovationWorkContracts.BindingModels;
+using RenovationWorkContracts.BusinessLogicsContracts;
+using RenovationWorkContracts.SeatchModels;
+using RenovationWorkContracts.StorageContracts;
+using RenovationWorkContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RenovationWorkBusinessLogic.BusinessLogic
+{
+ public class ReportLogic : IReportLogic
+ {
+ private readonly IComponentStorage _componentStorage;
+
+ private readonly IRepairStorage _RepairStorage;
+
+ private readonly IOrderStorage _orderStorage;
+
+ private readonly AbstractSaveToExcel _saveToExcel;
+
+ private readonly AbstractSaveToWord _saveToWord;
+
+ private readonly AbstractSaveToPdf _saveToPdf;
+
+ public ReportLogic(IRepairStorage RepairStorage, IComponentStorage componentStorage, IOrderStorage orderStorage,
+ AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
+ {
+ _RepairStorage = RepairStorage;
+ _componentStorage = componentStorage;
+ _orderStorage = orderStorage;
+
+ _saveToExcel = saveToExcel;
+ _saveToWord = saveToWord;
+ _saveToPdf = saveToPdf;
+ }
+
+ ///
+ /// Получение списка компонент с указанием, в каких изделиях используются
+ ///
+ ///
+ public List GetRepairComponent()
+ {
+ var components = _componentStorage.GetFullList();
+
+ var Repairs = _RepairStorage.GetFullList();
+
+ var list = new List();
+
+ foreach (var Repair in Repairs)
+ {
+ var record = new ReportRepairComponentViewModel
+ {
+ RepairName = Repair.RepairName,
+ Components = new List<(string Component, int Count)>(),
+ TotalCount = 0
+ };
+ foreach (var component in components)
+ {
+ if (Repair.RepairComponents.ContainsKey(component.Id))
+ {
+ record.Components.Add(new(component.ComponentName, Repair.RepairComponents[component.Id].Item2));
+ record.TotalCount += Repair.RepairComponents[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,
+ RepairName = x.RepairName,
+ Status = x.Status.ToString(),
+ Sum = x.Sum
+ })
+ .ToList();
+ }
+
+ ///
+ /// Сохранение компонент в файл-Word
+ ///
+ ///
+ public void SaveRepairsToWordFile(ReportBindingModel model)
+ {
+ _saveToWord.CreateDoc(new WordInfo
+ {
+ FileName = model.FileName,
+ Title = "Список ремонтных работ",
+ Repairs = _RepairStorage.GetFullList()
+ });
+ }
+
+
+ ///
+ /// Сохранение компонент с указаеним продуктов в файл-Excel
+ ///
+ ///
+ public void SaveRepairComponentToExcelFile(ReportBindingModel model)
+ {
+ _saveToExcel.CreateReport(new ExcelInfo
+ {
+ FileName = model.FileName,
+ Title = "Список компонент",
+ RepairComponents = GetRepairComponent()
+ });
+ }
+
+ ///
+ /// Сохранение заказов в файл-Pdf
+ ///
+ ///
+ public void SaveOrdersToPdfFile(ReportBindingModel model)
+ {
+ _saveToPdf.CreateDoc(new PdfInfo
+ {
+ FileName = model.FileName,
+ Title = "Список заказов",
+ //DateFrom = model.DateFrom!.Value,
+ //DateTo = model.DateTo!.Value,
+ DateFrom = DateTime.SpecifyKind(model.DateFrom!.Value, DateTimeKind.Utc),
+ DateTo = DateTime.SpecifyKind(model.DateTo!.Value, DateTimeKind.Utc),
+ Orders = GetOrders(model)
+ });
+ }
+ }
+}
diff --git a/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
index 30a5f39..80936ce 100644
--- a/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
+++ b/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
@@ -39,19 +39,19 @@ namespace RenovationWorkBusinessLogic.OfficePackage
{
ColumnName = "A",
RowIndex = rowIndex,
- Text = pc.ComponentName,
+ Text = pc.RepairName,
StyleInfo = ExcelStyleInfoType.Text
});
rowIndex++;
- foreach (var (Repair, Count) in pc.Repairs)
+ foreach (var (Component, Count) in pc.Components)
{
InsertCellInWorksheet(new ExcelCellParameters
{
ColumnName = "B",
RowIndex = rowIndex,
- Text = Repair,
- StyleInfo = ExcelStyleInfoType.TextWithBroder
+ Text = Component,
+ StyleInfo = ExcelStyleInfoType.TextWithBorder
});
InsertCellInWorksheet(new ExcelCellParameters
@@ -59,7 +59,7 @@ namespace RenovationWorkBusinessLogic.OfficePackage
ColumnName = "C",
RowIndex = rowIndex,
Text = Count.ToString(),
- StyleInfo = ExcelStyleInfoType.TextWithBroder
+ StyleInfo = ExcelStyleInfoType.TextWithBorder
});
rowIndex++;
diff --git a/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/AbstractSaveToWord.cs
index 3596a20..f1ab462 100644
--- a/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/AbstractSaveToWord.cs
+++ b/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/AbstractSaveToWord.cs
@@ -24,11 +24,14 @@ namespace RenovationWorkBusinessLogic.OfficePackage
}
});
- foreach (var component in info.Components)
+ foreach (var component in info.Repairs)
{
CreateParagraph(new WordParagraph
{
- Texts = new List<(string, WordTextProperties)> { (component.ComponentName, new WordTextProperties { Size = "24", }) },
+ Texts = new List<(string, WordTextProperties)> {
+ (component.RepairName, new WordTextProperties { Size = "24", Bold = true }),
+ (" " + component.Price.ToString(), new WordTextProperties { Size = "24" })
+ },
TextProperties = new WordTextProperties
{
Size = "24",
diff --git a/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs b/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
index 5631104..7b7d412 100644
--- a/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
+++ b/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
@@ -6,6 +6,6 @@
Text,
- TextWithBroder
+ TextWithBorder
}
}
diff --git a/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
index 56f1de7..8d7659a 100644
--- a/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
+++ b/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
@@ -14,5 +14,6 @@ namespace RenovationWorkBusinessLogic.OfficePackage.HelperModels
public string Title { get; set; } = string.Empty;
public List Components { get; set; } = new();
+ public List Repairs { get; set; } = new();
}
}
diff --git a/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
index 8f0f7d0..3275dd6 100644
--- a/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
+++ b/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
@@ -25,105 +25,149 @@ namespace RenovationWorkBusinessLogic.OfficePackage.Implements
{
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 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 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 });
-
+ 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 });
-
+ 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 });
-
+ 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 };
-
+ 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 };
-
+ 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" };
+ 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}" };
+ 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}" };
+ 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" });
-
+ stylesheetExtension2.Append(new TimelineStyles()
+ {
+ DefaultTimelineStyle = "TimeSlicerStyleLight1"
+ });
stylesheetExtensionList.Append(stylesheetExtension1);
stylesheetExtensionList.Append(stylesheetExtension2);
-
sp.Stylesheet.Append(fonts);
sp.Stylesheet.Append(fills);
sp.Stylesheet.Append(borders);
@@ -135,17 +179,12 @@ namespace RenovationWorkBusinessLogic.OfficePackage.Implements
sp.Stylesheet.Append(stylesheetExtensionList);
}
- ///
- /// Получение номера стиля из типа
- ///
- ///
- ///
private static uint GetStyleValue(ExcelStyleInfoType styleInfo)
{
return styleInfo switch
{
ExcelStyleInfoType.Title => 2U,
- ExcelStyleInfoType.TextWithBroder => 1U,
+ ExcelStyleInfoType.TextWithBorder => 1U,
ExcelStyleInfoType.Text => 0U,
_ => 0U,
};
@@ -153,29 +192,26 @@ namespace RenovationWorkBusinessLogic.OfficePackage.Implements
protected override void CreateExcel(ExcelInfo info)
{
- _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook);
- // Создаем книгу (в ней хранятся листы)
+ _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName,
+ SpreadsheetDocumentType.Workbook);
+
var workbookpart = _spreadsheetDocument.AddWorkbookPart();
- workbookpart.Workbook = new Workbook();
+ workbookpart.Workbook = new Workbook(); CreateStyles(workbookpart);
- CreateStyles(workbookpart);
-
- // Получаем/создаем хранилище текстов для книги
_shareStringPart = _spreadsheetDocument.WorkbookPart!.GetPartsOfType().Any()
- ? _spreadsheetDocument.WorkbookPart.GetPartsOfType().First()
- : _spreadsheetDocument.WorkbookPart.AddNewPart();
+ ?
+ _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()
{
@@ -184,7 +220,6 @@ namespace RenovationWorkBusinessLogic.OfficePackage.Implements
Name = "Лист"
};
sheets.Append(sheet);
-
_worksheet = worksheetPart.Worksheet;
}
@@ -200,7 +235,6 @@ namespace RenovationWorkBusinessLogic.OfficePackage.Implements
return;
}
- // Ищем строку, либо добавляем ее
Row row;
if (sheetData.Elements().Where(r => r.RowIndex! == excelParams.RowIndex).Any())
{
@@ -212,7 +246,6 @@ namespace RenovationWorkBusinessLogic.OfficePackage.Implements
sheetData.Append(row);
}
- // Ищем нужную ячейку
Cell cell;
if (row.Elements().Where(c => c.CellReference!.Value == excelParams.CellReference).Any())
{
@@ -220,8 +253,6 @@ namespace RenovationWorkBusinessLogic.OfficePackage.Implements
}
else
{
- // Все ячейки должны быть последовательно друг за другом расположены
- // нужно определить, после какой вставлять
Cell? refCell = null;
foreach (Cell rowCell in row.Elements| ())
{
@@ -231,17 +262,16 @@ namespace RenovationWorkBusinessLogic.OfficePackage.Implements
break;
}
}
-
- var newCell = new Cell() { CellReference = excelParams.CellReference };
+ 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);
@@ -254,7 +284,6 @@ namespace RenovationWorkBusinessLogic.OfficePackage.Implements
return;
}
MergeCells mergeCells;
-
if (_worksheet.Elements().Any())
{
mergeCells = _worksheet.Elements().First();
@@ -262,7 +291,6 @@ namespace RenovationWorkBusinessLogic.OfficePackage.Implements
else
{
mergeCells = new MergeCells();
-
if (_worksheet.Elements().Any())
{
_worksheet.InsertAfter(mergeCells, _worksheet.Elements().First());
@@ -272,7 +300,6 @@ namespace RenovationWorkBusinessLogic.OfficePackage.Implements
_worksheet.InsertAfter(mergeCells, _worksheet.Elements().First());
}
}
-
var mergeCell = new MergeCell()
{
Reference = new StringValue(excelParams.Merge)
diff --git a/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/Implements/SaveToWord.cs
index 622e6b5..7181c23 100644
--- a/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/Implements/SaveToWord.cs
+++ b/RenovationWork/RenovationWorkBusinessLogic/OfficePackage/Implements/SaveToWord.cs
@@ -98,11 +98,9 @@ namespace RenovationWorkBusinessLogic.OfficePackage.Implements
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)
@@ -110,12 +108,13 @@ namespace RenovationWorkBusinessLogic.OfficePackage.Implements
properties.AppendChild(new Bold());
}
docRun.AppendChild(properties);
-
- docRun.AppendChild(new Text { Text = run.Item1, Space = SpaceProcessingModeValues.Preserve });
-
+ docRun.AppendChild(new Text
+ {
+ Text = run.Item1,
+ Space = SpaceProcessingModeValues.Preserve
+ });
docParagraph.AppendChild(docRun);
}
-
_docBody.AppendChild(docParagraph);
}
diff --git a/RenovationWork/RenovationWorkContracts/BusinessLogicsContracts/IReportLogic.cs b/RenovationWork/RenovationWorkContracts/BusinessLogicsContracts/IReportLogic.cs
index 681612e..24b09b5 100644
--- a/RenovationWork/RenovationWorkContracts/BusinessLogicsContracts/IReportLogic.cs
+++ b/RenovationWork/RenovationWorkContracts/BusinessLogicsContracts/IReportLogic.cs
@@ -10,35 +10,17 @@ namespace RenovationWorkContracts.BusinessLogicsContracts
{
public interface IReportLogic
{
- ///
- /// Получение списка компонент с указанием, в каких изделиях используются
- ///
- ///
+
List GetRepairComponent();
- ///
- /// Получение списка заказов за определенный период
- ///
- ///
- ///
+
List GetOrders(ReportBindingModel model);
- ///
- /// Сохранение компонент в файл-Word
- ///
- ///
- void SaveComponentsToWordFile(ReportBindingModel model);
+ void SaveRepairsToWordFile(ReportBindingModel model);
- ///
- /// Сохранение компонент с указаеним продуктов в файл-Excel
- ///
- ///
void SaveRepairComponentToExcelFile(ReportBindingModel model);
- ///
- /// Сохранение заказов в файл-Pdf
- ///
- ///
+
void SaveOrdersToPdfFile(ReportBindingModel model);
}
}
diff --git a/RenovationWork/RenovationWorkContracts/ViewModels/ComponentViewModel.cs b/RenovationWork/RenovationWorkContracts/ViewModels/ComponentViewModel.cs
index 3889889..e230a21 100644
--- a/RenovationWork/RenovationWorkContracts/ViewModels/ComponentViewModel.cs
+++ b/RenovationWork/RenovationWorkContracts/ViewModels/ComponentViewModel.cs
@@ -14,7 +14,10 @@ namespace RenovationWorkContracts.ViewModels
[DisplayName("Название компонента")]
public string ComponentName { get; set; } = string.Empty;
[DisplayName("Цена")]
+
public double Cost { get; set; }
+ [DisplayName("Название изделия")]
+ public string RepairName { get; set; } = string.Empty;
}
}
diff --git a/RenovationWork/RenovationWorkContracts/ViewModels/RepairViewModel.cs b/RenovationWork/RenovationWorkContracts/ViewModels/RepairViewModel.cs
index d391169..c416b16 100644
--- a/RenovationWork/RenovationWorkContracts/ViewModels/RepairViewModel.cs
+++ b/RenovationWork/RenovationWorkContracts/ViewModels/RepairViewModel.cs
@@ -15,10 +15,7 @@ namespace RenovationWorkContracts.ViewModels
public string RepairName { get; set; } = string.Empty;
[DisplayName("Цена")]
public double Price { get; set; }
- public Dictionary RepairComponents
- {
- get;
- set;
- }
+ public Dictionary RepairComponents { get; set; } = new();
+
}
}
diff --git a/RenovationWork/RenovationWorkContracts/ViewModels/ReportOrdersViewModel.cs b/RenovationWork/RenovationWorkContracts/ViewModels/ReportOrdersViewModel.cs
index f21057e..1442b26 100644
--- a/RenovationWork/RenovationWorkContracts/ViewModels/ReportOrdersViewModel.cs
+++ b/RenovationWork/RenovationWorkContracts/ViewModels/ReportOrdersViewModel.cs
@@ -9,7 +9,7 @@ namespace RenovationWorkContracts.ViewModels
public class ReportOrdersViewModel
{
public int Id { get; set; }
-
+ public string Status { get; set; } = string.Empty;
public DateTime DateCreate { get; set; }
public string RepairName { get; set; } = string.Empty;
diff --git a/RenovationWork/RenovationWorkContracts/ViewModels/ReportRepairComponentViewModel.cs b/RenovationWork/RenovationWorkContracts/ViewModels/ReportRepairComponentViewModel.cs
index 4b238b5..d9d2596 100644
--- a/RenovationWork/RenovationWorkContracts/ViewModels/ReportRepairComponentViewModel.cs
+++ b/RenovationWork/RenovationWorkContracts/ViewModels/ReportRepairComponentViewModel.cs
@@ -8,10 +8,10 @@ namespace RenovationWorkContracts.ViewModels
{
public class ReportRepairComponentViewModel
{
- public string ComponentName { get; set; } = string.Empty;
+ public string RepairName { get; set; } = string.Empty;
public int TotalCount { get; set; }
- public List<(string Repair, int Count)> Repairs { get; set; } = new();
+ public List<(string Component, int Count)> Components { get; set; } = new();
}
}
diff --git a/RenovationWork/RenovationWorkDatabaseImplement/Implements/OrderStorage.cs b/RenovationWork/RenovationWorkDatabaseImplement/Implements/OrderStorage.cs
index 36fbcb0..3211204 100644
--- a/RenovationWork/RenovationWorkDatabaseImplement/Implements/OrderStorage.cs
+++ b/RenovationWork/RenovationWorkDatabaseImplement/Implements/OrderStorage.cs
@@ -1,4 +1,5 @@
-using RenovationWorkContracts.BindingModels;
+using Microsoft.EntityFrameworkCore;
+using RenovationWorkContracts.BindingModels;
using RenovationWorkContracts.SeatchModels;
using RenovationWorkContracts.StorageContracts;
using RenovationWorkContracts.ViewModels;
@@ -44,21 +45,24 @@ namespace RenovationWorkDatabaseImplement.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 RenovationWorkDatabase();
- return context.Orders.Where(x => x.Id == model.Id).Select(x => GetViewModel(x)).ToList();
+ return context.Orders.Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo).Select(x => GetViewModel(x)).ToList();
+
}
public List GetFullList()
{
using var context = new RenovationWorkDatabase();
-
- return context.Orders.Select(x => GetViewModel(x)).ToList();
+ return context.Orders
+ .Include(x => x.Repair)
+ .Select(x => x.GetViewModel)
+ .ToList();
}
public OrderViewModel? Insert(OrderBindingModel model)
diff --git a/RenovationWork/RenovationWorkDatabaseImplement/Model/Order.cs b/RenovationWork/RenovationWorkDatabaseImplement/Model/Order.cs
index 413f5ef..00f1ccc 100644
--- a/RenovationWork/RenovationWorkDatabaseImplement/Model/Order.cs
+++ b/RenovationWork/RenovationWorkDatabaseImplement/Model/Order.cs
@@ -27,6 +27,7 @@ namespace RenovationWorkDatabaseImplement.Model
public DateTime? DateImplement { get; set; }
public int Id { get; set; }
+ public virtual Repair Repair { get; set; } = new();
public static Order? Create(OrderBindingModel? model)
{
@@ -63,6 +64,7 @@ namespace RenovationWorkDatabaseImplement.Model
Count = Count,
Sum = Sum,
Status = Status,
+ RepairName = Repair.RepairName,
DateCreate = DateCreate,
DateImplement = DateImplement
};
diff --git a/RenovationWork/RenovationWorkDatabaseImplement/Model/Repair.cs b/RenovationWork/RenovationWorkDatabaseImplement/Model/Repair.cs
index bdb6112..9a57a2f 100644
--- a/RenovationWork/RenovationWorkDatabaseImplement/Model/Repair.cs
+++ b/RenovationWork/RenovationWorkDatabaseImplement/Model/Repair.cs
@@ -47,6 +47,7 @@ namespace RenovationWorkDatabaseImplement.Model
Id = model.Id,
RepairName = model.RepairName,
Price = model.Price,
+
Components = model.RepairComponents.Select(x => new RepairComponent
{
Component = context.Components.First(y => y.Id == x.Key),
diff --git a/RenovationWork/RenovationWorkFileImplement/Implements/OrderStorage.cs b/RenovationWork/RenovationWorkFileImplement/Implements/OrderStorage.cs
index 8ec831f..7a61607 100644
--- a/RenovationWork/RenovationWorkFileImplement/Implements/OrderStorage.cs
+++ b/RenovationWork/RenovationWorkFileImplement/Implements/OrderStorage.cs
@@ -26,21 +26,24 @@ namespace RenovationWorkFileImplement.Implements
{
return null;
}
- return GetViewModel(source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id));
+ 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 => GetViewModel(x)).ToList();
+ return source.Orders.Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo).Select(x => GetViewModel(x)).ToList();
+
}
public List GetFullList()
{
return source.Orders.Select(x => GetViewModel(x)).ToList();
+
}
public OrderViewModel? Insert(OrderBindingModel model)
diff --git a/RenovationWork/RenovationWorkFileImplement/Implements/RepairStorage.cs b/RenovationWork/RenovationWorkFileImplement/Implements/RepairStorage.cs
index f965194..3f425fc 100644
--- a/RenovationWork/RenovationWorkFileImplement/Implements/RepairStorage.cs
+++ b/RenovationWork/RenovationWorkFileImplement/Implements/RepairStorage.cs
@@ -38,8 +38,11 @@ namespace RenovationWorkFileImplement.Implements
{
return null;
}
- return source.Repairs.FirstOrDefault(x => (!string.IsNullOrEmpty(model.RepairName) && x.RepairName ==
- model.RepairName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+ return source.Repairs
+ .FirstOrDefault(x =>
+ (!string.IsNullOrEmpty(model.RepairName) && x.RepairName == model.RepairName) ||
+ (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+
}
public List GetFilteredList(RepairSearchModel model)
@@ -48,12 +51,19 @@ namespace RenovationWorkFileImplement.Implements
{
return new();
}
- return source.Repairs.Where(x => x.RepairName.Contains(model.RepairName)).Select(x => x.GetViewModel).ToList();
+ return source.Repairs
+ .Where(x => x.RepairName.Contains(model.RepairName))
+ .Select(x => x.GetViewModel)
+ .ToList();
+
}
public List GetFullList()
{
- return source.Repairs.Select(x => x.GetViewModel).ToList();
+ return source.Repairs
+ .Select(x => x.GetViewModel)
+ .ToList();
+
}
public RepairViewModel? Insert(RepairBindingModel model)
diff --git a/RenovationWork/RenovationWorkListImplement/Implements/OrderStorage.cs b/RenovationWork/RenovationWorkListImplement/Implements/OrderStorage.cs
index 8ef8911..3c5b943 100644
--- a/RenovationWork/RenovationWorkListImplement/Implements/OrderStorage.cs
+++ b/RenovationWork/RenovationWorkListImplement/Implements/OrderStorage.cs
@@ -53,23 +53,33 @@ namespace RenovationWorkListImplement.Implements
public List GetFilteredList(OrderSearchModel model)
{
var result = new List();
-
- if (!model.Id.HasValue)
+ if (model == null)
{
return result;
}
-
- foreach (var order in _source.Orders)
+ foreach (var Order in _source.Orders)
{
- if (model.Id.HasValue && order.Id == model.Id)
+ if (Order.Id == model.Id || model.DateFrom <= Order.DateCreate && Order.DateCreate <= model.DateTo)
{
- result.Add(order.GetViewModel);
+ result.Add(GetViewModel(Order));
}
}
-
return result;
- }
+ }
+ private OrderViewModel GetViewModel(Order order)
+ {
+ var viewModel = order.GetViewModel;
+ foreach (var rep in _source.Repair)
+ {
+ if (rep.Id == order.RepairId)
+ {
+ viewModel.RepairName = rep.RepairName;
+ break;
+ }
+ }
+ return viewModel;
+ }
public List GetFullList()
{
var result = new List();
diff --git a/RenovationWork/RenovationWorkView/FormMain.Designer.cs b/RenovationWork/RenovationWorkView/FormMain.Designer.cs
index c2fdeb5..9ae5b48 100644
--- a/RenovationWork/RenovationWorkView/FormMain.Designer.cs
+++ b/RenovationWork/RenovationWorkView/FormMain.Designer.cs
@@ -32,6 +32,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.componentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.componentProductsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.ordersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.DataGridView = new System.Windows.Forms.DataGridView();
this.CreateOrderButton = new System.Windows.Forms.Button();
this.TakeOrderInWorkButton = new System.Windows.Forms.Button();
@@ -46,7 +50,8 @@
//
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(7, 3, 0, 3);
@@ -77,6 +82,37 @@
this.КомпонентыToolStripMenuItem.Text = "Компоненты";
this.КомпонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click);
//
+ // отчетыToolStripMenuItem
+ //
+ this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.componentsToolStripMenuItem,
+ this.componentProductsToolStripMenuItem,
+ this.ordersToolStripMenuItem});
+ this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
+ this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(73, 24);
+ this.отчетыToolStripMenuItem.Text = "Отчеты";
+ //
+ // componentsToolStripMenuItem
+ //
+ this.componentsToolStripMenuItem.Name = "componentsToolStripMenuItem";
+ this.componentsToolStripMenuItem.Size = new System.Drawing.Size(355, 26);
+ this.componentsToolStripMenuItem.Text = "Список ремонтных работ";
+ this.componentsToolStripMenuItem.Click += new System.EventHandler(this.ComponentsToolStripMenuItem_Click);
+ //
+ // componentProductsToolStripMenuItem
+ //
+ this.componentProductsToolStripMenuItem.Name = "componentProductsToolStripMenuItem";
+ this.componentProductsToolStripMenuItem.Size = new System.Drawing.Size(355, 26);
+ this.componentProductsToolStripMenuItem.Text = "Компоненты по ремонтным работам";
+ this.componentProductsToolStripMenuItem.Click += new System.EventHandler(this.ComponentProductsToolStripMenuItem_Click);
+ //
+ // ordersToolStripMenuItem
+ //
+ this.ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
+ this.ordersToolStripMenuItem.Size = new System.Drawing.Size(355, 26);
+ this.ordersToolStripMenuItem.Text = "Список заказов";
+ this.ordersToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click);
+ //
// DataGridView
//
this.DataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -191,5 +227,9 @@
private Button OrderReadyButton;
private Button IssuedOrderButton;
private Button UpdateListButton;
+ private ToolStripMenuItem отчетыToolStripMenuItem;
+ private ToolStripMenuItem componentsToolStripMenuItem;
+ private ToolStripMenuItem componentProductsToolStripMenuItem;
+ private ToolStripMenuItem ordersToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/RenovationWork/RenovationWorkView/FormMain.cs b/RenovationWork/RenovationWorkView/FormMain.cs
index 37e7723..18cdec8 100644
--- a/RenovationWork/RenovationWorkView/FormMain.cs
+++ b/RenovationWork/RenovationWorkView/FormMain.cs
@@ -1,4 +1,5 @@
using Microsoft.Extensions.Logging;
+using RenovationWorkBusinessLogic.BusinessLogic;
using RenovationWorkContracts.BindingModels;
using RenovationWorkContracts.BusinessLogicsContracts;
using RenovationWorkDataModels.Enums;
@@ -19,13 +20,17 @@ namespace PrecastConcretePlantView
{
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)
@@ -192,15 +197,40 @@ namespace PrecastConcretePlantView
}
}
}
+ private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ _reportLogic.SaveRepairsToWordFile(new ReportBindingModel { FileName = dialog.FileName });
+ MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ }
+ }
+ private void ComponentProductsToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportRepairComponents));
+ if (service is FormReportRepairComponents 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 UpdateListButton_Click(object sender, EventArgs e)
{
LoadData();
}
-
private void DataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e)
{
}
+
}
}
diff --git a/RenovationWork/RenovationWorkView/FormReportOrders.Designer.cs b/RenovationWork/RenovationWorkView/FormReportOrders.Designer.cs
new file mode 100644
index 0000000..a88e00f
--- /dev/null
+++ b/RenovationWork/RenovationWorkView/FormReportOrders.Designer.cs
@@ -0,0 +1,143 @@
+namespace RenovationWorkView
+{
+ partial class FormReportOrders
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.panel = new System.Windows.Forms.Panel();
+ this.buttonToPdf = new System.Windows.Forms.Button();
+ this.buttonMake = new System.Windows.Forms.Button();
+ this.dateTimePickerTo = new System.Windows.Forms.DateTimePicker();
+ this.labelTo = new System.Windows.Forms.Label();
+ this.dateTimePickerFrom = new System.Windows.Forms.DateTimePicker();
+ this.labelFrom = new System.Windows.Forms.Label();
+ this.panel.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // panel
+ //
+ this.panel.Controls.Add(this.buttonToPdf);
+ this.panel.Controls.Add(this.buttonMake);
+ this.panel.Controls.Add(this.dateTimePickerTo);
+ this.panel.Controls.Add(this.labelTo);
+ this.panel.Controls.Add(this.dateTimePickerFrom);
+ this.panel.Controls.Add(this.labelFrom);
+ this.panel.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel.Location = new System.Drawing.Point(0, 0);
+ this.panel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.panel.Name = "panel";
+ this.panel.Size = new System.Drawing.Size(1031, 40);
+ this.panel.TabIndex = 0;
+ //
+ // buttonToPdf
+ //
+ this.buttonToPdf.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonToPdf.Location = new System.Drawing.Point(878, 8);
+ this.buttonToPdf.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.buttonToPdf.Name = "buttonToPdf";
+ this.buttonToPdf.Size = new System.Drawing.Size(139, 27);
+ this.buttonToPdf.TabIndex = 5;
+ this.buttonToPdf.Text = "В Pdf";
+ this.buttonToPdf.UseVisualStyleBackColor = true;
+ this.buttonToPdf.Click += new System.EventHandler(this.ButtonToPdf_Click);
+ //
+ // buttonMake
+ //
+ this.buttonMake.Location = new System.Drawing.Point(476, 8);
+ this.buttonMake.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.buttonMake.Name = "buttonMake";
+ this.buttonMake.Size = new System.Drawing.Size(139, 27);
+ this.buttonMake.TabIndex = 4;
+ this.buttonMake.Text = "Сформировать";
+ this.buttonMake.UseVisualStyleBackColor = true;
+ this.buttonMake.Click += new System.EventHandler(this.ButtonMake_Click);
+ //
+ // dateTimePickerTo
+ //
+ this.dateTimePickerTo.Location = new System.Drawing.Point(237, 7);
+ this.dateTimePickerTo.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.dateTimePickerTo.Name = "dateTimePickerTo";
+ this.dateTimePickerTo.Size = new System.Drawing.Size(163, 23);
+ this.dateTimePickerTo.TabIndex = 3;
+ //
+ // labelTo
+ //
+ this.labelTo.AutoSize = true;
+ this.labelTo.Location = new System.Drawing.Point(208, 10);
+ this.labelTo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelTo.Name = "labelTo";
+ this.labelTo.Size = new System.Drawing.Size(21, 15);
+ this.labelTo.TabIndex = 2;
+ this.labelTo.Text = "по";
+ //
+ // dateTimePickerFrom
+ //
+ this.dateTimePickerFrom.Location = new System.Drawing.Point(37, 7);
+ this.dateTimePickerFrom.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.dateTimePickerFrom.Name = "dateTimePickerFrom";
+ this.dateTimePickerFrom.Size = new System.Drawing.Size(163, 23);
+ this.dateTimePickerFrom.TabIndex = 1;
+ //
+ // labelFrom
+ //
+ this.labelFrom.AutoSize = true;
+ this.labelFrom.Location = new System.Drawing.Point(14, 10);
+ this.labelFrom.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelFrom.Name = "labelFrom";
+ this.labelFrom.Size = new System.Drawing.Size(15, 15);
+ this.labelFrom.TabIndex = 0;
+ this.labelFrom.Text = "С";
+ //
+ // FormReportOrders
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1031, 647);
+ this.Controls.Add(this.panel);
+ this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.Name = "FormReportOrders";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "Заказы";
+ this.panel.ResumeLayout(false);
+ this.panel.PerformLayout();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Panel panel;
+ private System.Windows.Forms.Button buttonToPdf;
+ private System.Windows.Forms.Button buttonMake;
+ private System.Windows.Forms.DateTimePicker dateTimePickerTo;
+ private System.Windows.Forms.Label labelTo;
+ private System.Windows.Forms.DateTimePicker dateTimePickerFrom;
+ private System.Windows.Forms.Label labelFrom;
+
+
+ }
+}
\ No newline at end of file
diff --git a/RenovationWork/RenovationWorkView/FormReportOrders.cs b/RenovationWork/RenovationWorkView/FormReportOrders.cs
new file mode 100644
index 0000000..937d1e4
--- /dev/null
+++ b/RenovationWork/RenovationWorkView/FormReportOrders.cs
@@ -0,0 +1,106 @@
+using Microsoft.Extensions.Logging;
+using Microsoft.Reporting.WinForms;
+using RenovationWorkContracts.BindingModels;
+using RenovationWorkContracts.BusinessLogicsContracts;
+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 RenovationWorkView
+{
+ 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
+ DateFrom = DateTime.SpecifyKind(dateTimePickerFrom.Value, DateTimeKind.Utc),
+ DateTo = DateTime.SpecifyKind(dateTimePickerTo.Value, DateTimeKind.Utc)
+ });
+ 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)
+ {
+ System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
+ 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
+ DateFrom = DateTime.SpecifyKind(dateTimePickerFrom.Value, DateTimeKind.Utc),
+ DateTo = DateTime.SpecifyKind(dateTimePickerTo.Value, DateTimeKind.Utc)
+ });
+ _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/RenovationWork/RenovationWorkView/FormReportOrders.resx b/RenovationWork/RenovationWorkView/FormReportOrders.resx
new file mode 100644
index 0000000..f298a7b
--- /dev/null
+++ b/RenovationWork/RenovationWorkView/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/RenovationWork/RenovationWorkView/FormReportRepairComponents.Designer.cs b/RenovationWork/RenovationWorkView/FormReportRepairComponents.Designer.cs
new file mode 100644
index 0000000..0387281
--- /dev/null
+++ b/RenovationWork/RenovationWorkView/FormReportRepairComponents.Designer.cs
@@ -0,0 +1,113 @@
+namespace RenovationWorkView
+{
+ partial class FormReportRepairComponents
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.dataGridView = new System.Windows.Forms.DataGridView();
+ this.buttonSaveToExcel = new System.Windows.Forms.Button();
+ this.ColumnComponent = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ColumnRepair = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+ this.SuspendLayout();
+ //
+ // dataGridView
+ //
+ this.dataGridView.AllowUserToAddRows = false;
+ this.dataGridView.AllowUserToDeleteRows = false;
+ this.dataGridView.AllowUserToOrderColumns = true;
+ this.dataGridView.AllowUserToResizeColumns = false;
+ this.dataGridView.AllowUserToResizeRows = false;
+ this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
+ this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.ColumnComponent,
+ this.ColumnRepair,
+ this.ColumnCount});
+ this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.dataGridView.Location = new System.Drawing.Point(0, 41);
+ this.dataGridView.MultiSelect = false;
+ this.dataGridView.Name = "dataGridView";
+ this.dataGridView.ReadOnly = true;
+ this.dataGridView.RowHeadersVisible = false;
+ this.dataGridView.Size = new System.Drawing.Size(528, 442);
+ this.dataGridView.TabIndex = 0;
+ //
+ // buttonSaveToExcel
+ //
+ this.buttonSaveToExcel.Location = new System.Drawing.Point(12, 12);
+ this.buttonSaveToExcel.Name = "buttonSaveToExcel";
+ this.buttonSaveToExcel.Size = new System.Drawing.Size(159, 23);
+ this.buttonSaveToExcel.TabIndex = 1;
+ this.buttonSaveToExcel.Text = "Сохранить в Excel";
+ this.buttonSaveToExcel.UseVisualStyleBackColor = true;
+ this.buttonSaveToExcel.Click += new System.EventHandler(this.ButtonSaveToExcel_Click);
+ //
+ // ColumnComponent
+ //
+ this.ColumnComponent.HeaderText = "Компонент";
+ this.ColumnComponent.Name = "ColumnComponent";
+ this.ColumnComponent.ReadOnly = true;
+ this.ColumnComponent.Width = 200;
+ //
+ // ColumnRepair
+ //
+ this.ColumnRepair.HeaderText = "Изделие";
+ this.ColumnRepair.Name = "ColumnRepair";
+ this.ColumnRepair.ReadOnly = true;
+ this.ColumnRepair.Width = 200;
+ //
+ // ColumnCount
+ //
+ this.ColumnCount.HeaderText = "Количество";
+ this.ColumnCount.Name = "ColumnCount";
+ this.ColumnCount.ReadOnly = true;
+ //
+ // FormReportRepairComponents
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(528, 483);
+ this.Controls.Add(this.buttonSaveToExcel);
+ this.Controls.Add(this.dataGridView);
+ this.Name = "FormReportRepairComponents";
+ this.Text = "Компоненты по изделиям";
+ this.Load += new System.EventHandler(this.FormReportRepairComponents_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+ this.ResumeLayout(false);
+ }
+
+ #endregion
+
+ private System.Windows.Forms.DataGridView dataGridView;
+ private System.Windows.Forms.Button buttonSaveToExcel;
+ private System.Windows.Forms.DataGridViewTextBoxColumn ColumnComponent;
+ private System.Windows.Forms.DataGridViewTextBoxColumn ColumnRepair;
+ private System.Windows.Forms.DataGridViewTextBoxColumn ColumnCount;
+ }
+}
\ No newline at end of file
diff --git a/RenovationWork/RenovationWorkView/FormReportRepairComponents.cs b/RenovationWork/RenovationWorkView/FormReportRepairComponents.cs
new file mode 100644
index 0000000..79e6059
--- /dev/null
+++ b/RenovationWork/RenovationWorkView/FormReportRepairComponents.cs
@@ -0,0 +1,91 @@
+using Microsoft.Extensions.Logging;
+using RenovationWorkContracts.BindingModels;
+using RenovationWorkContracts.BusinessLogicsContracts;
+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 RenovationWorkView
+{
+ public partial class FormReportRepairComponents : Form
+ {
+ private readonly ILogger _logger;
+
+ private readonly IReportLogic _logic;
+
+ public FormReportRepairComponents(ILogger logger, IReportLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ }
+
+ private void FormReportRepairComponents_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ var dict = _logic.GetRepairComponent();
+ if (dict != null)
+ {
+ dataGridView.Rows.Clear();
+ foreach (var elem in dict)
+ {
+ dataGridView.Rows.Add(new object[] { elem.RepairName, "", "" });
+ 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 | |