Merge branch 'Release/FixOreAnticipo'

Fix ricerca articoli

MP.Data/Controllers/MpSpecController.cs

@@ -183,11 +183,11 @@ namespace MP.Data.Controllers
             {
                 dbResult = dbCtx
                 .DbSetArticoli
-                .AsNoTracking()
-                .Where(x => (x.Azienda == azienda || azienda == "*") && (x.CodArticolo.Contains(searchVal) || x.DescArticolo.Contains(searchVal) || x.Disegno.Contains(searchVal) || string.IsNullOrEmpty(searchVal)))
-                .OrderBy(x => x.CodArticolo)
-                .Take(numRecord)
-                .ToList();
+                    .AsNoTracking()
+                    .Where(x => (x.Azienda == azienda || azienda == "*") && (x.CodArticolo.Contains(searchVal) || x.DescArticolo.Contains(searchVal) || x.Disegno.Contains(searchVal) || string.IsNullOrEmpty(searchVal)))
+                    .OrderBy(x => x.CodArticolo)
+                    .Take(numRecord)
+                    .ToList();
             }
             return dbResult;
         }

MP.SPEC/Components/DossiersFilter.razor

@@ -11,6 +11,9 @@
             <div>
                 Seleziona i filtri per:
             </div>
+            <div class="small mt-2">
+                <label class="px-2" for="dtMin" title="Selezionare inizio periodo">Articolo</label>
+            </div>
             <div class="input-group p-2">
                 <label class="input-group-text" for="macchina" title="Selezionare l'articolo"><i class="fa-solid fa-file"></i></label>
                 <select @bind="@selArticolo" class="form-select" id="macchina" title="Selezionare la macchina">
@@ -24,6 +27,9 @@
                     }
                 </select>
             </div>
+            <div class="small mt-2">
+                <label class="px-2" for="dtMin" title="Selezionare inizio periodo">Macchina</label>
+            </div>
             <div class="input-group p-2">
                 <label class="input-group-text" for="macchina" title="Selezionare la macchina"><i class="fa-solid fa-hard-drive"></i></label>
                 <select @bind="@selMacchina" class="form-select" id="macchina" title="Selezionare la macchina">
@@ -52,19 +58,6 @@
                 <label class="input-group-text" for="dtMax" title="Selezionare fine periodo"><i class="fa-regular fa-calendar-plus"></i></label>
                 <input class="form-control" @bind="@selDtMax" id="dtMax" type="datetime-local" title="Selezionare fine periodo">
             </div>
-            @*<div class="input-group p-2">
-                <label class="input-group-text" for="DtMin" title="Selezionare la data da visualizzare"><i class="fa-solid fa-calendar-check"></i></label>
-                <input @bind="@selDtRef" id="DtMin" class="form-control" type="datetime-local" title="Selezionare la data minima da visualizzare" />
-            </div>
-            <div class="input-group p-2">
-                <label class="input-group-text" for="maxRecord" title="Selezionare il numero massimo di record da visualizzare"><i class="fa-solid fa-list-ol"></i></label>
-                <select @bind="@selMaxRecord" class="form-select" id="maxRecord" title="Selezionare il numero massimo di record da visualizzare">
-                    <option value="50">50</option>
-                    <option value="100">100</option>
-                    <option value="250">250</option>
-                    <option value="500">500</option>
-                </select>
-            </div>*@
         </div>
     </div>
 </div>

MP.SPEC/Components/ListDossiers.razor

@@ -1,6 +1,9 @@
 @using MP.SPEC.Components
 @using MP.SPEC.Data
 
