From 20d6c6cd36c99d0796f60375cc7f342bb3164cf7 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 5 Apr 2023 09:15:23 +0200
Subject: [PATCH] Modifica SPEC x gestione fase libera vs lista

---
 MP.SPEC/Components/ListDossiers.razor.cs |  4 +--
 MP.SPEC/Components/ListPODL.razor        |  8 +++---
 MP.SPEC/Components/ListPODL.razor.cs     |  2 +-
 MP.SPEC/Components/ParamsFilter.razor.cs |  2 +-
 MP.SPEC/Data/MpDataService.cs            |  4 +--
 MP.SPEC/MP.SPEC.csproj                   |  2 +-
 MP.SPEC/Pages/Articoli.razor.cs          |  2 +-
 MP.SPEC/Pages/Giacenze.razor.cs          |  4 +--
 MP.SPEC/Pages/Index.razor.cs             |  2 +-
 MP.SPEC/Pages/ODL.razor.cs               |  2 +-
 MP.SPEC/Pages/PODL.razor                 | 36 +++++++++++++++---------
 MP.SPEC/Pages/PODL.razor.cs              |  9 ++++--
 MP.SPEC/Resources/ChangeLog.html         |  2 +-
 MP.SPEC/Resources/VersNum.txt            |  2 +-
 MP.SPEC/Resources/manifest.xml           |  2 +-
 15 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/MP.SPEC/Components/ListDossiers.razor.cs b/MP.SPEC/Components/ListDossiers.razor.cs
index 435fd7f3..4957f05d 100644
--- a/MP.SPEC/Components/ListDossiers.razor.cs
+++ b/MP.SPEC/Components/ListDossiers.razor.cs
@@ -232,8 +232,8 @@ namespace MP.SPEC.Components
             await MDService.ConfigResetCache();
             ListGruppiFase = await MDService.ElencoGruppiFase();
             ListStati = await MDService.AnagStatiComm();
-            selAzienda = await MDService.tryGetConfig("AZIENDA");
-            giacenzeConf = await MDService.tryGetConfig("SPEC_ShowGiacenze");
+            selAzienda = await MDService.ConfigTryGet("AZIENDA");
+            giacenzeConf = await MDService.ConfigTryGet("SPEC_ShowGiacenze");
             ListArticoli = await MDService.ArticoliGetSearch(100000, selAzienda, "");
             ListMacchine = await MDService.MacchineGetFilt("*");
             await ReloadData(true);
