diff --git a/MP-TAB-SERV/Components/MachineBlock.razor b/MP-TAB-SERV/Components/MachineBlock.razor index 16ccf129..6527e423 100644 --- a/MP-TAB-SERV/Components/MachineBlock.razor +++ b/MP-TAB-SERV/Components/MachineBlock.razor @@ -104,9 +104,10 @@ else *@ -
- @RecMSE.CodMacchina -
+
+ @*@RecMSE.CodMacchina*@ + @RecMSE.CodMacchina +
@@ -115,8 +116,8 @@ else
-
-
+
+
@RecMSE.DescrizioneStato:   @(formatDurata(RecMSE.Durata))
diff --git a/MP-TAB-SERV/Components/MachineBlock.razor.cs b/MP-TAB-SERV/Components/MachineBlock.razor.cs index a1b9dcf2..4bbdebd1 100644 --- a/MP-TAB-SERV/Components/MachineBlock.razor.cs +++ b/MP-TAB-SERV/Components/MachineBlock.razor.cs @@ -60,7 +60,8 @@ namespace MP_TAB_SERV.Components string answ = ""; if (string.IsNullOrEmpty(url.ToString())) { - url = "Steamware.png"; + //url = "Steamware.png"; + url = "SIMDP1.png"; } // verifico esistenza macchina SMALL... @@ -76,7 +77,8 @@ namespace MP_TAB_SERV.Components // altrimenti metto default Steamware if (!File.Exists(fullPath)) { - answ = "images/macchine/Steamware.png"; + //answ = "images/macchine/Steamware.png"; + answ = "images/macchine/SIMDP1.png"; } return answ; diff --git a/MP-TAB-SERV/Components/MachineBlock.razor.css b/MP-TAB-SERV/Components/MachineBlock.razor.css index 02926c4c..b19ec40a 100644 --- a/MP-TAB-SERV/Components/MachineBlock.razor.css +++ b/MP-TAB-SERV/Components/MachineBlock.razor.css @@ -26,14 +26,15 @@ color: #FFFFFF; background: #2200DE; background: rgba(33, 36, 39, 0.7); - -webkit-border-top-right-radius: inherit; - border-top-right-radius: inherit; - -webkit-border-top-left-radius: inherit; - border-top-left-radius: inherit; - -webkit-border-bottom-left-radius: inherit; - border-bottom-left-radius: inherit; - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; + border-radius: 15px 15px 0 0; + /*-webkit-border-top-right-radius: inherit; + border-top-right-radius: inherit; + -webkit-border-top-left-radius: inherit; + border-top-left-radius: inherit; + -webkit-border-bottom-left-radius: inherit; + border-bottom-left-radius: inherit; + -webkit-border-bottom-right-radius: 0; + border-bottom-right-radius: 0;*/ } /* area semafori*/ .sVe { @@ -74,4 +75,14 @@ color: #fff; /*padding: 0px 4px 0px 4px;*/ } -/*end semafori */ \ No newline at end of file +/*end semafori */ +.imgFitToSize { + height: 7.5rem; + object-fit: cover; + border-radius: 15px 15px 0 0; +} +@media (max-width: 640.98px) { + .imgFitToSize { + height: 5rem; + } +} \ No newline at end of file diff --git a/MP-TAB-SERV/Components/MachineBlock.razor.less b/MP-TAB-SERV/Components/MachineBlock.razor.less index e3497e78..f79ce3ec 100644 --- a/MP-TAB-SERV/Components/MachineBlock.razor.less +++ b/MP-TAB-SERV/Components/MachineBlock.razor.less @@ -28,14 +28,15 @@ color: #FFFFFF; background: #2200DE; background: rgba(33,36,39,.7); - -webkit-border-top-right-radius: inherit; + border-radius: 15px 15px 0 0; + /*-webkit-border-top-right-radius: inherit; border-top-right-radius: inherit; -webkit-border-top-left-radius: inherit; border-top-left-radius: inherit; -webkit-border-bottom-left-radius: inherit; border-bottom-left-radius: inherit; -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; + border-bottom-right-radius: 0;*/ } /* area semafori*/ @@ -83,5 +84,15 @@ } /*end semafori */ +.imgFitToSize { + height: 7.5rem; + object-fit: cover; + border-radius: 15px 15px 0 0; +} +@media (max-width: 640.98px){ + .imgFitToSize{ + height: 5rem; + } +} diff --git a/MP-TAB-SERV/Components/MachineBlock.razor.min.css b/MP-TAB-SERV/Components/MachineBlock.razor.min.css index 78a5665d..7492cf8d 100644 --- a/MP-TAB-SERV/Components/MachineBlock.razor.min.css +++ b/MP-TAB-SERV/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;}.labelTopDx{padding:.1em .4em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#fff;background:#2200de;background:rgba(33,36,39,.7);-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}.sVe{text-align:left;background:#009036;background:#198754;color:#fff;}.sGi{text-align:left;background:#ffec00;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;} \ 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;}.labelTopDx{padding:.1em .4em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#fff;background:#2200de;background:rgba(33,36,39,.7);border-radius:15px 15px 0 0;}.sVe{text-align:left;background:#009036;background:#198754;color:#fff;}.sGi{text-align:left;background:#ffec00;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;}.imgFitToSize{height:7.5rem;object-fit:cover;border-radius:15px 15px 0 0;}@media(max-width:640.98px){.imgFitToSize{height:5rem;}} \ No newline at end of file diff --git a/MP-TAB-SERV/Pages/_Layout.cshtml b/MP-TAB-SERV/Pages/_Layout.cshtml index 7b123737..f5ff7dac 100644 --- a/MP-TAB-SERV/Pages/_Layout.cshtml +++ b/MP-TAB-SERV/Pages/_Layout.cshtml @@ -6,7 +6,9 @@ - + + + diff --git a/MP-TAB-SERV/Shared/MainLayout.razor b/MP-TAB-SERV/Shared/MainLayout.razor index f80be328..d17c449a 100644 --- a/MP-TAB-SERV/Shared/MainLayout.razor +++ b/MP-TAB-SERV/Shared/MainLayout.razor @@ -33,7 +33,7 @@
-
+
@Body
diff --git a/MP-TAB-SERV/wwwroot/images/macchine/SIMDP1.png b/MP-TAB-SERV/wwwroot/images/macchine/SIMDP1.png new file mode 100644 index 00000000..3a931f02 Binary files /dev/null and b/MP-TAB-SERV/wwwroot/images/macchine/SIMDP1.png differ