+
+
+
 @if (ListRecords == null)
 {
     <LoadingData></LoadingData>
@@ -11,6 +14,70 @@ else if (totalCount == 0)
 }
 else
 {
+    @if (currFluxLogDto != null)
+    {
+        <div class="row">
+            <div class="col-12">
+                <div class="card mb-5">
+                    <div class="card-header bg-primary text-light d-flex justify-content-between">
+                        <div>
+                            Modifica Parametro
+                        </div>
+                        <div>
+                            @if (isEditing)
+                            {
+                                <span class="text-light">PENDING CHANGES...</span>
+                            }
+                        </div>
+                    </div>
+                    <div class="card-body">
+                        <div class="row">
+                            <div class="col-3 pe-0">
+                                <div class="input-group input-group-sm">
+                                    <span class="input-group-text" id="inputGroup-sizing-sm">MACCHINA</span>
+                                    <input type="text" class="form-control" disabled aria-label="Art search" aria-describedby="inputGroup-sizing-sm" @bind-value="@currFluxLogDto.IdxMacchina">
+                                </div>
+                            </div>
+                            <div class="col-3 pe-0">
+                                <div class="input-group input-group-sm">
+                                    <span class="input-group-text" id="inputGroup-sizing-sm">DATA</span>
+                                    <input type="text" class="form-control" disabled aria-label="Art search" aria-describedby="inputGroup-sizing-sm" @bind-value="@currFluxLogDto.dtEvento">
+                                </div>
+                            </div>
+                            <div class="col-3 pe-0">
+                                <div class="input-group input-group-sm">
+                                    <span class="input-group-text" id="inputGroup-sizing-sm">DATA TYPE</span>
+                                    <input type="text" class="form-control" disabled aria-label="Art search" aria-describedby="inputGroup-sizing-sm" @bind-value="@currFluxLogDto.CodFlux">
+                                </div>
+                            </div>
+                            <div class="col-3 pe-0">
+                                <div class="input-group input-group-sm">
+                                    <span class="input-group-text" id="inputGroup-sizing-sm">VALORE</span>
+                                    <input type="text" class="form-control" aria-label="Art search" aria-describedby="inputGroup-sizing-sm" @bind-value="@currFluxLogDto.ValoreEdit" @onclick="()=> enableEditing()">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row pt-4" style="visibility: @css()">
+                            <div class="col-3 pe-0">
+                            </div>
+                            <div class="col-3 pe-0">
+                            </div>
+                            <div class="col-3 pe-0">
+                                <div class="d-grid gap-2">
+                                    <button @onclick="() => cancel()" class="btn btn-warning">Annulla <i class="bi bi-x-circle"></i></button>
+                                </div>
+                            </div>
+                            <div class="col-3 pe-0">
+                                <div class="d-grid gap-2">
+                                    <button @onclick="() => update(currFluxLogDto)" class="btn btn-success">Save <i class="bi bi-save"></i></button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
     <div class="row">
         <div class="d-flex justify justify-content-between">
             <table class="table table-sm table-striped small">
@@ -24,7 +91,6 @@ else
                         <th><i class="fa-solid fa-hard-drive"></i> Macchina</th>
                         <th><i class="fa-regular fa-calendar-days"></i> Data Snap</th>
                         <th><i class="fa-solid fa-sliders"></i> ODL</th>
-                        @*<th><i class="fa-solid fa-circle-info"></i> DATA TYPE</th>*@
                         <th></th>
                     </tr>
                 </thead>
@@ -33,7 +99,15 @@ else
                     {
                         <tr class="@checkSelect(@record)">
                             <td>
-                                <button class="btn btn-primary btn-sm" @onclick="() => selRecord(record)"><i class="fa-solid fa-magnifying-glass"></i></button>
+                                @if (isEditing == false)
+                                {
+
+                                    <button class="btn btn-primary btn-sm" @onclick="() => selRecord(record)"><i class="fa-solid fa-magnifying-glass"></i></button>
+                                }
+                                else
+                                {
+                                    <button class="btn btn-secondary btn-sm disabled"><i class="fa-solid fa-magnifying-glass"></i></button>
+                                }
                             </td>
                             <td>
                                 @record.OdlNav.CodArticolo
@@ -52,11 +126,17 @@ else
                             <td>
                                 @record.IdxODL
                             </td>
-                            @*<td>
-                    @record.DataType
-                    </td>*@
                             <td>
-                                <button @onclick="() => deleteRecord(record)" class="btn btn-danger btn-sm"><i class="bi bi-trash-fill"></i></button>
+                                @if (isEditing == false)
+                                {
+
+                                    <button @onclick="() => deleteRecord(record)" class="btn btn-danger btn-sm"><i class="bi bi-trash-fill"></i></button>
+                                }
+                                else
+                                {
+                                    <button class="btn btn-secondary btn-sm disabled"><i class="bi bi-trash-fill"></i></button>
+
+                                }
                             </td>
                         </tr>
                     }
@@ -81,10 +161,8 @@ else
                                     <th><i class="fa-solid fa-hard-drive"></i> Macchina</th>
                                     <th><i class="fa-regular fa-calendar-days"></i> Data</th>
                                     <th><i class="fa-solid fa-sliders"></i> Data Type</th>
-                                    <th>
-                                        <div class="d-flex justify-content-between col-12">
-                                            <span class="col-11" style="text-align: right;"> Valore </span>
-                                        </div>
+                                    <th style="text-align: right;">
+                                        <span class="col-11"> Valore </span>
                                     </th>
                                 </tr>
                             </thead>

MP.SPEC/Components/ListDossiers.razor.cs

@@ -4,6 +4,7 @@ using Microsoft.JSInterop;
 using MP.Data.DatabaseModels;
 using MP.Data.DTO;
 using MP.SPEC.Data;
+using Newtonsoft.Json;
 
 namespace MP.SPEC.Components
 {
@@ -37,7 +38,7 @@ namespace MP.SPEC.Components
             {
                 try
                 {
-                    answ = (currFluxLogDto.CodFlux == recordSel.CodFlux && currFluxLogDto.dtEvento== recordSel.dtEvento) ? "table-info" : "";
+                    answ = (currFluxLogDto.CodFlux == recordSel.CodFlux && currFluxLogDto.dtEvento == recordSel.dtEvento) ? "table-info" : "";
                 }
                 catch
                 { }
@@ -53,6 +54,7 @@ namespace MP.SPEC.Components
                 try
                 {
                     answ = (currRecord.IdxMacchina == recordSel.IdxMacchina && currRecord.DtRif == recordSel.DtRif) ? "table-info" : "";
+
                 }
                 catch
                 { }
@@ -61,15 +63,20 @@ namespace MP.SPEC.Components
         }
         public void Dispose()
         {
-            MessageService.EA_PageUpdated -= MessageService_EA_PageUpdated;
-            MessageService.EA_SearchUpdated -= OnSeachUpdated;
             currRecord = null;
             SearchRecords = null;
             ListRecords = null;
             GC.Collect();
         }
-
-
+        private SelectDossierParams lastFilter { get; set; } = new SelectDossierParams() { CurrPage = -1 };
+        protected override async Task OnParametersSetAsync()
+        {
+            if (!lastFilter.Equals(SelFilter))
+            {
+                lastFilter = SelFilter.clone();
+                await reloadData(true);
+            }
+        }
         #endregion Public Methods
 
         #region Protected Properties
@@ -79,10 +86,6 @@ namespace MP.SPEC.Components
 
         [Inject]
         protected MpDataService MDService { get; set; } = null!;
-
-        [Inject]
-        protected MessageService MessageService { get; set; } = null!;
-
         #endregion Protected Properties
 
         #region Protected Methods
@@ -111,10 +114,59 @@ namespace MP.SPEC.Components
             await RecordSelFlux.InvokeAsync(selRec);
         }
 
+        private void enableEditing()
+        {
+            isEditing = true;
+        }
+
+        protected async Task cancel()
+        {
+            var alert = await JSRuntime.InvokeAsync<bool>("confirm", "Confermi di voler annullare TUTTE le modifiche? i dati saranno ricaricati.");
+            if (alert)
+            {
+                currFluxLogDto = null;
+                isEditing = false;
+                await Task.Delay(1);
+                listaFlux = MDService.getFluxLog(currRecord.Valore);
+                StateHasChanged();
+            }
+        }
+
+        protected async Task update(FluxLogDTO selRec)
+        {
+            var alert = await JSRuntime.InvokeAsync<bool>("confirm", "Confermi di voler salvare TUTTE le modifiche? queste saranno parte del dossier inviato all'impianto");
+
+            if (alert)
+            {
+
+                await Task.Delay(1);
+                if (currRecord != null)
+                {
+                    // serializzo valore x flux log...
+                    DossierFluxLogDTO updatedResult = new DossierFluxLogDTO() { ODL = listaFlux };
+                    string newVal = JsonConvert.SerializeObject(updatedResult);
+                    currRecord.Valore = newVal;
+                    // METODO PER UPDATE FLUX
+                    await MDService.DossiersUpdateValore(currRecord);
+                    currFluxLogDto = null;
+                    isEditing = false;
+                    await Task.Delay(1);
+                    StateHasChanged();
+                }
+                return;
+            }
+            else
+            {
+                currFluxLogDto = null;
+                await Task.Delay(1);
+                await JSRuntime.InvokeAsync<bool>("location.reload");
+
+            }
+
+        }
+
         protected override async Task OnInitializedAsync()
         {
-            MessageService.EA_PageUpdated += MessageService_EA_PageUpdated;
-            MessageService.EA_SearchUpdated += OnSeachUpdated;
             ListStati = await MDService.AnagStatiComm();
             await reloadData(true);
         }
@@ -141,6 +193,19 @@ namespace MP.SPEC.Components
             currRecord = null;
             await reloadData(true);
         }
+        private string css()
+        {
+            string answ = "";
+            if (isEditing)
+            {
+                answ = "visible";
+            }
+            else
+            {
+                answ = "hidden";
+            }
+            return answ;
+        }
 
         #endregion Protected Methods
 
@@ -162,8 +227,14 @@ namespace MP.SPEC.Components
 
         private int currPage
         {
-            get => MessageService.currPage;
-            set => MessageService.currPage = value;
+            get => SelFilter.CurrPage;
+            set => SelFilter.CurrPage = value;
+        }
+
+        private bool isEditing
+        {
+            get => SelFilter.isEditing;
+            set => SelFilter.isEditing = value;
         }
 
         private bool isLoading { get; set; } = false;
@@ -177,8 +248,8 @@ namespace MP.SPEC.Components
 
         private int numRecord
         {
-            get => MessageService.numRecord;
-            set => MessageService.numRecord = value;
+            get => SelFilter.NumRec;
+            set => SelFilter.NumRec = value;
         }
 
         private string SelArticolo
@@ -219,11 +290,6 @@ namespace MP.SPEC.Components
 
         #region Private Methods
 
-        private async void MessageService_EA_PageUpdated()
-        {
-            await reloadData(true);
-        }
-
         private async Task reloadData(bool setChanged)
         {
             isLoading = true;
@@ -263,6 +329,7 @@ namespace MP.SPEC.Components
             currFluxLogDto = null;
             currRecord = null;
             visualizzaFlux = true;
+            isEditing = false;
             await RecordSelFlux.InvokeAsync(currFluxLogDto);
             await Task.Delay(1);
         }

MP.SPEC/Components/ListODL.razor

@@ -198,6 +198,17 @@ else
                                                                 </div>
                                                             }
                                                         </td>
