diff --git a/SewingDresses/SewingDressesBusinessLogic/BusinessLogic/ReportLogic.cs b/SewingDresses/SewingDressesBusinessLogic/BusinessLogic/ReportLogic.cs index 41d9b11..dc2ae4e 100644 --- a/SewingDresses/SewingDressesBusinessLogic/BusinessLogic/ReportLogic.cs +++ b/SewingDresses/SewingDressesBusinessLogic/BusinessLogic/ReportLogic.cs @@ -13,14 +13,16 @@ namespace SewingDressesBusinessLogic.BusinessLogic private readonly IComponentStorage _componentStorage; private readonly IDressStorage _dressStorage; private readonly IOrderStorage _orderStorage; + private readonly IShopStorage _shopStorage; private readonly AbstractSaveToExcel _saveToExcel; private readonly AbstractSaveToWord _saveToWord; private readonly AbstractSaveToPdf _saveToPdf; - public ReportLogic(IComponentStorage componentStorage, IDressStorage dressStorage, IOrderStorage orderStorage, AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf) + public ReportLogic(IComponentStorage componentStorage, IDressStorage dressStorage, IOrderStorage orderStorage, IShopStorage shopStorage, AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf) { _componentStorage = componentStorage; _dressStorage = dressStorage; _orderStorage = orderStorage; + _shopStorage = shopStorage; _saveToExcel = saveToExcel; _saveToWord = saveToWord; _saveToPdf = saveToPdf; @@ -97,5 +99,65 @@ namespace SewingDressesBusinessLogic.BusinessLogic Orders = GetOrders(model) }); } - } + public List GetShopsDresses() + { + var shops = _shopStorage.GetFullList(); + var list = new List(); + foreach (var shop in shops) + { + var record = new ReportShopDressViewModel + { + ShopName = shop.ShopName, + Dresses = new List>(), + TotalCount = 0 + }; + foreach (var dress in shop.ShopDresses) + { + record.Dresses.Add(new Tuple(dress.Value.Item1.DressName, dress.Value.Item2)); + record.TotalCount += + dress.Value.Item2; + } + list.Add(record); + } + return list; + } + public List GetDateOrders() + { + return _orderStorage.GetFullList().GroupBy(x => x.DateCreate.Date).Select(x => new ReportDateOrdersViewModel + { + DateOfOrders = x.Key, + Count = x.Count(), + Sum = x.Sum(y => y.Sum) + }).ToList(); + } + public void SaveDatesOrdersToPdfFile(ReportBindingModel model) + { + _saveToPdf.CreateReportDateDoc(new PdfInfo + { + FileName = model.FileName, + Title = "Заказы по датам", + DateOrders = GetDateOrders() + }); + } + public void SaveShopsToWordFile(ReportBindingModel model) + { + var tmp = _shopStorage.GetFullList(); + _saveToWord.CreateTableDoc(new WordInfo + { + FileName = model.FileName, + Title = "Список магазинов", + Shops = _shopStorage.GetFullList() + }); + } + public void SaveShopsDressesToExcelFile(ReportBindingModel model) + { + _saveToExcel.CreateShopReport(new ExcelInfo + { + FileName = model.FileName, + Title = "Загруженность магазинов", + ShopDresses = GetShopsDresses() + }); + } + } } diff --git a/SewingDresses/SewingDressesBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/SewingDresses/SewingDressesBusinessLogic/OfficePackage/AbstractSaveToExcel.cs index 6d8df90..6d36b06 100644 --- a/SewingDresses/SewingDressesBusinessLogic/OfficePackage/AbstractSaveToExcel.cs +++ b/SewingDresses/SewingDressesBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -75,8 +75,71 @@ namespace SewingDressesBusinessLogic.OfficePackage SaveExcel(info); } - - protected abstract void CreateExcel(ExcelInfo info); + public void CreateShopReport(ExcelInfo info) + { + CreateExcel(info); + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = 1, + Text = info.Title, + StyleInfo = ExcelStyleInfoType.Title + }); + MergeCells(new ExcelMergeParameters + { + CellFromName = "A1", + CellToName = "C1" + }); + uint rowIndex = 2; + foreach (var pc in info.ShopDresses) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = rowIndex, + Text = pc.ShopName, + StyleInfo = ExcelStyleInfoType.Text + }); + rowIndex++; + foreach (var iceCream in pc.Dresses) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "B", + RowIndex = rowIndex, + Text = iceCream.Item1, + StyleInfo = + ExcelStyleInfoType.TextWithBorder + }); + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "C", + RowIndex = rowIndex, + Text = iceCream.Item2.ToString(), + StyleInfo = + ExcelStyleInfoType.TextWithBorder + }); + rowIndex++; + } + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = rowIndex, + Text = "Итого", + StyleInfo = ExcelStyleInfoType.Text + }); + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "C", + RowIndex = rowIndex, + Text = pc.TotalCount.ToString(), + StyleInfo = ExcelStyleInfoType.Text + }); + rowIndex++; + } + SaveExcel(info); + } + protected abstract void CreateExcel(ExcelInfo info); protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams); protected abstract void MergeCells(ExcelMergeParameters excelParams); protected abstract void SaveExcel(ExcelInfo info); diff --git a/SewingDresses/SewingDressesBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/SewingDresses/SewingDressesBusinessLogic/OfficePackage/AbstractSaveToPdf.cs index afa1b94..30b01ce 100644 --- a/SewingDresses/SewingDressesBusinessLogic/OfficePackage/AbstractSaveToPdf.cs +++ b/SewingDresses/SewingDressesBusinessLogic/OfficePackage/AbstractSaveToPdf.cs @@ -35,7 +35,41 @@ namespace SewingDressesBusinessLogic.OfficePackage SavePdf(info); } - protected abstract void CreatePdf(PdfInfo info); + + public void CreateReportDateDoc(PdfInfo info) + { + CreatePdf(info); + CreateParagraph(new PdfParagraph + { + Text = info.Title, + Style = "NormalTitle", + ParagraphAlignment = PdfParagraphAlignmentType.Center + }); + CreateTable(new List { "3cm", "3cm", "7cm" }); + CreateRow(new PdfRowParameters + { + Texts = new List { "Дата", "Количество", "Сумма" }, + Style = "NormalTitle", + ParagraphAlignment = PdfParagraphAlignmentType.Center + }); + foreach (var order in info.DateOrders) + { + CreateRow(new PdfRowParameters + { + Texts = new List { order.DateOfOrders.ToShortDateString(), order.Count.ToString(), order.Sum.ToString() }, + Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Left + }); + } + CreateParagraph(new PdfParagraph + { + Text = $"Итого: {info.DateOrders.Sum(x => x.Sum)}\t", + Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Center + }); + SavePdf(info); + } + protected abstract void CreatePdf(PdfInfo info); protected abstract void CreateParagraph(PdfParagraph paragraph); diff --git a/SewingDresses/SewingDressesBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/SewingDresses/SewingDressesBusinessLogic/OfficePackage/AbstractSaveToWord.cs index 7d55650..b9a502c 100644 --- a/SewingDresses/SewingDressesBusinessLogic/OfficePackage/AbstractSaveToWord.cs +++ b/SewingDresses/SewingDressesBusinessLogic/OfficePackage/AbstractSaveToWord.cs @@ -39,8 +39,35 @@ namespace SewingDressesBusinessLogic.OfficePackage } SaveWord(info); } - protected abstract void CreateWord(WordInfo info); + public void CreateTableDoc(WordInfo info) + { + CreateWord(info); + List> list = new List>(); + foreach (var shop in info.Shops) + { + var ls = new List + { + shop.ShopName, + shop.Adress, + shop.DateOpen.ToShortDateString() + }; + list.Add(ls); + } + var wordTable = new WordTable + { + Headers = new List { + "Название", + "Адрес", + "Дата открытия"}, + Columns = 3, + RowText = list + }; + CreateTable(wordTable); + SaveWord(info); + } + protected abstract void CreateWord(WordInfo info); protected abstract void CreateParagraph(WordParagraph paragraph); - protected abstract void SaveWord(WordInfo info); + protected abstract void CreateTable(WordTable table); + protected abstract void SaveWord(WordInfo info); } } diff --git a/SewingDresses/SewingDressesBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/SewingDresses/SewingDressesBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs index a3865bd..e48b15b 100644 --- a/SewingDresses/SewingDressesBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs +++ b/SewingDresses/SewingDressesBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs @@ -7,5 +7,6 @@ namespace SewingDressesBusinessLogic.OfficePackage.HelperModels public string FileName { get; set; } = string.Empty; public string Title { get; set; } = string.Empty; public List DressComponents { get; set; } = new(); - } + public List ShopDresses { get; set; } = new(); + } } diff --git a/SewingDresses/SewingDressesBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs b/SewingDresses/SewingDressesBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs index e05d5ff..706af1b 100644 --- a/SewingDresses/SewingDressesBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs +++ b/SewingDresses/SewingDressesBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs @@ -11,5 +11,6 @@ namespace SewingDressesBusinessLogic.OfficePackage.HelperModels public DateTime DateTo { get; set; } public OrderStatus Status { get; set; } public List Orders { get; set; } = new(); - } + public List DateOrders { get; set; } = new(); + } } diff --git a/SewingDresses/SewingDressesBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/SewingDresses/SewingDressesBusinessLogic/OfficePackage/HelperModels/WordInfo.cs index 8719fba..7efa5cc 100644 --- a/SewingDresses/SewingDressesBusinessLogic/OfficePackage/HelperModels/WordInfo.cs +++ b/SewingDresses/SewingDressesBusinessLogic/OfficePackage/HelperModels/WordInfo.cs @@ -6,5 +6,6 @@ namespace SewingDressesBusinessLogic.OfficePackage.HelperModels public string FileName { get; set; } = string.Empty; public string Title { get; set; } = string.Empty; public List Dresses { get; set; } = new(); + public List Shops { get; set; } = new(); } } diff --git a/SewingDresses/SewingDressesBusinessLogic/OfficePackage/HelperModels/WordTable.cs b/SewingDresses/SewingDressesBusinessLogic/OfficePackage/HelperModels/WordTable.cs new file mode 100644 index 0000000..b2155c8 --- /dev/null +++ b/SewingDresses/SewingDressesBusinessLogic/OfficePackage/HelperModels/WordTable.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SewingDressesBusinessLogic.OfficePackage.HelperModels +{ + public class WordTable + { + public List Headers { get; set; } = new(); + public List> RowText { get; set; } = new(); + public int Columns { get; set; } + } +} diff --git a/SewingDresses/SewingDressesBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/SewingDresses/SewingDressesBusinessLogic/OfficePackage/Implements/SaveToWord.cs index 2bd9c99..3567cad 100644 --- a/SewingDresses/SewingDressesBusinessLogic/OfficePackage/Implements/SaveToWord.cs +++ b/SewingDresses/SewingDressesBusinessLogic/OfficePackage/Implements/SaveToWord.cs @@ -117,5 +117,82 @@ namespace SewingDressesBusinessLogic.OfficePackage.Implements _wordDocument.Dispose(); } - } + protected override void CreateTable(WordTable table) + { + if (_docBody == null || table == null) + { + return; + } + Table docTable = new Table(); + TableProperties tableProps = new TableProperties( + new TopBorder + { + Val = new EnumValue(BorderValues.Single), + Size = 12 + }, + new BottomBorder + { + Val = new EnumValue(BorderValues.Single), + Size = 12 + }, + new LeftBorder + { + Val = new EnumValue(BorderValues.Single), + Size = 12 + }, + new RightBorder + { + Val = new EnumValue(BorderValues.Single), + Size = 12 + }, + new InsideHorizontalBorder + { + Val = new EnumValue(BorderValues.Single), + Size = 12 + }, + new InsideVerticalBorder + { + Val = new EnumValue(BorderValues.Single), + Size = 12 + }); + docTable.AppendChild(tableProps); + TableGrid tableGrid = new TableGrid(); + for (int i = 0; i < table.Columns; i++) + { + tableGrid.AppendChild(new GridColumn()); + } + docTable.AppendChild(tableGrid); + TableRow tableRow = new TableRow(); + foreach (var text in table.Headers) + { + tableRow.AppendChild(CreateTableCell(text)); + } + docTable.AppendChild(tableRow); + int height = table.RowText.Count; + int width = table.Columns; + for (int i = 0; i < height; i++) + { + tableRow = new TableRow(); + for (int j = 0; j < width; j++) + { + var element = table.RowText[i][j]; + tableRow.AppendChild(CreateTableCell(element)); + } + docTable.AppendChild(tableRow); + } + + _docBody.AppendChild(docTable); + } + + private TableCell CreateTableCell(string element) + { + var tableParagraph = new Paragraph(); + var run = new Run(); + run.AppendChild(new Text { Text = element }); + tableParagraph.AppendChild(run); + var tableCell = new TableCell(); + tableCell.AppendChild(tableParagraph); + return tableCell; + } + } } diff --git a/SewingDresses/SewingDressesDatabaseImplement/Implements/ShopStorage.cs b/SewingDresses/SewingDressesDatabaseImplement/Implements/ShopStorage.cs index 592b935..1e3d36a 100644 --- a/SewingDresses/SewingDressesDatabaseImplement/Implements/ShopStorage.cs +++ b/SewingDresses/SewingDressesDatabaseImplement/Implements/ShopStorage.cs @@ -52,8 +52,8 @@ namespace SewingDressesDatabaseImplement.Implements { using var context = new SewingDressesDatabase(); return context.Shops - .Include(x => x.Dresses) - .ThenInclude(x => x.Dress) + //.Include(x => x.Dresses) + //.ThenInclude(x => x.Dress) .Select(x => x.GetViewModel) .ToList(); } diff --git a/SewingDresses/SewingDressesView/MainForm.Designer.cs b/SewingDresses/SewingDressesView/MainForm.Designer.cs index 4887a47..4df7d11 100644 --- a/SewingDresses/SewingDressesView/MainForm.Designer.cs +++ b/SewingDresses/SewingDressesView/MainForm.Designer.cs @@ -1,235 +1,244 @@ namespace SewingDressesView { - partial class MainForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class MainForm + { + /// + /// 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); - } + /// + /// 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 + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - dataGridView = new DataGridView(); - buttonCreate = new Button(); - buttonDoOrder = new Button(); - buttonOrderReady = new Button(); - buttonOrderGive = new Button(); - buttonOrderUpdate = new Button(); - menuStrip1 = new MenuStrip(); - справочникиToolStripMenuItem = new ToolStripMenuItem(); - компонентыToolStripMenuItem = new ToolStripMenuItem(); - платьяToolStripMenuItem = new ToolStripMenuItem(); - отчетыToolStripMenuItem = new ToolStripMenuItem(); - DressesReportToolStripMenuItem = new ToolStripMenuItem(); - компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem(); - списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); - магазиныToolStripMenuItem = new ToolStripMenuItem(); - поставкиToolStripMenuItem = new ToolStripMenuItem(); - продажаToolStripMenuItem = new ToolStripMenuItem(); - ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); - menuStrip1.SuspendLayout(); - SuspendLayout(); - // - // dataGridView - // - dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Location = new Point(2, 39); - dataGridView.Name = "dataGridView"; - dataGridView.RowHeadersWidth = 51; - dataGridView.RowTemplate.Height = 29; - dataGridView.Size = new Size(804, 447); - dataGridView.TabIndex = 0; - // - // buttonCreate - // - buttonCreate.Location = new Point(854, 62); - buttonCreate.Name = "buttonCreate"; - buttonCreate.Size = new Size(194, 37); - buttonCreate.TabIndex = 1; - buttonCreate.Text = "Создать заказ"; - buttonCreate.UseVisualStyleBackColor = true; - buttonCreate.Click += buttonCreate_Click; - // - // buttonDoOrder - // - buttonDoOrder.Location = new Point(854, 130); - buttonDoOrder.Name = "buttonDoOrder"; - buttonDoOrder.Size = new Size(194, 37); - buttonDoOrder.TabIndex = 2; - buttonDoOrder.Text = "Отдать на выполнение"; - buttonDoOrder.UseVisualStyleBackColor = true; - buttonDoOrder.Click += buttonDoOrder_Click; - // - // buttonOrderReady - // - buttonOrderReady.Location = new Point(854, 205); - buttonOrderReady.Name = "buttonOrderReady"; - buttonOrderReady.Size = new Size(194, 37); - buttonOrderReady.TabIndex = 3; - buttonOrderReady.Text = "Заказ готов"; - buttonOrderReady.UseVisualStyleBackColor = true; - buttonOrderReady.Click += buttonOrderReady_Click; - // - // buttonOrderGive - // - buttonOrderGive.Location = new Point(854, 280); - buttonOrderGive.Name = "buttonOrderGive"; - buttonOrderGive.Size = new Size(194, 37); - buttonOrderGive.TabIndex = 4; - buttonOrderGive.Text = "Заказ выдан"; - buttonOrderGive.UseVisualStyleBackColor = true; - buttonOrderGive.Click += buttonOrderGive_Click; - // - // buttonOrderUpdate - // - buttonOrderUpdate.Location = new Point(854, 357); - buttonOrderUpdate.Name = "buttonOrderUpdate"; - buttonOrderUpdate.Size = new Size(194, 37); - buttonOrderUpdate.TabIndex = 5; - buttonOrderUpdate.Text = "Обновить список"; - buttonOrderUpdate.UseVisualStyleBackColor = true; - buttonOrderUpdate.Click += buttonOrderUpdate_Click; - // - // menuStrip1 - // - menuStrip1.ImageScalingSize = new Size(20, 20); - menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem }); - menuStrip1.Location = new Point(0, 0); - menuStrip1.Name = "menuStrip1"; - menuStrip1.Size = new Size(1096, 28); - menuStrip1.TabIndex = 6; - menuStrip1.Text = "menuStrip1"; - // - // справочникиToolStripMenuItem - // - справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, платьяToolStripMenuItem, магазины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 += ComponentsToolStripMenuItem_Click; - // - // платьяToolStripMenuItem - // - платьяToolStripMenuItem.Name = "платьяToolStripMenuItem"; - платьяToolStripMenuItem.Size = new Size(224, 26); - платьяToolStripMenuItem.Text = "Платья"; - платьяToolStripMenuItem.Click += DressesToolStripMenuItem_Click; - // - // отчетыToolStripMenuItem - // - отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { DressesReportToolStripMenuItem, компонентыПоИзделиямToolStripMenuItem, списокЗаказовToolStripMenuItem }); - отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - отчетыToolStripMenuItem.Size = new Size(73, 24); - отчетыToolStripMenuItem.Text = "Отчеты"; - // - // DressesReportToolStripMenuItem - // - DressesReportToolStripMenuItem.Name = "DressesReportToolStripMenuItem"; - DressesReportToolStripMenuItem.Size = new Size(276, 26); - DressesReportToolStripMenuItem.Text = "Список платьев"; - DressesReportToolStripMenuItem.Click += DressesToolStripMenuItemReport_Click; - // - // компонентыПоИзделиямToolStripMenuItem - // - компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem"; - компонентыПоИзделиямToolStripMenuItem.Size = new Size(276, 26); - компонентыПоИзделиямToolStripMenuItem.Text = "Компоненты по изделиям"; - компонентыПоИзделиямToolStripMenuItem.Click += ComponentProductsToolStripMenuItemReport_Click; - // - // списокЗаказовToolStripMenuItem - // - списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; - списокЗаказовToolStripMenuItem.Size = new Size(276, 26); - списокЗаказовToolStripMenuItem.Text = "Список заказов"; - списокЗаказовToolStripMenuItem.Click += OrdersToolStripMenuItemReport_Click; - // - // магазиныToolStripMenuItem - // - магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; - магазиныToolStripMenuItem.Size = new Size(224, 26); - магазиныToolStripMenuItem.Text = "Магазины"; - магазиныToolStripMenuItem.Click += ShopsToolStripMenuItem_Click; - // - // поставкиToolStripMenuItem - // - поставкиToolStripMenuItem.Name = "поставкиToolStripMenuItem"; - поставкиToolStripMenuItem.Size = new Size(224, 26); - поставкиToolStripMenuItem.Text = "Поставки"; - поставкиToolStripMenuItem.Click += SupplyToolStripMenuItem_Click; - // - // продажаToolStripMenuItem - // - продажаToolStripMenuItem.Name = "продажаToolStripMenuItem"; - продажаToolStripMenuItem.Size = new Size(224, 26); - продажаToolStripMenuItem.Text = "Продажа"; - продажаToolStripMenuItem.Click += SellToolStripMenuItem_Click; - // - // MainForm - // - AutoScaleDimensions = new SizeF(8F, 20F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1096, 493); - Controls.Add(buttonOrderUpdate); - Controls.Add(buttonOrderGive); - Controls.Add(buttonOrderReady); - Controls.Add(buttonDoOrder); - Controls.Add(buttonCreate); - Controls.Add(dataGridView); - Controls.Add(menuStrip1); - MainMenuStrip = menuStrip1; - Name = "MainForm"; - Text = "Магазин пошива одежды"; - Load += MainForm_Load; - ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); - menuStrip1.ResumeLayout(false); - menuStrip1.PerformLayout(); - ResumeLayout(false); - PerformLayout(); - } + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + dataGridView = new DataGridView(); + buttonCreate = new Button(); + buttonDoOrder = new Button(); + buttonOrderReady = new Button(); + buttonOrderGive = new Button(); + buttonOrderUpdate = new Button(); + menuStrip1 = new MenuStrip(); + справочникиToolStripMenuItem = new ToolStripMenuItem(); + компонентыToolStripMenuItem = new ToolStripMenuItem(); + платьяToolStripMenuItem = new ToolStripMenuItem(); + магазиныToolStripMenuItem = new ToolStripMenuItem(); + поставкиToolStripMenuItem = new ToolStripMenuItem(); + продажаToolStripMenuItem = new ToolStripMenuItem(); + отчетыToolStripMenuItem = new ToolStripMenuItem(); + DressesReportToolStripMenuItem = new ToolStripMenuItem(); + компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem(); + списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); + списокПлатьевПоМагазинамToolStripMenuItem = new ToolStripMenuItem(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + menuStrip1.SuspendLayout(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Location = new Point(2, 39); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 29; + dataGridView.Size = new Size(804, 447); + dataGridView.TabIndex = 0; + // + // buttonCreate + // + buttonCreate.Location = new Point(854, 62); + buttonCreate.Name = "buttonCreate"; + buttonCreate.Size = new Size(194, 37); + buttonCreate.TabIndex = 1; + buttonCreate.Text = "Создать заказ"; + buttonCreate.UseVisualStyleBackColor = true; + buttonCreate.Click += buttonCreate_Click; + // + // buttonDoOrder + // + buttonDoOrder.Location = new Point(854, 130); + buttonDoOrder.Name = "buttonDoOrder"; + buttonDoOrder.Size = new Size(194, 37); + buttonDoOrder.TabIndex = 2; + buttonDoOrder.Text = "Отдать на выполнение"; + buttonDoOrder.UseVisualStyleBackColor = true; + buttonDoOrder.Click += buttonDoOrder_Click; + // + // buttonOrderReady + // + buttonOrderReady.Location = new Point(854, 205); + buttonOrderReady.Name = "buttonOrderReady"; + buttonOrderReady.Size = new Size(194, 37); + buttonOrderReady.TabIndex = 3; + buttonOrderReady.Text = "Заказ готов"; + buttonOrderReady.UseVisualStyleBackColor = true; + buttonOrderReady.Click += buttonOrderReady_Click; + // + // buttonOrderGive + // + buttonOrderGive.Location = new Point(854, 280); + buttonOrderGive.Name = "buttonOrderGive"; + buttonOrderGive.Size = new Size(194, 37); + buttonOrderGive.TabIndex = 4; + buttonOrderGive.Text = "Заказ выдан"; + buttonOrderGive.UseVisualStyleBackColor = true; + buttonOrderGive.Click += buttonOrderGive_Click; + // + // buttonOrderUpdate + // + buttonOrderUpdate.Location = new Point(854, 357); + buttonOrderUpdate.Name = "buttonOrderUpdate"; + buttonOrderUpdate.Size = new Size(194, 37); + buttonOrderUpdate.TabIndex = 5; + buttonOrderUpdate.Text = "Обновить список"; + buttonOrderUpdate.UseVisualStyleBackColor = true; + buttonOrderUpdate.Click += buttonOrderUpdate_Click; + // + // menuStrip1 + // + menuStrip1.ImageScalingSize = new Size(20, 20); + menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem }); + menuStrip1.Location = new Point(0, 0); + menuStrip1.Name = "menuStrip1"; + menuStrip1.Size = new Size(1096, 28); + menuStrip1.TabIndex = 6; + menuStrip1.Text = "menuStrip1"; + // + // справочникиToolStripMenuItem + // + справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, платьяToolStripMenuItem, магазиныToolStripMenuItem, поставки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 += ComponentsToolStripMenuItem_Click; + // + // платьяToolStripMenuItem + // + платьяToolStripMenuItem.Name = "платьяToolStripMenuItem"; + платьяToolStripMenuItem.Size = new Size(182, 26); + платьяToolStripMenuItem.Text = "Платья"; + платьяToolStripMenuItem.Click += DressesToolStripMenuItem_Click; + // + // магазиныToolStripMenuItem + // + магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; + магазиныToolStripMenuItem.Size = new Size(182, 26); + магазиныToolStripMenuItem.Text = "Магазины"; + магазиныToolStripMenuItem.Click += ShopsToolStripMenuItem_Click; + // + // поставкиToolStripMenuItem + // + поставкиToolStripMenuItem.Name = "поставкиToolStripMenuItem"; + поставкиToolStripMenuItem.Size = new Size(182, 26); + поставкиToolStripMenuItem.Text = "Поставки"; + поставкиToolStripMenuItem.Click += SupplyToolStripMenuItem_Click; + // + // продажаToolStripMenuItem + // + продажаToolStripMenuItem.Name = "продажаToolStripMenuItem"; + продажаToolStripMenuItem.Size = new Size(182, 26); + продажаToolStripMenuItem.Text = "Продажа"; + продажаToolStripMenuItem.Click += SellToolStripMenuItem_Click; + // + // отчетыToolStripMenuItem + // + отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { DressesReportToolStripMenuItem, компонентыПоИзделиямToolStripMenuItem, списокЗаказовToolStripMenuItem, списокПлатьевПоМагазинамToolStripMenuItem }); + отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; + отчетыToolStripMenuItem.Size = new Size(73, 24); + отчетыToolStripMenuItem.Text = "Отчеты"; + // + // DressesReportToolStripMenuItem + // + DressesReportToolStripMenuItem.Name = "DressesReportToolStripMenuItem"; + DressesReportToolStripMenuItem.Size = new Size(304, 26); + DressesReportToolStripMenuItem.Text = "Список платьев"; + DressesReportToolStripMenuItem.Click += DressesToolStripMenuItemReport_Click; + // + // компонентыПоИзделиямToolStripMenuItem + // + компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem"; + компонентыПоИзделиямToolStripMenuItem.Size = new Size(304, 26); + компонентыПоИзделиямToolStripMenuItem.Text = "Компоненты по изделиям"; + компонентыПоИзделиямToolStripMenuItem.Click += ComponentProductsToolStripMenuItemReport_Click; + // + // списокЗаказовToolStripMenuItem + // + списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; + списокЗаказовToolStripMenuItem.Size = new Size(304, 26); + списокЗаказовToolStripMenuItem.Text = "Список заказов"; + списокЗаказовToolStripMenuItem.Click += OrdersToolStripMenuItemReport_Click; + // + // списокПлатьевПоМагазинамToolStripMenuItem + // + списокПлатьевПоМагазинамToolStripMenuItem.Name = "списокПлатьевПоМагазинамToolStripMenuItem"; + списокПлатьевПоМагазинамToolStripMenuItem.Size = new Size(304, 26); + списокПлатьевПоМагазинамToolStripMenuItem.Text = "Список платьев по магазинам"; + списокПлатьевПоМагазинамToolStripMenuItem.Click += DressesToShopStripMenuItem_Click; + // + // MainForm + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1096, 493); + Controls.Add(buttonOrderUpdate); + Controls.Add(buttonOrderGive); + Controls.Add(buttonOrderReady); + Controls.Add(buttonDoOrder); + Controls.Add(buttonCreate); + Controls.Add(dataGridView); + Controls.Add(menuStrip1); + MainMenuStrip = menuStrip1; + Name = "MainForm"; + Text = "Магазин пошива одежды"; + Load += MainForm_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + menuStrip1.ResumeLayout(false); + menuStrip1.PerformLayout(); + ResumeLayout(false); + PerformLayout(); + } - #endregion + #endregion - private DataGridView dataGridView; - private Button buttonCreate; - private Button buttonDoOrder; - private Button buttonOrderReady; - private Button buttonOrderGive; - private Button buttonOrderUpdate; - private MenuStrip menuStrip1; - private ToolStripMenuItem справочникиToolStripMenuItem; - private ToolStripMenuItem компонентыToolStripMenuItem; - private ToolStripMenuItem платьяToolStripMenuItem; - private ToolStripMenuItem отчетыToolStripMenuItem; - private ToolStripMenuItem DressesReportToolStripMenuItem; - private ToolStripMenuItem компонентыПоИзделиямToolStripMenuItem; - private ToolStripMenuItem списокЗаказовToolStripMenuItem; - private ToolStripMenuItem магазиныToolStripMenuItem; - private ToolStripMenuItem поставкиToolStripMenuItem; - private ToolStripMenuItem продажаToolStripMenuItem; - } + private DataGridView dataGridView; + private Button buttonCreate; + private Button buttonDoOrder; + private Button buttonOrderReady; + private Button buttonOrderGive; + private Button buttonOrderUpdate; + private MenuStrip menuStrip1; + private ToolStripMenuItem справочникиToolStripMenuItem; + private ToolStripMenuItem компонентыToolStripMenuItem; + private ToolStripMenuItem платьяToolStripMenuItem; + private ToolStripMenuItem отчетыToolStripMenuItem; + private ToolStripMenuItem DressesReportToolStripMenuItem; + 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/SewingDresses/SewingDressesView/MainForm.cs b/SewingDresses/SewingDressesView/MainForm.cs index 50882a6..8e9ee41 100644 --- a/SewingDresses/SewingDressesView/MainForm.cs +++ b/SewingDresses/SewingDressesView/MainForm.cs @@ -6,204 +6,212 @@ using SewingDressesBusinessLogic.BusinessLogic; namespace SewingDressesView { - public partial class MainForm : Form - { - private readonly ILogger _logger; - private readonly IOrderLogic _orderLogic; - private readonly IReportLogic _reportLogic; - public MainForm(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic) - { - InitializeComponent(); - _logger = logger; - _orderLogic = orderLogic; - _reportLogic = reportLogic; - } - private void LoadData() - { - try - { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["DressId"].Visible = false; - dataGridView.Columns["DressName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.AllCells; - } - _logger.LogInformation("Load orders"); - } - catch (Exception ex) - { - _logger.LogError(ex, "Load orders error"); - } - } + public partial class MainForm : Form + { + private readonly ILogger _logger; + private readonly IOrderLogic _orderLogic; + private readonly IReportLogic _reportLogic; + public MainForm(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic) + { + InitializeComponent(); + _logger = logger; + _orderLogic = orderLogic; + _reportLogic = reportLogic; + } + private void LoadData() + { + try + { + var list = _orderLogic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["DressId"].Visible = false; + dataGridView.Columns["DressName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.AllCells; + } + _logger.LogInformation("Load orders"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Load orders error"); + } + } - private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(ComponentsForm)); - if (service is ComponentsForm form) - { - form.ShowDialog(); - } - } + private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(ComponentsForm)); + if (service is ComponentsForm form) + { + form.ShowDialog(); + } + } - private void DressesToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(DressesForm)); - if (service is DressesForm form) - { - form.ShowDialog(); - } - } + private void DressesToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(DressesForm)); + if (service is DressesForm form) + { + form.ShowDialog(); + } + } - private void buttonCreate_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(OrderForm)); - if (service is OrderForm form) - { - form.ShowDialog(); - LoadData(); - } - } + private void buttonCreate_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(OrderForm)); + if (service is OrderForm form) + { + form.ShowDialog(); + LoadData(); + } + } - private void buttonDoOrder_Click(object sender, EventArgs e) - { - if (dataGridView.SelectedRows.Count == 1) - { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Order №{id}. Change Status on 'In work'", id); - try - { - var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel { Id = id }); - if (!operationResult) - { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); - } - LoadData(); - } - catch (Exception ex) - { - _logger.LogError(ex, "Change Status on 'In work' error"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } + private void buttonDoOrder_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Order №{id}. Change Status on 'In work'", id); + try + { + var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel { Id = id }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Change Status on 'In work' error"); + 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); - var dressId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["DressId"].Value); - var count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value); - _logger.LogInformation("Order №{id}. Change status on 'Ready'", id); - try - { - var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id, DressId = dressId, Count = count }); - if (!operationResult) - { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); - } - LoadData(); - } - catch (Exception ex) - { - _logger.LogError(ex, "Change status on 'Ready' error"); - 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); + var dressId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["DressId"].Value); + var count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value); + _logger.LogInformation("Order №{id}. Change status on 'Ready'", id); + try + { + var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id, DressId = dressId, Count = count }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Change status on 'Ready' error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } - } + } - private void buttonOrderGive_Click(object sender, EventArgs e) - { - if (dataGridView.SelectedRows.Count == 1) - { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Order №{id}. Status change on 'Given'", id); - try - { - var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel { Id = id }); - if (!operationResult) - { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); - } - _logger.LogInformation("Order №{id} given", id); - LoadData(); - } - catch (Exception ex) - { - _logger.LogError(ex, "Change status on 'Give' error"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - } + private void buttonOrderGive_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Order №{id}. Status change on 'Given'", id); + try + { + var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel { Id = id }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + _logger.LogInformation("Order №{id} given", id); + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Change status on 'Give' error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } - private void buttonOrderUpdate_Click(object sender, EventArgs e) - { - LoadData(); - } + private void buttonOrderUpdate_Click(object sender, EventArgs e) + { + LoadData(); + } - private void ShopsToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(ShopsForm)); - if (service is ShopsForm form) - { - form.ShowDialog(); - } - } + private void ShopsToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(ShopsForm)); + if (service is ShopsForm form) + { + form.ShowDialog(); + } + } - private void SupplyToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(SupplyForm)); - if (service is SupplyForm form) - { - form.ShowDialog(); - } - } + private void SupplyToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(SupplyForm)); + if (service is SupplyForm form) + { + form.ShowDialog(); + } + } - private void MainForm_Load(object sender, EventArgs e) - { - LoadData(); - } - private void ComponentProductsToolStripMenuItemReport_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(ReportDressComponentsForm)); - if (service is ReportDressComponentsForm form) - { - form.ShowDialog(); - } - } - private void OrdersToolStripMenuItemReport_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(ReportOrdersForm)); - if (service is ReportOrdersForm form) - { - form.ShowDialog(); - } - } + private void MainForm_Load(object sender, EventArgs e) + { + LoadData(); + } + private void ComponentProductsToolStripMenuItemReport_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(ReportDressComponentsForm)); + if (service is ReportDressComponentsForm form) + { + form.ShowDialog(); + } + } + private void OrdersToolStripMenuItemReport_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(ReportOrdersForm)); + if (service is ReportOrdersForm form) + { + form.ShowDialog(); + } + } - private void DressesToolStripMenuItemReport_Click(object sender, EventArgs e) - { - using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; - if (dialog.ShowDialog() == DialogResult.OK) - { - _reportLogic.SaveComponentsToWordFile(new ReportBindingModel - { - FileName = dialog.FileName - }); - MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - } + private void DressesToolStripMenuItemReport_Click(object sender, EventArgs e) + { + using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; + if (dialog.ShowDialog() == DialogResult.OK) + { + _reportLogic.SaveComponentsToWordFile(new ReportBindingModel + { + FileName = dialog.FileName + }); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } - private void SellToolStripMenuItem_Click(Object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(SellForm)); - if (service is SellForm form) - { - form.ShowDialog(); - } - } + private void SellToolStripMenuItem_Click(Object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(SellForm)); + if (service is SellForm form) + { + form.ShowDialog(); + } + } - } + private void DressesToShopStripMenuItem_Click(Object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(ReportShopsDressesForm)); + if (service is ReportShopsDressesForm form) + { + form.ShowDialog(); + } + } + } } diff --git a/SewingDresses/SewingDressesView/Program.cs b/SewingDresses/SewingDressesView/Program.cs index 7c1585d..49530c6 100644 --- a/SewingDresses/SewingDressesView/Program.cs +++ b/SewingDresses/SewingDressesView/Program.cs @@ -52,10 +52,12 @@ namespace SewingDressesView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); + } } } \ No newline at end of file diff --git a/SewingDresses/SewingDressesView/ReportOrders.rdlc b/SewingDresses/SewingDressesView/ReportOrders.rdlc index 12d2edf..77fd621 100644 --- a/SewingDresses/SewingDressesView/ReportOrders.rdlc +++ b/SewingDresses/SewingDressesView/ReportOrders.rdlc @@ -17,25 +17,17 @@ /* Local Query */ - - Id - System.Int32 - - - DateCreate + + DateOfOrders System.DateTime - - DressName - System.String - - - Status - System.String + + Count + System.Decimal Sum - System.Decimal + System.Double @@ -49,7 +41,7 @@ - + true true @@ -57,175 +49,48 @@ Заказы - - - - - - + Middle 2pt 2pt 2pt 2pt - + - 5.50333cm + 3cm - 5.50333cm + 3cm - 4.62938cm - - - 2.90217cm - - - 6.1195cm + 7cm - 1.235cm + 0.6cm - - - - true - true - - - - - Номер - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Дата создания - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Изделие - - - 2pt - 2pt - 2pt - 2pt - - - - @@ -235,17 +100,10 @@ - Статус - + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + true true @@ -275,22 +165,15 @@ Сумма - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!Status.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - + true true @@ -454,7 +270,7 @@ + - + true true - =Parameters!ReportParameterPeriod.Value - - 0.77639cm - 0.70583cm - 25.53401cm + 4.24cm + 8.55245cm + 0.6cm + 2.5cm 2 - + true true - Итого: - - - 5.9182cm - 13.96154cm + 4.24cm + 11.05245cm 0.6cm 2.5cm 3 @@ -562,37 +383,8 @@ 2pt - - true - true - - - - - =Sum(Fields!Sum.Value, "DataSetOrders") - - - 2pt - 2pt - 2pt - 2pt - - - 2.81911in + 2in