From 6a0eeba75f3004aa5563587202f4b937892a0d6a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 5 Oct 2022 14:45:29 +0200 Subject: [PATCH 01/33] Bozza metodo selezione x articolo --- MP.Data/Controllers/MpSpecController.cs | 6 ++- MP.Data/Utils.cs | 13 +++++- MP.SPEC/Components/DossiersFilter.razor | 50 ++++++++++----------- MP.SPEC/Components/DossiersFilter.razor.cs | 27 +++++++++++- MP.SPEC/Components/ListDossiers.razor.cs | 51 ++++++++++++++-------- MP.SPEC/Data/MpDataService.cs | 7 +-- MP.SPEC/Data/SelectDossierParams.cs | 7 ++- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 11 files changed, 110 insertions(+), 59 deletions(-) diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs index 105297cf..4713d55f 100644 --- a/MP.Data/Controllers/MpSpecController.cs +++ b/MP.Data/Controllers/MpSpecController.cs @@ -313,10 +313,11 @@ namespace MP.Data.Controllers /// macchina (ordinato x data registrazione) /// /// * = tutte, altrimenti solo x una data macchina + /// * = tutti, altrimenti solo x un dato articolo /// Data di riferimento (Massima) per estrazioen records /// numero massimo record da restituire /// - public List DossiersGetLastFilt(string IdxMacchina, DateTime DtRef, int MaxRec) + public List DossiersGetLastFilt(string IdxMacchina, string CodArticolo, DateTime DtRef, int MaxRec) { List dbResult = new List(); using (var dbCtx = new MoonProContext(_configuration)) @@ -324,9 +325,10 @@ namespace MP.Data.Controllers dbResult = dbCtx .DbSetDossiers .AsNoTracking() - .Where(x => (IdxMacchina == "*" || x.IdxMacchina == IdxMacchina) && x.DtRif <= DtRef) + .Where(x => (IdxMacchina == "*" || x.IdxMacchina == IdxMacchina) && (CodArticolo == "*" || x.OdlNav.CodArticolo== CodArticolo) && x.DtRif <= DtRef) .Include(m => m.MachineNav) .Include(o => o.OdlNav) + .Include(a => a.OdlNav.ArticoloNav) .OrderByDescending(x => x.DtRif) .Take(MaxRec) .ToList(); diff --git a/MP.Data/Utils.cs b/MP.Data/Utils.cs index b1d5b6d0..ea335382 100644 --- a/MP.Data/Utils.cs +++ b/MP.Data/Utils.cs @@ -57,13 +57,22 @@ namespace MP.Data return answ; } - public static async Task SaveToCsv(List reportData, string path) + /// + /// Effettua salvataggio in file di un generico oggetto in formato CSV + /// + /// + /// + /// + /// Separatore da impiegare + /// + public static async Task SaveToCsv(List reportData, string path, char separator) { var lines = new List(); IEnumerable props = TypeDescriptor.GetProperties(typeof(T)).OfType(); var header = string.Join(";", props.ToList().Select(x => x.Name)); lines.Add(header); - var valueLines = reportData.Select(row => string.Join(";", header.Split(';').Select(a => row.GetType().GetProperty(a).GetValue(row, null)))); + var valueLines = reportData.Select(row => string.Join(separator, header.Split(separator).Select(a => row.GetType().GetProperty(a).GetValue(row, null)))); + //var valueLines = reportData.Select(row => string.Join(";", header.Split(';').Select(a => row.GetType().GetProperty(a).GetValue(row, null)))); lines.AddRange(valueLines); await Task.Run(() => File.WriteAllLines(path, lines.ToArray())); } diff --git a/MP.SPEC/Components/DossiersFilter.razor b/MP.SPEC/Components/DossiersFilter.razor index a57ccf3f..762170c7 100644 --- a/MP.SPEC/Components/DossiersFilter.razor +++ b/MP.SPEC/Components/DossiersFilter.razor @@ -1,36 +1,34 @@ 
-
-
-
-
- - - - - + + @if (ListMacchine != null) + { + foreach (var item in ListMacchine) { - foreach (var item in ListMacchine) - { - - } + } - - - -
+ } + + + +
+
+ + + usare dots...
diff --git a/MP.SPEC/Components/DossiersFilter.razor.cs b/MP.SPEC/Components/DossiersFilter.razor.cs index 2ae4b100..c6d48734 100644 --- a/MP.SPEC/Components/DossiersFilter.razor.cs +++ b/MP.SPEC/Components/DossiersFilter.razor.cs @@ -58,6 +58,25 @@ namespace MP.SPEC.Components } } + protected string selArticolo + { + get + { + return SelFilterDossier.CodArticolo; + } + set + { + if (!SelFilterDossier.CodArticolo.Equals(value)) + { + SelFilterDossier.CurrPage = 1; + SelFilterDossier.CodArticolo = value; + StateHasChanged(); + Task.Delay(1); + reportChange(); + } + } + } + protected int selMaxRecord { get @@ -83,7 +102,9 @@ namespace MP.SPEC.Components { SelFilterDossier = new SelectDossierParams(); ListMacchine = await MDService.MacchineWithFlux(); - ListDossier = await MDService.DossiersGetLastFilt(selMacchina, selDtRef, selMaxRecord); +#if false + ListDossier = await MDService.DossiersGetLastFilt(selMacchina, selArticolo, selDtRef, selMaxRecord); +#endif await FilterChanged.InvokeAsync(SelFilterDossier); } @@ -96,7 +117,9 @@ namespace MP.SPEC.Components #region Private Fields - private List? ListDossier = null; +#if fase + private List? ListDossier = null; +#endif private List? ListMacchine = null; #endregion Private Fields diff --git a/MP.SPEC/Components/ListDossiers.razor.cs b/MP.SPEC/Components/ListDossiers.razor.cs index 546a164c..fdb5c4e4 100644 --- a/MP.SPEC/Components/ListDossiers.razor.cs +++ b/MP.SPEC/Components/ListDossiers.razor.cs @@ -37,20 +37,6 @@ namespace MP.SPEC.Components return answ; } - public async Task reloadData(bool setChanged) - { - isLoading = true; - SearchRecords = await MDService.DossiersGetLastFilt(SelMacchina, SelDtRef, MaxRecord); - totalCount = SearchRecords.Count; - ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); - await Task.Delay(1); - if (setChanged) - { - await InvokeAsync(() => StateHasChanged()); - } - isLoading = false; - } - #endregion Public Methods #region Protected Properties @@ -80,7 +66,7 @@ namespace MP.SPEC.Components await Task.Delay(1); var done = await MDService.DossiersDeleteRecord(selRec); currRecord = null; - await reloadData(); + await reloadData(true); await Task.Delay(1); } @@ -91,9 +77,11 @@ namespace MP.SPEC.Components ListStati = await MDService.AnagStatiComm(); - ListRecords = await MDService.DossiersGetLastFilt(SelMacchina, SelDtRef, MaxRecord); +#if false + ListRecords = await MDService.DossiersGetLastFilt(SelMacchina, SelArticolo, SelDtRef, MaxRecord); +#endif - await reloadData(); + await reloadData(true); } protected async void OnSeachUpdated() @@ -124,9 +112,13 @@ namespace MP.SPEC.Components #region Private Fields private int _totalCount = 0; + private Dossiers? currRecord = null; + private List? ListRecords; + private List? ListStati; + private List? SearchRecords; #endregion Private Fields @@ -154,6 +146,11 @@ namespace MP.SPEC.Components set => MessageService.numRecord = value; } + private string SelArticolo + { + get => SelFilter.CodArticolo; + } + private DateTime SelDtRef { get => SelFilter.DtRef; @@ -185,19 +182,35 @@ namespace MP.SPEC.Components private async void MessageService_EA_PageUpdated() { - await reloadData(); + await reloadData(true); } + private async Task reloadData(bool setChanged) + { + isLoading = true; + SearchRecords = await MDService.DossiersGetLastFilt(SelMacchina, SelArticolo, SelDtRef, MaxRecord); + totalCount = SearchRecords.Count; + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + await Task.Delay(1); + if (setChanged) + { + await InvokeAsync(() => StateHasChanged()); + } + isLoading = false; + } + +#if false private async Task reloadData() { isLoading = true; - SearchRecords = await MDService.DossiersGetLastFilt(SelMacchina, SelDtRef, MaxRecord); + SearchRecords = await MDService.DossiersGetLastFilt(SelMacchina, SelArticolo, SelDtRef, MaxRecord); totalCount = SearchRecords.Count; ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); await Task.Delay(1); await InvokeAsync(() => StateHasChanged()); isLoading = false; } +#endif private async Task toggleTableFlux() { diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index 4f996326..9ecec88e 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -314,16 +314,17 @@ namespace MP.SPEC.Data /// macchina (ordinato x data registrazione) /// /// * = tutte, altrimenti solo x una data macchina + /// * = tutti, altrimenti solo x un dato articolo /// Data di riferimento (Massima) per estrazione records /// numero massimo record da restituire /// - public async Task> DossiersGetLastFilt(string IdxMacchina, DateTime DtRef, int MaxRec) + public async Task> DossiersGetLastFilt(string IdxMacchina, string CodArticolo, DateTime DtRef, int MaxRec) { List? result = new List(); Stopwatch stopWatch = new Stopwatch(); stopWatch.Start(); string readType = "DB"; - string currKey = $"{redisDossByMac}:{IdxMacchina}:{DtRef:yyyy/MM/dd HH:mm:ss}:{MaxRec}"; + string currKey = $"{redisDossByMac}:{IdxMacchina}:{CodArticolo}:{DtRef:yyyy/MM/dd HH:mm:ss}:{MaxRec}"; // cerco in redis dato valore sel macchina... RedisValue rawData = redisDb.StringGet(currKey); if (rawData.HasValue) @@ -333,7 +334,7 @@ namespace MP.SPEC.Data } else { - result = await Task.FromResult(dbController.DossiersGetLastFilt(IdxMacchina, DtRef, MaxRec)); + result = await Task.FromResult(dbController.DossiersGetLastFilt(IdxMacchina, CodArticolo, DtRef, MaxRec)); // serializzp e salvo... rawData = JsonConvert.SerializeObject(result); redisDb.StringSet(currKey, rawData, getRandTOut(redisLongTimeCache / 5)); diff --git a/MP.SPEC/Data/SelectDossierParams.cs b/MP.SPEC/Data/SelectDossierParams.cs index 02cc5991..06489118 100644 --- a/MP.SPEC/Data/SelectDossierParams.cs +++ b/MP.SPEC/Data/SelectDossierParams.cs @@ -17,7 +17,9 @@ public string IdxMacchina { get; set; } = "*"; - public int MaxRecord { get; set; } = 10; + public string CodArticolo { get; set; } = "*"; + + public int MaxRecord { get; set; } = 100; #endregion Public Properties @@ -44,6 +46,9 @@ if (IdxMacchina != item.IdxMacchina) return false; + if (CodArticolo != item.CodArticolo) + return false; + if (MaxRecord != item.MaxRecord) return false; diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 539ad3ac..b68bc73a 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2210.511 + 6.16.2210.514 diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 0c0ee268..6fcb5580 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2210.511

+

Versione: 6.16.2210.514


Note di rilascio:
  • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 806c3689..97fa0ad3 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2210.511 +6.16.2210.514 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index d5f9ff5d..abf385b5 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2210.511 + 6.16.2210.514 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 From 0795cae1d5f6bc6fff101b05c60508e7c1ec43ac Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Wed, 5 Oct 2022 15:46:59 +0200 Subject: [PATCH 02/33] Aggiunta filtro per articolo + fix lettura da redis dossiers --- MP.Data/Controllers/MpSpecController.cs | 19 ++++++++++ MP.SPEC/Components/DossiersFilter.razor | 13 ++++++- MP.SPEC/Components/DossiersFilter.razor.cs | 5 ++- MP.SPEC/Data/MpDataService.cs | 41 ++++++++++++++++++++-- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Pages/DOSS.razor | 1 + MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 9 files changed, 79 insertions(+), 8 deletions(-) diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs index 4713d55f..f4103a4e 100644 --- a/MP.Data/Controllers/MpSpecController.cs +++ b/MP.Data/Controllers/MpSpecController.cs @@ -535,6 +535,25 @@ namespace MP.Data.Controllers return dbResult; } + /// + /// Elenco codice articoli che abbiano dati Dossier + /// + /// + public List ArticleWithDossier() + { + List dbResult = new List(); + using (var dbCtx = new MoonProContext(_configuration)) + { + dbResult = dbCtx + .DbSetDossiers + .AsNoTracking() + .Select(i => i.OdlNav.CodArticolo) + .Distinct() + .ToList(); + } + return dbResult; + } + /// /// Elenco da tabella MappaStatoExpl /// diff --git a/MP.SPEC/Components/DossiersFilter.razor b/MP.SPEC/Components/DossiersFilter.razor index 762170c7..80c12120 100644 --- a/MP.SPEC/Components/DossiersFilter.razor +++ b/MP.SPEC/Components/DossiersFilter.razor @@ -5,7 +5,17 @@
    - ...filtro ART + + +
    diff --git a/MP.SPEC/Components/DossiersFilter.razor.cs b/MP.SPEC/Components/DossiersFilter.razor.cs index c6d48734..8d9e01bb 100644 --- a/MP.SPEC/Components/DossiersFilter.razor.cs +++ b/MP.SPEC/Components/DossiersFilter.razor.cs @@ -102,6 +102,7 @@ namespace MP.SPEC.Components { SelFilterDossier = new SelectDossierParams(); ListMacchine = await MDService.MacchineWithFlux(); + ListArticoli = await MDService.ArticleWithDossier(); #if false ListDossier = await MDService.DossiersGetLastFilt(selMacchina, selArticolo, selDtRef, selMaxRecord); #endif @@ -117,11 +118,13 @@ namespace MP.SPEC.Components #region Private Fields -#if fase +#if false private List? ListDossier = null; #endif private List? ListMacchine = null; + private List? ListArticoli = null; + #endregion Private Fields #region Private Properties diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index 9ecec88e..cae0dd2c 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -314,7 +314,6 @@ namespace MP.SPEC.Data /// macchina (ordinato x data registrazione) /// /// * = tutte, altrimenti solo x una data macchina - /// * = tutti, altrimenti solo x un dato articolo /// Data di riferimento (Massima) per estrazione records /// numero massimo record da restituire /// @@ -324,7 +323,7 @@ namespace MP.SPEC.Data Stopwatch stopWatch = new Stopwatch(); stopWatch.Start(); string readType = "DB"; - string currKey = $"{redisDossByMac}:{IdxMacchina}:{CodArticolo}:{DtRef:yyyy/MM/dd HH:mm:ss}:{MaxRec}"; + string currKey = $"{redisDossByMac}:{IdxMacchina}:{CodArticolo}:{DtRef}:{MaxRec}"; // cerco in redis dato valore sel macchina... RedisValue rawData = redisDb.StringGet(currKey); if (rawData.HasValue) @@ -560,6 +559,42 @@ namespace MP.SPEC.Data return result; } + + /// + /// Elenco Codice articolo con dati dossier gestiti + /// + /// + public async Task> ArticleWithDossier() + { + List? result = new List(); + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); + string readType = "DB"; + string currKey = redisArtByDossier; + // cerco in redis dato valore sel macchina... + RedisValue rawData = redisDb.StringGet(currKey); + if (rawData.HasValue) + { + result = JsonConvert.DeserializeObject>($"{rawData}"); + readType = "REDIS"; + } + else + { + result = await Task.FromResult(dbController.ArticleWithDossier()); + // serializzp e salvo... + rawData = JsonConvert.SerializeObject(result); + redisDb.StringSet(currKey, rawData, getRandTOut(redisLongTimeCache)); + } + if (result == null) + { + result = new List(); + } + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Debug($"ArticleWithDossier | Read from {readType}: {ts.TotalMilliseconds}ms"); + return result; + } + /// /// Elenco di tutti i parametri filtrati x macchina /// @@ -651,6 +686,8 @@ namespace MP.SPEC.Data private const string redisMacByFlux = redisBaseAddr + "SPEC:Cache:MacByFlux"; + private const string redisArtByDossier = redisBaseAddr + "SPEC:Cache:ArtByDossier"; + private const string redisMacList = redisBaseAddr + "SPEC:Cache:MacList"; private const string redisStatoCom = redisBaseAddr + "SPEC:Cache:StatoCom"; diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index b68bc73a..6de1fbd1 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2210.514 + 6.16.2210.515 diff --git a/MP.SPEC/Pages/DOSS.razor b/MP.SPEC/Pages/DOSS.razor index 94278ea8..9c17c17b 100644 --- a/MP.SPEC/Pages/DOSS.razor +++ b/MP.SPEC/Pages/DOSS.razor @@ -14,6 +14,7 @@ } else { + }
    diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 6fcb5580..908f9356 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

    Versione: 6.16.2210.514

    +

    Versione: 6.16.2210.515


    Note di rilascio:
    • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 97fa0ad3..34747600 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2210.514 +6.16.2210.515 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index abf385b5..3824b6da 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2210.514 + 6.16.2210.515 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 From 21fa81f09cffcbed02393532d9895ea9b97c77da Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Wed, 5 Oct 2022 16:34:22 +0200 Subject: [PATCH 03/33] fix grafico filtri Dossier --- MP.SPEC/Components/DossiersFilter.razor | 47 +++++++++++++--------- MP.SPEC/Components/DossiersFilter.razor.cs | 7 ++++ 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/MP.SPEC/Components/DossiersFilter.razor b/MP.SPEC/Components/DossiersFilter.razor index 80c12120..b1d6c7e9 100644 --- a/MP.SPEC/Components/DossiersFilter.razor +++ b/MP.SPEC/Components/DossiersFilter.razor @@ -1,10 +1,9 @@ -
      -
      -
      +
      -
      -
      -
      +
      +
      + +
      - - - +
      -
      - - - usare dots... +
      +
      +
      + @if (showParam) + { + +
      + + + + + +
      + } + else + { + + }
      diff --git a/MP.SPEC/Components/DossiersFilter.razor.cs b/MP.SPEC/Components/DossiersFilter.razor.cs index 8d9e01bb..94174e12 100644 --- a/MP.SPEC/Components/DossiersFilter.razor.cs +++ b/MP.SPEC/Components/DossiersFilter.razor.cs @@ -14,6 +14,8 @@ namespace MP.SPEC.Components [Parameter] public SelectDossierParams SelFilterDossier { get; set; } = null!; + protected bool showParam { get; set; } = false; + #endregion Public Properties #region Protected Properties @@ -140,6 +142,11 @@ namespace MP.SPEC.Components FilterChanged.InvokeAsync(SelFilterDossier); } + private void toggleShowParams() + { + showParam = !showParam; + } + #endregion Private Methods } } \ No newline at end of file From 624d6d3411d23cc2314d5c227eb805047e66fb6e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 5 Oct 2022 16:46:56 +0200 Subject: [PATCH 04/33] minor refresh x display trad articolo/macchina --- MP.Data/Controllers/MpSpecController.cs | 14 +++++++------- MP.SPEC/Components/ListDossiers.razor | 2 ++ MP.SPEC/Data/MpDataService.cs | 2 +- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs index f4103a4e..aba8b789 100644 --- a/MP.Data/Controllers/MpSpecController.cs +++ b/MP.Data/Controllers/MpSpecController.cs @@ -520,17 +520,17 @@ namespace MP.Data.Controllers /// Elenco id Macchine che abbiano dati FLuxLog /// /// - public List MacchineWithFlux() + public async Task> MacchineWithFlux() { List dbResult = new List(); using (var dbCtx = new MoonProContext(_configuration)) { - dbResult = dbCtx - .DbSetFluxLog - .AsNoTracking() - .Select(i => i.IdxMacchina) - .Distinct() - .ToList(); + dbResult = await dbCtx + .DbSetFluxLog + .AsNoTracking() + .Select(i => i.IdxMacchina) + .Distinct() + .ToListAsync(); } return dbResult; } diff --git a/MP.SPEC/Components/ListDossiers.razor b/MP.SPEC/Components/ListDossiers.razor index 5737bf7d..3fe9e652 100644 --- a/MP.SPEC/Components/ListDossiers.razor +++ b/MP.SPEC/Components/ListDossiers.razor @@ -37,12 +37,14 @@ else @record.OdlNav.CodArticolo +
      @record.OdlNav.ArticoloNav.DescArticolo
      @tradFase(record.OdlNav.KeyRichiesta) @record.IdxMacchina +
      @record.MachineNav.Descrizione
      @record.DtRif diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index cae0dd2c..c42b520e 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -544,7 +544,7 @@ namespace MP.SPEC.Data } else { - result = await Task.FromResult(dbController.MacchineWithFlux()); + result = await dbController.MacchineWithFlux(); // serializzp e salvo... rawData = JsonConvert.SerializeObject(result); redisDb.StringSet(currKey, rawData, getRandTOut(redisLongTimeCache)); diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 6de1fbd1..3abca903 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2210.515 + 6.16.2210.516 diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 908f9356..e0f700ec 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

      Versione: 6.16.2210.515

      +

      Versione: 6.16.2210.516


      Note di rilascio:
      • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 34747600..401aa198 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2210.515 +6.16.2210.516 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 3824b6da..cb2da6ab 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2210.515 + 6.16.2210.516 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 From 81fd2820df78b542ab056d493cc624d367c1a2af Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Wed, 5 Oct 2022 17:39:51 +0200 Subject: [PATCH 05/33] Params filter con dots INIZIO --- MP.SPEC/Components/DossiersFilter.razor | 91 +++++++----- MP.SPEC/Components/ParamsFilter.razor | 182 +++++++++++------------ MP.SPEC/Components/ParamsFilter.razor.cs | 13 +- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 7 files changed, 159 insertions(+), 135 deletions(-) diff --git a/MP.SPEC/Components/DossiersFilter.razor b/MP.SPEC/Components/DossiersFilter.razor index b1d6c7e9..8378557c 100644 --- a/MP.SPEC/Components/DossiersFilter.razor +++ b/MP.SPEC/Components/DossiersFilter.razor @@ -2,54 +2,67 @@
        + @if (!showParam) + { +
        +
        +
        + + + + +
        +
        +
        + } -
        - - - - - -
        -
        -
        + + + +
        +
        +
        +
        @if (showParam) { +
        -
        - - - - - +
        + + + + + +
        } else { - + }
        diff --git a/MP.SPEC/Components/ParamsFilter.razor b/MP.SPEC/Components/ParamsFilter.razor index 1be0c622..be6a984b 100644 --- a/MP.SPEC/Components/ParamsFilter.razor +++ b/MP.SPEC/Components/ParamsFilter.razor @@ -1,103 +1,100 @@ +
        -
        -
        -
        +
        +
        - @if (!liveUpdate) - { - - } - else - { - - } -
        -
        - @if (selMacchina != "*") - { - - } -
        -
        - @if (snapshotDone) - { - - } -
        -
        -
        - -
        -
        - @if (showEditPar) + @if (!liveUpdate) { -
        - - - - - -
        + } else { -
        - -
        + } +
        +
        + @if (selMacchina != "*") + { + + } +
        +
        + @if (snapshotDone) + { + + } +
        +
        +
        +
        + + + + +
        + @if (showParam) + { +
        + + + + + +
        + + } + else + {
        - - - - + @if (selDtMax == null) { @@ -108,10 +105,13 @@ + + }
        -
        + + }
        diff --git a/MP.SPEC/Components/ParamsFilter.razor.cs b/MP.SPEC/Components/ParamsFilter.razor.cs index 9930b251..8093512e 100644 --- a/MP.SPEC/Components/ParamsFilter.razor.cs +++ b/MP.SPEC/Components/ParamsFilter.razor.cs @@ -99,7 +99,8 @@ namespace MP.SPEC.Components } } } - + protected bool showParam { get; set; } = false; + protected bool selDt { get; set; } = false; protected string selMacchina { get => SelFilter.IdxMacchina; @@ -192,6 +193,7 @@ namespace MP.SPEC.Components currFilt.dtMin = RoundDatetime(5).AddHours(-numOreAnticipoSnapshot); SelFilter = currFilt; } + protected void startTimer() { @@ -310,6 +312,15 @@ namespace MP.SPEC.Components { FilterChanged.InvokeAsync(SelFilter); } + private void toggleShowParams() + { + showParam = !showParam; + } + private void untoggleSelDt() + { + selDt = true; + liveUpdate = true; + } #endregion Private Methods } diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 3abca903..dafe7145 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2210.516 + 6.16.2210.517 diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index e0f700ec..396e50ac 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

        Versione: 6.16.2210.516

        +

        Versione: 6.16.2210.517


        Note di rilascio:
        • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 401aa198..ee6d4dff 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2210.516 +6.16.2210.517 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index cb2da6ab..3b015d2a 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2210.516 + 6.16.2210.517 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 From 5b12ac47d3cf4508715483b5cbbd2a51155d5aa9 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 6 Oct 2022 13:10:12 +0200 Subject: [PATCH 06/33] update Filter --- MP.SPEC/Components/ParamsFilter.razor | 9 ++++----- MP.SPEC/Components/ParamsFilter.razor.cs | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/MP.SPEC/Components/ParamsFilter.razor b/MP.SPEC/Components/ParamsFilter.razor index be6a984b..b9b098fc 100644 --- a/MP.SPEC/Components/ParamsFilter.razor +++ b/MP.SPEC/Components/ParamsFilter.razor @@ -94,10 +94,10 @@ {
          - - @if (selDtMax == null) + @if (selDt) { - + + } else { @@ -105,8 +105,7 @@ - - + }
          diff --git a/MP.SPEC/Components/ParamsFilter.razor.cs b/MP.SPEC/Components/ParamsFilter.razor.cs index 8093512e..76cd2905 100644 --- a/MP.SPEC/Components/ParamsFilter.razor.cs +++ b/MP.SPEC/Components/ParamsFilter.razor.cs @@ -186,14 +186,14 @@ namespace MP.SPEC.Components // copio il filtro var currFilt = SelFilter; // fermo update - currFilt.LiveUpdate = false; + //currFilt.LiveUpdate = false; currFilt.CurrPage = 0; currFilt.lastUpdate = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss}"; currFilt.dtMax = RoundDatetime(5); currFilt.dtMin = RoundDatetime(5).AddHours(-numOreAnticipoSnapshot); SelFilter = currFilt; } - + protected void startTimer() { @@ -318,9 +318,20 @@ namespace MP.SPEC.Components } private void untoggleSelDt() { - selDt = true; + selDt = false; liveUpdate = true; } + private void toggleSelDt() + { + selDt = true; + liveUpdate = false; + + if (selDtMax == null) + { + setDtMax(); + } + + } #endregion Private Methods } From 90d4a46087a851c8b620267c2c31c0c4a7702766 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 6 Oct 2022 16:27:49 +0200 Subject: [PATCH 07/33] Fine fix filtri params e dossier --- MP.SPEC/Components/DossiersFilter.razor | 113 ++++++++++-------------- MP.SPEC/Components/ParamsFilter.razor | 103 +++++++++++---------- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Pages/Test.razor | 32 +++++++ MP.SPEC/Pages/_Layout.cshtml | 2 + MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 8 files changed, 137 insertions(+), 121 deletions(-) create mode 100644 MP.SPEC/Pages/Test.razor diff --git a/MP.SPEC/Components/DossiersFilter.razor b/MP.SPEC/Components/DossiersFilter.razor index 8378557c..9350c1a4 100644 --- a/MP.SPEC/Components/DossiersFilter.razor +++ b/MP.SPEC/Components/DossiersFilter.razor @@ -1,69 +1,54 @@ 
          - -
          -
          - @if (!showParam) - { -
          -
          -
          - - - - -
          -
          -
          - } - + +
          +
          +

          FILTRI

          +
          - - - -
          -
          -
          -
          - @if (showParam) - { -
          - -
          - - - - - -
          -
          - } - else - { - - } +
          +
          + Seleziona i filtri per: +
          +
          + + +
          +
          + + +
          +
          + + +
          +
          + +
          diff --git a/MP.SPEC/Components/ParamsFilter.razor b/MP.SPEC/Components/ParamsFilter.razor index b9b098fc..525ee3b5 100644 --- a/MP.SPEC/Components/ParamsFilter.razor +++ b/MP.SPEC/Components/ParamsFilter.razor @@ -1,5 +1,3 @@ - -
          @@ -39,35 +37,55 @@ }
          +
          -
          -
          - - - - + +
          +
          +

          FILTRI

          +
          - @if (showParam) - { -
          +
          +
          + Seleziona i filtri per: +
          +
          + + +
          +
          + + +
          +
          + + +
          +
          + + +
          +
          +
          +
          -
          - - } - else - { -
          -
          - @if (selDt) - { - - - } - else - { - - - - - - } -
          -
          - - } +
          diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index dafe7145..ccb08c71 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2210.517 + 6.16.2210.616 diff --git a/MP.SPEC/Pages/Test.razor b/MP.SPEC/Pages/Test.razor new file mode 100644 index 00000000..be6e0035 --- /dev/null +++ b/MP.SPEC/Pages/Test.razor @@ -0,0 +1,32 @@ +@page "/Test" + +

          Test

          + + +
          +
          +
          Offcanvas
          + +
          +
          +
          + Some text as placeholder. In real life you can have the elements you have chosen. Like, text, images, lists, etc. +
          +
          + + +
          +
          +
          + +@code { + +} diff --git a/MP.SPEC/Pages/_Layout.cshtml b/MP.SPEC/Pages/_Layout.cshtml index 060b003f..9353216d 100644 --- a/MP.SPEC/Pages/_Layout.cshtml +++ b/MP.SPEC/Pages/_Layout.cshtml @@ -30,7 +30,9 @@ 🗙
          + + @*Gestione autoriconnessione: https://github.com/dotnet/aspnetcore/issues/38305 (vedere anche https://docs.microsoft.com/it-it/aspnet/core/blazor/fundamentals/signalr?view=aspnetcore-6.0#modify-the-reconnection-handler-blazor-server)*@ + + + @*Gestione autoriconnessione: https://github.com/dotnet/aspnetcore/issues/38305 (vedere anche https://docs.microsoft.com/it-it/aspnet/core/blazor/fundamentals/signalr?view=aspnetcore-6.0#modify-the-reconnection-handler-blazor-server)*@