From d8d3078f2f6ae6dae6b523a760ecc49cbfcca653 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 26 Feb 2024 14:17:08 +0100
Subject: [PATCH] Filtraggio OPeratori e scarti da anagrafica

---
 MP-TAB3/Components/MachineBlock.razor.cs     |  2 +-
 MP-TAB3/Components/ScrapEditor.razor         |  4 +-
 MP-TAB3/Components/ScrapEditor.razor.cs      |  8 ++-
 MP-TAB3/MP-TAB3.csproj                       |  2 +-
 MP-TAB3/Pages/RegNewDevice.razor             |  4 +-
 MP-TAB3/Pages/RegNewDevice.razor.cs          | 12 +++-
 MP-TAB3/Resources/ChangeLog.html             |  2 +-
 MP-TAB3/Resources/VersNum.txt                |  2 +-
 MP-TAB3/Resources/manifest.xml               |  2 +-
 MP.Data/DatabaseModels/AnagOperatoriModel.cs |  1 +
 MP.Data/DatabaseModels/vSelCauScartoModel.cs |  1 +
 MP.Mon/Components/DetailMSE.razor.cs         | 66 ++++++++++----------
 MP.Mon/MP.Mon.csproj                         |  2 +-
 MP.Mon/Resources/ChangeLog.html              |  2 +-
 MP.Mon/Resources/VersNum.txt                 |  2 +-
 MP.Mon/Resources/manifest.xml                |  2 +-
 16 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/MP-TAB3/Components/MachineBlock.razor.cs b/MP-TAB3/Components/MachineBlock.razor.cs
index 3a525255..8f81ae30 100644
--- a/MP-TAB3/Components/MachineBlock.razor.cs
+++ b/MP-TAB3/Components/MachineBlock.razor.cs
@@ -140,7 +140,7 @@ namespace MP_TAB3.Components
         }
 
         /// <summary>
-        /// CSS calss x testo (se descr lunga scorre...)
+        /// CSS class x testo (se descr lunga scorre...)
         /// </summary>
         protected string textDescrCss
         {
diff --git a/MP-TAB3/Components/ScrapEditor.razor b/MP-TAB3/Components/ScrapEditor.razor
index 3a89797c..12545c99 100644
--- a/MP-TAB3/Components/ScrapEditor.razor
+++ b/MP-TAB3/Components/ScrapEditor.razor
@@ -42,11 +42,11 @@
                 </div>
                 <div class="col-12">
                     <div class="row">
-                        @foreach (var item in ListComplete)
+                        @foreach (var item in listCauScarto)
                         {
                             <div class="col-6 col-lg-4 col-xl-3 mt-2">
                                 <button class="btn w-100 btn-lg @($"btn-{item.cssClass}")" @onclick="() => doSave(item)">
-                                    <i class="@item.icona"></i> <span style="font-size: 1rem;">@item.label</span>
+                                    <i class="@item.icona"></i><span cs="fs-5 ps-2">@item.label</span>
                                 </button>
                                 <asp:LinkButton ID="hlRegistra" runat="server" OnClick="hlRegistra_Click" CommandArgument='<%# Eval("value") %>' CssClass='<%# "btn w-100 btn-lg btn-" + Eval("cssClass")%>'>
 
diff --git a/MP-TAB3/Components/ScrapEditor.razor.cs b/MP-TAB3/Components/ScrapEditor.razor.cs
index e339a29d..96ef8169 100644
--- a/MP-TAB3/Components/ScrapEditor.razor.cs
+++ b/MP-TAB3/Components/ScrapEditor.razor.cs
@@ -32,7 +32,7 @@ namespace MP_TAB3.Components
         }
 
         protected string errMsg { get; set; } = "";
-        protected List<vSelCauScartoModel> ListComplete { get; set; } = new List<vSelCauScartoModel>();
+        protected List<vSelCauScartoModel> listCauScarto { get; set; } = new List<vSelCauScartoModel>();
 
         [Inject]
         protected MessageService MServ { get; set; } = null!;
@@ -124,7 +124,11 @@ namespace MP_TAB3.Components
 
         protected async Task ReloadData()
         {
-            ListComplete = await TabServ.VSCS_getAll();
+            var rawData = await TabServ.VSCS_getAll();
+            listCauScarto = rawData
+                            .Where(x => x.isEnabled)
+                            .OrderBy(x => x.label)
+                            .ToList();
         }
 
         protected void resetDate()
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index 60e338b8..8a818395 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2402.2610</Version>
+      <Version>6.16.2402.2614</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB3/Pages/RegNewDevice.razor b/MP-TAB3/Pages/RegNewDevice.razor
index acfef946..f16cb53f 100644
--- a/MP-TAB3/Pages/RegNewDevice.razor
+++ b/MP-TAB3/Pages/RegNewDevice.razor
@@ -41,12 +41,12 @@
    
 }
 
