From 21303b50a5ba1c81bd189af0d66caeb903ddb5b2 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 14:44:00 +0200 Subject: [PATCH 1/3] abbozzata aggiunta pagine statistiche --- MP-STATS.sln | 2 +- MP.Stats/Pages/Controlli.razor | 58 ++++++++++-- MP.Stats/Pages/Controlli.razor.cs | 147 ++++++++++++++++++++++++++++++ MP.Stats/Pages/UserLog.razor | 59 ++++++++++++ MP.Stats/Pages/UserLog.razor.cs | 147 ++++++++++++++++++++++++++++++ 5 files changed, 405 insertions(+), 8 deletions(-) create mode 100644 MP.Stats/Pages/Controlli.razor.cs create mode 100644 MP.Stats/Pages/UserLog.razor create mode 100644 MP.Stats/Pages/UserLog.razor.cs diff --git a/MP-STATS.sln b/MP-STATS.sln index c8630043..3b5b6475 100644 --- a/MP-STATS.sln +++ b/MP-STATS.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31229.75 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP-STATS", "MP.Stats\MP.Stats.csproj", "{D9901B50-E61C-400C-B62C-FA060CF72C29}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Stats", "MP.Stats\MP.Stats.csproj", "{D9901B50-E61C-400C-B62C-FA060CF72C29}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data.csproj", "{10BA8450-301D-49C7-8E1E-21B7469C225C}" EndProject diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index 0c0fb7b2..d05728d7 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -4,12 +4,56 @@ @using MP.Stats.Data
-
Controlli
+
Scarti
- elenco controlli + @if (currRecord != null) + { + @**@ + } + @if (ListRecords == null) + { +

Loading...

+ } + else + { + + + + @**@ + + + + + + + + + + + @foreach (var record in ListRecords) + { + + @**@ + + + + + + + + + } + +
MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
 @record.IdxMacchina@record.DataOra@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.Descrizione@record.CodArticolo@record.MatrOpr
+ }
-
- -@code { - -} \ No newline at end of file +
+
+
+
+
+ +
+
+
+ \ No newline at end of file diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs new file mode 100644 index 00000000..951382ea --- /dev/null +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -0,0 +1,147 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; +using MP.Stats.Data; +using System; +using System.Threading.Tasks; + +namespace MP.Stats.Pages +{ + public partial class Controlli : ComponentBase, IDisposable + { + #region Private Fields + + private MP.Data.DatabaseModels.ResScarti currRecord = null; + + private MP.Data.DatabaseModels.ResScarti[] ListRecords; + + #endregion Private Fields + + #region Private Properties + + private int numRecord { get; set; } = 10; + + #endregion Private Properties + + #region Protected Properties + + [Inject] + protected IJSRuntime JSRuntime { get; set; } + + [Inject] + protected MessageService MessageService { get; set; } + + [Inject] + protected NavigationManager NavManager { get; set; } + + [Inject] + protected MpStatsService StatService { get; set; } + + #endregion Protected Properties + + #region Protected Methods + + protected async Task ForceReload(int newNum) + { + numRecord = newNum; + ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + } + + protected override async Task OnInitializedAsync() + { + numRecord = 10; + MessageService.ShowSearch = true; + MessageService.EA_SearchUpdated += OnSeachUpdated; + ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + } + + protected void ResetData() + { + StatService.rollBackEdit(currRecord); + currRecord = null; + } + + protected async Task UpdateData() + { + currRecord = null; + ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + } + + #endregion Protected Methods + + #region Public Methods + + public string checkSelect(DateTime DataOra, string IdxMacchina, string Causale) + { + string answ = ""; + if (currRecord != null) + { + try + { + answ = (currRecord.DataOra == DataOra && currRecord.IdxMacchina == IdxMacchina && currRecord.Causale == Causale) ? "table-info" : ""; + } + catch + { } + } + return answ; + } + + public void Dispose() + { + MessageService.EA_SearchUpdated -= OnSeachUpdated; + } + + public void OnSeachUpdated() + { + InvokeAsync(() => + { + UpdateData(); + StateHasChanged(); + }); + } + + #endregion Public Methods + +#if false + [Inject] + protected BBM_SelectData SelectData { get; set; } + + protected void CreateNew() + { + // recupero counter + string newCode = BBMService.CounterGetNext("EGW.B", 6); + DatabaseModels.BasketsModel newRecord = new DatabaseModels.BasketsModel() + { + CodBasket = newCode, + DataIns = DateTime.Now, + CustomerId = 1, + Descript = "New Basket" + }; + currBasket = newRecord; + } + + protected async Task Delete(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) + { + if (!await JSRuntime.InvokeAsync("confirm", $"Sicuro di voler eliminare il Basket '{currRecord.CodBasket}'?")) + return; + + BBMService.BasketsDelete(currRecord); + await UpdateData(); + } + + protected void Edit(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) + { + currBasket = currRecord; + } + + protected void ShowDocs(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) + { + // salvo + SelectData.BasketId = currRecord.BasketId; + SelectData.NegotiationId = 0; + // rimando... + NavManager.NavigateTo("docs"); + } + +#endif + } +} \ No newline at end of file diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor new file mode 100644 index 00000000..31097de1 --- /dev/null +++ b/MP.Stats/Pages/UserLog.razor @@ -0,0 +1,59 @@ +@page "/userlog" + +@using MP.Stats.Components +@using MP.Stats.Data + +
+
Scarti
+
+ @if (currRecord != null) + { + @**@ + } + @if (ListRecords == null) + { +

Loading...

+ } + else + { + + + + @**@ + + + + + + + + + + + @foreach (var record in ListRecords) + { + + @**@ + + + + + + + + + } + +
MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
 @record.IdxMacchina@record.DataOra@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.Descrizione@record.CodArticolo@record.MatrOpr
+ } +
+
+
+
+
+
+ +
+
+
+
\ No newline at end of file diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs new file mode 100644 index 00000000..963b85a7 --- /dev/null +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -0,0 +1,147 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; +using MP.Stats.Data; +using System; +using System.Threading.Tasks; + +namespace MP.Stats.Pages +{ + public partial class UserLog : ComponentBase, IDisposable + { + #region Private Fields + + private MP.Data.DatabaseModels.ResScarti currRecord = null; + + private MP.Data.DatabaseModels.ResScarti[] ListRecords; + + #endregion Private Fields + + #region Private Properties + + private int numRecord { get; set; } = 10; + + #endregion Private Properties + + #region Protected Properties + + [Inject] + protected IJSRuntime JSRuntime { get; set; } + + [Inject] + protected MessageService MessageService { get; set; } + + [Inject] + protected NavigationManager NavManager { get; set; } + + [Inject] + protected MpStatsService StatService { get; set; } + + #endregion Protected Properties + + #region Protected Methods + + protected async Task ForceReload(int newNum) + { + numRecord = newNum; + ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + } + + protected override async Task OnInitializedAsync() + { + numRecord = 10; + MessageService.ShowSearch = true; + MessageService.EA_SearchUpdated += OnSeachUpdated; + ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + } + + protected void ResetData() + { + StatService.rollBackEdit(currRecord); + currRecord = null; + } + + protected async Task UpdateData() + { + currRecord = null; + ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + } + + #endregion Protected Methods + + #region Public Methods + + public string checkSelect(DateTime DataOra, string IdxMacchina, string Causale) + { + string answ = ""; + if (currRecord != null) + { + try + { + answ = (currRecord.DataOra == DataOra && currRecord.IdxMacchina == IdxMacchina && currRecord.Causale == Causale) ? "table-info" : ""; + } + catch + { } + } + return answ; + } + + public void Dispose() + { + MessageService.EA_SearchUpdated -= OnSeachUpdated; + } + + public void OnSeachUpdated() + { + InvokeAsync(() => + { + UpdateData(); + StateHasChanged(); + }); + } + + #endregion Public Methods + +#if false + [Inject] + protected BBM_SelectData SelectData { get; set; } + + protected void CreateNew() + { + // recupero counter + string newCode = BBMService.CounterGetNext("EGW.B", 6); + DatabaseModels.BasketsModel newRecord = new DatabaseModels.BasketsModel() + { + CodBasket = newCode, + DataIns = DateTime.Now, + CustomerId = 1, + Descript = "New Basket" + }; + currBasket = newRecord; + } + + protected async Task Delete(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) + { + if (!await JSRuntime.InvokeAsync("confirm", $"Sicuro di voler eliminare il Basket '{currRecord.CodBasket}'?")) + return; + + BBMService.BasketsDelete(currRecord); + await UpdateData(); + } + + protected void Edit(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) + { + currBasket = currRecord; + } + + protected void ShowDocs(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) + { + // salvo + SelectData.BasketId = currRecord.BasketId; + SelectData.NegotiationId = 0; + // rimando... + NavManager.NavigateTo("docs"); + } + +#endif + } +} \ No newline at end of file From d3b5811cdccc3add63dcf4254401a5b6277fbcda Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 15:05:40 +0200 Subject: [PATCH 2/3] Bozza pagine completata --- MP.Data/Controllers/MpStatsController.cs | 44 +++++++++++++++++- MP.Stats/Data/MpStatsService.cs | 16 +++++-- MP.Stats/Pages/Controlli.razor | 14 +++--- MP.Stats/Pages/Controlli.razor.cs | 57 +++--------------------- MP.Stats/Pages/Index.razor | 2 +- MP.Stats/Pages/Scarti.razor.cs | 49 ++------------------ MP.Stats/Pages/UserLog.razor | 16 +++---- MP.Stats/Pages/UserLog.razor.cs | 57 +++--------------------- MP.Stats/Shared/NavMenu.razor | 2 +- 9 files changed, 89 insertions(+), 168 deletions(-) diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 0b1d43eb..b8f59321 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -43,7 +43,7 @@ namespace MP.Data.Controllers /// /// /// - public bool rollBackEntity(object item) + public bool RollBackEntity(object item) { bool answ = false; try @@ -60,13 +60,33 @@ namespace MP.Data.Controllers return answ; } + /// + /// Elenco tabella controlli da filtro + /// + /// + /// + /// + public List StatControlliGetAll(int numRecord, string searchVal = "") + { + List dbResult = new List(); + + dbResult = dbCtx + .DbSetControlli + .Where(x => x.Note.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + .OrderByDescending(x => x.DataOra) + .Take(numRecord) + .ToList(); + + return dbResult; + } + /// /// Elenco tabella scarti da filtro /// /// /// /// - public List ScartiGetAll(int numRecord, string searchVal = "") + public List StatScartiGetAll(int numRecord, string searchVal = "") { List dbResult = new List(); @@ -80,6 +100,26 @@ namespace MP.Data.Controllers return dbResult; } + /// + /// Elenco tabella UserLog da filtro + /// + /// + /// + /// + public List StatUserLogGetAll(int numRecord, string searchVal = "") + { + List dbResult = new List(); + + dbResult = dbCtx + .DbSetUserLog + .Where(x => x.Valore.Contains(searchVal) || x.Cognome.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + .OrderByDescending(x => x.DataOraRif) + .Take(numRecord) + .ToList(); + + return dbResult; + } + #endregion Public Methods } } \ No newline at end of file diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 5c0c2570..34b74b1a 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -59,12 +59,22 @@ namespace MP.Stats.Data public void rollBackEdit(object item) { - dbController.rollBackEntity(item); + dbController.RollBackEntity(item); } - public Task ScartiGetAll(int numRecord, string searchVal = "") + public Task StatControlliGetAll(int numRecord, string searchVal = "") { - return Task.FromResult(dbController.ScartiGetAll(numRecord, searchVal).ToArray()); + return Task.FromResult(dbController.StatControlliGetAll(numRecord, searchVal).ToArray()); + } + + public Task StatScartiGetAll(int numRecord, string searchVal = "") + { + return Task.FromResult(dbController.StatScartiGetAll(numRecord, searchVal).ToArray()); + } + + public Task StatUserLogGetAll(int numRecord, string searchVal = "") + { + return Task.FromResult(dbController.StatUserLogGetAll(numRecord, searchVal).ToArray()); } #endregion Public Methods diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index d05728d7..72afd5a9 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -4,7 +4,7 @@ @using MP.Stats.Data
-
Scarti
+
Controlli
@if (currRecord != null) { @@ -24,22 +24,22 @@ Data ODL/Commessa Articolo - Descrizione - Qta + Esito + Note Operatore @foreach (var record in ListRecords) { - + @* *@ @record.IdxMacchina @record.DataOra - @record.IdxOdl | @record.KeyRichiesta - @record.CodArticolo - @record.Descrizione + @record.IdxOdl @record.CodArticolo + @record.EsitoOk + @record.Note @record.MatrOpr } diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index 951382ea..53842097 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -10,9 +10,9 @@ namespace MP.Stats.Pages { #region Private Fields - private MP.Data.DatabaseModels.ResScarti currRecord = null; + private MP.Data.DatabaseModels.ResControlli currRecord = null; - private MP.Data.DatabaseModels.ResScarti[] ListRecords; + private MP.Data.DatabaseModels.ResControlli[] ListRecords; #endregion Private Fields @@ -43,7 +43,7 @@ namespace MP.Stats.Pages protected async Task ForceReload(int newNum) { numRecord = newNum; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal); } protected override async Task OnInitializedAsync() @@ -51,7 +51,7 @@ namespace MP.Stats.Pages numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal); } protected void ResetData() @@ -63,21 +63,21 @@ namespace MP.Stats.Pages protected async Task UpdateData() { currRecord = null; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal); } #endregion Protected Methods #region Public Methods - public string checkSelect(DateTime DataOra, string IdxMacchina, string Causale) + public string checkSelect(int IdxControllo) { string answ = ""; if (currRecord != null) { try { - answ = (currRecord.DataOra == DataOra && currRecord.IdxMacchina == IdxMacchina && currRecord.Causale == Causale) ? "table-info" : ""; + answ = (currRecord.IdxControllo == IdxControllo) ? "table-info" : ""; } catch { } @@ -100,48 +100,5 @@ namespace MP.Stats.Pages } #endregion Public Methods - -#if false - [Inject] - protected BBM_SelectData SelectData { get; set; } - - protected void CreateNew() - { - // recupero counter - string newCode = BBMService.CounterGetNext("EGW.B", 6); - DatabaseModels.BasketsModel newRecord = new DatabaseModels.BasketsModel() - { - CodBasket = newCode, - DataIns = DateTime.Now, - CustomerId = 1, - Descript = "New Basket" - }; - currBasket = newRecord; - } - - protected async Task Delete(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - if (!await JSRuntime.InvokeAsync("confirm", $"Sicuro di voler eliminare il Basket '{currRecord.CodBasket}'?")) - return; - - BBMService.BasketsDelete(currRecord); - await UpdateData(); - } - - protected void Edit(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - currBasket = currRecord; - } - - protected void ShowDocs(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - // salvo - SelectData.BasketId = currRecord.BasketId; - SelectData.NegotiationId = 0; - // rimando... - NavManager.NavigateTo("docs"); - } - -#endif } } \ No newline at end of file diff --git a/MP.Stats/Pages/Index.razor b/MP.Stats/Pages/Index.razor index 91a38f96..14365445 100644 --- a/MP.Stats/Pages/Index.razor +++ b/MP.Stats/Pages/Index.razor @@ -27,7 +27,7 @@
Main Topics
- + @**@ diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index 2a8a3d36..2f95202e 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -43,7 +43,7 @@ namespace MP.Stats.Pages protected async Task ForceReload(int newNum) { numRecord = newNum; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatScartiGetAll(numRecord, MessageService.SearchVal); } protected override async Task OnInitializedAsync() @@ -51,7 +51,7 @@ namespace MP.Stats.Pages numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatScartiGetAll(numRecord, MessageService.SearchVal); } protected void ResetData() @@ -63,7 +63,7 @@ namespace MP.Stats.Pages protected async Task UpdateData() { currRecord = null; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatScartiGetAll(numRecord, MessageService.SearchVal); } #endregion Protected Methods @@ -100,48 +100,5 @@ namespace MP.Stats.Pages } #endregion Public Methods - -#if false - [Inject] - protected BBM_SelectData SelectData { get; set; } - - protected void CreateNew() - { - // recupero counter - string newCode = BBMService.CounterGetNext("EGW.B", 6); - DatabaseModels.BasketsModel newRecord = new DatabaseModels.BasketsModel() - { - CodBasket = newCode, - DataIns = DateTime.Now, - CustomerId = 1, - Descript = "New Basket" - }; - currBasket = newRecord; - } - - protected async Task Delete(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - if (!await JSRuntime.InvokeAsync("confirm", $"Sicuro di voler eliminare il Basket '{currRecord.CodBasket}'?")) - return; - - BBMService.BasketsDelete(currRecord); - await UpdateData(); - } - - protected void Edit(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - currBasket = currRecord; - } - - protected void ShowDocs(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - // salvo - SelectData.BasketId = currRecord.BasketId; - SelectData.NegotiationId = 0; - // rimando... - NavManager.NavigateTo("docs"); - } - -#endif } } \ No newline at end of file diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index 31097de1..193069f7 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -4,7 +4,7 @@ @using MP.Stats.Data
-
Scarti
+
User Log
@if (currRecord != null) { @@ -24,23 +24,23 @@ Data ODL/Commessa Articolo + Azione Descrizione - Qta Operatore @foreach (var record in ListRecords) { - + @* *@ @record.IdxMacchina - @record.DataOra - @record.IdxOdl | @record.KeyRichiesta + @record.DataOraRif + - @record.CodArticolo - @record.Descrizione - @record.CodArticolo - @record.MatrOpr + @record.Azione + @record.Valore + @record.Cognome @record.Nome } diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs index 963b85a7..a343b2dd 100644 --- a/MP.Stats/Pages/UserLog.razor.cs +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -10,9 +10,9 @@ namespace MP.Stats.Pages { #region Private Fields - private MP.Data.DatabaseModels.ResScarti currRecord = null; + private MP.Data.DatabaseModels.UserActionLog currRecord = null; - private MP.Data.DatabaseModels.ResScarti[] ListRecords; + private MP.Data.DatabaseModels.UserActionLog[] ListRecords; #endregion Private Fields @@ -43,7 +43,7 @@ namespace MP.Stats.Pages protected async Task ForceReload(int newNum) { numRecord = newNum; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatUserLogGetAll(numRecord, MessageService.SearchVal); } protected override async Task OnInitializedAsync() @@ -51,7 +51,7 @@ namespace MP.Stats.Pages numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatUserLogGetAll(numRecord, MessageService.SearchVal); } protected void ResetData() @@ -63,21 +63,21 @@ namespace MP.Stats.Pages protected async Task UpdateData() { currRecord = null; - ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatUserLogGetAll(numRecord, MessageService.SearchVal); } #endregion Protected Methods #region Public Methods - public string checkSelect(DateTime DataOra, string IdxMacchina, string Causale) + public string checkSelect(int IdxLog) { string answ = ""; if (currRecord != null) { try { - answ = (currRecord.DataOra == DataOra && currRecord.IdxMacchina == IdxMacchina && currRecord.Causale == Causale) ? "table-info" : ""; + answ = (currRecord.IdxLog == IdxLog) ? "table-info" : ""; } catch { } @@ -100,48 +100,5 @@ namespace MP.Stats.Pages } #endregion Public Methods - -#if false - [Inject] - protected BBM_SelectData SelectData { get; set; } - - protected void CreateNew() - { - // recupero counter - string newCode = BBMService.CounterGetNext("EGW.B", 6); - DatabaseModels.BasketsModel newRecord = new DatabaseModels.BasketsModel() - { - CodBasket = newCode, - DataIns = DateTime.Now, - CustomerId = 1, - Descript = "New Basket" - }; - currBasket = newRecord; - } - - protected async Task Delete(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - if (!await JSRuntime.InvokeAsync("confirm", $"Sicuro di voler eliminare il Basket '{currRecord.CodBasket}'?")) - return; - - BBMService.BasketsDelete(currRecord); - await UpdateData(); - } - - protected void Edit(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - currBasket = currRecord; - } - - protected void ShowDocs(SHERPA.BBM.DatabaseModels.BasketsModel currRecord) - { - // salvo - SelectData.BasketId = currRecord.BasketId; - SelectData.NegotiationId = 0; - // rimando... - NavManager.NavigateTo("docs"); - } - -#endif } } \ No newline at end of file diff --git a/MP.Stats/Shared/NavMenu.razor b/MP.Stats/Shared/NavMenu.razor index a2d36f59..78ef73f4 100644 --- a/MP.Stats/Shared/NavMenu.razor +++ b/MP.Stats/Shared/NavMenu.razor @@ -18,7 +18,7 @@
  • - + User ActionLog
    • From ea6911080e46e31f7615e37fd81468c3de2727b6 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 15:26:07 +0200 Subject: [PATCH 3/3] review page loader progressbar --- MP.Stats/Pages/Controlli.razor | 2 +- MP.Stats/Pages/Scarti.razor | 2 +- MP.Stats/Pages/UserLog.razor | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index 72afd5a9..0aea2bac 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -12,7 +12,7 @@ } @if (ListRecords == null) { -

    Loading...

    +
    } else { diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index c6503e13..513ece02 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -12,7 +12,7 @@ } @if (ListRecords == null) { -

    Loading...

    +
    } else { diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index 193069f7..cd9a068c 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -12,7 +12,7 @@ } @if (ListRecords == null) { -

    Loading...

    +
    } else {