diff --git a/MP.SPEC/Components/ListPODL.razor b/MP.SPEC/Components/ListPODL.razor
index 71900f7d..20839fb0 100644
--- a/MP.SPEC/Components/ListPODL.razor
+++ b/MP.SPEC/Components/ListPODL.razor
@@ -44,14 +44,14 @@ else
                                     <button @onclick="() => cloneRecord(record)" class="btn btn-info btn-sm mx-1" title="Duplica Record"><i class="bi bi-clipboard-check"></i></button>
                                     @if (record.IdxOdl == 0)
                                     {
-                                        @if (canStartOdl(record.IdxMacchina))
+                                        <button @onclick="() => selRecord(record)" class="btn btn-primary btn-sm mx-1" title="Modifica Record"><i class="bi bi-pencil-square"></i></button>
+                                        @*@if (canStartOdl(record.IdxMacchina))
                                         {
-                                            <button @onclick="() => selRecord(record)" class="btn btn-primary btn-sm mx-1" title="Modifica Record"><i class="bi bi-pencil-square"></i></button>
                                         }
                                         else
                                         {
-                                            <button class="btn btn-secondary btn-sm mx-1 disabled" title="Impossibile modificare"><i class="bi bi-pencil-square"></i></button>
-                                        }
+                                        <button class="btn btn-secondary btn-sm mx-1 disabled" title="Impossibile modificare"><i class="bi bi-pencil-square"></i></button>
+                                        }*@
                                         @if (canStartOdl(record.IdxMacchina))
                                         {
                                             <button @onclick="() => startOdl(record)" class="btn btn-success btn-sm mx-1" title="Avvia PODL">
diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs
index c6275065..7bcd14bf 100644
--- a/MP.SPEC/Components/ListPODL.razor.cs
+++ b/MP.SPEC/Components/ListPODL.razor.cs
@@ -127,7 +127,7 @@ namespace MP.SPEC.Components
         protected override async Task OnInitializedAsync()
         {
             ListStati = await MDService.AnagStatiComm();
-            var strMachRecipe = await MDService.tryGetConfig("MachineWithRecipe");
+            var strMachRecipe = await MDService.ConfigTryGet("MachineWithRecipe");
             bool.TryParse(strMachRecipe, out MachineWithRecipe);
         }
 
diff --git a/MP.SPEC/Components/ParamsFilter.razor.cs b/MP.SPEC/Components/ParamsFilter.razor.cs
index 08968b94..1ccadf88 100644
--- a/MP.SPEC/Components/ParamsFilter.razor.cs
+++ b/MP.SPEC/Components/ParamsFilter.razor.cs
@@ -172,7 +172,7 @@ namespace MP.SPEC.Components
         {
             SelFilter = new SelectFluxParams();
             await MDService.ConfigResetCache();
-            var result = await MDService.tryGetConfig("SPEC_ParamTempoAgg");
+            var result = await MDService.ConfigTryGet("SPEC_ParamTempoAgg");
             if (result != null)
             {
                 refreshRate = int.Parse(result);
diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs
index 108dcb23..bda3aa46 100644
--- a/MP.SPEC/Data/MpDataService.cs
+++ b/MP.SPEC/Data/MpDataService.cs
@@ -679,7 +679,7 @@ namespace MP.SPEC.Data
                 rawData = JsonConvert.SerializeObject(result);
                 if (string.IsNullOrEmpty(canCacheParametri))
                 {
-                    canCacheParametri = await tryGetConfig("SPEC_ParametriEnableRedisCache");
+                    canCacheParametri = await ConfigTryGet("SPEC_ParametriEnableRedisCache");
                 }
                 if (canCacheParametri != "false")
                 {
@@ -1516,7 +1516,7 @@ namespace MP.SPEC.Data
         /// </summary>
         /// <param name="keyName"></param>
         /// <returns></returns>
-        public async Task<string> tryGetConfig(string keyName)
+        public async Task<string> ConfigTryGet(string keyName)
         {
             string answ = "";
             // preselezione valori
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index e14e931b..a9c730e8 100644
--- a/MP.SPEC/MP.SPEC.csproj
+++ b/MP.SPEC/MP.SPEC.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP.SPEC</RootNamespace>
-    <Version>6.16.2304.419</Version>
+    <Version>6.16.2304.509</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Pages/Articoli.razor.cs b/MP.SPEC/Pages/Articoli.razor.cs
index c69fc1ca..1aa30c00 100644
--- a/MP.SPEC/Pages/Articoli.razor.cs
+++ b/MP.SPEC/Pages/Articoli.razor.cs
@@ -137,7 +137,7 @@ namespace MP.SPEC.Pages
                 selAzienda = currRec.Valore;
             } 
 #endif
-            selAzienda = await MDService.tryGetConfig("AZIENDA");
+            selAzienda = await MDService.ConfigTryGet("AZIENDA");
             ListAziende = await MDService.ElencoAziende();
             ListTipoArt = await MDService.AnagTipoArtLV();
         }
diff --git a/MP.SPEC/Pages/Giacenze.razor.cs b/MP.SPEC/Pages/Giacenze.razor.cs
index 8fed01fe..a359d9dc 100644
--- a/MP.SPEC/Pages/Giacenze.razor.cs
+++ b/MP.SPEC/Pages/Giacenze.razor.cs
@@ -27,9 +27,9 @@ namespace MP.SPEC.Pages
         protected override async Task OnInitializedAsync()
         {
             await MDService.ConfigResetCache();
-            giacenzeConf = await MDService.tryGetConfig("SPEC_ShowGiacenze");
+            giacenzeConf = await MDService.ConfigTryGet("SPEC_ShowGiacenze");
             await Task.Delay(1);
-            padCodXdl = await MDService.tryGetConfig("padCodXdl");
+            padCodXdl = await MDService.ConfigTryGet("padCodXdl");
             var uri = NavManager.ToAbsoluteUri(NavManager.Uri);
             if (QueryHelpers.ParseQuery(uri.Query).TryGetValue("IdxOdl", out var _idxOdl))
             {
diff --git a/MP.SPEC/Pages/Index.razor.cs b/MP.SPEC/Pages/Index.razor.cs
index 421acf29..922dbb4f 100644
--- a/MP.SPEC/Pages/Index.razor.cs
+++ b/MP.SPEC/Pages/Index.razor.cs
@@ -40,7 +40,7 @@ namespace MP.SPEC.Pages
                 }
             } 
 #endif
-            currAzienda = await MDService.tryGetConfig("AZIENDA");
+            currAzienda = await MDService.ConfigTryGet("AZIENDA");
             await Task.Delay(1);
         }
 
diff --git a/MP.SPEC/Pages/ODL.razor.cs b/MP.SPEC/Pages/ODL.razor.cs
index 0c30854e..5c291bfc 100644
--- a/MP.SPEC/Pages/ODL.razor.cs
+++ b/MP.SPEC/Pages/ODL.razor.cs
@@ -112,7 +112,7 @@ namespace MP.SPEC.Pages
             }
             ListStati = await MDService.AnagStatiComm();
             ListMacchine = await MDService.MacchineGetFilt(selReparto);
-            padCodXdl = await MDService.tryGetConfig("padCodXdl");
+            padCodXdl = await MDService.ConfigTryGet("padCodXdl");
         }
 
         protected async Task pgResetReq(bool doReset)
diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor
index 08476435..b4f3c371 100644
--- a/MP.SPEC/Pages/PODL.razor
+++ b/MP.SPEC/Pages/PODL.razor
@@ -97,24 +97,32 @@
                                 </div>
                                 <div class="col-3">
                                     <div class="input-group input-group-sm">
-                                        <span class="input-group-text" id="inputGroup-sizing-sm">Fase</span>
-                                        <select @bind="@currRecord.KeyRichiesta" class="form-select">
-                                            @if (ListStati != null)
-                                            {
-                                                foreach (var item in ListStati)
+                                        @if (useFasi4KeyRich == "FASE")
+                                        {
+                                            <span class="input-group-text" id="inputGroup-sizing-sm">Fase</span>
+                                            <select @bind="@currRecord.KeyRichiesta" class="form-select">
+                                                @if (ListStati != null)
                                                 {
-                                                    @if (item.value == currRecordControlli.KeyRichiesta)
+                                                    foreach (var item in ListStati)
                                                     {
-                                                        <option value="@item.value" selected>@item.label</option>
-                                                    }
-                                                    else
-                                                    {
-                                                        <option value="@item.value">@item.label</option>
-                                                    }
+                                                        @if (item.value == currRecordControlli.KeyRichiesta)
+                                                        {
+                                                            <option value="@item.value" selected>@item.label</option>
+                                                        }
+                                                        else
+                                                        {
+                                                            <option value="@item.value">@item.label</option>
+                                                        }
 
+                                                    }
                                                 }
-                                            }
-                                        </select>
+                                            </select>
+                                        }
+                                        else
+                                        {
+                                            <span class="input-group-text" id="inputGroup-sizing-sm">Fase/Richiesta</span>
+                                            <input type="text" class="form-control" aria-label="Fase/Richiesta" aria-describedby="inputGroup-sizing-sm" @bind-value="@currRecord.KeyRichiesta">
+                                        }
                                     </div>
                                 </div>
                             </div>
diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs
index 8fd268a4..99184db1 100644
--- a/MP.SPEC/Pages/PODL.razor.cs
+++ b/MP.SPEC/Pages/PODL.razor.cs
@@ -111,10 +111,13 @@ namespace MP.SPEC.Pages
                 ListGruppiFase = allGruppiData.Where(x => x.SelEnabled).ToList();
             }
             ListStati = await MDService.AnagStatiComm();
-            currAzienda = await MDService.tryGetConfig("AZIENDA");
-            padCodXdl = await MDService.tryGetConfig("padCodXdl");
+            currAzienda = await MDService.ConfigTryGet("AZIENDA");
+            padCodXdl = await MDService.ConfigTryGet("padCodXdl");
+            useFasi4KeyRich = await MDService.ConfigTryGet("SPEC_KeyRichiesta");
         }
 
+        protected string useFasi4KeyRich { get; set; } = "";
+
         protected override async Task OnParametersSetAsync()
         {
             // carico dati
@@ -185,7 +188,7 @@ namespace MP.SPEC.Pages
 
         protected async Task selRecord(PODLExpModel selRec)
         {
-            
+
             currRecord = selRec;
             await Task.Delay(1);
         }
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index a83c61fb..ff7b7900 100644
--- a/MP.SPEC/Resources/ChangeLog.html
+++ b/MP.SPEC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2304.419</h4>
+    <h4>Versione: 6.16.2304.509</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 176b40f4..ee4e3914 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2304.419
+6.16.2304.509
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 4e171e64..ca56af37 100644
--- a/MP.SPEC/Resources/manifest.xml
+++ b/MP.SPEC/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2304.419</version>
+  <version>6.16.2304.509</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>