From 5e574cd19ed1f1b5339870dd1853efadfeaf5eb5 Mon Sep 17 00:00:00 2001 From: Loretta Date: Sat, 15 Nov 2025 08:13:35 +0100 Subject: [PATCH] fixes --- FruitBank.Common/Dtos/ProductDto.cs | 3 --- .../Grids/Products/GridStockQuantityHistoryDto.cs | 10 +++------- .../Products/GridStockQuantityHistoryDtoTemplate.razor | 9 ++------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/FruitBank.Common/Dtos/ProductDto.cs b/FruitBank.Common/Dtos/ProductDto.cs index fafd9f0..c42991b 100644 --- a/FruitBank.Common/Dtos/ProductDto.cs +++ b/FruitBank.Common/Dtos/ProductDto.cs @@ -3,11 +3,8 @@ using LinqToDB.Mapping; using Mango.Nop.Core.Dtos; using Mango.Nop.Core.Extensions; using Newtonsoft.Json; -using Nop.Core; //using Nop.Core.Domain.Catalog; using Nop.Core.Domain.Common; -using Nop.Core.Domain.Orders; -using System.Globalization; using System.Linq.Expressions; namespace FruitBank.Common.Dtos; diff --git a/FruitBankHybrid.Shared/Components/Grids/Products/GridStockQuantityHistoryDto.cs b/FruitBankHybrid.Shared/Components/Grids/Products/GridStockQuantityHistoryDto.cs index 31ea073..2a28f4f 100644 --- a/FruitBankHybrid.Shared/Components/Grids/Products/GridStockQuantityHistoryDto.cs +++ b/FruitBankHybrid.Shared/Components/Grids/Products/GridStockQuantityHistoryDto.cs @@ -1,19 +1,15 @@ -using AyCode.Core.Interfaces; -using DevExpress.Blazor; +using DevExpress.Blazor; using FruitBank.Common.Dtos; -using FruitBank.Common.Entities; using FruitBank.Common.SignalRs; -using FruitBankHybrid.Shared.Pages; using Microsoft.AspNetCore.Components; -namespace FruitBankHybrid.Shared.Components.Grids.ShippingItems; +namespace FruitBankHybrid.Shared.Components.Grids.Products; public class GridStockQuantityHistoryDto : FruitBankListGridBase, IGrid { public GridStockQuantityHistoryDto() : base() { - if (IsMasterGrid) GetAllMessageTag = SignalRTags.GetStockQuantityHistoryDtos; - else GetAllMessageTag = SignalRTags.GetStockQuantityHistoryDtosByProductId; + GetAllMessageTag = IsMasterGrid ? SignalRTags.GetStockQuantityHistoryDtos : SignalRTags.GetStockQuantityHistoryDtosByProductId; //AddMessageTag = SignalRTags.AddShippingItem; //UpdateMessageTag = SignalRTags.UpdateShippingItem; diff --git a/FruitBankHybrid.Shared/Components/Grids/Products/GridStockQuantityHistoryDtoTemplate.razor b/FruitBankHybrid.Shared/Components/Grids/Products/GridStockQuantityHistoryDtoTemplate.razor index a59afca..aa68938 100644 --- a/FruitBankHybrid.Shared/Components/Grids/Products/GridStockQuantityHistoryDtoTemplate.razor +++ b/FruitBankHybrid.Shared/Components/Grids/Products/GridStockQuantityHistoryDtoTemplate.razor @@ -1,9 +1,6 @@ @using AyCode.Core.Loggers; -@using AyCode.Core.Extensions -@using AyCode.Core.Helpers @using AyCode.Utils.Extensions @using FruitBank.Common.Dtos -@using FruitBank.Common.Entities @using FruitBankHybrid.Shared.Components.Grids.ShippingItems @using FruitBankHybrid.Shared.Components.Toolbars @using FruitBankHybrid.Shared.Databases @@ -57,17 +54,15 @@ [Inject] public required DatabaseClient Database { get; set; } [Parameter] public object[]? ContextIds { get; set; } - [Parameter] public bool IsMasterGrid { get; set; } = false; + [Parameter] public bool IsMasterGrid { get; set; } [Parameter] public IEnumerable? ProductDtos { get; set; } [Parameter] public List? StockQuantityHistoryDtos { get; set; } string GridCss => !IsMasterGrid ? "hide-toolbar" : string.Empty; - const string ExportFileName = "ExportResult"; - public GridStockQuantityHistoryDto Grid { get; set; } - private LoggerClient _logger; + private LoggerClient _logger = null!; protected override async Task OnInitializedAsync() {