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:
zaccaria.majid
2023-12-15 17:14:29 +01:00
parent 102bef1552 476c61cc57
commit 593dc3fb3b
6 changed files with 96 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/CmpFooter.razor
+2 -2
View File
@@ -1,6 +1,6 @@
<div class="row bg-dark text-light px-2 small">
<div class="col-4 text-left">
<b>MP-TAB2 @(DateTime.Today.Year)</b> | <span class="small">v.@version</span>
<div class="col-4 text-left text-nowrap pe-0">
<b>MP-TAB2 @(DateTime.Today.Year)</b> <span class="small" style="font-size:0.6rem;">v.@version</span>
</div>
<div class="col-4 d-flex flex-column justify-content-center">
@if (typeScadLogin > 0)
MP-TAB-SERV/Components/OdlMan.razor
+5 -4
View File
@@ -225,17 +225,18 @@
</div>
<div class="col-12 col-md-6 mb-2 mt-2">
<div class="input-group input-group-lg">
<input type="text" class="form-control w-25" placeholder="Cerca" aria-label="Cerca">
<button class="btn btn-outline-secondary px-2" @onclick="SearchPodlReset"><i class="fa-solid fa-x"></i></button>
<input type="text" class="form-control w-25 small" placeholder="Cerca" aria-label="Cerca" @bind="@SearchPodl">
<select class="form-select w-50" @bind="IdxPOdlSel">
@foreach (var item in ListODL)
{
<option value="@item.value">@item.label</option>
}
</select>
<div class="input-group-text">
<div class="input-group-text px-1">
<input class="form-check-input mt-0 me-1" id="chk_all" type="checkbox" @bind="ShowAll">
<label class="form-check-label" for="" chk_all">
Tutti
<label class="form-check-label form-check-label-sm" for="chk_all">
tutti
</label>
</div>
</div>
MP-TAB-SERV/Components/OdlMan.razor.cs
+58 -40
View File
@@ -86,6 +86,7 @@ namespace MP_TAB_SERV.Components
protected IJSRuntime JSRuntime { get; set; } = null!;
protected List<vSelOdlModel> ListODL { get; set; } = new List<vSelOdlModel>();
protected List<vSelOdlModel> ListODLAll { get; set; } = new List<vSelOdlModel>();
[Inject]
protected MailService MailServ { get; set; } = null!;
@@ -107,6 +108,23 @@ namespace MP_TAB_SERV.Components
get => IdxOdl > 0;
}
protected string SearchPodl
{
get => searchPodl;
set
{
if (searchPodl != value)
{
searchPodl = value;
var pUpd = Task.Run(async () =>
{
await ReloadData(true);
});
pUpd.Wait();
}
}
}
protected bool ShowAll
{
get => showAll;
@@ -130,6 +148,25 @@ namespace MP_TAB_SERV.Components
[Inject]
protected TabDataService TabDServ { get; set; } = null!;
/// <summary>
/// Verifica se la tavola SIA in fase di attrezzaggio, ovvero SE:
/// - sia un impianto MULTI (= con + tavole)
/// - sia già attrezzata
/// </summary>
protected bool tavHasOdl
{
get
{
bool answ = false;
// se è multi controllo
if (isMulti)
{
answ = !emptyOdlMacc;
}
return answ;
}
}
#endregion Protected Properties
#region Protected Methods
@@ -165,24 +202,6 @@ namespace MP_TAB_SERV.Components
await ReloadXDL(false);
}
}
/// <summary>
/// Verifica se la tavola SIA in fase di attrezzaggio, ovvero SE:
/// - sia un impianto MULTI (= con + tavole)
/// - sia già attrezzata
/// </summary>
protected bool tavHasOdl
{
get
{
bool answ = false;
// se è multi controllo
if (isMulti)
{
answ = !emptyOdlMacc;
}
return answ;
}
}
/// <summary>
/// Aggiorno...
@@ -439,7 +458,6 @@ namespace MP_TAB_SERV.Components
}
await advStep(currStep++);
// riporto stringa
lblOut = sb.ToString().Replace("---", "<br/>");
// update buttons...
@@ -656,7 +674,6 @@ namespace MP_TAB_SERV.Components
lblOut = "Selezionare un ORDINE valido!";
}
// refresh finale
var tmpTCR = tcRichAttr;
checkBtnStatus();
@@ -716,19 +733,6 @@ namespace MP_TAB_SERV.Components
checkAll();
}
#if false
protected override async Task OnParametersSetAsync()
{
// verifica stato inAttr
if (!string.IsNullOrEmpty(IdxMaccSel) && IdxMaccSelLast != IdxMaccSel)
{
await CheckAttr();
await ReloadData(false);
IdxMaccSelLast = IdxMaccSel;
}
}
#endif
protected async Task ProdEnd()
{
if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Confermi fine produzione?"))
@@ -868,6 +872,11 @@ namespace MP_TAB_SERV.Components
tcRichAttr = newTCRich;
}
protected void SearchPodlReset()
{
SearchPodl = "";
}
protected async Task SendFixEndSetup()
{
if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Confermi invio FIX chiusura attrezzaggio ad impianto?"))
@@ -986,7 +995,7 @@ namespace MP_TAB_SERV.Components
private string IdxMaccSel = "";
#if false
private string IdxMaccSelLast = "";
private string IdxMaccSelLast = "";
#endif
private int idxPOdlSel = 0;
@@ -1019,6 +1028,7 @@ namespace MP_TAB_SERV.Components
private int PzPallet = 1;
private string searchPodl = "";
private bool showAll = false;
private bool showChkCloseOdlVal = false;
@@ -1044,7 +1054,7 @@ namespace MP_TAB_SERV.Components
private string cssDetailOdl
{
get => IdxPOdlSel > 0 ? "bg-primary text-light" : "bg-warning";
get => IdxPOdlSel > 0 ? "bg-info text-light" : "bg-warning";
}
private ODLExpModel currOdl { get; set; } = new ODLExpModel();
@@ -1193,7 +1203,7 @@ namespace MP_TAB_SERV.Components
// ora verifico SE E SOLO SE è ANCORA in attrezzaggio
#if false
if (inAttr)
{
{
#endif
// ora verifico SE ALTRA TAVOLA ha ODL...
if (dtChiusura.AddMinutes(gPeriodReopenOdlTav) > adesso)
@@ -1201,7 +1211,7 @@ namespace MP_TAB_SERV.Components
answ = showReopenOdlTav;
}
#if false
}
}
#endif
}
}
@@ -1233,11 +1243,11 @@ namespace MP_TAB_SERV.Components
#if false
// ora verifico SE E SOLO SE è ANCORA in attrezzaggio
if (inAttr)
{
{
#endif
answ = showSplitOdlOnTav;
#if false
}
}
#endif
}
}
@@ -1627,7 +1637,15 @@ namespace MP_TAB_SERV.Components
}
if (!string.IsNullOrEmpty(IdxMaccSel))
{
ListODL = await TabDServ.VSOdlGetUnused(IdxMaccParent, ShowAll, numDayOdl);
ListODLAll = await TabDServ.VSOdlGetUnused(IdxMaccParent, ShowAll, numDayOdl);
if (string.IsNullOrEmpty(SearchPodl))
{
ListODL = ListODLAll;
}
else
{
ListODL = ListODLAll.Where(x => x.label.Contains(SearchPodl, StringComparison.InvariantCultureIgnoreCase) || x.value == 0).ToList();
}
Log.Trace($"found {ListODL.Count} rec");
if (forceReload)
{
MP-TAB-SERV/Components/ProdConfirm.razor
+12 -12
View File
@@ -98,8 +98,8 @@
Dati Globali ODL
</div>
<div class="col-6 col-sm-3 py-1">
<div class="text-center h-100 p-2" style=" background-color: #fff3cd; border-radius: .5rem;">
<div class="text-truncate">
<div class="text-center h-100 px-2" style=" background-color: #fff3cd; border-radius: .5rem;">
<div class="text-truncate lh-sm pt-1">
<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">
@@ -109,14 +109,14 @@
}
else
{
<span class="fw-bold" style="font-size: 3vh">@numPzProdotti2Rec</span>
<span class="fw-bold fs-3">@numPzProdotti2Rec</span>
}
</div>
</div>
</div>
<div class="col-6 col-sm-3 py-1">
<div class="text-center h-100 p-2" style=" background-color: #cff4fc; border-radius: .5rem;">
<div class="text-truncate">
<div class="text-center h-100 px-2" style=" background-color: #cff4fc; border-radius: .5rem;">
<div class="text-truncate lh-sm pt-1">
<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">
@@ -126,14 +126,14 @@
}
else
{
<span class="fw-bold" style="font-size: 3vh">@numPzProdotti</span>
<span class="fw-bold fs-3">@numPzProdotti</span>
}
</div>
</div>
</div>
<div class="col-6 col-sm-3 py-1">
<div class="text-center h-100 p-2" style=" background-color: #f8d7da; border-radius: .5rem;">
<div class="text-truncate">
<div class="text-center h-100 px-2" style=" background-color: #f8d7da; border-radius: .5rem;">
<div class="text-truncate lh-sm pt-1">
<span class="text-dark small">[B] Scarti VERS.</span>
</div>
<div class="text-dark d-flex align-items-center text-center justify-content-center">
@@ -143,14 +143,14 @@
}
else
{
<span class="fw-bold" style="font-size: 3vh">@numPzScaConf</span>
<span class="fw-bold fs-3">@numPzScaConf</span>
}
</div>
</div>
</div>
<div class="col-6 col-sm-3 py-1">
<div class="text-center h-100 p-2" style=" background-color: #d1e7dd; border-radius: .5rem;">
<div class="text-truncate">
<div class="text-center h-100 px-2" style=" background-color: #d1e7dd; border-radius: .5rem;">
<div class="text-truncate lh-sm pt-1">
<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">
@@ -160,7 +160,7 @@
}
else
{
<span class="fw-bold" style="font-size: 3vh">@numPzBuoniConf</span>
<span class="fw-bold fs-3">@numPzBuoniConf</span>
}
</div>
</div>
MP-TAB-SERV/Components/SlideMenu.razor
+4 -3
View File
@@ -37,12 +37,13 @@
</div>
<div class="my-4">
<div class="d-flex justify-content-center">
<div class="py-0 px-2">
<img src="images/LogoSteamware.png" class="img-fluid" width="60" />
<div class="py-0 px-3">
<img src="images/LogoSteamware.png" class="img-fluid" width="80" />
</div>
<div class="p-0 pl-1">
<div class="py-1 px-0 lh-sm">
<div class="flex-row">
<b class="modal-title fs-1">MAPO MES</b>
<div class="small" style="font-size:0.8rem;">v.@version</div>
</div>
<div class="flex-row">
<small>TAB Controller - MES Suite</small>
MP-TAB-SERV/Components/SlideMenu.razor.cs
+15 -2
View File
@@ -15,11 +15,12 @@ namespace MP_TAB_SERV.Components
#region Protected Properties
[Inject]
protected NavigationManager navManager { get; set; } = null!;
[Inject]
protected MessageService MsgServ { get; set; } = null!;
[Inject]
protected NavigationManager navManager { get; set; } = null!;
#endregion Protected Properties
#region Protected Methods
@@ -29,6 +30,12 @@ namespace MP_TAB_SERV.Components
return navManager.Uri.Contains(currUri) ? "bg-dark text-light" : "";
}
protected override void OnInitialized()
{
var rawVers = typeof(Program).Assembly.GetName().Version;
version = rawVers != null ? rawVers : new Version("0.0.0.0");
}
protected async Task SetPage(string tgtUrl)
{
await Task.Delay(1);
@@ -41,5 +48,11 @@ namespace MP_TAB_SERV.Components
}
#endregion Protected Methods
#region Private Fields
private Version version = null!;
#endregion Private Fields
}
}