diff --git a/MP.INVE/Components/InveSessionList.razor b/MP.INVE/Components/InveSessionList.razor new file mode 100644 index 00000000..011126d6 --- /dev/null +++ b/MP.INVE/Components/InveSessionList.razor @@ -0,0 +1,147 @@ +@if (reqNew) +{ +
+
+
+
+
+ Avvia una nuova sessione +
+
+ @*@if (isEditing) + { + PENDING CHANGES... + }*@ +
+
+
+
+
+
+ Magazzino + +
+
+
+
+ Descrizione + +
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+ @if (magazzino != -1) + { +
+ +
+ } +
+
+
+
+
+
+} + + + + @if (inCorso) + { + + } + + + + + + + + + + + + @if (elencoSessioni != null) + { + @foreach (var item in elencoSessioni) + { + + @if (inCorso) + { + + } + + + + + + @if (item.DtEnd != null) + { + + } + else + { + + } + + + + + + } + } + +
QRID sessioneMagazzinoOperatoreData inizioData fineDescriptionTrasferita
+ + + + @item.InveSessID + + @item.AnagMagNav.DescMag + + @item.UserCrea + + @item.DtStart + + @item.DtEnd + + In corso... + + @item.Description + + @if (item.Transferred) + { + + } + else + { + + + } + + +
\ No newline at end of file diff --git a/MP.INVE/Components/InveSessionList.razor.cs b/MP.INVE/Components/InveSessionList.razor.cs new file mode 100644 index 00000000..4b2b75e4 --- /dev/null +++ b/MP.INVE/Components/InveSessionList.razor.cs @@ -0,0 +1,88 @@ +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.Components +{ + public partial class InveSessionList + { + + + private bool reqNew { get; set; } = false; + private string matrOpr { get; set; } = ""; + private int magazzino { get; set; } = 0; + private string desc { get; set; } = ""; + + private int totalCount + { + get => currParams.TotCount; + set => currParams.TotCount = value; + } + private int numRecord + { + get => currParams.NumRec; + set + { + currParams.NumRec = value; + StateHasChanged(); + } + } + private int currPage + { + get => currParams.CurrPage; + set + { + currParams.CurrPage = value; + StateHasChanged(); + } + } + + private async Task reloadData() + { + elencoSessioni = null; + isLoading = true; + if (inCorso) + { + SearchRecords = MIDataservice.InventSessCurrList(); + } + else + { + SearchRecords = MIDataservice.InventSessHistList(dtStart, dtEnd); + } + totalCount = SearchRecords.Count; + elencoSessioni = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + await Task.Delay(1); + await InvokeAsync(() => StateHasChanged()); + await Task.Delay(1); + isLoading = false; + } + + [Parameter] + public DataPagerParams currParams { get; set; } = null!; + + [Parameter] + public bool isLoading { get; set; } + [Parameter] + public bool isCorso { get; set; } + + private List? elencoSessioni; + private List? SearchRecords; + private List? elencoOperatori; + private List? elencoMagazzini; + } +} \ No newline at end of file diff --git a/MP.INVE/Pages/Session.razor b/MP.INVE/Pages/InveSession.razor similarity index 94% rename from MP.INVE/Pages/Session.razor rename to MP.INVE/Pages/InveSession.razor index 738d2ada..af52cbc1 100644 --- a/MP.INVE/Pages/Session.razor +++ b/MP.INVE/Pages/InveSession.razor @@ -32,7 +32,8 @@ } else { - @if (reqNew) + + @*@if (reqNew) {
@@ -43,10 +44,6 @@ Avvia una nuova sessione
- @*@if (isEditing) - { - PENDING CHANGES... - }*@
@@ -179,12 +176,13 @@ } } - + *@ }
- + @**@ +
diff --git a/MP.INVE/Pages/Session.razor.cs b/MP.INVE/Pages/InveSession.razor.cs similarity index 95% rename from MP.INVE/Pages/Session.razor.cs rename to MP.INVE/Pages/InveSession.razor.cs index 158411d3..6408bdc5 100644 --- a/MP.INVE/Pages/Session.razor.cs +++ b/MP.INVE/Pages/InveSession.razor.cs @@ -21,12 +21,12 @@ using Blazored.LocalStorage; namespace MP.INVE.Pages { - public partial class Session + public partial class InveSession { [Inject] private MiDataService MIDataservice { get; set; } = null!; - DataPagerParams currParams = new DataPagerParams(); + private DataPagerParams currParams = new DataPagerParams(); private List? elencoSessioni; private List? SearchRecords; @@ -39,8 +39,8 @@ namespace MP.INVE.Pages { //await FilterChanged.InvokeAsync(actFilter); await getId(); - await Task.Delay(1); - await reloadData(); + //await Task.Delay(1); + //await reloadData(); } private bool inCorso { get; set; } = true; @@ -118,11 +118,14 @@ namespace MP.INVE.Pages } } - private bool reqNew { get; set; } = false; private bool isLoading { get; set; } = false; +#if false + private bool reqNew { get; set; } = false; private string matrOpr { get; set; } = ""; private int magazzino { get; set; } = 0; - private string desc { get; set; } = ""; + private string desc { get; set; } = ""; +#endif +#if false private int totalCount { get => currParams.TotCount; @@ -145,10 +148,12 @@ namespace MP.INVE.Pages currParams.CurrPage = value; StateHasChanged(); } - } + } +#endif private async Task reloadData() { +#if false elencoSessioni = null; isLoading = true; if (inCorso) @@ -164,7 +169,8 @@ namespace MP.INVE.Pages await Task.Delay(1); await InvokeAsync(() => StateHasChanged()); await Task.Delay(1); - isLoading = false; + isLoading = false; +#endif } protected async Task getCurrSess(int idSess) { @@ -185,13 +191,11 @@ namespace MP.INVE.Pages protected void ForceReload(int newNum) { numRecord = newNum; - StateHasChanged(); } protected void ForceReloadPage(int newNum) { currPage = newNum; - StateHasChanged(); } protected override async Task OnParametersSetAsync() { diff --git a/MP.INVE/Shared/NavMenu.razor b/MP.INVE/Shared/NavMenu.razor index 8239343d..0dec7c4b 100644 --- a/MP.INVE/Shared/NavMenu.razor +++ b/MP.INVE/Shared/NavMenu.razor @@ -43,7 +43,7 @@
- +
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 5c91363a..8fbc1f10 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2211.1812 + 6.16.2211.1814 diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index b67818df..dd494459 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2211.1812

+

Versione: 6.16.2211.1814


Note di rilascio:
  • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 0ee1ca7e..18ada50d 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2211.1812 +6.16.2211.1814 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index ce27159a..1803ddcb 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2211.1812 + 6.16.2211.1814 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