+                                                        <td>
+                                                            <div class="input-group input-group-sm">
+                                                                <div class="input-group-text">
+                                                                    <span class="me-1 @leftStringCSS">Tutti gli Stati</span>
+                                                                    <span class="form-check form-check-sm form-switch py-1" title="Mostra/Nascondi macchina spenta">
+                                                                        <input class="form-check-input" type="checkbox" id="switchSpenta" @onchange="() => toggleSpenta()" value="@hideSpenta">
+                                                                    </span>
+                                                                    <span class="@rightStringCSS">Nascondi Spenta</span>
+                                                                </div>
+                                                            </div>
+                                                        </td>
                                                     </tr>
                                                 </tbody>
                                             </table>
@@ -205,10 +216,9 @@ else
                                         <div>
                                             @if (statRecord != null)
                                             {
-
-                                                @if (ListOdlStats != null)
+                                                @if (ListOdlStatsAct != null)
                                                 {
-                                                    @foreach (var stat in ListOdlStats)
+                                                    @foreach (var stat in ListOdlStatsAct)
                                                     {
                                                         <div class="p-1">
                                                             <div class="d-flex justify-content-between">
@@ -234,11 +244,12 @@ else
                                         @if (statRecord != null && ListOdlStats != null)
                                         {
                                             <div class="dcBox">
-                                                <ODLPlot SelectedOdl="@statRecord.IdxOdl"></ODLPlot>
+                                                <ODLPlot SelectedOdl="@statRecord.IdxOdl" hideSpenta="@hideSpenta"></ODLPlot>
                                             </div>
                                             <div class="dcBox dcOverlay d-flex">
                                                 <div class="align-self-center text-center w-100">
-                                                    <b class="fs-3">@statRecord.DurataMinuti</b>
+                                                    <b class="fs-3">@durataFilt</b>
+                                                    @*<b class="fs-3">@statRecord.DurataMinuti</b>*@
                                                 </div>
                                             </div>
                                         }

MP.SPEC/Components/ListODL.razor.cs

@@ -46,6 +46,7 @@ namespace MP.SPEC.Components
             ListRecords = null;
             ListStati = null;
             ListOdlStats = null;
+            ListOdlStatsNetto = null;
             statRecord = null;
             GC.Collect();
         }
@@ -87,7 +88,7 @@ namespace MP.SPEC.Components
                 await MDService.ODLClose(currRecord.IdxOdl, currRecord.IdxMacchina, 0, true);
                 Log.Info($"Effettuata chiusura ODL {currRecord.IdxOdl}");
                 // ricarica...
-                await selectRecord(null);
+                await selRecord(null);
             }
             await reloadData();
         }
@@ -116,7 +117,7 @@ namespace MP.SPEC.Components
                 await callSyncDb(currRecord.IdxMacchina);
                 Log.Info($"Richiesto forceSyncDb per idxMacc {currRecord.IdxMacchina}");
                 // ricarica...
-                await selectRecord(null);
+                await selRecord(null);
             }
             await reloadData();
         }
@@ -143,27 +144,10 @@ namespace MP.SPEC.Components
 
         protected async Task resetSel()
         {
-            await selectRecord(null);
+            await selRecord(null);
             await reloadData();
         }
 
-        protected async Task selectRecord(ODLModel? currRec)
-        {
-            showStats = true;
-            await Task.Delay(1);
-            currRecord = currRec;
-            if (currRec != null)
-            {
-                showStats = true;
-                ListOdlStats = await MDService.StatOdl(currRec.IdxOdl);
-            }
-            else
-            {
-                showStats = false;
-                ListOdlStats = null;
-            }
-        }
-
         protected async Task selectStatRecord(ODLModel? currRec)
         {
             showStats = true;
@@ -171,8 +155,7 @@ namespace MP.SPEC.Components
             statRecord = currRec;
             if (currRec != null)
             {
-                showStats = true;
-                ListOdlStats = await MDService.StatOdl(currRec.IdxOdl);
+                await reloadStatsData(currRec);
             }
             else
             {
@@ -188,11 +171,22 @@ namespace MP.SPEC.Components
             currRecord = currRec;
             showStats = false;
             ListOdlStats = null;
+            ListOdlStatsNetto = null;
+        }
+
+        protected async Task toggleSpenta()
+        {
+            hideSpenta = !hideSpenta;
+            await Task.Delay(1);
+            if (statRecord != null)
+            {
+                await reloadStatsData(statRecord);
+            }
         }
 
         protected async Task UpdateData()
         {
-            await selectRecord(null);
+            await selRecord(null);
             await reloadData();
         }
 
@@ -201,10 +195,13 @@ namespace MP.SPEC.Components
         #region Private Fields
 
         private static Logger Log = LogManager.GetCurrentClassLogger();
+
         private ODLModel? currRecord = null;
 
         private List<StatODLModel>? ListOdlStats;
 
+        private List<StatODLModel>? ListOdlStatsNetto;
+
         private List<ODLModel>? ListRecords;
 
         private List<ListValues>? ListStati;
@@ -225,6 +222,39 @@ namespace MP.SPEC.Components
             set => currFilter.CurrPage = value;
         }
 
