diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/Implements/OrderStorage.cs b/SecuritySystem/SecuritySystemDatabaseImplement/Implements/OrderStorage.cs index 00f3380..347042f 100644 --- a/SecuritySystem/SecuritySystemDatabaseImplement/Implements/OrderStorage.cs +++ b/SecuritySystem/SecuritySystemDatabaseImplement/Implements/OrderStorage.cs @@ -21,16 +21,24 @@ namespace SecuritySystemDatabaseImplement.Implements public List GetFilteredList(OrderSearchModel model) { - if (!model.Id.HasValue) - { - return new(); - } using var context = new SecuritySystemDatabase(); - return context.Orders - .Where(x => x.Id == model.Id) + var orders = context.Orders .Include(x => x.Secure) .Select(x => x.GetViewModel) .ToList(); + if (model.Id.HasValue) + { + orders = orders.Where(x => x.Id == model.Id.Value).ToList(); + } + if (model.DateFrom.HasValue) + { + orders = orders.Where(x => x.DateCreate >= model.DateFrom.Value).ToList(); + } + if (model.DateTo.HasValue) + { + orders = orders.Where(x => x.DateCreate <= model.DateTo.Value).ToList(); + } + return orders; } public List GetFullList() diff --git a/SecuritySystem/SecuritySystemView/FormMain.Designer.cs b/SecuritySystem/SecuritySystemView/FormMain.Designer.cs index 636859e..f7557b2 100644 --- a/SecuritySystem/SecuritySystemView/FormMain.Designer.cs +++ b/SecuritySystem/SecuritySystemView/FormMain.Designer.cs @@ -32,16 +32,16 @@ справочникиToolStripMenuItem = new ToolStripMenuItem(); ComponentsToolStripMenuItem = new ToolStripMenuItem(); SecuresToolStripMenuItem = 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(); button4 = new Button(); buttonRefresh = new Button(); - отчетыToolStripMenuItem = new ToolStripMenuItem(); - списокКомпонентовToolStripMenuItem = new ToolStripMenuItem(); - компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem(); - списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -66,17 +66,45 @@ // ComponentsToolStripMenuItem // ComponentsToolStripMenuItem.Name = "ComponentsToolStripMenuItem"; - ComponentsToolStripMenuItem.Size = new Size(224, 26); + ComponentsToolStripMenuItem.Size = new Size(182, 26); ComponentsToolStripMenuItem.Text = "Компоненты"; ComponentsToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click; // // SecuresToolStripMenuItem // SecuresToolStripMenuItem.Name = "SecuresToolStripMenuItem"; - SecuresToolStripMenuItem.Size = new Size(224, 26); + SecuresToolStripMenuItem.Size = new Size(182, 26); SecuresToolStripMenuItem.Text = "Изделия"; SecuresToolStripMenuItem.Click += SecuresToolStripMenuItem_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 += ReportComponentsToolStripMenuItem_Click; + // + // компонентыПоИзделиямToolStripMenuItem + // + компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem"; + компонентыПоИзделиямToolStripMenuItem.Size = new Size(276, 26); + компонентыПоИзделиямToolStripMenuItem.Text = "Компоненты по изделиям"; + компонентыПоИзделиямToolStripMenuItem.Click += ReportComponentsSecuresToolStripMenuItem_Click; + // + // списокЗаказовToolStripMenuItem + // + списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; + списокЗаказовToolStripMenuItem.Size = new Size(276, 26); + списокЗаказовToolStripMenuItem.Text = "Список заказов"; + списокЗаказовToolStripMenuItem.Click += ReportOrdersToolStripMenuItem_Click; + // // dataGridView // dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; @@ -146,31 +174,6 @@ buttonRefresh.UseVisualStyleBackColor = true; buttonRefresh.Click += ButtonRefresh_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 - // - компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem"; - компонентыПоИзделиямToolStripMenuItem.Size = new Size(276, 26); - компонентыПоИзделиямToolStripMenuItem.Text = "Компоненты по изделиям"; - // - // списокЗаказовToolStripMenuItem - // - списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; - списокЗаказовToolStripMenuItem.Size = new Size(276, 26); - списокЗаказовToolStripMenuItem.Text = "Список заказов"; - // // FormMain // AutoScaleDimensions = new SizeF(8F, 20F); diff --git a/SecuritySystem/SecuritySystemView/FormMain.cs b/SecuritySystem/SecuritySystemView/FormMain.cs index 2fed95c..db1d737 100644 --- a/SecuritySystem/SecuritySystemView/FormMain.cs +++ b/SecuritySystem/SecuritySystemView/FormMain.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.BusinessLogicsContracts; +using SecuritySystemView.Report; namespace SecuritySystemView { @@ -8,11 +9,13 @@ namespace SecuritySystemView { 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) { @@ -136,5 +139,37 @@ namespace SecuritySystemView { LoadData(); } + + private void ReportComponentsToolStripMenuItem_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 ReportComponentsSecuresToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormReportSecureComponents)); + if (service is FormReportSecureComponents form) + { + form.ShowDialog(); + } + } + + private void ReportOrdersToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); + if (service is FormReportOrders form) + { + form.ShowDialog(); + } + } } } diff --git a/SecuritySystem/SecuritySystemView/FormMain.resx b/SecuritySystem/SecuritySystemView/FormMain.resx index c17a880..6c82d08 100644 --- a/SecuritySystem/SecuritySystemView/FormMain.resx +++ b/SecuritySystem/SecuritySystemView/FormMain.resx @@ -18,7 +18,7 @@ System.Resources.ResXResourceReader, System.Windows.Forms, ... System.Resources.ResXResourceWriter, System.Windows.Forms, ... this is my long stringthis is a comment - Blue + Blue [base64 mime encoded serialized .NET Framework object] diff --git a/SecuritySystem/SecuritySystemView/Program.cs b/SecuritySystem/SecuritySystemView/Program.cs index ec3c570..06e6dff 100644 --- a/SecuritySystem/SecuritySystemView/Program.cs +++ b/SecuritySystem/SecuritySystemView/Program.cs @@ -2,9 +2,12 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; using SecuritySystemBusinessLogic.BusinessLogics; +using SecuritySystemBusinessLogic.OfficePackage; +using SecuritySystemBusinessLogic.OfficePackage.Implements; using SecuritySystemContracts.BusinessLogicsContracts; using SecuritySystemContracts.StoragesContracts; using SecuritySystemDatabaseImplement.Implements; +using SecuritySystemView.Report; namespace SecuritySystemView { @@ -39,6 +42,10 @@ namespace SecuritySystemView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -46,6 +53,8 @@ namespace SecuritySystemView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/SecuritySystem/SecuritySystemView/Report/FormReportOrders.Designer.cs b/SecuritySystem/SecuritySystemView/Report/FormReportOrders.Designer.cs new file mode 100644 index 0000000..772f695 --- /dev/null +++ b/SecuritySystem/SecuritySystemView/Report/FormReportOrders.Designer.cs @@ -0,0 +1,143 @@ +namespace SecuritySystemView.Report +{ + 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() + { + groupBox = new GroupBox(); + buttonToPDF = new Button(); + buttonMake = new Button(); + label2 = new Label(); + dateTimePickerTo = new DateTimePicker(); + dateTimePickerFrom = new DateTimePicker(); + label1 = new Label(); + reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer(); + groupBox.SuspendLayout(); + SuspendLayout(); + // + // groupBox + // + groupBox.Controls.Add(buttonToPDF); + groupBox.Controls.Add(buttonMake); + groupBox.Controls.Add(label2); + groupBox.Controls.Add(dateTimePickerTo); + groupBox.Controls.Add(dateTimePickerFrom); + groupBox.Controls.Add(label1); + groupBox.Dock = DockStyle.Top; + groupBox.Location = new Point(0, 0); + groupBox.Name = "groupBox"; + groupBox.Size = new Size(1049, 54); + groupBox.TabIndex = 0; + groupBox.TabStop = false; + // + // buttonToPDF + // + buttonToPDF.Location = new Point(720, 18); + buttonToPDF.Name = "buttonToPDF"; + buttonToPDF.Size = new Size(200, 30); + buttonToPDF.TabIndex = 5; + buttonToPDF.Text = "Выгрузить в PDF"; + buttonToPDF.UseVisualStyleBackColor = true; + buttonToPDF.Click += ButtonToPDF_Click; + // + // buttonMake + // + buttonMake.Location = new Point(498, 18); + buttonMake.Name = "buttonMake"; + buttonMake.Size = new Size(200, 30); + buttonMake.TabIndex = 4; + buttonMake.Text = "Сформировать"; + buttonMake.UseVisualStyleBackColor = true; + buttonMake.Click += ButtonMake_Click; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(236, 23); + label2.Name = "label2"; + label2.Size = new Size(27, 20); + label2.TabIndex = 3; + label2.Text = "по"; + // + // dateTimePickerTo + // + dateTimePickerTo.Location = new Point(269, 18); + dateTimePickerTo.Name = "dateTimePickerTo"; + dateTimePickerTo.Size = new Size(200, 27); + dateTimePickerTo.TabIndex = 2; + dateTimePickerTo.Value = DateTime.Today; + // + // dateTimePickerFrom + // + dateTimePickerFrom.Location = new Point(30, 18); + dateTimePickerFrom.Name = "dateTimePickerFrom"; + dateTimePickerFrom.Size = new Size(200, 27); + dateTimePickerFrom.TabIndex = 1; + dateTimePickerFrom.Value = DateTime.Today.AddMonths(-1); + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(6, 23); + label1.Name = "label1"; + label1.Size = new Size(18, 20); + label1.TabIndex = 0; + label1.Text = "C"; + // + // reportViewer1 + // + reportViewer1.Location = new Point(0, 0); + reportViewer1.Name = "ReportViewer"; + reportViewer1.ServerReport.BearerToken = null; + reportViewer1.Size = new Size(396, 246); + reportViewer1.TabIndex = 0; + // + // FormReportOrders + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1049, 450); + Controls.Add(groupBox); + Name = "FormReportOrders"; + Text = "Заказы"; + groupBox.ResumeLayout(false); + groupBox.PerformLayout(); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBox; + private Button buttonToPDF; + private Button buttonMake; + private Label label2; + private DateTimePicker dateTimePickerTo; + private DateTimePicker dateTimePickerFrom; + private Label label1; + private Microsoft.Reporting.WinForms.ReportViewer reportViewer1; + } +} \ No newline at end of file diff --git a/SecuritySystem/SecuritySystemView/Report/FormReportOrders.cs b/SecuritySystem/SecuritySystemView/Report/FormReportOrders.cs new file mode 100644 index 0000000..ba8fdde --- /dev/null +++ b/SecuritySystem/SecuritySystemView/Report/FormReportOrders.cs @@ -0,0 +1,91 @@ +using Microsoft.Extensions.Logging; +using Microsoft.Reporting.WinForms; +using SecuritySystemContracts.BindingModels; +using SecuritySystemContracts.BusinessLogicsContracts; + +namespace SecuritySystemView.Report +{ + 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("Report\\ReportOrders.rdlc", FileMode.Open)); + Controls.Clear(); + Controls.Add(reportViewer); + Controls.Add(groupBox); + } + private void ButtonMake_Click(object sender, EventArgs e) + { + if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date) + { + MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + try + { + DateTime dateFrom = dateTimePickerFrom.Value; + DateTime dateTo = dateTimePickerTo.Value; + dateFrom = new DateTime(dateFrom.Year, dateFrom.Month, dateFrom.Day, 0, 0, 0); + dateTo = new DateTime(dateTo.Year, dateTo.Month, dateTo.Day, 23, 59, 59); + var dataSource = _logic.GetOrders(new ReportBindingModel + { + DateFrom = dateFrom, + DateTo = dateTo + }); + 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/SecuritySystem/SecuritySystemView/Report/FormReportOrders.resx b/SecuritySystem/SecuritySystemView/Report/FormReportOrders.resx new file mode 100644 index 0000000..fbd1d64 --- /dev/null +++ b/SecuritySystem/SecuritySystemView/Report/FormReportOrders.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 17, 17 + + \ No newline at end of file diff --git a/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.Designer.cs b/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.Designer.cs index 4f47dfe..606cc76 100644 --- a/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.Designer.cs +++ b/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.Designer.cs @@ -44,12 +44,13 @@ buttonSaveToExcel.TabIndex = 0; buttonSaveToExcel.Text = "Сохранить в Excel"; buttonSaveToExcel.UseVisualStyleBackColor = true; + buttonSaveToExcel.Click += ButtonSaveToExcel_Click; // // dataGridView // + dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnComponent, ColumnSecure, ColumnCount }); - dataGridView.Dock = DockStyle.Bottom; dataGridView.Location = new Point(0, 47); dataGridView.Name = "dataGridView"; dataGridView.RowHeadersVisible = false; @@ -77,7 +78,7 @@ ColumnCount.HeaderText = "Количество"; ColumnCount.MinimumWidth = 6; ColumnCount.Name = "ColumnCount"; - ColumnCount.Width = 125; + ColumnCount.Width = 266; // // FormReportSecureComponents // @@ -88,6 +89,7 @@ Controls.Add(buttonSaveToExcel); Name = "FormReportSecureComponents"; Text = "Компоненты по изделиям"; + Load += FormReportSecureComponents_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ResumeLayout(false); } diff --git a/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.resx b/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.resx index 1e14ddc..99f6798 100644 --- a/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.resx +++ b/SecuritySystem/SecuritySystemView/Report/FormReportSecureComponents.resx @@ -18,7 +18,7 @@ System.Resources.ResXResourceReader, System.Windows.Forms, ... System.Resources.ResXResourceWriter, System.Windows.Forms, ... this is my long stringthis is a comment - Blue + Blue [base64 mime encoded serialized .NET Framework object] diff --git a/SecuritySystem/SecuritySystemView/Report/ReportOrders.rdlc b/SecuritySystem/SecuritySystemView/Report/ReportOrders.rdlc index 01a4cf5..8787f67 100644 --- a/SecuritySystem/SecuritySystemView/Report/ReportOrders.rdlc +++ b/SecuritySystem/SecuritySystemView/Report/ReportOrders.rdlc @@ -25,8 +25,8 @@ DateCreate System.DateTime - - SecurityName + + SecureName System.String @@ -329,21 +329,21 @@ - + true true - =Fields!SecurityName.Value + =Fields!SecureName.Value