Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.steamware.net/steamware/mapo-core into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2023-10-11 19:32:07 +02:00
parent 1744b4fa56 7bb8903a3c
commit 6ebb97e229
5 changed files with 71 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/MachineBlock.razor
+46 -1
View File
@@ -31,7 +31,7 @@ else
{
@if (FullMode)
{
<div class="card mapBlock shadow @RecMSE.Semaforo p-0 m-0" @onclick="ShowDetail">
@*<div class="card mapBlock shadow @RecMSE.Semaforo p-0 m-0" @onclick="ShowDetail">
<img src="@ImgUrlMacc(RecMSE.Url)" class="card-img-top" alt="@RecMSE.CodMacchina">
<div class="m-1 bg-black">
<div class="card-img-overlay p-0 d-flex flex-row-reverse align-items-start rCTop">
@@ -103,6 +103,51 @@ else
</div>
</div>
</div>
</div>*@
<div class="card shadow" @onclick="ShowDetail">
<img src="@ImgUrlMacc(RecMSE.Url)" class="card-img-top" alt="@RecMSE.CodMacchina" style="height: 119px; object-fit: cover">
<div class="m-1 bg-black">
<div class="card-img-overlay p-0 d-flex flex-row-reverse align-items-start rCTop">
<div class="labelTopDx px-2 w-100">
<div class="text-center fs-2 fw-bold">
@RecMSE.Nome
</div>
</div>
</div>
</div>
<div class="card-body p-2" style="background-color: #212427">
<div class="@RecMSE.Semaforo p-2" style="border-radius: 15px">
<div class="d-flex justify-content-center fs-5">
<span><b>@RecMSE.DescrizioneStato</b>: &nbsp; @(formatDurata(RecMSE.Durata))</span>
</div>
<div class="d-flex justify-content-around" style="border-radius: 15px; background-color: #212427">
<div class="text-center text-success">
<div>
Confermati
</div>
<div>
@($"{RecMSE.PezziConf:N0}")
</div>
</div>
<div class="text-center text-warning">
<div>
Prodotti
</div>
<div>
@($"{RecMSE.PezziProd:N0}")
</div>
</div>
<div class="text-center">
<div>
Ordinati
</div>
<div>
@($"{RecMSE.NumPezzi:N0}")
</div>
</div>
</div>
</div>
</div>
</div>
}
else
MP-TAB-SERV/Components/MachineBlock.razor.css
+10 -4
View File
@@ -25,7 +25,7 @@
bottom: auto;
color: #FFFFFF;
background: #2200DE;
background: rgba(33, 0, 200, 0.7);
background: rgba(33, 36, 39, 0.7);
-webkit-border-top-right-radius: inherit;
border-top-right-radius: inherit;
-webkit-border-top-left-radius: inherit;
@@ -39,20 +39,24 @@
.sVe {
text-align: left;
background: #009036;
background: rgba(0, 255, 80, 0.6);
background: #198754;
/*background: rgba(0,255,80,.6);*/
/*padding: 0px 4px 0px 4px;*/
color: Yellow;
/*color: Yellow;*/
color: #fff;
}
.sGi {
text-align: left;
background: #ffec00;
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 {
@@ -60,12 +64,14 @@
background: #3690FF;
background: rgba(0, 80, 255, 0.6);
/*padding: 0px 4px 0px 4px;*/
color: Yellow;
/*color: Yellow;*/
color: #fff;
}
.sGr {
text-align: left;
background-color: #bcbcbc;
background: rgba(180, 180, 180, 0.6);
color: #fff;
/*padding: 0px 4px 0px 4px;*/
}
/*end semafori */
MP-TAB-SERV/Components/MachineBlock.razor.less
+13 -4
View File
@@ -27,7 +27,7 @@
bottom: auto;
color: #FFFFFF;
background: #2200DE;
background: rgba(33,0,200,.7);
background: rgba(33,36,39,.7);
-webkit-border-top-right-radius: inherit;
border-top-right-radius: inherit;
-webkit-border-top-left-radius: inherit;
@@ -42,15 +42,18 @@
.sVe {
text-align: left;
background: #009036;
background: rgba(0,255,80,.6);
background: #198754;
/*background: rgba(0,255,80,.6);*/
/*padding: 0px 4px 0px 4px;*/
color: Yellow;
/*color: Yellow;*/
color: #fff;
}
.sGi {
text-align: left;
background: #ffec00;
background: rgba(255,220,0,.6);
color: #fff;
/*padding: 0px 4px 0px 4px;*/
}
@@ -58,6 +61,7 @@
text-align: left;
background-color: #e2001a;
background: rgba(240,0,10,.6);
color: #fff;
/*padding: 0px 4px 0px 4px;*/
}
@@ -66,13 +70,18 @@
background: #3690FF;
background: rgba(0,80,255,.6);
/*padding: 0px 4px 0px 4px;*/
color: Yellow;
/*color: Yellow;*/
color: #fff;
}
.sGr {
text-align: left;
background-color: #bcbcbc;
background: rgba(180,180,180,.6);
color: #fff;
/*padding: 0px 4px 0px 4px;*/
}
/*end semafori */
MP-TAB-SERV/Components/MachineBlock.razor.min.css
Vendored
+1 -1
View File
@@ -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,0,200,.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:rgba(0,255,80,.6);color:#ff0;}.sGi{text-align:left;background:#ffec00;background:rgba(255,220,0,.6);}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#ff0;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);}
.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;}
MP-TAB-SERV/Pages/StatusMap.razor
+1 -1
View File
@@ -17,7 +17,7 @@
{
@foreach (var item in ListMSE)
{
<div class="col-6 col-sm-6 col-md-4 col-lg-3 col-xl-2 mb-2 px-1 bloccoMacc">
<div class="col-6 col-sm-6 col-md-4 col-lg-4 col-xl-3 mb-2 px-1 bloccoMacc">
<MachineBlock RecMSE="@item" FullMode="true"></MachineBlock>
</div>
}