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

divisione grafica dimensione schermo

Browse Source
This commit is contained in:
zaccaria.majid
2023-10-13 16:16:13 +02:00
parent 597b4a6b63
commit 9a646703d4
6 changed files with 115 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/MachineBlock.razor
+84 -75
View File
@@ -103,94 +103,103 @@ else
</div>
</div>
</div>
</div>*@@*
<div class="card shadow" @onclick="ShowDetail" style="border-radius: 15px">
@*<img src="@ImgUrlMacc(RecMSE.Url)" class="card-img-top imgFitToSize" alt="@RecMSE.CodMacchina">
<img src="@ImgUrlMacc(RecMSE.Url)" class="card-img-top imgFitToSize" alt="@RecMSE.CodMacchina">
<div class="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-1" style="background-color: #212427; border-radius: 0 0 15px 15px">
<div class="@RecMSE.Semaforo p-1" 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>*@
<div class="card shadow" @onclick="ShowDetail" style="border-radius: 11px; background: linear-gradient(121deg, rgba(255, 255, 255, 0.20) -0.71%, rgba(255, 255, 255, 0.05) 97.66%); box-shadow: 0px 4px 24px -1px rgba(0, 0, 0, 0.25);">
<div class="card-body p-0">
<div style="border-radius: 11px;" class="@RecMSE.Semaforo p-1 text-center">
<div class="fs-2" style="line-height: 1.8rem;">
<b>@RecMSE.Nome</b>
<br />
<b>@RecMSE.DescrizioneStato</b>: &nbsp; @(formatDurata(RecMSE.Durata))
if (Width > 640)
{
<div class="card shadow" @onclick="ShowDetail" style="border-radius: 15px">
@*<img src="@ImgUrlMacc(RecMSE.Url)" class="card-img-top imgFitToSize" alt="@RecMSE.CodMacchina">*@
<img src="@ImgUrlMacc(RecMSE.Url)" class="card-img-top imgFitToSize" alt="@RecMSE.CodMacchina">
<div class="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>
@if (showCard)
{
<div class="d-flex justify-content-between w-100" style="height: 100px; width: 100px;">
<div class="col-6">
@*<EgwCoreLib.Razor.CircleGauge Titolo="@($"{RecMSE.NumPezzi:N0}")" Testo="" maxVal="@int.Parse(RecMSE.NumPezzi.ToString())" currVal="@int.Parse(RecMSE.PezziProd.ToString())" strokeColorVal="#FFC107" StyleTitolo="font-size: 2.7rem; font-weight:bold; fill: white;" StyleTesto="font-size: 1rem; fill: #ACACAC;" ShowCircleBtn="false"></EgwCoreLib.Razor.CircleGauge>*@
<EgwCoreLib.Razor.CircleGaugeMulti Titolo="@($"{currMaxVal}")" Testo="#pz prod" maxVal="@currMaxVal" ListInner="@innerCircleVals" ListOuter="@outerCircleVals" ShowCircleBtn="true"></EgwCoreLib.Razor.CircleGaugeMulti>
<div class="card-body p-1" style="background-color: #212427; border-radius: 0 0 15px 15px">
<div class="@RecMSE.Semaforo p-1" 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 style="font-size: 1rem" class="me-3 col-6">
<div class="text-center text-success d-flex justify-content-between">
<div class="col-4"><i class="fa-regular fa-circle-check"></i></div>
<div class="col-8">@($"{RecMSE.PezziConf:N0}")</div>
</div>
<div class="text-center text-warning d-flex justify-content-between">
<div class="col-4"><i class="fa-solid fa-layer-group"></i></div>
<div class="col-8">@($"{RecMSE.PezziProd:N0}")</div>
</div>
<div class="d-flex justify-content-between">
<div class="col-4">
<EgwCoreLib.Razor.CircleGaugeMulti Titolo="@($"{currMaxVal}")" Testo="#pz rich" maxVal="@currMaxVal" ListInner="@innerCircleVals" ListOuter="@outerCircleVals" ShowCircleBtn="true"></EgwCoreLib.Razor.CircleGaugeMulti>
</div>
<div class="col-8" style="line-height: 1.8rem;">
<div class="d-flex justify-content-around">
<div class="text-center text-success ">
<div>
<i class="fa-regular fa-circle-check"></i>&nbsp; @($" {RecMSE.PezziConf:N0}")
</div>
</div>
<div class="text-center text-warning ">
<div>
<i class="fa-solid fa-layer-group"></i>&nbsp; @($" {RecMSE.PezziProd:N0}")
</div>
</div>
</div>
<div class="text-center text-light d-flex justify-content-between">
<div class="col-4"><span>ART.</span></div>
<div class="col-8">@RecMSE.CodArticolo</div>
<div class="col-4"><span>ART:</span></div>
<div class="col-8">@($"{RecMSE.CodArticolo}")</div>
</div>
<div class="text-center text-light d-flex justify-content-between small">
<div class="col-4">ORD.</div>
<div class="col-4">ODL:</div>
<div class="col-8">@($"ODL{RecMSE.IdxOdl:00000000}")</div>
</div>
<div class="text-center text-light d-flex justify-content-between small">
<div class="col-4">PODL:</div>
<div class="col-8">@($"ODL{RecMSE.IdxOdl:00000000}")</div>
@* <div class="col-6">@($"PODL{RecMSE.IdxPOdl:00000000}")</div>
<div class="col-6">@($"ODL{RecMSE.IdxOdl:00000000}")</div> *@
</div>
</div>
</div>
}
</div>
</div>
</div>
}
else
{
<div class="card shadow" @onclick="ShowDetail" style="border-radius: 11px; background: linear-gradient(121deg, rgba(255, 255, 255, 0.20) -0.71%, rgba(255, 255, 255, 0.05) 97.66%); box-shadow: 0px 4px 24px -1px rgba(0, 0, 0, 0.25);">
<div class="card-body p-0">
<div style="border-radius: 11px;" class="@RecMSE.Semaforo p-1 text-center">
<div class="fs-2" style="line-height: 1.8rem;">
<b>@RecMSE.Nome</b>
<br />
<b>@RecMSE.DescrizioneStato</b>: &nbsp; @(formatDurata(RecMSE.Durata))
</div>
</div>
@if (showCard)
{
<div class="d-flex justify-content-between w-100" style="height: 100px; width: 100px;">
<div class="col-6">
<EgwCoreLib.Razor.CircleGaugeMulti Titolo="@($"{currMaxVal}")" Testo="#pz prod" maxVal="@currMaxVal" ListInner="@innerCircleVals" ListOuter="@outerCircleVals" ShowCircleBtn="true"></EgwCoreLib.Razor.CircleGaugeMulti>
</div>
<div style="font-size: 1rem" class="me-3 col-6">
<div class="text-center text-success d-flex justify-content-between">
<div class="col-4"><i class="fa-regular fa-circle-check"></i></div>
<div class="col-8">@($"{RecMSE.PezziConf:N0}")</div>
</div>
<div class="text-center text-warning d-flex justify-content-between">
<div class="col-4"><i class="fa-solid fa-layer-group"></i></div>
<div class="col-8">@($"{RecMSE.PezziProd:N0}")</div>
</div>
<div class="text-center text-light d-flex justify-content-between">
<div class="col-4"><span>ART.</span></div>
<div class="col-8">@RecMSE.CodArticolo</div>
</div>
<div class="text-center text-light d-flex justify-content-between small">
<div class="col-4">ORD.</div>
<div class="col-8">@($"ODL{RecMSE.IdxOdl:00000000}")</div>
</div>
</div>
</div>
}
</div>
</div>
}
}
else
{
MP-TAB-SERV/Components/MachineBlock.razor.cs
+27 -1
View File
@@ -1,7 +1,10 @@
using EgwCoreLib.Razor;
using global::Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using MP.Data.DatabaseModels;
using MP.Data.Services;
using NLog.Fluent;
using static MP_TAB_SERV.Pages.User;
namespace MP_TAB_SERV.Components
{
@@ -21,6 +24,8 @@ namespace MP_TAB_SERV.Components
[Parameter]
public bool showCard { get; set; }
[Inject]
protected IJSRuntime JSRuntime { get; set; } = null!;
#endregion Public Properties
@@ -31,9 +36,25 @@ namespace MP_TAB_SERV.Components
protected int currVal1 = 1000;
protected int currMaxVal = 1000;
protected int maxVal = 1000;
public int Height { get; set; } = 0;
public int Width { get; set; } = 0;
public string currIpv4 { get; set; } = "";
public class WindowDimension
{
public int Width { get; set; }
public int Height { get; set; }
}
protected async Task getWDim()
{
var dimension = await JSRuntime.InvokeAsync<WindowDimension>("getWindowDimensions");
Height = dimension.Height;
Width = dimension.Width;
}
protected async Task setGaugeVals()
{
await Task.Delay(1);
if (RecMSE != null)
{
innerCircleVals.Clear();
@@ -156,7 +177,12 @@ namespace MP_TAB_SERV.Components
#region Protected Methods
protected override async Task OnAfterRenderAsync(bool firstRender)
{
{//await Task.Delay(500);
if (firstRender)
{
await getWDim();
StateHasChanged();
}
isLoading = RecMSE == null;
await Task.Delay(1);
//return base.OnAfterRenderAsync(firstRender);
MP-TAB-SERV/MP-TAB-SERV.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2310.1314</Version>
<Version>6.16.2310.1316</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB_SERV</RootNamespace>
</PropertyGroup>
MP-TAB-SERV/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2310.1314</h4>
<h4>Versione: 6.16.2310.1316</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB-SERV/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2310.1314
6.16.2310.1316
MP-TAB-SERV/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2310.1314</version>
<version>6.16.2310.1316</version>
<url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>