-@if (oprsList.Count > 0)
+@if (oprList.Count > 0)
 {
     <div class="mb-1">
         <span class="fs-5 fw-bold">Selezionare un operatore</span>
         <select class="form-select" @bind="matrOpr">
-            @foreach (var opr in oprsList)
+            @foreach (var opr in oprList)
             {
                 <option value="@opr.MatrOpr">@($"{opr.Cognome} {opr.Nome}")</option>
             }
diff --git a/MP-TAB3/Pages/RegNewDevice.razor.cs b/MP-TAB3/Pages/RegNewDevice.razor.cs
index 3f3e6575..4b4f715d 100644
--- a/MP-TAB3/Pages/RegNewDevice.razor.cs
+++ b/MP-TAB3/Pages/RegNewDevice.razor.cs
@@ -17,7 +17,7 @@ namespace MP_TAB3.Pages
         {
             txtError = "";
             matrOpr = 0;
-            oprsList = new List<AnagOperatoriModel>();
+            oprList = new List<AnagOperatoriModel>();
             //GC.Collect();
         }
 
@@ -71,7 +71,7 @@ namespace MP_TAB3.Pages
         [Inject]
         protected NavigationManager NavMan { get; set; } = null!;
 
-        protected List<AnagOperatoriModel> oprsList { get; set; } = new List<AnagOperatoriModel>();
+        protected List<AnagOperatoriModel> oprList { get; set; } = new List<AnagOperatoriModel>();
 
         protected AnagOperatoriModel rigaOpr { get; set; } = null!;
 
@@ -126,7 +126,13 @@ namespace MP_TAB3.Pages
             matrOpr = await MsgServ.GetLastMatrOprAsync();
             TDService.ConfigGetVal("cookieDayExpire", ref expDays);
             ShowScanBarcode = !SMServ.GetConfBool("TAB_WebCamHide");
-            oprsList = await TDService.ElencoOperatori();
+            oprList = await TDService.ElencoOperatori();
+            // filtro solo abilitati + ordino x nome...
+            oprList = oprList
+                        .Where(x => x.isEnabled)
+                        .OrderBy(x => x.Cognome)
+                        .ThenBy(x => x.Nome)
+                        .ToList();
         }
 
         protected async Task ScanDoneHandler(string value)
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index 6eb2c6bd..b6ea39d5 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2402.2610</h4>
+    <h4>Versione: 6.16.2402.2614</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index dce54adc..1fdc36b2 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2402.2610
+6.16.2402.2614
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index 9b46d4e4..88efb02a 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2402.2610</version>
+  <version>6.16.2402.2614</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Data/DatabaseModels/AnagOperatoriModel.cs b/MP.Data/DatabaseModels/AnagOperatoriModel.cs
index 78c32afb..abc7de20 100644
--- a/MP.Data/DatabaseModels/AnagOperatoriModel.cs
+++ b/MP.Data/DatabaseModels/AnagOperatoriModel.cs
@@ -21,5 +21,6 @@ namespace MP.Data.DatabaseModels
         public bool isAdmin { get; set; } = false;
         public string authKey { get; set; }
         public string CodOprExt { get; set; }
+        public bool isEnabled { get; set; } = false;
     }
 }
diff --git a/MP.Data/DatabaseModels/vSelCauScartoModel.cs b/MP.Data/DatabaseModels/vSelCauScartoModel.cs
index 05b41c1a..9c8a46a8 100644
--- a/MP.Data/DatabaseModels/vSelCauScartoModel.cs
+++ b/MP.Data/DatabaseModels/vSelCauScartoModel.cs
@@ -16,5 +16,6 @@ namespace MP.Data.DatabaseModels
         public string label { get; set; } = "";
         public string cssClass { get; set; } = "";
         public string icona { get; set; } = "";
