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-25 12:02:46 +02:00
parent 37916a1907 02d770ce05
commit b0551a027c
8 changed files with 59 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/MachSel.razor
+2 -2
View File
@@ -1,7 +1,7 @@
@if (isMulti)
{
<div class="input-group mb-3">
<span class="input-group-text" id="basic-addon1">Selezione Impianto</span>
<div class="input-group">
<span class="input-group-text" id="basic-addon1"><i class="fa-solid fa-building"></i></span>
<select class="form-select form-select-sm" @bind="@IdxMaccSel">
@if (ListMacchine == null)
{
MP-TAB-SERV/Components/MachineBlock.razor
+15 -13
View File
@@ -212,10 +212,10 @@ else
</div>
</div>
</div>
<div class="col-4">
<div class="col-4" style="max-height: 8rem; max-width: 8rem;">
<EgwCoreLib.Razor.CircleGaugeMulti Titolo="@($"{currMaxVal}")" Testo="#pz prod" maxVal="@currMaxVal" ListInner="@innerCircleVals" ListOuter="@outerCircleVals" ShowCircleBtn="true"></EgwCoreLib.Razor.CircleGaugeMulti>
</div>
<div class="col-4 d-flex flex-wrap align-items-center " style="line-height: 1.6rem;">
<div class="col-4 d-flex flex-wrap justify-content-center align-items-center " style="line-height: 1.6rem;">
<div class="col-12 px-2 py-1 @RecMSE.Semaforo statusCard">
<div class="d-flex justify-content-between ">
<div class="p-0 mr-auto">
@@ -226,17 +226,19 @@ else
</div>
</div>
</div>
<div class="text-end text-light d-flex justify-content-between">
<div class="col-4">ART:</div>
<div class="col-8">@($"{RecMSE.CodArticolo}")</div>
</div>
<div class="text-end text-light d-flex justify-content-between small lh-sm">
<div class="col-4">ODL:</div>
<div class="col-8">@($"ODL{RecMSE.IdxOdl:00000000}")</div>
</div>
<div class="text-end text-light d-flex justify-content-between small lh-sm">
<div class="col-4">PODL:</div>
<div class="col-8">@($"PODL{RecMSE.IdxPOdl:00000000}")</div>
<div>
<div class="text-light d-flex justify-content-between">
<div class="text-start col-4">ART:</div>
<div class="text-end col-8">@($"{RecMSE.CodArticolo}")</div>
</div>
<div class="text-end text-light d-flex justify-content-between small lh-sm">
<div class="text-start col-4">ODL:</div>
<div class="text-end col-8">@($"ODL{RecMSE.IdxOdl:00000000}")</div>
</div>
<div class="text-end text-light d-flex justify-content-between small lh-sm">
<div class="text-start col-4">PODL:</div>
<div class="text-end col-8">@($"PODL{RecMSE.IdxPOdl:00000000}")</div>
</div>
</div>
</div>
</div>
MP-TAB-SERV/Components/ProdConfirm.razor
+33 -20
View File
@@ -1,21 +1,33 @@
<div class="d-flex justify-content-between mt-2">
<div class="col-6">
<div class="col-4">
<MachSel RecMSE="RecMSE" E_MachSel="SetMacc"></MachSel>
</div>
<div class="col-6 d-flex justify-content-end">
<div>
<div class="col-8 d-flex justify-content-end">
@if (odlOk)
{
<div class="px-1">
<button class="btn btn-sm @ConfBg py-2 px-4" style="min-width: 72px; min-height: 39px" @onclick="ToggleConfProd">
<i class="@ConfTitle"></i>
</button>
</div>
}
else
{
<div class="alert alert-warning fs-3">MANCA ODL: conferma NON permessa</div>
}
<div class="px-1">
<PrintMag RecMSE="RecMSE"></PrintMag>
@*<button class="btn btn-sm btn-primary py-2 px-4">MAG</button>*@
</div>
<div class="ms-2">
<div class="px-1">
<button class="btn btn-sm btn-secondary py-2 px-4">PDF</button>
</div>
</div>
</div>
@if (odlOk)
@*@if (odlOk)
{
<div class="row">
<div class="col-12">
@@ -28,24 +40,24 @@
else
{
<div class="alert alert-warning fs-3">MANCA ODL: conferma NON permessa</div>
}
}*@
@if (showInnov)
{
<div class="cardBg p-2 mt-2">
<div class="d-flex justify-content-between">
<div class="col-4 p-1">
<div class="col-3 p-1">
<form class="form-floating">
<input type="number" class="form-control" id="floatingInputConf" @bind="numPzProdotti2Rec" @onblur="() => setConfirmBtn(true)" @onfocus="() => setConfirmBtn(false)">
<label for="floatingInputConf" class="text-dark fw-bold">Pezzi confermati</label>
<input type="number" class="form-control bg-danger" id="floatingInputConf" @bind="numPzProdotti2Rec" @onblur="() => setConfirmBtn(true)" @onfocus="() => setConfirmBtn(false)">
<label for="floatingInputConf" class="text-dark fw-bold" style="font-size: .8rem;">Pezzi confermati</label>
</form>
</div>
<div class="col-4 p-1">
<div class="col-3 p-1">
<form class="form-floating">
@if (enablePzProdLasciati)
{
<input type="number" class="form-control" id="floatingInputScarti" @bind="numPzLasciati" @onblur="() => setConfirmBtn(true)" @onfocus="() => setConfirmBtn(false)">
<input type="number" class="form-control bg-success" id="floatingInputScarti" @bind="numPzLasciati" @onblur="() => setConfirmBtn(true)" @onfocus="() => setConfirmBtn(false)">
<label for="floatingInputScarti" class="text-dark fw-bold">Scarti</label>
}
else
@@ -54,19 +66,20 @@ else
}
</form>
</div>
<div class="col-4 p-1">
<div class="col-3 p-1">
<form class="form-floating">
<input type="number" class="form-control" id="floatingInputBuoni" value="@(lblPz2RecScarto + lblPz2RecBuoni)" disabled>
<label for="floatingInputBuoni" class="text-dark fw-bold">Totale</label>
</form>
</div>
<div class="col-3 p-1">
@if (showConfirm)
{
<button class="btn btn-success text-light btn-lg w-100 h-100" @onclick="SalvaConfPz"><i class="fa-regular fa-floppy-disk"></i></button>
}
</div>
</div>
<div>
@if (showConfirm)
{
<button class="btn btn-success text-light btn-lg w-100" @onclick="SalvaConfPz"><i class="fa-regular fa-floppy-disk"></i> CONFERMA</button>
}
</div>
</div>
@*<div class="row textCondens text-end bg-dark m-1 p-1" runat="server" id="divInnovazioni" onloadeddata="showConfirmButton()">
@@ -125,11 +138,11 @@ else
</div>
<div class="col-6 d-flex justify-content-end">
<div>
<a class="btn btn-info btn-sm w-100 py-2 px-4" href="scrap"><i class="fa fa-bug"></i></a>
<a class="btn btn-info btn-sm w-100 py-2 px-4" style="min-width: 72px; min-height: 39px" href="scrap"><i class="fa fa-bug"></i></a>
@*<button class="btn btn-sm btn-primary py-2 px-4">MAG</button>*@
</div>
<div class="ms-2">
<a class="btn btn-primary btn-sm w-100 py-2 px-4" href="controls"><i class="fa fa-wrench"></i></a>
<a class="btn btn-primary btn-sm w-100 py-2 px-4" style="min-width: 72px; min-height: 39px" href="controls"><i class="fa fa-wrench"></i></a>
</div>
</div>
@*<div class="col-6 text-end" id="divPeriodo">
MP-TAB-SERV/Components/ProdConfirm.razor.cs
+5 -1
View File
@@ -69,7 +69,11 @@ namespace MP_TAB_SERV.Components
protected string ConfTitle
{
get => showInnov ? "Nascondi Conferma" : "Mostra Conferma";
get => showInnov ? "fa-solid fa-x" : "fa-solid fa-check";
}
protected string ConfBg
{
get => showInnov ? "bg-warning text-dark" : "bg-success text-light";
}
/// <summary>
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.2416</Version>
<Version>6.16.2310.2509</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.2416</h4>
<h4>Versione: 6.16.2310.2509</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB-SERV/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2310.2416
6.16.2310.2509
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.2416</version>
<version>6.16.2310.2509</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>