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

TAB3: review tabella elenco conferme (come controlli)

Browse Source
This commit is contained in:
Samuele Locatelli
2025-07-24 17:34:11 +02:00
parent b4fd22c2e5
commit 8e36976860
12 changed files with 117 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/Components/AlarmsMan.razor
+7 -1
View File
@@ -65,7 +65,13 @@ else
</tr>
}
</tbody>
<tfoot>
<tr>
<td>
<EgwCoreLib.Razor.DataPager currPage="@PageNum" PageSize="@NumRecPage" totalCount="@TotalCount" numPageChanged="SavePage" numRecordChanged="SaveNumRec"></EgwCoreLib.Razor.DataPager>
</td>
</tr>
</tfoot>
</table>
</div>
<EgwCoreLib.Razor.DataPager currPage="@PageNum" PageSize="@NumRecPage" totalCount="@TotalCount" numPageChanged="SavePage" numRecordChanged="SaveNumRec"></EgwCoreLib.Razor.DataPager>
}
MP-TAB3/Components/ControlsMan.razor
+7 -3
View File
@@ -123,11 +123,15 @@
</tr>
}
</tbody>
<tfoot>
<tr>
<td>
<EgwCoreLib.Razor.DataPager currPage="@PageNum" PageSize="@NumRecPage" totalCount="@TotalCount" numPageChanged="SavePage" numRecordChanged="SaveNumRec"></EgwCoreLib.Razor.DataPager>
</td>
</tr>
</tfoot>
</table>
</div>
</div>
</div>
<div class="cad-footer">
<EgwCoreLib.Razor.DataPager currPage="@PageNum" PageSize="@NumRecPage" totalCount="@TotalCount" numPageChanged="SavePage" numRecordChanged="SaveNumRec"></EgwCoreLib.Razor.DataPager>
</div>
</div>
MP-TAB3/Components/DeclarMan.razor
+8 -4
View File
@@ -44,7 +44,7 @@
{
<tr>
<td>
<button class="btn btn-primary" @onclick="()=>SetEdit(item)"><i class="fa-solid fa-pen"></i></button>
<button class="btn btn-primary" @onclick="() => SetEdit(item)"><i class="fa-solid fa-pen"></i></button>
</td>
<td>
<i class="@item.CssClass" aria-hidden="true"></i>
@@ -64,11 +64,15 @@
</tr>
}
</tbody>
<tfoot>
<tr>
<td colspan="6">
<EgwCoreLib.Razor.DataPager currPage="@PageNum" PageSize="@NumRecPage" totalCount="@TotalCount" numPageChanged="SavePage" numRecordChanged="SaveNumRec"></EgwCoreLib.Razor.DataPager>
</td>
</tr>
</tfoot>
</table>
</div>
</div>
</div>
<div>
<EgwCoreLib.Razor.DataPager currPage="@PageNum" PageSize="@NumRecPage" totalCount="@TotalCount" numPageChanged="SavePage" numRecordChanged="SaveNumRec"></EgwCoreLib.Razor.DataPager>
</div>
</div>
MP-TAB3/Components/ProdConfMan.razor
+53 -4
View File
@@ -27,7 +27,7 @@
<div class="bg-secondary p-1 mb-1">
<div class="row">
<div class="col-12">
<table class="table table-dark table-sm table-striped">
@* <table class="table table-dark table-sm table-striped">
<thead>
<tr class="text-start1">
<th>DataOra</th>
@@ -67,11 +67,60 @@
</tr>
}
</tbody>
</table> *@
<table class="table table-dark table-sm table-striped">
<thead>
<tr class="text-start1">
<th>Art/ODL</th>
<th class="text-end"># Pz Conf</th>
<th class="text-end"># Pz Scarto</th>
@if (ShowRilav)
{
<th class="text-end"># Pz Rilav</th>
}
<th class="text-end">Operatore</th>
</tr>
</thead>
<tbody>
@foreach (var item in ListPaged)
{
var actOdl = ActiveOdl(item.DataTo);
<tr>
<td class="text-nowrap">
<div>
Art: <b>@actOdl.CodArticolo</b>
</div>
<div>
ODL: <b>@($"ODL{actOdl.IdxOdl:000000000}")</b>
</div>
</td>
@* <td class="text-nowrap">
<div>@($"ODL{actOdl.IdxOdl:00000000}")</div>
<div>@item.CommessaEsterna</div>
</td> *@
<td class="fs-4 fw-bold text-end">@item.PezziConf</td>
<td class="fs-4 fw-bold text-end">@item.PezziScar</td>
@if (ShowRilav)
{
<td class="text-end">@item.PezziDaRilav</td>
}
<td class="text-end">
<div>@($"{item.DataOraConf:ddd yyyy-MM-dd HH:mm:ss}")</div>
<div><b>@OperDto(item.MatrApp)</b> <i class="fa fa-user" aria-hidden="true"></i></div>
</td>
</tr>
}
</tbody>
<tfoot>
<tr>
<td colspan="5">
<EgwCoreLib.Razor.DataPager currPage="@PageNum" PageSize="@NumRecPage" totalCount="@TotalCount" numPageChanged="SetPage" numRecordChanged="SetNumRec"></EgwCoreLib.Razor.DataPager>
</td>
</tr>
</tfoot>
</table>
</div>
</div>
</div>
<div class="cad-footer">
<EgwCoreLib.Razor.DataPager currPage="@PageNum" PageSize="@NumRecPage" totalCount="@TotalCount" numPageChanged="SetPage" numRecordChanged="SetNumRec"></EgwCoreLib.Razor.DataPager>
</div>
</div>
MP-TAB3/Components/ProdConfMan.razor.cs
+25 -2
View File
@@ -264,6 +264,28 @@ namespace MP_TAB3.Components
return recOdl ?? new ODLModel();
}
private string OperDto(int matr)
{
string answ = $"[{matr}]";
// cerco in dizionario
if (DictOpr.ContainsKey(matr))
{
answ = DictOpr[matr];
}
else
{
// altrimenti cerco da lista e inserisco in dizionario
var recOpr = ListaOper.Where(x => x.MatrOpr == matr).FirstOrDefault();
if (recOpr != null)
{
answ = $"{recOpr.Cognome} {recOpr.Nome}";
}
DictOpr.Add(matr, answ);
}
return answ;
}
#if false
private MarkupString OperDto(int matr)
{
string answ = $"[{matr}]";
@@ -278,12 +300,13 @@ namespace MP_TAB3.Components
var recOpr = ListaOper.Where(x => x.MatrOpr == matr).FirstOrDefault();
if (recOpr != null)
{
answ = $"{recOpr.Cognome} {recOpr.Nome}<br/>[{matr}]";
answ = $"{recOpr.Cognome} {recOpr.Nome}<sup>{matr}</sup>";
}
DictOpr.Add(matr, answ);
}
return (MarkupString)answ;
}
}
#endif
/// <summary>
/// Rileggo anagrafiche di base
MP-TAB3/Components/ScrapMan.razor
+9 -5
View File
@@ -84,13 +84,13 @@
<sub class="pe-1">&times;</sub>
@if (item.KitSplit)
{
<button class="btn btn-info" @onclick="()=>ShowKitDetail(item)" title="KIT esploso" style="max-width: 2.5rem;display: flex;justify-content: center;min-height: 2.375rem;align-items: center;">
<button class="btn btn-info" @onclick="() => ShowKitDetail(item)" title="KIT esploso" style="max-width: 2.5rem;display: flex;justify-content: center;min-height: 2.375rem;align-items: center;">
<i class="fa-solid fa-box-open"></i>
</button>
}
else
{
<button class="btn btn-secondary" @onclick="()=>ShowKitDetail(item)" title="KIT non esploso">
<button class="btn btn-secondary" @onclick="() => ShowKitDetail(item)" title="KIT non esploso">
<i class="fa-solid fa-box"></i>
</button>
}
@@ -136,11 +136,15 @@
}
}
</tbody>
<tfoot>
<tr>
<td>
<EgwCoreLib.Razor.DataPager currPage="@PageNum" PageSize="@NumRecPage" totalCount="@TotalCount" numPageChanged="SavePage" numRecordChanged="SaveNumRec"></EgwCoreLib.Razor.DataPager>
</td>
</tr>
</tfoot>
</table>
</div>
</div>
</div>
<div>
<EgwCoreLib.Razor.DataPager currPage="@PageNum" PageSize="@NumRecPage" totalCount="@TotalCount" numPageChanged="SavePage" numRecordChanged="SaveNumRec"></EgwCoreLib.Razor.DataPager>
</div>
</div>
MP-TAB3/MP-TAB3.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2507.2410</Version>
<Version>6.16.2507.2417</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB3</RootNamespace>
</PropertyGroup>
MP-TAB3/Pages/ProdConf.razor
-2
View File
@@ -12,5 +12,3 @@ else
<MachineBlock RecMSE="CurrMSE" FullMode="false" IdxMacchSub="@IdxMaccSubSel"></MachineBlock>
<ProdConfMan RecMSE="CurrMSE" IdxMacchSub="@IdxMaccSubSel"></ProdConfMan>
}
MP-TAB3/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2507.2410</h4>
<h4>Versione: 6.16.2507.2417</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB3/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2507.2410
6.16.2507.2417
MP-TAB3/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2507.2410</version>
<version>6.16.2507.2417</version>
<url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.Data/Services/MessageService.cs
+4 -1
View File
@@ -298,7 +298,10 @@ namespace MP.Data.Services
{
redisDb = null;
_rigaOper = null;
userListMachine.Clear();
if (userListMachine != null)
{
userListMachine.Clear();
}
UserPrefs.Clear();
}