diff --git a/FruitBank.Common/Entities/MeasuringItemPalletBase.cs b/FruitBank.Common/Entities/MeasuringItemPalletBase.cs index 6347059..6aa5416 100644 --- a/FruitBank.Common/Entities/MeasuringItemPalletBase.cs +++ b/FruitBank.Common/Entities/MeasuringItemPalletBase.cs @@ -61,6 +61,7 @@ public abstract class MeasuringItemPalletBase : MgEntityBase, IMeasuringItemPall public virtual MeasuringStatus MeasuringStatus => IsMeasured ? MeasuringStatus.Finnished : Id > 0 ? MeasuringStatus.Started : MeasuringStatus.NotStarted; + public void SetForeignKey(int foreignKey) => ForeignItemId = foreignKey; public virtual double CalculateNetWeight() => double.Round(GrossWeight - PalletWeight - (TareWeight * TrayQuantity), 1); /// diff --git a/FruitBank.Common/FruitBankConstClient.cs b/FruitBank.Common/FruitBankConstClient.cs index a547956..47c30ad 100644 --- a/FruitBank.Common/FruitBankConstClient.cs +++ b/FruitBank.Common/FruitBankConstClient.cs @@ -8,7 +8,7 @@ public static class FruitBankConstClient public static string DefaultLocale = "en-US"; public static string BaseUrl = "https://localhost:59579"; //FrutiBank nop - + #if RELEASE // public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop #endif diff --git a/FruitBank.Common/Interfaces/IFruitBankDataControllerCommon.cs b/FruitBank.Common/Interfaces/IFruitBankDataControllerCommon.cs index da1582e..9fc0a06 100644 --- a/FruitBank.Common/Interfaces/IFruitBankDataControllerCommon.cs +++ b/FruitBank.Common/Interfaces/IFruitBankDataControllerCommon.cs @@ -27,6 +27,7 @@ public interface IFruitBankDataControllerCommon #region ShippingItem public Task?> GetShippingItems(); + public Task?> GetShippingItemsByPartnerId(int partnerId); public Task?> GetShippingItemsByShippingId(int shippingId); public Task?> GetShippingItemsByDocumentId(int shippingDocumentId); public Task GetShippingItemById(int id); @@ -36,6 +37,8 @@ public interface IFruitBankDataControllerCommon #endregion ShippingItem #region ShippingItemPallet + + public Task?> GetShippingItemPallets(); public Task AddShippingItemPallet(ShippingItemPallet shippingItemPallet); public Task UpdateShippingItemPallet(ShippingItemPallet shippingItemPallet); public Task AddOrUpdateMeasuredShippingItemPallet(ShippingItemPallet shippingItemPallet); diff --git a/FruitBank.Common/SignalRs/SignalRTags.cs b/FruitBank.Common/SignalRs/SignalRTags.cs index b7d0c9c..4f16cce 100644 --- a/FruitBank.Common/SignalRs/SignalRTags.cs +++ b/FruitBank.Common/SignalRs/SignalRTags.cs @@ -26,6 +26,7 @@ public class SignalRTags : AcSignalRTags public const int GetShippingItemById = 51; public const int GetShippingItemsByDocumentId = 52; public const int GetShippingItemsByShippingId = 53; + public const int GetShippingItemsByPartnerId = 54; public const int AddShippingItem = 55; public const int UpdateShippingItem = 56; public const int UpdateMeasuredShippingItem = 57; @@ -47,6 +48,7 @@ public class SignalRTags : AcSignalRTags public const int GetAllMeasuringProductDtos = 82; public const int GetMeasuringProductDtoById = 83; + public const int GetShippingItemPallets = 94; public const int AddShippingItemPallet = 95; public const int UpdateShippingItemPallet = 96; public const int AddOrUpdateMeasuredShippingItemPallet = 97; diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor index 1006ca8..e3ebd53 100644 --- a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor +++ b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor @@ -17,7 +17,7 @@ - + diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor index 5a879d2..311923e 100644 --- a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor +++ b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor @@ -18,6 +18,7 @@ + + diff --git a/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor b/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor index 5540b9a..339756c 100644 --- a/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor +++ b/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor @@ -23,6 +23,7 @@ + diff --git a/FruitBankHybrid.Shared/Components/GridShippingDocument.razor b/FruitBankHybrid.Shared/Components/GridShippingDocument.razor index 99783c5..e257015 100644 --- a/FruitBankHybrid.Shared/Components/GridShippingDocument.razor +++ b/FruitBankHybrid.Shared/Components/GridShippingDocument.razor @@ -20,7 +20,7 @@ ParentDataItem="@ParentDataItem" Logger="_logger" ValidationEnabled="false" EditMode="GridEditMode.EditRow" FocusedRowChanged="Grid_FocusedRowChanged"> - + ? Shippings { get; set; } - [Parameter] public List? Partners { get; set; } + [Parameter] public AcObservableCollection? Partners { get; set; } [Parameter] public AcObservableCollection? ShippingDocuments { get; set; } [Parameter] public Func?, Task>? OnUploadedFileParsed { get; set; } @@ -149,6 +149,7 @@ public bool IsMasterGrid => ParentDataItem == null; public bool ParentDataItemIsShipping => (ParentDataItem is Shipping); + public bool ParentDataItemIsPartner => (ParentDataItem is Partner); string GridCss => !IsMasterGrid ? "hide-toolbar" : string.Empty; @@ -172,31 +173,37 @@ private async Task ReloadDataFromDb(bool forceReload = false) { - using (await ObjectLock.GetSemaphore().UseWaitAsync()) + if (!ParentDataItemIsPartner) { - if (Partners == null) Partners = await FruitBankSignalRClient.GetPartners() ?? []; - else if (Partners.Count == 0 || forceReload) + using (await ObjectLock.GetSemaphore().UseWaitAsync()) { - Partners.Clear(); - Partners.AddRange(await FruitBankSignalRClient.GetPartners() ?? []); + if (Partners == null) Partners = new AcObservableCollection(await FruitBankSignalRClient.GetPartners() ?? []); + else if (Partners.Count == 0 || forceReload) + { + Partners.Replace(await FruitBankSignalRClient.GetPartners() ?? []); + } + } + } + + if (!ParentDataItemIsShipping) + { + using (await ObjectLock.GetSemaphore().UseWaitAsync()) + { + if (Shippings == null) Shippings = new AcObservableCollection(await FruitBankSignalRClient.GetShippings() ?? []); + else if (Shippings.Count == 0 || forceReload) + { + Shippings.Replace(await FruitBankSignalRClient.GetShippings() ?? []); + } } } if (!IsMasterGrid) { if (Shippings == null && ParentDataItem is Shipping shippingParent) Shippings = [shippingParent]; + if (Partners == null && ParentDataItem is Partner partnerParent) Partners = [partnerParent]; return; } - using (await ObjectLock.GetSemaphore().UseWaitAsync()) - { - if (Shippings == null) Shippings = new AcObservableCollection(await FruitBankSignalRClient.GetShippings() ?? []); - else if (Shippings.Count == 0 || forceReload) - { - Shippings.Replace(await FruitBankSignalRClient.GetShippings() ?? []); - } - } - if (Grid == null) return; using (await ObjectLock.GetSemaphore().UseWaitAsync()) diff --git a/FruitBankHybrid.Shared/Components/GridShippingItemPallets.razor b/FruitBankHybrid.Shared/Components/GridShippingItemPallets.razor index 7ba1e00..291c286 100644 --- a/FruitBankHybrid.Shared/Components/GridShippingItemPallets.razor +++ b/FruitBankHybrid.Shared/Components/GridShippingItemPallets.razor @@ -65,7 +65,7 @@ ShippingItemPallets.Clear(); //TODO: A ShippingItemPallet-eknek SignalR Endpoint! - J. - ShippingItemPallets.AddRange((await FruitBankSignalRClient.GetShippingItems())?.SelectMany(si => si.ShippingItemPallets ?? []) ?? []); + ShippingItemPallets.AddRange(await FruitBankSignalRClient.GetShippingItemPallets() ?? []); if (ShippingItemPallets.Any(sip => sip.ShippingItem?.ProductDto != null)) { diff --git a/FruitBankHybrid.Shared/Components/Grids/Partners/GridPartner.razor b/FruitBankHybrid.Shared/Components/Grids/Partners/GridPartner.razor new file mode 100644 index 0000000..ef4bdab --- /dev/null +++ b/FruitBankHybrid.Shared/Components/Grids/Partners/GridPartner.razor @@ -0,0 +1,113 @@ +@using System.Collections.ObjectModel +@using AyCode.Core.Helpers +@using AyCode.Core.Loggers +@using AyCode.Utils.Extensions +@using FruitBank.Common.Dtos +@using FruitBank.Common.Entities +@using FruitBankHybrid.Shared.Components.Grids.Shippings +@using FruitBankHybrid.Shared.Components.Toolbars +@using FruitBankHybrid.Shared.Databases +@using FruitBankHybrid.Shared.Services.Loggers +@using FruitBankHybrid.Shared.Services.SignalRs + +@inject IEnumerable LogWriters +@inject FruitBankSignalRClient FruitBankSignalRClient + + + + + + + + + + + + + + + + + + + + @if (IsMasterGrid) + { + var partner = ((Partner)context.DataItem); + var shippingDocuments = partner?.ShippingDocuments ?? []; + + + + @{ + var observableShippingDocuments = new AcObservableCollection(shippingDocuments); + + } + + + + @{ + var observableShippingItems = new AcObservableCollection(shippingDocuments.SelectMany(sd => sd.ShippingItems ?? [])); + + } + + + } + + + @if (IsMasterGrid) + { + + } + + + +@code { + //[Inject] public required ObjectLock ObjectLock { get; set; } + [Inject] public required DatabaseClient Database { get; set; } + + [Parameter] public bool IsMasterGrid { get; set; } = false; + [Parameter] public AcObservableCollection? Partners { get; set; } + [Parameter] public AcObservableCollection? Shippings { get; set; } + + const string ExportFileName = "ExportResult"; + string GridSearchText = ""; + bool EditItemsEnabled { get; set; } + int FocusedRowVisibleIndex { get; set; } + public GridPartnerBase Grid { get; set; } + string GridCss => !IsMasterGrid ? "hide-toolbar" : string.Empty; + + private int _activeTabIndex; + private LoggerClient _logger; + + protected override async Task OnInitializedAsync() + { + _logger = new LoggerClient(LogWriters.ToArray()); + await ReloadDataFromDb(false); + } + + private async Task ReloadDataFromDb(bool forceReload = false) + { + if (!IsMasterGrid) return; + + if (Grid == null) return; + + using (await ObjectLock.GetSemaphore().UseWaitAsync()) + if (forceReload) await Grid.ReloadDataSourceAsync(); + + if (forceReload) Grid.Reload(); + } + + async Task Grid_FocusedRowChanged(GridFocusedRowChangedEventArgs args) + { + if (Grid == null) return; + + if (Grid.IsEditing() && !Grid.IsEditingNewRow()) + await Grid.SaveChangesAsync(); + + FocusedRowVisibleIndex = args.VisibleIndex; + EditItemsEnabled = true; + } +} + diff --git a/FruitBankHybrid.Shared/Components/Grids/Partners/GridPartnerBase.cs b/FruitBankHybrid.Shared/Components/Grids/Partners/GridPartnerBase.cs new file mode 100644 index 0000000..9ae0d4e --- /dev/null +++ b/FruitBankHybrid.Shared/Components/Grids/Partners/GridPartnerBase.cs @@ -0,0 +1,67 @@ +using AyCode.Core.Interfaces; +using DevExpress.Blazor; +using FruitBank.Common.Entities; +using FruitBank.Common.Interfaces; +using FruitBank.Common.SignalRs; +using FruitBankHybrid.Shared.Pages; +using Microsoft.AspNetCore.Components; + +namespace FruitBankHybrid.Shared.Components.Grids.Partners; + +public class GridPartnerBase: FruitBankGridBase, IGrid +{ + private bool _isFirstInitializeParameterCore; + private bool _isFirstInitializeParameters; + + public GridPartnerBase() : base() + { + GetAllMessageTag = SignalRTags.GetPartners; + AddMessageTag = SignalRTags.AddPartner; + UpdateMessageTag = SignalRTags.UpdatePartner; + + //RemoveMessageTag = SignalRTags.; + } + + protected override async Task OnInitializedAsync() + { + await base.OnInitializedAsync(); + } + + protected override void OnParametersSet() + { + base.OnParametersSet(); + + if (!_isFirstInitializeParameters) + { + //if (!IsMasterGrid && (ContextIds == null || ContextIds.Length == 0)) + //{ + // ContextIds = [ParentDataItem!.Id]; + // GetAllMessageTag = SignalRTags.GetShippingItemsByDocumentId; + //} + + _isFirstInitializeParameters = false; + } + } + + protected override async Task SetParametersAsyncCore(ParameterView parameters) + { + await base.SetParametersAsyncCore(parameters); + + if (!_isFirstInitializeParameterCore) + { + //if (!IsMasterGrid && (ContextIds == null || ContextIds.Length == 0)) + //{ + // ContextIds = [ParentDataItem!.Id]; + // GetAllMessageTag = SignalRTags.GetShippingItemsByDocumentId; + //} + + //ShowFilterRow = true; + //ShowGroupPanel = true; + //AllowSort = false; + + //etc... + + _isFirstInitializeParameterCore = false; + } + } +} \ No newline at end of file diff --git a/FruitBankHybrid.Shared/Components/Grids/ShippingItems/GridShippingItemBase.cs b/FruitBankHybrid.Shared/Components/Grids/ShippingItems/GridShippingItemBase.cs index 068c9bc..08761cf 100644 --- a/FruitBankHybrid.Shared/Components/Grids/ShippingItems/GridShippingItemBase.cs +++ b/FruitBankHybrid.Shared/Components/Grids/ShippingItems/GridShippingItemBase.cs @@ -1,4 +1,5 @@ using AyCode.Core.Interfaces; +using AyCode.Utils.Extensions; using DevExpress.Blazor; using FruitBank.Common.Entities; using FruitBank.Common.Interfaces; @@ -34,12 +35,19 @@ public class GridShippingItemBase : FruitBankGridBase, IGrid { case IShippingDocument: GetAllMessageTag = SignalRTags.GetShippingItemsByDocumentId; + break; case IShipping: AddMessageTag = 0;//SignalRTags.None; - GetAllMessageTag = SignalRTags.GetShippingItemsByShippingId; + break; + case IPartner: + AddMessageTag = 0;//SignalRTags.None; + GetAllMessageTag = SignalRTags.GetShippingItemsByPartnerId; + + break; + } } diff --git a/FruitBankHybrid.Shared/Components/Grids/Shippings/GridShipping.razor b/FruitBankHybrid.Shared/Components/Grids/Shippings/GridShipping.razor index af07c04..cdb411b 100644 --- a/FruitBankHybrid.Shared/Components/Grids/Shippings/GridShipping.razor +++ b/FruitBankHybrid.Shared/Components/Grids/Shippings/GridShipping.razor @@ -58,17 +58,6 @@ } - - - - - @code { @@ -76,7 +65,7 @@ [Inject] public required DatabaseClient Database { get; set; } [Parameter] public bool IsMasterGrid { get; set; } = false; - [Parameter] public List? Partners { get; set; } + [Parameter] public AcObservableCollection? Partners { get; set; } [Parameter] public AcObservableCollection? Shippings { get; set; } const string ExportFileName = "ExportResult"; @@ -101,11 +90,10 @@ using (await ObjectLock.GetSemaphore().UseWaitAsync()) { - if (Partners == null) Partners = await FruitBankSignalRClient.GetPartners() ?? []; + if (Partners == null) Partners = new AcObservableCollection(await FruitBankSignalRClient.GetPartners() ?? []); else if (Partners.Count == 0 || forceReload) { - Partners.Clear(); - Partners.AddRange(await FruitBankSignalRClient.GetPartners() ?? []); + Partners.Replace(await FruitBankSignalRClient.GetPartners() ?? []); } } diff --git a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs index 01f6896..77f50a2 100644 --- a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs +++ b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs @@ -1,6 +1,7 @@ using AyCode.Core.Extensions; using AyCode.Core.Loggers; using DevExpress.Blazor; +using FruitBank.Common.Dtos; using FruitBank.Common.Entities; using FruitBank.Common.Helpers; using FruitBank.Common.Interfaces; @@ -198,15 +199,7 @@ namespace FruitBankHybrid.Shared.Pages for (var i = shippingItem.ShippingItemPallets.Count; i < shippingItem.MeasuringCount; i++) { - shippingItem.ShippingItemPallets.Add(new ShippingItemPallet - { - ShippingItemId = shippingItem.Id, - PalletWeight = shippingItem.Pallet?.Weight ?? 0, - TareWeight = shippingItem.ProductDto?.Tare ?? 0, - - CreatorId = LoggedInModel.CustomerDto?.Id, - ModifierId = LoggedInModel.CustomerDto?.Id - }); + shippingItem.ShippingItemPallets.Add(MeasurementService.CreateNewShippingItemPallet(shippingItem, LoggedInModel.CustomerDto)); } } } diff --git a/FruitBankHybrid.Shared/Pages/OrdersAdmin.razor b/FruitBankHybrid.Shared/Pages/OrdersAdmin.razor index e7e3a29..cf0edd4 100644 --- a/FruitBankHybrid.Shared/Pages/OrdersAdmin.razor +++ b/FruitBankHybrid.Shared/Pages/OrdersAdmin.razor @@ -1,5 +1,6 @@ @page "/OrdersAdmin" @using FruitBank.Common.Dtos +@using FruitBank.Common.Models @using FruitBankHybrid.Shared.Components @using FruitBankHybrid.Shared.Databases

