Merge branch 'develop' of https://gitlab.steamware.net/steamware/mapo-core into develop
This commit is contained in:
Samuele Locatelli
@@ -190,54 +190,64 @@ else
|
||||
</div>
|
||||
</div>*@
|
||||
|
||||
<div class="cardBlock text-center d-flex justify-content-between px-3 py-1">
|
||||
<div class="col-4">
|
||||
<div class="py-2">
|
||||
<h4 class="text-start mb-0 fw-bold">
|
||||
@RecMSE.Nome
|
||||
</h4>
|
||||
<div class="cardBlock px-3 py-1">
|
||||
<div class="text-center d-flex justify-content-between ">
|
||||
<div class="col-4">
|
||||
<div class="py-2">
|
||||
<h4 class="text-start mb-0 fw-bold">
|
||||
@RecMSE.Nome
|
||||
</h4>
|
||||
</div>
|
||||
<div style="font-size: 1rem" class="me-3 col-6">
|
||||
<div class="text-end 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-end 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-end text-primary d-flex justify-content-between">
|
||||
<div class="col-4"><i class="fa-brands fa-stack-overflow"></i></div>
|
||||
<div class="col-8">@($"{RecMSE.extraVal:N0}")</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="font-size: 1rem" class="me-3 col-6">
|
||||
<div class="text-end 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-end 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-end text-primary d-flex justify-content-between">
|
||||
<div class="col-4"><i class="fa-brands fa-stack-overflow"></i></div>
|
||||
<div class="col-8">@($"{RecMSE.extraVal:N0}")</div>
|
||||
<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 justify-content-center align-items-center " style="line-height: 1.6rem;">
|
||||
|
||||
<div>
|
||||
<div class="text-light d-flex justify-content-between small lh-sm">
|
||||
<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>
|
||||
<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 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">
|
||||
<b>@RecMSE.DescrizioneStato</b>
|
||||
<div class="d-flex justify-content-between">
|
||||
<div class="col-10 mb-2 px-2 py-1 @RecMSE.Semaforo statusCard">
|
||||
<div class="d-flex justify-content-center ">
|
||||
<div class="p-0 mr-auto me-1">
|
||||
<b>@RecMSE.DescrizioneStato</b> :
|
||||
</div>
|
||||
<div class="p-0">
|
||||
@(formatDurata(RecMSE.Durata))
|
||||
</div>
|
||||
</div>
|
||||
</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 class="col-2">
|
||||
<div class="px-1 w-100">
|
||||
<button class="btn btn-sm btn-secondary w-100"><i class="fa-regular fa-file-pdf"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -4,11 +4,16 @@
|
||||
<div class="col-4">
|
||||
<MachSel RecMSE="RecMSE" E_MachSel="SetMacc"></MachSel>
|
||||
</div>
|
||||
|
||||
<div class="col-8 d-flex justify-content-end">
|
||||
<div class="px-1 col-4">
|
||||
<PrintMag RecMSE="RecMSE"></PrintMag>
|
||||
@*<button class="btn btn-sm btn-primary py-2 px-4">MAG</button>*@
|
||||
</div>
|
||||
@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">
|
||||
<div class="px-1 col-8">
|
||||
<button class="btn btn-sm @ConfBg py-2 px-4" style="width: 100%" @onclick="ToggleConfProd">
|
||||
<span>@ConfTitle</span>
|
||||
</button>
|
||||
</div>
|
||||
@@ -17,13 +22,10 @@
|
||||
{
|
||||
<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="px-1">
|
||||
<button class="btn btn-sm btn-secondary py-2 px-4">PDF</button>
|
||||
</div>
|
||||
|
||||
@*<div class="px-1">
|
||||
<button class="btn btn-sm btn-secondary py-2 px-4">PDF</button>
|
||||
</div>*@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -70,9 +72,9 @@ else
|
||||
<div><span class="text-success">Pz Buoni</span> <span>@lblPz2RecBuoni</span></div>
|
||||
<div><span class="text-danger">Pz scarto</span> <span>@lblPz2RecScarto</span></div>
|
||||
@*<form class="form-floating">
|
||||
<input type="text" class="form-control" id="floatingInputBuoni" value="@($"{lblPz2RecScarto} {lblPz2RecBuoni}")" disabled />
|
||||
<label for="floatingInputBuoni" class="text-dark fw-bold">Totale</label>
|
||||
</form>*@
|
||||
<input type="text" 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)
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace MP_TAB_SERV.Components
|
||||
|
||||
protected string ConfTitle
|
||||
{
|
||||
get => showInnov ? "CHIUDI" : "CONF";
|
||||
get => showInnov ? "Nascondi conferma" : "Mostra conferma";
|
||||
}
|
||||
protected string ConfBg
|
||||
{
|
||||
|
||||
@@ -25,7 +25,7 @@ else
|
||||
}
|
||||
else
|
||||
{
|
||||
<table class="table table-sm table-dark table-striped text-center rounded">
|
||||
<table class="table table-sm table-dark table-striped text-center rounded small">
|
||||
<thead>
|
||||
<tr class="text-center">
|
||||
<th>
|
||||
|
||||
@@ -19,7 +19,9 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
<EgwCoreLib.Razor.PeriodoSel CurrPeriodo="CurrPeriodo" E_PeriodoSel="SetPeriodo"></EgwCoreLib.Razor.PeriodoSel>
|
||||
<div style="font-size: .8rem">
|
||||
<EgwCoreLib.Razor.PeriodoSel CurrPeriodo="CurrPeriodo" E_PeriodoSel="SetPeriodo"></EgwCoreLib.Razor.PeriodoSel>
|
||||
</div>
|
||||
}
|
||||
<ShowProcessing Message="Caricamento" IsProcessing="@isProcessing"></ShowProcessing>
|
||||
<div class="cardObj p-2 mt-2">
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<Version>6.16.2310.2617</Version>
|
||||
<Version>6.16.2310.2616</Version>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<RootNamespace>MP_TAB_SERV</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<body>
|
||||
<i>Modulo MAPOSPEC </i>
|
||||
<h4>Versione: 6.16.2310.2617</h4>
|
||||
<h4>Versione: 6.16.2310.2616</h4>
|
||||
<br /> Note di rilascio:
|
||||
<ul>
|
||||
<li>
|
||||
|
||||
@@ -1 +1 @@
|
||||
6.16.2310.2617
|
||||
6.16.2310.2616
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<item>
|
||||
<version>6.16.2310.2617</version>
|
||||
<version>6.16.2310.2616</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>
|
||||
|
||||
Reference in New Issue
Block a user