diff --git a/MP.Mon/Components/CmpFooter.razor b/MP.Mon/Components/CmpFooter.razor index e0e57471..799a3550 100644 --- a/MP.Mon/Components/CmpFooter.razor +++ b/MP.Mon/Components/CmpFooter.razor @@ -1,8 +1,10 @@ -
-
+
+
Mapo MON @(DateTime.Today.Year) | v.@version + | + @Width x @Height
-
+
@($"{DateTime.Now:HH:mm:ss}") | Egalware
diff --git a/MP.Mon/Components/CmpFooter.razor.cs b/MP.Mon/Components/CmpFooter.razor.cs index 6148c074..5a71ad78 100644 --- a/MP.Mon/Components/CmpFooter.razor.cs +++ b/MP.Mon/Components/CmpFooter.razor.cs @@ -1,8 +1,11 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; using NLog; +using System; namespace MP.Mon.Components { - public partial class CmpFooter:IDisposable + public partial class CmpFooter : IDisposable { #region Public Methods @@ -36,8 +39,46 @@ namespace MP.Mon.Components #endregion Public Methods + #region Public Classes + + public class WindowDimension + { + #region Public Properties + + public int Height { get; set; } + public int Width { get; set; } + + #endregion Public Properties + } + + #endregion Public Classes + + #region Protected Properties + + [Inject] + protected IJSRuntime JSRuntime { get; set; } = null!; + + #endregion Protected Properties + #region Protected Methods + protected async Task getWDim() + { + var dimension = await JSRuntime.InvokeAsync("getWindowDimensions"); + Height = dimension.Height; + Width = dimension.Width; + } + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + await getWDim(); + StateHasChanged(); + Log.Debug($"Dimensioni schermo: {Width}x{Height}"); + } + } + protected override void OnInitialized() { var currAssembly = typeof(Program).Assembly.GetName(); @@ -54,5 +95,13 @@ namespace MP.Mon.Components private Version version = null!; #endregion Private Fields + + #region Private Properties + + private int Height { get; set; } = 0; + + private int Width { get; set; } = 0; + + #endregion Private Properties } } \ No newline at end of file diff --git a/MP.Mon/Components/DetailViewMSE.razor.cs b/MP.Mon/Components/DetailViewMSE.razor.cs index f694f163..d024127f 100644 --- a/MP.Mon/Components/DetailViewMSE.razor.cs +++ b/MP.Mon/Components/DetailViewMSE.razor.cs @@ -122,11 +122,11 @@ namespace MP.Mon.Components { // calcolo delta... a-b-c con 5-10-oltre int delta = currText.Length - maxChar4Scroll; - if (delta < 8) + if (delta < 5) { answ = " scroll-left-a"; } - else if (delta < 15) + else if (delta < 10) { answ = " scroll-left-b"; } diff --git a/MP.Mon/Components/DetailViewMSE.razor.css b/MP.Mon/Components/DetailViewMSE.razor.css index 95133a2e..ba6fdff1 100644 --- a/MP.Mon/Components/DetailViewMSE.razor.css +++ b/MP.Mon/Components/DetailViewMSE.razor.css @@ -24,11 +24,12 @@ -webkit-transform: translateX(0%); transform: translateX(0%); } +/* gestione scroll testo A: 90% */ .scroll-left-a span { /* Apply animation to this element */ - -moz-animation: scroll-left-a 9s ease infinite; - -webkit-animation: scroll-left-a 9s ease infinite; - animation: scroll-left-a 9s ease infinite; + -moz-animation: scroll-left-a 10s ease infinite; + -webkit-animation: scroll-left-a 10s ease infinite; + animation: scroll-left-a 10s ease infinite; } /* Move it (define the animation) */ @keyframes scroll-left-a { @@ -42,12 +43,12 @@ transform: translateX(-90%); } } -/* gestione scroll testo B: 120% */ +/* gestione scroll testo B: 100% */ .scroll-left-b span { /* Apply animation to this element */ - -moz-animation: scroll-left-b 9s ease infinite; - -webkit-animation: scroll-left-b 9s ease infinite; - animation: scroll-left-b 9s ease infinite; + -moz-animation: scroll-left-b 10s ease infinite; + -webkit-animation: scroll-left-b 10s ease infinite; + animation: scroll-left-b 10s ease infinite; } /* Move it (define the animation) */ @keyframes scroll-left-b { @@ -64,9 +65,9 @@ /* gestione scroll testo C: 150% */ .scroll-left-c span { /* Apply animation to this element */ - -moz-animation: scroll-left-c 9s ease infinite; - -webkit-animation: scroll-left-c 9s ease infinite; - animation: scroll-left-c 9s ease infinite; + -moz-animation: scroll-left-c 10s ease infinite; + -webkit-animation: scroll-left-c 10s ease infinite; + animation: scroll-left-c 10s ease infinite; } /* Move it (define the animation) */ @keyframes scroll-left-c { diff --git a/MP.Mon/Components/DetailViewMSE.razor.less b/MP.Mon/Components/DetailViewMSE.razor.less index 3001ee2d..9c566dcd 100644 --- a/MP.Mon/Components/DetailViewMSE.razor.less +++ b/MP.Mon/Components/DetailViewMSE.razor.less @@ -22,6 +22,7 @@ } +/* gestione scroll testo A: 90% */ .scroll-left-a { &:extend(.scroll-left); } @@ -29,9 +30,9 @@ .scroll-left-a span { &:extend(.scroll-left span); /* Apply animation to this element */ - -moz-animation: scroll-left-a 9s ease infinite; - -webkit-animation: scroll-left-a 9s ease infinite; - animation: scroll-left-a 9s ease infinite; + -moz-animation: scroll-left-a 10s ease infinite; + -webkit-animation: scroll-left-a 10s ease infinite; + animation: scroll-left-a 10s ease infinite; } /* Move it (define the animation) */ @keyframes scroll-left-a { @@ -48,7 +49,7 @@ } } -/* gestione scroll testo B: 120% */ +/* gestione scroll testo B: 100% */ .scroll-left-b { &:extend(.scroll-left); } @@ -56,9 +57,9 @@ .scroll-left-b span { &:extend(.scroll-left span); /* Apply animation to this element */ - -moz-animation: scroll-left-b 9s ease infinite; - -webkit-animation: scroll-left-b 9s ease infinite; - animation: scroll-left-b 9s ease infinite; + -moz-animation: scroll-left-b 10s ease infinite; + -webkit-animation: scroll-left-b 10s ease infinite; + animation: scroll-left-b 10s ease infinite; } /* Move it (define the animation) */ @keyframes scroll-left-b { @@ -83,9 +84,9 @@ .scroll-left-c span { &:extend(.scroll-left span); /* Apply animation to this element */ - -moz-animation: scroll-left-c 9s ease infinite; - -webkit-animation: scroll-left-c 9s ease infinite; - animation: scroll-left-c 9s ease infinite; + -moz-animation: scroll-left-c 10s ease infinite; + -webkit-animation: scroll-left-c 10s ease infinite; + animation: scroll-left-c 10s ease infinite; } /* Move it (define the animation) */ @keyframes scroll-left-c { diff --git a/MP.Mon/Components/DetailViewMSE.razor.min.css b/MP.Mon/Components/DetailViewMSE.razor.min.css index 929b995b..b570075d 100644 --- a/MP.Mon/Components/DetailViewMSE.razor.min.css +++ b/MP.Mon/Components/DetailViewMSE.razor.min.css @@ -1 +1 @@ -.scroll-left,.scroll-left-a,.scroll-left-b,.scroll-left-c{height:1.5em;overflow:hidden;position:relative;width:100%;white-space:nowrap;}.scroll-left span,.scroll-left-a span,.scroll-left-b span,.scroll-left-c span{position:absolute;width:100%;height:100%;margin:0;line-height:1.5em;-moz-transform:translateX(0%);-webkit-transform:translateX(0%);transform:translateX(0%);}.scroll-left-a span{-moz-animation:scroll-left-a 9s ease infinite;-webkit-animation:scroll-left-a 9s ease infinite;animation:scroll-left-a 9s ease infinite;}@keyframes scroll-left-a{0%{transform:translateX(0%);}30%{transform:translateX(0%);}90%{transform:translateX(-90%);}}.scroll-left-b span{-moz-animation:scroll-left-b 9s ease infinite;-webkit-animation:scroll-left-b 9s ease infinite;animation:scroll-left-b 9s ease infinite;}@keyframes scroll-left-b{0%{transform:translateX(0%);}30%{transform:translateX(0%);}90%{transform:translateX(-120%);}}.scroll-left-c span{-moz-animation:scroll-left-c 9s ease infinite;-webkit-animation:scroll-left-c 9s ease infinite;animation:scroll-left-c 9s ease infinite;}@keyframes scroll-left-c{0%{transform:translateX(0%);}30%{transform:translateX(0%);}90%{transform:translateX(-150%);}} \ No newline at end of file +.scroll-left,.scroll-left-a,.scroll-left-b,.scroll-left-c{height:1.5em;overflow:hidden;position:relative;width:100%;white-space:nowrap;}.scroll-left span,.scroll-left-a span,.scroll-left-b span,.scroll-left-c span{position:absolute;width:100%;height:100%;margin:0;line-height:1.5em;-moz-transform:translateX(0%);-webkit-transform:translateX(0%);transform:translateX(0%);}.scroll-left-a span{-moz-animation:scroll-left-a 10s ease infinite;-webkit-animation:scroll-left-a 10s ease infinite;animation:scroll-left-a 10s ease infinite;}@keyframes scroll-left-a{0%{transform:translateX(0%);}30%{transform:translateX(0%);}90%{transform:translateX(-90%);}}.scroll-left-b span{-moz-animation:scroll-left-b 10s ease infinite;-webkit-animation:scroll-left-b 10s ease infinite;animation:scroll-left-b 10s ease infinite;}@keyframes scroll-left-b{0%{transform:translateX(0%);}30%{transform:translateX(0%);}90%{transform:translateX(-120%);}}.scroll-left-c span{-moz-animation:scroll-left-c 10s ease infinite;-webkit-animation:scroll-left-c 10s ease infinite;animation:scroll-left-c 10s ease infinite;}@keyframes scroll-left-c{0%{transform:translateX(0%);}30%{transform:translateX(0%);}90%{transform:translateX(-150%);}} \ No newline at end of file diff --git a/MP.Mon/MP.Mon.csproj b/MP.Mon/MP.Mon.csproj index 40849609..c31ed3fe 100644 --- a/MP.Mon/MP.Mon.csproj +++ b/MP.Mon/MP.Mon.csproj @@ -4,7 +4,7 @@ net6.0 enable enable - 6.16.2503.1216 + 6.16.2503.1219 diff --git a/MP.Mon/Pages/Index.razor b/MP.Mon/Pages/Index.razor index 3820fa58..75175021 100644 --- a/MP.Mon/Pages/Index.razor +++ b/MP.Mon/Pages/Index.razor @@ -35,20 +35,12 @@ else mseIdx++; if (currMse != null) { - bool showOld = false; - bool showNew = true; - @if (showOld) - { -
+ @*
-
- } - if(showNew) - { -
- -
- } +
*@ +
+ +
} else { @@ -58,32 +50,4 @@ else
} - @*
- @{ - int currIdx = 0; - foreach (var recordIob in ListMSE) - { -
- -
- currIdx++; - if (currIdx >= maxCol) - { - currIdx = 0; - @((MarkupString)"
") - ; - } - } - // controllo se devo "chiudere riga... - int currNum = (currIdx % maxCol); - while (currNum < (maxCol)) - { - @((MarkupString)"
 
") - ; - currNum++; - - } - } -
*@ - } diff --git a/MP.Mon/Pages/_Layout.cshtml b/MP.Mon/Pages/_Layout.cshtml index 68d8f365..0b7c41c7 100644 --- a/MP.Mon/Pages/_Layout.cshtml +++ b/MP.Mon/Pages/_Layout.cshtml @@ -58,6 +58,7 @@ }); *@ +