diff --git a/EgwCoreLib.Lux.Core/Enums.cs b/EgwCoreLib.Lux.Core/Enums.cs index 6339f28a..d388a467 100644 --- a/EgwCoreLib.Lux.Core/Enums.cs +++ b/EgwCoreLib.Lux.Core/Enums.cs @@ -86,6 +86,7 @@ namespace EgwCoreLib.Lux.Core BomAlt } +#if false /// /// Modo chiamata Engine /// @@ -96,8 +97,10 @@ namespace EgwCoreLib.Lux.Core Preview, Bom, HardwareModelList - } + } +#endif +#if false /// /// SubMode di chiamata Engine /// @@ -107,9 +110,11 @@ namespace EgwCoreLib.Lux.Core LIST = 1, CALCSASH = 2, SASHOPTIONS = 3 - } + } +#endif +#if false /// /// Elenco produttori Hardware /// @@ -119,6 +124,7 @@ namespace EgwCoreLib.Lux.Core AGB = 1, MAICO = 2, ROTO = 3 - } + } +#endif } } diff --git a/Lux.API/Controllers/GenericController.cs b/Lux.API/Controllers/GenericController.cs index 9ff26c35..ebc1affd 100644 --- a/Lux.API/Controllers/GenericController.cs +++ b/Lux.API/Controllers/GenericController.cs @@ -1,4 +1,5 @@ -using EgwCoreLib.Lux.Core.RestPayload; +using Egw.Window.Data; +using EgwCoreLib.Lux.Core.RestPayload; using EgwCoreLib.Lux.Data.Services; using EgwMultiEngineManager.Data; using Microsoft.AspNetCore.Mvc; @@ -45,7 +46,11 @@ namespace Lux.API.Controllers // controllo se mancassero parametri... if (!DictExec.ContainsKey("Mode")) { - DictExec.Add("Mode", "1"); + DictExec.Add("Mode", $"{(int)Enums.QuestionModes.PREVIEW}"); + } + if (!DictExec.ContainsKey("SubMode")) + { + DictExec.Add("SubMode", $"{(int)Enums.QuestionSubModes.NULL}"); } if (!DictExec.ContainsKey("UID")) { @@ -84,7 +89,7 @@ namespace Lux.API.Controllers { Dictionary DictExec = new Dictionary(); // cablata la BOM - DictExec.Add("Mode", "2"); + DictExec.Add("Mode", $"{(int)Enums.QuestionModes.BOM}"); // UID cablato x ora... DictExec.Add("UID", id); DictExec.Add("Jwd", currSer); diff --git a/Lux.API/Controllers/WindowController.cs b/Lux.API/Controllers/WindowController.cs index ba65ee5f..52524bf5 100644 --- a/Lux.API/Controllers/WindowController.cs +++ b/Lux.API/Controllers/WindowController.cs @@ -1,4 +1,5 @@ -using EgwCoreLib.Lux.Core; +using Egw.Window.Data; +using EgwCoreLib.Lux.Core; using EgwCoreLib.Lux.Data.DbModel.Config; using EgwCoreLib.Lux.Data.Services; using EgwMultiEngineManager.Data; @@ -60,7 +61,7 @@ namespace Lux.API.Controllers if (!string.IsNullOrEmpty(currJwd)) { Dictionary DictExec = new Dictionary(); - DictExec.Add("Mode", "2"); + DictExec.Add("Mode", $"{(int)Egw.Window.Data.Enums.QuestionModes.BOM}"); // UID cablato x ora... DictExec.Add("UID", id); DictExec.Add("Jwd", currJwd); @@ -102,11 +103,11 @@ namespace Lux.API.Controllers private async Task sendHwReq() { Dictionary DictExec = new Dictionary(); - DictExec.Add("Mode", $"{(int)Enums.EngineQueryType.HardwareModelList}"); + DictExec.Add("Mode", $"{(int)Egw.Window.Data.Enums.QuestionModes.HARDWAREMODELLIST}"); // da rivedere? DictExec.Add("UID", "HW.AGB"); - DictExec.Add("SubMode", $"{(int)Enums.EngineSubMode.LIST}"); - DictExec.Add("Manufacturer", $"{(int)Enums.EngineHwManufacturers.AGB}"); + DictExec.Add("SubMode", $"{(int)Egw.Window.Data.Enums.QuestionSubModes.LIST}"); + DictExec.Add("Manufacturer", $"{(int)Egw.Window.Data.Enums.HardwareManufacturers.AGB}"); int nId = 1; // da modificare con tipo richiesta... QuestionDTO currArgs = new QuestionDTO(nId, EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW, DictExec); @@ -238,7 +239,7 @@ namespace Lux.API.Controllers if (!string.IsNullOrEmpty(currJwd)) { Dictionary DictExec = new Dictionary(); - DictExec.Add("Mode", "1"); + DictExec.Add("Mode", $"{(int)Egw.Window.Data.Enums.QuestionModes.PREVIEW}"); // UID cablato x ora... DictExec.Add("UID", id); DictExec.Add("Jwd", currJwd); diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index bca10f43..3d94128d 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 0.9.2510.2111 + 0.9.2510.2115 diff --git a/Lux.UI/Components/Compo/OfferRowMan.razor b/Lux.UI/Components/Compo/OfferRowMan.razor index 5bc96f77..4e53ee6a 100644 --- a/Lux.UI/Components/Compo/OfferRowMan.razor +++ b/Lux.UI/Components/Compo/OfferRowMan.razor @@ -112,7 +112,18 @@ else @if (isNote) { - @item.Note + + @if (CurrEditMode == EditMode.RecData && EditRecord != null && EditRecord.OfferRowID == item.OfferRowID) + { +
+