From 91d7c8598fdae31481ac7406fc748fe3c2a08467 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 12 Mar 2025 12:17:16 +0100 Subject: [PATCH] Update MON --- MP.Mon/Components/DetailViewMSE.razor | 110 ++++++++++------- MP.Mon/Components/DetailViewMSE.razor.cs | 113 ++++++++++++++---- MP.Mon/Components/DetailViewMSE.razor.css | 41 +++++++ MP.Mon/Components/DetailViewMSE.razor.less | 47 ++++++++ MP.Mon/Components/DetailViewMSE.razor.min.css | 1 + MP.Mon/MP.Mon.csproj | 2 +- MP.Mon/Pages/Index.razor | 23 ++-- MP.Mon/Resources/ChangeLog.html | 2 +- MP.Mon/Resources/VersNum.txt | 2 +- MP.Mon/Resources/manifest.xml | 2 +- MP.Mon/compilerconfig.json | 4 + MP.Stats/MP.Stats.csproj | 4 +- MP.Stats/Resources/ChangeLog.html | 2 +- MP.Stats/Resources/VersNum.txt | 2 +- MP.Stats/Resources/manifest.xml | 2 +- 15 files changed, 274 insertions(+), 83 deletions(-) create mode 100644 MP.Mon/Components/DetailViewMSE.razor.css create mode 100644 MP.Mon/Components/DetailViewMSE.razor.less create mode 100644 MP.Mon/Components/DetailViewMSE.razor.min.css diff --git a/MP.Mon/Components/DetailViewMSE.razor b/MP.Mon/Components/DetailViewMSE.razor index b14216e3..0eea4158 100644 --- a/MP.Mon/Components/DetailViewMSE.razor +++ b/MP.Mon/Components/DetailViewMSE.razor @@ -4,57 +4,79 @@ } else { -
-
-
@CurrRecord.Nome
-
-
-
- ART: -
-
- @if (showArt == "CodArticolo") - { - @CurrRecord.CodArticolo - } - else - { - if (string.IsNullOrEmpty(CurrRecord.Disegno)) +
+
+
+
+ @CurrRecord.Nome +
+
+
+
+ ART: +
+
+ @if (showArt == "CodArticolo") { - [@CurrRecord.CodArticolo] + @CurrRecord.CodArticolo } else { - @CurrRecord.Disegno + if (string.IsNullOrEmpty(CurrRecord.Disegno)) + { + [@CurrRecord.CodArticolo] + } + else + { + @CurrRecord.Disegno + } } - } +
-
-
-
- PODL: +
+
+ PODL: +
+
+ @(CurrRecord.IdxPOdl > 0 ? $"{CurrRecord.IdxPOdl:00000000}" : "-") +
-
- @(CurrRecord.IdxPOdl > 0 ? $"{CurrRecord.IdxPOdl:00000000}" : "-") -
-
-
-
- ODL: -
-
- @(CurrRecord.IdxOdl > 0 ? $"{CurrRecord.IdxOdl:00000000}" : "-") +
+
+ ODL: +
+
+ @(CurrRecord.IdxOdl > 0 ? $"{CurrRecord.IdxOdl:00000000}" : "-") +
+ @if (hasRow(4)) + { +
+ @foreach (var item in rowValues(4)) + { +
@item.TagName: @currVal(item.TagLocation)
+ } +
+ } + else + { +
+
TC. Act
+
@getMinSec(@CurrRecord.TCLavRT) [@getMinSec(@CurrRecord.TCAssegnato)]
+
+ }
-
-
+
+
@CurrRecord.DescrizioneStato
@getMinSec(getDecimal(@CurrRecord.Durata))
+ +
- @CurrRecord.PezziProd / @CurrRecord.NumPezzi + @CurrRecord.PezziProd / @CurrRecord.NumPezzi
@@ -65,15 +87,15 @@ else
*@
-
-
- @if (showComErr(CurrRecord.LastUpdate)) - { -
+
+
+
+ @if (showComErr(CurrRecord.LastUpdate)) + { C.101 -
- } -
+ } +
+
@CurrRecord.LastUpdate
diff --git a/MP.Mon/Components/DetailViewMSE.razor.cs b/MP.Mon/Components/DetailViewMSE.razor.cs index b0988978..f6aacf60 100644 --- a/MP.Mon/Components/DetailViewMSE.razor.cs +++ b/MP.Mon/Components/DetailViewMSE.razor.cs @@ -44,19 +44,90 @@ namespace MP.Mon.Components #endregion Protected Properties - #region Private Methods + #region Protected Methods - private decimal getDecimal(object? rawData) + /// + /// Verifica se ci sia un override per la riga indicata + /// + /// + /// + protected bool hasRow(int numRow) { - decimal answ = 0; - if (rawData != null) + bool answ = false; + if (currTagConf != null) { - decimal.TryParse($"{rawData}", out answ); + if (currTagConf.Count > 0) + { + var currVals = rowValues(numRow); + answ = currVals.Count > 0; + } + } + return answ; + } + /// + /// Restituisce (se presenti) valori di override per la riga indicata + /// + /// + /// + protected List rowValues(int numRow) + { + List? rowVals = null; + if (currTagConf != null) + { + if (currTagConf.Count > 0) + { + //cerco solo la riga corrente... + rowVals = currTagConf.Where(x => x.RowNum == numRow).ToList(); + } + } + if (rowVals == null) + { + rowVals = new List(); + } + return rowVals; + } + + /// + /// restituisce il valore data la tagLocation + /// + /// + /// + protected string currVal(string tagLocation) + { + string answ = ""; + if (currTagVal.ContainsKey(tagLocation)) + { + answ = currTagVal[tagLocation]; } return answ; } - private string cssStatus(string codSemaforo) + #endregion Protected Methods + + #region Private Methods + + private string cssComStatus(string semaforo, DateTime? lastUpdateN) + { + DateTime lastUpdate = lastUpdateN.HasValue ? (DateTime)lastUpdateN : DateTime.Now.AddHours(-1); + string answ = "bg-dark opacity-75"; cssStatus(semaforo, false); + if (DateTime.Now.Subtract(lastUpdate).TotalSeconds > (keepAliveMin * kaFactor)) + { + answ = $"bg-danger"; + // blink se secondo pari... +#if false + DateTime adesso = DateTime.Now; + int resto = 0; + Math.DivRem(adesso.Second, 2, out resto); + if (resto == 0) + { + answ += " opacity-100"; + } +#endif + } + return answ; + } + + private string cssStatus(string codSemaforo, bool animate) { string answ = ""; // se vuoto --> mostra nero! @@ -69,28 +140,34 @@ namespace MP.Mon.Components { case "sVe": answ = "bg-success"; - doAnimate = false; + animate = false; break; + case "sGi": answ = "bg-warning"; break; + case "sGr": answ = "bg-dark opacity-75"; - doAnimate = false; + animate = false; break; + case "sRo": answ = "bg-danger"; break; + case "sBl": answ = "bg-primary"; break; + case "sNe": answ = "bg-dark"; break; + default: break; } - if (doAnimate) + if (animate) { if (doBlink) { @@ -99,21 +176,13 @@ namespace MP.Mon.Components } return answ; } - private string cssComStatus(string semaforo, DateTime? lastUpdateN) + + private decimal getDecimal(object? rawData) { - DateTime lastUpdate = lastUpdateN.HasValue ? (DateTime)lastUpdateN : DateTime.Now.AddHours(-1); - string answ = cssStatus(semaforo); - if (DateTime.Now.Subtract(lastUpdate).TotalSeconds > (keepAliveMin * kaFactor)) + decimal answ = 0; + if (rawData != null) { - answ = $"bg-danger"; - // blink se secondo pari... - DateTime adesso = DateTime.Now; - int resto = 0; - Math.DivRem(adesso.Second, 2, out resto); - if (resto == 0) - { - answ += " opacity-75"; - } + decimal.TryParse($"{rawData}", out answ); } return answ; } diff --git a/MP.Mon/Components/DetailViewMSE.razor.css b/MP.Mon/Components/DetailViewMSE.razor.css new file mode 100644 index 00000000..11f9df59 --- /dev/null +++ b/MP.Mon/Components/DetailViewMSE.razor.css @@ -0,0 +1,41 @@ +/* gestione scroll testo */ +.scroll-left { + overflow: hidden; + position: relative; + width: 100%; + white-space: nowrap; +} +.scroll-left span { + /*display: inline-block;*/ + position: absolute; + width: 100%; + height: 100%; + margin: 0; + line-height: 1.5em; + /* Starting position */ + -moz-transform: translateX(-50%); + -webkit-transform: translateX(-50%); + transform: translateX(-50%); + /* Apply animation to this element */ + -moz-animation: scroll-left 20s ease infinite; + -webkit-animation: scroll-left 20s ease infinite; + animation: scroll-left 20s ease infinite; +} +/* Move it (define the animation) */ +@keyframes scroll-left { + 0% { + transform: translateX(-50%); + } + 25% { + transform: translateX(-30%); + } + 50% { + transform: translateX(-50%); + } + 75% { + transform: translateX(-70%); + } + 100% { + transform: translateX(-50%); + } +} \ No newline at end of file diff --git a/MP.Mon/Components/DetailViewMSE.razor.less b/MP.Mon/Components/DetailViewMSE.razor.less new file mode 100644 index 00000000..1b5e04c2 --- /dev/null +++ b/MP.Mon/Components/DetailViewMSE.razor.less @@ -0,0 +1,47 @@ + +/* gestione scroll testo */ +.scroll-left { + overflow: hidden; + position: relative; + width: 100%; + white-space: nowrap; +} + +.scroll-left span { + /*display: inline-block;*/ + position: absolute; + width: 100%; + height: 100%; + margin: 0; + line-height: 1.5em; + /* Starting position */ + -moz-transform: translateX(-50%); + -webkit-transform: translateX(-50%); + transform: translateX(-50%); + /* Apply animation to this element */ + -moz-animation: scroll-left 20s ease infinite; + -webkit-animation: scroll-left 20s ease infinite; + animation: scroll-left 20s ease infinite; +} +/* Move it (define the animation) */ +@keyframes scroll-left { + 0% { + transform: translateX(-50%); + } + + 25% { + transform: translateX(-30%); + } + + 50% { + transform: translateX(-50%); + } + + 75% { + transform: translateX(-70%); + } + + 100% { + transform: translateX(-50%); + } +} diff --git a/MP.Mon/Components/DetailViewMSE.razor.min.css b/MP.Mon/Components/DetailViewMSE.razor.min.css new file mode 100644 index 00000000..e8737628 --- /dev/null +++ b/MP.Mon/Components/DetailViewMSE.razor.min.css @@ -0,0 +1 @@ +.scroll-left{overflow:hidden;position:relative;width:100%;white-space:nowrap;}.scroll-left span{position:absolute;width:100%;height:100%;margin:0;line-height:1.5em;-moz-transform:translateX(-50%);-webkit-transform:translateX(-50%);transform:translateX(-50%);-moz-animation:scroll-left 20s ease infinite;-webkit-animation:scroll-left 20s ease infinite;animation:scroll-left 20s ease infinite;}@keyframes scroll-left{0%{transform:translateX(-50%);}25%{transform:translateX(-30%);}50%{transform:translateX(-50%);}75%{transform:translateX(-70%);}100%{transform:translateX(-50%);}} \ No newline at end of file diff --git a/MP.Mon/MP.Mon.csproj b/MP.Mon/MP.Mon.csproj index bec92edd..fb1d84bf 100644 --- a/MP.Mon/MP.Mon.csproj +++ b/MP.Mon/MP.Mon.csproj @@ -4,7 +4,7 @@ net6.0 enable enable - 6.16.2503.1207 + 6.16.2503.1211 diff --git a/MP.Mon/Pages/Index.razor b/MP.Mon/Pages/Index.razor index d11cc08d..3820fa58 100644 --- a/MP.Mon/Pages/Index.razor +++ b/MP.Mon/Pages/Index.razor @@ -35,13 +35,20 @@ else mseIdx++; if (currMse != null) { -
- -
- - @*
- -
*@ + bool showOld = false; + bool showNew = true; + @if (showOld) + { +
+ +
+ } + if(showNew) + { +
+ +
+ } } else { @@ -51,7 +58,7 @@ else
} -@*
+ @*
@{ int currIdx = 0; foreach (var recordIob in ListMSE) diff --git a/MP.Mon/Resources/ChangeLog.html b/MP.Mon/Resources/ChangeLog.html index 95a313a2..c1026c5a 100644 --- a/MP.Mon/Resources/ChangeLog.html +++ b/MP.Mon/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MON MAPO -

Versione: 6.16.2503.1207

+

Versione: 6.16.2503.1211


Note di rilascio:
  • diff --git a/MP.Mon/Resources/VersNum.txt b/MP.Mon/Resources/VersNum.txt index 4caf3356..51e49edd 100644 --- a/MP.Mon/Resources/VersNum.txt +++ b/MP.Mon/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2503.1207 +6.16.2503.1211 diff --git a/MP.Mon/Resources/manifest.xml b/MP.Mon/Resources/manifest.xml index e8691b20..4d2527d3 100644 --- a/MP.Mon/Resources/manifest.xml +++ b/MP.Mon/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2503.1207 + 6.16.2503.1211 https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.Mon.zip https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html false diff --git a/MP.Mon/compilerconfig.json b/MP.Mon/compilerconfig.json index 16f25062..096f92bc 100644 --- a/MP.Mon/compilerconfig.json +++ b/MP.Mon/compilerconfig.json @@ -10,5 +10,9 @@ { "outputFile": "Components/DetailMSE.razor.css", "inputFile": "Components/DetailMSE.razor.less" + }, + { + "outputFile": "Components/DetailViewMSE.razor.css", + "inputFile": "Components/DetailViewMSE.razor.less" } ] \ No newline at end of file diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index eaa0030e..4ef8fe9f 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,8 +4,8 @@ net6.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 6.16.2503.1207 - 6.16.2503.1207 + 6.16.2503.1210 + 6.16.2503.1210 true $(NoWarn);1591 en diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html index 7f4a9db5..5e4a1a00 100644 --- a/MP.Stats/Resources/ChangeLog.html +++ b/MP.Stats/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

    Versione: 6.16.2503.1207

    +

    Versione: 6.16.2503.1210


    Note di rilascio:
      diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt index 4caf3356..c81df893 100644 --- a/MP.Stats/Resources/VersNum.txt +++ b/MP.Stats/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2503.1207 +6.16.2503.1210 diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml index f93be876..7c8757d8 100644 --- a/MP.Stats/Resources/manifest.xml +++ b/MP.Stats/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2503.1207 + 6.16.2503.1210 https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html false