From 714be658262764d74f1579cdb4876430b9750c48 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 9 Oct 2023 15:26:36 +0200 Subject: [PATCH 1/2] fix grafici --- MP-TAB-SERV/Components/LongStopList.razor | 2 +- MP-TAB-SERV/Components/NotesMan.razor | 7 ++----- MP-TAB-SERV/MP-TAB-SERV.csproj | 2 +- MP-TAB-SERV/Resources/ChangeLog.html | 2 +- MP-TAB-SERV/Resources/VersNum.txt | 2 +- MP-TAB-SERV/Resources/manifest.xml | 2 +- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/MP-TAB-SERV/Components/LongStopList.razor b/MP-TAB-SERV/Components/LongStopList.razor index 8b6044fa..f48192e0 100644 --- a/MP-TAB-SERV/Components/LongStopList.razor +++ b/MP-TAB-SERV/Components/LongStopList.razor @@ -1,4 +1,4 @@ -
+
diff --git a/MP-TAB-SERV/Components/NotesMan.razor b/MP-TAB-SERV/Components/NotesMan.razor index bbec5f1e..ef77be87 100644 --- a/MP-TAB-SERV/Components/NotesMan.razor +++ b/MP-TAB-SERV/Components/NotesMan.razor @@ -2,7 +2,7 @@
-
+
@@ -49,7 +49,7 @@
-
+
# commenti @@ -96,9 +96,6 @@ @($"ODL{item.IdxODL:000000000}")
- @*
- -
*@
} diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index 942f31fc..4523ee58 100644 --- a/MP-TAB-SERV/MP-TAB-SERV.csproj +++ b/MP-TAB-SERV/MP-TAB-SERV.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2310.914 + 6.16.2310.915 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 82a01a36..40b236e5 100644 --- a/MP-TAB-SERV/Resources/ChangeLog.html +++ b/MP-TAB-SERV/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2310.914

+

Versione: 6.16.2310.915


Note di rilascio:
  • diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt index b829241e..acc49c4a 100644 --- a/MP-TAB-SERV/Resources/VersNum.txt +++ b/MP-TAB-SERV/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2310.914 +6.16.2310.915 diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml index b0e6d77f..24998d54 100644 --- a/MP-TAB-SERV/Resources/manifest.xml +++ b/MP-TAB-SERV/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2310.914 + 6.16.2310.915 https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html false From e456635e1b64dc56854f19fe65ebe1cf782192f7 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 9 Oct 2023 16:10:49 +0200 Subject: [PATCH 2/2] fix fnq --- MP-TAB-SERV/Components/LongStopList.razor | 40 +++++++++++--------- MP-TAB-SERV/Components/LongStopList.razor.cs | 36 +++++++++++------- MP-TAB-SERV/Components/NotesMan.razor | 24 ++++++------ MP-TAB-SERV/Components/NotesMan.razor.cs | 17 --------- 4 files changed, 57 insertions(+), 60 deletions(-) diff --git a/MP-TAB-SERV/Components/LongStopList.razor b/MP-TAB-SERV/Components/LongStopList.razor index e49395f1..053b03c0 100644 --- a/MP-TAB-SERV/Components/LongStopList.razor +++ b/MP-TAB-SERV/Components/LongStopList.razor @@ -1,25 +1,29 @@ -
    -
    -
    -
    - @fnqName +@if (currFnq != null) +{ +
    +
    +
    +
    + @currFnq.Macchina +
    +
    + @currFnq.CodArticolo +
    -
    - @fnqArticle -
    -
    -
    -
    - @($"{fnqDateTime:yyyy/MM/dd HH:mm:ss}") - @*09.10.2023 00:30*@ -
    -
    - @*7h 30m*@ - @(fnqDurMin) +
    +
    + @($"{currFnq.InizioStato:yyyy/MM/dd HH:mm:ss}") + @*09.10.2023 00:30*@ +
    +
    + @*7h 30m*@ + @(MP.Data.Utils.FormDurata(currFnq.DurataMinuti)) +
    -
    +} + diff --git a/MP-TAB-SERV/Components/LongStopList.razor.cs b/MP-TAB-SERV/Components/LongStopList.razor.cs index 635f305e..99b41c11 100644 --- a/MP-TAB-SERV/Components/LongStopList.razor.cs +++ b/MP-TAB-SERV/Components/LongStopList.razor.cs @@ -26,21 +26,10 @@ namespace MP_TAB_SERV.Components { public partial class LongStopList { - [Parameter] - public string fnqName { get; set; } = ""; + public FermiNonQualModel currFnq { get; set; } = new FermiNonQualModel(); + //public string fnqSemaforo { get; set; } = ""; - [Parameter] - public string fnqArticle { get; set; } = ""; - - [Parameter] - public DateTime fnqDateTime { get; set; } = DateTime.Now; - - [Parameter] - public double fnqDurMin { get; set; } = 0; - - [Parameter] - public string fnqSemaforo { get; set; } = ""; [Inject] protected MessageService MsgServ { get; set; } = null!; @@ -52,10 +41,29 @@ namespace MP_TAB_SERV.Components { await Task.Delay(1); // salva la data-ora evento richiesto... - await MsgServ.DtRifCommentoSet(fnqDateTime); + await MsgServ.DtRifCommentoSet(currFnq.InizioStato); NavMan.NavigateTo("prod-stop"); } [Inject] protected NavigationManager NavMan { get; set; } = null!; + + + private string setSemaforo(string sem) + { + string answ = ""; + if (sem == "sBl") + { + answ = "bg-primary text-warning"; + } + else if (sem == "sGr") + { + answ = "bg-secondary text-dark"; + } + else if (sem == "sGi") + { + answ = "bg-warning text-dark"; + } + return answ; + } } } \ No newline at end of file diff --git a/MP-TAB-SERV/Components/NotesMan.razor b/MP-TAB-SERV/Components/NotesMan.razor index ef77be87..a94b28fe 100644 --- a/MP-TAB-SERV/Components/NotesMan.razor +++ b/MP-TAB-SERV/Components/NotesMan.razor @@ -1,13 +1,12 @@  -
    +
    -
    - Ultimi gg - @for (int i = 1; i < 11; i++) { @@ -20,12 +19,13 @@ +
    -
    - Durata min - @for (int i = 1; i < 7; i++) { @@ -37,6 +37,7 @@ +
    @@ -44,15 +45,16 @@
    @foreach (var item in RecordListFnq) { - + }
    -
    - # commenti - + +
    + + # Commenti
    diff --git a/MP-TAB-SERV/Components/NotesMan.razor.cs b/MP-TAB-SERV/Components/NotesMan.razor.cs index bb4b3ee4..5ab656d0 100644 --- a/MP-TAB-SERV/Components/NotesMan.razor.cs +++ b/MP-TAB-SERV/Components/NotesMan.razor.cs @@ -93,23 +93,6 @@ namespace MP_TAB_SERV.Components } } - private string setSemaforo(string sem) - { - string answ = ""; - if(sem == "sBl") - { - answ = "bg-primary text-warning"; - } - else if(sem == "sGr") - { - answ = "bg-secondary text-dark"; - } - else if(sem == "sGi") - { - answ = "bg-warning text-dark"; - } - return answ; - } #endregion Private Methods }