From 8cab06f96366edd4652b3d41edb2767905f58cc3 Mon Sep 17 00:00:00 2001 From: gg12 darfren Date: Tue, 26 Mar 2024 22:57:55 +0400 Subject: [PATCH] gabella --- IceCreamShop/IceCreamShop/IceCreamShop.csproj | 8 ++++ .../ReportIceCreamComponentForm.Designer.cs | 46 +++++++++---------- .../ReportIceCreamComponentForm.resx | 4 +- IceCreamShop/IceCreamShop/ReportOrders.rdlc | 1 - .../Implements/OrderStorage.cs | 15 +++--- .../Implements/OrderStorage.cs | 8 ++-- 6 files changed, 44 insertions(+), 38 deletions(-) diff --git a/IceCreamShop/IceCreamShop/IceCreamShop.csproj b/IceCreamShop/IceCreamShop/IceCreamShop.csproj index 20c0860..b675aab 100644 --- a/IceCreamShop/IceCreamShop/IceCreamShop.csproj +++ b/IceCreamShop/IceCreamShop/IceCreamShop.csproj @@ -8,6 +8,10 @@ enable + + + + @@ -27,6 +31,10 @@ + + + + True diff --git a/IceCreamShop/IceCreamShop/ReportIceCreamComponentForm.Designer.cs b/IceCreamShop/IceCreamShop/ReportIceCreamComponentForm.Designer.cs index e89c3ec..b4bfb7f 100644 --- a/IceCreamShop/IceCreamShop/ReportIceCreamComponentForm.Designer.cs +++ b/IceCreamShop/IceCreamShop/ReportIceCreamComponentForm.Designer.cs @@ -29,41 +29,23 @@ private void InitializeComponent() { dataGridView = new DataGridView(); - ComponentColumn = new DataGridViewTextBoxColumn(); - IceCreamColumn = new DataGridViewTextBoxColumn(); - CountColumn = new DataGridViewTextBoxColumn(); SaveButton = new Button(); + IceCreamColumn = new DataGridViewTextBoxColumn(); + ComponentColumn = new DataGridViewTextBoxColumn(); + CountColumn = new DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); // // dataGridView // dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Columns.AddRange(new DataGridViewColumn[] { ComponentColumn, IceCreamColumn, CountColumn }); + dataGridView.Columns.AddRange(new DataGridViewColumn[] { IceCreamColumn, ComponentColumn, CountColumn }); dataGridView.Location = new Point(12, 46); dataGridView.Name = "dataGridView"; dataGridView.RowTemplate.Height = 25; dataGridView.Size = new Size(570, 392); dataGridView.TabIndex = 0; // - // ComponentColumn - // - ComponentColumn.HeaderText = "Компонент"; - ComponentColumn.Name = "ComponentColumn"; - ComponentColumn.Width = 200; - // - // IceCreamColumn - // - IceCreamColumn.HeaderText = "Мороженное"; - IceCreamColumn.Name = "IceCreamColumn"; - IceCreamColumn.Width = 200; - // - // CountColumn - // - CountColumn.HeaderText = "Количество"; - CountColumn.Name = "CountColumn"; - CountColumn.Width = 130; - // // SaveButton // SaveButton.Location = new Point(12, 17); @@ -74,6 +56,24 @@ SaveButton.UseVisualStyleBackColor = true; SaveButton.Click += SaveButton_Click; // + // IceCreamColumn + // + IceCreamColumn.HeaderText = "Мороженное"; + IceCreamColumn.Name = "IceCreamColumn"; + IceCreamColumn.Width = 200; + // + // ComponentColumn + // + ComponentColumn.HeaderText = "Компоненты"; + ComponentColumn.Name = "ComponentColumn"; + ComponentColumn.Width = 200; + // + // CountColumn + // + CountColumn.HeaderText = "Количество"; + CountColumn.Name = "CountColumn"; + CountColumn.Width = 130; + // // ReportIceCreamComponentForm // AutoScaleDimensions = new SizeF(7F, 15F); @@ -92,8 +92,8 @@ private DataGridView dataGridView; private Button SaveButton; - private DataGridViewTextBoxColumn ComponentColumn; private DataGridViewTextBoxColumn IceCreamColumn; + private DataGridViewTextBoxColumn ComponentColumn; private DataGridViewTextBoxColumn CountColumn; } } \ No newline at end of file diff --git a/IceCreamShop/IceCreamShop/ReportIceCreamComponentForm.resx b/IceCreamShop/IceCreamShop/ReportIceCreamComponentForm.resx index c67efe4..2d4f860 100644 --- a/IceCreamShop/IceCreamShop/ReportIceCreamComponentForm.resx +++ b/IceCreamShop/IceCreamShop/ReportIceCreamComponentForm.resx @@ -117,10 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + True diff --git a/IceCreamShop/IceCreamShop/ReportOrders.rdlc b/IceCreamShop/IceCreamShop/ReportOrders.rdlc index 1712a9f..5a39888 100644 --- a/IceCreamShop/IceCreamShop/ReportOrders.rdlc +++ b/IceCreamShop/IceCreamShop/ReportOrders.rdlc @@ -424,7 +424,6 @@ 2pt - true diff --git a/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs b/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs index 983f9d1..c1fadf6 100644 --- a/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs +++ b/IceCreamShop/IceCreamShopFileImplement/Implements/OrderStorage.cs @@ -29,14 +29,15 @@ namespace IceCreamShopFileImplement.Implements public List GetFilteredList(OrderSearchModel model) { - if (!model.Id.HasValue) - { - return new(); - } return source.Orders - .Where(x => x.Id == model.Id) - .Select( x => AccessIceCreamStorage( x.GetViewModel)) - .ToList(); + .Where(x => ( + (!model.Id.HasValue || x.Id == model.Id) && + (!model.DateFrom.HasValue || x.DateCreate >= model.DateFrom) && + (!model.DateTo.HasValue || x.DateCreate <= model.DateTo) + ) + ) + .Select(x => x.GetViewModel) + .ToList(); } public OrderViewModel? GetElement(OrderSearchModel model) diff --git a/IceCreamShop/IceCreamShopListImplement/Implements/OrderStorage.cs b/IceCreamShop/IceCreamShopListImplement/Implements/OrderStorage.cs index d10184b..e92bd6e 100644 --- a/IceCreamShop/IceCreamShopListImplement/Implements/OrderStorage.cs +++ b/IceCreamShop/IceCreamShopListImplement/Implements/OrderStorage.cs @@ -31,13 +31,11 @@ namespace IceCreamShopListImplement.Implements model) { var result = new List(); - if (!model.Id.HasValue) - { - return result; - } foreach (var order in _source.Orders) { - if (order.Id == model.Id) + if ((!model.Id.HasValue || order.Id == model.Id) && + (!model.DateFrom.HasValue || order.DateCreate >= model.DateFrom) && + (!model.DateTo.HasValue || order.DateCreate <= model.DateTo)) { result.Add(AccessIceCreamStorage(order.GetViewModel)); }