From 41a00ffa45ff33d14b862d0771dab74fb2f866d3 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 18 Oct 2022 09:55:29 +0200 Subject: [PATCH] fix 2 variabili x statRecord e currRecord --- MP.SPEC/Components/ListODL.razor | 54 ++++++++++++++--------------- MP.SPEC/Components/ListODL.razor.cs | 32 +++++++++++++---- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- MP.SPEC/wwwroot/lib/modalHandler.js | 35 +++++++------------ 7 files changed, 69 insertions(+), 60 deletions(-) diff --git a/MP.SPEC/Components/ListODL.razor b/MP.SPEC/Components/ListODL.razor index 8937c9d6..838f5857 100644 --- a/MP.SPEC/Components/ListODL.razor +++ b/MP.SPEC/Components/ListODL.razor @@ -110,7 +110,7 @@ else @record.DurataMinuti
- +
@@ -122,26 +122,26 @@ else
- @if (currRecord != null) + @if (statRecord != null) {
- ODL @currRecord.IdxOdl + ODL @statRecord.IdxOdl
- @currRecord.CodArticolo -
@currRecord.ArticoloNav.DescArticolo
+ @statRecord.CodArticolo +
@statRecord.ArticoloNav.DescArticolo
- @currRecord.IdxMacchina -
@currRecord.MachineNav.Descrizione
+ @statRecord.IdxMacchina +
@statRecord.MachineNav.Descrizione
}
- +
- @if (currRecord != null && showStats) + @if (statRecord != null && showStats) {
@@ -150,23 +150,23 @@ else -
N° pezzi: @currRecord.NumPezzi
-
T. Ciclo: @currRecord.Tcassegnato.ToString("N3")
+
N° pezzi: @statRecord.NumPezzi
+
T. Ciclo: @statRecord.Tcassegnato.ToString("N3")
-
@($"{@currRecord.DataInizio:yyyy/MM/dd}")
-
@($"{@currRecord.DataInizio:ddd HH:mm:ss}")
+
@($"{@statRecord.DataInizio:yyyy/MM/dd}")
+
@($"{@statRecord.DataInizio:ddd HH:mm:ss}")
- @if (@currRecord.DataFine != null) + @if (@statRecord.DataFine != null) { -
@($"{@currRecord.DataFine:yyyy/MM/dd}")
-
@($"{@currRecord.DataFine:ddd HH:mm:ss}")
+
@($"{@statRecord.DataFine:yyyy/MM/dd}")
+
@($"{@statRecord.DataFine:ddd HH:mm:ss}")
} else { @@ -192,12 +192,12 @@ else
- @tradFase(currRecord.KeyRichiesta) + @tradFase(statRecord.KeyRichiesta)
- @if (currRecord.Note != "") + @if (statRecord.Note != "") {
- @currRecord.Note + @statRecord.Note
} @@ -206,25 +206,25 @@ else
- @if (currRecord != null) + @if (statRecord != null) { @if (ListOdlStats != null) { - @foreach (var statRecord in ListOdlStats) + @foreach (var stat in ListOdlStats) {
- @statRecord.Descrizione + @stat.Descrizione
- @(formDurata(statRecord.TotDurata)) + @(formDurata(stat.TotDurata))
-
@($"{calcolaPerc(statRecord.TotDurata):N1}%")
+
@($"{calcolaPerc(stat.TotDurata):N1}%")
@@ -234,14 +234,14 @@ else
- @if (currRecord != null && ListOdlStats != null) + @if (statRecord != null && ListOdlStats != null) {
- +
- @currRecord.DurataMinuti + @statRecord.DurataMinuti
} diff --git a/MP.SPEC/Components/ListODL.razor.cs b/MP.SPEC/Components/ListODL.razor.cs index 4be64bc9..d6b15fbd 100644 --- a/MP.SPEC/Components/ListODL.razor.cs +++ b/MP.SPEC/Components/ListODL.razor.cs @@ -48,19 +48,19 @@ namespace MP.SPEC.Components //oggetto contenente le funzioni del code behind che sono jsInvokable private DotNetObjectReference? objRef; -#if true //FUNZIONA SE IL METODO TriggerDotNetInstanceMethod() E' IN ONCLOCK BOTTONE +#if false //FUNZIONA SE IL METODO TriggerDotNetInstanceMethod() E' IN ONCLICK BOTTONE + [JSInvokable] + public void setHelper() + { + objRef = DotNetObjectReference.Create(this); + } [JSInvokable] public void svuotaRecord() { currRecord = null; } - [JSInvokable] - public void setHelper() - { - objRef = DotNetObjectReference.Create(this); - } public async Task TriggerDotNetInstanceMethod() { await JSRuntime.InvokeVoidAsync("recordDeselect", objRef); @@ -71,6 +71,8 @@ namespace MP.SPEC.Components #region Protected Properties + + [Inject] protected IJSRuntime JSRuntime { get; set; } = null!; @@ -162,6 +164,22 @@ namespace MP.SPEC.Components ListOdlStats = null; } } + protected async Task selectStatRecord(ODLModel? currRec) + { + showStats = true; + await Task.Delay(1); + statRecord = currRec; + if (currRec != null) + { + showStats = true; + ListOdlStats = await MDService.StatOdl(currRec.IdxOdl); + } + else + { + showStats = false; + ListOdlStats = null; + } + } protected async Task selRecord(ODLModel? currRec) { @@ -184,6 +202,8 @@ namespace MP.SPEC.Components private ODLModel? currRecord = null; + private ODLModel? statRecord = null; + private List? ListOdlStats; private List? ListRecords; diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index a10c3528..88ad3e02 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2210.1715 + 6.16.2210.1809 diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 4d586f32..34cb2d33 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2210.1715

+

Versione: 6.16.2210.1809


Note di rilascio:
  • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 9c48c79c..9140f6db 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2210.1715 +6.16.2210.1809 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index e06c02e3..e152c102 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2210.1715 + 6.16.2210.1809 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 diff --git a/MP.SPEC/wwwroot/lib/modalHandler.js b/MP.SPEC/wwwroot/lib/modalHandler.js index d951b3a5..b669ff89 100644 --- a/MP.SPEC/wwwroot/lib/modalHandler.js +++ b/MP.SPEC/wwwroot/lib/modalHandler.js @@ -1,15 +1,4 @@ -//window.recordDeselect = (dotNetHelper) => { -// var myModalEl = document.getElementById('myModal') -// myModalEl.addEventListener('hidden.bs.modal', function (event) { -// // do something... -// //dotNetHelper.invokeMethodAsync('TriggerDotNetInstanceMethod'); -// return dotNetHelper.invokeMethodAsync('svuotaRecord'); -// console.log("fatto"); -// }); -//}; - - -//TENTATIVO POPOLAMENTO HELPER PER POTER INVOCARE IL METODO DOPO +////TENTATIVO POPOLAMENTO HELPER PER POTER INVOCARE IL METODO DOPO //let helper; //window.setHelper = (dotNetHelper) => { @@ -18,15 +7,15 @@ // return dotNetHelper.invokeMethodAsync('setHelper'); //} -//BECCA QUANDO LA MODALE VIENE CHIUSA ED ESEGUE -document.addEventListener('click', function (e) { - if (e.target.id === 'myModal') { - console.log('chiuso'); +////BECCA QUANDO LA MODALE VIENE CHIUSA ED ESEGUE +//document.addEventListener('click', function (e) { +// if (e.target.id === 'myModal') { +// console.log('chiuso'); - return helper.invokeMethodAsync('svuotaRecord'); - console.log("fatto"); - } else { - console.log('aperto'); - } - e.stopPropagation(); -}, false); \ No newline at end of file +// //return helper.invokeMethodAsync('svuotaRecord'); +// console.log("fatto"); +// } else { +// console.log('aperto'); +// } +// e.stopPropagation(); +//}, false); \ No newline at end of file