diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index 0a29b929..5927e6ee 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.2410.3010
- 6.16.2410.3010
+ 6.16.2410.3110
+ 6.16.2410.3110
true
$(NoWarn);1591
diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html
index 288ce829..285a2b21 100644
--- a/MP.Stats/Resources/ChangeLog.html
+++ b/MP.Stats/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo statistiche MAPO
- Versione: 6.16.2410.3010
+ Versione: 6.16.2410.3110
Note di rilascio:
diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt
index 332be544..54e13fd0 100644
--- a/MP.Stats/Resources/VersNum.txt
+++ b/MP.Stats/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2410.3010
+6.16.2410.3110
diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml
index b0950ae0..6e175db9 100644
--- a/MP.Stats/Resources/manifest.xml
+++ b/MP.Stats/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2410.3010
+ 6.16.2410.3110
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
diff --git a/MP.Stats/Shared/MainLayout.razor b/MP.Stats/Shared/MainLayout.razor
index 79b94cfd..bd7cafc0 100644
--- a/MP.Stats/Shared/MainLayout.razor
+++ b/MP.Stats/Shared/MainLayout.razor
@@ -6,7 +6,7 @@
-
+
diff --git a/MP.Stats/Shared/MainLayout.razor.cs b/MP.Stats/Shared/MainLayout.razor.cs
index 4666af12..569c0663 100644
--- a/MP.Stats/Shared/MainLayout.razor.cs
+++ b/MP.Stats/Shared/MainLayout.razor.cs
@@ -61,5 +61,6 @@ namespace MP.Stats.Shared
private bool ShowSearch { get; set; } = false;
#endregion Private Properties
+
}
}
\ No newline at end of file
diff --git a/MP.Stats/Shared/MainLayout.razor.css b/MP.Stats/Shared/MainLayout.razor.css
index 8dc48221..d92ddf03 100644
--- a/MP.Stats/Shared/MainLayout.razor.css
+++ b/MP.Stats/Shared/MainLayout.razor.css
@@ -1,102 +1,90 @@
-.page {
- position: relative;
- display: flex;
- flex-direction: column;
+.page {
+ position: relative;
+ display: flex;
+ flex-direction: column;
}
-
main {
- flex: 1;
+ flex: 1;
}
-
-.sidebar, .sidebarSmall {
- background-image: linear-gradient(180deg, rgb(5, 39, 103) 20%, #3aa6ff 90%);
+.sidebar,
+.sidebarSmall {
+ background-image: -webkit-linear-gradient(180deg, #052767 20%, #3aa6ff 90%);
+ background-image: linear-gradient(180deg, #052767 20%, #3aa6ff 90%);
}
-
.top-row {
- background-color: #f7f7f7;
- border-bottom: 1px solid #d6d5d5;
- height: 3.5rem;
- align-items: center;
- /*justify-content: space-evenly;
+ background-color: #f7f7f7;
+ border-bottom: 1px solid #d6d5d5;
+ height: 3.5rem;
+ align-items: center;
+ /*justify-content: space-evenly;
display: flex;*/
}
-
- .top-row ::deep a, .top-row .btn-link {
- white-space: nowrap;
- margin-left: 0.5rem;
- }
-
- .top-row a:first-child {
- overflow: hidden;
- text-overflow: ellipsis;
- }
-
+.top-row ::deep a,
+.top-row .btn-link {
+ white-space: nowrap;
+ margin-left: 0.5rem;
+}
+.top-row a:first-child {
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
@media (max-width: 640.98px) {
- .top-row:not(.auth) {
- display: none;
- }
-
- .top-row.auth {
- justify-content: space-between;
- }
-
- .top-row a, .top-row .btn-link {
- margin-left: 0;
- }
+ .top-row:not(.auth) {
+ display: none;
+ }
+ .top-row.auth {
+ justify-content: space-between;
+ }
+ .top-row a,
+ .top-row .btn-link {
+ margin-left: 0;
+ }
}
-
.bottom-row {
- color: #dedede;
- background-color: #000000;
- height: 1.6rem;
- align-items: center;
+ color: #dedede;
+ background-color: #000000;
+ height: 1.6rem;
+ align-items: center;
}
-
@media (max-width: 640.99px) {
- .main > div {
- padding-left: 0.5rem !important;
- padding-right: 0.5rem !important;
- }
+ .main > div {
+ padding-left: 0.5rem !important;
+ padding-right: 0.5rem !important;
+ }
}
-
@media (min-width: 641px) {
- .page {
- flex-direction: row;
- }
-
- .sidebar {
- width: 230px;
- height: 100vh;
- position: sticky;
- top: 0;
- }
-
- .sidebarSmall {
- width: 80px;
- height: 100vh;
- position: sticky;
- top: 0;
- }
-
- .top-row {
- position: sticky;
- top: 0;
- z-index: 1;
- }
-
- .top-row, article {
- padding-left: 1rem !important;
- padding-right: 1.0rem !important;
- }
-
- .bottom-row {
- position: fixed;
- bottom: 0;
- z-index: 1;
- }
-
- .main > div {
- /*padding-left: 0.5rem !important;
+ .page {
+ flex-direction: row;
+ }
+ .sidebar {
+ width: 13.5rem;
+ height: 100vh;
+ position: sticky;
+ top: 0;
+ }
+ .sidebarSmall {
+ width: 4.5rem;
+ height: 100vh;
+ position: sticky;
+ top: 0;
+ }
+ .top-row {
+ position: sticky;
+ top: 0;
+ z-index: 1;
+ }
+ .top-row,
+ article {
+ padding-left: 1rem !important;
+ padding-right: 1rem !important;
+ }
+ .bottom-row {
+ position: fixed;
+ bottom: 0;
+ z-index: 1;
+ }
+ .main > div {
+ /*padding-left: 0.5rem !important;
padding-right: 0.5rem !important;*/
- }
-}
+ }
+}
\ No newline at end of file
diff --git a/MP.Stats/Shared/MainLayout.razor.less b/MP.Stats/Shared/MainLayout.razor.less
new file mode 100644
index 00000000..6e1c5562
--- /dev/null
+++ b/MP.Stats/Shared/MainLayout.razor.less
@@ -0,0 +1,104 @@
+.page {
+ position: relative;
+ display: flex;
+ flex-direction: column;
+}
+
+main {
+ flex: 1;
+}
+
+.sidebar,
+.sidebarSmall {
+ background-image: -webkit-linear-gradient(180deg, rgb(5, 39, 103) 20%, #3aa6ff 90%);
+ background-image: linear-gradient(180deg, rgb(5, 39, 103) 20%, #3aa6ff 90%);
+}
+
+.top-row {
+ background-color: #f7f7f7;
+ border-bottom: 1px solid #d6d5d5;
+ height: 3.5rem;
+ align-items: center;
+ /*justify-content: space-evenly;
+ display: flex;*/
+}
+
+ .top-row ::deep a, .top-row .btn-link {
+ white-space: nowrap;
+ margin-left: 0.5rem;
+ }
+
+ .top-row a:first-child {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+@media (max-width: 640.98px) {
+ .top-row:not(.auth) {
+ display: none;
+ }
+
+ .top-row.auth {
+ justify-content: space-between;
+ }
+
+ .top-row a, .top-row .btn-link {
+ margin-left: 0;
+ }
+}
+
+.bottom-row {
+ color: #dedede;
+ background-color: #000000;
+ height: 1.6rem;
+ align-items: center;
+}
+
+@media (max-width: 640.99px) {
+ .main > div {
+ padding-left: 0.5rem !important;
+ padding-right: 0.5rem !important;
+ }
+}
+
+@media (min-width: 641px) {
+ .page {
+ flex-direction: row;
+ }
+
+ .sidebar {
+ width: 13.5rem;
+ height: 100vh;
+ position: sticky;
+ top: 0;
+ }
+
+ .sidebarSmall {
+ width: 4.5rem;
+ height: 100vh;
+ position: sticky;
+ top: 0;
+ }
+
+ .top-row {
+ position: sticky;
+ top: 0;
+ z-index: 1;
+ }
+
+ .top-row, article {
+ padding-left: 1rem !important;
+ padding-right: 1.0rem !important;
+ }
+
+ .bottom-row {
+ position: fixed;
+ bottom: 0;
+ z-index: 1;
+ }
+
+ .main > div {
+ /*padding-left: 0.5rem !important;
+ padding-right: 0.5rem !important;*/
+ }
+}
diff --git a/MP.Stats/Shared/MainLayout.razor.min.css b/MP.Stats/Shared/MainLayout.razor.min.css
new file mode 100644
index 00000000..d48977e7
--- /dev/null
+++ b/MP.Stats/Shared/MainLayout.razor.min.css
@@ -0,0 +1 @@
+.page{position:relative;display:flex;flex-direction:column;}main{flex:1;}.sidebar,.sidebarSmall{background-image:-webkit-linear-gradient(180deg,#052767 20%,#3aa6ff 90%);background-image:linear-gradient(180deg,#052767 20%,#3aa6ff 90%);}.top-row{background-color:#f7f7f7;border-bottom:1px solid #d6d5d5;height:3.5rem;align-items:center;}.top-row ::deep a,.top-row .btn-link{white-space:nowrap;margin-left:.5rem;}.top-row a:first-child{overflow:hidden;text-overflow:ellipsis;}@media(max-width:640.98px){.top-row:not(.auth){display:none;}.top-row.auth{justify-content:space-between;}.top-row a,.top-row .btn-link{margin-left:0;}}.bottom-row{color:#dedede;background-color:#000;height:1.6rem;align-items:center;}@media(max-width:640.99px){.main>div{padding-left:.5rem!important;padding-right:.5rem!important;}}@media(min-width:641px){.page{flex-direction:row;}.sidebar{width:13.5rem;height:100vh;position:sticky;top:0;}.sidebarSmall{width:4.5rem;height:100vh;position:sticky;top:0;}.top-row{position:sticky;top:0;z-index:1;}.top-row,article{padding-left:1rem!important;padding-right:1rem!important;}.bottom-row{position:fixed;bottom:0;z-index:1;}}
\ No newline at end of file
diff --git a/MP.Stats/Shared/NavMenu.razor b/MP.Stats/Shared/NavMenu.razor
index db02b103..fcbdfdc1 100644
--- a/MP.Stats/Shared/NavMenu.razor
+++ b/MP.Stats/Shared/NavMenu.razor
@@ -1,5 +1,12 @@
-
MP-STATS
+ @if (!showText)
+ {
+
MP.S
+ }
+ else
+ {
+
MP.STATS
+ }
@@ -9,64 +16,94 @@
-
- Home
+
+ @if (showText)
+ {
+ Home
+ }
-
- TRS/OEE %
+
+ @if (showText)
+ {
+ TRS/OEE %
+ }
-
- ENERGY
+
+ @if (showText)
+ {
+ ENERGY
+ }
-
- Report ODL/Comm.
+
+ @if (showText)
+ {
+ Report ODL/Comm.
+ }
-
- Diario Produzione
+
+ @if (showText)
+ {
+ Diario Produzione
+ }
-
- User ActionLog
+
+ @if (showText)
+ {
+ User ActionLog
+ }
-
- Registro Controlli
+
+ @if (showText)
+ {
+ Registro Controlli
+ }
-
- Registro Scarti
+
+ @if (showText)
+ {
+ Registro Scarti
+ }
-
- Task Scheduler
+
+ @if (showText)
+ {
+ Task Scheduler
+ }
-
- Force Reset
+
+ @if (showText)
+ {
+ Force Reset
+ }