diff --git a/MP.INVE/Components/ListQrOpr.razor b/MP.INVE/Components/ListQrOpr.razor index 0a35a81b..bf07395a 100644 --- a/MP.INVE/Components/ListQrOpr.razor +++ b/MP.INVE/Components/ListQrOpr.razor @@ -1,6 +1,6 @@ @if (elencoOperatori != null) { -
+
@foreach (var item in elencoOperatori) { diff --git a/MP.INVE/Components/ListQrOpr.razor.cs b/MP.INVE/Components/ListQrOpr.razor.cs index 7817e756..c4aa1df3 100644 --- a/MP.INVE/Components/ListQrOpr.razor.cs +++ b/MP.INVE/Components/ListQrOpr.razor.cs @@ -18,15 +18,11 @@ namespace MP.INVE.Components [Parameter] public EventCallback TotalChanged { get; set; } - - private SelectQrOperatoreParams? lastParams { get; set; } = null; - #endregion Public Properties #region Protected Fields protected List? elencoOperatori = new List(); - protected List? SearchRecords = new List(); #endregion Protected Fields @@ -67,19 +63,9 @@ namespace MP.INVE.Components #region Protected Methods - //protected override async Task OnAfterRenderAsync(bool firstRender) - //{ - // await Task.Delay(50); - // if (firstRender) - // { - // //await reloadData(true); - // } - //} - protected override async Task OnParametersSetAsync() { - bool doReload = lastParams == null; - if (doReload || !currParams.Equals(lastParams)) + if (lastParams == null || !currParams.Equals(lastParams)) { lastParams = currParams.Clone(); await reloadData(true); @@ -93,7 +79,6 @@ namespace MP.INVE.Components private string _authKey = ""; private int _idOperatore = 0; - private int _totalCount = 0; #endregion Private Fields @@ -108,6 +93,8 @@ namespace MP.INVE.Components get => currParams.CurrPage; } + private SelectQrOperatoreParams? lastParams { get; set; } = null; + private int numRecord { get => currParams.NumRec; diff --git a/MP.INVE/Components/ListScan.razor b/MP.INVE/Components/ListScan.razor index 7cc8ac6d..23f37bbd 100644 --- a/MP.INVE/Components/ListScan.razor +++ b/MP.INVE/Components/ListScan.razor @@ -39,8 +39,6 @@
- - } } diff --git a/MP.INVE/Components/ListScan.razor.cs b/MP.INVE/Components/ListScan.razor.cs index 40456e7d..93b53d68 100644 --- a/MP.INVE/Components/ListScan.razor.cs +++ b/MP.INVE/Components/ListScan.razor.cs @@ -40,7 +40,7 @@ namespace MP.INVE.Components #region Private Fields - private List? elencoSCAN; + private List? elencoSCAN { get; set; } = null; #endregion Private Fields diff --git a/MP.INVE/Components/ProcOperat.razor.cs b/MP.INVE/Components/ProcOperat.razor.cs index 521a728a..99112847 100644 --- a/MP.INVE/Components/ProcOperat.razor.cs +++ b/MP.INVE/Components/ProcOperat.razor.cs @@ -1,42 +1,35 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Components; -using System.Net.Http; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components.Routing; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.Web.Virtualization; using Microsoft.JSInterop; -using MP.INVE; -using MP.INVE.Shared; -using MP.INVE.Components; using MP.Data.DatabaseModels; using MP.INVE.Data; -using MP.INVE.Pages; namespace MP.INVE.Components { public partial class ProcOperat { - [Parameter] - public AnagUdcModel UDC { get; set; } = null!; - [Parameter] - public string userScan { get; set; } = null!; - [Parameter] - public int sessID { get; set; } = 0; + #region Public Properties + + [Inject] + public IJSRuntime JSRuntime { get; set; } = null!; [Inject] public MiDataService MIService { get; set; } = null!; - [Inject] - public IJSRuntime JSRuntime { get; set; } = null!; - [Inject] - public NavigationManager NavManager{ get; set; } = null!; - private bool isForced = false; + [Inject] + public NavigationManager NavManager { get; set; } = null!; + + [Parameter] + public int sessID { get; set; } = 0; + + [Parameter] + public AnagUdcModel UDC { get; set; } = null!; + + [Parameter] + public string userScan { get; set; } = null!; + + #endregion Public Properties + + #region Protected Methods protected async void insertSession() { @@ -65,7 +58,8 @@ namespace MP.INVE.Components { NavManager.NavigateTo(NavManager.Uri, true); } - } + + #endregion Protected Methods } } \ No newline at end of file diff --git a/MP.INVE/Components/ProcOperatore.razor.cs b/MP.INVE/Components/ProcOperatore.razor.cs index 4eefb1a7..cea01089 100644 --- a/MP.INVE/Components/ProcOperatore.razor.cs +++ b/MP.INVE/Components/ProcOperatore.razor.cs @@ -60,6 +60,7 @@ namespace MP.INVE.Components { operatoreScelto = elencoOperatori.Where(x => x.MatrOpr == int.Parse(lastScanOperatore)).FirstOrDefault(); } + await Task.Delay(1); } public int MatrOpr { get; set; } = 0; public int InveSessID { get; set; } = 0; diff --git a/MP.INVE/Data/MessageService.cs b/MP.INVE/Data/MessageService.cs index 948b53f4..ea2a9c29 100644 --- a/MP.INVE/Data/MessageService.cs +++ b/MP.INVE/Data/MessageService.cs @@ -31,7 +31,7 @@ namespace MP.INVE.Data } catch (Exception exc) { - //Log.Error($"Eccezione in clearLocalStorage{Environment.NewLine}{exc}"); + Log.Error($"Eccezione in clearLocalStorage{Environment.NewLine}{exc}"); } return answ; } @@ -63,148 +63,5 @@ namespace MP.INVE.Data return answ; } -#if false - - public event Action EA_PageUpdated = null!; - - public event Action EA_SearchUpdated = null!; - - public event Action EA_ShowSearch = null!; - - public event Action EA_StatoSearch = null!; - - public int currPage - { - get => _currPage; - set - { - if (_currPage != value) - { - _currPage = value; - if (EA_PageUpdated != null) - { - EA_PageUpdated?.Invoke(); - } - } - } - } - - public int numRecord - { - get => _numRecord; - set - { - if (_numRecord != value) - { - _numRecord = value; - if (EA_PageUpdated != null) - { - EA_PageUpdated?.Invoke(); - } - } - } - } - - public string SearchVal - { - get => searchVal; - set - { - //if (_nome != value) - //{ - searchVal = value; - - if (EA_SearchUpdated != null) - { - EA_SearchUpdated?.Invoke(); - } - //} - } - } - - public bool ShowSearch - { - get => showSearch; - set - { - if (showSearch != value) - { - showSearch = value; - if (EA_ShowSearch != null) - { - EA_ShowSearch?.Invoke(); - } - } - } - } - - public string StateSel - { - get => stateSel; - set - { - stateSel = value; - - if (EA_StatoSearch != null) - { - EA_StatoSearch?.Invoke(); - } - } - } - - public string TipoSearch - { - get => tipoSearch; - set - { - if (tipoSearch != value) - { - tipoSearch = value; - if (EA_ShowSearch != null) - { - EA_ShowSearch?.Invoke(); - } - } - } - } - - public int totalCount - { - get => _totalCount; - set - { - if (_totalCount != value) - { - _totalCount = value; - } - } - } - - protected void reportPaging() - { - if (EA_PageUpdated != null) - { - EA_PageUpdated?.Invoke(); - } - } - - protected void reportSearch() - { - if (EA_SearchUpdated != null) - { - EA_SearchUpdated?.Invoke(); - } - } - - private string searchVal = ""; - private bool showSearch; - private string stateSel = "*"; - private string tipoSearch = ""; - - private int _currPage { get; set; } = 1; - - private int _numRecord { get; set; } = 10; - private int _totalCount { get; set; } = 0; -#endif } } \ No newline at end of file diff --git a/MP.INVE/MP.INVE.csproj b/MP.INVE/MP.INVE.csproj index 60f976f6..cd303f6f 100644 --- a/MP.INVE/MP.INVE.csproj +++ b/MP.INVE/MP.INVE.csproj @@ -5,7 +5,7 @@ enable enable MP.INVE - 6.16.2409.408 + 6.16.2410.2811 @@ -32,6 +32,7 @@ + diff --git a/MP.INVE/Pages/ElencoMagazzini.razor.cs b/MP.INVE/Pages/ElencoMagazzini.razor.cs index 9f7c2aad..e4a3032d 100644 --- a/MP.INVE/Pages/ElencoMagazzini.razor.cs +++ b/MP.INVE/Pages/ElencoMagazzini.razor.cs @@ -25,38 +25,39 @@ namespace MP.INVE.Pages { public partial class ElencoMagazzini { - [Inject] - private IConfiguration Configuration { get; set; } = null!; - - [Inject] - private ISessionStorageService sessionStorage { get; set; } = null!; - [Inject] - private ILocalStorageService localStorage { get; set; } = null!; - - [Inject] - private MiDataService MIDataservice { get; set; } = null!; - - [Inject] - private NavigationManager NavManager { get; set; } = null!; + #region Public Fields public SelectMagListParams currParams = new SelectMagListParams(); - private int totalCount + #endregion Public Fields + + #region Protected Methods + + protected void ForceReload(int newNum) { - get => currParams.TotCount; - set => currParams.TotCount = value; + numRecord = newNum; } - private int numRecord + + protected void ForceReloadPage(int newNum) { - get => currParams.NumRec; - set - { - if (currParams.NumRec != value) - { - currParams.NumRec = value; - } - } + currPage = newNum; } + + protected override async Task OnParametersSetAsync() + { + await reloadData(); + await Task.Delay(1); + } + + #endregion Protected Methods + + #region Private Properties + + private string codMag { get; set; } = ""; + + [Inject] + private IConfiguration Configuration { get; set; } = null!; + private int currPage { get => currParams.CurrPage; @@ -68,11 +69,9 @@ namespace MP.INVE.Pages } } } - private bool reqNew - { - get => currParams.reqNew; - set => currParams.reqNew = value; - } + + private string desc { get; set; } = ""; + private bool inCorso { get => currParams.inCorso; @@ -83,21 +82,50 @@ namespace MP.INVE.Pages currParams.inCorso = value; } } - } - private List? ListaMagazzini; + private bool isLoading { get; set; } = false; - protected override async Task OnParametersSetAsync() + [Inject] + private ILocalStorageService localStorage { get; set; } = null!; + + [Inject] + private MiDataService MIDataservice { get; set; } = null!; + + [Inject] + private NavigationManager NavManager { get; set; } = null!; + + private int numRecord { - await reloadData(); - await Task.Delay(1); + get => currParams.NumRec; + set + { + if (currParams.NumRec != value) + { + currParams.NumRec = value; + } + } } - private void openNew() + private bool reqNew { - reqNew = true; + get => currParams.reqNew; + set => currParams.reqNew = value; } + + [Inject] + private ISessionStorageService sessionStorage { get; set; } = null!; + + private int totalCount + { + get => currParams.TotCount; + set => currParams.TotCount = value; + } + + #endregion Private Properties + + #region Private Methods + private void closeNew() { reqNew = false; @@ -105,15 +133,6 @@ namespace MP.INVE.Pages desc = ""; } - private async Task reloadData() - { - await Task.Delay(1); - //ListaMagazzini = null; - isLoading = true; - //ListaMagazzini = MIDataservice.MagazziniList(); - isLoading = false; - } - private async Task insertNewMag() { var alert = await JSRuntime.InvokeAsync("confirm", "Confermi di voler creare un nuovo magazzino?"); @@ -129,40 +148,25 @@ namespace MP.INVE.Pages }; await MIDataservice.InsertNewMag(newMag); NavManager.NavigateTo(NavManager.Uri, true); - //await MIDataservice.FlushRedisCache(); - //await reloadData(); } else { closeNew(); } } -#if false - private async Task deleteMag(AnagMagModel mag) + private void openNew() { - var alert = await JSRuntime.InvokeAsync("confirm", "Confermi di voler eliminare il magazzino selezionato?"); - if (alert) - { - await MIDataservice.DeleteMag(mag); - NavManager.NavigateTo("ElencoMagazzini", true); - await reloadData(); - } - } -#endif - protected void ForceReload(int newNum) - { - numRecord = newNum; + reqNew = true; } - protected void ForceReloadPage(int newNum) + private async Task reloadData() { - currPage = newNum; + isLoading = true; + await Task.Delay(1); + isLoading = false; } - private bool isLoading { get; set; } = false; - private string codMag { get; set; } = ""; - private string desc { get; set; } = ""; - + #endregion Private Methods } } \ No newline at end of file diff --git a/MP.INVE/Pages/Invio.razor.cs b/MP.INVE/Pages/Invio.razor.cs index 4e2bd6ca..4528a4c3 100644 --- a/MP.INVE/Pages/Invio.razor.cs +++ b/MP.INVE/Pages/Invio.razor.cs @@ -58,7 +58,7 @@ namespace MP.INVE.Pages protected async void ExportCSV() { var fullData = MIService.ExportSessionDetail(sessID); - await MP.Data.Utils.SaveToCsv(fullData, fullPath, ';'); + await Egw.Core.Utils.SaveToCsv(fullData, fullPath, ';'); await InvokeAsync(StateHasChanged); } diff --git a/MP.INVE/Pages/Jumper.razor.cs b/MP.INVE/Pages/Jumper.razor.cs index 1a8a52ec..d7362b47 100644 --- a/MP.INVE/Pages/Jumper.razor.cs +++ b/MP.INVE/Pages/Jumper.razor.cs @@ -19,6 +19,7 @@ namespace MP.INVE.Pages protected string codMag { get; set; } = ""; + protected AnagOperatoriModel currOpr { get; set; } = null!; protected string idOpr { get; set; } = ""; protected int inveSessionId { get; set; } = 0; @@ -29,12 +30,15 @@ namespace MP.INVE.Pages [Inject] protected MiDataService MIService { get; set; } = null!; + [Inject] protected MessageService MsgService { get; set; } = null!; [Inject] protected NavigationManager NavManager { get; set; } = null!; + protected string rawScan { get; set; } = null!; + [Inject] protected ISessionStorageService sessionStorage { get; set; } = null!; @@ -74,47 +78,8 @@ namespace MP.INVE.Pages codMag = _codMag; } } - -#if false - if (!string.IsNullOrEmpty(idOpr) && !string.IsNullOrEmpty(authKey)) - { - isFullUrl = true; - string pw = MIService.DeriptData(authKey); - logged = MIService.loginOperatore(int.Parse(idOpr), pw); - - if (logged) - { - operatore = MIService.ElencoOperatori(); - if (operatore != null) - { - AnagOperatoriModel? currOpr = operatore.Where(x => (x.MatrOpr == int.Parse(idOpr)) && (x.authKey == pw)).SingleOrDefault(); - - if (currOpr != null) - { - string hash = MIService.EncriptData(currOpr.authKey); - OperatoreDTO sessionOpr = new OperatoreDTO - { - MatrOpr = currOpr.MatrOpr, - Nome = currOpr.Nome, - Cognome = currOpr.Cognome, - hashAuthKey = hash, - dtExp = DateTime.Now.AddMinutes(1) - }; - -#if false - await localStorage.SetItemAsync("MatrOpr", currOpr); -#endif - await MsgService.setCurrOperDtoAsync(sessionOpr); - await sessionStorage.SetItemAsync("idSessione", inveSessionId); - } - NavManager.NavigateTo($"Acquisizione?idSess={inveSessionId}&idOpr={idOpr}&codMag={codMag}"); - } - } - } -#endif } - string json = ""; - Dictionary uriProcDict = new Dictionary(); + protected void saveScan(string newScan) { //uriProcDict.Clear(); @@ -140,18 +105,18 @@ namespace MP.INVE.Pages else { rawScan = uriProcDict["IdSessione"]; - } + } #endif rawScan = newScan; } } - protected string rawScan { get; set; } = null!; - protected AnagOperatoriModel currOpr { get; set; } = null!; + #endregion Protected Methods #region Private Fields private List operatore = new List(); + private Dictionary uriProcDict = new Dictionary(); #endregion Private Fields diff --git a/MP.INVE/Pages/OperatoreLogin.razor.cs b/MP.INVE/Pages/OperatoreLogin.razor.cs index 7cdb4d99..22f3eeed 100644 --- a/MP.INVE/Pages/OperatoreLogin.razor.cs +++ b/MP.INVE/Pages/OperatoreLogin.razor.cs @@ -66,26 +66,26 @@ namespace MP.INVE.Pages { logged = MIDataservice.loginOperatore(idOperatore, authKey); - AnagOperatoriModel? currOpr = elencoOperatori.Where(x => (x.MatrOpr == idOperatore) && (x.authKey == authKey)).SingleOrDefault(); - - if (logged) + if (elencoOperatori != null) { - if (currOpr != null) + AnagOperatoriModel? currOpr = elencoOperatori.Where(x => (x.MatrOpr == idOperatore) && (x.authKey == authKey)).SingleOrDefault(); + + if (logged) { - string hash = MIDataservice.EncriptData(currOpr.authKey); - OperatoreDTO sessionOpr = new OperatoreDTO + if (currOpr != null) { - MatrOpr = currOpr.MatrOpr, - Nome = currOpr.Nome, - Cognome = currOpr.Cognome, - hashAuthKey = hash, - dtExp = DateTime.Now.AddMinutes(1) - }; -#if false - localStorage.SetItemAsync("MatrOpr", sessionOpr); -#endif - await MsgService.setCurrOperDtoAsync(sessionOpr); - NavManager.NavigateTo("InveSession", true); + string hash = MIDataservice.EncriptData(currOpr.authKey); + OperatoreDTO sessionOpr = new OperatoreDTO + { + MatrOpr = currOpr.MatrOpr, + Nome = currOpr.Nome, + Cognome = currOpr.Cognome, + hashAuthKey = hash, + dtExp = DateTime.Now.AddMinutes(1) + }; + await MsgService.setCurrOperDtoAsync(sessionOpr); + NavManager.NavigateTo("InveSession", true); + } } } } diff --git a/MP.INVE/Pages/Test.razor b/MP.INVE/Pages/Test.razor deleted file mode 100644 index 8f230945..00000000 --- a/MP.INVE/Pages/Test.razor +++ /dev/null @@ -1,95 +0,0 @@ -@page "/Test" -@*
-
-
-
UDC Già presente
-
-
-
-
-
-
SEMI LAVORATO
-
-
-
-
-
-
UDC NUOVO
-
-
-
-
-
-
LOTTO
-
-
-
-
-
-
LOTTO Già presente
-
-
-
-
-
-
-
-
-
ARTICOLO GIUSTO
-
-
-
-
-
-
ARTICOLO SBAGLIATO
-
-
-
-
-
*@ - - - - - - - - - - @if (elencoSCAN != null) - { - @foreach (var item in elencoSCAN) - { - - - - - - - } - } - -
Oggetto
-
-
- Cod: @item.ScanValue -
-
- Lotto: @item.Lotto -
-
-
-
- Art: @item.CodArticolo -
-
- Qty: @Math.Round(item.Qty, 0) -
-
- 		-
- -
-
diff --git a/MP.INVE/Pages/Test.razor.cs b/MP.INVE/Pages/Test.razor.cs deleted file mode 100644 index 45c98884..00000000 --- a/MP.INVE/Pages/Test.razor.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Components; -using System.Net.Http; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components.Routing; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.Web.Virtualization; -using Microsoft.JSInterop; -using MP.INVE; -using MP.INVE.Shared; -using MP.INVE.Components; -using MP.INVE.Data; -using MP.Data.DatabaseModels; - -namespace MP.INVE.Pages -{ - public partial class Test - { - [Inject] - MiDataService MIService { get; set; } = null!; - [Inject] - IJSRuntime JSRuntime { get; set; } = null!; - - protected string rawScan { get; set; } = null!; - - List? elencoSCAN; - protected override async Task OnParametersSetAsync() - { - await Task.Delay(1); - - } - - protected override async Task OnAfterRenderAsync(bool firstRender) - { - //if (firstRender) - //{ - // await JSRuntime.InvokeVoidAsync("clearContent", $"qrCodeImg_{101}"); - // await JSRuntime.InvokeVoidAsync("displayQr", $"qrCodeImg_{101}", "20MFI000000001"); - // await JSRuntime.InvokeVoidAsync("clearContent", $"qrCodeImg_{102}"); - // await JSRuntime.InvokeVoidAsync("displayQr", $"qrCodeImg_{102}", "20MSL000000002"); - // await JSRuntime.InvokeVoidAsync("clearContent", $"qrCodeImg_{103}"); - // await JSRuntime.InvokeVoidAsync("displayQr", $"qrCodeImg_{103}", "21MFI000000017"); - - // await JSRuntime.InvokeVoidAsync("clearContent", $"qrCodeImg_{104}"); - // await JSRuntime.InvokeVoidAsync("displayQr", $"qrCodeImg_{104}", "M200000019"); - - // await JSRuntime.InvokeVoidAsync("clearContent", $"qrCodeImg_{105}"); - // await JSRuntime.InvokeVoidAsync("displayQr", $"qrCodeImg_{105}", "M210000055"); - - // await JSRuntime.InvokeVoidAsync("clearContent", $"qrCodeImg_{106}"); - // await JSRuntime.InvokeVoidAsync("displayQr", $"qrCodeImg_{106}", "027407"); - - // await JSRuntime.InvokeVoidAsync("clearContent", $"qrCodeImg_{107}"); - // await JSRuntime.InvokeVoidAsync("displayQr", $"qrCodeImg_{107}", "ABCDE"); - //} - } - - protected void saveScan(string newScan) - { - if (!string.IsNullOrEmpty(newScan)) - { - rawScan = newScan; - elencoSCAN = MIService.ScanList().Where(x => x.ScanValue == newScan).ToList(); - } - } - protected async Task deleteScan(ScanDataModel scan) - { - await MIService.deleteScansione(scan); - } - private string CodUDC { get; set; } = null!; - } -} \ No newline at end of file diff --git a/MP.INVE/Resources/ChangeLog.html b/MP.INVE/Resources/ChangeLog.html index b166755d..3317bfd8 100644 --- a/MP.INVE/Resources/ChangeLog.html +++ b/MP.INVE/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOINVE -

Versione: 6.16.2409.408

+

Versione: 6.16.2410.2811


Note di rilascio:
  • diff --git a/MP.INVE/Resources/VersNum.txt b/MP.INVE/Resources/VersNum.txt index 9fd70b9c..02a9b1b9 100644 --- a/MP.INVE/Resources/VersNum.txt +++ b/MP.INVE/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2409.408 +6.16.2410.2811 diff --git a/MP.INVE/Resources/manifest.xml b/MP.INVE/Resources/manifest.xml index 9866626f..e513eaad 100644 --- a/MP.INVE/Resources/manifest.xml +++ b/MP.INVE/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2409.408 + 6.16.2410.2811 https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/MP.INVE.zip https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/ChangeLog.html false diff --git a/MP.INVE/Shared/NavMenu.razor.cs b/MP.INVE/Shared/NavMenu.razor.cs index 0fd17647..b2703688 100644 --- a/MP.INVE/Shared/NavMenu.razor.cs +++ b/MP.INVE/Shared/NavMenu.razor.cs @@ -1,57 +1,61 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Components; -using System.Net.Http; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components.Routing; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.Web.Virtualization; -using Microsoft.JSInterop; -using MP.INVE; -using MP.INVE.Shared; -using MP.INVE.Components; -using MP.INVE.Data; -using MP.Data.DTO; using Blazored.LocalStorage; +using Microsoft.AspNetCore.Components; namespace MP.INVE.Shared { public partial class NavMenu { - private bool collapseNavMenu = true; - //public List? ElencoLink { get; set; } - private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; - private void ToggleNavMenu() - { - collapseNavMenu = !collapseNavMenu; - } + #region Public Properties + [Parameter] + public EventCallback EC_compressUpdated { get; set; } - protected override async Task OnInitializedAsync() - { - // recupero elenco JQM - //ElencoLink = await MDService.ElencoLink(); - } + #endregion Public Properties + + #region Protected Properties + + protected string hideText { get => showText ? "" : "invisible"; } + + [Inject] + protected ILocalStorageService localStorage { get; set; } = null!; + + [Inject] + protected NavigationManager NavigationManager { get; set; } = null!; protected bool showText { get; set; } = true; + + #endregion Protected Properties + + #region Protected Methods + protected void ToggleCompress() { showText = !showText; EC_compressUpdated.InvokeAsync(showText); } - protected string hideText { get => showText ? "" : "invisible"; } + #endregion Protected Methods - [Parameter] - public EventCallback EC_compressUpdated { get; set; } - [Inject] - protected ILocalStorageService localStorage { get; set; } = null!; - [Inject] - protected NavigationManager NavigationManager { get; set; } = null!; + #region Private Fields + private bool collapseNavMenu = true; + + #endregion Private Fields + + #region Private Properties + + //public List? ElencoLink { get; set; } + private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; + + #endregion Private Properties + + #region Private Methods + + private void ToggleNavMenu() + { + collapseNavMenu = !collapseNavMenu; + } + + #endregion Private Methods } } \ No newline at end of file diff --git a/MP.INVE/temp/2.csv b/MP.INVE/temp/2.csv new file mode 100644 index 00000000..b8186166 --- /dev/null +++ b/MP.INVE/temp/2.csv @@ -0,0 +1,7 @@ +InveSessId;Description;UserCrea;DtStart;DtEnd;CodMag;DescMag;ScanId;DtScan;ScanValue;Lotto;CodArticolo;DescrArt;CodArtExt;CodStato;Qty;UserScan;Note +2;prova n2;Zaccaria;10/11/2022 10:00:00;04/01/2023 12:57:48;00004;Magazzino Qualità;53;13/12/2022 14:33:27;21MFI000000017;M210000022;60652;GUARNIZIONE 3 STOP;60652;FIN;100,000000;103; +2;prova n2;Zaccaria;10/11/2022 10:00:00;04/01/2023 12:57:48;00004;Magazzino Qualità;54;13/12/2022 14:33:37;M210000063;M210000063;60644;SCHAUM ZWST AUSSTROMER MIT KLEBER PROJECT CRAFTER;60644;FIN;0,000000;103; +2;prova n2;Zaccaria;10/11/2022 10:00:00;04/01/2023 12:57:48;00004;Magazzino Qualità;55;13/12/2022 14:34:00;M210000063;M210000063;60644;SCHAUM ZWST AUSSTROMER MIT KLEBER PROJECT CRAFTER;60644;FIN;93939,000000;103; +2;prova n2;Zaccaria;10/11/2022 10:00:00;04/01/2023 12:57:48;00004;Magazzino Qualità;56;13/12/2022 14:35:42;21MFI000000019;M210000023;AC31973128;MICROPES 2075N 250\10 H110CM SP10 + ADESIVO GL;AC31973128;FIN;200,000000;103; +2;prova n2;Zaccaria;10/11/2022 10:00:00;04/01/2023 12:57:48;00004;Magazzino Qualità;57;13/12/2022 14:36:24;d;d;60737;TEPPICH FUER HSK KAPPE;60737;FIN;898950,000000;103; +2;prova n2;Zaccaria;10/11/2022 10:00:00;04/01/2023 12:57:48;00004;Magazzino Qualità;58;13/12/2022 14:36:57;d;d;60737;TEPPICH FUER HSK KAPPE;60737;FIN;898950,000000;103;test note