Filtraggio OPeratori e scarti da anagrafica

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
         {

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")%>'>
 

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()

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>

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>
             }

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)

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>

MP-TAB3/Resources/VersNum.txt

@@ -1 +1 @@
-6.16.2402.2610
+6.16.2402.2614

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>