+        public bool isEnabled { get; set; } = false;
     }
 }
diff --git a/MP.Mon/Components/DetailMSE.razor.cs b/MP.Mon/Components/DetailMSE.razor.cs
index 9e6e0122..738c551a 100644
--- a/MP.Mon/Components/DetailMSE.razor.cs
+++ b/MP.Mon/Components/DetailMSE.razor.cs
@@ -41,39 +41,6 @@ namespace MP.Mon.Components
             aTimer.Dispose();
         }
 
-        /// <summary>
-        /// CSS Class x overlay (effetto spento x macchina spenta/ sGr)
-        /// </summary>
-        protected string overlayCss
-        {
-            get
-            {
-                string answ = "";
-                if (CurrRecord != null)
-                {
-                    answ = CurrRecord.Semaforo == "sGr" ? "bg-light opacity-25" : "";
-                }
-                return answ;
-            }
-        }
-
-        protected string textDescrCss = "";
-        ///// <summary>
-        ///// CSS calss x testo (se descr lunga scorre...)
-        ///// </summary>
-        //protected string textDescrCss
-        //{
-        //    get
-        //    {
-        //        string answ = "text-nowrap";
-        //        if (CurrRecord != null && CurrRecord.DescrizioneStato.Length > 7)
-        //        {
-        //            answ = " scroll-left";
-        //        }
-        //        return answ;
-        //    }
-        //}
-
         public void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e)
         {
             var pUpd = Task.Run(async () =>
@@ -108,6 +75,21 @@ namespace MP.Mon.Components
             pUpd.Wait();
         }
 
+        ///// <summary>
+        ///// CSS class x testo (se descr lunga scorre...)
+        ///// </summary>
+        //protected string textDescrCss
+        //{
+        //    get
+        //    {
+        //        string answ = "text-nowrap";
+        //        if (CurrRecord != null && CurrRecord.DescrizioneStato.Length > 7)
+        //        {
+        //            answ = " scroll-left";
+        //        }
+        //        return answ;
+        //    }
+        //}
         public void StartTimer()
         {
             int tOutPeriod = 1000;
@@ -126,6 +108,8 @@ namespace MP.Mon.Components
 
         protected int kaFactor = 60 / 2;
 
+        protected string textDescrCss = "";
+
         #endregion Protected Fields
 
         #region Protected Properties
@@ -145,6 +129,22 @@ namespace MP.Mon.Components
 
         protected bool dataLoaded { get; set; } = false;
 
+        /// <summary>
+        /// CSS Class x overlay (effetto spento x macchina spenta/ sGr)
+        /// </summary>
+        protected string overlayCss
+        {
+            get
+            {
+                string answ = "";
+                if (CurrRecord != null)
+                {
+                    answ = CurrRecord.Semaforo == "sGr" ? "bg-light opacity-25" : "";
+                }
+                return answ;
+            }
+        }
+
         #endregion Protected Properties
 
         #region Protected Methods
diff --git a/MP.Mon/MP.Mon.csproj b/MP.Mon/MP.Mon.csproj
index 58b07b8b..2fac77a8 100644
--- a/MP.Mon/MP.Mon.csproj
+++ b/MP.Mon/MP.Mon.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>6.16.2402.2611</Version>
+    <Version>6.16.2402.2613</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.Mon/Resources/ChangeLog.html b/MP.Mon/Resources/ChangeLog.html
index 008b2f37..70fb73e0 100644
--- a/MP.Mon/Resources/ChangeLog.html
+++ b/MP.Mon/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MON MAPO</i>
-    <h4>Versione: 6.16.2402.2611</h4>
+    <h4>Versione: 6.16.2402.2613</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.Mon/Resources/VersNum.txt b/MP.Mon/Resources/VersNum.txt
index 4e7fc39b..3d5823df 100644
--- a/MP.Mon/Resources/VersNum.txt
+++ b/MP.Mon/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2402.2611
+6.16.2402.2613
diff --git a/MP.Mon/Resources/manifest.xml b/MP.Mon/Resources/manifest.xml
index 17910e73..1a41aa77 100644
--- a/MP.Mon/Resources/manifest.xml
+++ b/MP.Mon/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2402.2611</version>
+  <version>6.16.2402.2613</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.Mon.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>