diff --git a/SMGen.Core/Constants.cs b/SMGen.Core/Constants.cs index 640849a..6e99f37 100644 --- a/SMGen.Core/Constants.cs +++ b/SMGen.Core/Constants.cs @@ -21,6 +21,8 @@ namespace SMGen.Core public const string redisBaseAddr = "SMGEN"; public const string rKeyFiles = $"{redisBaseAddr}:Files"; public const string rKeyEventi = $"{redisBaseAddr}:Eventi"; + public const string rKeyFamIng = $"{redisBaseAddr}:FamIngressi"; + public const string rKeyFamStati = $"{redisBaseAddr}:FamStati"; } } diff --git a/SMGen.Data/Controllers/SMGenController.cs b/SMGen.Data/Controllers/SMGenController.cs index 8f7a49f..98177ab 100644 --- a/SMGen.Data/Controllers/SMGenController.cs +++ b/SMGen.Data/Controllers/SMGenController.cs @@ -47,6 +47,42 @@ namespace SMGen.Data.Controllers } return events; } + public List FamIngressiGetAll() + { + List dbResult = new List(); + using (SMGDataContext localDbCtx = new SMGDataContext(_configuration)) + { + try + { + dbResult = localDbCtx + .DbSetFamIngressi + .ToList(); + } + catch (Exception exc) + { + Log.Error($"Eccezione durante FamIngressiGetAll: {Environment.NewLine}{exc}"); + } + } + return dbResult; + } + public List FamStatiGetAll() + { + List dbResult = new List(); + using (SMGDataContext localDbCtx = new SMGDataContext(_configuration)) + { + try + { + dbResult = localDbCtx + .DbSetFamStati + .ToList(); + } + catch (Exception exc) + { + Log.Error($"Eccezione durante FamStatiGetAll: {Environment.NewLine}{exc}"); + } + } + return dbResult; + } /// /// Aggiunta in bulk delle transizioni/ingressi @@ -117,30 +153,6 @@ namespace SMGen.Data.Controllers .AddRange(newEvRecs); await localDbCtx.SaveChangesAsync(); fatto = true; - -#if false - foreach (var item in newEvRecs) - { - var currRec = localDbCtx - .DbSetAnagEventiTemp - .Where(x => (x.IdxTipo == item.IdxTipo)) - .FirstOrDefault(); - if (currRec != null) - { - currRec.Nome = item.Nome; - localDbCtx.Entry(currRec).State = EntityState.Modified; - } - else - { - - localDbCtx - .DbSetAnagEventiTemp - .Add(item); - } - } -#endif - await localDbCtx.SaveChangesAsync(); - fatto = true; Log.Info($"Gli stati sono OK!"); } catch (Exception exc) diff --git a/SMGen.Data/Data/SelectFamIngParams.cs b/SMGen.Data/Data/SelectFamIngParams.cs new file mode 100644 index 0000000..89a465e --- /dev/null +++ b/SMGen.Data/Data/SelectFamIngParams.cs @@ -0,0 +1,68 @@ +using NLog.LayoutRenderers.Wrappers; + +namespace SMGen.Data +{ + public class SelectFamIngParams + { + #region Public Constructors + + public SelectFamIngParams() + { } + + #endregion Public Constructors + + #region Public Properties + + + public int CurrPage { get; set; } = 1; + + public int MaxRecord { get; set; } = 100; + + public int NumRec { get; set; } = 10; + + public int TotCount { get; set; } = 0; + + #endregion Public Properties + + #region Public Methods + + public SelectFamIngParams clone() + { + SelectFamIngParams clonedData = new SelectFamIngParams() + { + CurrPage = this.CurrPage, + MaxRecord = this.MaxRecord, + NumRec = this.NumRec, + TotCount = this.TotCount + }; + return clonedData; + } + + public override bool Equals(object obj) + { + if (!(obj is SelectFamIngParams item)) + return false; + + if (MaxRecord != item.MaxRecord) + return false; + + if (NumRec != item.NumRec) + return false; + + if (TotCount != item.TotCount) + return false; + + if (CurrPage != item.CurrPage) + return false; + + return true; + } + + public override int GetHashCode() + { + return base.GetHashCode(); + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/SMGen.Data/Data/SelectFamStatiParams.cs b/SMGen.Data/Data/SelectFamStatiParams.cs new file mode 100644 index 0000000..9132292 --- /dev/null +++ b/SMGen.Data/Data/SelectFamStatiParams.cs @@ -0,0 +1,68 @@ +using NLog.LayoutRenderers.Wrappers; + +namespace SMGen.Data +{ + public class SelectFamStatiParams + { + #region Public Constructors + + public SelectFamStatiParams() + { } + + #endregion Public Constructors + + #region Public Properties + + + public int CurrPage { get; set; } = 1; + + public int MaxRecord { get; set; } = 100; + + public int NumRec { get; set; } = 10; + + public int TotCount { get; set; } = 0; + + #endregion Public Properties + + #region Public Methods + + public SelectFamStatiParams clone() + { + SelectFamStatiParams clonedData = new SelectFamStatiParams() + { + CurrPage = this.CurrPage, + MaxRecord = this.MaxRecord, + NumRec = this.NumRec, + TotCount = this.TotCount + }; + return clonedData; + } + + public override bool Equals(object obj) + { + if (!(obj is SelectFamStatiParams item)) + return false; + + if (MaxRecord != item.MaxRecord) + return false; + + if (NumRec != item.NumRec) + return false; + + if (TotCount != item.TotCount) + return false; + + if (CurrPage != item.CurrPage) + return false; + + return true; + } + + public override int GetHashCode() + { + return base.GetHashCode(); + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/SMGen.Data/DbModels/FamIngressiViewModel.cs b/SMGen.Data/DbModels/FamIngressiViewModel.cs new file mode 100644 index 0000000..a40296b --- /dev/null +++ b/SMGen.Data/DbModels/FamIngressiViewModel.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SMGen.Data.DbModels +{ + [Table("v_FamIngressi")] + public class FamIngressiViewModel + { + public int IdxFamigliaIngresso { get; set; } = 0; + public string DescrizioneIngresso { get; set; } = ""; + public int numTipoEv { get; set; } = 0; + public int numMStati { get; set; } = 0; + public int numRighe { get; set; } = 0; + } +} diff --git a/SMGen.Data/DbModels/FamStatiViewModel.cs b/SMGen.Data/DbModels/FamStatiViewModel.cs new file mode 100644 index 0000000..e0ffc56 --- /dev/null +++ b/SMGen.Data/DbModels/FamStatiViewModel.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SMGen.Data.DbModels +{ + [Table("v_FamStati")] + public class FamStatiViewModel + { + public int IdxFamiglia { get; set; } = 0; + public string Descrizione { get; set; } = ""; + public bool HasIOB { get; set; } = false; + public bool HasUDI { get; set; } = false; + public int numTipoEv { get; set; } = 0; + public int numMStati { get; set; } = 0; + public int numRighe { get; set; } = 0; + } +} diff --git a/SMGen.Data/SMGDataContext.cs b/SMGen.Data/SMGDataContext.cs index 0eb09b5..4269685 100644 --- a/SMGen.Data/SMGDataContext.cs +++ b/SMGen.Data/SMGDataContext.cs @@ -54,6 +54,8 @@ namespace SMGen.Data public virtual DbSet DbSetTranIngTemp { get; set; } = null!; public virtual DbSet DbSetAnagEventiTemp { get; set; } = null!; public virtual DbSet DbSetAnagEventi { get; set; } = null!; + public virtual DbSet DbSetFamIngressi { get; set; } = null!; + public virtual DbSet DbSetFamStati { get; set; } = null!; public void DbForceMigrate() { @@ -95,6 +97,13 @@ namespace SMGen.Data modelBuilder.UseCollation("Latin1_General_CI_AS"); modelBuilder.Entity().HasKey(c => new { c.IdxFamigliaIngresso, c.IdxMicroStato, c.ValoreIngresso }); + modelBuilder.Entity().ToView("v_FamIngressi"); + modelBuilder.Entity().HasNoKey(); + + + modelBuilder.Entity().ToView("v_FamStati"); + modelBuilder.Entity().HasNoKey(); + OnModelCreatingPartial(modelBuilder); } partial void OnModelCreatingPartial(ModelBuilder modelBuilder); diff --git a/SMGen.Data/Services/SMGDataService.cs b/SMGen.Data/Services/SMGDataService.cs index cfc1997..c499371 100644 --- a/SMGen.Data/Services/SMGDataService.cs +++ b/SMGen.Data/Services/SMGDataService.cs @@ -143,6 +143,95 @@ namespace SMGen.Data.Services } + public async Task> FamStatiGetAll() + { + string source = "DB"; + List dbResult = new List(); + try + { + // cerco da cache + string currKey = $"{Constants.rKeyFamStati}"; + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); + string? rawData = await redisDb.StringGetAsync(currKey); + if (!string.IsNullOrEmpty(rawData)) + { + source = "REDIS"; + var tempResult = JsonConvert.DeserializeObject>(rawData); + if (tempResult == null) + { + dbResult = new List(); + } + else + { + dbResult = tempResult; + } + } + else + { + dbResult = dbController.FamStatiGetAll(); + rawData = JsonConvert.SerializeObject(dbResult, JSSettings); + await redisDb.StringSetAsync(currKey, rawData, UltraLongCache); + } + if (dbResult == null) + { + dbResult = new List(); + } + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Debug($"FamStatiGetAll | {source} in: {ts.TotalMilliseconds} ms"); + } + catch (Exception exc) + { + Log.Error($"Exception during FamStatiGetAll: {exc}{Environment.NewLine}"); + } + return dbResult; + } + + public async Task> FamIngressiGetAll() + { + string source = "DB"; + List dbResult = new List(); + try + { + // cerco da cache + string currKey = $"{Constants.rKeyFamIng}"; + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); + string? rawData = await redisDb.StringGetAsync(currKey); + if (!string.IsNullOrEmpty(rawData)) + { + source = "REDIS"; + var tempResult = JsonConvert.DeserializeObject>(rawData); + if (tempResult == null) + { + dbResult = new List(); + } + else + { + dbResult = tempResult; + } + } + else + { + dbResult = dbController.FamIngressiGetAll(); + rawData = JsonConvert.SerializeObject(dbResult, JSSettings); + await redisDb.StringSetAsync(currKey, rawData, UltraLongCache); + } + if (dbResult == null) + { + dbResult = new List(); + } + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Debug($"FamIngressiGetAll | {source} in: {ts.TotalMilliseconds} ms"); + } + catch (Exception exc) + { + Log.Error($"Exception during FamIngressiGetAll: {exc}{Environment.NewLine}"); + } + return dbResult; + } public async Task> AnagEventiGetAll() { string source = "DB"; diff --git a/SMGen/Components/FamIngList.razor b/SMGen/Components/FamIngList.razor new file mode 100644 index 0000000..fbd8570 --- /dev/null +++ b/SMGen/Components/FamIngList.razor @@ -0,0 +1,23 @@ + + + + + + + + + + + + @foreach (var item in FamIngs) + { + + + + + + + + } + +
Idx famigliaDescrizione ingressoTotale eventiTotale statiRighe totali
@item.IdxFamigliaIngresso@item.DescrizioneIngresso@item.numTipoEv@item.numMStati@item.numRighe
\ No newline at end of file diff --git a/SMGen/Components/FamIngList.razor.cs b/SMGen/Components/FamIngList.razor.cs new file mode 100644 index 0000000..46bcf5e --- /dev/null +++ b/SMGen/Components/FamIngList.razor.cs @@ -0,0 +1,84 @@ +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 SMGen; +using SMGen.Shared; +using SMGen.Components; +using EgwCoreLib.Razor; +using EgwCoreLib.Razor.Data; +using SMGen.Data; +using SMGen.Core; +using SMGen.Data.DbModels; +using SMGen.Data.Controllers; +using SMGen.Data.Services; + +namespace SMGen.Components +{ + public partial class FamIngList + { + protected List FamIngs = new List(); + + protected List SearchRecords = new List(); + + [Parameter] + public SelectFamIngParams currFilter { get; set; } = null!; + + [Parameter] + public EventCallback PagerResetReq { get; set; } + + [Parameter] + public EventCallback updateRecordCount { get; set; } + + [Inject] + protected SMGDataService SMGDService{ get; set; } = null!; + private int _totalCount { get; set; } = 0; + + private int currPage + { + get => currFilter.CurrPage; + set => currFilter.CurrPage = value; + } + + private int numRecord + { + get => currFilter.NumRec; + set => currFilter.NumRec = value; + } + + private int totalCount + { + get => _totalCount; + set + { + if (_totalCount != value) + { + _totalCount = value; + updateRecordCount.InvokeAsync(value); + } + } + } + + protected override async Task OnParametersSetAsync() + { + await Task.Delay(1); + await ReloadData(); + } + protected async Task ReloadData() + { + SearchRecords = await SMGDService.FamIngressiGetAll(); + totalCount = SearchRecords.Count; + FamIngs = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + await InvokeAsync(() => StateHasChanged()); + } + } +} \ No newline at end of file diff --git a/SMGen/Components/FamStatiList.razor b/SMGen/Components/FamStatiList.razor new file mode 100644 index 0000000..bd1d66b --- /dev/null +++ b/SMGen/Components/FamStatiList.razor @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + @foreach (var item in FamIngs) + { + + + + + + + + + + } + +
Idx famigliaDescrizion ingressoIOBUDITotale eventiTotale statiRighe totali
@item.IdxFamiglia@item.Descrizione + @if (item.HasIOB) + { + + } + else + { + + } + + @if (item.HasUDI) + { + + } + else + { + + } + @item.numTipoEv@item.numMStati@item.numRighe
\ No newline at end of file diff --git a/SMGen/Components/FamStatiList.razor.cs b/SMGen/Components/FamStatiList.razor.cs new file mode 100644 index 0000000..84a1c90 --- /dev/null +++ b/SMGen/Components/FamStatiList.razor.cs @@ -0,0 +1,84 @@ +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 SMGen; +using SMGen.Shared; +using SMGen.Components; +using EgwCoreLib.Razor; +using EgwCoreLib.Razor.Data; +using SMGen.Data; +using SMGen.Core; +using SMGen.Data.DbModels; +using SMGen.Data.Controllers; +using SMGen.Data.Services; + +namespace SMGen.Components +{ + public partial class FamStatiList + { + protected List FamIngs = new List(); + + protected List SearchRecords = new List(); + + [Parameter] + public SelectFamStatiParams currFilter { get; set; } = null!; + + [Parameter] + public EventCallback PagerResetReq { get; set; } + + [Parameter] + public EventCallback updateRecordCount { get; set; } + + [Inject] + protected SMGDataService SMGDService{ get; set; } = null!; + private int _totalCount { get; set; } = 0; + + private int currPage + { + get => currFilter.CurrPage; + set => currFilter.CurrPage = value; + } + + private int numRecord + { + get => currFilter.NumRec; + set => currFilter.NumRec = value; + } + + private int totalCount + { + get => _totalCount; + set + { + if (_totalCount != value) + { + _totalCount = value; + updateRecordCount.InvokeAsync(value); + } + } + } + + protected override async Task OnParametersSetAsync() + { + await Task.Delay(1); + await ReloadData(); + } + protected async Task ReloadData() + { + SearchRecords = await SMGDService.FamStatiGetAll(); + totalCount = SearchRecords.Count; + FamIngs = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + await InvokeAsync(() => StateHasChanged()); + } + } +} \ No newline at end of file diff --git a/SMGen/Components/FilesList.razor.cs b/SMGen/Components/FilesList.razor.cs index 07cf95f..702df41 100644 --- a/SMGen/Components/FilesList.razor.cs +++ b/SMGen/Components/FilesList.razor.cs @@ -7,15 +7,14 @@ namespace SMGen.Components { public partial class FilesList { + protected FileLinesClass k = new FileLinesClass(); + [Parameter] public bool calcEmptyState { get; set; } = false; [Parameter] public bool calcItSelf { get; set; } = false; - [Parameter] - public Core.Enum.ORDERTYPE orderType { get; set; } = Core.Enum.ORDERTYPE.stateEvent; - [Parameter] public SelectSMIn2EvParams currFilter { get; set; } = null!; @@ -26,8 +25,13 @@ namespace SMGen.Components [Parameter] public bool hasBit { get; set; } = false; + [Parameter] + public Core.Enum.ORDERTYPE orderType { get; set; } = Core.Enum.ORDERTYPE.stateEvent; //[Parameter] //public Dictionary Files2Download { get; set; } = new Dictionary(); + + [Parameter] + public int succFiles { get; set; } = 0; [Parameter] public EventCallback PagerResetReq { get; set; } @@ -43,27 +47,7 @@ namespace SMGen.Components [Inject] protected SMGDataService SMGDService { get; set; } = null!; - - [Parameter] - public int succFiles { get; set; } = 0; - private int _totalCount { get; set; } = 0; - - protected FileLinesClass k = new FileLinesClass(); - - protected async Task doProc(FilesClass currFile) - { - await Task.Delay(1); - if (k.statesOK.Count <= 0 && k.eventsOK.Count <= 0 && k.lines.Count <= 0) - { - k = await SMGDService.DoCheckUnusedEvSt(currFile); - } - else - { - k = new FileLinesClass(); - } - } - private int currPage { get => currFilter.CurrPage; @@ -75,6 +59,7 @@ namespace SMGen.Components get => currFilter.NumRec; set => currFilter.NumRec = value; } + private int totalCount { get => _totalCount; @@ -88,6 +73,18 @@ namespace SMGen.Components } } + protected async Task doProc(FilesClass currFile) + { + await Task.Delay(1); + if (k.statesOK.Count <= 0 && k.eventsOK.Count <= 0 && k.lines.Count <= 0) + { + k = await SMGDService.DoCheckUnusedEvSt(currFile); + } + else + { + k = new FileLinesClass(); + } + } protected override async Task OnParametersSetAsync() { await ReloadData(); diff --git a/SMGen/Pages/FamIngressi.razor b/SMGen/Pages/FamIngressi.razor index 65a68fa..825309d 100644 --- a/SMGen/Pages/FamIngressi.razor +++ b/SMGen/Pages/FamIngressi.razor @@ -1,7 +1,6 @@ @page "/FamIngressi" -

FamIngressi

-

+@*

Deve mostrare elenco fam ingressi e su selezione dettaglio delle righe tab relative..

@@ -18,4 +17,18 @@ Deve mostrare elenco fam ingressi e su selezione dettaglio delle righe tab relat select * from TransizioneIngressi where IdxFamigliaIngresso = 60 -- es SIM +*@ + +
+
+

Famiglia-ingressi

+
+
+ +
+
+ +
+ + diff --git a/SMGen/Pages/FamIngressi.razor.cs b/SMGen/Pages/FamIngressi.razor.cs index 43e6d24..73b4393 100644 --- a/SMGen/Pages/FamIngressi.razor.cs +++ b/SMGen/Pages/FamIngressi.razor.cs @@ -13,10 +13,57 @@ using Microsoft.AspNetCore.Components.Web.Virtualization; using Microsoft.JSInterop; using SMGen; using SMGen.Shared; +using SMGen.Data; +using EgwCoreLib.Razor; namespace SMGen.Pages { public partial class FamIngressi { + protected void ForceReload(int newNum) + { + numRecord = newNum; + } + + protected void ForceReloadPage(int newNum) + { + currPage = newNum; + } + + protected async Task pgResetReq(bool doReset) + { + if (doReset) + { + await Task.Delay(1); + if (pagerFamIng != null) + { + pagerFamIng.resetCurrPage(); + } + } + } + protected void UpdateTotCount(int newTotCount) + { + totalCount = newTotCount; + } + private int currPage + { + get => currFilter.CurrPage; + set => currFilter.CurrPage = value; + } + + private int numRecord + { + get => currFilter.NumRec; + set => currFilter.NumRec = value; + } + + private int totalCount + { + get => currFilter.TotCount; + set => currFilter.TotCount = value; + } + protected SelectFamIngParams currFilter = new SelectFamIngParams(); + + protected DataPager? pagerFamIng = null!; } } \ No newline at end of file diff --git a/SMGen/Pages/FamMacchine.razor b/SMGen/Pages/FamMacchine.razor index 68f5525..b714b4f 100644 --- a/SMGen/Pages/FamMacchine.razor +++ b/SMGen/Pages/FamMacchine.razor @@ -1,8 +1,7 @@ @page "/FamMacchine" -

FamMacchine

-

+@*

Deve mostrare elenco fam ingressi e su selezione dettaglio delle righe tab relative..

@@ -21,4 +20,18 @@ -Partire da esempio vb in Mapo-IOB\StateMachine\src, in particolare M_transitions.vb \ No newline at end of file +Partire da esempio vb in Mapo-IOB\StateMachine\src, in particolare M_transitions.vb +*@ + + +
+
+

Famiglia-stati

+
+
+ +
+
+ +
+
\ No newline at end of file diff --git a/SMGen/Pages/FamMacchine.razor.cs b/SMGen/Pages/FamMacchine.razor.cs index 30e2bab..e4ea18f 100644 --- a/SMGen/Pages/FamMacchine.razor.cs +++ b/SMGen/Pages/FamMacchine.razor.cs @@ -13,10 +13,57 @@ using Microsoft.AspNetCore.Components.Web.Virtualization; using Microsoft.JSInterop; using SMGen; using SMGen.Shared; +using EgwCoreLib.Razor; +using SMGen.Data; namespace SMGen.Pages { public partial class FamMacchine { + protected void ForceReload(int newNum) + { + numRecord = newNum; + } + + protected void ForceReloadPage(int newNum) + { + currPage = newNum; + } + + protected async Task pgResetReq(bool doReset) + { + if (doReset) + { + await Task.Delay(1); + if (pagerFamStati != null) + { + pagerFamStati.resetCurrPage(); + } + } + } + protected void UpdateTotCount(int newTotCount) + { + totalCount = newTotCount; + } + private int currPage + { + get => currFilter.CurrPage; + set => currFilter.CurrPage = value; + } + + private int numRecord + { + get => currFilter.NumRec; + set => currFilter.NumRec = value; + } + + private int totalCount + { + get => currFilter.TotCount; + set => currFilter.TotCount = value; + } + protected SelectFamStatiParams currFilter = new SelectFamStatiParams(); + + protected DataPager? pagerFamStati = null!; } } \ No newline at end of file diff --git a/SMGen/Pages/SMEvent2State.razor b/SMGen/Pages/SMEvent2State.razor index 12d7995..e074f9b 100644 --- a/SMGen/Pages/SMEvent2State.razor +++ b/SMGen/Pages/SMEvent2State.razor @@ -1,7 +1,7 @@ @page "/SMEvent2State" -

SMEvent2State

+

Event-state

-

+@*

Deve permettere upload file *.rul (NUOVO, diverso/semplificato) e generazione righe regole (come x csv)

@@ -12,7 +12,7 @@

Vista in preview si può poi inserire in prod se confermato -

+

*@
diff --git a/SMGen/Pages/SMIn2Event.razor b/SMGen/Pages/SMIn2Event.razor index d8fa204..d62d4fc 100644 --- a/SMGen/Pages/SMIn2Event.razor +++ b/SMGen/Pages/SMIn2Event.razor @@ -1,7 +1,8 @@ @page "/SMIn2Event" -

SMIn2Event

-

+

Ingresso-evento

+ +@*

Deve permettere upload file *.rul e generazione righe regole (come x csv)

@@ -13,7 +14,7 @@

Vista in preview si può poi inserire in prod se confermato

- +*@
diff --git a/SMGen/Pages/SMIn2Event.razor.cs b/SMGen/Pages/SMIn2Event.razor.cs index f78fd6a..2920067 100644 --- a/SMGen/Pages/SMIn2Event.razor.cs +++ b/SMGen/Pages/SMIn2Event.razor.cs @@ -56,12 +56,9 @@ namespace SMGen.Pages protected Dictionary Files { get; set; } = new Dictionary(); protected int maxAllowedFiles { get; set; } = 100; - protected int resetSucc { get; set; } = 0; - protected string pathDir { get; set; } = ""; - protected string pathFile { get; set; } = ""; - + protected int resetSucc { get; set; } = 0; [Inject] protected SMGDataService SMGDService { get; set; } = null!; @@ -97,15 +94,6 @@ namespace SMGen.Pages } } } - protected async Task updateFilter(SelectSMIn2EvParams newParams) - { - await Task.Delay(1); - currPage = 1; - // salvo comunque filtro reparto x utente - await Task.Delay(1); - await InvokeAsync(() => StateHasChanged()); - currFilter = newParams; - } protected void UpdateTotCount(int newTotCount) {