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

ok grafica commenti

Browse Source
This commit is contained in:
zaccaria.majid
2023-10-30 15:12:35 +01:00
parent 615fa3cbc8
commit 4f3e0e9fb1
7 changed files with 98 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/LongStopList.razor
+44 -30
View File
@@ -1,40 +1,15 @@
@if (currFnq != null)
{
<div class="col-sm-6 col-lg-4 my-1 p-2">
<div class="card">
<div class="card-body @setSemaforo(currFnq.Semaforo)">
<div class="col-6 col-sm-6 col-lg-4 my-1 p-2">
<div class="cardObj">
<div class="@setSemaforo(currFnq.Semaforo)" style="border-radius: 0.375rem 0.375rem 0 0;">
<div @onclick="SelectFermo">
<div class="text-start fw-bold" style="font-size: 1.8rem;">
<div class="text-start fw-bold text-center" style="font-size: 1.3rem;">
@currFnq.Stato
</div>
<div class="text-end" style="font-size: 1.5rem;">
@currFnq.CodArticolo
</div>
</div>
@if (currNotes.Count > 0)
{
<div>
<div class="accordion accordion-flush" id="accordionFlushExample">
<div class="accordion-item">
<h2 class="accordion-header" id="flush-headingOne">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#flush-collapseOne" aria-expanded="false" aria-controls="flush-collapseOne">
Accordion Item #1
</button>
</h2>
<div id="flush-collapseOne" class="accordion-collapse collapse" aria-labelledby="flush-headingOne" data-bs-parent="#accordionFlushExample">
<div class="accordion-body">
@foreach (var note in currNotes)
{
<span>@note.Value</span>
}
</div>
</div>
</div>
</div>
</div>
}
</div>
<div class="card-footer d-flex justify-content-between bg-dark text-light">
<div class="text-light p-2">
<div>
@($"{currFnq.InizioStato:yyyy/MM/dd HH:mm:ss}")
@*09.10.2023 00:30*@
@@ -43,6 +18,45 @@
@*7h 30m*@
@(MP.Data.Utils.FormDurata(currFnq.DurataMinuti))
</div>
<div class="text-end" style="font-size: 1.5rem;">
@currFnq.CodArticolo
</div>
</div>
<div>
@if (currNotes.Count > 0)
{
<div class="accordion" id="@($"{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}")">
<div class="accordion-item">
<h2 class="accordion-header" id="@($"{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}One")">
<button class="accordion-button collapsed p-1" type="button" data-bs-toggle="collapse" data-bs-target="#@($"collapse_{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}")" aria-expanded="false" aria-controls="@($"collapse_{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}")" style="border-radius: 0.375rem;">
@($"{currNotes.Count} commenti")
</button>
</h2>
<div id="@($"collapse_{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}")" class="accordion-collapse collapse" aria-labelledby="headingOne" data-bs-parent="@($"#{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}")">
<div class="accordion-body">
@foreach (var note in currNotes)
{
<span>@note.Value</span>
}
</div>
</div>
</div>
</div>
}
else
{
<div class="accordion" style="background-color: #BDC3C7;">
<div class="accordion-item">
<h2 class="accordion-header" id="headingTwo">
<button class="accordion-button collapsed p-1" type="button" data-bs-toggle="collapse" data-bs-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo" disabled style="background-color: #BDC3C7;">
@($"{currNotes.Count} commenti")
</button>
</h2>
<div id="collapseTwo" class="accordion-collapse collapse" aria-labelledby="headingTwo" data-bs-parent="#accordionExample">
</div>
</div>
</div>
}
</div>
</div>
</div>
MP-TAB-SERV/Components/NotesMan.razor
+6 -4
View File
@@ -2,7 +2,7 @@
<NotesEditor CanSave="true" Title="Nuovo Commento" RecMSE="@RecMSE" E_Updated="DoUpdate" CurrRecord="@currEv"></NotesEditor>
<div class="row mt-1">
<div class="col-7 col-sm-8 col-lg-9 pr-1">
<div class="col-12 col-sm-8 col-lg-9 pr-1">
<div class="row">
<div class="col-6">
<div class="form-floating">
@@ -50,6 +50,8 @@
</div>
</div>
</div>
@*
<div class="col-5 col-sm-4 col-lg-3 pl-1">
<div class="form-floating">
@@ -57,7 +59,7 @@
<label for="commentsNum"># Commenti</label>
</div>
@*
@if (RecordListComments == null)
{
<EgwCoreLib.Razor.LoadingData></EgwCoreLib.Razor.LoadingData>
@@ -103,7 +105,7 @@
}
}
*@
</div>
</div>
</div>
*@
MP-TAB-SERV/Components/ProdConfirm.razor
+44 -44
View File
@@ -160,12 +160,12 @@ else
<span>@dtFine</span>
</sub>
</div>*@
<div class="d-flex justify-content-between">
<div class="d-flex justify-content-between flex-wrap">
<div class="col-3 col-sm-3 p-1">
<div class="text-center h-100 w-100 p-2" style=" background-color: #FF8000; border-radius: .5rem;">
<div class="col-6 col-sm-3 p-1">
<div class="text-center h-100 w-100 p-2" style=" background-color: #fff3cd; border-radius: .5rem;">
<div class="text-truncate">
<span class="text-dark small">NUOVI Pz.Prod</span>
<span class="text-dark small">[A] NUOVI Pz.Prod</span>
</div>
<div class="text-dark d-flex align-items-center text-center justify-content-center">
@if (isProcessing)
@@ -174,50 +174,15 @@ else
}
else
{
<span class="fw-bold">@numPzProdotti.ToString("N0")</span>
<span class="fw-bold" style="font-size: 3vh">@numPzProdotti.ToString("N0")</span>
}
</div>
</div>
</div>
<div class="col-3 col-sm-3 p-1">
<div class="text-center h-100 w-100 p-2" style=" background-color: #FF0000; border-radius: .5rem;">
<div class="col-6 col-sm-3 p-1">
<div class="text-center h-100 w-100 p-2" style=" background-color: #cff4fc; border-radius: .5rem;">
<div class="text-truncate">
<span class="text-light small">Scarti VERS.</span>
</div>
<div class="text-light d-flex align-items-center text-center justify-content-center">
@if (isProcessing)
{
<i class="fa-solid fa-spinner span"></i>
}
else
{
<span class="fw-bold">@numPzScaConf.ToString("N0")</span>
}
</div>
</div>
</div>
<div class="col-3 col-sm-3 p-1">
<div class="text-center h-100 w-100 p-2" style=" background-color: #198754; border-radius: .5rem;">
<div class="text-truncate">
<span class="text-light small">Pz Buoni VERS.</span>
</div>
<div class="text-light d-flex align-items-center text-center justify-content-center">
@if (isProcessing)
{
<i class="fa-solid fa-spinner span"></i>
}
else
{
<span class="fw-bold">@numPzBuoniConf.ToString("N0")</span>
}
</div>
</div>
</div>
<div class="col-3 col-sm-3 p-1">
<div class="text-center h-100 w-100 p-2" style=" background-color: #FFC107; border-radius: .5rem;">
<div class="text-truncate">
<span class="text-dark small">Pz Prodotti TOT</span>
<span class="text-dark small">Pz Prodotti TOT [A+B+C]</span>
</div>
<div class="text-dark d-flex align-items-center text-center justify-content-center">
@if (isProcessing)
@@ -226,11 +191,46 @@ else
}
else
{
<span class="fw-bold">@numPzProdotti.ToString("N0")</span>
<span class="fw-bold" style="font-size: 3vh">@numPzProdotti.ToString("N0")</span>
}
</div>
</div>
</div>
<div class="col-6 col-sm-3 p-1">
<div class="text-center h-100 w-100 p-2" style=" background-color: #f8d7da; border-radius: .5rem;">
<div class="text-truncate">
<span class="text-dark small">[B] Scarti VERS.</span>
</div>
<div class="text-dark d-flex align-items-center text-center justify-content-center">
@if (isProcessing)
{
<i class="fa-solid fa-spinner span"></i>
}
else
{
<span class="fw-bold" style="font-size: 3vh">@numPzScaConf.ToString("N0")</span>
}
</div>
</div>
</div>
<div class="col-6 col-sm-3 p-1">
<div class="text-center h-100 w-100 p-2" style=" background-color: #d1e7dd; border-radius: .5rem;">
<div class="text-truncate">
<span class="text-dark small">[C] Pz Buoni VERS.</span>
</div>
<div class="text-dark d-flex align-items-center text-center justify-content-center">
@if (isProcessing)
{
<i class="fa-solid fa-spinner span"></i>
}
else
{
<span class="fw-bold" style="font-size: 3vh">@numPzBuoniConf.ToString("N0")</span>
}
</div>
</div>
</div>
</div>
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.2717</Version>
<Version>6.16.2310.3014</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.2717</h4>
<h4>Versione: 6.16.2310.3014</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB-SERV/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2310.2717
6.16.2310.3014
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.2717</version>
<version>6.16.2310.3014</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>