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

Completata gestione selezione macchina MULTI

Browse Source
This commit is contained in:
Samuele Locatelli
2023-10-05 19:38:01 +02:00
parent ef6ca76416
commit 5ff7090746
8 changed files with 32 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/MachSel.razor
-7
View File
@@ -3,7 +3,6 @@
<div class="input-group mb-3">
<span class="input-group-text" id="basic-addon1">Selezione Impianto</span>
<select class="form-select form-select-sm" @bind="@IdxMaccSel">
<option>--- Selezionare impianto ---</option>
@if (ListMacchine == null)
{
<option value="" disabled>No record found</option>
@@ -17,10 +16,4 @@
}
</select>
</div>
@* <asp:DropDownList runat="server" ID="ddlSubMacc" DataSourceID="ods" CssClass="form-control" DataTextField="CodMaccArticolo" DataValueField="IdxMacchina" AutoPostBack="True" OnSelectedIndexChanged="ddlSubMacc_SelectedIndexChanged" OnDataBound="ddlSubMacc_DataBound"></asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="original_{0}" SelectMethod="getMulti" TypeName="MapoDb.DS_applicazioneTableAdapters.MSFDTableAdapter" FilterExpression="idxMacchina LIKE '%#%'">
<SelectParameters>
<asp:SessionParameter DefaultValue="0" Name="IdxMacchina" SessionField="IdxMacchina" Type="String" />
</SelectParameters>
</asp:ObjectDataSource> *@
}
MP-TAB-SERV/Components/MachSel.razor.cs
+6 -1
View File
@@ -43,7 +43,6 @@ namespace MP_TAB_SERV.Components
#region Protected Methods
protected override async Task OnParametersSetAsync()
{
// inizilamente riporto machcina corrente da MSE
@@ -59,6 +58,12 @@ namespace MP_TAB_SERV.Components
var listMulti = await TDataService.VMSFDGetAll();
ListMacchine = listMulti.Where(x => x.IdxMacchina.Contains($"{RecMSE?.IdxMacchina}#")).ToDictionary(x => x.IdxMacchina, x => $"{x.IdxMacchina.Replace($"{RecMSE?.IdxMacchina}#", "")}");
if (ListMacchine.Count > 0 && string.IsNullOrEmpty(idxMaccSel))
{
IdxMaccSel = ListMacchine.FirstOrDefault().Key;
//await E_MachSel.InvokeAsync(idxMaccSel);
}
}
}
await Task.Delay(1);
MP-TAB-SERV/Components/ProdConfirm.razor
+5 -13
View File
@@ -1,4 +1,5 @@
<MachSel RecMSE="RecMSE" E_MachSel="SetMacc"></MachSel>
<div class="card bg-secondary">
<div class="card-header p-0 bg-success">
@if (odlOk)
@@ -9,7 +10,6 @@
<i class="fa fa-check"></i> @ConfTitle
</button>
</div>
<MachSel RecMSE="RecMSE" E_MachSel="SetMacc"></MachSel>
</div>
}
else
@@ -93,9 +93,7 @@
<div class="my-0 fw-bold fs-2">
@if (isProcessing)
{
<div class="placeholder-glow">
<span class="placeholder col-3"></span>
</div>
<i class="fa-solid fa-spinner span"></i>
}
else
{
@@ -112,9 +110,7 @@
<div class="my-0 fw-bold fs-2">
@if (isProcessing)
{
<div class="placeholder-glow">
<span class="placeholder col-3"></span>
</div>
<i class="fa-solid fa-spinner span"></i>
}
else
{
@@ -131,9 +127,7 @@
<div class="my-0 fw-bold fs-2">
@if (isProcessing)
{
<div class="placeholder-glow">
<span class="placeholder col-3"></span>
</div>
<i class="fa-solid fa-spinner span"></i>
}
else
{
@@ -150,9 +144,7 @@
<div class="my-0 fw-bold fs-2">
@if (isProcessing)
{
<div class="placeholder-glow">
<span class="placeholder col-3"></span>
</div>
<i class="fa-solid fa-spinner span"></i>
}
else
{
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.515</Version>
<Version>6.16.2310.519</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB_SERV</RootNamespace>
</PropertyGroup>
MP-TAB-SERV/Pages/MachineDetail.razor.cs
+17 -28
View File
@@ -15,6 +15,9 @@ namespace MP_TAB_SERV.Pages
[Inject]
protected MessageService MsgServ { get; set; } = null!;
[Inject]
protected SharedMemService MStor { get; set; } = null!;
[Inject]
protected TabDataService TabServ { get; set; } = null!;
@@ -25,12 +28,20 @@ namespace MP_TAB_SERV.Pages
protected override async Task OnInitializedAsync()
{
await ReloadData();
#if false
if (enableSchedaTecnica)
{
checkLottiOdl();
}
#endif
}
protected async Task RefreshMBlock()
{
// recupero MSE macchina....
if (!string.IsNullOrEmpty(IdxMacc))
{
CurrMSE = await MsgServ.GetMachineMse(IdxMacc);
}
await Task.Delay(1);
}
#endregion Protected Methods
@@ -38,8 +49,8 @@ namespace MP_TAB_SERV.Pages
#region Private Fields
private static Logger Log = LogManager.GetCurrentClassLogger();
private List<ConfigModel>? CurrConfig = null;
private bool enableMagLotti = false;
private bool enableSchedaTecnica = false;
#endregion Private Fields
@@ -70,16 +81,6 @@ namespace MP_TAB_SERV.Pages
#endif
}
protected async Task RefreshMBlock()
{
// recupero MSE macchina....
if (!string.IsNullOrEmpty(IdxMacc))
{
CurrMSE = await MsgServ.GetMachineMse(IdxMacc);
}
await Task.Delay(1);
}
private async Task ReloadData()
{
if (string.IsNullOrEmpty(IdxMacc))
@@ -104,21 +105,9 @@ namespace MP_TAB_SERV.Pages
private async Task setupConf()
{
CurrConfig = await TabServ.ConfigGetAll();
#if false
if (CurrConfig != null && CurrConfig.Count > 0)
{
// sistemo i parametri opzionali...
getConfValInt("keepAliveMin", ref keepAliveMin);
getConfValInt("MON_maxCol", ref maxCol);
int intDoAnim = 0;
getConfValInt("doAnimate", ref intDoAnim);
doAnimate = intDoAnim == 1;
getConfValInt("pageRefreshSec", ref slowRefreshSec);
getConfVal("sART", ref showArt);
Log.Info($"setupConf | Effettuato setup parametri | keepAlive: {keepAliveMin} | MaxCol: {maxCol} | doAnimate: {doAnimate} | slowRefreshSec: {slowRefreshSec}");
}
#endif
enableSchedaTecnica = MStor.GetConfBool("enableSchedaTecnica");
enableMagLotti = MStor.GetConfBool("enableMagLotti");
await Task.Delay(1);
}
#endregion Private Methods
MP-TAB-SERV/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2310.515</h4>
<h4>Versione: 6.16.2310.519</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB-SERV/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2310.515
6.16.2310.519
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.515</version>
<version>6.16.2310.519</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>