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

Fix overlay donught

Browse Source
This commit is contained in:
Samuele Locatelli
2022-10-14 17:27:55 +02:00
parent c4b6f289af
commit a428ecb4ab
11 changed files with 88 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.SPEC/Components/ListODL.razor
+29 -15
View File
@@ -94,23 +94,24 @@ else
<div class="modal fade" id="staticBackdrop" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
<div class="modal-dialog modal-xl">
<div class="modal-content">
<div class="modal-header bg-info col-12">
<div class="modal-header bg-primary col-12">
@if (currRecord != null)
{
<div class="col-2">
<h3 class="modal-title fs-5" id="staticBackdropLabel"><b>ODL @currRecord.IdxOdl</b></h3>
<div class="col-3">
<b class="modal-title fs-1" id="staticBackdropLabel"><b>ODL @currRecord.IdxOdl</b></b>
</div>
<div class="col-6">
<div class="col-6 fs-5">
<b>@currRecord.CodArticolo</b>
<div class="small textConsensed text-secondary">@currRecord.ArticoloNav.DescArticolo</div>
<div class="small textConsensed text-light">@currRecord.ArticoloNav.DescArticolo</div>
</div>
<div class="col-2">
<div class="col-2 fs-5">
<b>@currRecord.IdxMacchina</b>
<div class="small textConsensed text-secondary">@currRecord.MachineNav.Descrizione</div>
<div class="small textConsensed text-light">@currRecord.MachineNav.Descrizione</div>
</div>
}
<button type="button" class="btn-close col-2" data-bs-dismiss="modal" aria-label="Close"></button>
<div class="col-1 text-end">
<button type="button" class="btn btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
</div>
<div class="modal-body col-12">
@if (currRecord != null)
@@ -185,10 +186,18 @@ else
{
@foreach (var statRecord in ListOdlStats)
{
<div class=" p-1">
<h6>@statRecord.Descrizione - <b>@($"{calcolaPerc(statRecord.TotDurata)}%")</b></h6>
<div class="p-1">
<div class="d-flex justify-content-between">
<div class="text-uppercase">
@statRecord.Descrizione
</div>
<div>
<b>@(formDurata(statRecord.TotDurata))</b>
</div>
</div>
<div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" style="width: @Math.Round(calcolaPerc(statRecord.TotDurata),0)%; background-color:@statRecord.Css;" aria-valuemax="100"></div>
<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" style="width: @Math.Round(calcolaPerc(statRecord.TotDurata),0)%; background-color:@statRecord.Css;" aria-valuemax="100">@($"{calcolaPerc(statRecord.TotDurata):N1}%")</div>
</div>
</div>
@@ -197,12 +206,17 @@ else
}
</div>
</div>
<div class="col-4">
<div class="col-4 dcContainer">
<div class="dcBox">
<ODLPlot SelectedOdl="@currRecord.IdxOdl"></ODLPlot>
</div>
<div class="dcBox dcOverlay">
<b class="fs-3">@currRecord.DurataMinuti</b>
</div>
</div>
<div class="text-center" style="margin-top: 170px;height: 50px;position: absolute;margin-left: 884px;">
@*<div class="text-center" style="margin-top: 170px;height: 50px;position: absolute;margin-left: 884px;">
<h4><b>@currRecord.DurataMinuti</b></h4>
</div>
</div>*@
</div>
}
</div>
MP.SPEC/Components/ListODL.razor.cs
+5
View File
@@ -208,6 +208,11 @@ namespace MP.SPEC.Components
return answ;
}
public string formDurata (double durataMin)
{
return Utils.FormDurata(durataMin);
}
#endregion Private Methods
}
}
MP.SPEC/Components/ODLPlot.razor
-2
View File
@@ -1,6 +1,5 @@
@if (@SelectedOdl != -1)
{
<div class="d-flex topDiv">
<div class="px-1 flex-fill">
@if (isLoading)
{
@@ -11,5 +10,4 @@
<MP.SPEC.Components.Chart.Doughnut Type="@Chart.Doughnut.ChartType.Doughnut" Data="@Data.ToArray()" BackgroundColor="@colors.ToArray()" ></MP.SPEC.Components.Chart.Doughnut>
}
</div>
</div>
}
MP.SPEC/MP.SPEC.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.SPEC</RootNamespace>
<Version>6.16.2210.1416</Version>
<Version>6.16.2210.1417</Version>
</PropertyGroup>
<ItemGroup>
MP.SPEC/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2210.1416</h4>
<h4>Versione: 6.16.2210.1417</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.SPEC/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2210.1416
6.16.2210.1417
MP.SPEC/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2210.1416</version>
<version>6.16.2210.1417</version>
<url>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.SPEC/wwwroot/css/site.css
+16
View File
@@ -81,6 +81,22 @@ a,
.footer {
line-height: 1.8em;
}
.dcContainer {
width: 22rem;
height: 22rem;
position: relative;
}
.dcBox {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
}
.dcOverlay {
z-index: 9;
margin: 8.5rem;
}
#blazor-error-ui {
background: lightyellow;
bottom: 0;
MP.SPEC/wwwroot/css/site.less
+18
View File
@@ -87,6 +87,24 @@ a, .btn-link {
line-height: 1.8em;
}
.dcContainer {
width: 22rem;
height: 22rem;
position: relative;
}
.dcBox {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
}
.dcOverlay {
z-index: 9;
margin: 8.5rem;
}
#blazor-error-ui {
background: lightyellow;
bottom: 0;
MP.SPEC/wwwroot/css/site.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long