Aggiunto livello utente (utente base vs utente avanzato)

2026-01-19 10:31:08 +01:00
parent bc96177d74
commit aae2fa5ba7
29 changed files with 958 additions and 1450 deletions
@@ -29,16 +29,16 @@
                }
            </NavLink>
        </div>
+        <div class="nav-item px-3">
+            <NavLink class="nav-link" href="BaseEdit">
+                <span class="fa-solid fa-pencil px-2 fs-4" aria-hidden="true"></span> <span class="@hideText">BaseEdit</span>
+            </NavLink>
+        </div>
@*         <div class="nav-item px-3">
            <NavLink class="nav-link" href="EditJWD">
                <span class="fa-solid fa-gear px-2 fs-4" aria-hidden="true"></span> <span class="@hideText">EditJWD</span>
            </NavLink>
        </div> *@
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="SimpleEdit">
-                <span class="fa-solid fa-pencil px-2 fs-4" aria-hidden="true"></span> <span class="@hideText">SimpleEdit</span>
-            </NavLink>
-        </div>
    </nav>
 </div>

@@ -0,0 +1,32 @@
+@page "/BaseEdit"
+@rendermode InteractiveServer
+
+<PageTitle>BaseEdit</PageTitle>
+
+<WebWindowComplex.TableComp ListPayload="SetupList"
+                            LiveData="CurrData"
+                            baseUser="User"
+                            EC_ActionReq="DoAction"
+                            EC_DoUpdate="ExecRequest"
+                            EC_OnClose="CloseObj">
+</WebWindowComplex.TableComp>
+
+
+@if (!string.IsNullOrEmpty(outClose))
+{
+    <div class="alert alert-danger fs-4">
+        @outClose
+    </div>
+}
+else if (!string.IsNullOrEmpty(outSave))
+{
+    <div class="alert alert-success fs-4">
+        @outSave
+    </div>
+}
+
+<div class="card">
+    <div class="card-body small">
+        @JsonSer
+    </div>
+</div>
@@ -0,0 +1,372 @@
+using Egw.Window.Data;
+using EgwCoreLib.Lux.Core;
+using EgwCoreLib.Lux.Core.RestPayload;
+using EgwCoreLib.Lux.Data.Services;
+using Microsoft.AspNetCore.Components;
+using Newtonsoft.Json;
+using WebWindowComplex;
+using WebWindowComplex.DTO;
+using static WebWindowComplex.LayoutConst;
+
+namespace Test.UI.Components.Pages
+{
+    public partial class BaseEdit
+    {
+        #region Public Fields
+
+        public string InitialJwd = "";
+
+        #endregion Public Fields
+
+        #region Public Methods
+
+        public void Dispose()
+        {
+            DLService.PipeSvg.EA_NewMessage -= PipeSvg_EA_NewMessage;
+            DLService.PipeShape.EA_NewMessage -= PipeShape_EA_NewMessage;
+            DLService.PipeHwOpt.EA_NewMessage -= PipeHwOption_EA_NewMessage;
+        }
+
+        #endregion Public Methods
+
+        #region Protected Fields
+
+        /// <summary>
+        /// Predisposizione valori live SVG/JWD
+        /// </summary>
+        protected LivePayload CurrData = new LivePayload();
+
+        /// <summary>
+        /// Livello di accesso
+        /// -- true: utente base (versione semplificata)
+        /// -- false: utente avanzato (versione completa)
+        /// </summary>
+        protected bool User = false;
+
+        protected Dictionary<int, string> currGroupShape = new Dictionary<int, string>();
+        protected Dictionary<int, string> currHwOption = new Dictionary<int, string>();
+        protected string currJwd = "...";
+        protected Dictionary<string, string> m_CurrArgs = new Dictionary<string, string>();
+        protected string prevJwd = "";
+
+        /// <summary>
+        /// Configurazione elenchi anagrafiche
+        /// </summary>
+        protected BaseListPayload SetupList = new BaseListPayload();
+
+        #endregion Protected Fields
+
+        #region Protected Properties
+
+        protected List<string> AvailColorMaterialList { get; set; } = new List<string>()
+        {
+            new string("White"),
+            new string("Black"),
+            new string("Blu")
+        };
+
+        protected List<string> AvailFamilyHardwareList { get; set; } = new List<string>()
+        {
+            new string("ArTech"),
+            new string("ArTechPlana")
+        };
+
+        protected List<string> AvailGlassList { get; set; } = new List<string>()
+        {
+            new string("Vetro BE 2S 4/12/4"),
+            new string("Vetro BE 2S 4/16/4"),
+            new string("Vetro BE 3S 4/12/4/12/4"),
+            new string("Vetro BE 3S 4/16/4/16/4"),
+            new string("Vetro BE 2S 4T/12/4T"),
+            new string("Vetro BE 2S 4T/16/4T")
+        };
+
+        protected List<Hardware> AvailHardwareList { get; set; } = new List<Hardware>();
+
+        protected List<string> AvailMaterialList { get; set; } = new List<string>()
+        {
+            new string("Pino"),
+            new string("Abete")
+        };
+
+        protected List<string> AvailProfileList { get; set; } = new List<string>()
+        {
+            new string("Profilo78"),
+            new string("ProfiloSaomad")
+        };
+
+        protected Dictionary<string, List<Threshold>> AvailThreshold { get; set; } = new Dictionary<string, List<Threshold>>()
+        {
+            {"Profilo78",  new List<Threshold>() { new Threshold(3, "Bottom"), new Threshold(1, "Threshold")}},
+            {"ProfiloSaomad",  new List<Threshold>(){ new Threshold(3, "Bottom"), new Threshold(2, "BottomWaterdrip"), new Threshold(1, "Threshold")}}
+        };
+
+        [Inject]
+        protected IConfiguration Config { get; set; } = null!;
+
+        [Inject]
+        protected DataLayerServices DLService { get; set; } = null!;
+
+        [Inject]
+        protected ImageCacheService ICService { get; set; } = null!;
+
+        protected MarkupString JsonSer
+        {
+            get => (MarkupString)currJwd.Replace(Environment.NewLine, "<br/>").Replace(" ", "&nbsp;");
+        }
+
+        protected string SelColorMaterial { get; set; } = "";
+        protected string SelFamilyHardware { get; set; } = "";
+        protected string SelGlass { get; set; } = "";
+        protected string SelMaterial { get; set; } = "";
+
+        #endregion Protected Properties
+
+        #region Protected Methods
+
+        protected override void OnAfterRender(bool firstRender)
+        {
+            if (firstRender)
+            {
+                // JS interop or data fetches go here
+                isInteractive = true;
+            }
+        }
+
+        protected override async Task OnInitializedAsync()
+        {
+            ConfInit();
+            User = true;
+            Random random = new Random();
+            CalcUid = Convert.ToString(random.Next(1000, 10000));
+            windowUid = CalcUid;
+            //InitialJwd = File.ReadAllText("Data\\FinestraSplitGrid.jwd");
+            InitialJwd = File.ReadAllText("Data\\AntaDoppia.jwd");
+            //InitialJwd = File.ReadAllText("Data\\ArcoAntaDoppia.jwd");
+            currJwd = InitialJwd;
+            // rileggo altri dati
+            await ReloadData();
+            // preparo conf oggetti x controllo
+            SetupList = new BaseListPayload()
+            {
+                ColorMaterial = AvailColorMaterialList,
+                FamilyHardware = AvailFamilyHardwareList,
+                Glass = AvailGlassList,
+                Hardware = AvailHardwareList,
+                Material = AvailMaterialList,
+                Profile = AvailProfileList,
+                Threshold = AvailThreshold
+            };
+            CurrData = new LivePayload()
+            {
+                CurrJwd = InitialJwd,
+                SvgPreview = currSvg,
+                DictShape = currGroupShape,
+                DictOptionsXml = currHwOption
+            };
+            DLService.PipeSvg.EA_NewMessage += PipeSvg_EA_NewMessage;
+            DLService.PipeShape.EA_NewMessage += PipeShape_EA_NewMessage;
+            DLService.PipeHwOpt.EA_NewMessage += PipeHwOption_EA_NewMessage;
+        }
+
+        #endregion Protected Methods
+
+        #region Private Fields
+
+        private string apiUrl = "";
+        private string calcTag = "";
+        private string CalcUid = "CurrWindow";
+        private string windowUid = "CurrWindow";
+        private string cFileHardware = "Hardware/Setup.json";
+        private string currSvg = "";
+        private string GenericBasePath = "";
+
+        private string colorMassUpdate;
+        private string familyHWMassUpdate;
+        private string glassMassUpdate;
+        private Hardware hardwareMassUpdate;
+        private string materialMassUpdate;
+        private string profileMassUpdate;
+
+        /// <summary>
+        /// Semaforo x definire se sia già in modalità ionterattiva o di prerendering
+        /// </summary>
+        private bool isInteractive = false;
+
+        private string outClose = "";
+        private string outSave = "";
+
+        private string imgBasePath = "";
+
+        private string channelHwOpt = "";
+        private string channelShape = "";
+        private string channelSvg = "";
+
+        #endregion Private Fields
+
+        #region Private Methods
+
+        /// <summary>
+        /// Effettua chiusura oggetto con eventuale save
+        /// </summary>
+        /// <param name="reqSave"></param>
+        private void CloseObj(bool reqSave)
+        {
+            outClose = !reqSave ? "Richiesto chiusura!" : "";
+            outSave = reqSave ? "Richiesto salvataggio!" : "";
+        }
+
+        private void ConfInit()
+        {
+            apiUrl = Config.GetValue<string>("ServerConf:Prog.ApiUrl") ?? "";
+            imgBasePath = Config.GetValue<string>("ServerConf:ImageBaseUrl") ?? "";
+            GenericBasePath = Config.GetValue<string>("ServerConf:GenericBaseUrl") ?? "";
+            calcTag = Config.GetValue<string>("ServerConf:CalcTag") ?? "";
+            channelSvg = Config.GetValue<string>("ServerConf:ChannelSvg") ?? "";
+            channelShape = Config.GetValue<string>("ServerConf:ChannelShape") ?? "";
+            channelHwOpt = Config.GetValue<string>("ServerConf:ChannelHwOpt") ?? "";
+        }
+
+        /// <summary>
+        /// Esecuzione azione richiesta
+        /// </summary>
+        /// <param name="actReq">Azione richiesta</param>
+        private void DoAction(DataAction actReq)
+        {
+            switch (actReq)
+            {
+                case DataAction.None:
+                    break;
+
+                case DataAction.ResetDictShape:
+                    CurrData.DictShape = new Dictionary<int, string>();
+                    break;
+
+                case DataAction.ResetHwOpt:
+                    CurrData.DictOptionsXml = new Dictionary<int, string>();
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Esecuzione richiesta
+        /// </summary>
+        /// <param name="CurrArgs"></param>
+        /// <returns></returns>
+        private async Task ExecRequest(Dictionary<string, string> CurrArgs)
+        {
+            // Proseguo solo se sono in interattivo (NO prerender pagina)
+            if (isInteractive)
+            {
+                outClose = "";
+                outSave = "";
+                // verifico se contiene JWD, lo aggiorno
+                if (CurrArgs.ContainsKey("SerializedData"))
+                {
+                    currJwd = CurrArgs["SerializedData"];
+                    CurrData.CurrJwd = currJwd;
+                }
+                // se il SSE variato --> invio
+                if (!currJwd.Equals(prevJwd) || !EgwCoreLib.Utils.DictUtils.DictAreEqual(m_CurrArgs, CurrArgs))
+                {
+                    m_CurrArgs = CurrArgs;
+                    prevJwd = currJwd;
+                    CalcRequestDTO calcRequestDTO = new CalcRequestDTO();
+                    calcRequestDTO.EnvType = EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW;
+                    calcRequestDTO.DictExec = m_CurrArgs;
+                    // chiamo la chiamata POST alla API, che manda la richiesta via REDIS
+                    await ICService.CallRestPost($"{apiUrl}/{GenericBasePath}", $"{calcTag}/{CalcUid}", calcRequestDTO);
+                }
+            }
+        }
+
+        private async void PipeHwOption_EA_NewMessage(object? sender, EventArgs e)
+        {
+            // aggiorno visualizzazione
+            PubSubEventArgs currArgs = (PubSubEventArgs)e;
+            // conversione on-the-fly SVG da mostrare
+            if (!string.IsNullOrEmpty(currArgs.newMessage))
+            {
+                if (currArgs.msgUid.StartsWith($"{channelHwOpt}:{windowUid}") && currArgs.newMessage.Length > 2)
+                {
+                    // deserializzo il dizionario delle risposte...
+                    Dictionary<int, string> rawDict = JsonConvert.DeserializeObject<Dictionary<int, string>>(currArgs.newMessage) ?? new Dictionary<int, string>();
+                    if (rawDict.Count > 0)
+                    {
+                        currHwOption = rawDict;
+                        CurrData.DictOptionsXml = currHwOption;
+                    }
+                }
+                await InvokeAsync(StateHasChanged);
+            }
+            await Task.Delay(1);
+        }
+
+        private async void PipeShape_EA_NewMessage(object? sender, EventArgs e)
+        {
+            // aggiorno visualizzazione
+            PubSubEventArgs currArgs = (PubSubEventArgs)e;
+            // conversione on-the-fly SVG da mostrare
+            if (!string.IsNullOrEmpty(currArgs.newMessage) && currArgs.newMessage.Length > 2)
+            {
+                if (currArgs.msgUid.StartsWith($"{channelShape}:{windowUid}"))
+                {
+                    // deserializzo il dizionario delle risposte...
+                    var rawDict = JsonConvert.DeserializeObject<Dictionary<int, string>>(currArgs.newMessage);
+                    currGroupShape = rawDict ?? new Dictionary<int, string>();
+                    CurrData.DictShape = currGroupShape;
+                }
+                await InvokeAsync(StateHasChanged);
+            }
+            await Task.Delay(1);
+        }
+
+        private async void PipeSvg_EA_NewMessage(object? sender, EventArgs e)
+        {
+            // aggiorno visualizzazione
+            PubSubEventArgs currArgs = (PubSubEventArgs)e;
+            // conversione on-the-fly SVG da mostrare
+            if (!string.IsNullOrEmpty(currArgs.newMessage))
+            {
+                if (currArgs.msgUid.Equals($"{channelSvg}:{windowUid}"))
+                {
+                    currSvg = currArgs.newMessage;
+                    CurrData.SvgPreview = currArgs.newMessage;
+                }
+                await InvokeAsync(StateHasChanged);
+            }
+            await Task.Delay(1);
+        }
+
+        /// <summary>
+        /// Rilettura dati
+        /// </summary>
+        /// <returns></returns>
+        private async Task ReloadData()
+        {
+            //return base.OnInitializedAsync();
+            AvailHardwareList = new List<Hardware>();
+            if (File.Exists(cFileHardware))
+            {
+                string rawValHW = File.ReadAllText(cFileHardware);
+                var rawListHW = JsonConvert.DeserializeObject<List<Hardware>>(rawValHW) ?? new List<Hardware>();
+                foreach (var item in rawListHW)
+                {
+                    AvailHardwareList.Add(item);
+                }
+            }
+            await Task.Delay(100);
+        }
+
+        private void updateInfoJwd(string currSer, string? newFamilyHardware, Hardware? newHardware, string? newColorMaterial, string? newMaterial, string? newGlass, string? newProfile)
+        {
+            var newJwd = SerialMan.MassUpdate(currSer, newFamilyHardware, newHardware, newColorMaterial, newMaterial, newGlass, newProfile);
+            CurrData.CurrJwd = newJwd;
+        }
+
+        #endregion Private Methods
+    }
+}
@@ -69,6 +69,7 @@

 <WebWindowComplex.TableComp ListPayload="SetupList"
                            LiveData="CurrData"
+                            baseUser="User"
                            EC_ActionReq="DoAction"
                            EC_DoUpdate="ExecRequest"
                            EC_OnClose="CloseObj">
@@ -39,6 +39,13 @@ namespace Test.UI.Components.Pages
        /// </summary>
        protected LivePayload CurrData = new LivePayload();

+        /// <summary>
+        /// Livello di accesso
+        /// -- true: utente base (versione semplificata)
+        /// -- false: utente avanzato (versione completa)
+        /// </summary>
+        protected bool User = false;
+
        protected Dictionary<int, string> currGroupShape = new Dictionary<int, string>();
        protected Dictionary<int, string> currHwOption = new Dictionary<int, string>();
        protected string currJwd = "...";
@@ -132,11 +139,12 @@ namespace Test.UI.Components.Pages
        protected override async Task OnInitializedAsync()
        {
            ConfInit();
+            User = false;
            Random random = new Random();
            CalcUid = Convert.ToString(random.Next(1000, 10000));
            windowUid = CalcUid;
-            //InitialJwd = File.ReadAllText("Data\\FinestraSplitGrid.jwd");
-            InitialJwd = File.ReadAllText("Data\\AntaDoppia.jwd");
+            InitialJwd = File.ReadAllText("Data\\FinestraSplitGrid.jwd");
+            //InitialJwd = File.ReadAllText("Data\\AntaDoppia.jwd");
            //InitialJwd = File.ReadAllText("Data\\ArcoAntaDoppia.jwd");
            currJwd = InitialJwd;
            // rileggo altri dati
@@ -1,7 +1,7 @@
-@page "/SimpleEdit"
+@page "/SimpleEditOld"
@rendermode InteractiveServer

-<PageTitle>SimpleEdit</PageTitle>
+<PageTitle>SimpleEditOld</PageTitle>

 <WebWindowTest.Test ListPayload="SetupList"
                    LiveData="CurrData"
@@ -9,7 +9,7 @@ using static WebWindowTest.LayoutConst;

 namespace Test.UI.Components.Pages
 {
-    public partial class SimpleEdit : IDisposable
+    public partial class SimpleEditOld : IDisposable
    {
        #region Public Fields

@@ -132,9 +132,8 @@ namespace Test.UI.Components.Pages
            Random random = new Random();
            CalcUid = Convert.ToString(random.Next(1000, 10000));
            windowUid = CalcUid;
-            //InitialJwd = File.ReadAllText("Data\\FinestraSplitGrid.jwd");
-            InitialJwd = File.ReadAllText("Data\\AntaDoppia.jwd");
-            //InitialJwd = File.ReadAllText("Data\\ArcoAntaDoppia.jwd");
+            InitialJwd = File.ReadAllText("Data\\FinestraSplitGrid.jwd");
+            //InitialJwd = File.ReadAllText("Data\\AntaDoppia.jwd");
            currJwd = InitialJwd;
            // rileggo altri dati
            await ReloadData();