Rendelések - Adminisztrátor

@@ -15,10 +16,12 @@ Text="Adatok szinkronizálása folyamatban..."> @* @bind-ActiveTabIndex="@ActiveTabIndex" *@ - + + + diff --git a/FruitBankHybrid.Shared/Pages/ShippingsAdmin.razor b/FruitBankHybrid.Shared/Pages/ShippingsAdmin.razor index 1386f01..3fb759e 100644 --- a/FruitBankHybrid.Shared/Pages/ShippingsAdmin.razor +++ b/FruitBankHybrid.Shared/Pages/ShippingsAdmin.razor @@ -2,6 +2,7 @@ @using FruitBank.Common.Dtos @using FruitBank.Common.Entities @using FruitBankHybrid.Shared.Components +@using FruitBankHybrid.Shared.Components.Grids.Partners @using FruitBankHybrid.Shared.Components.Grids.Shippings @using FruitBankHybrid.Shared.Databases

Szállítmányok - Adminisztrátor

@@ -21,6 +22,9 @@ + + + diff --git a/FruitBankHybrid.Shared/Pages/ShippingsAdmin.razor.cs b/FruitBankHybrid.Shared/Pages/ShippingsAdmin.razor.cs index 30cdf5a..2be9b86 100644 --- a/FruitBankHybrid.Shared/Pages/ShippingsAdmin.razor.cs +++ b/FruitBankHybrid.Shared/Pages/ShippingsAdmin.razor.cs @@ -9,6 +9,7 @@ using FruitBank.Common.Models; using FruitBankHybrid.Shared.Components; using FruitBankHybrid.Shared.Components.Grids.ShippingItems; using FruitBankHybrid.Shared.Components.Grids.Shippings; +using FruitBankHybrid.Shared.Components.Grids.Partners; using FruitBankHybrid.Shared.Databases; using FruitBankHybrid.Shared.Services.Loggers; using FruitBankHybrid.Shared.Services.SignalRs; @@ -27,6 +28,7 @@ public partial class ShippingsAdmin : ComponentBase [Inject] public required DatabaseClient Database { get; set; } private GridProductDtoTemplate gridProductDtoTemplate; + private GridPartner gridPartner; private GridShipping gridShipping; private GridShippingDocument gridShippingDocument; private GridShippingItemTemplate gridShippingItemTemplate; @@ -36,7 +38,7 @@ public partial class ShippingsAdmin : ComponentBase public AcObservableCollection ShippingDocuments { get; set; } = []; public AcObservableCollection ShippingItems { get; set; } = []; public List ShippingItemPallets { get; set; } = []; - public List Partners { get; set; } = []; + public AcObservableCollection Partners { get; set; } = []; public bool AutoCollapseDetailRow { get; set; } diff --git a/FruitBankHybrid.Shared/Services/MeasurementService.cs b/FruitBankHybrid.Shared/Services/MeasurementService.cs index e38a8bb..fb619cf 100644 --- a/FruitBankHybrid.Shared/Services/MeasurementService.cs +++ b/FruitBankHybrid.Shared/Services/MeasurementService.cs @@ -63,21 +63,39 @@ public class MeasurementService(IEnumerable logWriters) return string.Empty; } + public static ShippingItemPallet CreateNewShippingItemPallet(ShippingItem shippingItem, CustomerDto? customerDto) + { + var shippingItemPallet = CreatePalletItem(shippingItem.Id, shippingItem.ProductDto?.Tare, shippingItem.IsMeasurable, customerDto); + + shippingItemPallet.ShippingItem = shippingItem; + shippingItemPallet.PalletWeight = shippingItem.IsMeasurable ? shippingItem.Pallet?.Weight ?? 0 : 0; + + return shippingItemPallet; + } + public static OrderItemPallet CreateNewOrderItemPallet(OrderItemDto orderItemDto, CustomerDto? customerDto) { - var orderItemPallet = new OrderItemPallet - { - OrderItemId = orderItemDto.Id, - OrderItemDto = orderItemDto, - TareWeight = orderItemDto.ProductDto?.Tare ?? 0, - - CreatorId = customerDto?.Id, - ModifierId = customerDto?.Id - }; + var orderItemPallet = CreatePalletItem(orderItemDto.Id, orderItemDto.ProductDto?.Tare, orderItemDto.IsMeasurable, customerDto); + orderItemPallet.OrderItemDto = orderItemDto; return orderItemPallet; } + private static TPalletItem CreatePalletItem(int foreignKey, double? tare, bool isMeasurable, CustomerDto? customerDto) where TPalletItem : MeasuringItemPalletBase + { + var palletItem = Activator.CreateInstance(); + + palletItem.SetForeignKey(foreignKey); + + //palletItem.PalletWeight = isMeasurable ? orderItemDto.Pallet?.Weight ?? 0 : 0; + palletItem.TareWeight = isMeasurable ? tare ?? 0 : 0; + + palletItem.CreatorId = customerDto?.Id; + palletItem.ModifierId = customerDto?.Id; + + return palletItem; + } + public static bool IsCustomItemPalletMeasuredAndValid(IMeasuringItemPalletBase customItemPallet, bool isMeasurable) => customItemPallet.IsMeasuredAndValid(isMeasurable); } \ No newline at end of file diff --git a/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs b/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs index eb2e101..e1e0d4c 100644 --- a/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs +++ b/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs @@ -105,6 +105,9 @@ namespace FruitBankHybrid.Shared.Services.SignalRs public Task?> GetShippingItemsByShippingId(int shippingId) => GetAllAsync>(SignalRTags.GetShippingItemsByShippingId, [shippingId]); + public Task?> GetShippingItemsByPartnerId(int partnerId) + => GetAllAsync>(SignalRTags.GetShippingItemsByPartnerId, [partnerId]); + public Task GetShippingItemById(int id) => GetByIdAsync(SignalRTags.GetShippingItemById, id); @@ -120,6 +123,10 @@ namespace FruitBankHybrid.Shared.Services.SignalRs #endregion ShippingItem #region ShippingItemPallet + + public Task?> GetShippingItemPallets() + => GetAllAsync>(SignalRTags.GetShippingItemPallets); + public Task AddShippingItemPallet(ShippingItemPallet shippingItemPallet) => PostDataAsync(SignalRTags.AddShippingItemPallet, shippingItemPallet); @@ -162,7 +169,7 @@ namespace FruitBankHybrid.Shared.Services.SignalRs public Task?> GetMeasuringUsers() => GetAllAsync>(SignalRTags.GetMeasuringUsers); - + public Task?> GetCustomerRolesByCustomerId(int customerId) => GetAllAsync>(SignalRTags.GetCustomerRolesByCustomerId, [customerId]); #endregion Customer @@ -224,7 +231,7 @@ namespace FruitBankHybrid.Shared.Services.SignalRs public Task?> GetAllOrderDtoByProductId(int productId) => GetAllAsync>(SignalRTags.GetAllOrderDtoByProductId, [productId]); - + public Task GetOrderItemDtoById(int orderItemId) => GetByIdAsync(SignalRTags.GetOrderItemDtoById, [orderItemId]); @@ -254,6 +261,7 @@ namespace FruitBankHybrid.Shared.Services.SignalRs public Task?> GetStockQuantityHistoryDtosByProductId(int productId) => GetAllAsync>(SignalRTags.GetStockQuantityHistoryDtosByProductId, [productId]); + #endregion Orders } } diff --git a/FruitBankHybrid.Web.Client/Program.cs b/FruitBankHybrid.Web.Client/Program.cs index f03d9fb..3c8c491 100644 --- a/FruitBankHybrid.Web.Client/Program.cs +++ b/FruitBankHybrid.Web.Client/Program.cs @@ -15,9 +15,9 @@ builder.Services.AddDevExpressBlazor(configure => configure.SizeMode = DevExpres // Add device-specific services used by the FruitBankHybrid.Shared project builder.Services.AddSingleton(); -#if DEBUG +//#if DEBUG builder.Services.AddSingleton(); -#endif +//#endif builder.Services.AddSingleton(); builder.Services.AddSingleton(); diff --git a/FruitBankHybrid/MauiProgram.cs b/FruitBankHybrid/MauiProgram.cs index ada3e32..fbbc93f 100644 --- a/FruitBankHybrid/MauiProgram.cs +++ b/FruitBankHybrid/MauiProgram.cs @@ -34,7 +34,7 @@ namespace FruitBankHybrid #endif builder.Services.AddSingleton(); - builder.Services.AddScoped(); + builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton();