From c952b45323494f05d94a3713436aff262114c9c7 Mon Sep 17 00:00:00 2001 From: the Date: Tue, 4 Apr 2023 12:49:22 +0400 Subject: [PATCH] Almost done --- .../Models/IComponentModel.cs | 2 +- .../Models/IComputerModel.cs | 2 +- AbstractComputerDataModel/Models/IId.cs | 2 +- .../Models/IOrderModel.cs | 2 +- .../BusinessLogics/ReportLogic.cs | 2 +- .../OfficePackage/Implements/SaveToExcel.cs | 2 +- .../OfficePackage/Implements/SaveToPdf.cs | 2 +- .../Implements/OrderStorage.cs | 5 +- ComputersShop/ComputersShop.csproj | 1 + ComputersShop/FormMain.Designer.cs | 71 +-- ComputersShop/FormMain.cs | 32 +- ComputersShop/FormReportOrders.Designer.cs | 138 +++++ ComputersShop/FormReportOrders.cs | 100 ++++ ComputersShop/FormReportOrders.resx | 60 ++ ComputersShop/Program.cs | 10 + ComputersShop/ReportOrders.rdlc | 529 ++++++++++++++++++ 16 files changed, 916 insertions(+), 44 deletions(-) create mode 100644 ComputersShop/FormReportOrders.Designer.cs create mode 100644 ComputersShop/FormReportOrders.cs create mode 100644 ComputersShop/FormReportOrders.resx create mode 100644 ComputersShop/ReportOrders.rdlc diff --git a/AbstractComputerDataModel/Models/IComponentModel.cs b/AbstractComputerDataModel/Models/IComponentModel.cs index a04c804..a4116ac 100644 --- a/AbstractComputerDataModel/Models/IComponentModel.cs +++ b/AbstractComputerDataModel/Models/IComponentModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace ComputerShopDataModels.Models { - public interface IComponentModel + public interface IComponentModel : IId { string ComponentName { get; } double Cost { get; } diff --git a/AbstractComputerDataModel/Models/IComputerModel.cs b/AbstractComputerDataModel/Models/IComputerModel.cs index 9d24edd..e36e7c2 100644 --- a/AbstractComputerDataModel/Models/IComputerModel.cs +++ b/AbstractComputerDataModel/Models/IComputerModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace ComputerShopDataModels.Models { - public interface IComputerModel + public interface IComputerModel : IId { string ComputerName { get; } double Price { get; } diff --git a/AbstractComputerDataModel/Models/IId.cs b/AbstractComputerDataModel/Models/IId.cs index 4994ee2..1a3888c 100644 --- a/AbstractComputerDataModel/Models/IId.cs +++ b/AbstractComputerDataModel/Models/IId.cs @@ -8,6 +8,6 @@ namespace ComputerShopDataModels.Models { public interface IId { - string Id { get; } + int Id { get; } } } diff --git a/AbstractComputerDataModel/Models/IOrderModel.cs b/AbstractComputerDataModel/Models/IOrderModel.cs index 0562eb4..682d963 100644 --- a/AbstractComputerDataModel/Models/IOrderModel.cs +++ b/AbstractComputerDataModel/Models/IOrderModel.cs @@ -7,7 +7,7 @@ using ComputerShopDataModels.Enums; namespace ComputerShopDataModels.Models { - public interface IOrderModel + public interface IOrderModel : IId { int ComputerId { get; } string ComputerName { get; } diff --git a/ComputerShopBusinessLogic/BusinessLogics/ReportLogic.cs b/ComputerShopBusinessLogic/BusinessLogics/ReportLogic.cs index a39d668..96121b8 100644 --- a/ComputerShopBusinessLogic/BusinessLogics/ReportLogic.cs +++ b/ComputerShopBusinessLogic/BusinessLogics/ReportLogic.cs @@ -13,7 +13,7 @@ using System.Threading.Tasks; namespace ComputerShopBusinessLogic.BusinessLogics { - internal class ReportLogic : IReportLogic + public class ReportLogic : IReportLogic { private readonly IComponentStorage _componentStorage; private readonly IComputerStorage _productStorage; diff --git a/ComputerShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/ComputerShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs index e47d4ed..65fb407 100644 --- a/ComputerShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs +++ b/ComputerShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs @@ -14,7 +14,7 @@ using System.Threading.Tasks; namespace ComputerShopBusinessLogic.OfficePackage.Implements { - internal class SaveToExcel : AbstractSaveToExcel + public class SaveToExcel : AbstractSaveToExcel { private SpreadsheetDocument? _spreadsheetDocument; private SharedStringTablePart? _shareStringPart; diff --git a/ComputerShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs b/ComputerShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs index 8585e2c..76a5ee4 100644 --- a/ComputerShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs +++ b/ComputerShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; namespace ComputerShopBusinessLogic.OfficePackage.Implements { - internal class SaveToPdf : AbstractSaveToPdf + public class SaveToPdf : AbstractSaveToPdf { private Document? _document; private Section? _section; diff --git a/ComputerShopDatabaseImplement/Implements/OrderStorage.cs b/ComputerShopDatabaseImplement/Implements/OrderStorage.cs index bae5a5c..cbaf643 100644 --- a/ComputerShopDatabaseImplement/Implements/OrderStorage.cs +++ b/ComputerShopDatabaseImplement/Implements/OrderStorage.cs @@ -26,18 +26,19 @@ namespace ComputerShopDatabaseImplement.Implements public List GetFilteredList(OrderSearchModel model) { - if (!model.Id.HasValue) + if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue) { return new(); } using var context = new ComputerShopDatabase(); return context.Orders - .Where(x => x.Id == model.Id) .Include(x => x.Computer) + .Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo) .Select(x => x.GetViewModel) .ToList(); } + public List GetFullList() { using var context = new ComputerShopDatabase(); diff --git a/ComputersShop/ComputersShop.csproj b/ComputersShop/ComputersShop.csproj index 95ccf99..993350b 100644 --- a/ComputersShop/ComputersShop.csproj +++ b/ComputersShop/ComputersShop.csproj @@ -19,6 +19,7 @@ + diff --git a/ComputersShop/FormMain.Designer.cs b/ComputersShop/FormMain.Designer.cs index 3e56d7f..69c4149 100644 --- a/ComputersShop/FormMain.Designer.cs +++ b/ComputersShop/FormMain.Designer.cs @@ -32,16 +32,16 @@ this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.компьютерыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.отчетыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.списокКомпонентовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.компонентыПоИзделиямToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.списокЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dataGridView = new System.Windows.Forms.DataGridView(); this.ButtonCreateOrder = new System.Windows.Forms.Button(); this.ButtonTakeOrderInWork = new System.Windows.Forms.Button(); this.ButtonOrderReady = new System.Windows.Forms.Button(); this.ButtonIssuedOrder = new System.Windows.Forms.Button(); this.ButtonRef = new System.Windows.Forms.Button(); - this.отчетыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.списокКомпонентовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.компонентыПоИзделиямToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.списокЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.SuspendLayout(); @@ -69,17 +69,48 @@ // компьютерыToolStripMenuItem // this.компьютерыToolStripMenuItem.Name = "компьютерыToolStripMenuItem"; - this.компьютерыToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.компьютерыToolStripMenuItem.Size = new System.Drawing.Size(147, 22); this.компьютерыToolStripMenuItem.Text = "Компьютеры"; this.компьютерыToolStripMenuItem.Click += new System.EventHandler(this.КомпьютерыToolStripMenuItem_Click); // // компонентыToolStripMenuItem // this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(147, 22); this.компонентыToolStripMenuItem.Text = "Компоненты"; this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click); // + // отчетыToolStripMenuItem + // + this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.списокКомпонентовToolStripMenuItem, + this.компонентыПоИзделиямToolStripMenuItem, + this.списокЗаказовToolStripMenuItem}); + this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; + this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(60, 20); + this.отчетыToolStripMenuItem.Text = "Отчеты"; + // + // списокКомпонентовToolStripMenuItem + // + this.списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem"; + this.списокКомпонентовToolStripMenuItem.Size = new System.Drawing.Size(218, 22); + this.списокКомпонентовToolStripMenuItem.Text = "Список компонентов"; + this.списокКомпонентовToolStripMenuItem.Click += new System.EventHandler(this.ComponentsToolStripMenuItem_Click); + // + // компонентыПоИзделиямToolStripMenuItem + // + this.компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem"; + this.компонентыПоИзделиямToolStripMenuItem.Size = new System.Drawing.Size(218, 22); + this.компонентыПоИзделиямToolStripMenuItem.Text = "Компоненты по изделиям"; + this.компонентыПоИзделиямToolStripMenuItem.Click += new System.EventHandler(this.ComponentComputersToolStripMenuItem_Click); + // + // списокЗаказовToolStripMenuItem + // + this.списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; + this.списокЗаказовToolStripMenuItem.Size = new System.Drawing.Size(218, 22); + this.списокЗаказовToolStripMenuItem.Text = "Список заказов"; + this.списокЗаказовToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click); + // // dataGridView // this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -139,34 +170,6 @@ this.ButtonRef.UseVisualStyleBackColor = true; this.ButtonRef.Click += new System.EventHandler(this.ButtonRef_Click); // - // отчетыToolStripMenuItem - // - this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.списокКомпонентовToolStripMenuItem, - this.компонентыПоИзделиямToolStripMenuItem, - this.списокЗаказовToolStripMenuItem}); - this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(60, 20); - this.отчетыToolStripMenuItem.Text = "Отчеты"; - // - // списокКомпонентовToolStripMenuItem - // - this.списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem"; - this.списокКомпонентовToolStripMenuItem.Size = new System.Drawing.Size(218, 22); - this.списокКомпонентовToolStripMenuItem.Text = "Список компонентов"; - // - // компонентыПоИзделиямToolStripMenuItem - // - this.компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem"; - this.компонентыПоИзделиямToolStripMenuItem.Size = new System.Drawing.Size(218, 22); - this.компонентыПоИзделиямToolStripMenuItem.Text = "Компоненты по изделиям"; - // - // списокЗаказовToolStripMenuItem - // - this.списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; - this.списокЗаказовToolStripMenuItem.Size = new System.Drawing.Size(218, 22); - this.списокЗаказовToolStripMenuItem.Text = "Список заказов"; - // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); diff --git a/ComputersShop/FormMain.cs b/ComputersShop/FormMain.cs index ed69259..542db85 100644 --- a/ComputersShop/FormMain.cs +++ b/ComputersShop/FormMain.cs @@ -18,11 +18,13 @@ namespace ComputersShop { private readonly ILogger _logger; private readonly IOrderLogic _orderLogic; - public FormMain(ILogger logger, IOrderLogic orderLogic) + private readonly IReportLogic _reportLogic; + public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic) { InitializeComponent(); _logger = logger; _orderLogic = orderLogic; + _reportLogic = reportLogic; } private void FormMain_Load(object sender, EventArgs e) @@ -175,5 +177,33 @@ namespace ComputersShop { LoadData(); } + + private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e) + { + using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; + if (dialog.ShowDialog() == DialogResult.OK) + { + _reportLogic.SaveComponentsToWordFile(new ReportBindingModel { FileName = dialog.FileName }); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + + private void ComponentComputersToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormReportComputerComponents)); + if (service is FormReportComputerComponents form) + { + form.ShowDialog(); + } + } + + private void OrdersToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); + if (service is FormReportOrders form) + { + form.ShowDialog(); + } + } } } diff --git a/ComputersShop/FormReportOrders.Designer.cs b/ComputersShop/FormReportOrders.Designer.cs new file mode 100644 index 0000000..b16be4d --- /dev/null +++ b/ComputersShop/FormReportOrders.Designer.cs @@ -0,0 +1,138 @@ +namespace ComputersShop +{ + partial class FormReportOrders + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.panel = new System.Windows.Forms.Panel(); + this.buttonMake = new System.Windows.Forms.Button(); + this.dateTimePickerTo = new System.Windows.Forms.DateTimePicker(); + this.labelTo = new System.Windows.Forms.Label(); + this.dateTimePickerFrom = new System.Windows.Forms.DateTimePicker(); + this.labelFrom = new System.Windows.Forms.Label(); + this.buttonToPdf = new System.Windows.Forms.Button(); + this.panel.SuspendLayout(); + this.SuspendLayout(); + // + // panel + // + this.panel.Controls.Add(this.buttonToPdf); + this.panel.Controls.Add(this.buttonMake); + this.panel.Controls.Add(this.dateTimePickerFrom); + this.panel.Controls.Add(this.dateTimePickerTo); + this.panel.Controls.Add(this.labelFrom); + this.panel.Controls.Add(this.labelTo); + this.panel.Dock = System.Windows.Forms.DockStyle.Top; + this.panel.Location = new System.Drawing.Point(0, 0); + this.panel.Name = "panel"; + this.panel.Size = new System.Drawing.Size(851, 54); + this.panel.TabIndex = 0; + // + // buttonMake + // + this.buttonMake.Location = new System.Drawing.Point(475, 13); + this.buttonMake.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonMake.Name = "buttonMake"; + this.buttonMake.Size = new System.Drawing.Size(139, 27); + this.buttonMake.TabIndex = 9; + this.buttonMake.Text = "Сформировать"; + this.buttonMake.UseVisualStyleBackColor = true; + this.buttonMake.Click += new System.EventHandler(this.ButtonMake_Click); + // + // dateTimePickerTo + // + this.dateTimePickerTo.Location = new System.Drawing.Point(236, 12); + this.dateTimePickerTo.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.dateTimePickerTo.Name = "dateTimePickerTo"; + this.dateTimePickerTo.Size = new System.Drawing.Size(163, 23); + this.dateTimePickerTo.TabIndex = 8; + // + // labelTo + // + this.labelTo.AutoSize = true; + this.labelTo.Location = new System.Drawing.Point(207, 15); + this.labelTo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelTo.Name = "labelTo"; + this.labelTo.Size = new System.Drawing.Size(21, 15); + this.labelTo.TabIndex = 7; + this.labelTo.Text = "по"; + // + // dateTimePickerFrom + // + this.dateTimePickerFrom.Location = new System.Drawing.Point(36, 12); + this.dateTimePickerFrom.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.dateTimePickerFrom.Name = "dateTimePickerFrom"; + this.dateTimePickerFrom.Size = new System.Drawing.Size(163, 23); + this.dateTimePickerFrom.TabIndex = 6; + // + // labelFrom + // + this.labelFrom.AutoSize = true; + this.labelFrom.Location = new System.Drawing.Point(13, 15); + this.labelFrom.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelFrom.Name = "labelFrom"; + this.labelFrom.Size = new System.Drawing.Size(15, 15); + this.labelFrom.TabIndex = 5; + this.labelFrom.Text = "С"; + // + // buttonToPdf + // + this.buttonToPdf.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonToPdf.Location = new System.Drawing.Point(699, 13); + this.buttonToPdf.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonToPdf.Name = "buttonToPdf"; + this.buttonToPdf.Size = new System.Drawing.Size(139, 27); + this.buttonToPdf.TabIndex = 10; + this.buttonToPdf.Text = "В Pdf"; + this.buttonToPdf.UseVisualStyleBackColor = true; + this.buttonToPdf.Click += new System.EventHandler(this.ButtonToPdf_Click); + // + // FormReportOrders + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(851, 479); + this.Controls.Add(this.panel); + this.Name = "FormReportOrders"; + this.Text = "FormReportOrders"; + this.panel.ResumeLayout(false); + this.panel.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private Panel panel; + private Button buttonToPdf; + private Button buttonMake; + private DateTimePicker dateTimePickerFrom; + private DateTimePicker dateTimePickerTo; + private Label labelFrom; + private Label labelTo; + } +} \ No newline at end of file diff --git a/ComputersShop/FormReportOrders.cs b/ComputersShop/FormReportOrders.cs new file mode 100644 index 0000000..af508d7 --- /dev/null +++ b/ComputersShop/FormReportOrders.cs @@ -0,0 +1,100 @@ +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 ComputerShopContracts.BindingModels; +using ComputerShopContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +using Microsoft.Reporting.WinForms; + +namespace ComputersShop +{ + public partial class FormReportOrders : Form + { + private readonly ReportViewer reportViewer; + + private readonly ILogger _logger; + + private readonly IReportLogic _logic; + public FormReportOrders(ILogger logger, IReportLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + reportViewer = new ReportViewer + { + Dock = DockStyle.Fill + }; + reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrders.rdlc", FileMode.Open)); + Controls.Clear(); + Controls.Add(reportViewer); + Controls.Add(panel); + } + private void ButtonMake_Click(object sender, EventArgs e) + { + if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date) + { + MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + try + { + var dataSource = _logic.GetOrders(new ReportBindingModel + { + DateFrom = dateTimePickerFrom.Value, + DateTo = dateTimePickerTo.Value + }); + var source = new ReportDataSource("DataSetOrders", dataSource); + reportViewer.LocalReport.DataSources.Clear(); + reportViewer.LocalReport.DataSources.Add(source); + var parameters = new[] { new ReportParameter("ReportParameterPeriod", + $"c {dateTimePickerFrom.Value.ToShortDateString()} по {dateTimePickerTo.Value.ToShortDateString()}") }; + reportViewer.LocalReport.SetParameters(parameters); + + reportViewer.RefreshReport(); + _logger.LogInformation("Загрузка списка заказов на период {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString()); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка заказов на период"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonToPdf_Click(object sender, EventArgs e) + { + if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date) + { + MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" }; + if (dialog.ShowDialog() == DialogResult.OK) + { + try + { + _logic.SaveOrdersToPdfFile(new ReportBindingModel + { + FileName = dialog.FileName, + DateFrom = dateTimePickerFrom.Value, + DateTo = dateTimePickerTo.Value + }); + _logger.LogInformation("Сохранение списка заказов на период {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString()); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения списка заказов на период"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + + +} diff --git a/ComputersShop/FormReportOrders.resx b/ComputersShop/FormReportOrders.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/ComputersShop/FormReportOrders.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ComputersShop/Program.cs b/ComputersShop/Program.cs index 5c97bbb..c747e81 100644 --- a/ComputersShop/Program.cs +++ b/ComputersShop/Program.cs @@ -1,4 +1,6 @@ using ComputerShopBusinessLogic.BusinessLogics; +using ComputerShopBusinessLogic.OfficePackage.Implements; +using ComputerShopBusinessLogic.OfficePackage; using ComputerShopContracts.BusinessLogicsContracts; using ComputerShopContracts.StoragesContracts; using ComputerShopDatabaseImplement.Implements; @@ -39,6 +41,12 @@ namespace ComputersShop services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -46,6 +54,8 @@ namespace ComputersShop services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/ComputersShop/ReportOrders.rdlc b/ComputersShop/ReportOrders.rdlc new file mode 100644 index 0000000..4aaff59 --- /dev/null +++ b/ComputersShop/ReportOrders.rdlc @@ -0,0 +1,529 @@ + + + 0 + + + + System.Data.DataSet + /* Local Connection */ + + b8ef3cd1-0b6f-495f-8361-03c2eec80c42 + + + + + + ComputerShopContractsViewModels + /* Local Query */ + + + + Id + System.Int32 + + + DateCreate + System.DateTime + + + ComputerName + System.String + + + Sum + System.Decimal + + + + ComputerShopContracts.ViewModels + ReportOrdersViewModel + ComputerShopContracts.ViewModels.ReportOrdersViewModel, ComputerShopContracts, 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 + + + + + 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 + + + + + + + + 0.6cm + + + + + true + true + + + + + =Fields!Id.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!DateCreate.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!ComputerName.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Sum.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + + After + + + + + + + DataSetOrders + 2.48391cm + 0.55245cm + 1.2cm + 16.44755cm + 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 +