diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor index 637062ba..3940f143 100644 --- a/MP-TAB3/Components/MachineBlock.razor +++ b/MP-TAB3/Components/MachineBlock.razor @@ -33,8 +33,8 @@ else { if (Width > 640) { -
- @RecMSE.CodMacchina +
+ @RecMSE.CodMacchina
@@ -44,10 +44,10 @@ else
-
+
-
+
@RecMSE.DescrizioneStato
@@ -97,8 +97,8 @@ else } else { -
- @RecMSE.CodMacchina +
+ @RecMSE.CodMacchina
@@ -108,10 +108,10 @@ else
-
+
-
+
@RecMSE.DescrizioneStato
@@ -161,57 +161,6 @@ else
- @*
-
-
-
- @RecMSE.Nome -
- @RecMSE.DescrizioneStato:   @(FormatDurata(RecMSE.Durata)) -
-
- @if (showCard) - { -
-
-
-
-  @($"{RecMSE.PezziConf}") -
- @if (datiProdAct != null && datiProdAct.PzConfScarto > 0) - { -
-
- @($"(- {datiProdAct.PzConfScarto})") -
-
- } -
-
-
-
-  @($"{RecMSE.PezziProd}") -
-
-
-
-
- -
-
-
-
ART.
-
@RecMSE.CodArticolo
-
-
-
ORD.
-
@($"ODL{RecMSE.IdxOdl:00000000}")
-
-
-
- } -
-
*@ } } else @@ -291,7 +240,7 @@ else
-
+
@RecMSE.DescrizioneStato @@ -301,12 +250,15 @@ else
-
-
- @* *@ - + @if (enableDisegno) + { +
+
+ @* *@ + +
-
+ }
} diff --git a/MP-TAB3/Components/MachineBlock.razor.cs b/MP-TAB3/Components/MachineBlock.razor.cs index 85db393c..f60f4380 100644 --- a/MP-TAB3/Components/MachineBlock.razor.cs +++ b/MP-TAB3/Components/MachineBlock.razor.cs @@ -99,14 +99,17 @@ namespace MP_TAB3.Components #region Protected Properties + [Inject] + protected IConfiguration config { get; set; } = null!; + /// /// CSS Class bordo da stato macchina /// - protected string borderCss + protected string cssClassBorder { get { - string answ = "border-2"; + string answ = "border-3"; if (RecMSE != null) { switch (RecMSE.Semaforo) @@ -140,8 +143,37 @@ namespace MP_TAB3.Components } } - [Inject] - protected IConfiguration config { get; set; } = null!; + /// + /// CSS Class x overlay (effetto spento x macchina spenta/ sGr) + /// + protected string cssClassOverlay + { + get + { + string answ = ""; + if (RecMSE != null) + { + answ = RecMSE.Semaforo == "sGr" ? "bg-dark opacity-50" : ""; + } + return answ; + } + } + + /// + /// CSS class x testo (se descr lunga scorre...) + /// + protected string cssClassTextDescr + { + get + { + string answ = "text-nowrap"; + if (RecMSE != null && RecMSE.DescrizioneStato.Length >= 17) + { + answ = " scroll-left"; + } + return answ; + } + } protected ProdAdvDispl.ProdCounter CurrCount { @@ -175,44 +207,12 @@ namespace MP_TAB3.Components [Inject] protected NavigationManager NavMan { get; set; } = null!; - /// - /// CSS Class x overlay (effetto spento x macchina spenta/ sGr) - /// - protected string overlayCss - { - get - { - string answ = ""; - if (RecMSE != null) - { - answ = RecMSE.Semaforo == "sGr" ? "bg-dark opacity-50" : ""; - } - return answ; - } - } - [Inject] protected StatusData SDService { get; set; } = null!; [Inject] protected TabDataService TabDServ { get; set; } = null!; - /// - /// CSS class x testo (se descr lunga scorre...) - /// - protected string textDescrCss - { - get - { - string answ = "text-nowrap"; - if (RecMSE != null && RecMSE.DescrizioneStato.Length >= 20) - { - answ = " scroll-left"; - } - return answ; - } - } - #endregion Protected Properties #region Protected Methods diff --git a/MP-TAB3/Components/MachineBlock.razor.css b/MP-TAB3/Components/MachineBlock.razor.css index 536f7f6f..8a2cc60b 100644 --- a/MP-TAB3/Components/MachineBlock.razor.css +++ b/MP-TAB3/Components/MachineBlock.razor.css @@ -1,16 +1,4 @@ -/* Bordi */ -/*.rCAll { - border-radius: 10px; -} - -.rCTop { - border-radius: 10px 10px 0 0; -} - -.rCBot { - border-radius: 0 0 10px 10px; -}*/ -.mapBlock { +.mapBlock { font-family: 'Open Sans Condensed', sans-serif; color: #FFF; background-image: linear-gradient(#111, #000); @@ -35,7 +23,6 @@ position: relative; width: 70%; white-space: nowrap; - /*display: inline-block;*/ } .scroll-left span { /*display: inline-block;*/ @@ -69,9 +56,6 @@ .sVe { text-align: left; background: #198754; - /*background: rgba(0,255,80,.6);*/ - /*padding: 0px 4px 0px 4px;*/ - /*color: Yellow;*/ color: #fff; } .sGi { @@ -79,21 +63,17 @@ background: #ffc107; background: rgba(255, 220, 0, 0.6); color: #fff; - /*padding: 0px 4px 0px 4px;*/ } .sRo { text-align: left; background-color: #e2001a; background: rgba(240, 0, 10, 0.6); color: #fff; - /*padding: 0px 4px 0px 4px;*/ } .sBl { text-align: left; background: #3690FF; background: rgba(0, 80, 255, 0.6); - /*padding: 0px 4px 0px 4px;*/ - /*color: Yellow;*/ color: #fff; } .sGr { @@ -101,18 +81,15 @@ background-color: #bcbcbc; background: rgba(180, 180, 180, 0.6); color: #fff; - /*padding: 0px 4px 0px 4px;*/ } /*end semafori */ .card-body { background-color: currentColor; background-image: linear-gradient(121deg, rgba(255, 255, 255, 0.2) -0.71%, rgba(255, 255, 255, 0.05) 97.66%); - border-radius: 0 0 15px 15px; } .imgFitToSize { height: 11rem; object-fit: cover; - border-radius: 15px 15px 0 0; } @media (max-width: 640.98px) { .imgFitToSize { @@ -121,7 +98,4 @@ .card-body { background-color: transparent; } -} -.statusCard { - border-radius: 0.5rem; } \ No newline at end of file diff --git a/MP-TAB3/Components/MachineBlock.razor.less b/MP-TAB3/Components/MachineBlock.razor.less index 1a4ffc33..5e21b854 100644 --- a/MP-TAB3/Components/MachineBlock.razor.less +++ b/MP-TAB3/Components/MachineBlock.razor.less @@ -1,16 +1,4 @@ -/* Bordi */ -/*.rCAll { - border-radius: 10px; -} - -.rCTop { - border-radius: 10px 10px 0 0; -} - -.rCBot { - border-radius: 0 0 10px 10px; -}*/ - + .mapBlock { font-family: 'Open Sans Condensed', sans-serif; color: #FFF; @@ -37,7 +25,6 @@ position: relative; width: 70%; white-space: nowrap; - /*display: inline-block;*/ } .scroll-left span { @@ -72,9 +59,6 @@ .sVe { text-align: left; background: #198754; - /*background: rgba(0,255,80,.6);*/ - /*padding: 0px 4px 0px 4px;*/ - /*color: Yellow;*/ color: #fff; } @@ -83,7 +67,6 @@ background: #ffc107; background: rgba(255,220,0,.6); color: #fff; - /*padding: 0px 4px 0px 4px;*/ } .sRo { @@ -91,15 +74,12 @@ background-color: #e2001a; background: rgba(240,0,10,.6); color: #fff; - /*padding: 0px 4px 0px 4px;*/ } .sBl { text-align: left; background: #3690FF; background: rgba(0,80,255,.6); - /*padding: 0px 4px 0px 4px;*/ - /*color: Yellow;*/ color: #fff; } @@ -108,19 +88,16 @@ background-color: #bcbcbc; background: rgba(180,180,180,.6); color: #fff; - /*padding: 0px 4px 0px 4px;*/ } /*end semafori */ .card-body { background-color: currentColor; background-image: linear-gradient(121deg, rgba(255, 255, 255, 0.20) -0.71%, rgba(255, 255, 255, 0.05) 97.66%); - border-radius: 0 0 15px 15px } .imgFitToSize { height: 11rem; object-fit: cover; - border-radius: 15px 15px 0 0; } @media (max-width: 640.98px){ @@ -132,9 +109,3 @@ } } - - - -.statusCard { - border-radius: 0.5rem; -} diff --git a/MP-TAB3/Components/MachineBlock.razor.min.css b/MP-TAB3/Components/MachineBlock.razor.min.css index 4b64d50a..dfef5c7b 100644 --- a/MP-TAB3/Components/MachineBlock.razor.min.css +++ b/MP-TAB3/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;}.labelTop{padding:.1em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#fff;background:#2200de;background:rgba(33,36,39,.75);border-radius:15px 15px 0 0;}.scroll-left{height:1.5em;overflow:hidden;position:relative;width:70%;white-space:nowrap;}.scroll-left span{position:absolute;width:100%;height:100%;margin:0;line-height:1.5em;-moz-transform:translateX(0%);-webkit-transform:translateX(0%);transform:translateX(0%);-moz-animation:scroll-left 8s ease infinite;-webkit-animation:scroll-left 8s ease infinite;animation:scroll-left 8s ease infinite;}@keyframes scroll-left{0%{transform:translateX(0%);}30%{transform:translateX(0%);}80%{transform:translateX(-50%);}}.sVe{text-align:left;background:#198754;color:#fff;}.sGi{text-align:left;background:#ffc107;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;}.card-body{background-color:currentColor;background-image:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);border-radius:0 0 15px 15px;}.imgFitToSize{height:11rem;object-fit:cover;border-radius:15px 15px 0 0;}@media(max-width:640.98px){.imgFitToSize{height:8rem;}.card-body{background-color:transparent;}}.statusCard{border-radius:.5rem;} \ 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;}.labelTop{padding:.1em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#fff;background:#2200de;background:rgba(33,36,39,.75);border-radius:15px 15px 0 0;}.scroll-left{height:1.5em;overflow:hidden;position:relative;width:70%;white-space:nowrap;}.scroll-left span{position:absolute;width:100%;height:100%;margin:0;line-height:1.5em;-moz-transform:translateX(0%);-webkit-transform:translateX(0%);transform:translateX(0%);-moz-animation:scroll-left 8s ease infinite;-webkit-animation:scroll-left 8s ease infinite;animation:scroll-left 8s ease infinite;}@keyframes scroll-left{0%{transform:translateX(0%);}30%{transform:translateX(0%);}80%{transform:translateX(-50%);}}.sVe{text-align:left;background:#198754;color:#fff;}.sGi{text-align:left;background:#ffc107;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;}.card-body{background-color:currentColor;background-image:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);}.imgFitToSize{height:11rem;object-fit:cover;}@media(max-width:640.98px){.imgFitToSize{height:8rem;}.card-body{background-color:transparent;}} \ No newline at end of file