From 53e69c0b7809856c5cdb59e7006c5ef992f9f8be Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 24 Mar 2026 12:55:16 +0100 Subject: [PATCH] Completamento move DataLayerServices --- .../DataServiceCollectionExtensions.cs | 3 +- .../{ => General}/DataLayerServices.cs | 6 +- .../Services/General/IDataLayerServices.cs | 84 ++++++ Lux.API/Controllers/FileController.cs | 2 +- .../Components/Compo/Config/GlassMan.razor.cs | 4 +- .../Compo/Config/HardwareMan.razor.cs | 3 +- .../Compo/Config/ProfileMan.razor.cs | 2 +- .../Components/Compo/Config/WoodMan.razor.cs | 4 +- Lux.UI/Components/Compo/EditBom.razor.cs | 246 +++++++++--------- .../Compo/FileMan/BtlPreview.razor.cs | 2 +- .../Components/Compo/Item/DataFilter.razor.cs | 4 - Lux.UI/Components/Compo/Item/ItemMan.razor.cs | 12 +- .../Compo/Item/SellingItemEdit.razor.cs | 2 +- .../Compo/Item/SellingItemMan.razor.cs | 2 +- .../Compo/JobTask/JobStepMan.razor.cs | 154 +++++------ .../Compo/JobTask/JobTaskListMan.razor.cs | 169 ++++++------ .../Compo/JobTask/ResourcesMan.razor.cs | 4 +- .../Components/Compo/OfferCommonPar.razor.cs | 2 +- Lux.UI/Components/Compo/OfferMan.razor.cs | 19 +- Lux.UI/Components/Compo/OfferRowMan.razor.cs | 2 +- Lux.UI/Components/Compo/OrderRowMan.razor.cs | 3 +- .../Compo/Templates/TemplateList.razor.cs | 4 +- .../Compo/Templates/TemplateRowList.razor.cs | 2 +- .../Compo/WorkLoad/ItemSel.razor.cs | 8 - .../Compo/WorkLoad/TimeEstim.razor.cs | 5 +- Lux.UI/Components/Pages/Items.razor.cs | 4 +- Lux.UI/Components/Pages/JobRoute.razor.cs | 4 +- Lux.UI/Components/Pages/Offers.razor.cs | 2 +- Lux.UI/Components/Pages/Orders.razor.cs | 2 +- Lux.UI/Components/Pages/ProdPlanner.razor.cs | 15 +- Lux.UI/Components/Pages/ResetCache.razor | 4 +- Lux.UI/Components/Pages/Scratch.razor.cs | 2 +- Lux.UI/Components/Pages/SellItems.razor.cs | 4 +- .../Components/Pages/WorkLoadBalance.razor.cs | 2 +- 34 files changed, 415 insertions(+), 372 deletions(-) rename EgwCoreLib.Lux.Data/Services/{ => General}/DataLayerServices.cs (98%) create mode 100644 EgwCoreLib.Lux.Data/Services/General/IDataLayerServices.cs diff --git a/EgwCoreLib.Lux.Data/DataServiceCollectionExtensions.cs b/EgwCoreLib.Lux.Data/DataServiceCollectionExtensions.cs index cabc74e8..f2dc0ad7 100644 --- a/EgwCoreLib.Lux.Data/DataServiceCollectionExtensions.cs +++ b/EgwCoreLib.Lux.Data/DataServiceCollectionExtensions.cs @@ -6,7 +6,6 @@ using EgwCoreLib.Lux.Data.Repository.Production; using EgwCoreLib.Lux.Data.Repository.Sales; using EgwCoreLib.Lux.Data.Repository.Stats; using EgwCoreLib.Lux.Data.Repository.Utils; -using EgwCoreLib.Lux.Data.Services; using EgwCoreLib.Lux.Data.Services.Config; using EgwCoreLib.Lux.Data.Services.Cost; using EgwCoreLib.Lux.Data.Services.General; @@ -100,7 +99,7 @@ namespace EgwCoreLib.Lux.Data services.TryAddScoped(); // Facade / DataLayerService - services.TryAddScoped(); + services.TryAddScoped(); services.TryAddScoped(); //builder.Services.AddSingleton(); //services.TryAddScoped(); diff --git a/EgwCoreLib.Lux.Data/Services/DataLayerServices.cs b/EgwCoreLib.Lux.Data/Services/General/DataLayerServices.cs similarity index 98% rename from EgwCoreLib.Lux.Data/Services/DataLayerServices.cs rename to EgwCoreLib.Lux.Data/Services/General/DataLayerServices.cs index 85d4f314..6cf54556 100644 --- a/EgwCoreLib.Lux.Data/Services/DataLayerServices.cs +++ b/EgwCoreLib.Lux.Data/Services/General/DataLayerServices.cs @@ -14,9 +14,9 @@ using StackExchange.Redis; using System.Diagnostics; using System.Runtime.CompilerServices; -namespace EgwCoreLib.Lux.Data.Services +namespace EgwCoreLib.Lux.Data.Services.General { - public class DataLayerServices : BaseServ + public class DataLayerServices : BaseServ, IDataLayerServices { #region Public Constructors @@ -66,7 +66,7 @@ namespace EgwCoreLib.Lux.Data.Services /// /// /// - public async Task>?> PlannerGetEvents(DateTime dtStart, DateTime dtEnd) + public async Task>?> PlannerGetEventsAsync(DateTime dtStart, DateTime dtEnd) { using var activity = StartActivity(); string source = "DB"; diff --git a/EgwCoreLib.Lux.Data/Services/General/IDataLayerServices.cs b/EgwCoreLib.Lux.Data/Services/General/IDataLayerServices.cs new file mode 100644 index 00000000..7668ec03 --- /dev/null +++ b/EgwCoreLib.Lux.Data/Services/General/IDataLayerServices.cs @@ -0,0 +1,84 @@ +using EgwCoreLib.Lux.Core.Generic; +using EgwCoreLib.Lux.Data.Services.Internal; +using EgwMultiEngineManager.Data; + +namespace EgwCoreLib.Lux.Data.Services.General +{ + /// + /// Interfaccia servizio livello dati (orchestrazione) + /// + public interface IDataLayerServices + { + #region Public Properties + + public MessagePipe PipeBom { get; set; } + + public MessagePipe PipeHwList { get; set; } + + public MessagePipe PipeHwOpt { get; set; } + + public MessagePipe PipePng { get; set; } + + public MessagePipe PipeProd { get; set; } + + public MessagePipe PipeProfElement { get; set; } + + public MessagePipe PipeProfList { get; set; } + + public MessagePipe PipeShape { get; set; } + + public MessagePipe PipeSvg { get; set; } + + public MessagePipe PipeUpdate { get; set; } + + #endregion Public Properties + + #region Public Methods + + /// + /// Reset completo cache sistema (modalità async) + /// + /// Token di cancellazione + /// Task di completamento + Task FlushCacheAsync(); + + /// + /// Restituisce un dizionario di EventDto da usare nel planner + /// + /// Data inizio + /// Data fine + /// Dizionario fasi -> eventi + Task>?> PlannerGetEventsAsync(DateTime dtStart, DateTime dtEnd); + + /// + /// Esegue salvataggio BOM sul DB + /// + /// UID dell'item offerta + /// Mode della chiamata + /// Environment dell'item + /// BOM serializzata + /// Task di completamento + Task SaveBomAsync(string uID, Egw.Window.Data.Enums.QuestionModes qMode, Constants.EXECENVIRONMENTS execEnvironment, string bomContent); + + /// + /// Esegue salvataggio ProdBalance (di un gruppo lavorazioni per riga ordine) sul DB + /// + /// UID dell'item offerta + /// Prod Group di riferimento + /// Environment dell'item + /// Stima Balance serializzata + /// True se salvato con successo + Task SaveProdBalanceAsync(string uID, string rGroup, Constants.EXECENVIRONMENTS execEnvironment, string balance); + + /// + /// Esegue salvataggio ProdEstimate (per riga ordine) sul DB + /// + /// UID dell'item offerta + /// Environment dell'item + /// Stima ProdEstimate serializzata + /// True se salvato con successo + Task SaveProdEstimateAsync(string uID, Constants.EXECENVIRONMENTS execEnvironment, string prodEstim); + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/Lux.API/Controllers/FileController.cs b/Lux.API/Controllers/FileController.cs index 379ad7c0..380be7d4 100644 --- a/Lux.API/Controllers/FileController.cs +++ b/Lux.API/Controllers/FileController.cs @@ -189,7 +189,7 @@ namespace Lux.API.Controllers #region Private Properties - private DataLayerServices _DSService { get; set; } + private IDataLayerServices _DSService { get; set; } private IOfferRowService _OffRService { get; set; } private IOrderRowService _OrdRService { get; set; } private ImageCacheService _imgService { get; set; } diff --git a/Lux.UI/Components/Compo/Config/GlassMan.razor.cs b/Lux.UI/Components/Compo/Config/GlassMan.razor.cs index 2b9f5ce9..4afa5771 100644 --- a/Lux.UI/Components/Compo/Config/GlassMan.razor.cs +++ b/Lux.UI/Components/Compo/Config/GlassMan.razor.cs @@ -1,6 +1,6 @@ using EgwCoreLib.Lux.Data.DbModel.Config; -using EgwCoreLib.Lux.Data.Services; using EgwCoreLib.Lux.Data.Services.Config; +using EgwCoreLib.Lux.Data.Services.General; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; @@ -14,7 +14,7 @@ namespace Lux.UI.Components.Compo.Config protected IConfGlassService CGService { get; set; } = null!; [Inject] - protected DataLayerServices DLService { get; set; } = null!; + protected IDataLayerServices DLService { get; set; } = null!; [Inject] protected IJSRuntime JSRuntime { get; set; } = null!; diff --git a/Lux.UI/Components/Compo/Config/HardwareMan.razor.cs b/Lux.UI/Components/Compo/Config/HardwareMan.razor.cs index cf6c61e2..189c2fc9 100644 --- a/Lux.UI/Components/Compo/Config/HardwareMan.razor.cs +++ b/Lux.UI/Components/Compo/Config/HardwareMan.razor.cs @@ -1,6 +1,5 @@ using EgwCoreLib.Lux.Core.RestPayload; using EgwCoreLib.Lux.Data.DbModel.Config; -using EgwCoreLib.Lux.Data.Services; using EgwCoreLib.Lux.Data.Services.General; using EgwMultiEngineManager.Data; using Microsoft.AspNetCore.Components; @@ -89,7 +88,7 @@ namespace Lux.UI.Components.Compo.Config private ICalcRequestService CService { get; set; } = null!; [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private IJSRuntime JSRuntime { get; set; } = null!; diff --git a/Lux.UI/Components/Compo/Config/ProfileMan.razor.cs b/Lux.UI/Components/Compo/Config/ProfileMan.razor.cs index 5d1f2859..59cd2b88 100644 --- a/Lux.UI/Components/Compo/Config/ProfileMan.razor.cs +++ b/Lux.UI/Components/Compo/Config/ProfileMan.razor.cs @@ -105,7 +105,7 @@ namespace Lux.UI.Components.Compo.Config } [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private IJSRuntime JSRuntime { get; set; } = null!; diff --git a/Lux.UI/Components/Compo/Config/WoodMan.razor.cs b/Lux.UI/Components/Compo/Config/WoodMan.razor.cs index 3144e13f..22a51a03 100644 --- a/Lux.UI/Components/Compo/Config/WoodMan.razor.cs +++ b/Lux.UI/Components/Compo/Config/WoodMan.razor.cs @@ -1,6 +1,6 @@ using EgwCoreLib.Lux.Data.DbModel.Config; -using EgwCoreLib.Lux.Data.Services; using EgwCoreLib.Lux.Data.Services.Config; +using EgwCoreLib.Lux.Data.Services.General; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; @@ -40,7 +40,7 @@ namespace Lux.UI.Components.Compo.Config private IConfWoodService CWService { get; set; } = null!; [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private IJSRuntime JSRuntime { get; set; } = null!; diff --git a/Lux.UI/Components/Compo/EditBom.razor.cs b/Lux.UI/Components/Compo/EditBom.razor.cs index 45765968..06ab8229 100644 --- a/Lux.UI/Components/Compo/EditBom.razor.cs +++ b/Lux.UI/Components/Compo/EditBom.razor.cs @@ -1,7 +1,7 @@ using EgwCoreLib.Lux.Core.RestPayload; using EgwCoreLib.Lux.Data.DbModel.Items; using EgwCoreLib.Lux.Data.DbModel.Sales; -using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using EgwCoreLib.Lux.Data.Services.Items; using EgwMultiEngineManager.Data; using Microsoft.AspNetCore.Components; @@ -28,107 +28,25 @@ namespace Lux.UI.Components.Compo #region Protected Properties - [Inject] - protected DataLayerServices DLService { get; set; } = null!; - - [Inject] - protected IItemService IService { get; set; } = null!; - - protected double ImportoTotale + protected bool showMassEditSave { - get - { - double valTot = 0; - if (bomDict != null) - { - valTot = bomDict.Sum(x => x.TotalCost); - } - return valTot; - } - } - - protected double QtyTotale - { - get - { - double valTot = 0; - if (bomDict != null) - { - valTot = bomDict.Sum(x => x.Qty); - } - return valTot; - } - } - - protected int TotItemQty - { - get - { - int numTot = 0; - if (bomDict != null) - { - numTot = bomDict.Sum(x => x.ItemQty); - } - return numTot; - } - } - - protected bool SelAll - { - get => selAll; - set - { - if (selAll != value) - { - selAll = value; - foreach (var item in bomDict) - { - item.isSelected = selAll; - } - } - } - } - - protected double VolTotale - { - get - { - double valTot = 0; - if (bomDict != null) - { - valTot = bomDict.Sum(x => x.Volume); - } - return valTot; - } + get => bomDict != null && bomDict.Any(x => x.isSelected); } #endregion Protected Properties #region Protected Methods - protected void DoCancel() + protected async Task ForceItemPrice() { - EditRecord = null; - isLoading = false; - } - - protected async Task DoEdit(BomDtoSel editRec) - { - if (editRec.ItemID > 0) - { - // carico elenco alternative... - ListItemAlt = await IService.GetAltAsync(editRec.ItemID); - // riordino... - ListItemAlt = ListItemAlt - .OrderBy(x => x.ItemIDParent) - .ThenBy(x => x.Description) - .ToList(); - } - else - { - ListItemAlt = new List(); - } - EditRecord = editRec; + isLoading = true; + // chiamo metodo update x i soli valori selezionati... + var list2upd = bomDict.Where(x => x.isSelected).Cast().ToList(); + await IService.MassUpdateAsync(list2upd, totCost, (double)defMargin, defQtyMax, defUM, defRound); + // ...e passo al controller parent LINQ projection to base type + List baseList = bomDict.Cast().ToList(); + await EC_Updated.InvokeAsync(baseList); + SelAll = false; } /// @@ -166,18 +84,6 @@ namespace Lux.UI.Components.Compo } } - protected void SaveNumRec(int newNum) - { - numRecord = newNum; - UpdateTable(); - } - - protected void SavePage(int newNum) - { - currPage = newNum; - UpdateTable(); - } - #endregion Protected Methods #region Private Fields @@ -215,23 +121,6 @@ namespace Lux.UI.Components.Compo #endregion Private Fields - protected async Task ForceItemPrice() - { - isLoading = true; - // chiamo metodo update x i soli valori selezionati... - var list2upd = bomDict.Where(x => x.isSelected).Cast().ToList(); - await IService.MassUpdateAsync(list2upd, totCost, (double)defMargin, defQtyMax, defUM, defRound); - // ...e passo al controller parent LINQ projection to base type - List baseList = bomDict.Cast().ToList(); - await EC_Updated.InvokeAsync(baseList); - SelAll = false; - } - - protected bool showMassEditSave - { - get => bomDict != null && bomDict.Any(x => x.isSelected); - } - #region Protected Classes protected class BomDtoSel : BomItemDTO @@ -248,15 +137,114 @@ namespace Lux.UI.Components.Compo #region Private Properties + [Inject] + private IDataLayerServices DLService { get; set; } = null!; + + private double ImportoTotale + { + get + { + double valTot = 0; + if (bomDict != null) + { + valTot = bomDict.Sum(x => x.TotalCost); + } + return valTot; + } + } + + [Inject] + private IItemService IService { get; set; } = null!; + + private double QtyTotale + { + get + { + double valTot = 0; + if (bomDict != null) + { + valTot = bomDict.Sum(x => x.Qty); + } + return valTot; + } + } + + private bool SelAll + { + get => selAll; + set + { + if (selAll != value) + { + selAll = value; + foreach (var item in bomDict) + { + item.isSelected = selAll; + } + } + } + } + private bool ShowVolume { get => CurrRowRec.Envir == Constants.EXECENVIRONMENTS.BEAM || CurrRowRec.Envir == Constants.EXECENVIRONMENTS.WALL; } + private int TotItemQty + { + get + { + int numTot = 0; + if (bomDict != null) + { + numTot = bomDict.Sum(x => x.ItemQty); + } + return numTot; + } + } + + private double VolTotale + { + get + { + double valTot = 0; + if (bomDict != null) + { + valTot = bomDict.Sum(x => x.Volume); + } + return valTot; + } + } + #endregion Private Properties #region Private Methods + private void DoCancel() + { + EditRecord = null; + isLoading = false; + } + + private async Task DoEdit(BomDtoSel editRec) + { + if (editRec.ItemID > 0) + { + // carico elenco alternative... + ListItemAlt = await IService.GetAltAsync(editRec.ItemID); + // riordino... + ListItemAlt = ListItemAlt + .OrderBy(x => x.ItemIDParent) + .ThenBy(x => x.Description) + .ToList(); + } + else + { + ListItemAlt = new List(); + } + EditRecord = editRec; + } + /// /// Salvataggio con conversion a list + ritorno a parent /// @@ -276,6 +264,18 @@ namespace Lux.UI.Components.Compo await EC_Updated.InvokeAsync(baseList); } + private void SaveNumRec(int newNum) + { + numRecord = newNum; + UpdateTable(); + } + + private void SavePage(int newNum) + { + currPage = newNum; + UpdateTable(); + } + /// /// Update item nel dictionary /// diff --git a/Lux.UI/Components/Compo/FileMan/BtlPreview.razor.cs b/Lux.UI/Components/Compo/FileMan/BtlPreview.razor.cs index c17b08f5..fbe67ac7 100644 --- a/Lux.UI/Components/Compo/FileMan/BtlPreview.razor.cs +++ b/Lux.UI/Components/Compo/FileMan/BtlPreview.razor.cs @@ -38,7 +38,7 @@ namespace Lux.UI.Components.Compo.FileMan #region Private Properties [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private IOfferRowService ORService { get; set; } = null!; diff --git a/Lux.UI/Components/Compo/Item/DataFilter.razor.cs b/Lux.UI/Components/Compo/Item/DataFilter.razor.cs index 03792e42..35c59411 100644 --- a/Lux.UI/Components/Compo/Item/DataFilter.razor.cs +++ b/Lux.UI/Components/Compo/Item/DataFilter.razor.cs @@ -1,6 +1,5 @@ using EgwCoreLib.Lux.Core; using EgwCoreLib.Lux.Data.DbModel.Items; -using EgwCoreLib.Lux.Data.Services; using EgwCoreLib.Lux.Data.Services.Items; using Microsoft.AspNetCore.Components; @@ -55,9 +54,6 @@ namespace Lux.UI.Components.Compo.Item #region Private Properties - [Inject] - private DataLayerServices DLService { get; set; } = null!; - [Inject] private IItemGroupService IGService { get; set; } = null!; diff --git a/Lux.UI/Components/Compo/Item/ItemMan.razor.cs b/Lux.UI/Components/Compo/Item/ItemMan.razor.cs index 3bbf6dd4..28a0fde4 100644 --- a/Lux.UI/Components/Compo/Item/ItemMan.razor.cs +++ b/Lux.UI/Components/Compo/Item/ItemMan.razor.cs @@ -1,6 +1,6 @@ using EgwCoreLib.Lux.Core; using EgwCoreLib.Lux.Data.DbModel.Items; -using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using EgwCoreLib.Lux.Data.Services.Items; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; @@ -56,7 +56,7 @@ namespace Lux.UI.Components.Compo.Item #region Private Properties [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private IItemService IService { get; set; } = null!; @@ -66,14 +66,6 @@ namespace Lux.UI.Components.Compo.Item #endregion Private Properties -#if false - private async Task DoCancel() - { - await ResetEdit(); - UpdateTable(); - } -#endif - #region Private Methods /// diff --git a/Lux.UI/Components/Compo/Item/SellingItemEdit.razor.cs b/Lux.UI/Components/Compo/Item/SellingItemEdit.razor.cs index 33ca2b27..5abf14d0 100644 --- a/Lux.UI/Components/Compo/Item/SellingItemEdit.razor.cs +++ b/Lux.UI/Components/Compo/Item/SellingItemEdit.razor.cs @@ -38,7 +38,7 @@ namespace Lux.UI.Components.Compo.Item #region Private Properties [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private IFileService FService { get; set; } = null!; diff --git a/Lux.UI/Components/Compo/Item/SellingItemMan.razor.cs b/Lux.UI/Components/Compo/Item/SellingItemMan.razor.cs index 66f8f0c1..4491b7f0 100644 --- a/Lux.UI/Components/Compo/Item/SellingItemMan.razor.cs +++ b/Lux.UI/Components/Compo/Item/SellingItemMan.razor.cs @@ -86,7 +86,7 @@ namespace Lux.UI.Components.Compo.Item private IConfiguration Config { get; set; } = null!; [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private IImageCacheService ICService { get; set; } = null!; diff --git a/Lux.UI/Components/Compo/JobTask/JobStepMan.razor.cs b/Lux.UI/Components/Compo/JobTask/JobStepMan.razor.cs index 968f9b53..139a23dd 100644 --- a/Lux.UI/Components/Compo/JobTask/JobStepMan.razor.cs +++ b/Lux.UI/Components/Compo/JobTask/JobStepMan.razor.cs @@ -1,6 +1,6 @@ using EgwCoreLib.Lux.Data.DbModel.Cost; using EgwCoreLib.Lux.Data.DbModel.Job; -using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using EgwCoreLib.Lux.Data.Services.Job; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; @@ -44,21 +44,50 @@ namespace Lux.UI.Components.Compo.JobTask #endregion Protected Fields - #region Protected Properties + #region Protected Methods + + protected override void OnParametersSet() + { + ReloadData(); + } + + #endregion Protected Methods + + #region Private Fields + + private bool addVisible = false; + + private int currPage = 1; + + private JobStepModel? editRecord = null; + + private string errorMsg = ""; + + private JobStepModel? newRecord = null; + + private int numRecord = 10; + + private JobStepModel? selRecord = null; + + private int totalCount = 0; + + #endregion Private Fields + + #region Private Properties [Inject] - protected DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] - protected IJobStepService JSService { get; set; } = null!; + private IJSRuntime JSRuntime { get; set; } = null!; [Inject] - protected IJSRuntime JSRuntime { get; set; } = null!; + private IJobStepService JSService { get; set; } = null!; /// /// Elenco ordinato fasi /// - protected List ListPhasesOrd + private List ListPhasesOrd { get => ListPhases.OrderBy(x => x.CodPhase).ThenBy(x => x.Name).ToList(); } @@ -66,12 +95,12 @@ namespace Lux.UI.Components.Compo.JobTask /// /// Elenco ordinato risorse /// - protected List ListResourcesOrd + private List ListResourcesOrd { get => ListResources.OrderBy(x => x.CodResource).ThenBy(x => x.Name).ToList(); } - protected int PhaseId + private int PhaseId { get => newRecord != null ? newRecord.PhaseID : 0; set @@ -83,7 +112,7 @@ namespace Lux.UI.Components.Compo.JobTask } } - protected decimal ProductivityRateProxy + private decimal ProductivityRateProxy { get => editRecord != null ? Math.Round(editRecord.ProductivityRate, 3) : 0; set @@ -95,7 +124,7 @@ namespace Lux.UI.Components.Compo.JobTask } } - protected int ResourceId + private int ResourceId { get => newRecord != null ? newRecord.ResourceID : 0; set @@ -107,14 +136,29 @@ namespace Lux.UI.Components.Compo.JobTask } } - #endregion Protected Properties + #endregion Private Properties - #region Protected Methods + #region Private Methods + + /// + /// Check selezione riga item + /// + /// + /// + private string checkSel(JobStepModel curRec) + { + string answ = ""; + if (selRecord != null) + { + answ = curRec.JobStepID == selRecord.JobStepID ? "table-info" : ""; + } + return answ; + } /// /// Genera nuovo record e lo salva /// - protected async Task DoAdd() + private async Task DoAdd() { if (newRecord != null) { @@ -140,7 +184,7 @@ namespace Lux.UI.Components.Compo.JobTask /// /// Annullamento salvataggio /// - protected Task DoCancel() + private Task DoCancel() { editRecord = null; selRecord = null; @@ -151,7 +195,7 @@ namespace Lux.UI.Components.Compo.JobTask /// Eliminazione record /// /// - protected async Task DoDelete(JobStepModel rec2del) + private async Task DoDelete(JobStepModel rec2del) { if (!await JSRuntime.InvokeAsync("confirm", $"Sicuro di voler eliminare il record? {rec2del.Description} ({rec2del.JobStepID})")) return; @@ -167,7 +211,7 @@ namespace Lux.UI.Components.Compo.JobTask /// Edit articolo selezionato /// /// - protected Task DoEdit(JobStepModel curRec) + private Task DoEdit(JobStepModel curRec) { editRecord = curRec; selRecord = curRec; @@ -177,7 +221,7 @@ namespace Lux.UI.Components.Compo.JobTask /// /// Reset selezione /// - protected Task DoReset() + private Task DoReset() { editRecord = null; selRecord = null; @@ -188,7 +232,7 @@ namespace Lux.UI.Components.Compo.JobTask /// Effettua salvataggio record /// /// - protected async Task DoSave() + private async Task DoSave() { if (editRecord != null) { @@ -206,68 +250,12 @@ namespace Lux.UI.Components.Compo.JobTask /// Selezione articolo x display info /// /// - protected Task DoSelect(JobStepModel curRec) + private Task DoSelect(JobStepModel curRec) { selRecord = curRec; return EC_Selected.InvokeAsync(curRec); } - protected override void OnParametersSet() - { - ReloadData(); - } - - protected void ToggleAdd() - { - addVisible = !addVisible; - if (addVisible) - { - newRecord = new JobStepModel() - { - JobID = CurrJob.JobID, - Index = totalCount + 1, - Description = $"Fase {totalCount + 1}", - PhaseID = 0, - ResourceID = 0 - }; - } - } - - #endregion Protected Methods - - #region Private Fields - - private bool addVisible = false; - private int currPage = 1; - private JobStepModel? editRecord = null; - private string errorMsg = ""; - private JobStepModel? newRecord = null; - - private int numRecord = 10; - - private JobStepModel? selRecord = null; - - private int totalCount = 0; - - #endregion Private Fields - - #region Private Methods - - /// - /// Check selezione riga item - /// - /// - /// - private string checkSel(JobStepModel curRec) - { - string answ = ""; - if (selRecord != null) - { - answ = curRec.JobStepID == selRecord.JobStepID ? "table-info" : ""; - } - return answ; - } - private void ReloadData() { if (CurrRecords != null) @@ -293,6 +281,22 @@ namespace Lux.UI.Components.Compo.JobTask } } + private void ToggleAdd() + { + addVisible = !addVisible; + if (addVisible) + { + newRecord = new JobStepModel() + { + JobID = CurrJob.JobID, + Index = totalCount + 1, + Description = $"Fase {totalCount + 1}", + PhaseID = 0, + ResourceID = 0 + }; + } + } + #endregion Private Methods } } \ No newline at end of file diff --git a/Lux.UI/Components/Compo/JobTask/JobTaskListMan.razor.cs b/Lux.UI/Components/Compo/JobTask/JobTaskListMan.razor.cs index 23835fac..07ff1651 100644 --- a/Lux.UI/Components/Compo/JobTask/JobTaskListMan.razor.cs +++ b/Lux.UI/Components/Compo/JobTask/JobTaskListMan.razor.cs @@ -1,6 +1,6 @@ using EgwCoreLib.Lux.Data.DbModel.Cost; using EgwCoreLib.Lux.Data.DbModel.Job; -using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using EgwCoreLib.Lux.Data.Services.Job; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; @@ -34,25 +34,47 @@ namespace Lux.UI.Components.Compo.JobTask #endregion Public Properties - #region Protected Fields + #region Protected Methods - protected List FiltRecords = new List(); - protected List ListRecords = new List(); + protected override void OnParametersSet() + { + ReloadData(); + } - #endregion Protected Fields + #endregion Protected Methods - #region Protected Properties + #region Private Fields + + private bool addVisible = false; + private int currPage = 1; + private JobTaskModel? editRecord = null; + private string errorMsg = ""; + private List FiltRecords = new List(); + private bool isLoading = false; + private List ListRecords = new List(); + + private JobTaskModel? newRecord = null; + + private int numRecord = 10; + + private JobTaskModel? selRecord = null; + + private int totalCount = 0; + + #endregion Private Fields + + #region Private Properties [Inject] - protected DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] - protected IJSRuntime JSRuntime { get; set; } = null!; + private IJSRuntime JSRuntime { get; set; } = null!; [Inject] - protected IJobTaskService JTService { get; set; } = null!; + private IJobTaskService JTService { get; set; } = null!; - protected List ListCostDrivers + private List ListCostDrivers { get => CostDriverLists .Select(x => x.Name) @@ -60,14 +82,29 @@ namespace Lux.UI.Components.Compo.JobTask .ToList(); } - #endregion Protected Properties + #endregion Private Properties - #region Protected Methods + #region Private Methods + + /// + /// Check selezione riga item + /// + /// + /// + private string checkSel(JobTaskModel curRec) + { + string answ = ""; + if (selRecord != null) + { + answ = curRec.JobID == selRecord.JobID ? "table-info" : ""; + } + return answ; + } /// /// Genera nuovo record e lo salva /// - protected async Task DoAdd() + private async Task DoAdd() { if (newRecord != null) { @@ -96,7 +133,7 @@ namespace Lux.UI.Components.Compo.JobTask /// Eliminazione record /// /// - protected async Task DoDelete(JobTaskModel rec2del) + private async Task DoDelete(JobTaskModel rec2del) { // controlo che NON abbia child obj... altrimenti esco if (rec2del.NumChild > 0) @@ -118,7 +155,7 @@ namespace Lux.UI.Components.Compo.JobTask /// Edit articolo selezionato /// /// - protected Task DoEdit(JobTaskModel curRec) + private Task DoEdit(JobTaskModel curRec) { editRecord = curRec; selRecord = curRec; @@ -128,7 +165,7 @@ namespace Lux.UI.Components.Compo.JobTask /// /// Reset selezione /// - protected async Task DoReset() + private async Task DoReset() { editRecord = null; selRecord = null; @@ -136,11 +173,23 @@ namespace Lux.UI.Components.Compo.JobTask await EC_Updated.InvokeAsync(true); } + /// + /// Update record x elenco tags + /// + /// + /// + private async Task DoSaveTags(TagDisplay.SavePayload args) + { + // chiamo update + await JTService.MergeTagsAsync(args.Id, args.Tags); + await EC_Updated.InvokeAsync(true); + } + /// /// Selezione articolo x display info /// /// - protected Task DoSelect(JobTaskModel curRec) + private Task DoSelect(JobTaskModel curRec) { selRecord = curRec; return EC_Selected.InvokeAsync(curRec); @@ -151,7 +200,7 @@ namespace Lux.UI.Components.Compo.JobTask /// /// /// - protected List ListDriversName(JobTaskModel curRec) + private List ListDriversName(JobTaskModel curRec) { List result = new List(); if (CostDriverLists != null && ResourceLists != null) @@ -177,77 +226,6 @@ namespace Lux.UI.Components.Compo.JobTask return result; } - protected override void OnParametersSet() - { - ReloadData(); - } - - protected void ToggleAdd() - { - addVisible = !addVisible; - if (addVisible) - { - newRecord = new JobTaskModel() - { - Description = $"Nuovo Ciclo-{DateTime.Now:yyyy.MM.dd-HH.mm.ss}", - Index = totalCount + 1 - }; - } - } - - #endregion Protected Methods - - #region Private Fields - - private bool addVisible = false; - - private int currPage = 1; - - private JobTaskModel? editRecord = null; - - private string errorMsg = ""; - - private bool isLoading = false; - - private JobTaskModel? newRecord = null; - - private int numRecord = 10; - - private JobTaskModel? selRecord = null; - - private int totalCount = 0; - - #endregion Private Fields - - #region Private Methods - - /// - /// Check selezione riga item - /// - /// - /// - private string checkSel(JobTaskModel curRec) - { - string answ = ""; - if (selRecord != null) - { - answ = curRec.JobID == selRecord.JobID ? "table-info" : ""; - } - return answ; - } - - /// - /// Update record x elenco tags - /// - /// - /// - private async Task DoSaveTags(TagDisplay.SavePayload args) - { - // chiamo update - await JTService.MergeTagsAsync(args.Id, args.Tags); - await EC_Updated.InvokeAsync(true); - } - /// /// Esegue spostamento /// @@ -291,6 +269,19 @@ namespace Lux.UI.Components.Compo.JobTask ReloadData(); } + private void ToggleAdd() + { + addVisible = !addVisible; + if (addVisible) + { + newRecord = new JobTaskModel() + { + Description = $"Nuovo Ciclo-{DateTime.Now:yyyy.MM.dd-HH.mm.ss}", + Index = totalCount + 1 + }; + } + } + #endregion Private Methods } } \ No newline at end of file diff --git a/Lux.UI/Components/Compo/JobTask/ResourcesMan.razor.cs b/Lux.UI/Components/Compo/JobTask/ResourcesMan.razor.cs index 11b18a92..b32fa448 100644 --- a/Lux.UI/Components/Compo/JobTask/ResourcesMan.razor.cs +++ b/Lux.UI/Components/Compo/JobTask/ResourcesMan.razor.cs @@ -1,6 +1,6 @@ using EgwCoreLib.Lux.Data.DbModel.Cost; -using EgwCoreLib.Lux.Data.Services; using EgwCoreLib.Lux.Data.Services.Cost; +using EgwCoreLib.Lux.Data.Services.General; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; @@ -61,7 +61,7 @@ namespace Lux.UI.Components.Compo.JobTask private ICostDriverService CDService { get; set; } = null!; [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private IJSRuntime JSRuntime { get; set; } = null!; diff --git a/Lux.UI/Components/Compo/OfferCommonPar.razor.cs b/Lux.UI/Components/Compo/OfferCommonPar.razor.cs index 992e5217..3c88583e 100644 --- a/Lux.UI/Components/Compo/OfferCommonPar.razor.cs +++ b/Lux.UI/Components/Compo/OfferCommonPar.razor.cs @@ -108,7 +108,7 @@ namespace Lux.UI.Components.Compo private ICalcRequestService CService { get; set; } = null!; [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private IConfGlassService CGService { get; set; } = null!; diff --git a/Lux.UI/Components/Compo/OfferMan.razor.cs b/Lux.UI/Components/Compo/OfferMan.razor.cs index e94830f6..c54300f2 100644 --- a/Lux.UI/Components/Compo/OfferMan.razor.cs +++ b/Lux.UI/Components/Compo/OfferMan.razor.cs @@ -1,7 +1,6 @@ using EgwCoreLib.Lux.Core; using EgwCoreLib.Lux.Core.Generic; using EgwCoreLib.Lux.Data.DbModel.Sales; -using EgwCoreLib.Lux.Data.Services; using EgwCoreLib.Lux.Data.Services.Sales; using Microsoft.AspNetCore.Components; @@ -20,18 +19,18 @@ namespace Lux.UI.Components.Compo [Parameter] public OfferModel CurrRecord { get; set; } = null!; - /// - /// Evento che indica variazione rispetto ai dati originali - /// - [Parameter] - public EventCallback EC_Changed { get; set; } - /// /// Callback invocato a richiesta cancel editing della finestra /// [Parameter] public EventCallback EC_Cancel { get; set; } + /// + /// Evento che indica variazione rispetto ai dati originali + /// + [Parameter] + public EventCallback EC_Changed { get; set; } + /// /// Callback invocato alla richiesta di salvataggio con l'offerta aggiornata. /// @@ -76,12 +75,6 @@ namespace Lux.UI.Components.Compo [Inject] private ICustomerService CService { get; set; } = null!; - /// - /// Servizi di accesso ai dati iniettati dal framework. - /// - [Inject] - private DataLayerServices DLService { get; set; } = null!; - [Inject] private IDealerService DService { get; set; } = null!; diff --git a/Lux.UI/Components/Compo/OfferRowMan.razor.cs b/Lux.UI/Components/Compo/OfferRowMan.razor.cs index 3607190c..a352906d 100644 --- a/Lux.UI/Components/Compo/OfferRowMan.razor.cs +++ b/Lux.UI/Components/Compo/OfferRowMan.razor.cs @@ -310,7 +310,7 @@ namespace Lux.UI.Components.Compo private IConfWoodService CWService { get; set; } = null!; [Inject] - private DataLayerServices DLService { get; set; } = default!; + private IDataLayerServices DLService { get; set; } = default!; [Inject] private IEnvirParamService EPService { get; set; } = null!; diff --git a/Lux.UI/Components/Compo/OrderRowMan.razor.cs b/Lux.UI/Components/Compo/OrderRowMan.razor.cs index babf9690..50004d6f 100644 --- a/Lux.UI/Components/Compo/OrderRowMan.razor.cs +++ b/Lux.UI/Components/Compo/OrderRowMan.razor.cs @@ -7,7 +7,6 @@ using EgwCoreLib.Lux.Data.DbModel.Production; using EgwCoreLib.Lux.Data.DbModel.Sales; using EgwCoreLib.Lux.Data.DbModel.Utils; using EgwCoreLib.Lux.Data.Domains; -using EgwCoreLib.Lux.Data.Services; using EgwCoreLib.Lux.Data.Services.Config; using EgwCoreLib.Lux.Data.Services.General; using EgwCoreLib.Lux.Data.Services.Items; @@ -345,7 +344,7 @@ namespace Lux.UI.Components.Compo private IConfWoodService CWService { get; set; } = null!; [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private IEnvirParamService EPService { get; set; } = null!; diff --git a/Lux.UI/Components/Compo/Templates/TemplateList.razor.cs b/Lux.UI/Components/Compo/Templates/TemplateList.razor.cs index 13809d20..f94115bd 100644 --- a/Lux.UI/Components/Compo/Templates/TemplateList.razor.cs +++ b/Lux.UI/Components/Compo/Templates/TemplateList.razor.cs @@ -1,6 +1,6 @@ using EgwCoreLib.Lux.Core; using EgwCoreLib.Lux.Data.DbModel.Catalog; -using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using EgwCoreLib.Lux.Data.Services.Utils; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; @@ -67,7 +67,7 @@ namespace Lux.UI.Components.Compo.Templates /// Servizi di accesso ai dati iniettati dal framework. /// [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private ITemplateService TService { get; set; } = default!; diff --git a/Lux.UI/Components/Compo/Templates/TemplateRowList.razor.cs b/Lux.UI/Components/Compo/Templates/TemplateRowList.razor.cs index 832736b5..adc34873 100644 --- a/Lux.UI/Components/Compo/Templates/TemplateRowList.razor.cs +++ b/Lux.UI/Components/Compo/Templates/TemplateRowList.razor.cs @@ -284,7 +284,7 @@ namespace Lux.UI.Components.Compo.Templates /// Servizi di accesso ai dati iniettati dal framework. /// [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private IEnvirParamService EPService { get; set; } = null!; diff --git a/Lux.UI/Components/Compo/WorkLoad/ItemSel.razor.cs b/Lux.UI/Components/Compo/WorkLoad/ItemSel.razor.cs index ed34d69c..cfecd9d1 100644 --- a/Lux.UI/Components/Compo/WorkLoad/ItemSel.razor.cs +++ b/Lux.UI/Components/Compo/WorkLoad/ItemSel.razor.cs @@ -1,6 +1,5 @@ using EgwCoreLib.Lux.Core; using EgwCoreLib.Lux.Data.DbModel.Items; -using EgwCoreLib.Lux.Data.Services; using EgwCoreLib.Lux.Data.Services.Items; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; @@ -74,9 +73,6 @@ namespace Lux.UI.Components.Compo.WorkLoad #region Protected Properties - [Inject] - protected DataLayerServices DLService { get; set; } = null!; - [Inject] protected IItemService IService { get; set; } = null!; @@ -87,9 +83,6 @@ namespace Lux.UI.Components.Compo.WorkLoad #region Protected Methods - - - /// /// Selezione articolo x display info /// @@ -129,7 +122,6 @@ namespace Lux.UI.Components.Compo.WorkLoad private int currPage = 1; - private bool isLoading = false; private int numRecord = 10; diff --git a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor.cs b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor.cs index 96a85d90..1a80d234 100644 --- a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor.cs +++ b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor.cs @@ -2,10 +2,9 @@ using EgwCoreLib.Lux.Core.Generic; using EgwCoreLib.Lux.Core.RestPayload; using EgwCoreLib.Lux.Data.DbModel.Production; using EgwCoreLib.Lux.Data.DbModel.Sales; -using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; -using NLog.Targets.Wrappers; namespace Lux.UI.Components.Compo.WorkLoad { @@ -97,7 +96,7 @@ namespace Lux.UI.Components.Compo.WorkLoad } [Inject] - protected DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; protected string MainCss { diff --git a/Lux.UI/Components/Pages/Items.razor.cs b/Lux.UI/Components/Pages/Items.razor.cs index 6c16fd54..beab3ee2 100644 --- a/Lux.UI/Components/Pages/Items.razor.cs +++ b/Lux.UI/Components/Pages/Items.razor.cs @@ -1,7 +1,7 @@ using EgwCoreLib.Lux.Core; using EgwCoreLib.Lux.Data.DbModel.Items; using EgwCoreLib.Lux.Data.DbModel.Job; -using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using EgwCoreLib.Lux.Data.Services.Items; using EgwCoreLib.Lux.Data.Services.Job; using Microsoft.AspNetCore.Components; @@ -37,7 +37,7 @@ namespace Lux.UI.Components.Pages private FiltSelect CurrFilt { get; set; } = new FiltSelect(); [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private IItemGroupService IGService { get; set; } = null!; diff --git a/Lux.UI/Components/Pages/JobRoute.razor.cs b/Lux.UI/Components/Pages/JobRoute.razor.cs index 2b0ac67c..5b1aaa90 100644 --- a/Lux.UI/Components/Pages/JobRoute.razor.cs +++ b/Lux.UI/Components/Pages/JobRoute.razor.cs @@ -1,7 +1,7 @@ using EgwCoreLib.Lux.Data.DbModel.Cost; using EgwCoreLib.Lux.Data.DbModel.Job; -using EgwCoreLib.Lux.Data.Services; using EgwCoreLib.Lux.Data.Services.Cost; +using EgwCoreLib.Lux.Data.Services.General; using EgwCoreLib.Lux.Data.Services.Job; using EgwCoreLib.Lux.Data.Services.Utils; using Microsoft.AspNetCore.Components; @@ -47,7 +47,7 @@ namespace Lux.UI.Components.Pages private ICostDriverService CDService { get; set; } = null!; [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private IJobStepService JStService { get; set; } = null!; diff --git a/Lux.UI/Components/Pages/Offers.razor.cs b/Lux.UI/Components/Pages/Offers.razor.cs index 840b921d..290a2c21 100644 --- a/Lux.UI/Components/Pages/Offers.razor.cs +++ b/Lux.UI/Components/Pages/Offers.razor.cs @@ -112,7 +112,7 @@ namespace Lux.UI.Components.Pages } [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private IEnvirParamService EPService { get; set; } = null!; diff --git a/Lux.UI/Components/Pages/Orders.razor.cs b/Lux.UI/Components/Pages/Orders.razor.cs index a9e447ad..5b6622f6 100644 --- a/Lux.UI/Components/Pages/Orders.razor.cs +++ b/Lux.UI/Components/Pages/Orders.razor.cs @@ -48,7 +48,7 @@ namespace Lux.UI.Components.Pages } [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private IProductionItemService PIService { get; set; } = default!; diff --git a/Lux.UI/Components/Pages/ProdPlanner.razor.cs b/Lux.UI/Components/Pages/ProdPlanner.razor.cs index 63291629..28cfdd7c 100644 --- a/Lux.UI/Components/Pages/ProdPlanner.razor.cs +++ b/Lux.UI/Components/Pages/ProdPlanner.razor.cs @@ -1,19 +1,11 @@ using EgwCoreLib.Lux.Core.Generic; -using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using Microsoft.AspNetCore.Components; -using System.Collections.Generic; namespace Lux.UI.Components.Pages { public partial class ProdPlanner { - #region Protected Properties - - [Inject] - protected DataLayerServices DLService { get; set; } = null!; - - #endregion Protected Properties - #region Private Fields /// @@ -25,6 +17,9 @@ namespace Lux.UI.Components.Pages #region Private Properties + [Inject] + private IDataLayerServices DLService { get; set; } = null!; + private List ListEventi { get; set; } = new(); #endregion Private Properties @@ -36,7 +31,7 @@ namespace Lux.UI.Components.Pages /// private async Task ReloadDataAsync() { - var rawData = await DLService.PlannerGetEvents(PeriodoSel.Inizio, PeriodoSel.Fine); + var rawData = await DLService.PlannerGetEventsAsync(PeriodoSel.Inizio, PeriodoSel.Fine); if (rawData != null && rawData.Count > 0) { ListEventi.Clear(); diff --git a/Lux.UI/Components/Pages/ResetCache.razor b/Lux.UI/Components/Pages/ResetCache.razor index c619f0da..c1a6c3dd 100644 --- a/Lux.UI/Components/Pages/ResetCache.razor +++ b/Lux.UI/Components/Pages/ResetCache.razor @@ -1,12 +1,12 @@ @page "/ResetCache" -@using EgwCoreLib.Lux.Data.Services +@using EgwCoreLib.Lux.Data.Services.General @code { [Inject] - protected DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private NavigationManager NavMan { get; set; } = null!; diff --git a/Lux.UI/Components/Pages/Scratch.razor.cs b/Lux.UI/Components/Pages/Scratch.razor.cs index 87f61e79..0fb5d0cf 100644 --- a/Lux.UI/Components/Pages/Scratch.razor.cs +++ b/Lux.UI/Components/Pages/Scratch.razor.cs @@ -32,7 +32,7 @@ namespace Lux.UI.Components.Pages protected IConfiguration Config { get; set; } = null!; [Inject] - protected DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] protected ImageCacheService ICService { get; set; } = null!; diff --git a/Lux.UI/Components/Pages/SellItems.razor.cs b/Lux.UI/Components/Pages/SellItems.razor.cs index 4058053b..b7fc0d3a 100644 --- a/Lux.UI/Components/Pages/SellItems.razor.cs +++ b/Lux.UI/Components/Pages/SellItems.razor.cs @@ -1,7 +1,7 @@ using EgwCoreLib.Lux.Core; using EgwCoreLib.Lux.Data.DbModel.Items; using EgwCoreLib.Lux.Data.DbModel.Job; -using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using EgwCoreLib.Lux.Data.Services.Items; using EgwCoreLib.Lux.Data.Services.Job; using Microsoft.AspNetCore.Components; @@ -37,7 +37,7 @@ namespace Lux.UI.Components.Pages private FiltSelect CurrFilt { get; set; } = new FiltSelect(); [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private IItemGroupService IGService { get; set; } = null!; diff --git a/Lux.UI/Components/Pages/WorkLoadBalance.razor.cs b/Lux.UI/Components/Pages/WorkLoadBalance.razor.cs index a6d23a60..3c8515e0 100644 --- a/Lux.UI/Components/Pages/WorkLoadBalance.razor.cs +++ b/Lux.UI/Components/Pages/WorkLoadBalance.razor.cs @@ -78,7 +78,7 @@ namespace Lux.UI.Components.Pages private ICalcRequestService CService { get; set; } = null!; [Inject] - private DataLayerServices DLService { get; set; } = null!; + private IDataLayerServices DLService { get; set; } = null!; [Inject] private IGenValService GVService { get; set; } = default!;