From 3a5a98abc0fc808bbcca488b52fd00ac6539fbc3 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Wed, 30 Nov 2022 15:40:57 +0100 Subject: [PATCH] fix --- MP.Data/Controllers/MpSpecController.cs | 2 +- MP.SPEC/Components/ListDossiers.razor | 400 +++++++++++------------ MP.SPEC/Components/ListDossiers.razor.cs | 2 +- MP.SPEC/Components/SelFilterXDL.razor | 45 ++- MP.SPEC/Components/SelFilterXDL.razor.cs | 2 +- MP.SPEC/Data/MpDataService.cs | 8 +- MP.SPEC/Pages/ODL.razor.cs | 2 +- MP.SPEC/Pages/PODL.razor | 273 ++++++++-------- MP.SPEC/Pages/PODL.razor.cs | 44 +-- 9 files changed, 368 insertions(+), 410 deletions(-) diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs index 3df6862a..e45e05e8 100644 --- a/MP.Data/Controllers/MpSpecController.cs +++ b/MP.Data/Controllers/MpSpecController.cs @@ -699,7 +699,7 @@ namespace MP.Data.Controllers /// public List MacchineGetFilt(string codGruppo) { - List dbResult = new List(); + List dbResult = new List(); using (var dbCtx = new MoonProContext(_configuration)) { if (codGruppo == "*") diff --git a/MP.SPEC/Components/ListDossiers.razor b/MP.SPEC/Components/ListDossiers.razor index 80655c2b..cbb6bcfc 100644 --- a/MP.SPEC/Components/ListDossiers.razor +++ b/MP.SPEC/Components/ListDossiers.razor @@ -6,99 +6,99 @@ @if (ListRecords == null) { - + } else if (totalCount == 0) { -
Nessun record trovato
+
Nessun record trovato
} else { - + @if (currFluxLogDto != null) { -
-
-
-
-
- Modifica Parametro -
-
+
+
+
+
+
+ Modifica Parametro +
+
@if (isEditing) { - PENDING CHANGES... + PENDING CHANGES... } -
-
-
-
-
-
- MACCHINA -
-
-
- DATA - +
+
+
+
+ MACCHINA + +
+
+
+
+ DATA + +
+
+
+
+ DATA TYPE + +
+
+
+
+ VALORE + +
+
-
-
-
- DATA TYPE - -
-
-
-
- VALORE - -
-
-
-
-
-
-
-
-
-
- -
-
-
-
- +
+
+
+
+
+
+
+ +
+
+
+
+ +
+
-
-
} - - + + @if (currRecordClone != null) { -
-
-
-
-
- Nuovo Dossier -
-
-
- -
-
-
- MACCHINA - @if (ListMacchine != null) { foreach (var item in ListMacchine) @@ -106,89 +106,89 @@ else @if (item.IdxMacchina == currRecordClone.IdxMacchina) { - + } else { - + } } } - -
-
-
-
- FASE - +
+
+
+
+ FASE + -
-
+ +
+
-
-
- ARTICOLI +
+
+ ARTICOLI - @if (ListArticoli != null) { foreach (var item in ListArticoli) { @if (item.CodArticolo == currRecordClone.CodArticolo) { - + } else { - + } } } - + +
+
-
-
- + -
-
-
-
-
-
-
- -
-
-
-
- +
+
+
+
+
+
+
+ +
+
+
+
+ +
+
-
-
} - + @@ -196,149 +196,149 @@ else -
-
- - - -
-
+
+
+ + + + - - - - - - - - - + + + + + + + + + + + @foreach (var record in ListRecords) { - - + - + - + - + - + - + - + - + + } - -
+
@if (currRecord != null) { - - + + } -
- 		Articolo Fase Macchina Data Snap ODL
Articolo Fase Macchina Data Snap ODL
+
@if (isEditing == false) { - - - + + + @**@ } else { - + } - + @record.CodArticolo -
@record.ArticoloNav.DescArticolo
- 		+
@record.ArticoloNav.DescArticolo
+ 		@tradFase(record.KeyRichiesta) - + @record.IdxMacchina - + @record.DtRif - -
-
+
+
+
@record.IdxODL -
+
@if (record.IdxODL > 0) { - + } - - 		+ + @if (isEditing == false) { - + } else { - + } -
+ +
@if (!visualizzaFlux) { if (listaFlux == null) { -
Nessun record trovato
+
Nessun record trovato
} else { -
- - - - - - - - - - - +
+
- - Macchina Data Data Type - Valore -
+ + + + + + + + + + @foreach (var record in listaFlux) { - - - + + - + - + - + - + + } - -
+ + Macchina Data Data Type + Valore +
- - +
+ + @record.IdxMacchina - + @record.dtEvento - + @traduci(record.CodFlux) -
@record.CodFlux
- 		+
@record.CodFlux
+ 		@if (record.ValoreEdit != record.Valore) { -
@record.ValoreEdit
-
(@record.Valore)
+
@record.ValoreEdit
+
(@record.Valore)
} else { -
@record.ValoreEdit
+
@record.ValoreEdit
} -
-
+ + +
} } +
-
} diff --git a/MP.SPEC/Components/ListDossiers.razor.cs b/MP.SPEC/Components/ListDossiers.razor.cs index 48013235..89106654 100644 --- a/MP.SPEC/Components/ListDossiers.razor.cs +++ b/MP.SPEC/Components/ListDossiers.razor.cs @@ -309,7 +309,7 @@ namespace MP.SPEC.Components private List? ListArticoli; private List? ListGruppiFase; - private List? ListMacchine; + private List? ListMacchine; private List? ListRecords; private List? ListStati; diff --git a/MP.SPEC/Components/SelFilterXDL.razor b/MP.SPEC/Components/SelFilterXDL.razor index 44ec8e07..f3f26e8a 100644 --- a/MP.SPEC/Components/SelFilterXDL.razor +++ b/MP.SPEC/Components/SelFilterXDL.razor @@ -23,7 +23,7 @@ { foreach (var item in ListGruppiFase) { - + } } @@ -37,19 +37,12 @@
@@ -68,7 +61,7 @@ { foreach (var item in ListStati) { - + } } @@ -76,20 +69,20 @@
@if (!isActive || hasOdl) { -
- -
-
- - -
-
- -
-
- - -
+
+ +
+
+ + +
+
+ +
+
+ + +
}
diff --git a/MP.SPEC/Components/SelFilterXDL.razor.cs b/MP.SPEC/Components/SelFilterXDL.razor.cs index f5466103..039b0c0b 100644 --- a/MP.SPEC/Components/SelFilterXDL.razor.cs +++ b/MP.SPEC/Components/SelFilterXDL.razor.cs @@ -19,7 +19,7 @@ namespace MP.SPEC.Components public List? ListGruppiFase { get; set; } = null; [Parameter] - public List? ListMacchine { get; set; } = null; + public List? ListMacchine { get; set; } = null; [Parameter] public List? ListStati { get; set; } = null; diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index a02d5104..a4dbd916 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -793,7 +793,7 @@ namespace MP.SPEC.Data /// public async Task> MacchineGetFilt(string codGruppo) { - List? result = new List(); + List? result = new List(); Stopwatch stopWatch = new Stopwatch(); stopWatch.Start(); string readType = "DB"; @@ -803,7 +803,7 @@ namespace MP.SPEC.Data RedisValue rawData = redisDb.StringGet(currKey); if (rawData.HasValue) { - result = JsonConvert.DeserializeObject>($"{rawData}"); + result = JsonConvert.DeserializeObject>($"{rawData}"); readType = "REDIS"; } else @@ -811,11 +811,11 @@ namespace MP.SPEC.Data result = await Task.FromResult(dbController.MacchineGetFilt(codGruppo)); // serializzo e salvo... rawData = JsonConvert.SerializeObject(result); - redisDb.StringSet(redisMacList, rawData, getRandTOut(redisLongTimeCache)); + redisDb.StringSet(currKey, rawData, getRandTOut(redisLongTimeCache)); } if (result == null) { - result = new List(); + result = new List(); } stopWatch.Stop(); TimeSpan ts = stopWatch.Elapsed; diff --git a/MP.SPEC/Pages/ODL.razor.cs b/MP.SPEC/Pages/ODL.razor.cs index 8fe5897a..eff6487f 100644 --- a/MP.SPEC/Pages/ODL.razor.cs +++ b/MP.SPEC/Pages/ODL.razor.cs @@ -160,7 +160,7 @@ namespace MP.SPEC.Pages #region Private Fields - private List? ListMacchine; + private List? ListMacchine; private List? ListStati; #endregion Private Fields diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor index 95b50e3e..d34dda95 100644 --- a/MP.SPEC/Pages/PODL.razor +++ b/MP.SPEC/Pages/PODL.razor @@ -18,7 +18,7 @@
@if (addEnabled) { - + }
@@ -26,26 +26,26 @@
@if (filtActive) { -
+
@**@ @if (selReparto != "*") { - + } @if (macchina != "*") { - + } @if (StatoSel != "*") { - + } -
+
} @if (hasOdl) { - @selDtStart   - @selDtEnd   + @selDtStart   + @selDtEnd   }
@@ -53,230 +53,225 @@
- + @if (currRecord != null) { -
-
-
-
@header
-
-
-
-
-
-
- Search - +
+
+
+
@header
+
+
+
+
+
+
+ Search + +
-
-
-
- Articolo - @if (ListArticoli != null) { foreach (var item in ListArticoli) { @if (item.CodArticolo == currRecordControlli.CodArticolo) { - + } else { - + } } } - + +
-
-
-
- # pz - - T.Ciclo - +
+
+ # pz + + T.Ciclo + +
-
-
-
- Fase - @if (ListStati != null) { foreach (var item in ListStati) { @if (item.value == currRecordControlli.KeyRichiesta) { - + } else { - + } } } - + +
-
-
-
-
+
+
- Gruppo - @if (ListGruppiFase != null) { foreach (var item in ListGruppiFase) { @if (item.CodGruppo == currRecordControlli.CodGruppo) { - + } else { - + } } } - -
-
-
-
-
-
-
- Macchina -
-
-
-
- Note - -
-
-
-
-
-
-
-
- Attivabile -
-
- +
+
+
+
+ Macchina + +
-
-
-
-
-
- +
+
+ Note + +
-
-
- +
+
+
+
+
+ Attivabile +
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+ @if (currRecord.CodArticolo != "" && currRecord.CodFase != "" && currRecord.CodGruppo != "" && currRecord.IdxMacchina != "") + { + + } +
-
} else if (addEnabled) { -
-
+
+
@**@ -
+
@if (reqNew) { -
-
- Azienda - @if (ListAziende != null) { foreach (var item in ListAziende.Where(x => x.CodGruppo != "*").ToList()) { - + } } - -
-
-
-
- Search - - Articolo - +
+
+
+
+ Search + + Articolo + -
-
+ +
+
} -
+
}
@if (isLoading) { - + } else { - + }
diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs index ff6656f9..19f3fd84 100644 --- a/MP.SPEC/Pages/PODL.razor.cs +++ b/MP.SPEC/Pages/PODL.razor.cs @@ -98,7 +98,8 @@ namespace MP.SPEC.Pages await localStorage.SetItemAsync(keyStor, selReparto); } } - protected override async Task OnParametersSetAsync() + + protected override async Task OnInitializedAsync() { await getReparto(); ListAziende = await MDService.ElencoAziende(); @@ -160,7 +161,7 @@ namespace MP.SPEC.Pages string codMacc = ""; if (ListMacchine != null && ListMacchine.Count > 0) { - var firstMacc = ListMacchine.FirstOrDefault(x => x.MachineNav.Nome.Contains(currAzienda)); + var firstMacc = ListMacchine.FirstOrDefault(x => x.Nome.Contains(currAzienda)); if (firstMacc != null) { codMacc = firstMacc.IdxMacchina; @@ -197,8 +198,6 @@ namespace MP.SPEC.Pages return; await Task.Delay(1); var clonedRec = MP.Data.Utils.POdlExt.convertToPOdl(selRec); - clonedRec.CodGruppo = gruppoSearch; - clonedRec.IdxOdl = 0; var done = await MDService.POdlUpdateRecord(clonedRec); await callSyncDb(clonedRec); currRecord = null; @@ -228,8 +227,7 @@ namespace MP.SPEC.Pages private List? ListGruppiFase; - private List? ListMacchine; - private List? ListMacchineFiltro; + private List? ListMacchine; private List? ListStati; @@ -240,23 +238,7 @@ namespace MP.SPEC.Pages #region Private Properties private string _artSearch { get; set; } = ""; - private string _gruppoSearch { get; set; } = ""; - private string gruppoSearch - { - get => _gruppoSearch; - set - { - if (!_gruppoSearch.Equals(value)) - { - _gruppoSearch = value; - var pUpd = Task.Run(async () => - { - await reloadData(); - }); - pUpd.Wait(); - } - } - } + private string _currAzienda { get; set; } = "*"; private bool addEnabled @@ -355,13 +337,8 @@ namespace MP.SPEC.Pages get => _currRecord; set { - if (value != null) - { - - _currRecord = value; - artSearch = value == null ? "" : value.CodArticolo; - - } + _currRecord = value; + artSearch = value == null ? "" : value.CodArticolo; } } @@ -440,14 +417,8 @@ namespace MP.SPEC.Pages } } - private async Task reloadDataFiltro() - { - ListMacchineFiltro = await MDService.MacchineGetAll(selReparto); - } - private async Task reloadData() { - await getReparto(); isLoading = true; await Task.Delay(1); @@ -470,7 +441,6 @@ namespace MP.SPEC.Pages await reloadData(); await Task.Delay(1); await InvokeAsync(() => StateHasChanged()); - await reloadDataFiltro(); currFilter = newParams; isLoading = false; }