diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor index c5feda72..e9114edf 100644 --- a/MP-TAB3/Components/MachineBlock.razor +++ b/MP-TAB3/Components/MachineBlock.razor @@ -105,8 +105,15 @@ else
-
- @RecMSE.DescrizioneStato:   @(FormatDurata(RecMSE.Durata)) +
+
+ @RecMSE.DescrizioneStato +
+
+ + @(FormatDurata(RecMSE.Durata)) + +
@@ -282,10 +289,10 @@ else
- @RecMSE.DescrizioneStato : + @RecMSE.DescrizioneStato
- @(FormatDurata(RecMSE.Durata)) + @(FormatDurata(RecMSE.Durata))
diff --git a/MP-TAB3/Components/MachineBlock.razor.cs b/MP-TAB3/Components/MachineBlock.razor.cs index 1cd45001..3a525255 100644 --- a/MP-TAB3/Components/MachineBlock.razor.cs +++ b/MP-TAB3/Components/MachineBlock.razor.cs @@ -81,6 +81,9 @@ namespace MP_TAB3.Components #endregion Public Methods + /// + /// CSS Class x overlay (effetto spento x macchina spenta/ sGr) + /// protected string overlayCss { get @@ -93,6 +96,10 @@ namespace MP_TAB3.Components return answ; } } + + /// + /// CSS Class bordo da stato macchina + /// protected string borderCss { get @@ -115,14 +122,14 @@ namespace MP_TAB3.Components answ += " border-dark"; break; - //case "sBl": - // answ += " border-primary"; - // break; + case "sBl": + answ += " border-primary"; + break; + + case "sVe": + answ += " border-success"; + break; - //case "sVe": - // answ += " border-success"; - // break; - default: answ += " border-secondary"; break; @@ -132,6 +139,22 @@ namespace MP_TAB3.Components } } + /// + /// CSS calss x testo (se descr lunga scorre...) + /// + protected string textDescrCss + { + get + { + string answ = "text-nowrap"; + if (RecMSE != null && RecMSE.DescrizioneStato.Length > 18) + { + answ = " scroll-left"; + } + return answ; + } + } + #region Protected Fields protected string baseCss = "sem"; diff --git a/MP-TAB3/Components/MachineBlock.razor.css b/MP-TAB3/Components/MachineBlock.razor.css index c63d6b7a..536f7f6f 100644 --- a/MP-TAB3/Components/MachineBlock.razor.css +++ b/MP-TAB3/Components/MachineBlock.razor.css @@ -28,6 +28,43 @@ background: rgba(33, 36, 39, 0.75); border-radius: 15px 15px 0 0; } +/* gestione scroll testo */ +.scroll-left { + height: 1.5em; + overflow: hidden; + position: relative; + width: 70%; + white-space: nowrap; + /*display: inline-block;*/ +} +.scroll-left span { + /*display: inline-block;*/ + position: absolute; + width: 100%; + height: 100%; + margin: 0; + line-height: 1.5em; + /* Starting position */ + -moz-transform: translateX(0%); + -webkit-transform: translateX(0%); + transform: translateX(0%); + /* Apply animation to this element */ + -moz-animation: scroll-left 8s ease infinite; + -webkit-animation: scroll-left 8s ease infinite; + animation: scroll-left 8s ease infinite; +} +/* Move it (define the animation) */ +@keyframes scroll-left { + 0% { + transform: translateX(0%); + } + 30% { + transform: translateX(0%); + } + 80% { + transform: translateX(-50%); + } +} /* area semafori*/ .sVe { text-align: left; diff --git a/MP-TAB3/Components/MachineBlock.razor.less b/MP-TAB3/Components/MachineBlock.razor.less index 64f1bb69..1a4ffc33 100644 --- a/MP-TAB3/Components/MachineBlock.razor.less +++ b/MP-TAB3/Components/MachineBlock.razor.less @@ -30,7 +30,44 @@ background: rgba(33,36,39,.75); border-radius: 15px 15px 0 0; } +/* gestione scroll testo */ +.scroll-left { + height: 1.5em; + overflow: hidden; + position: relative; + width: 70%; + white-space: nowrap; + /*display: inline-block;*/ +} +.scroll-left span { + /*display: inline-block;*/ + position: absolute; + width: 100%; + height: 100%; + margin: 0; + line-height: 1.5em; + /* Starting position */ + -moz-transform: translateX(0%); + -webkit-transform: translateX(0%); + transform: translateX(0%); + /* Apply animation to this element */ + -moz-animation: scroll-left 8s ease infinite; + -webkit-animation: scroll-left 8s ease infinite; + animation: scroll-left 8s ease infinite; +} +/* Move it (define the animation) */ +@keyframes scroll-left { + 0% { + transform: translateX(0%); + } + 30% { + transform: translateX(0%); + } + 80% { + transform: translateX(-50%); + } +} /* area semafori*/ .sVe { text-align: left; diff --git a/MP-TAB3/Components/MachineBlock.razor.min.css b/MP-TAB3/Components/MachineBlock.razor.min.css index d7b3e5b2..4b64d50a 100644 --- a/MP-TAB3/Components/MachineBlock.razor.min.css +++ b/MP-TAB3/Components/MachineBlock.razor.min.css @@ -1 +1 @@ -.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);min-width:8em;}.labelTop{padding:.1em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#fff;background:#2200de;background:rgba(33,36,39,.75);border-radius:15px 15px 0 0;}.sVe{text-align:left;background:#198754;color:#fff;}.sGi{text-align:left;background:#ffc107;background:rgba(255,220,0,.6);color:#fff;}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);color:#fff;}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#fff;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);color:#fff;}.card-body{background-color:currentColor;background-image:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);border-radius:0 0 15px 15px;}.imgFitToSize{height:11rem;object-fit:cover;border-radius:15px 15px 0 0;}@media(max-width:640.98px){.imgFitToSize{height:8rem;}.card-body{background-color:transparent;}}.statusCard{border-radius:.5rem;} \ No newline at end of file +.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);min-width:8em;}.labelTop{padding:.1em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#fff;background:#2200de;background:rgba(33,36,39,.75);border-radius:15px 15px 0 0;}.scroll-left{height:1.5em;overflow:hidden;position:relative;width:70%;white-space:nowrap;}.scroll-left span{position:absolute;width:100%;height:100%;margin:0;line-height:1.5em;-moz-transform:translateX(0%);-webkit-transform:translateX(0%);transform:translateX(0%);-moz-animation:scroll-left 8s ease infinite;-webkit-animation:scroll-left 8s ease infinite;animation:scroll-left 8s ease infinite;}@keyframes scroll-left{0%{transform:translateX(0%);}30%{transform:translateX(0%);}80%{transform:translateX(-50%);}}.sVe{text-align:left;background:#198754;color:#fff;}.sGi{text-align:left;background:#ffc107;background:rgba(255,220,0,.6);color:#fff;}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);color:#fff;}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#fff;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);color:#fff;}.card-body{background-color:currentColor;background-image:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);border-radius:0 0 15px 15px;}.imgFitToSize{height:11rem;object-fit:cover;border-radius:15px 15px 0 0;}@media(max-width:640.98px){.imgFitToSize{height:8rem;}.card-body{background-color:transparent;}}.statusCard{border-radius:.5rem;} \ No newline at end of file diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index a267f372..60e338b8 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2402.2608 + 6.16.2402.2610 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index c8c9f431..6eb2c6bd 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2402.2608

+

Versione: 6.16.2402.2610


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index 83b65a12..dce54adc 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2402.2608 +6.16.2402.2610 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index 8c11ca8a..9b46d4e4 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2402.2608 + 6.16.2402.2610 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false