+        private string durataFilt
+        {
+            get
+            {
+                string answ = "ND";
+                if (statRecord != null)
+                {
+                    if (hideSpenta)
+                    {
+                        if (ListOdlStatsNetto != null)
+                        {
+                            var tsDurata = TimeSpan.FromMinutes(ListOdlStatsNetto.Sum(x => x.TotDurata));
+                            if (tsDurata.TotalDays < 1)
+                            {
+                                answ = $"{tsDurata.Hours:00}h {tsDurata.Minutes:00}'";
+                            }
+                            else
+                            {
+                                answ = $"{tsDurata.Days}gg {tsDurata.Hours:00}h";
+                            }
+                        }
+                    }
+                    else
+                    {
+                        answ = statRecord.DurataMinuti;
+                    }
+                }
+                return answ;
+            }
+        }
+
+        private bool hideSpenta { get; set; } = false;
+
         /// <summary>
         /// Indica se si tratti di ODL correnti
         /// </summary>
@@ -235,12 +265,39 @@ namespace MP.SPEC.Components
 
         private bool isLoading { get; set; } = false;
 
+        private string leftStringCSS
+        {
+            get => hideSpenta ? "text-secondary" : "text-dark fw-bold";
+        }
+
+        private List<StatODLModel>? ListOdlStatsAct
+        {
+            get
+            {
+                List<StatODLModel> answ = new List<StatODLModel>();
+                if (hideSpenta)
+                {
+                    answ = ListOdlStatsNetto;
+                }
+                else
+                {
+                    answ = ListOdlStats;
+                }
+                return answ;
+            }
+        }
+
         private int numRecord
         {
             get => currFilter.NumRec;
             set => currFilter.NumRec = value;
         }
 
+        private string rightStringCSS
+        {
+            get => hideSpenta ? "text-dark fw-bold" : "text-secondary";
+        }
+
         private DateTime selDtFine { get; set; } = DateTime.Now;
 
         private bool showStats { get; set; } = false;
@@ -286,12 +343,9 @@ namespace MP.SPEC.Components
             double answ = 0;
 
             double tot = 0;
-            if (ListOdlStats != null)
+            if (ListOdlStatsAct != null)
             {
-                foreach (var item in ListOdlStats)
-                {
-                    tot += item.TotDurata;
-                }
+                tot = ListOdlStatsAct.Sum(x => x.TotDurata);
 
                 double perc = (durata / tot) * 100;
                 if (perc > 1)
@@ -349,6 +403,21 @@ namespace MP.SPEC.Components
             isLoading = false;
         }
 
