From 0bd15709aa9241c05d6a605ee4e89cfc825dc461 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Fri, 28 Oct 2022 17:05:31 +0200 Subject: [PATCH] Aggiunta alarms preview --- MP.MONO.UI/Components/AlarmsOverview.razor | 1 + MP.MONO.UI/Components/AlarmsOverview.razor.cs | 4 ++ MP.MONO.UI/MP.MONO.UI.csproj | 2 +- MP.MONO.UI/Pages/Index.razor | 43 ++++++++++++++++--- MP.MONO.UI/Pages/Test.razor | 16 +++++++ MP.MONO.UI/Pages/Test.razor.cs | 9 +++- MP.MONO.UI/Pages/_Layout.cshtml | 1 + MP.MONO.UI/Resources/ChangeLog.html | 2 +- MP.MONO.UI/Resources/VersNum.txt | 2 +- MP.MONO.UI/Resources/manifest.xml | 2 +- MP.MONO.UI/wwwroot/css/site.less | 2 + MP.MONO.UI/wwwroot/lib/popover.js | 9 ++++ 12 files changed, 81 insertions(+), 12 deletions(-) create mode 100644 MP.MONO.UI/wwwroot/lib/popover.js diff --git a/MP.MONO.UI/Components/AlarmsOverview.razor b/MP.MONO.UI/Components/AlarmsOverview.razor index 5f2e607..2589855 100644 --- a/MP.MONO.UI/Components/AlarmsOverview.razor +++ b/MP.MONO.UI/Components/AlarmsOverview.razor @@ -7,6 +7,7 @@ @if (@ListRecords != null) { +
diff --git a/MP.MONO.UI/Components/AlarmsOverview.razor.cs b/MP.MONO.UI/Components/AlarmsOverview.razor.cs index 5683664..0036be2 100644 --- a/MP.MONO.UI/Components/AlarmsOverview.razor.cs +++ b/MP.MONO.UI/Components/AlarmsOverview.razor.cs @@ -44,6 +44,10 @@ namespace MP.MONO.UI.Components } return answ; } + private void showAalarms() + { + compMode = !compMode; + } #endregion Public Methods diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 45a44b9..84c1c55 100644 --- a/MP.MONO.UI/MP.MONO.UI.csproj +++ b/MP.MONO.UI/MP.MONO.UI.csproj @@ -5,7 +5,7 @@ enable enable AnyCPU;x86;x64 - 1.2.2210.2811 + 1.2.2210.2815 diff --git a/MP.MONO.UI/Pages/Index.razor b/MP.MONO.UI/Pages/Index.razor index d8cf9f8..73f1742 100644 --- a/MP.MONO.UI/Pages/Index.razor +++ b/MP.MONO.UI/Pages/Index.razor @@ -5,14 +5,34 @@
-

MAPO-MONO

+

MAPO-MONO

-
-
- - @*
ALARMS
*@ - -
+
+
+
+ +
+ @if (!compMode) + { + +
+ + + +
+ } + else + { +
+ + + + +
+ }
@@ -92,3 +112,12 @@
+ +@code { + private bool compMode { get; set; } = false; + + private void showAalarms() + { + compMode = !compMode; + } +} diff --git a/MP.MONO.UI/Pages/Test.razor b/MP.MONO.UI/Pages/Test.razor index eda304d..9d91873 100644 --- a/MP.MONO.UI/Pages/Test.razor +++ b/MP.MONO.UI/Pages/Test.razor @@ -59,3 +59,19 @@
*@ +
+ + + +

This is a title

+

+ +

+
+ +
+ + @*
ALARMS
*@ + +
+
\ No newline at end of file diff --git a/MP.MONO.UI/Pages/Test.razor.cs b/MP.MONO.UI/Pages/Test.razor.cs index 9d5434a..34e3d5e 100644 --- a/MP.MONO.UI/Pages/Test.razor.cs +++ b/MP.MONO.UI/Pages/Test.razor.cs @@ -18,8 +18,11 @@ using MP.MONO.UI.Components; namespace MP.MONO.UI.Pages { + public partial class Test { + [Inject] + private IJSRuntime JSRuntime { get; set; } = null!; protected int _numHourPrev = 24; protected int numHourPrev { @@ -40,9 +43,13 @@ namespace MP.MONO.UI.Pages protected override async Task OnInitializedAsync() { + await ReloadData(); } - + private async void popover() + { + await JSRuntime.InvokeVoidAsync("pop"); + } private async Task ReloadData() { await Task.Delay(1); diff --git a/MP.MONO.UI/Pages/_Layout.cshtml b/MP.MONO.UI/Pages/_Layout.cshtml index 69d4642..a2b3937 100644 --- a/MP.MONO.UI/Pages/_Layout.cshtml +++ b/MP.MONO.UI/Pages/_Layout.cshtml @@ -56,5 +56,6 @@ + diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 75395e8..6fa1195 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

Version: 1.2.2210.2811

+

Version: 1.2.2210.2815


Release Note:
  • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 53dd5cd..eff0546 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2210.2811 +1.2.2210.2815 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index fb3a217..ba67947 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2210.2811 + 1.2.2210.2815 http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html false diff --git a/MP.MONO.UI/wwwroot/css/site.less b/MP.MONO.UI/wwwroot/css/site.less index 632f9a4..7d0dbc4 100644 --- a/MP.MONO.UI/wwwroot/css/site.less +++ b/MP.MONO.UI/wwwroot/css/site.less @@ -10,6 +10,8 @@ html, body { /*font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;*/ font-family: 'Roboto', sans-serif; } + + .pulse-warning { /*color: rgba(255, 255, 255, 0.8);*/ box-shadow: 0px 0px 20px 5px rgba(255, 0, 0, .8); diff --git a/MP.MONO.UI/wwwroot/lib/popover.js b/MP.MONO.UI/wwwroot/lib/popover.js new file mode 100644 index 0000000..2f249ae --- /dev/null +++ b/MP.MONO.UI/wwwroot/lib/popover.js @@ -0,0 +1,9 @@ + + +window.pop = () => { + var popoverTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]')) + var popoverList = popoverTriggerList.map(function (popoverTriggerEl) { + return new bootstrap.Popover(popoverTriggerEl) + console.log("fatto"); + }) +} \ No newline at end of file