diff --git a/LawFirm/LawFirm/FormMain.Designer.cs b/LawFirm/LawFirm/FormMain.Designer.cs
index ce67498..3c8895e 100644
--- a/LawFirm/LawFirm/FormMain.Designer.cs
+++ b/LawFirm/LawFirm/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.buttonSetToWork = new System.Windows.Forms.Button();
this.buttonSetToDone = new System.Windows.Forms.Button();
this.buttonSetToFinish = new System.Windows.Forms.Button();
this.buttonUpdate = 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.menuStrip.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
this.SuspendLayout();
@@ -81,6 +81,36 @@
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(73, 24);
+ this.отчетыToolStripMenuItem.Text = "Отчеты";
+ //
+ // списокБланковToolStripMenuItem
+ //
+ this.списокБланковToolStripMenuItem.Name = "списокБланковToolStripMenuItem";
+ this.списокБланковToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
+ this.списокБланковToolStripMenuItem.Text = "Список бланков";
+ //
+ // бланкиПоДокументамToolStripMenuItem
+ //
+ this.бланкиПоДокументамToolStripMenuItem.Name = "бланкиПоДокументамToolStripMenuItem";
+ this.бланкиПоДокументамToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
+ this.бланкиПоДокументамToolStripMenuItem.Text = "Бланки по документам";
+ this.бланкиПоДокументамToolStripMenuItem.Click += new System.EventHandler(this.бланкиПоДокументамToolStripMenuItem_Click);
+ //
+ // списокЗаказовToolStripMenuItem
+ //
+ this.списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem";
+ this.списокЗаказовToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
+ this.списокЗаказовToolStripMenuItem.Text = "Список заказов";
+ this.списокЗаказовToolStripMenuItem.Click += new System.EventHandler(this.списокЗаказовToolStripMenuItem_Click);
+ //
// dataGridView
//
this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
@@ -141,35 +171,6 @@
this.buttonUpdate.UseVisualStyleBackColor = true;
this.buttonUpdate.Click += new System.EventHandler(this.buttonUpdate_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(73, 24);
- this.отчетыToolStripMenuItem.Text = "Отчеты";
- //
- // списокБланковToolStripMenuItem
- //
- this.списокБланковToolStripMenuItem.Name = "списокБланковToolStripMenuItem";
- this.списокБланковToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
- this.списокБланковToolStripMenuItem.Text = "Список бланков";
- //
- // бланкиПоДокументамToolStripMenuItem
- //
- this.бланкиПоДокументамToolStripMenuItem.Name = "бланкиПоДокументамToolStripMenuItem";
- this.бланкиПоДокументамToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
- this.бланкиПоДокументамToolStripMenuItem.Text = "Бланки по документам";
- this.бланкиПоДокументамToolStripMenuItem.Click += new System.EventHandler(this.бланкиПоДокументамToolStripMenuItem_Click);
- //
- // списокЗаказовToolStripMenuItem
- //
- this.списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem";
- this.списокЗаказовToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
- this.списокЗаказовToolStripMenuItem.Text = "Список заказов";
- //
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
diff --git a/LawFirm/LawFirm/FormMain.cs b/LawFirm/LawFirm/FormMain.cs
index b1d6aa1..7455cdc 100644
--- a/LawFirm/LawFirm/FormMain.cs
+++ b/LawFirm/LawFirm/FormMain.cs
@@ -78,6 +78,15 @@ namespace LawFirmView
}
}
+ private void списокЗаказовToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportOrder));
+ if (service is FormReportOrder form)
+ {
+ form.ShowDialog();
+ }
+ }
+
private void buttonCreateOrder_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
diff --git a/LawFirm/LawFirm/FormReportOrder.Designer.cs b/LawFirm/LawFirm/FormReportOrder.Designer.cs
new file mode 100644
index 0000000..07c497c
--- /dev/null
+++ b/LawFirm/LawFirm/FormReportOrder.Designer.cs
@@ -0,0 +1,131 @@
+namespace LawFirmView
+{
+ partial class FormReportOrder
+ {
+ ///
+ /// 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.buttonCreateToPdf = new System.Windows.Forms.Button();
+ this.buttonCreateReport = new System.Windows.Forms.Button();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.dateTimePickerEnd = new System.Windows.Forms.DateTimePicker();
+ this.dateTimePickerStart = new System.Windows.Forms.DateTimePicker();
+ this.panel.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // panel
+ //
+ this.panel.Controls.Add(this.buttonCreateToPdf);
+ this.panel.Controls.Add(this.buttonCreateReport);
+ this.panel.Controls.Add(this.label2);
+ this.panel.Controls.Add(this.label1);
+ this.panel.Controls.Add(this.dateTimePickerEnd);
+ this.panel.Controls.Add(this.dateTimePickerStart);
+ 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(984, 69);
+ this.panel.TabIndex = 0;
+ //
+ // buttonCreateToPdf
+ //
+ this.buttonCreateToPdf.Location = new System.Drawing.Point(782, 39);
+ this.buttonCreateToPdf.Name = "buttonCreateToPdf";
+ this.buttonCreateToPdf.Size = new System.Drawing.Size(190, 27);
+ this.buttonCreateToPdf.TabIndex = 5;
+ this.buttonCreateToPdf.Text = "PDF";
+ this.buttonCreateToPdf.UseVisualStyleBackColor = true;
+ this.buttonCreateToPdf.Click += new System.EventHandler(this.buttonCreateToPdf_Click);
+ //
+ // buttonCreateReport
+ //
+ this.buttonCreateReport.Location = new System.Drawing.Point(554, 39);
+ this.buttonCreateReport.Name = "buttonCreateReport";
+ this.buttonCreateReport.Size = new System.Drawing.Size(190, 27);
+ this.buttonCreateReport.TabIndex = 4;
+ this.buttonCreateReport.Text = "Сформировать";
+ this.buttonCreateReport.UseVisualStyleBackColor = true;
+ this.buttonCreateReport.Click += new System.EventHandler(this.buttonCreateReport_Click);
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(369, 9);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(56, 20);
+ this.label2.TabIndex = 3;
+ this.label2.Text = "Конец:";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(87, 6);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(64, 20);
+ this.label1.TabIndex = 2;
+ this.label1.Text = "Начало:";
+ //
+ // dateTimePickerEnd
+ //
+ this.dateTimePickerEnd.Location = new System.Drawing.Point(307, 39);
+ this.dateTimePickerEnd.Name = "dateTimePickerEnd";
+ this.dateTimePickerEnd.Size = new System.Drawing.Size(187, 27);
+ this.dateTimePickerEnd.TabIndex = 1;
+ //
+ // dateTimePickerStart
+ //
+ this.dateTimePickerStart.Location = new System.Drawing.Point(35, 39);
+ this.dateTimePickerStart.Name = "dateTimePickerStart";
+ this.dateTimePickerStart.Size = new System.Drawing.Size(187, 27);
+ this.dateTimePickerStart.TabIndex = 0;
+ //
+ // FormReportOrder
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(984, 450);
+ this.Controls.Add(this.panel);
+ this.Name = "FormReportOrder";
+ this.Text = "Заказы";
+ this.panel.ResumeLayout(false);
+ this.panel.PerformLayout();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private Panel panel;
+ private DateTimePicker dateTimePickerEnd;
+ private DateTimePicker dateTimePickerStart;
+ private Button buttonCreateToPdf;
+ private Button buttonCreateReport;
+ private Label label2;
+ private Label label1;
+ }
+}
\ No newline at end of file
diff --git a/LawFirm/LawFirm/FormReportOrder.cs b/LawFirm/LawFirm/FormReportOrder.cs
new file mode 100644
index 0000000..3d9046f
--- /dev/null
+++ b/LawFirm/LawFirm/FormReportOrder.cs
@@ -0,0 +1,96 @@
+using LawFirmContracts.BindingModels;
+using LawFirmContracts.BusinessLogicContracts;
+using Microsoft.Extensions.Logging;
+using Microsoft.Reporting.WinForms;
+
+namespace LawFirmView
+{
+ public partial class FormReportOrder : Form
+ {
+ private readonly ReportViewer reportViewer;
+ private readonly ILogger _logger;
+ private readonly IReportLogic _logic;
+
+ public FormReportOrder(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 (dateTimePickerStart.Value.Date >= dateTimePickerEnd.Value.Date)
+ {
+ MessageBox.Show("Дата начала должна быть меньше даты окончания",
+ "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ try
+ {
+ var dataSource = _logic.GetOrders(new ReportBindingModel
+ {
+ DateFrom = dateTimePickerStart.Value,
+ DateTo = dateTimePickerEnd.Value
+ });
+ var source = new ReportDataSource("DataSetOrders", dataSource);
+ reportViewer.LocalReport.DataSources.Clear();
+ reportViewer.LocalReport.DataSources.Add(source);
+ var parameters = new[] { new ReportParameter("ReportParameterPeriod", $"c{ dateTimePickerStart.Value.ToShortDateString()} по {dateTimePickerEnd.Value.ToShortDateString()}") };
+ reportViewer.LocalReport.SetParameters(parameters);
+ reportViewer.RefreshReport();
+ _logger.LogInformation("Загрузка списка заказов на период {From}-{ To}", dateTimePickerStart.Value.ToShortDateString(), dateTimePickerEnd.Value.ToShortDateString());
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки списка заказов на период");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+ MessageBoxIcon.Error);
+ }
+
+ }
+
+ private void buttonCreateToPdf_Click(object sender, EventArgs e)
+ {
+ if (dateTimePickerStart.Value.Date >= dateTimePickerEnd.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 = dateTimePickerStart.Value,
+ DateTo = dateTimePickerEnd.Value
+ });
+ _logger.LogInformation("Сохранение списка заказов на период { From} -{ To}", dateTimePickerStart.Value.ToShortDateString(),dateTimePickerEnd.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/LawFirm/LawFirm/FormReportOrder.resx b/LawFirm/LawFirm/FormReportOrder.resx
new file mode 100644
index 0000000..f298a7b
--- /dev/null
+++ b/LawFirm/LawFirm/FormReportOrder.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/LawFirm/LawFirm/LawFirmView.csproj b/LawFirm/LawFirm/LawFirmView.csproj
index 9d320d6..c75a088 100644
--- a/LawFirm/LawFirm/LawFirmView.csproj
+++ b/LawFirm/LawFirm/LawFirmView.csproj
@@ -16,6 +16,7 @@
+
diff --git a/LawFirm/LawFirm/Program.cs b/LawFirm/LawFirm/Program.cs
index 70ca19c..1b5ecce 100644
--- a/LawFirm/LawFirm/Program.cs
+++ b/LawFirm/LawFirm/Program.cs
@@ -61,6 +61,7 @@ namespace LawFirm
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
}
}
diff --git a/LawFirm/LawFirm/ReportOrders.rdlc b/LawFirm/LawFirm/ReportOrders.rdlc
new file mode 100644
index 0000000..d3766db
--- /dev/null
+++ b/LawFirm/LawFirm/ReportOrders.rdlc
@@ -0,0 +1,529 @@
+
+
+ 0
+
+
+
+ System.Data.DataSet
+ /* Local Connection */
+
+ 10791c83-cee8-4a38-bbd0-245fc17cefb3
+
+
+
+
+
+ LawFirmContractsViewModels
+ /* Local Query */
+
+
+
+ Id
+ System.Int32
+
+
+ DateCreate
+ System.DateTime
+
+
+ DocumentName
+ System.String
+
+
+ Sum
+ System.Decimal
+
+
+
+ LawFirmContracts.ViewModels
+ ReportOrdersViewModel
+ LawFirmContracts.ViewModels.ReportOrdersViewModel, LawFirmContracts, 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
+
+
+
+
+ Номер
+
+
+
+
+
+
+ Textbox5
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Дата создания
+
+
+
+
+
+
+ Textbox1
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Документ
+
+
+
+
+
+
+ Textbox3
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Сумма
+
+
+
+
+
+
+ Textbox7
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ 0.6cm
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!Id.Value
+
+
+
+
+
+
+ Id
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!DateCreate.Value
+
+
+
+
+
+
+ DateCreate
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!DocumentName.Value
+
+
+
+
+
+
+ DocumentName
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!Sum.Value
+
+
+
+
+
+
+ Sum
+
+
+ 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
+
+
+ 21cm
+
+ 29.7cm
+ 21cm
+ 2cm
+ 2cm
+ 2cm
+ 2cm
+ 0.13cm
+
+
+
+
+
+
+ String
+ true
+ ReportParameter1
+
+
+
+
+ 4
+ 2
+
+
+ 0
+ 0
+ ReportParameterPeriod
+
+
+
+
+ Cm
+ 2de0031a-4d17-449d-922d-d9fc54572312
+
\ No newline at end of file
diff --git a/LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs b/LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs
index 66b9941..4269723 100644
--- a/LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs
+++ b/LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs
@@ -26,14 +26,14 @@ namespace LawFirmDatabaseImplement.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 LawFirmDatabase();
return context.Orders
- .Where(x => x.Id == model.Id)
.Include(x => x.Document)
+ .Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo)
.Select(x => x.GetViewModel)
.ToList();
}
diff --git a/LawFirm/LawFirmFileImplement/Implements/OrderStorage.cs b/LawFirm/LawFirmFileImplement/Implements/OrderStorage.cs
index 93cbffe..1400a66 100644
--- a/LawFirm/LawFirmFileImplement/Implements/OrderStorage.cs
+++ b/LawFirm/LawFirmFileImplement/Implements/OrderStorage.cs
@@ -32,14 +32,14 @@ namespace LawFirmFileImplement.Implements
public List GetFilteredList(OrderSearchModel model)
{
- if (!model.Id.HasValue)
+ if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue)
{
return new();
}
return source.Orders
- .Where(x => x.Id == model.Id)
- .Select(x => GetViewModel(x))
- .ToList();
+ .Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo)
+ .Select(x => x.GetViewModel)
+ .ToList();
}
public List GetFullList()
diff --git a/LawFirm/LawFirmListImplements/Implements/OrderStorage.cs b/LawFirm/LawFirmListImplements/Implements/OrderStorage.cs
index 9e0fd88..247eea2 100644
--- a/LawFirm/LawFirmListImplements/Implements/OrderStorage.cs
+++ b/LawFirm/LawFirmListImplements/Implements/OrderStorage.cs
@@ -39,13 +39,9 @@ namespace LawFirmListImplements.Implements
public List GetFilteredList(OrderSearchModel model)
{
var result = new List();
- if (!model.Id.HasValue)
- {
- return result;
- }
foreach (var order in _source.Orders)
{
- if (order.Id == model.Id)
+ if (order.Id == model.Id || model.DateFrom <= order.DateCreate && order.DateCreate <= model.DateTo)
{
result.Add(GetViewModel(order));
}