From 86c5657d511f4c953eff646d10cc39809225a0a6 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 Mar 2025 09:09:40 +0100 Subject: [PATCH] Fix sizing dinamico placeholder macchine in TAB3 x statusMap --- MP-TAB3/Components/PlaceholderStatusMap.razor | 17 ++++---- .../Components/PlaceholderStatusMap.razor.css | 22 +++++++++- .../PlaceholderStatusMap.razor.less | 25 ++++++++++- .../PlaceholderStatusMap.razor.min.css | 2 +- MP-TAB3/MP-TAB3.csproj | 2 +- MP-TAB3/Pages/StatusMap.razor | 42 ++++++------------- MP-TAB3/Resources/ChangeLog.html | 2 +- MP-TAB3/Resources/VersNum.txt | 2 +- MP-TAB3/Resources/manifest.xml | 2 +- MP.MON/MP.MON.csproj | 2 +- MP.MON/Resources/ChangeLog.html | 2 +- MP.MON/Resources/VersNum.txt | 2 +- MP.MON/Resources/manifest.xml | 2 +- 13 files changed, 75 insertions(+), 49 deletions(-) diff --git a/MP-TAB3/Components/PlaceholderStatusMap.razor b/MP-TAB3/Components/PlaceholderStatusMap.razor index 8d12accf..f5075e16 100644 --- a/MP-TAB3/Components/PlaceholderStatusMap.razor +++ b/MP-TAB3/Components/PlaceholderStatusMap.razor @@ -1,25 +1,26 @@ 
-
+
-
+
-
- +
-
+
-
- +
+
-
+
+ + diff --git a/MP-TAB3/Components/PlaceholderStatusMap.razor.css b/MP-TAB3/Components/PlaceholderStatusMap.razor.css index 218fdd85..73c94457 100644 --- a/MP-TAB3/Components/PlaceholderStatusMap.razor.css +++ b/MP-TAB3/Components/PlaceholderStatusMap.razor.css @@ -1,4 +1,24 @@ .pholderHeight { - height: 3rem; + height: 5.5rem; object-fit: cover; +} +@media (min-width: 600px) { + .pholderHeight { + height: 5.1rem; + } +} +@media (min-width: 768px) { + .pholderHeight { + height: 7.6rem; + } +} +@media (min-width: 800px) { + .pholderHeight { + height: 8.2rem; + } +} +@media (min-width: 1025px) { + .pholderHeight { + height: 7.2rem; + } } \ No newline at end of file diff --git a/MP-TAB3/Components/PlaceholderStatusMap.razor.less b/MP-TAB3/Components/PlaceholderStatusMap.razor.less index 90d74c36..eda5e2c8 100644 --- a/MP-TAB3/Components/PlaceholderStatusMap.razor.less +++ b/MP-TAB3/Components/PlaceholderStatusMap.razor.less @@ -1,6 +1,29 @@  .pholderHeight { - height: 3rem; + height: 5.5rem; object-fit: cover; } +@media (min-width: 600px) { + .pholderHeight { + height: 5.1rem; + } +} + +@media (min-width: 768px) { + .pholderHeight { + height: 7.6rem; + } +} + +@media (min-width: 800px) { + .pholderHeight { + height: 8.2rem; + } +} + +@media (min-width: 1025px) { + .pholderHeight { + height: 7.2rem; + } +} \ No newline at end of file diff --git a/MP-TAB3/Components/PlaceholderStatusMap.razor.min.css b/MP-TAB3/Components/PlaceholderStatusMap.razor.min.css index 66d7e09e..c3598583 100644 --- a/MP-TAB3/Components/PlaceholderStatusMap.razor.min.css +++ b/MP-TAB3/Components/PlaceholderStatusMap.razor.min.css @@ -1 +1 @@ -.pholderHeight{height:3rem;object-fit:cover;} \ No newline at end of file +.pholderHeight{height:5.5rem;object-fit:cover;}@media(min-width:600px){.pholderHeight{height:5.1rem;}}@media(min-width:768px){.pholderHeight{height:7.6rem;}}@media(min-width:800px){.pholderHeight{height:8.2rem;}}@media(min-width:1025px){.pholderHeight{height:7.2rem;}} \ No newline at end of file diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 098f61e5..b3b50a9a 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2503.1418 + 6.16.2503.1708 enable MP_TAB3 diff --git a/MP-TAB3/Pages/StatusMap.razor b/MP-TAB3/Pages/StatusMap.razor index b2c85453..ba9fa715 100644 --- a/MP-TAB3/Pages/StatusMap.razor +++ b/MP-TAB3/Pages/StatusMap.razor @@ -15,7 +15,6 @@ Nessun impianto abilitato per l'operatore.
- LogOut @@ -43,9 +42,18 @@ mseIdx++; if (currMse != null) { -
- -
+
+ +
+ @* if (mseIdx % 2 == 0) + { + } + else + { +
+ +
+ } *@ } else { @@ -54,31 +62,5 @@ }
} - @*
- @{ - int maxBlocks = calcMaxBlock(); - int currIdx = 0; - @foreach (var item in ListMSE) - { - currIdx++; -
- -
- @if (currIdx >= maxBlocks) - { - currIdx = 0; - @((MarkupString)"
") - @((MarkupString)"
") - } - } - // controllo se devo "chiudere riga... - int currNum = (currIdx % maxBlocks); - while (currNum < (maxBlocks)) - { - @((MarkupString)"
 
") - currNum++; - } - } -
*@ }
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 1664133a..919466f7 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2503.1418

+

Versione: 6.16.2503.1708


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index 7d5437b1..63cb362f 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2503.1418 +6.16.2503.1708 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index b59b180d..84deb40b 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2503.1418 + 6.16.2503.1708 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 diff --git a/MP.MON/MP.MON.csproj b/MP.MON/MP.MON.csproj index 73ea4586..334a40f6 100644 --- a/MP.MON/MP.MON.csproj +++ b/MP.MON/MP.MON.csproj @@ -6,7 +6,7 @@ enable MP.MON $(AssemblyName.Replace(' ', '_')) - 6.16.2503.1512 + 6.16.2503.1707 diff --git a/MP.MON/Resources/ChangeLog.html b/MP.MON/Resources/ChangeLog.html index c56078d1..e3d9bd44 100644 --- a/MP.MON/Resources/ChangeLog.html +++ b/MP.MON/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

    Versione: 6.16.2503.1512

    +

    Versione: 6.16.2503.1707


    Note di rilascio:
    • diff --git a/MP.MON/Resources/VersNum.txt b/MP.MON/Resources/VersNum.txt index bc67faa8..b7dd2621 100644 --- a/MP.MON/Resources/VersNum.txt +++ b/MP.MON/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2503.1512 +6.16.2503.1707 diff --git a/MP.MON/Resources/manifest.xml b/MP.MON/Resources/manifest.xml index cc21e43b..c4fdc0a3 100644 --- a/MP.MON/Resources/manifest.xml +++ b/MP.MON/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2503.1512 + 6.16.2503.1707 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