From efdbb5ed109657270a63d23b89a00394e161ba5d Mon Sep 17 00:00:00 2001 From: Extrimal Date: Sat, 15 Jun 2024 20:34:34 +0400 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/ReportLogic.cs | 107 ---- .../OfficePackage/AbstractSaveToExcel.cs | 96 --- .../OfficePackage/AbstractSaveToPdf.cs | 63 -- .../OfficePackage/AbstractSaveToWord.cs | 53 -- .../HelperEnums/ExcelStyleInfoType.cs | 17 - .../HelperEnums/PdfParagraphAlignmentType.cs | 17 - .../HelperEnums/WordJustificationType.cs | 15 - .../HelperModels/ExcelCellParameters.cs | 22 - .../OfficePackage/HelperModels/ExcelInfo.cs | 18 - .../HelperModels/ExcelMergeParameters.cs | 17 - .../OfficePackage/HelperModels/PdfInfo.cs | 22 - .../HelperModels/PdfParagraph.cs | 18 - .../HelperModels/PdfRowParameters.cs | 18 - .../OfficePackage/HelperModels/WordInfo.cs | 18 - .../HelperModels/WordParagraph.cs | 15 - .../HelperModels/WordTextProperties.cs | 18 - .../OfficePackage/Implements/SaveToExcel.cs | 285 --------- .../OfficePackage/Implements/SaveToPdf.cs | 108 ---- .../OfficePackage/Implements/SaveToWord.cs | 121 ---- .../BindingModels/ReportBindingModel.cs | 11 - .../BusinessLogicsContracts/IReportLogic.cs | 18 - .../SearchModels/OrderSearchModel.cs | 3 - .../ViewModels/ReportOrdersViewModel.cs | 15 - .../ReportTextileComponentViewModel.cs | 11 - .../Implements/OrderStorage.cs | 10 +- .../Implements/OrderStorage.cs | 7 - .../Implements/OrderStorage.cs | 13 +- ...LogicsContracts.IComponentLogic.datasource | 10 - .../GarmentFactoryView/FormMain.Designer.cs | 353 +++++------ GarmentFactory/GarmentFactoryView/FormMain.cs | 319 +++++----- .../GarmentFactoryView/FormReportOrders.cs | 91 --- .../FormReportOrders.designer.cs | 140 ---- .../GarmentFactoryView/FormReportOrders.resx | 120 ---- .../FormReportTextileComponents.Designer.cs | 117 ---- .../FormReportTextileComponents.cs | 80 --- .../FormReportTextileComponents.resx | 129 ---- .../GarmentFactoryView.csproj | 6 - GarmentFactory/GarmentFactoryView/Program.cs | 16 +- ...nessLogicsContracts.IOrderLogic.datasource | 10 - ...essLogicsContracts.IReportLogic.datasource | 10 - ...ssLogicsContracts.ITextileLogic.datasource | 10 - ...agesContracts.IComponentStorage.datasource | 10 - ...StoragesContracts.IOrderStorage.datasource | 10 - ...oragesContracts.ITextileStorage.datasource | 10 - .../GarmentFactoryView/ReportOrders.rdlc | 599 ------------------ 45 files changed, 339 insertions(+), 2837 deletions(-) delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/BusinessLogics/ReportLogic.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/AbstractSaveToExcel.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/AbstractSaveToPdf.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/AbstractSaveToWord.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/WordInfo.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/Implements/SaveToExcel.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/Implements/SaveToPdf.cs delete mode 100644 GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/Implements/SaveToWord.cs delete mode 100644 GarmentFactory/GarmentFactoryContracts/BindingModels/ReportBindingModel.cs delete mode 100644 GarmentFactory/GarmentFactoryContracts/BusinessLogicsContracts/IReportLogic.cs delete mode 100644 GarmentFactory/GarmentFactoryContracts/ViewModels/ReportOrdersViewModel.cs delete mode 100644 GarmentFactory/GarmentFactoryContracts/ViewModels/ReportTextileComponentViewModel.cs delete mode 100644 GarmentFactory/GarmentFactoryView/DataSources/GarmentFactoryContracts.BusinessLogicsContracts.IComponentLogic.datasource delete mode 100644 GarmentFactory/GarmentFactoryView/FormReportOrders.cs delete mode 100644 GarmentFactory/GarmentFactoryView/FormReportOrders.designer.cs delete mode 100644 GarmentFactory/GarmentFactoryView/FormReportOrders.resx delete mode 100644 GarmentFactory/GarmentFactoryView/FormReportTextileComponents.Designer.cs delete mode 100644 GarmentFactory/GarmentFactoryView/FormReportTextileComponents.cs delete mode 100644 GarmentFactory/GarmentFactoryView/FormReportTextileComponents.resx delete mode 100644 GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.BusinessLogicsContracts.IOrderLogic.datasource delete mode 100644 GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.BusinessLogicsContracts.IReportLogic.datasource delete mode 100644 GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.BusinessLogicsContracts.ITextileLogic.datasource delete mode 100644 GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.StoragesContracts.IComponentStorage.datasource delete mode 100644 GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.StoragesContracts.IOrderStorage.datasource delete mode 100644 GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.StoragesContracts.ITextileStorage.datasource delete mode 100644 GarmentFactory/GarmentFactoryView/ReportOrders.rdlc diff --git a/GarmentFactory/GarmentFactoryBusinessLogic/BusinessLogics/ReportLogic.cs b/GarmentFactory/GarmentFactoryBusinessLogic/BusinessLogics/ReportLogic.cs deleted file mode 100644 index 79189aa..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/BusinessLogics/ReportLogic.cs +++ /dev/null @@ -1,107 +0,0 @@ -using GarmentFactoryBusinessLogic.OfficePackage; -using GarmentFactoryBusinessLogic.OfficePackage.HelperModels; -using GarmentFactoryContracts.BindingModels; -using GarmentFactoryContracts.BusinessLogicsContracts; -using GarmentFactoryContracts.SearchModels; -using GarmentFactoryContracts.StoragesContracts; -using GarmentFactoryContracts.ViewModels; - -namespace GarmentFactoryBusinessLogic.BusinessLogics -{ - public class ReportLogic : IReportLogic - { - private readonly ITextileStorage _textileStorage; - - private readonly IOrderStorage _orderStorage; - - private readonly AbstractSaveToExcel _saveToExcel; - - private readonly AbstractSaveToWord _saveToWord; - - private readonly AbstractSaveToPdf _saveToPdf; - - public ReportLogic(ITextileStorage textileStorage, IComponentStorage componentStorage, IOrderStorage orderStorage, - AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf) - { - _textileStorage = textileStorage; - _orderStorage = orderStorage; - - _saveToExcel = saveToExcel; - _saveToWord = saveToWord; - _saveToPdf = saveToPdf; - } - - public List GetTextileComponents() - { - - var textiles = _textileStorage.GetFullList(); - - var list = new List(); - - foreach (var textile in textiles) - { - var record = new ReportTextileComponentViewModel - { - TextileName = textile.TextileName, - Components = new List<(string Component, int Count)>(), - TotalCount = 0, - }; - foreach (var component in textile.TextileComponents) - { - record.Components.Add(new(component.Value.Item1.ComponentName, component.Value.Item2)); - record.TotalCount += component.Value.Item2; - } - - list.Add(record); - } - - return list; - } - - public List GetOrders(ReportBindingModel model) - { - return _orderStorage.GetFilteredList(new OrderSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo }) - .Select(x => new ReportOrdersViewModel - { - Id = x.Id, - DateCreate = x.DateCreate, - TextileName = x.TextileName, - OrderStatus = x.Status.ToString(), - Sum = x.Sum - }) - .ToList(); - } - - public void SaveTextilesToWordFile(ReportBindingModel model) - { - _saveToWord.CreateDoc(new WordInfo - { - FileName = model.FileName, - Title = "Список изделий", - Textiles = _textileStorage.GetFullList() - }); - } - - public void SaveTextileComponentToExcelFile(ReportBindingModel model) - { - _saveToExcel.CreateReport(new ExcelInfo - { - FileName = model.FileName, - Title = "Список изделий", - TextileComponents = GetTextileComponents() - }); - } - - 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/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/AbstractSaveToExcel.cs deleted file mode 100644 index f127966..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/AbstractSaveToExcel.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using GarmentFactoryBusinessLogic.OfficePackage.HelperEnums; -using GarmentFactoryBusinessLogic.OfficePackage.HelperModels; - -namespace GarmentFactoryBusinessLogic.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 t in info.TextileComponents) - { - InsertCellInWorksheet(new ExcelCellParameters - { - ColumnName = "A", - RowIndex = rowIndex, - Text = t.TextileName, - StyleInfo = ExcelStyleInfoType.Text - }); - rowIndex++; - - foreach (var (Component, Count) in t.Components) - { - InsertCellInWorksheet(new ExcelCellParameters - { - ColumnName = "B", - RowIndex = rowIndex, - Text = Component, - StyleInfo = ExcelStyleInfoType.TextWithBorder - }); - - InsertCellInWorksheet(new ExcelCellParameters - { - ColumnName = "C", - RowIndex = rowIndex, - Text = Count.ToString(), - StyleInfo = ExcelStyleInfoType.TextWithBorder - }); - rowIndex++; - } - - InsertCellInWorksheet(new ExcelCellParameters - { - ColumnName = "A", - RowIndex = rowIndex, - Text = "Итого", - StyleInfo = ExcelStyleInfoType.Text - }); - InsertCellInWorksheet(new ExcelCellParameters - { - ColumnName = "C", - RowIndex = rowIndex, - Text = t.TotalCount.ToString(), - StyleInfo = ExcelStyleInfoType.Text - }); - rowIndex++; - } - - SaveExcel(info); - } - - // Создание excel-файла - protected abstract void CreateExcel(ExcelInfo info); - - // Добавляем новую ячейку в лист - protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams); - - // Объединение ячеек - protected abstract void MergeCells(ExcelMergeParameters excelParams); - - // Сохранение файла - protected abstract void SaveExcel(ExcelInfo info); - } -} diff --git a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/AbstractSaveToPdf.cs deleted file mode 100644 index 978fe96..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/AbstractSaveToPdf.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using GarmentFactoryBusinessLogic.OfficePackage.HelperEnums; -using GarmentFactoryBusinessLogic.OfficePackage.HelperModels; - -namespace GarmentFactoryBusinessLogic.OfficePackage -{ - public abstract class AbstractSaveToPdf - { - public void CreateDoc(PdfInfo info) - { - CreatePdf(info); - CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center }); - CreateParagraph(new PdfParagraph - { - Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", - Style = "Normal", - ParagraphAlignment = PdfParagraphAlignmentType.Center - }); - - CreateTable(new List { "2cm", "3cm", "6cm", "4cm", "3cm" }); - - CreateRow(new PdfRowParameters - { - Texts = new List { "Номер", "Дата заказа", "Изделие", "Статус", "Сумма" }, - Style = "NormalTitle", - ParagraphAlignment = PdfParagraphAlignmentType.Center - }); - - foreach (var order in info.Orders) - { - CreateRow(new PdfRowParameters - { - Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.TextileName, - order.OrderStatus, order.Sum.ToString() }, - Style = "Normal", - ParagraphAlignment = PdfParagraphAlignmentType.Left - }); - } - CreateParagraph(new PdfParagraph { Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Right }); - - SavePdf(info); - } - - // Создание pdf-файла - 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/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/AbstractSaveToWord.cs deleted file mode 100644 index c8a8edc..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/AbstractSaveToWord.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using GarmentFactoryBusinessLogic.OfficePackage.HelperEnums; -using GarmentFactoryBusinessLogic.OfficePackage.HelperModels; - -namespace GarmentFactoryBusinessLogic.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 textile in info.Textiles) - { - CreateParagraph(new WordParagraph - { - Texts = new List<(string, WordTextProperties)> {(textile.TextileName + " - ", new WordTextProperties { Size = "24", Bold = true}), - (textile.Price.ToString(), new WordTextProperties { Size = "24", })}, - TextProperties = new WordTextProperties - { - Size = "24", - JustificationType = WordJustificationType.Both - } - }); - } - - SaveWord(info); - } - - // Создание doc-файла - protected abstract void CreateWord(WordInfo info); - - // Создание абзаца с текстом - protected abstract void CreateParagraph(WordParagraph paragraph); - - // Сохранение файла - protected abstract void SaveWord(WordInfo info); - } -} diff --git a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs deleted file mode 100644 index b3affaf..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace GarmentFactoryBusinessLogic.OfficePackage.HelperEnums -{ - public enum ExcelStyleInfoType - { - Title, - - Text, - - TextWithBorder - } -} diff --git a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs deleted file mode 100644 index 97ccbb1..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace GarmentFactoryBusinessLogic.OfficePackage.HelperEnums -{ - public enum PdfParagraphAlignmentType - { - Center, - - Left, - - Right - } -} diff --git a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs deleted file mode 100644 index 53fcbd3..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace GarmentFactoryBusinessLogic.OfficePackage.HelperEnums -{ - public enum WordJustificationType - { - Center, - - Both - } -} diff --git a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs deleted file mode 100644 index 9fb7136..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using GarmentFactoryBusinessLogic.OfficePackage.HelperEnums; - -namespace GarmentFactoryBusinessLogic.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/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs deleted file mode 100644 index 9eaea62..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using GarmentFactoryContracts.ViewModels; - -namespace GarmentFactoryBusinessLogic.OfficePackage.HelperModels -{ - public class ExcelInfo - { - public string FileName { get; set; } = string.Empty; - - public string Title { get; set; } = string.Empty; - - public List TextileComponents { get; set; } = new(); - } -} diff --git a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs deleted file mode 100644 index 5bcdb1c..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace GarmentFactoryBusinessLogic.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/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs deleted file mode 100644 index 41244bb..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using GarmentFactoryContracts.ViewModels; - -namespace GarmentFactoryBusinessLogic.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/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs deleted file mode 100644 index bd4619a..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs +++ /dev/null @@ -1,18 +0,0 @@ -using GarmentFactoryBusinessLogic.OfficePackage.HelperEnums; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace GarmentFactoryBusinessLogic.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/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs deleted file mode 100644 index b21f65a..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs +++ /dev/null @@ -1,18 +0,0 @@ -using GarmentFactoryBusinessLogic.OfficePackage.HelperEnums; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace GarmentFactoryBusinessLogic.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/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/WordInfo.cs deleted file mode 100644 index 7000d62..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/WordInfo.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using GarmentFactoryContracts.ViewModels; - -namespace GarmentFactoryBusinessLogic.OfficePackage.HelperModels -{ - public class WordInfo - { - public string FileName { get; set; } = string.Empty; - - public string Title { get; set; } = string.Empty; - - public List Textiles { get; set; } = new(); - } -} diff --git a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs deleted file mode 100644 index 982b3f9..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace GarmentFactoryBusinessLogic.OfficePackage.HelperModels -{ - public class WordParagraph - { - public List<(string, WordTextProperties)> Texts { get; set; } = new(); - - public WordTextProperties? TextProperties { get; set; } - } -} diff --git a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs deleted file mode 100644 index 20cc9c6..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using GarmentFactoryBusinessLogic.OfficePackage.HelperEnums; - -namespace GarmentFactoryBusinessLogic.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/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/Implements/SaveToExcel.cs deleted file mode 100644 index b86fcd3..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/Implements/SaveToExcel.cs +++ /dev/null @@ -1,285 +0,0 @@ -using GarmentFactoryBusinessLogic.OfficePackage.HelperEnums; -using GarmentFactoryBusinessLogic.OfficePackage.HelperModels; -using DocumentFormat.OpenXml; -using DocumentFormat.OpenXml.Office2010.Excel; -using DocumentFormat.OpenXml.Office2013.Excel; -using DocumentFormat.OpenXml.Packaging; -using DocumentFormat.OpenXml.Spreadsheet; - -namespace GarmentFactoryBusinessLogic.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.TextWithBorder => 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/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/Implements/SaveToPdf.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/Implements/SaveToPdf.cs deleted file mode 100644 index 6450e7b..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/Implements/SaveToPdf.cs +++ /dev/null @@ -1,108 +0,0 @@ -using GarmentFactoryBusinessLogic.OfficePackage.HelperEnums; -using GarmentFactoryBusinessLogic.OfficePackage.HelperModels; -using MigraDoc.DocumentObjectModel; -using MigraDoc.DocumentObjectModel.Tables; -using MigraDoc.Rendering; - -namespace GarmentFactoryBusinessLogic.OfficePackage.Implements -{ - public class SaveToPdf : AbstractSaveToPdf - { - private Document? _document; - private Section? _section; - private Table? _table; - - private static ParagraphAlignment GetParagraphAlignment(PdfParagraphAlignmentType type) - { - return type switch - { - PdfParagraphAlignmentType.Center => ParagraphAlignment.Center, - PdfParagraphAlignmentType.Left => ParagraphAlignment.Left, - PdfParagraphAlignmentType.Right => ParagraphAlignment.Right, - _ => ParagraphAlignment.Justify, - }; - } - - private static void DefineStyles(Document document) - { - var style = document.Styles["Normal"]; - style.Font.Name = "Times New Roman"; - style.Font.Size = 14; - - style = document.Styles.AddStyle("NormalTitle", "Normal"); - style.Font.Bold = true; - } - - protected override void CreatePdf(PdfInfo info) - { - _document = new Document(); - DefineStyles(_document); - - _section = _document.AddSection(); - } - - protected override void CreateParagraph(PdfParagraph pdfParagraph) - { - if (_section == null) - { - return; - } - var paragraph = _section.AddParagraph(pdfParagraph.Text); - paragraph.Format.SpaceAfter = "1cm"; - paragraph.Format.Alignment = GetParagraphAlignment(pdfParagraph.ParagraphAlignment); - paragraph.Style = pdfParagraph.Style; - } - - protected override void CreateTable(List columns) - { - if (_document == null) - { - return; - } - _table = _document.LastSection.AddTable(); - - foreach (var elem in columns) - { - _table.AddColumn(elem); - } - } - - protected override void CreateRow(PdfRowParameters rowParameters) - { - if (_table == null) - { - return; - } - var row = _table.AddRow(); - for (int i = 0; i < rowParameters.Texts.Count; ++i) - { - row.Cells[i].AddParagraph(rowParameters.Texts[i]); - - if (!string.IsNullOrEmpty(rowParameters.Style)) - { - row.Cells[i].Style = rowParameters.Style; - } - - Unit borderWidth = 0.5; - - row.Cells[i].Borders.Left.Width = borderWidth; - row.Cells[i].Borders.Right.Width = borderWidth; - row.Cells[i].Borders.Top.Width = borderWidth; - row.Cells[i].Borders.Bottom.Width = borderWidth; - - row.Cells[i].Format.Alignment = GetParagraphAlignment(rowParameters.ParagraphAlignment); - row.Cells[i].VerticalAlignment = VerticalAlignment.Center; - } - } - - protected override void SavePdf(PdfInfo info) - { - var renderer = new PdfDocumentRenderer(true) - { - Document = _document - }; - renderer.RenderDocument(); - renderer.PdfDocument.Save(info.FileName); - } - } -} diff --git a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/Implements/SaveToWord.cs deleted file mode 100644 index 5a9bea6..0000000 --- a/GarmentFactory/GarmentFactoryBusinessLogic/OfficePackage/Implements/SaveToWord.cs +++ /dev/null @@ -1,121 +0,0 @@ -using GarmentFactoryBusinessLogic.OfficePackage.HelperEnums; -using GarmentFactoryBusinessLogic.OfficePackage.HelperModels; -using DocumentFormat.OpenXml; -using DocumentFormat.OpenXml.Packaging; -using DocumentFormat.OpenXml.Wordprocessing; - - -namespace GarmentFactoryBusinessLogic.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/GarmentFactory/GarmentFactoryContracts/BindingModels/ReportBindingModel.cs b/GarmentFactory/GarmentFactoryContracts/BindingModels/ReportBindingModel.cs deleted file mode 100644 index 4b4149d..0000000 --- a/GarmentFactory/GarmentFactoryContracts/BindingModels/ReportBindingModel.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace GarmentFactoryContracts.BindingModels -{ - public class ReportBindingModel - { - public string FileName { get; set; } = string.Empty; - - public DateTime? DateFrom { get; set; } - - public DateTime? DateTo { get; set; } - } -} diff --git a/GarmentFactory/GarmentFactoryContracts/BusinessLogicsContracts/IReportLogic.cs b/GarmentFactory/GarmentFactoryContracts/BusinessLogicsContracts/IReportLogic.cs deleted file mode 100644 index 5d1f614..0000000 --- a/GarmentFactory/GarmentFactoryContracts/BusinessLogicsContracts/IReportLogic.cs +++ /dev/null @@ -1,18 +0,0 @@ -using GarmentFactoryContracts.BindingModels; -using GarmentFactoryContracts.ViewModels; -namespace GarmentFactoryContracts.BusinessLogicsContracts -{ - public interface IReportLogic - { - //Получение списка компонент с указанием, в каких изделиях используются - List GetTextileComponents(); - // Получение списка заказов за определенный период - List GetOrders(ReportBindingModel model); - // Сохранение компонент в файл-Word - void SaveTextilesToWordFile(ReportBindingModel model); - // Сохранение компонент с указаеним продуктов в файл-Excel - void SaveTextileComponentToExcelFile(ReportBindingModel model); - // Сохранение заказов в файл-Pdf - void SaveOrdersToPdfFile(ReportBindingModel model); - } -} diff --git a/GarmentFactory/GarmentFactoryContracts/SearchModels/OrderSearchModel.cs b/GarmentFactory/GarmentFactoryContracts/SearchModels/OrderSearchModel.cs index 8399b33..6debaa3 100644 --- a/GarmentFactory/GarmentFactoryContracts/SearchModels/OrderSearchModel.cs +++ b/GarmentFactory/GarmentFactoryContracts/SearchModels/OrderSearchModel.cs @@ -9,8 +9,5 @@ namespace GarmentFactoryContracts.SearchModels public class OrderSearchModel { public int? Id { get; set; } - public DateTime? DateFrom { get; set; } - - public DateTime? DateTo { get; set; } } } diff --git a/GarmentFactory/GarmentFactoryContracts/ViewModels/ReportOrdersViewModel.cs b/GarmentFactory/GarmentFactoryContracts/ViewModels/ReportOrdersViewModel.cs deleted file mode 100644 index 3ed3694..0000000 --- a/GarmentFactory/GarmentFactoryContracts/ViewModels/ReportOrdersViewModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace GarmentFactoryContracts.ViewModels -{ - public class ReportOrdersViewModel - { - public int Id { get; set; } - - public DateTime DateCreate { get; set; } - - public string TextileName { get; set; } = string.Empty; - - public string OrderStatus { get; set; } = string.Empty; - - public double Sum { get; set; } - } -} diff --git a/GarmentFactory/GarmentFactoryContracts/ViewModels/ReportTextileComponentViewModel.cs b/GarmentFactory/GarmentFactoryContracts/ViewModels/ReportTextileComponentViewModel.cs deleted file mode 100644 index 917e828..0000000 --- a/GarmentFactory/GarmentFactoryContracts/ViewModels/ReportTextileComponentViewModel.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace GarmentFactoryContracts.ViewModels -{ - public class ReportTextileComponentViewModel - { - public string TextileName { get; set; } = string.Empty; - - public int TotalCount { get; set; } - - public List<(string Component, int Count)> Components { get; set; } = new(); - } -} diff --git a/GarmentFactory/GarmentFactoryDatabaseImplement/Implements/OrderStorage.cs b/GarmentFactory/GarmentFactoryDatabaseImplement/Implements/OrderStorage.cs index bb2b08c..e5bd6af 100644 --- a/GarmentFactory/GarmentFactoryDatabaseImplement/Implements/OrderStorage.cs +++ b/GarmentFactory/GarmentFactoryDatabaseImplement/Implements/OrderStorage.cs @@ -20,19 +20,11 @@ namespace GarmentFactoryDatabaseImplement.Implements public List GetFilteredList(OrderSearchModel model) { - if (!model.Id.HasValue && !model.DateFrom.HasValue) + if (!model.Id.HasValue) { return new(); } using var context = new GarmentFactoryDatabase(); - if (model.DateFrom.HasValue) - { - return context.Orders - .Include(x => x.Textile) - .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) - .Select(x => x.GetViewModel) - .ToList(); - } return context.Orders .Include(x => x.Textile) .Where(x => x.Id == model.Id) diff --git a/GarmentFactory/GarmentFactoryFileImplement/Implements/OrderStorage.cs b/GarmentFactory/GarmentFactoryFileImplement/Implements/OrderStorage.cs index 5ab2b48..7a82052 100644 --- a/GarmentFactory/GarmentFactoryFileImplement/Implements/OrderStorage.cs +++ b/GarmentFactory/GarmentFactoryFileImplement/Implements/OrderStorage.cs @@ -33,13 +33,6 @@ namespace GarmentFactoryFileImplement.Implements { return new(); } - if (model.DateFrom.HasValue) - { - return source.Orders - .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) - .Select(x => AddTextileName(x.GetViewModel)) - .ToList(); - } return source.Orders .Where(x => x.Id == model.Id) .Select(x => AddTextileName(x.GetViewModel)) diff --git a/GarmentFactory/GarmentFactoryListImplement/Implements/OrderStorage.cs b/GarmentFactory/GarmentFactoryListImplement/Implements/OrderStorage.cs index 659c5a8..a3a544c 100644 --- a/GarmentFactory/GarmentFactoryListImplement/Implements/OrderStorage.cs +++ b/GarmentFactory/GarmentFactoryListImplement/Implements/OrderStorage.cs @@ -33,21 +33,10 @@ namespace GarmentFactoryListImplement.Implements public List GetFilteredList(OrderSearchModel model) { var result = new List(); - if (!model.Id.HasValue && !model.DateFrom.HasValue) + if (!model.Id.HasValue) { return result; } - if (model.DateFrom.HasValue) - { - foreach (var order in _source.Orders) - { - if (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo) - { - result.Add(AddTextileName(order.GetViewModel)); - } - } - return result; - } foreach (var order in _source.Orders) { if (order.Id == model.Id) diff --git a/GarmentFactory/GarmentFactoryView/DataSources/GarmentFactoryContracts.BusinessLogicsContracts.IComponentLogic.datasource b/GarmentFactory/GarmentFactoryView/DataSources/GarmentFactoryContracts.BusinessLogicsContracts.IComponentLogic.datasource deleted file mode 100644 index 44f9cbe..0000000 --- a/GarmentFactory/GarmentFactoryView/DataSources/GarmentFactoryContracts.BusinessLogicsContracts.IComponentLogic.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - GarmentFactoryContracts.BusinessLogicsContracts.IComponentLogic, GarmentFactoryContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/GarmentFactory/GarmentFactoryView/FormMain.Designer.cs b/GarmentFactory/GarmentFactoryView/FormMain.Designer.cs index 1be9e19..900cd81 100644 --- a/GarmentFactory/GarmentFactoryView/FormMain.Designer.cs +++ b/GarmentFactory/GarmentFactoryView/FormMain.Designer.cs @@ -20,185 +20,177 @@ base.Dispose(disposing); } - #region Windows Form Designer generated code + #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() - { - menuStrip = new MenuStrip(); - справочникиToolStripMenuItem = new ToolStripMenuItem(); - компонентыToolStripMenuItem = new ToolStripMenuItem(); - изделиеToolStripMenuItem = new ToolStripMenuItem(); - отчетыToolStripMenuItem = new ToolStripMenuItem(); - списокПродуктаToolStripMenuItem = new ToolStripMenuItem(); - dataGridView = new DataGridView(); - buttonCreateOrder = new Button(); - buttonTakeOrderInWork = new Button(); - buttonOrderReady = new Button(); - buttonIssuedOrder = new Button(); - buttonUpd = new Button(); - компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem(); - списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); - menuStrip.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); - SuspendLayout(); - // - // menuStrip - // - menuStrip.ImageScalingSize = new Size(20, 20); - menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem }); - menuStrip.Location = new Point(0, 0); - menuStrip.Name = "menuStrip"; - menuStrip.Size = new Size(1178, 28); - menuStrip.TabIndex = 0; - menuStrip.Text = "menuStrip1"; - // - // справочникиToolStripMenuItem - // - справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделиеToolStripMenuItem }); - справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; - справочникиToolStripMenuItem.Size = new Size(117, 24); - справочникиToolStripMenuItem.Text = "Справочники"; - // - // компонентыToolStripMenuItem - // - компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(182, 26); - компонентыToolStripMenuItem.Text = "Компоненты"; - компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; - // - // изделиеToolStripMenuItem - // - изделиеToolStripMenuItem.Name = "изделиеToolStripMenuItem"; - изделиеToolStripMenuItem.Size = new Size(182, 26); - изделиеToolStripMenuItem.Text = "Изделие"; - изделиеToolStripMenuItem.Click += ИзделиеToolStripMenuItem_Click; - // - // отчетыToolStripMenuItem - // - отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокПродуктаToolStripMenuItem, компонентыПоИзделиямToolStripMenuItem, списокЗаказовToolStripMenuItem }); - отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - отчетыToolStripMenuItem.Size = new Size(73, 24); - отчетыToolStripMenuItem.Text = "Отчеты"; - // - // списокПродуктаToolStripMenuItem - // - списокПродуктаToolStripMenuItem.Name = "списокПродуктаToolStripMenuItem"; - списокПродуктаToolStripMenuItem.Size = new Size(276, 26); - списокПродуктаToolStripMenuItem.Text = "Список изделия"; - списокПродуктаToolStripMenuItem.Click += СписокИзделияToolStripMenuItem_Click; - // - // dataGridView - // - dataGridView.AllowUserToAddRows = false; - dataGridView.AllowUserToDeleteRows = false; - dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; - dataGridView.BackgroundColor = SystemColors.ControlLightLight; - dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Location = new Point(0, 37); - dataGridView.Name = "dataGridView"; - dataGridView.ReadOnly = true; - dataGridView.RowHeadersVisible = false; - dataGridView.RowHeadersWidth = 51; - dataGridView.RowTemplate.Height = 29; - dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView.Size = new Size(944, 427); - dataGridView.TabIndex = 1; - // - // buttonCreateOrder - // - buttonCreateOrder.Location = new Point(965, 77); - buttonCreateOrder.Name = "buttonCreateOrder"; - buttonCreateOrder.Size = new Size(199, 36); - buttonCreateOrder.TabIndex = 2; - buttonCreateOrder.Text = "Создать заказ"; - buttonCreateOrder.UseVisualStyleBackColor = true; - buttonCreateOrder.Click += ButtonCreateOrder_Click; - // - // buttonTakeOrderInWork - // - buttonTakeOrderInWork.Location = new Point(965, 149); - buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; - buttonTakeOrderInWork.Size = new Size(199, 36); - buttonTakeOrderInWork.TabIndex = 3; - buttonTakeOrderInWork.Text = "Отдать на выполнение"; - buttonTakeOrderInWork.UseVisualStyleBackColor = true; - buttonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click; - // - // buttonOrderReady - // - buttonOrderReady.Location = new Point(963, 222); - buttonOrderReady.Name = "buttonOrderReady"; - buttonOrderReady.Size = new Size(199, 36); - buttonOrderReady.TabIndex = 4; - buttonOrderReady.Text = "Заказ готов"; - buttonOrderReady.UseVisualStyleBackColor = true; - buttonOrderReady.Click += ButtonOrderReady_Click; - // - // buttonIssuedOrder - // - buttonIssuedOrder.Location = new Point(965, 305); - buttonIssuedOrder.Name = "buttonIssuedOrder"; - buttonIssuedOrder.Size = new Size(199, 36); - buttonIssuedOrder.TabIndex = 5; - buttonIssuedOrder.Text = "Заказ выдан"; - buttonIssuedOrder.UseVisualStyleBackColor = true; - buttonIssuedOrder.Click += ButtonIssuedOrder_Click; - // - // buttonUpd - // - buttonUpd.Location = new Point(965, 384); - buttonUpd.Name = "buttonUpd"; - buttonUpd.Size = new Size(197, 36); - buttonUpd.TabIndex = 6; - buttonUpd.Text = "Обновить список"; - buttonUpd.UseVisualStyleBackColor = true; - buttonUpd.Click += ButtonUpd_Click; - // - // компонентыПоИзделиямToolStripMenuItem - // - компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem"; - компонентыПоИзделиямToolStripMenuItem.Size = new Size(276, 26); - компонентыПоИзделиямToolStripMenuItem.Text = "Компоненты по изделиям"; - компонентыПоИзделиямToolStripMenuItem.Click += КомпонентыПоИзделиямToolStripMenuItem_Click; - // - // списокЗаказовToolStripMenuItem - // - списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; - списокЗаказовToolStripMenuItem.Size = new Size(276, 26); - списокЗаказовToolStripMenuItem.Text = "Список заказов"; - списокЗаказовToolStripMenuItem.Click += СписокЗаказовToolStripMenuItem_Click; - // - // FormMain - // - AutoScaleDimensions = new SizeF(8F, 20F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1178, 463); - Controls.Add(buttonUpd); - Controls.Add(buttonIssuedOrder); - Controls.Add(buttonOrderReady); - Controls.Add(buttonTakeOrderInWork); - Controls.Add(buttonCreateOrder); - Controls.Add(dataGridView); - Controls.Add(menuStrip); - MainMenuStrip = menuStrip; - Name = "FormMain"; - StartPosition = FormStartPosition.CenterScreen; - Text = "Текстильная фабрика"; - Load += FormMain_Load; - menuStrip.ResumeLayout(false); - menuStrip.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); - ResumeLayout(false); - PerformLayout(); - } + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + menuStrip = new MenuStrip(); + справочникиToolStripMenuItem = new ToolStripMenuItem(); + компонентыToolStripMenuItem = new ToolStripMenuItem(); + изделиеToolStripMenuItem = new ToolStripMenuItem(); + магазинToolStripMenuItem = new ToolStripMenuItem(); + пополнениеМагазинаToolStripMenuItem = new ToolStripMenuItem(); + dataGridView = new DataGridView(); + buttonCreateOrder = new Button(); + buttonTakeOrderInWork = new Button(); + buttonOrderReady = new Button(); + buttonIssuedOrder = new Button(); + buttonUpd = new Button(); + продажаИзделияToolStripMenuItem = new ToolStripMenuItem(); + menuStrip.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // menuStrip + // + menuStrip.ImageScalingSize = new Size(20, 20); + menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, пополнениеМагазинаToolStripMenuItem, продажаИзделияToolStripMenuItem }); + menuStrip.Location = new Point(0, 0); + menuStrip.Name = "menuStrip"; + menuStrip.Size = new Size(1178, 28); + menuStrip.TabIndex = 0; + menuStrip.Text = "menuStrip1"; + // + // справочникиToolStripMenuItem + // + справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделиеToolStripMenuItem, магазинToolStripMenuItem }); + справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; + справочникиToolStripMenuItem.Size = new Size(117, 24); + справочникиToolStripMenuItem.Text = "Справочники"; + // + // компонентыToolStripMenuItem + // + компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; + компонентыToolStripMenuItem.Size = new Size(224, 26); + компонентыToolStripMenuItem.Text = "Компоненты"; + компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; + // + // изделиеToolStripMenuItem + // + изделиеToolStripMenuItem.Name = "изделиеToolStripMenuItem"; + изделиеToolStripMenuItem.Size = new Size(224, 26); + изделиеToolStripMenuItem.Text = "Изделие"; + изделиеToolStripMenuItem.Click += ИзделиеToolStripMenuItem_Click; + // + // магазинToolStripMenuItem + // + магазинToolStripMenuItem.Name = "магазинToolStripMenuItem"; + магазинToolStripMenuItem.Size = new Size(224, 26); + магазинToolStripMenuItem.Text = "Магазины"; + магазинToolStripMenuItem.Click += МагазиныToolStripMenuItem_Click; + // + // пополнениеМагазинаToolStripMenuItem + // + пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem"; + пополнениеМагазинаToolStripMenuItem.Size = new Size(182, 24); + пополнениеМагазинаToolStripMenuItem.Text = "Пополнение магазина"; + пополнениеМагазинаToolStripMenuItem.Click += ПополнениеМагазинаToolStripMenuItem_Click; + // + // dataGridView + // + dataGridView.AllowUserToAddRows = false; + dataGridView.AllowUserToDeleteRows = false; + dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; + dataGridView.BackgroundColor = SystemColors.ControlLightLight; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Location = new Point(0, 37); + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersVisible = false; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 29; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(944, 427); + dataGridView.TabIndex = 1; + // + // buttonCreateOrder + // + buttonCreateOrder.Location = new Point(965, 77); + buttonCreateOrder.Name = "buttonCreateOrder"; + buttonCreateOrder.Size = new Size(199, 36); + buttonCreateOrder.TabIndex = 2; + buttonCreateOrder.Text = "Создать заказ"; + buttonCreateOrder.UseVisualStyleBackColor = true; + buttonCreateOrder.Click += ButtonCreateOrder_Click; + // + // buttonTakeOrderInWork + // + buttonTakeOrderInWork.Location = new Point(965, 149); + buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; + buttonTakeOrderInWork.Size = new Size(199, 36); + buttonTakeOrderInWork.TabIndex = 3; + buttonTakeOrderInWork.Text = "Отдать на выполнение"; + buttonTakeOrderInWork.UseVisualStyleBackColor = true; + buttonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click; + // + // buttonOrderReady + // + buttonOrderReady.Location = new Point(963, 222); + buttonOrderReady.Name = "buttonOrderReady"; + buttonOrderReady.Size = new Size(199, 36); + buttonOrderReady.TabIndex = 4; + buttonOrderReady.Text = "Заказ готов"; + buttonOrderReady.UseVisualStyleBackColor = true; + buttonOrderReady.Click += ButtonOrderReady_Click; + // + // buttonIssuedOrder + // + buttonIssuedOrder.Location = new Point(965, 305); + buttonIssuedOrder.Name = "buttonIssuedOrder"; + buttonIssuedOrder.Size = new Size(199, 36); + buttonIssuedOrder.TabIndex = 5; + buttonIssuedOrder.Text = "Заказ выдан"; + buttonIssuedOrder.UseVisualStyleBackColor = true; + buttonIssuedOrder.Click += ButtonIssuedOrder_Click; + // + // buttonUpd + // + buttonUpd.Location = new Point(965, 384); + buttonUpd.Name = "buttonUpd"; + buttonUpd.Size = new Size(197, 36); + buttonUpd.TabIndex = 6; + buttonUpd.Text = "Обновить список"; + buttonUpd.UseVisualStyleBackColor = true; + buttonUpd.Click += ButtonUpd_Click; + // + // продажаИзделияToolStripMenuItem + // + продажаИзделияToolStripMenuItem.Name = "продажаИзделияToolStripMenuItem"; + продажаИзделияToolStripMenuItem.Size = new Size(148, 24); + продажаИзделияToolStripMenuItem.Text = "Продажа изделия"; + продажаИзделияToolStripMenuItem.Click += продажаИзделияToolStripMenuItem_Click; + // + // FormMain + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1178, 463); + Controls.Add(buttonUpd); + Controls.Add(buttonIssuedOrder); + Controls.Add(buttonOrderReady); + Controls.Add(buttonTakeOrderInWork); + Controls.Add(buttonCreateOrder); + Controls.Add(dataGridView); + Controls.Add(menuStrip); + MainMenuStrip = menuStrip; + Name = "FormMain"; + StartPosition = FormStartPosition.CenterScreen; + Text = "Текстильная фабрика"; + Load += FormMain_Load; + menuStrip.ResumeLayout(false); + menuStrip.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + PerformLayout(); + } - #endregion + #endregion - private MenuStrip menuStrip; + private MenuStrip menuStrip; private ToolStripMenuItem справочникиToolStripMenuItem; private ToolStripMenuItem компонентыToolStripMenuItem; private ToolStripMenuItem изделиеToolStripMenuItem; @@ -208,9 +200,8 @@ private Button buttonOrderReady; private Button buttonIssuedOrder; private Button buttonUpd; - private ToolStripMenuItem отчетыToolStripMenuItem; - private ToolStripMenuItem списокПродуктаToolStripMenuItem; - private ToolStripMenuItem компонентыПоИзделиямToolStripMenuItem; - private ToolStripMenuItem списокЗаказовToolStripMenuItem; - } + private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem; + private ToolStripMenuItem магазинToolStripMenuItem; + private ToolStripMenuItem продажаИзделияToolStripMenuItem; + } } \ No newline at end of file diff --git a/GarmentFactory/GarmentFactoryView/FormMain.cs b/GarmentFactory/GarmentFactoryView/FormMain.cs index b4fee53..7b8382b 100644 --- a/GarmentFactory/GarmentFactoryView/FormMain.cs +++ b/GarmentFactory/GarmentFactoryView/FormMain.cs @@ -13,177 +13,174 @@ using Microsoft.Extensions.Logging; namespace GarmentFactoryView { - public partial class FormMain : Form - { - private readonly ILogger _logger; - private readonly IOrderLogic _orderLogic; - private readonly IReportLogic _reportLogic; + public partial class FormMain : Form + { + private readonly ILogger _logger; + private readonly IOrderLogic _orderLogic; - public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic) - { - InitializeComponent(); - _logger = logger; - _orderLogic = orderLogic; - _reportLogic = reportLogic; - } + public FormMain(ILogger logger, IOrderLogic orderLogic) + { + InitializeComponent(); + _logger = logger; + _orderLogic = orderLogic; + } - private void FormMain_Load(object sender, EventArgs e) - { - LoadData(); - } - private void LoadData() - { - try - { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["TextileId"].Visible = false; - dataGridView.Columns["TextileName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка заказов"); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка загрузки заказов"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); - if (service is FormComponents form) - { - form.ShowDialog(); - } - } + private void FormMain_Load(object sender, EventArgs e) + { + LoadData(); + } + private void LoadData() + { + try + { + var list = _orderLogic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["TextileId"].Visible = false; + dataGridView.Columns["TextileName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка заказов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки заказов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); + if (service is FormComponents form) + { + form.ShowDialog(); + } + } - private void ИзделиеToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormTextiles)); - if (service is FormTextiles form) - { - form.ShowDialog(); - } - } + private void ИзделиеToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormTextiles)); + if (service is FormTextiles form) + { + form.ShowDialog(); + } + } - private void ButtonCreateOrder_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); - if (service is FormCreateOrder form) - { - form.ShowDialog(); - LoadData(); - } + private void ButtonCreateOrder_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); + if (service is FormCreateOrder form) + { + form.ShowDialog(); + LoadData(); + } - } + } - private void ButtonTakeOrderInWork_Click(object sender, EventArgs e) - { - if (dataGridView.SelectedRows.Count == 1) - { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id); - try - { - var operationResult = _orderLogic.TakeOrderInWork(new - OrderBindingModel - { Id = id }); - if (!operationResult) - { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); - } - LoadData(); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка передачи заказа в работу"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); - } - } - } - private void ButtonOrderReady_Click(object sender, EventArgs e) - { - if (dataGridView.SelectedRows.Count == 1) - { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id); - try - { - var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id }); - if (!operationResult) - { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); - } - LoadData(); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка отметки о готовности заказа"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } + private void ButtonTakeOrderInWork_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id); + try + { + var operationResult = _orderLogic.TakeOrderInWork(new + OrderBindingModel + { Id = id }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка передачи заказа в работу"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + } + private void ButtonOrderReady_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id); + try + { + var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о готовности заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } - } + } - private void ButtonIssuedOrder_Click(object sender, EventArgs e) - { - if (dataGridView.SelectedRows.Count == 1) - { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id); - try - { - var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel { Id = id }); - if (!operationResult) - { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); - } - _logger.LogInformation("Заказ №{id} выдан", id); - LoadData(); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); - } - } + private void ButtonIssuedOrder_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id); + try + { + var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel { Id = id }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + _logger.LogInformation("Заказ №{id} выдан", id); + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } - } - private void ButtonUpd_Click(object sender, EventArgs e) - { - LoadData(); - } + } + private void ButtonUpd_Click(object sender, EventArgs e) + { + LoadData(); + } - private void СписокИзделияToolStripMenuItem_Click(object sender, EventArgs e) - { - using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; - if (dialog.ShowDialog() == DialogResult.OK) - { - _reportLogic.SaveTextilesToWordFile(new ReportBindingModel { FileName = dialog.FileName }); - MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - } + private void ПополнениеМагазинаToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormMakeDelivery)); + if (service is FormMakeDelivery form) + { + form.ShowDialog(); + } + } - private void КомпонентыПоИзделиямToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormReportTextileComponents)); - if (service is FormReportTextileComponents form) - { - form.ShowDialog(); - } - } + private void МагазиныToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShops)); + if (service is FormShops form) + { + form.ShowDialog(); + } + } - private void СписокЗаказовToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); - if (service is FormReportOrders form) - { - form.ShowDialog(); - } - } - } + private void продажаИзделияToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormTextileSale)); + if (service is FormTextileSale form) + { + form.ShowDialog(); + } + } + } } diff --git a/GarmentFactory/GarmentFactoryView/FormReportOrders.cs b/GarmentFactory/GarmentFactoryView/FormReportOrders.cs deleted file mode 100644 index 933a791..0000000 --- a/GarmentFactory/GarmentFactoryView/FormReportOrders.cs +++ /dev/null @@ -1,91 +0,0 @@ -using GarmentFactoryContracts.BindingModels; -using GarmentFactoryContracts.BusinessLogicsContracts; -using Microsoft.Extensions.Logging; -using Microsoft.Reporting.WinForms; - -namespace GarmentFactoryView -{ - 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 ButtonCreateReport_Click(object sender, EventArgs e) - { - if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date) - { - MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - try - { - var dataSource = _logic.GetOrders(new ReportBindingModel - { - DateFrom = dateTimePickerFrom.Value, - DateTo = dateTimePickerTo.Value - }); - var source = new ReportDataSource("DataSetOrders", dataSource); - reportViewer.LocalReport.DataSources.Clear(); - reportViewer.LocalReport.DataSources.Add(source); - var parameters = new[] { new ReportParameter("ReportParameterPeriod", - $"c {dateTimePickerFrom.Value.ToShortDateString()} по {dateTimePickerTo.Value.ToShortDateString()}") }; - reportViewer.LocalReport.SetParameters(parameters); - - reportViewer.RefreshReport(); - _logger.LogInformation("Loading list of orders for period {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString()); - } - catch (Exception ex) - { - _logger.LogError(ex, "Loading list of orders for period error"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - - private void ButtonToPdf_Click(object sender, EventArgs e) - { - if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date) - { - MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" }; - if (dialog.ShowDialog() == DialogResult.OK) - { - try - { - _logic.SaveOrdersToPdfFile(new ReportBindingModel - { - FileName = dialog.FileName, - DateFrom = dateTimePickerFrom.Value, - DateTo = dateTimePickerTo.Value - }); - _logger.LogInformation("Saving list of orders for period {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString()); - MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - catch (Exception ex) - { - _logger.LogError(ex, "Saving list of orders for period error"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - } - } -} \ No newline at end of file diff --git a/GarmentFactory/GarmentFactoryView/FormReportOrders.designer.cs b/GarmentFactory/GarmentFactoryView/FormReportOrders.designer.cs deleted file mode 100644 index 449e067..0000000 --- a/GarmentFactory/GarmentFactoryView/FormReportOrders.designer.cs +++ /dev/null @@ -1,140 +0,0 @@ -namespace GarmentFactoryView -{ - 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() - { - panel = new Panel(); - buttonToPdf = new Button(); - buttonCreateReport = new Button(); - dateTimePickerTo = new DateTimePicker(); - labelTo = new Label(); - dateTimePickerFrom = new DateTimePicker(); - labelFrom = new Label(); - panel.SuspendLayout(); - SuspendLayout(); - // - // panel - // - panel.Controls.Add(buttonToPdf); - panel.Controls.Add(buttonCreateReport); - panel.Controls.Add(dateTimePickerTo); - panel.Controls.Add(labelTo); - panel.Controls.Add(dateTimePickerFrom); - panel.Controls.Add(labelFrom); - panel.Dock = DockStyle.Top; - panel.Location = new Point(0, 0); - panel.Margin = new Padding(4, 3, 4, 3); - panel.Name = "panel"; - panel.Size = new Size(1031, 40); - panel.TabIndex = 0; - // - // buttonToPdf - // - buttonToPdf.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonToPdf.Location = new Point(878, 8); - buttonToPdf.Margin = new Padding(4, 3, 4, 3); - buttonToPdf.Name = "buttonToPdf"; - buttonToPdf.Size = new Size(139, 27); - buttonToPdf.TabIndex = 5; - buttonToPdf.Text = "В Pdf"; - buttonToPdf.UseVisualStyleBackColor = true; - buttonToPdf.Click += ButtonToPdf_Click; - // - // buttonCreateReport - // - buttonCreateReport.Location = new Point(476, 8); - buttonCreateReport.Margin = new Padding(4, 3, 4, 3); - buttonCreateReport.Name = "buttonCreateReport"; - buttonCreateReport.Size = new Size(139, 27); - buttonCreateReport.TabIndex = 4; - buttonCreateReport.Text = "Сформировать"; - buttonCreateReport.UseVisualStyleBackColor = true; - buttonCreateReport.Click += ButtonCreateReport_Click; - // - // dateTimePickerTo - // - dateTimePickerTo.Location = new Point(237, 10); - dateTimePickerTo.Margin = new Padding(4, 3, 4, 3); - dateTimePickerTo.Name = "dateTimePickerTo"; - dateTimePickerTo.Size = new Size(163, 23); - dateTimePickerTo.TabIndex = 3; - // - // labelTo - // - labelTo.AutoSize = true; - labelTo.Location = new Point(208, 13); - labelTo.Margin = new Padding(4, 0, 4, 0); - labelTo.Name = "labelTo"; - labelTo.Size = new Size(21, 15); - labelTo.TabIndex = 2; - labelTo.Text = "по"; - // - // dateTimePickerFrom - // - dateTimePickerFrom.Location = new Point(37, 10); - dateTimePickerFrom.Margin = new Padding(4, 3, 4, 3); - dateTimePickerFrom.Name = "dateTimePickerFrom"; - dateTimePickerFrom.Size = new Size(163, 23); - dateTimePickerFrom.TabIndex = 1; - // - // labelFrom - // - labelFrom.AutoSize = true; - labelFrom.Location = new Point(14, 13); - labelFrom.Margin = new Padding(4, 0, 4, 0); - labelFrom.Name = "labelFrom"; - labelFrom.Size = new Size(15, 15); - labelFrom.TabIndex = 0; - labelFrom.Text = "С"; - // - // FormReportOrders - // - AutoScaleDimensions = new SizeF(7F, 15F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1031, 647); - Controls.Add(panel); - Margin = new Padding(4, 3, 4, 3); - Name = "FormReportOrders"; - StartPosition = FormStartPosition.CenterScreen; - Text = "Заказы"; - panel.ResumeLayout(false); - panel.PerformLayout(); - ResumeLayout(false); - } - - #endregion - - private System.Windows.Forms.Panel panel; - private System.Windows.Forms.Button buttonToPdf; - private System.Windows.Forms.Button buttonCreateReport; - 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/GarmentFactory/GarmentFactoryView/FormReportOrders.resx b/GarmentFactory/GarmentFactoryView/FormReportOrders.resx deleted file mode 100644 index af32865..0000000 --- a/GarmentFactory/GarmentFactoryView/FormReportOrders.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/GarmentFactory/GarmentFactoryView/FormReportTextileComponents.Designer.cs b/GarmentFactory/GarmentFactoryView/FormReportTextileComponents.Designer.cs deleted file mode 100644 index ad139db..0000000 --- a/GarmentFactory/GarmentFactoryView/FormReportTextileComponents.Designer.cs +++ /dev/null @@ -1,117 +0,0 @@ -namespace GarmentFactoryView -{ - partial class FormReportTextileComponents - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - buttonSaveToExcel = new Button(); - dataGridView = new DataGridView(); - ColumnTextile = new DataGridViewTextBoxColumn(); - ColumnComponent = new DataGridViewTextBoxColumn(); - ColumnCount = new DataGridViewTextBoxColumn(); - ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); - SuspendLayout(); - // - // buttonSaveToExcel - // - buttonSaveToExcel.Location = new Point(12, 12); - buttonSaveToExcel.Name = "buttonSaveToExcel"; - buttonSaveToExcel.Size = new Size(242, 37); - buttonSaveToExcel.TabIndex = 0; - buttonSaveToExcel.Text = "Сохранить в Excel"; - buttonSaveToExcel.UseVisualStyleBackColor = true; - buttonSaveToExcel.Click += ButtonSaveToExcel_Click; - // - // dataGridView - // - dataGridView.AllowUserToAddRows = false; - dataGridView.AllowUserToDeleteRows = false; - dataGridView.AllowUserToOrderColumns = true; - dataGridView.AllowUserToResizeColumns = false; - dataGridView.AllowUserToResizeRows = false; - dataGridView.BackgroundColor = SystemColors.ControlLightLight; - dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnTextile, ColumnComponent, ColumnCount }); - dataGridView.Dock = DockStyle.Bottom; - dataGridView.Location = new Point(0, 66); - dataGridView.MultiSelect = false; - dataGridView.Name = "dataGridView"; - dataGridView.ReadOnly = true; - dataGridView.RowHeadersVisible = false; - dataGridView.RowHeadersWidth = 51; - dataGridView.RowTemplate.Height = 29; - dataGridView.Size = new Size(704, 677); - dataGridView.TabIndex = 0; - // - // ColumnTextile - // - ColumnTextile.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - ColumnTextile.HeaderText = "Изделие"; - ColumnTextile.MinimumWidth = 6; - ColumnTextile.Name = "ColumnTextile"; - ColumnTextile.ReadOnly = true; - // - // ColumnComponent - // - ColumnComponent.HeaderText = "Компонент"; - ColumnComponent.MinimumWidth = 6; - ColumnComponent.Name = "ColumnComponent"; - ColumnComponent.ReadOnly = true; - ColumnComponent.Width = 180; - // - // ColumnCount - // - ColumnCount.HeaderText = "Количество"; - ColumnCount.MinimumWidth = 6; - ColumnCount.Name = "ColumnCount"; - ColumnCount.ReadOnly = true; - ColumnCount.Width = 180; - // - // FormReportTextileComponents - // - AutoScaleDimensions = new SizeF(8F, 20F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(704, 743); - Controls.Add(dataGridView); - Controls.Add(buttonSaveToExcel); - Name = "FormReportTextileComponents"; - StartPosition = FormStartPosition.CenterScreen; - Text = "Компоненты по изделиям"; - Load += FormReportProductComponents_Load; - ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); - ResumeLayout(false); - } - - #endregion - - private Button buttonSaveToExcel; - private DataGridView dataGridView; - private DataGridViewTextBoxColumn ColumnTextile; - private DataGridViewTextBoxColumn ColumnComponent; - private DataGridViewTextBoxColumn ColumnCount; - } -} \ No newline at end of file diff --git a/GarmentFactory/GarmentFactoryView/FormReportTextileComponents.cs b/GarmentFactory/GarmentFactoryView/FormReportTextileComponents.cs deleted file mode 100644 index 157a54f..0000000 --- a/GarmentFactory/GarmentFactoryView/FormReportTextileComponents.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using GarmentFactoryContracts.BindingModels; -using GarmentFactoryContracts.BusinessLogicsContracts; -using Microsoft.Extensions.Logging; - - -namespace GarmentFactoryView -{ - public partial class FormReportTextileComponents : Form - { - private readonly ILogger _logger; - - private readonly IReportLogic _logic; - public FormReportTextileComponents(ILogger logger, IReportLogic logic) - { - InitializeComponent(); - _logger = logger; - _logic = logic; - } - - private void ButtonSaveToExcel_Click(object sender, EventArgs e) - { - using var dialog = new SaveFileDialog { Filter = "xlsx|*.xlsx" }; - if (dialog.ShowDialog() == DialogResult.OK) - { - try - { - _logic.SaveTextileComponentToExcelFile(new ReportBindingModel - { - FileName = dialog.FileName - }); - _logger.LogInformation("Saving list of textiles with components"); - MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - catch (Exception ex) - { - _logger.LogError(ex, "Saving list of textiles with components error"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - } - - private void FormReportProductComponents_Load(object sender, EventArgs e) - { - - try - { - var dict = _logic.GetTextileComponents(); - if (dict != null) - { - dataGridView.Rows.Clear(); - foreach (var elem in dict) - { - dataGridView.Rows.Add(new object[] { elem.TextileName, "", "" }); - 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()); - } - } - _logger.LogInformation("Loading list of textiles with components"); - } - catch (Exception ex) - { - _logger.LogError(ex, "Loading list of textiles with components error"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - } -} diff --git a/GarmentFactory/GarmentFactoryView/FormReportTextileComponents.resx b/GarmentFactory/GarmentFactoryView/FormReportTextileComponents.resx deleted file mode 100644 index f5f35e0..0000000 --- a/GarmentFactory/GarmentFactoryView/FormReportTextileComponents.resx +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - True - - - True - - - True - - \ No newline at end of file diff --git a/GarmentFactory/GarmentFactoryView/GarmentFactoryView.csproj b/GarmentFactory/GarmentFactoryView/GarmentFactoryView.csproj index 0ffbeaa..46b9ce5 100644 --- a/GarmentFactory/GarmentFactoryView/GarmentFactoryView.csproj +++ b/GarmentFactory/GarmentFactoryView/GarmentFactoryView.csproj @@ -27,10 +27,4 @@ - - - Always - - - \ No newline at end of file diff --git a/GarmentFactory/GarmentFactoryView/Program.cs b/GarmentFactory/GarmentFactoryView/Program.cs index f38ba41..3b525d3 100644 --- a/GarmentFactory/GarmentFactoryView/Program.cs +++ b/GarmentFactory/GarmentFactoryView/Program.cs @@ -5,8 +5,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; using GarmentFactoryDatabaseImplement.Implements; -using GarmentFactoryBusinessLogic.OfficePackage.Implements; -using GarmentFactoryBusinessLogic.OfficePackage; using System.Drawing; namespace GarmentFactoryView @@ -34,15 +32,13 @@ namespace GarmentFactoryView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -50,9 +46,11 @@ namespace GarmentFactoryView services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - } + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + } } } diff --git a/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.BusinessLogicsContracts.IOrderLogic.datasource b/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.BusinessLogicsContracts.IOrderLogic.datasource deleted file mode 100644 index 659fdeb..0000000 --- a/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.BusinessLogicsContracts.IOrderLogic.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - GarmentFactoryContracts.BusinessLogicsContracts.IOrderLogic, GarmentFactoryContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.BusinessLogicsContracts.IReportLogic.datasource b/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.BusinessLogicsContracts.IReportLogic.datasource deleted file mode 100644 index d8f129d..0000000 --- a/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.BusinessLogicsContracts.IReportLogic.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - GarmentFactoryContracts.BusinessLogicsContracts.IReportLogic, GarmentFactoryContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.BusinessLogicsContracts.ITextileLogic.datasource b/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.BusinessLogicsContracts.ITextileLogic.datasource deleted file mode 100644 index c52461d..0000000 --- a/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.BusinessLogicsContracts.ITextileLogic.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - GarmentFactoryContracts.BusinessLogicsContracts.ITextileLogic, GarmentFactoryContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.StoragesContracts.IComponentStorage.datasource b/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.StoragesContracts.IComponentStorage.datasource deleted file mode 100644 index 63428c6..0000000 --- a/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.StoragesContracts.IComponentStorage.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - GarmentFactoryContracts.StoragesContracts.IComponentStorage, GarmentFactoryContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.StoragesContracts.IOrderStorage.datasource b/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.StoragesContracts.IOrderStorage.datasource deleted file mode 100644 index 8686c61..0000000 --- a/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.StoragesContracts.IOrderStorage.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - GarmentFactoryContracts.StoragesContracts.IOrderStorage, GarmentFactoryContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.StoragesContracts.ITextileStorage.datasource b/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.StoragesContracts.ITextileStorage.datasource deleted file mode 100644 index 537092b..0000000 --- a/GarmentFactory/GarmentFactoryView/Properties/DataSources/GarmentFactoryContracts.StoragesContracts.ITextileStorage.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - GarmentFactoryContracts.StoragesContracts.ITextileStorage, GarmentFactoryContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/GarmentFactory/GarmentFactoryView/ReportOrders.rdlc b/GarmentFactory/GarmentFactoryView/ReportOrders.rdlc deleted file mode 100644 index 516aa3b..0000000 --- a/GarmentFactory/GarmentFactoryView/ReportOrders.rdlc +++ /dev/null @@ -1,599 +0,0 @@ - - - 0 - - - - System.Data.DataSet - /* Local Connection */ - - 47cb53f0-7dde-4717-ba03-866a0bc4f4dd - - - - - - GarmentFactoryContractsViewModels - /* Local Query */ - - - - Id - System.Int32 - - - DateCreate - System.DateTime - - - TextileName - System.String - - - Sum - System.Decimal - - - OrderStatus - GarmentFactoryDataModels.OrderStatus - - - - GarmentFactoryContracts.ViewModels - ReportOrderViewModel - GarmentFactoryContracts.ViewModels.ReportOrderViewModel, GarmentFactoryContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - - - - - - - true - true - - - - - =Parameters!ReportParameterPeriod.Value - - - - - - - ReportParameterPeriod - 1cm - 1cm - 21cm - - - Middle - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - Заказы - - - - - - - 1cm - 21cm - 1 - - - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - 2.5cm - - - 3.21438cm - - - 8.23317cm - - - 2.5cm - - - 2.5cm - - - - - 0.6cm - - - - - true - true - - - - - Номер - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Дата создания - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Изделие - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Статус Заказа - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Сумма - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - 0.6cm - - - - - true - true - - - - - =Fields!Id.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!DateCreate.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!TextileName.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!OrderStatus.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!Sum.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - - - - - - - - - After - - - - - - - DataSetOrders - 2.48391cm - 0.55245cm - 1.2cm - 18.94755cm - 2 - - - - - - true - true - - - - - Итого: - - - - - - - 4cm - 12cm - 0.6cm - 2.5cm - 3 - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Sum(Fields!Sum.Value, "DataSetOrders") - - - - - - - 4cm - 14.5cm - 0.6cm - 2.5cm - 4 - - - 2pt - 2pt - 2pt - 2pt - - - - 5.72875cm -