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

Merge branch 'FeaturegraphicFixes' into develop

Browse Source
This commit is contained in:
zaccaria.majid
2023-09-29 11:14:40 +02:00
parent ff42276bd6 1ac2572f8b
commit 1831b89e63
7 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB/MP-TAB.Client/Components/SlideMenu.razor
+1 -1
View File
@@ -1,7 +1,7 @@
<button class="btn btn-link text-light" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasTabMenu" aria-controls="offcanvasTabMenu">
<span class="fa fa-bars fa-lg"></span>
</button>
<div class="offcanvas offcanvas-end" tabindex="-1" id="offcanvasTabMenu" aria-labelledby="offcanvasTabMenuLabel">
<div class="offcanvas offcanvas-end text-start" tabindex="-1" id="offcanvasTabMenu" aria-labelledby="offcanvasTabMenuLabel">
<div class="offcanvas-header bg-secondary text-light">
<div class="d-flex flex-row">
<div class="p-0">
MP-TAB/MP-TAB.Client/Pages/TCHistory.razor
+29 -13
View File
@@ -5,18 +5,19 @@
@inject HttpClient Http
<div class="card">
<div class="card-header">
<div class="card-header px-2">
<MP_TAB.Client.Components.TcHistoryFilter Title="Storico Tempi Ciclo" SearchMinChar="@SearchMinChar" E_CodArt="SelCodArt" E_IdxMacc="SelIdxMacc" MatrOpr="@MatrOpr"></MP_TAB.Client.Components.TcHistoryFilter>
</div>
<div class="card-body">
<div class="card-body px-2">
<table class="table table-striped table-sm">
<thead>
<tr>
<th>Articolo</th>
<th>TCiclo</th>
<th>Note</th>
<th>Informazioni</th>
@* <th>TCiclo</th> *@
@* <th>Note</th> *@
@* <th class="text-end">Impianto</th> *@
<th>Periodo</th>
<th class="text-end">Impianto</th>
</tr>
</thead>
<tbody>
@@ -33,7 +34,7 @@
<div class="placeholder col-6"></div>
<small class="placeholder col-6"></small>
</td>
<td><span class="placeholder col-12"></span></td>
@* <td><span class="placeholder col-12"></span></td> *@
<td><span class="placeholder col-12"></span></td>
<td class="text-end">
<div class="placeholder col-10"></div>
@@ -62,15 +63,30 @@
<small class="text-secondary">@item.DescArticolo</small>
</td>
<td>
<div>@item.Tcassegnato.ToString("N3")</div>
<small class="text-secondary">@item.Tcassegnato.ToString("N3")</small>
<div>
<small><b>Impianto:</b> @item.IdxMacchina</small>
</div>
<div>
<small><b>TC:</b> @item.Tcassegnato.ToString("N3")</small>
</div>
<div>
<small><b>N° pz:</b> @item.NumPezzi pz</small>
</div>
<div class="badge text-bg-light border-primary">
<small class="text-secondary">@item.Note</small>
</div>
</td>
<td>@item.Note</td>
<td>@item.DataInizio --&gt; @item.DataFine</td>
<td class="text-end">
<div>@item.IdxMacchina</div>
<small class="text-secondary">@item.NumPezzi pz</small>
@* <td></td> *@
<td>
<div>
<small><b>Inizio:</b> @item.DataInizio</small>
</div>
<div>
<small><b>Fine:</b> @item.DataFine</small>
</div>
</td>
@* <td class="text-end">
</td> *@
</tr>
<p>@item.IdxOdl</p>
}
MP-TAB/MP-TAB/Components/Layout/MainLayout.razor
+9 -7
View File
@@ -5,17 +5,19 @@
<main>
<div class="top-row px-4 d-flex justify-content-between">
<div>
<div class="top-row d-flex justify-content-between">
<div class="col-4">
<span>
Username
</span>
<sub>[999]</sub>
</div>
<a href="status-map" class="text-decoration-none text-light">
MapoTAB2
</a>
<div>
<div class="col-4 text-center">
<a href="status-map" class="text-decoration-none text-light">
MapoTAB2
</a>
</div>
<div class="col-4 text-end">
@* <div class="row w-100 slideMen"> *@
<div class="row w-100 slideMen">
<div class="">
@@ -25,7 +27,7 @@
</div>
</div>
<article class="content px-4 d-flex">
<article class="content d-flex">
<div class="" id="mainBody">
@Body
</div>
MP-TAB/MP-TAB/Components/Layout/MainLayout.razor.css
+2 -2
View File
@@ -95,8 +95,8 @@ main {
}
.top-row, article {
padding-left: 2rem !important;
padding-right: 1.5rem !important;
padding-left: 1rem !important;
padding-right: .5rem !important;
}
#blazor-error-ui {
MP-TAB/MP-TAB/wwwroot/app.css
+3
View File
@@ -42,4 +42,7 @@ a,
}
.blazor-error-boundary::after {
content: "An error has occurred.";
}
td {
font-size: 0.7rem;
}
MP-TAB/MP-TAB/wwwroot/app.less
+3 -1
View File
@@ -49,4 +49,6 @@ a, .btn-link {
}
td{
font-size: .7rem;
}
MP-TAB/MP-TAB/wwwroot/app.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
html,body{font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-image:linear-gradient(#444,#222);color:#ededed;}h1:focus{outline:0;}a,.btn-link{color:#0071c1;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.btn:focus,.btn:active:focus,.btn-link.nav-link:focus,.form-control:focus,.form-check-input:focus{box-shadow:0 0 0 .1rem white,0 0 0 .25rem #258cfb;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}.blazor-error-boundary{background:url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem,#b32121;padding:1rem 1rem 1rem 3.7rem;color:#fff;}.blazor-error-boundary::after{content:"An error has occurred.";}
html,body{font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-image:linear-gradient(#444,#222);color:#ededed;}h1:focus{outline:0;}a,.btn-link{color:#0071c1;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.btn:focus,.btn:active:focus,.btn-link.nav-link:focus,.form-control:focus,.form-check-input:focus{box-shadow:0 0 0 .1rem white,0 0 0 .25rem #258cfb;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}.blazor-error-boundary{background:url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem,#b32121;padding:1rem 1rem 1rem 3.7rem;color:#fff;}.blazor-error-boundary::after{content:"An error has occurred.";}td{font-size:.7rem;}