diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs
index 5f9d9162..6f1b20e6 100644
--- a/MP.SPEC/Pages/PODL.razor.cs
+++ b/MP.SPEC/Pages/PODL.razor.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Components;
+using Blazored.LocalStorage;
+using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using MP.Data.DatabaseModels;
using MP.SPEC.Components;
@@ -12,7 +13,7 @@ namespace MP.SPEC.Pages
{
#region Protected Fields
- protected DataPager pagerODL = null!;
+ protected DataPager? pagerODL = null!;
protected bool reqNew = false;
@@ -23,6 +24,9 @@ namespace MP.SPEC.Pages
[Inject]
protected IJSRuntime JSRuntime { get; set; } = null!;
+ [Inject]
+ protected ILocalStorageService localStorage { get; set; } = null!;
+
[Inject]
protected MpDataService MDService { get; set; } = null!;
@@ -66,8 +70,24 @@ namespace MP.SPEC.Pages
currPage = newNum;
}
+ protected async Task getReparto()
+ {
+ string keyStor = "reparto";
+ string localReparto = await localStorage.GetItemAsync
(keyStor);
+ if (!string.IsNullOrEmpty(localReparto))
+ {
+ selReparto = localReparto;
+ }
+ else
+ {
+ selReparto = "*";
+ await localStorage.SetItemAsync(keyStor, selReparto);
+ }
+ }
+
protected override async Task OnInitializedAsync()
{
+ await getReparto();
ListAziende = await MDService.ElencoAziende();
var allGruppiData = await MDService.ElencoGruppiFase();
if (allGruppiData != null)
@@ -76,16 +96,7 @@ namespace MP.SPEC.Pages
}
ListMacchine = await MDService.MacchineGetAll();
ListStati = await MDService.AnagStatiComm();
- SearchRecords = await MDService.ListPODLFilt(hasOdl, StatoSel, macchina, reparto);
-#if false
- // preselezione valori
- configData = await MDService.ConfigGetAll();
- var currRec = configData.FirstOrDefault(x => x.Chiave == "AZIENDA");
- if (currRec != null)
- {
- currAzienda = currRec.Valore;
- }
-#endif
+ SearchRecords = await MDService.ListPODLFilt(hasOdl, StatoSel, macchina, selReparto);
currAzienda = await MDService.tryGetConfig("AZIENDA");
padCodXdl = await MDService.tryGetConfig("padCodXdl");
// carico dati
@@ -97,7 +108,10 @@ namespace MP.SPEC.Pages
if (doReset)
{
await Task.Delay(1);
- pagerODL.resetCurrPage();
+ if (pagerODL != null)
+ {
+ pagerODL.resetCurrPage();
+ }
}
}
@@ -162,16 +176,6 @@ namespace MP.SPEC.Pages
hasOdl = !hasOdl;
await Task.Delay(1);
}
- private async Task updateFilter(SelectPOdlParams newParams)
- {
- isLoading = true;
- await Task.Delay(1);
- currPage = 1;
- await Task.Delay(1);
- await InvokeAsync(() => StateHasChanged());
- currFilter = newParams;
- isLoading = false;
- }
protected async Task update(PODLExpModel selRec)
{
@@ -198,24 +202,29 @@ namespace MP.SPEC.Pages
#region Private Fields
private static Logger Log = LogManager.GetCurrentClassLogger();
+
private PODLExpModel? _currRecord = null;
+
private PODLExpModel currRecordControlli = new PODLExpModel();
+
private List? ListArticoli;
+
private List? ListAziende;
+
private List? ListGruppiFase;
+
private List? ListMacchine;
+
private List? ListStati;
+
private List? SearchRecords;
#endregion Private Fields
-#if false
- private PODLModel? _currRecordControlli = null;
-#endif
-
#region Private Properties
private string _artSearch { get; set; } = "";
+
private string _currAzienda { get; set; } = "*";
private bool addEnabled
@@ -245,9 +254,6 @@ namespace MP.SPEC.Pages
get => currArticolo == "" ? "Sel Articolo" : "Nuovo PODL";
}
-#if false
- private List? configData { get; set; } = null;
-#endif
private string currArticolo { get; set; } = "";
private string currAzienda
@@ -280,7 +286,7 @@ namespace MP.SPEC.Pages
}
}
- private SelectPOdlParams currFilter { get; set; } = new SelectPOdlParams();
+ private SelectXdlParams currFilter { get; set; } = new SelectXdlParams();
private int currPage
{
@@ -300,18 +306,24 @@ namespace MP.SPEC.Pages
private bool hasOdl
{
- get => currFilter.hasOdl;
+ get => currFilter.HasOdl;
set
{
- if (currFilter.hasOdl != value)
+ if (currFilter.HasOdl != value)
{
- currFilter.hasOdl = value;
+ currFilter.HasOdl = value;
}
}
}
private bool isLoading { get; set; } = false;
+ private string macchina
+ {
+ get => currFilter.IdxMacchina;
+ set => currFilter.IdxMacchina = value;
+ }
+
private int numRecord
{
get => currFilter.NumRec;
@@ -320,29 +332,24 @@ namespace MP.SPEC.Pages
private string padCodXdl { get; set; } = "00000";
- private int totalCount
- {
- get => currFilter.TotCount;
- set => currFilter.TotCount = value;
- }
-
- private string macchina
- {
- get => currFilter.IdxMacchina;
- set => currFilter.IdxMacchina = value;
- }
-
- private string reparto
+ private string selReparto
{
get => currFilter.CodReparto;
set => currFilter.CodReparto = value;
}
+
private string StatoSel
{
get => currFilter.CodFase;
set => currFilter.CodFase = value;
}
+ private int totalCount
+ {
+ get => currFilter.TotCount;
+ set => currFilter.TotCount = value;
+ }
+
#endregion Private Properties
#region Private Methods
@@ -382,6 +389,19 @@ namespace MP.SPEC.Pages
isLoading = false;
}
+ private async Task updateFilter(SelectXdlParams newParams)
+ {
+ isLoading = true;
+ await Task.Delay(1);
+ currPage = 1;
+ // salvo comunque filtro reparto x utente
+ await localStorage.SetItemAsync("reparto", selReparto);
+ await Task.Delay(1);
+ await InvokeAsync(() => StateHasChanged());
+ currFilter = newParams;
+ isLoading = false;
+ }
+
#endregion Private Methods
}
}
\ No newline at end of file
diff --git a/MP.SPEC/Program.cs b/MP.SPEC/Program.cs
index 75d78ad3..acb4bdc5 100644
--- a/MP.SPEC/Program.cs
+++ b/MP.SPEC/Program.cs
@@ -1,3 +1,4 @@
+using Blazored.LocalStorage;
using Microsoft.AspNetCore.Authentication.Negotiate;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web;
@@ -38,6 +39,7 @@ builder.Services.AddServerSideBlazor();
builder.Services.AddSingleton(redisMultiplexer);
builder.Services.AddSingleton();
builder.Services.AddScoped();
+builder.Services.AddBlazoredLocalStorage();
builder.Services.AddHttpClient();
builder.Services.AddSingleton();
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 8f084fb1..a93c4d7d 100644
--- a/MP.SPEC/Resources/ChangeLog.html
+++ b/MP.SPEC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 6.16.2211.2508
+ Versione: 6.16.2211.2519
Note di rilascio:
-
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 232fe766..b8c8952b 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2211.2508
+6.16.2211.2519
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 91d7c675..6f3cb693 100644
--- a/MP.SPEC/Resources/manifest.xml
+++ b/MP.SPEC/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2211.2508
+ 6.16.2211.2519
https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip
https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html
false