+        private async Task reloadStatsData(ODLModel? currRec)
+        {
+            showStats = true;
+            if (currRec != null)
+            {
+                ListOdlStats = await MDService.StatOdl(currRec.IdxOdl);
+                ListOdlStatsNetto = ListOdlStats.Where(x => x.Semaforo != "sGr").ToList();
+            }
+            else
+            {
+                ListOdlStats = null;
+                ListOdlStatsNetto = null;
+            }
+        }
+
         private string tradFase(string codFase)
         {
             string answ = codFase;

MP.SPEC/Components/ListPARAMS.razor.cs

@@ -25,7 +25,7 @@ namespace MP.SPEC.Components
         #endregion Public Properties
 
         #region Public Methods
-
+        private SelectFluxParams lastFilter { get; set; } = new SelectFluxParams() { CurrPage = -1 };
         public string checkSelect(FluxLog selRecord)
         {
             string answ = "";
@@ -45,10 +45,10 @@ namespace MP.SPEC.Components
         {
             await Task.Delay(1);
             // se sono cambiati --> rileggo...
-            if (LastFilter==null || !SelFilter.Equals(LastFilter))
+            if (!lastFilter.Equals(SelFilter))
             {
-                await reloadData(false);
-                LastFilter = SelFilter;
+                lastFilter = SelFilter.clone();
+                await reloadData(true);
             }
         }
 
@@ -58,8 +58,6 @@ namespace MP.SPEC.Components
         public void Dispose()
         {
             aTimer.Elapsed -= ElapsedTimer;
-            MessageService.EA_PageUpdated -= MessageService_EA_PageUpdated;
-            MessageService.EA_SearchUpdated -= OnSeachUpdated;
             aTimer.Stop();
             aTimer.Dispose();
             currRecord = null;
@@ -128,9 +126,6 @@ namespace MP.SPEC.Components
         [Inject]
         protected MpDataService MDService { get; set; } = null!;
 
-        [Inject]
-        protected MessageService MessageService { get; set; } = null!;
-
         protected int RefreshPeriod
         {
             get => SelFilter.TempoAgg;
@@ -142,8 +137,6 @@ namespace MP.SPEC.Components
 
         protected override async Task OnInitializedAsync()
         {
-            MessageService.EA_PageUpdated += MessageService_EA_PageUpdated;
-            MessageService.EA_SearchUpdated += OnSeachUpdated;
             StartTimer();
         }
 
@@ -197,8 +190,8 @@ namespace MP.SPEC.Components
 
         private int currPage
         {
-            get => MessageService.currPage;
-            set => MessageService.currPage = value;
+            get => SelFilter.CurrPage;
+            set => SelFilter.CurrPage = value;
         }
 
         private bool isLoading { get; set; } = false;
@@ -215,8 +208,8 @@ namespace MP.SPEC.Components
 
         private int numRecord
         {
-            get => MessageService.numRecord;
-            set => MessageService.numRecord = value;
+            get => SelFilter.NumRec;
+            set => SelFilter.NumRec = value;
         }
 
         private string SelFlux
@@ -250,11 +243,6 @@ namespace MP.SPEC.Components
 
         #region Private Methods
 
-        private async void MessageService_EA_PageUpdated()
-        {
-            await reloadData(true);
-        }
-
         #endregion Private Methods
     }
 }

MP.SPEC/Components/ODLPlot.razor.cs

@@ -1,14 +1,25 @@
 using Microsoft.AspNetCore.Components;
-using Microsoft.JSInterop;
 using MP.Data.DatabaseModels;
-using MP.SPEC.Components;
 using MP.SPEC.Data;
 
 namespace MP.SPEC.Components
 {
     public partial class ODLPlot
     {
-        #region Public Properties        
+        #region Public Fields
+
+        public List<DoughnutStyling> colors = new List<DoughnutStyling>();
+
+        public List<double> Data = new List<double>();
+
+        public List<string> Labels = new List<string>();
+
+        #endregion Public Fields
+
+        #region Public Properties
+
+        [Parameter]
+        public bool hideSpenta { get; set; }
 
         public int OdlId
         {
@@ -29,34 +40,36 @@ namespace MP.SPEC.Components
         //protected DataLogFilter _SelFilter { get; set; } = new DataLogFilter();
         protected int _selParam { get; set; } = -1;
 
+        [Inject]
+        protected MpDataService MDService { get; set; } = null!;
+
         #endregion Protected Properties
 
         #region Protected Methods
 
-        private bool isLoading { get; set; } = false;
-
         protected override async Task OnInitializedAsync()
         {
             isLoading = true;
             await Task.Delay(1);
         }
-        private List<StatODLModel>? ListRecords = null;
+
         protected override async Task OnParametersSetAsync()
         {
             await ReloadData();
             await Task.Delay(1);
         }
 
-        public List<double> Data = new List<double>();
-        public List<string> Labels = new List<string>();
-        public List<DoughnutStyling> colors = new List<DoughnutStyling>();
-
         protected async Task ReloadData()
         {
             Data.Clear();
             Labels.Clear();
             colors.Clear();
             ListRecords = await MDService.StatOdl(SelectedOdl);
+            // se hideSpenta --> filtro stato 11 = spenta...
+            if (hideSpenta)
+            {
+                ListRecords = ListRecords.Where(x => x.Semaforo != "sGr").ToList();
+            }
             foreach (var record in ListRecords)
             {
                 Data.Add(record.TotDurata);
@@ -73,18 +86,23 @@ namespace MP.SPEC.Components
                 {
                     colors.Add(new DoughnutStyling(record.Css, "ccc"));
                 }
-
-
             }
             await Task.Delay(1);
             isLoading = false;
         }
 
-
-
-        [Inject]
-        protected MpDataService MDService { get; set; } = null!;
-
         #endregion Protected Methods
+
+        #region Private Fields
+
+        private List<StatODLModel>? ListRecords = null;
+
+        #endregion Private Fields
+
+        #region Private Properties
+
+        private bool isLoading { get; set; } = false;
+
+        #endregion Private Properties
     }
 }

MP.SPEC/Components/ParamsFilter.razor.cs

@@ -178,7 +178,9 @@ namespace MP.SPEC.Components
             var currRec = configData.FirstOrDefault(x => x.Chiave == "numOreAnticipoSnapshot");
             if (currRec != null)
             {
-                int.TryParse(currRec.Valore, out numOreAnticipoSnapshot);
+                var newInt = 40;
+                int.TryParse(currRec.Valore, out newInt);
+                numOreAnticipoSnapshot = newInt;
             }
 
             await FilterChanged.InvokeAsync(SelFilter);
@@ -249,7 +251,7 @@ namespace MP.SPEC.Components
         private static System.Timers.Timer aTimer = new System.Timers.Timer();
         private List<string>? ListFlux = null;
         private List<string>? ListMacchine = null;
-        private int numOreAnticipoSnapshot = 5;
+        private int numOreAnticipoSnapshot { get; set; } = 50;
         private bool snapshotDone = false;
 
         #endregion Private Fields

MP.SPEC/Data/MpDataService.cs

@@ -180,7 +180,33 @@ namespace MP.SPEC.Data
         /// <returns></returns>
         public async Task<List<AnagArticoli>> ArticoliGetSearch(int numRecord, string azienda, string searchVal)
         {
-            return await Task.FromResult(dbController.ArticoliGetSearch(numRecord, azienda, searchVal));
+            List<AnagArticoli> result = new List<AnagArticoli>();
+            Stopwatch stopWatch = new Stopwatch();
+            stopWatch.Start();
+            string readType = "DB";
+            string currKey = $"{redisArtList}:{azienda}";
+            // cerco in redis dato valore sel macchina...
+            RedisValue rawData = redisDb.StringGet(currKey);
+            if (rawData.HasValue)
+            {
+                result = JsonConvert.DeserializeObject<List<AnagArticoli>>($"{rawData}");
+                readType = "REDIS";
+            }
+            else
+            {
+                result = await Task.FromResult(dbController.ArticoliGetSearch(numRecord, azienda, searchVal));
+                // serializzo e salvo...
+                rawData = JsonConvert.SerializeObject(result);
+                redisDb.StringSet(currKey, rawData, getRandTOut(redisLongTimeCache/5));
+            }
+            if (result == null)
+            {
+                result = new List<AnagArticoli>();
+            }
+            stopWatch.Stop();
+            TimeSpan ts = stopWatch.Elapsed;
+            Log.Debug($"ArticoliGetSearch | Read from {readType}: {ts.TotalMilliseconds}ms");
+            return result;
         }
 
         /// <summary>
@@ -388,11 +414,10 @@ namespace MP.SPEC.Data
             await Task.Delay(1);
             // chiamo stored x salvare parametri
             dbController.DossiersTakeParamsSnapshot(IdxMacchina, MaxSec, DtRif);
-            // svuoto cache redis x macchina
-            string currKey = $"{redisDossByMac}:{IdxMacchina}";
-            redisDb.StringSet(currKey, "", TimeSpan.FromSeconds(1));
-            currKey = $"{redisDossByMac}:*";
-            redisDb.StringSet(currKey, "", TimeSpan.FromSeconds(1));
+            // elimino cache redis...
+            RedisValue pattern = new RedisValue($"{redisDossByMac}:*");
+            answ = await ExecFlushRedisPattern(pattern);
+            Log.Info($"Svuotata cache dossier | {pattern}");
             return answ;
         }
 
@@ -407,13 +432,13 @@ namespace MP.SPEC.Data
         {
             bool answ = false;
             await Task.Delay(1);
+            Log.Info($"Richiesta snapshot per macchina {IdxMacchina} | periodo {dtMin} --> {dtMax}");
             // chiamo stored x salvare parametri
             dbController.DossiersTakeParamsSnapshotLast(IdxMacchina, dtMin, dtMax);
-            // svuoto cache redis x macchina
-            string currKey = $"{redisDossByMac}:{IdxMacchina}";
-            redisDb.StringSet(currKey, "", TimeSpan.FromSeconds(1));
-            currKey = $"{redisDossByMac}:*";
-            redisDb.StringSet(currKey, "", TimeSpan.FromSeconds(1));
+            // elimino cache redis...
+            RedisValue pattern = new RedisValue($"{redisDossByMac}:*");
+            answ = await ExecFlushRedisPattern(pattern);
+            Log.Info($"Svuotata cache dossier | {pattern}");
             return answ;
         }
 
@@ -886,6 +911,15 @@ namespace MP.SPEC.Data
             return answ;
         }
 
+
+        public async Task<bool> DossiersUpdateValore(Dossiers currDoss)
+        {
+            // aggiorno record sul DB
+            bool answ = await dbController.DossiersUpdateValore(currDoss);
+
+            return answ;
+        }
+
         #endregion Public Methods
 
         #region Protected Fields
@@ -912,6 +946,7 @@ namespace MP.SPEC.Data
         #region Private Fields
 
         private const string redisArtByDossier = redisBaseAddr + "SPEC:Cache:ArtByDossier";
+        private const string redisArtList = redisBaseAddr + "SPEC:Cache:ArtList";
         private const string redisBaseAddr = "MP:";
 
         private const string redisConfKey = redisBaseAddr + "SPEC:Cache:Config";

MP.SPEC/Data/SelectArticoliParams.cs

@@ -0,0 +1,74 @@
+namespace MP.SPEC.Data
+{
+    public class SelectArticoliParams
+    {
+        #region Public Constructors
+
+        public SelectArticoliParams()
+        { }
+
+        #endregion Public Constructors
+
+        #region Public Properties
+
+
+        public int CurrPage { get; set; } = 1;
+
+        public string IdxMacchina { get; set; } = "*";
+        public string Azienda { get; set; } = "*";
+
+        public int MaxRecord { get; set; } = 100;
+
+        public int NumRec { get; set; } = 10;
+
+        public int TotCount { get; set; } = 0;
+
+        #endregion Public Properties
+
+        #region Public Methods
+
+        public SelectArticoliParams clone()
+        {
+            SelectArticoliParams clonedData = new SelectArticoliParams()
+            {
+                CurrPage = this.CurrPage,
+                IdxMacchina = this.IdxMacchina,
+                Azienda = this.Azienda,
+                MaxRecord = this.MaxRecord,
+                NumRec = this.NumRec,
+                TotCount = this.TotCount
+            };
+            return clonedData;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (!(obj is SelectArticoliParams item))
+                return false;
+
+            if (MaxRecord != item.MaxRecord)
+                return false;
+
+            if (NumRec != item.NumRec)
+                return false;
+
+            if (TotCount != item.TotCount)
+                return false;
+
+            if (CurrPage != item.CurrPage)
+                return false;
+
+            if (IdxMacchina != item.IdxMacchina)
+                return false;
+
+            return true;
+        }
+
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+
+        #endregion Public Methods
+    }
+}

MP.SPEC/Data/SelectDossierParams.cs

@@ -1,4 +1,6 @@
-namespace MP.SPEC.Data
+using MP.Data;
+
+namespace MP.SPEC.Data
 {
     public class SelectDossierParams
     {
@@ -13,31 +15,35 @@
 
         public int CurrPage { get; set; } = 1;
 
-        public DateTime DtEnd { get; set; } = InitDatetime(5);
+        public DateTime DtEnd { get; set; } = Utils.InitDatetime(DateTime.Now, 15);
 
-        public DateTime DtStart { get; set; } = InitDatetime(5).AddDays(-730);
+        public DateTime DtStart { get; set; } = Utils.InitDatetime(DateTime.Now, 15).AddDays(-730);
 
         public string IdxMacchina { get; set; } = "*";
 
         public string CodArticolo { get; set; } = "*";
-
+        public int NumRec { get; set; } = 10;
+        public int TotCount { get; set; } = 0;
         public int MaxRecord { get; set; } = 100;
+        public bool isEditing { get; set; } = false;
 
         #endregion Public Properties
 
         #region Public Methods
-
-        /// <summary>
-        /// Inizializzazione con periodo e arrotondamento
-        /// </summary>
-        /// <param name="minRound"></param>
-        /// <returns></returns>
-        public static DateTime InitDatetime(int minRound)
+        public SelectDossierParams clone()
         {
-            TimeSpan DayElapsed = DateTime.Now.Subtract(DateTime.Today);
-            int minDay = (int)Math.Ceiling((double)(DayElapsed.TotalMinutes / minRound)) * minRound;
-            DateTime endRounded = DateTime.Today.AddMinutes(minDay);
-            return endRounded;
+            SelectDossierParams clonedData = new SelectDossierParams()
+            {
+                DtEnd = this.DtEnd,
+                DtStart = this.DtStart,
+                CurrPage = this.CurrPage,
+                IdxMacchina = this.IdxMacchina,
+                CodArticolo = this.CodArticolo,
+                MaxRecord = this.MaxRecord,
+                NumRec = this.NumRec,
+                TotCount = this.TotCount
+            };
+            return clonedData;
         }
 
         public override bool Equals(object obj)
@@ -54,6 +60,12 @@
             if (MaxRecord != item.MaxRecord)
                 return false;
 
+            if (TotCount != item.TotCount)
+                return false;
+
+            if (NumRec != item.NumRec)
+                return false;
+
             if (DtEnd != item.DtEnd)
                 return false;
 

MP.SPEC/Data/SelectFluxParams.cs

@@ -19,14 +19,33 @@
         public string IdxMacchina { get; set; } = "*";
         public string lastUpdate { get; set; } = "-";
         public bool LiveUpdate { get; set; } = true;
-
+        public int NumRec { get; set; } = 10;
         public int MaxRecord { get; set; } = 100;
         public int TempoAgg { get; set; } = 10000;
+        public int TotCount { get; set; } = 0;
 
         #endregion Public Properties
 
         #region Public Methods
-
+        public SelectFluxParams clone()
+        {
+            SelectFluxParams clonedData = new SelectFluxParams()
+            {
+                CodFlux = this.CodFlux,
+                CurrPage = this.CurrPage,
+                dtRif = this.dtRif,
+                dtMax = this.dtMax,
+                dtMin = this.dtMin,
+                IdxMacchina = this.IdxMacchina,
+                lastUpdate = this.lastUpdate,
+                LiveUpdate = this.LiveUpdate,
+                NumRec = this.NumRec,
+                MaxRecord = this.MaxRecord,
+                TotCount = this.TotCount,
+                TempoAgg = this.TempoAgg
+            };
+            return clonedData;
+        }
         public override bool Equals(object obj)
         {
             if (!(obj is SelectFluxParams item))
@@ -46,6 +65,12 @@
 
             if (TempoAgg != item.TempoAgg)
                 return false;
+            
+            if (NumRec!= item.NumRec)
+                return false;
+            
+            if (TotCount!= item.TotCount)
+                return false;
 
             if (CurrPage != item.CurrPage)
                 return false;

MP.SPEC/Data/SelectOdlParams.cs

@@ -19,7 +19,7 @@ namespace MP.SPEC.Data
         public int NumRec { get; set; } = 10;
         public int TotCount { get; set; } = 0;
         public DateTime DtEnd { get; set; } = Utils.InitDatetime(DateTime.Now, 5);
-        public DateTime DtStart { get; set; } = Utils.InitDatetime(DateTime.Now, 5).AddDays(-7);
+        public DateTime DtStart { get; set; } = Utils.InitDatetime(DateTime.Now, 5).AddDays(-10);
         public int MaxRecord { get; set; } = 100;
         public bool IsActive { get; set; } = true;
         public string SearchVal { get; set; } = "*";

MP.SPEC/MP.SPEC.csproj

@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP.SPEC</RootNamespace>
-    <Version>6.16.2210.1910</Version>
+    <Version>6.16.2210.2017</Version>
   </PropertyGroup>
 
   <ItemGroup>

MP.SPEC/Pages/Articoli.razor.cs

@@ -24,9 +24,11 @@ namespace MP.SPEC.Pages
             return answ;
         }
 
+        private SelectArticoliParams currFilter = new SelectArticoliParams();
+
         public void Dispose()
         {
-            MessageService.EA_SearchUpdated -= OnSeachUpdated;
+            //MessageService.EA_SearchUpdated -= OnSeachUpdated;
             currRecord = null;
             ListTipoArt = null;
             ListAziende = null;
@@ -55,9 +57,6 @@ namespace MP.SPEC.Pages
         [Inject]
         protected MpDataService MDService { get; set; } = null!;
 
-        [Inject]
-        protected MessageService MessageService { get; set; } = null!;
-
         [Inject]
         protected NavigationManager NavManager { get; set; }
 
@@ -131,9 +130,6 @@ namespace MP.SPEC.Pages
         protected override async Task OnInitializedAsync()
         {
             numRecord = 10;
-            // mostro ricerca
-            MessageService.ShowSearch = true;
-            MessageService.EA_SearchUpdated += OnSeachUpdated;
             configData = await MDService.ConfigGetAll();
             var currRec = configData.FirstOrDefault(x => x.Chiave == "AZIENDA");
             if (currRec != null)
@@ -172,14 +168,14 @@ namespace MP.SPEC.Pages
             {
                 Azienda = selRec.Azienda,
                 CodArticolo = selRec.CodArticolo,
-                DescArticolo = $"CLONE - { selRec.DescArticolo }",
+                DescArticolo = $"CLONE - {selRec.DescArticolo}",
                 Disegno = selRec.Disegno,
-                Tipo=selRec.Tipo
+                Tipo = selRec.Tipo
             };
             currRecord = newRec;
             await Task.Delay(1);
         }
-        
+
 
         protected async Task update(AnagArticoli selRec)
         {
@@ -294,7 +290,7 @@ namespace MP.SPEC.Pages
         private async Task reloadData()
         {
             isLoading = true;
-            SearchRecords = await MDService.ArticoliGetSearch(100000, selAzienda, MessageService.SearchVal);
+            SearchRecords = await MDService.ArticoliGetSearch(100000, selAzienda, "");
             ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
             isLoading = false;
         }

MP.SPEC/Pages/DOSS.razor

@@ -21,67 +21,13 @@
         </div>
     </div>
     <div class="card-body">
-        @if (currDetFluxLogRecord != null)
-        {
-            <div class="row">
-                <div class="col-12">
-                    <div class="card mb-5">
-                        <div class="card-header bg-primary text-light">Modifica Parametro</div>
-                        <div class="card-body">
-                            <div class="row">
-                                <div class="col-3 pe-0">
-                                    <div class="input-group input-group-sm">
-                                        <span class="input-group-text" id="inputGroup-sizing-sm">MACCHINA</span>
-                                        <input type="text" class="form-control" disabled aria-label="Art search" aria-describedby="inputGroup-sizing-sm" @bind-value="@currDetFluxLogRecord.IdxMacchina">
-                                    </div>
-                                </div>
-                                <div class="col-3 pe-0">
-                                    <div class="input-group input-group-sm">
-                                        <span class="input-group-text" id="inputGroup-sizing-sm">DATA</span>
-                                        <input type="text" class="form-control" disabled aria-label="Art search" aria-describedby="inputGroup-sizing-sm" @bind-value="@currDetFluxLogRecord.dtEvento">
-                                    </div>
-                                </div>
-                                <div class="col-3 pe-0">
-                                    <div class="input-group input-group-sm">
-                                        <span class="input-group-text" id="inputGroup-sizing-sm">DATA TYPE</span>
-                                        <input type="text" class="form-control" disabled aria-label="Art search" aria-describedby="inputGroup-sizing-sm" @bind-value="@currDetFluxLogRecord.CodFlux">
-                                    </div>
-                                </div>
-                                <div class="col-3 pe-0">
-                                    <div class="input-group input-group-sm">
-                                        <span class="input-group-text" id="inputGroup-sizing-sm">VALORE</span>
-                                        <input type="text" class="form-control" aria-label="Art search" aria-describedby="inputGroup-sizing-sm" @bind-value="@currDetFluxLogRecord.ValoreEdit">
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row pt-4">
-                                <div class="col-3 pe-0">
-                                </div>
-                                <div class="col-3 pe-0">
-                                </div>
-                                <div class="col-3 pe-0">
-                                    <div class="d-grid gap-2">
-                                        <button @onclick="() => cancel()" class="btn btn-warning">Annulla <i class="bi bi-x-circle"></i></button>
-                                    </div>
-                                </div>
-                                <div class="col-3 pe-0">
-                                    <div class="d-grid gap-2">
-                                        <button @onclick="() => update(currDetFluxLogRecord)" class="btn btn-success">Save <i class="bi bi-save"></i></button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        }
         @if (isLoading)
         {
             <LoadingData></LoadingData>
         }
         else
         {
-            <ListDossiers SelFilter="@currFilter" RecordSel="@selRecordDoss" RecordSelFlux="@selRecordFlux" TotRecordChanged="updateTotal"></ListDossiers>
+            <ListDossiers SelFilter="@currFilter" RecordSel="@selRecordDoss" TotRecordChanged="updateTotal"></ListDossiers>
         }
     </div>
     <div class="card-footer py-1">

MP.SPEC/Pages/DOSS.razor.cs

@@ -23,19 +23,11 @@ namespace MP.SPEC.Pages
         [Inject]
         protected MpDataService MDService { get; set; } = null!;
 
-        [Inject]
-        protected MessageService MsgService { get; set; } = null!;
 
         #endregion Protected Properties
 
         #region Protected Methods
 
-        protected async Task cancel()
-        {
-            currDetFluxLogRecord = null;
-            await Task.Delay(1);
-        }
-
         protected void ForceReload(int newNum)
         {
             numRecord = newNum;
@@ -51,9 +43,6 @@ namespace MP.SPEC.Pages
         {
             isLoading = true;
             isFiltering = true;
-            // disabilito ricerca...
-            MsgService.SearchVal = "";
-            MsgService.ShowSearch = false;
             // fix pagina
             await Task.Delay(1);
             var modFilter = currFilter;
@@ -69,25 +58,23 @@ namespace MP.SPEC.Pages
             await Task.Delay(1);
         }
 
-        protected async Task selRecordFlux(FluxLogDTO selRec)
+        private string css()
         {
-            currDetFluxLogRecord = selRec;
-            await Task.Delay(1);
+            string answ = "";
+            if (isEditing == false)
+            {
+                answ = "hidden";
+            }
+            else
+            {
+                answ = "visible";
+            }
+            return answ;
         }
 
-        protected async Task update(FluxLogDTO selRec)
+        private void enableEditing()
         {
-            if (!await JSRuntime.InvokeAsync<bool>("confirm", "Confermi di voler salvare le modifiche? queste saranno parte del dossier inviato all'impianto"))
-                return;
-
-            await Task.Delay(1);
-            if (currRecordDoss != null)
-            {
-                // METODO PER UPDATE FLUX
-                await MDService.updateDossierValue(currRecordDoss, selRec);
-            }
-            currDetFluxLogRecord = null;
-            await Task.Delay(1);
+            isEditing = true;
         }
 
         protected void updateTotal(int newTotCount)
@@ -105,18 +92,14 @@ namespace MP.SPEC.Pages
 
         #region Private Properties
 
-        private FluxLogDTO? currDetFluxLogRecord
-        {
-            get => _currDetFluxLogRecord;
-            set { _currDetFluxLogRecord = value; }
-        }
+
 
         private SelectDossierParams currFilter { get; set; } = new SelectDossierParams();
 
         private int currPage
         {
-            get => MsgService.currPage;
-            set => MsgService.currPage = value;
+            get => currFilter.CurrPage;
+            set => currFilter.CurrPage = value;
         }
 
         private Dossiers? currRecordDoss { get; set; } = null;
@@ -125,11 +108,19 @@ namespace MP.SPEC.Pages
 
         private int numRecord
         {
-            get => MsgService.numRecord;
-            set => MsgService.numRecord = value;
+            get => currFilter.NumRec;
+            set => currFilter.NumRec = value;
+        }
+        private bool isEditing
+        {
+            get => currFilter.isEditing;
+            set => currFilter.isEditing = value;
+        }
+        private int totalCount
+        {
+            get => currFilter.TotCount;
+            set => currFilter.TotCount = value;
         }
-
-        private int totalCount { get; set; } = 0;
 
         #endregion Private Properties
 
@@ -146,6 +137,10 @@ namespace MP.SPEC.Pages
             currFilter = newParams;
             isLoading = false;
         }
+        protected void UpdateTotCount(int newTotCount)
+        {
+            totalCount = newTotCount;
+        }
 
         #endregion Private Methods
     }

MP.SPEC/Pages/ODL.razor.cs

@@ -100,7 +100,7 @@ namespace MP.SPEC.Pages
         {
             // copio il filtro
             currFilter.DtEnd = RoundDatetime(5);
-            currFilter.DtStart = RoundDatetime(5).AddDays(-1);
+            currFilter.DtStart = RoundDatetime(5).AddDays(-10);
         }
 
         protected void UpdateTotCount(int newTotCount)

MP.SPEC/Pages/PARAMS.razor

@@ -25,7 +25,7 @@
         }
         else
         {
-            <ListPARAMS SelFilter="@currFilter" TotRecordChanged="@updateTotal" RecordSel="@detailSel"></ListPARAMS>
+            <ListPARAMS SelFilter="@currFilter" TotRecordChanged="@UpdateTotCount" RecordSel="@detailSel"></ListPARAMS>
         }
     </div>
     <div class="card-footer py-1">

MP.SPEC/Pages/PARAMS.razor.cs

@@ -15,8 +15,6 @@ namespace MP.SPEC.Pages
 
         #region Protected Properties
 
-        [Inject]
-        protected MessageService MsgService { get; set; } = null!;
 
         #endregion Protected Properties
 
@@ -43,9 +41,6 @@ namespace MP.SPEC.Pages
         {
             isLoading = true;
             isFiltering = true;
-            // disabilito ricerca...
-            MsgService.SearchVal = "";
-            MsgService.ShowSearch = false;
             // fix pagina
             await Task.Delay(1);
             var modFilter = currFilter;
@@ -100,8 +95,8 @@ namespace MP.SPEC.Pages
 
         private int currPage
         {
-            get => MsgService.currPage;
-            set => MsgService.currPage = value;
+            get => currFilter.CurrPage;
+            set => currFilter.CurrPage = value;
         }
 
         private bool isFiltering { get; set; } = false;
@@ -109,8 +104,8 @@ namespace MP.SPEC.Pages
 
         private int numRecord
         {
-            get => MsgService.numRecord;
-            set => MsgService.numRecord = value;
+            get => currFilter.NumRec;
+            set => currFilter.NumRec = value;
         }
 
         private int totalCount { get; set; } = 0;
@@ -139,7 +134,10 @@ namespace MP.SPEC.Pages
             currFilter = newParams;
             isLoading = false;
         }
-
+        protected void UpdateTotCount(int newTotCount)
+        {
+            totalCount = newTotCount;
+        }
         #endregion Private Methods
     }
 }

MP.SPEC/Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2210.1910</h4>
+    <h4>Versione: 6.16.2210.2017</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

MP.SPEC/Resources/VersNum.txt

@@ -1 +1 @@
-6.16.2210.1910
+6.16.2210.2017

MP.SPEC/Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2210.1910</version>
+  <version>6.16.2210.2017</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>