diff --git a/MP.Data/Controllers/MpInveController.cs b/MP.Data/Controllers/MpInveController.cs index 922bf910..59591e41 100644 --- a/MP.Data/Controllers/MpInveController.cs +++ b/MP.Data/Controllers/MpInveController.cs @@ -28,6 +28,34 @@ namespace MP.Data.Controllers _configuration = null; } + + #region gestione config + + /// + /// Elenco da tabella Config + /// + /// + public List ConfigGetAll() + { + List dbResult = new List(); + using (var dbCtx = new MoonProContext(_configuration)) + { + dbResult = dbCtx + .DbSetConfig + .AsNoTracking() + .OrderBy(x => x.Chiave) + .ToList(); + } + return dbResult; + } + #endregion gestione config + + + + + + + /// /// Elenco Scansioni dato Id sessione inventario /// diff --git a/MP.Data/DTO/OperatoreDTO.cs b/MP.Data/DTO/OperatoreDTO.cs index eb421c5b..da56411d 100644 --- a/MP.Data/DTO/OperatoreDTO.cs +++ b/MP.Data/DTO/OperatoreDTO.cs @@ -12,5 +12,6 @@ namespace MP.Data.DTO public string Cognome { get; set; } = ""; public string Nome { get; set; } = ""; public string hashAuthKey { get; set; } = ""; + public DateTime dtExp { get; set; } } } diff --git a/MP.INVE/Components/CmpTop.razor.cs b/MP.INVE/Components/CmpTop.razor.cs index 262b05f0..3eb00344 100644 --- a/MP.INVE/Components/CmpTop.razor.cs +++ b/MP.INVE/Components/CmpTop.razor.cs @@ -40,6 +40,8 @@ namespace MP.INVE.Components #region Protected Methods + //&& !(answ.dtExp < DateTime.Now) + protected async Task getId() { OperatoreDTO answ = new OperatoreDTO(); diff --git a/MP.INVE/Components/CodeScan.razor b/MP.INVE/Components/CodeScan.razor index 8bb24799..d60a1402 100644 --- a/MP.INVE/Components/CodeScan.razor +++ b/MP.INVE/Components/CodeScan.razor @@ -1,10 +1,3 @@ 
- +
- -@if (rawScan != null) -{ -
- -
-} \ No newline at end of file diff --git a/MP.INVE/Components/CodeScan.razor.cs b/MP.INVE/Components/CodeScan.razor.cs index 4c8b1654..d0719ee2 100644 --- a/MP.INVE/Components/CodeScan.razor.cs +++ b/MP.INVE/Components/CodeScan.razor.cs @@ -15,34 +15,47 @@ using MP.INVE; using MP.INVE.Shared; using MP.INVE.Components; using MP.INVE.Data; +using StackExchange.Redis; namespace MP.INVE.Components { public partial class CodeScan { // FIXME TODO creare evento x riportare scansione - + [Parameter] + public EventCallback lastRawScan { get; set; } /// /// Imposta il focus su input scansione /// protected void setFocus() - { - // all'apertura del componente --> focus su txtbox scan (e anche dopo input) + { + // all'apertura del componente --> focus su txtbox scan (e anche dopo input) } private ElementReference target; - protected string lastScan { get; set; } = ""; + //protected string lastScan { get; set; } = ""; public SelectScanParams currParams = new SelectScanParams(); - protected string rawScan + //protected string rawScan + //{ + // get => currParams.UDC; + // set => currParams.UDC = value; + //} + protected string _lastScan = ""; + protected string LastScan { - get => currParams.UDC; - set => currParams.UDC = value; + get => _lastScan; + set + { + _lastScan = value; + saveSel(LastScan); + } } + protected override async Task OnAfterRenderAsync(bool firstRender) { if (firstRender) @@ -50,6 +63,12 @@ namespace MP.INVE.Components await target.FocusAsync(); } } + + private void saveSel(string scanToSend) + { + //LastScan = scanToSend; + Task.FromResult(lastRawScan.InvokeAsync(scanToSend)); + } } } \ No newline at end of file diff --git a/MP.INVE/Components/ProcSuggestion.razor b/MP.INVE/Components/ProcSuggestion.razor index 1c3820f8..2c48c865 100644 --- a/MP.INVE/Components/ProcSuggestion.razor +++ b/MP.INVE/Components/ProcSuggestion.razor @@ -10,52 +10,29 @@ @if (udc != null) { -
- @* -
- - @udc.UDC - - - @tipo - -
*@ -
-
    -
  • - Lotto: -
    - - @tipo -
    -
    • -
  • - Articolo: -
    - - -
    -
    • -
  • - Quantità: -
    - - -
    -
    • -
-
- +
    +
  • + Lotto: +
    + + @tipo
    -
-
-
- Last scan: @udc.UDC + +
  • + Articolo: +
    + +
    -
    • -
    - - + +
  • + Quantità: +
    + + +
    +
    • + } else { diff --git a/MP.INVE/Components/ProcSuggestion.razor.cs b/MP.INVE/Components/ProcSuggestion.razor.cs index 8125c9ea..4085063f 100644 --- a/MP.INVE/Components/ProcSuggestion.razor.cs +++ b/MP.INVE/Components/ProcSuggestion.razor.cs @@ -23,14 +23,8 @@ namespace MP.INVE.Components { [Inject] private MiDataService MIService { get; set; } = null!; - [Parameter] - public SelectScanParams currParams { get; set; } = null!; - protected string rawScan - { - get => currParams.UDC; - set => currParams.UDC = value; - } + public string lastScan { get; set; } = null!; private string tipo { get; set; } = ""; public List? searchrecords; @@ -38,10 +32,9 @@ namespace MP.INVE.Components protected override async Task OnParametersSetAsync() { - //await FilterChanged.InvokeAsync(actFilter); await Task.Delay(1); searchrecords = MIService.ElencoUDC(); - udc = searchrecords.Where(x => x.UDC == rawScan).FirstOrDefault(); + udc = searchrecords.Where(x => x.UDC == lastScan).FirstOrDefault(); if (udc != null) { diff --git a/MP.INVE/MP.INVE.csproj b/MP.INVE/MP.INVE.csproj index 2988c20a..158704a5 100644 --- a/MP.INVE/MP.INVE.csproj +++ b/MP.INVE/MP.INVE.csproj @@ -5,7 +5,7 @@ enable enable MP.INVE - 6.16.2211.2916 + 6.16.2212.212 diff --git a/MP.INVE/Pages/Acquisizione.razor b/MP.INVE/Pages/Acquisizione.razor index 7d5ced7c..d93521cf 100644 --- a/MP.INVE/Pages/Acquisizione.razor +++ b/MP.INVE/Pages/Acquisizione.razor @@ -6,5 +6,26 @@

    Acquisizione

    - +
    +
    +
    + @*if (rawScan != null) + { + }*@ +
    + +
    + @if (rawScan != null) + { +
    + +
    + } +
    +
    +
    + Last scan: @rawScan +
    +
    +
    \ No newline at end of file diff --git a/MP.INVE/Pages/Acquisizione.razor.cs b/MP.INVE/Pages/Acquisizione.razor.cs index b797884c..c50cce10 100644 --- a/MP.INVE/Pages/Acquisizione.razor.cs +++ b/MP.INVE/Pages/Acquisizione.razor.cs @@ -33,12 +33,16 @@ namespace MP.INVE.Pages private SelectScanParams currParams = new SelectScanParams(); private bool logged { get;set; } = false; - + protected string rawScan { get; set; } = null!; protected string idOPeratore { get; set; } = null!; protected string authKey { get; set; } = null!; protected override async Task OnInitializedAsync() { } - protected DateTime? lastScan { get; set; } = null; + protected void saveScan(string newScan) + { + rawScan = newScan; + } + //protected DateTime? lastScan { get; set; } = null; } } \ No newline at end of file diff --git a/MP.INVE/Pages/Jumper.razor.cs b/MP.INVE/Pages/Jumper.razor.cs index e5ec42ee..7969d480 100644 --- a/MP.INVE/Pages/Jumper.razor.cs +++ b/MP.INVE/Pages/Jumper.razor.cs @@ -62,7 +62,8 @@ namespace MP.INVE.Pages MatrOpr = currOpr.MatrOpr, Nome = currOpr.Nome, Cognome = currOpr.Cognome, - hashAuthKey = hash + hashAuthKey = hash, + dtExp = DateTime.Now.AddMinutes(1) }; await localStorage.SetItemAsync("MatrOpr", currOpr); diff --git a/MP.INVE/Pages/OperatoreLogin.razor b/MP.INVE/Pages/OperatoreLogin.razor index 9d0e9867..15e1aa06 100644 --- a/MP.INVE/Pages/OperatoreLogin.razor +++ b/MP.INVE/Pages/OperatoreLogin.razor @@ -5,50 +5,58 @@
    -
    -
    -

    login Operatore

    -
    -
    -
    -
    -
    - -
    + @if (isLoading) + { + + } + else + { -
    - + @if (elencoOperatori != null) { - + @foreach (var item in elencoOperatori) + { + + } } - } - + +
    +
    -
    -
    -
    -
    -
    - - +
    +
    +
    + + +
    +
    -
    -
    -
    -
    -
    - -
    -
    +
    +
    +
    + +
    +
    +
    -
    + }
    diff --git a/MP.INVE/Pages/OperatoreLogin.razor.cs b/MP.INVE/Pages/OperatoreLogin.razor.cs index bdc5f655..9af22264 100644 --- a/MP.INVE/Pages/OperatoreLogin.razor.cs +++ b/MP.INVE/Pages/OperatoreLogin.razor.cs @@ -48,14 +48,17 @@ namespace MP.INVE.Pages private string _authKey { get; set; } = ""; private bool logged { get; set; } = false; + private bool isLoading { get; set; } = false; private List? elencoOperatori; protected override async Task OnInitializedAsync() { + isLoading = true; //await FilterChanged.InvokeAsync(actFilter); await Task.Delay(1); elencoOperatori = MIDataservice.ElencoOperatori(); + isLoading = false; } private void login() @@ -74,7 +77,8 @@ namespace MP.INVE.Pages MatrOpr = currOpr.MatrOpr, Nome = currOpr.Nome, Cognome = currOpr.Cognome, - hashAuthKey = hash + hashAuthKey = hash, + dtExp = DateTime.Now.AddMinutes(1) }; localStorage.SetItemAsync("MatrOpr", sessionOpr); NavManager.NavigateTo("InveSession", true); diff --git a/MP.INVE/Resources/ChangeLog.html b/MP.INVE/Resources/ChangeLog.html index 33a30497..245b1b4a 100644 --- a/MP.INVE/Resources/ChangeLog.html +++ b/MP.INVE/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOINVE -

    Versione: 6.16.2211.2916

    +

    Versione: 6.16.2212.212


    Note di rilascio:
    • diff --git a/MP.INVE/Resources/VersNum.txt b/MP.INVE/Resources/VersNum.txt index 20db0176..f4a200e2 100644 --- a/MP.INVE/Resources/VersNum.txt +++ b/MP.INVE/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2211.2916 +6.16.2212.212 diff --git a/MP.INVE/Resources/manifest.xml b/MP.INVE/Resources/manifest.xml index a6165706..d78259b6 100644 --- a/MP.INVE/Resources/manifest.xml +++ b/MP.INVE/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2211.2916 + 6.16.2212.212 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