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

Merge branch 'Release/AddTab03CiCd02'

Browse Source
This commit is contained in:
Samuele Locatelli
2023-12-19 19:48:09 +01:00
parent db87ab14bd e0206e8aef
commit a45b38905e
31 changed files with 321 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/Components/CheckControls.razor.cs
+1 -1
View File
@@ -37,7 +37,7 @@ namespace MP_TAB3.Components
{
try
{
// in questo caso controllo idxStato... e recupero priorit� se > 1 -->
// in questo caso controllo idxStato... e recupero priorita se > 1 -->
// richiesta qualifica
answ = SMServ.GetStateRow(idxStato).Priorita > 1;
}
MP-TAB3/Components/ControlsMan.razor
+1 -1
View File
@@ -28,7 +28,7 @@
</div>
<div class="col-6">
<div class="form-check form-switch fs-3">
<input class="form-check-input" type="checkbox" @bind="@useOdl">
<input class="form-check-input" type="checkbox" @bind="@UseOdl">
<label class="form-check-label">@selMessage</label>
</div>
</div>
MP-TAB3/Components/ControlsMan.razor.cs
+37
View File
@@ -10,6 +10,9 @@ namespace MP_TAB3.Components
{
#region Public Properties
[Parameter]
public EventCallback<string> E_MachSel { get; set; }
[Parameter]
public EventCallback<bool> E_Updated { get; set; }
@@ -49,7 +52,9 @@ namespace MP_TAB3.Components
}
protected bool enableControlli { get; set; } = true;
protected List<RegistroControlliModel> ListComplete { get; set; } = new List<RegistroControlliModel>();
protected List<RegistroControlliModel> ListPaged { get; set; } = new List<RegistroControlliModel>();
[Inject]
@@ -72,6 +77,16 @@ namespace MP_TAB3.Components
{
enableControlli = SMServ.GetConfBool("enableControlli");
IdxMaccSel = RecMSE.IdxMacchina;
bool isMulti = SMServ.DictMacchMulti[IdxMaccSel] == 1;
if (isMulti)
{
var idxMSel = MServ.UserPrefGet(IdxMaccSel);
if (!string.IsNullOrEmpty(idxMSel))
{
IdxMaccSel = idxMSel;
}
}
DateTime fine = DateTime.Today.AddDays(1);
DateTime inizio = fine.AddDays(-8);
CurrPeriodo = new Periodo(inizio, fine);
@@ -121,6 +136,7 @@ namespace MP_TAB3.Components
await doUpdate();
isProcessing = false;
await Task.Delay(1);
await E_MachSel.InvokeAsync(selIdxMacc);
}
protected async Task SetOdl(int selIdxOdl)
@@ -172,13 +188,21 @@ namespace MP_TAB3.Components
#region Private Fields
private static Logger Log = LogManager.GetCurrentClassLogger();
private bool isProcessing = false;
private string noteKo = "";
private int NumRecPage = 10;
private int PageNum = 1;
private bool showInsert = false;
private bool showNote = false;
private int TotalCount = 0;
private bool useOdl = false;
#endregion Private Fields
@@ -196,6 +220,19 @@ namespace MP_TAB3.Components
get => useOdl ? "Periodo da ODL" : "Periodo Libero";
}
private bool UseOdl
{
get => useOdl;
set
{
useOdl = value;
if (!value)
{
IdxOdl = 0;
}
}
}
#endregion Private Properties
}
}
MP-TAB3/Components/DeclarEditor.razor.cs
+12
View File
@@ -97,6 +97,18 @@ namespace MP_TAB3.Components
{
if (IsNewRec)
{
// sistemo IdxMacchina SE fosse multi...
string IdxMaccSel = IdxMacc;
bool isMulti = SMServ.DictMacchMulti[IdxMacc] == 1;
if (isMulti)
{
var idxMSel = MServ.UserPrefGet(IdxMacc);
if (!string.IsNullOrEmpty(idxMSel))
{
IdxMaccSel = idxMSel;
}
currRec.IdxMacchina = IdxMaccSel;
}
// inserisco
await TabServ.RegDichiarInsert(currRec);
}
MP-TAB3/Components/DeclarMan.razor
+1 -3
View File
@@ -1,7 +1,5 @@
<MachSel RecMSE="RecMSE" E_MachSel="SetMacc"></MachSel>
<ShowProcessing Message="Caricamento" IsProcessing="@isProcessing"></ShowProcessing>
<div class="cardObj p-2 mt-2">
<div class="mb-1">
@@ -13,7 +11,7 @@
</div>
<div class="col-6">
<div class="form-check form-switch fs-3">
<input class="form-check-input" type="checkbox" @bind="@useOdl">
<input class="form-check-input" type="checkbox" @bind="@UseOdl">
<label class="form-check-label">@selMessage</label>
</div>
</div>
MP-TAB3/Components/DeclarMan.razor.cs
+37 -7
View File
@@ -11,6 +11,9 @@ namespace MP_TAB3.Components
{
#region Public Properties
[Parameter]
public EventCallback<string> E_MachSel { get; set; }
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
@@ -44,14 +47,12 @@ namespace MP_TAB3.Components
protected List<RegistroDichiarazioniModel> ListComplete { get; set; } = new List<RegistroDichiarazioniModel>();
protected List<RegistroDichiarazioniModel> ListPaged { get; set; } = new List<RegistroDichiarazioniModel>();
protected void SetEdit(RegistroDichiarazioniModel selRec)
{
CurrRec = selRec;
}
[Inject]
protected MessageService MServ { get; set; } = null!;
[Inject]
protected SharedMemService SMServ { get; set; } = null!;
[Inject]
protected TabDataService TabDServ { get; set; } = null!;
@@ -65,6 +66,16 @@ namespace MP_TAB3.Components
if (RecMSE != null)
{
IdxMaccSel = RecMSE.IdxMacchina;
bool isMulti = SMServ.DictMacchMulti[IdxMaccSel] == 1;
if (isMulti)
{
var idxMSel = MServ.UserPrefGet(IdxMaccSel);
if (!string.IsNullOrEmpty(idxMSel))
{
IdxMaccSel = idxMSel;
}
}
DateTime fine = DateTime.Today.AddDays(1);
DateTime inizio = fine.AddDays(-8);
CurrPeriodo = new Periodo(inizio, fine);
@@ -84,6 +95,11 @@ namespace MP_TAB3.Components
UpdateTable();
}
protected void SetEdit(RegistroDichiarazioniModel selRec)
{
CurrRec = selRec;
}
protected async Task SetMacc(string selIdxMacc)
{
isProcessing = true;
@@ -92,6 +108,7 @@ namespace MP_TAB3.Components
await doUpdate();
isProcessing = false;
await Task.Delay(1);
await E_MachSel.InvokeAsync(selIdxMacc);
}
protected async Task SetOdl(int selIdxOdl)
@@ -127,8 +144,6 @@ namespace MP_TAB3.Components
#region Private Fields
private RegistroDichiarazioniModel? CurrRec { get; set; } = null;
private static Logger Log = LogManager.GetCurrentClassLogger();
private bool isProcessing = false;
private int NumRecPage = 10;
@@ -142,6 +157,8 @@ namespace MP_TAB3.Components
private Periodo CurrPeriodo { get; set; } = new Periodo();
private RegistroDichiarazioniModel? CurrRec { get; set; } = null;
private string IdxMaccSel { get; set; } = "";
private int IdxOdl { get; set; } = 0;
@@ -151,6 +168,19 @@ namespace MP_TAB3.Components
get => useOdl ? "Periodo da ODL" : "Periodo Libero";
}
private bool UseOdl
{
get => useOdl;
set
{
useOdl = value;
if (!value)
{
IdxOdl = 0;
}
}
}
#endregion Private Properties
}
}
MP-TAB3/Components/FixOdl.razor.cs
+5 -1
View File
@@ -27,6 +27,9 @@ namespace MP_TAB3.Components
protected List<ODLModel> ListComplete { get; set; } = new List<ODLModel>();
protected List<ODLModel> ListPaged { get; set; } = new List<ODLModel>();
[Parameter]
public EventCallback<bool> E_RefreshData { get; set; }
[Inject]
protected MessageService MServ { get; set; } = null!;
@@ -100,10 +103,11 @@ namespace MP_TAB3.Components
// registro ODL retroattivamente...
await TabDServ.OdlSetupPostumo(IdxOdlSel, IdxMaccCurr);
}
await E_RefreshData.InvokeAsync(true);
}
// redirect
NavMan.NavigateTo(NavMan.Uri, true);
//NavMan.NavigateTo(NavMan.Uri, true);
}
protected void toggleFixOdl()
MP-TAB3/Components/LongStopList.razor
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="@divCss my-1 p-2 d-flex justify-content-between">
<div class="@cardBorder @cardCss">
<div class="@setSemaforo(currFnq.Semaforo)" style="border-radius: 0.375rem 0 0 0;">
<div class="@setSemaforo(currFnq.Semaforo)" style="border-radius: 0.375rem 0.375rem 0 0;">
<div @onclick="SelectFermo">
<div class="text-start fw-bold text-center" style="font-size: 1.3rem;">
@currFnq.Stato
MP-TAB3/Components/NotesEditor.razor.cs
+6 -2
View File
@@ -137,8 +137,12 @@ namespace MP_TAB3.Components
};
// elimino vecchio se c'è...
await TabServ.EvListDelete(IdxMacc, DateSel, idxTipoCommento);
// inserisco
await TabServ.EvListInsert(newRec, MP.Data.Objects.Enums.tipoInputEvento.commento);
// se c'è un commento lo inserisco
if (!string.IsNullOrEmpty(UserComment))
{
// inserisco
await TabServ.EvListInsert(newRec, MP.Data.Objects.Enums.tipoInputEvento.commento);
}
// reset
await E_relData.InvokeAsync(true);
DoReset();
MP-TAB3/Components/OdlMan.razor
+1 -1
View File
@@ -56,7 +56,7 @@
@if (!odlOk)
{
<div class="col-12">
<FixOdl IdxMaccCurr="@IdxMaccParent"></FixOdl>
<FixOdl IdxMaccCurr="@IdxMaccParent" E_RefreshData="refreshAfterFixOdl"></FixOdl>
</div>
}
}
MP-TAB3/Components/OdlMan.razor.cs
+17 -1
View File
@@ -199,7 +199,7 @@ namespace MP_TAB3.Components
// se in attr --> carico podlCurr...
if (inAttr && RecMSE != null)
{
await ReloadXDL(false);
await ReloadXDL(true);
}
}
@@ -867,6 +867,22 @@ namespace MP_TAB3.Components
await ReloadData(true);
}
protected async Task refreshAfterFixOdl(bool has2Refr)
{
if (has2Refr)
{
// update buttons...
checkAll();
// reset vari
IdxPOdlSel = 0;
inAttr = false;
IdxPOdlSel = 0;
await RefreshData();
await CheckAttr();
await InvokeAsync(StateHasChanged);
}
}
protected void SaveTCRich(decimal newTCRich)
{
tcRichAttr = newTCRich;
MP-TAB3/Components/ProdConfirm.razor
+11 -6
View File
@@ -27,7 +27,7 @@
</div>
@if (showInnov)
@if (confProdActive)
{
<div class="cardBg p-2 mt-2">
<div class="d-flex justify-content-between">
@@ -165,16 +165,17 @@
</div>
</div>
</div>
<div class="row textCondens mt-1 py-1">
@if (!confProdActive)
{
<div class="row textCondens mt-1 py-1">
<div class="col-6">
<a class="btn btn-info btn-sm w-100 py-2 " style="min-width: 6rem;" href="scrap"><i class="fa fa-bug"></i> Reg. SCARTI</a>
</div>
<div class=" col-6">
<a class="btn btn-primary btn-sm w-100 py-2" style="min-width: 6rem;" href="controls"><i class="fa fa-wrench"></i> Reg. CONTROLLI</a>
</div>
@* <div class="d-flex justify-content-between p-3 pe-4">
</div> *@
</div>
</div>
}
@if (!string.IsNullOrEmpty(lblOut))
{
<div class="d-flex justify-content-around my-2">
@@ -183,4 +184,8 @@
</div>
</div>
}
<ShowProcessing IsProcessing="@isProcessing"></ShowProcessing>
<ShowProcessing IsProcessing="@isProcessing"></ShowProcessing>
@if (!confProdActive)
{
<ProdStat RecMSE="RecMSE"></ProdStat>
}
MP-TAB3/Components/ProdConfirm.razor.cs
+35 -16
View File
@@ -38,7 +38,20 @@ namespace MP_TAB3.Components
}
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
public MappaStatoExpl? RecMSE
{
get => currRecMSE;
set
{
// salvo SOLO SE non sono in conferma
if (!confProdActive)
{
currRecMSE = value;
}
}
}
private MappaStatoExpl? currRecMSE { get; set; } = null;
#endregion Public Properties
@@ -46,16 +59,17 @@ namespace MP_TAB3.Components
protected string ConfBg
{
get => showInnov ? "bg-warning text-dark" : "bg-success text-light";
get => confProdActive ? "bg-warning text-dark" : "bg-success text-light";
}
protected string ConfCssWidth
{
get => enableMagPrint ? "col-6" : "col-12";
}
protected string ConfTitle
{
get => showInnov ? "Nascondi conferma" : "Mostra conferma";
}
protected string ConfCssWidth
{
get => enableMagPrint ? "col-6" : "col-12";
get => confProdActive ? "Nascondi conferma" : "Mostra conferma";
}
/// <summary>
@@ -163,9 +177,12 @@ namespace MP_TAB3.Components
protected override async Task OnParametersSetAsync()
{
lblOut = "";
numPzLasciati = 0;
if (RecMSE != null && string.IsNullOrEmpty(IdxMaccSel))
{
if (!confProdActive)
{
numPzLasciati = 0;
}
// verifico SE fosse doppia...
bool isMulti = false;
// verifico se la macchina sia configurata tra le MSFD...
@@ -206,8 +223,9 @@ namespace MP_TAB3.Components
// mostro output
lblOut = $"Confermata produzione {numPzConfermati - numPzLasciati} pezzi (+{numPzLasciati} pz lasciati, +{numPzScarto2Rec} pz scarto) |{dtReqUpdate:HH:mm:ss} | {dtReqUpdate:ddd yyyy.MM.dd}";
// cambio button conferma...
showInnov = false;
confProdActive = false;
numPzLasciati = 0;
dtReqUpdate = DateTime.Now;
await DoUpdate();
await Task.Delay(1);
await RefreshData();
@@ -235,7 +253,11 @@ namespace MP_TAB3.Components
/// </summary>
protected async Task ToggleConfProd()
{
showInnov = !showInnov;
confProdActive = !confProdActive;
if (confProdActive)
{
numPzLasc = 0;
}
dtReqUpdate = DateTime.Now;
await DoUpdate();
StateHasChanged();
@@ -245,12 +267,11 @@ namespace MP_TAB3.Components
#region Private Fields
private bool chkPzBuoniNeg = false;
private bool confRett = false;
private bool enablePzProdLasciati = false;
private bool enableMagPrint = false;
private bool chkPzBuoniNeg = false;
private bool enablePzProdLasciati = false;
private string lblOut = "";
private int modoConfProd = 0;
@@ -274,7 +295,7 @@ namespace MP_TAB3.Components
private bool showConfirm { get; set; } = true;
private bool showInnov { get; set; } = false;
private bool confProdActive { get; set; } = false;
#endregion Private Properties
@@ -307,7 +328,5 @@ namespace MP_TAB3.Components
}
#endregion Private Methods
}
}
MP-TAB3/Components/ScrapEditor.razor
+1 -1
View File
@@ -12,7 +12,7 @@
</div>
@if(errMsg != "")
{
<div class="alert bg-danger mt-1">
<div class="alert alert-warning mt-1 text-center">
@errMsg
</div>
}
MP-TAB3/Components/ScrapEditor.razor.cs
+23 -6
View File
@@ -31,11 +31,15 @@ namespace MP_TAB3.Components
}
}
protected string errMsg { get; set; } = "";
protected List<vSelCauScartoModel> ListComplete { get; set; } = new List<vSelCauScartoModel>();
[Inject]
protected MessageService MServ { get; set; } = null!;
[Inject]
protected MessageService MsgServ { get; set; } = null!;
protected int NumPz
{
get => numPz;
@@ -70,10 +74,25 @@ namespace MP_TAB3.Components
protected async Task doSave(vSelCauScartoModel currCau)
{
bool isMulti = false;
// verifico se la macchina sia configurata tra le MSFD...
if (SMServ.DictMacchMulti.ContainsKey(IdxMacc))
{
isMulti = SMServ.DictMacchMulti[IdxMacc] == 1;
}
string IdxMaccSel = IdxMacc;
if (isMulti)
{
var idxMSel = MsgServ.UserPrefGet(IdxMacc);
if (!string.IsNullOrEmpty(idxMSel))
{
IdxMaccSel = idxMSel;
}
}
// registro scarto
RegistroScartiModel newRec = new RegistroScartiModel()
{
IdxMacchina = IdxMacc,
IdxMacchina = IdxMaccSel,
DataOra = DateSel,
Causale = currCau.value,
Qta = NumPz,
@@ -87,20 +106,17 @@ namespace MP_TAB3.Components
// reset
DoReset();
errMsg = "";
//ToggleCtrl();
await E_Updated.InvokeAsync(true);
await ReloadData();
StateHasChanged();
await InvokeAsync(StateHasChanged);
}
else
{
errMsg = "ODL non attivo o data/ora errato";
errMsg = "Insert non possibile: ODL non attivo o data/ora errato";
}
ShowDetail = false;
}
protected string errMsg { get; set; } = "";
protected override async Task OnInitializedAsync()
{
await ReloadData();
@@ -127,6 +143,7 @@ namespace MP_TAB3.Components
if (ShowDetail)
{
DateSel = DateTime.Now;
errMsg = "";
}
}
MP-TAB3/Components/ScrapMan.razor
+1 -1
View File
@@ -21,7 +21,7 @@
</div>
<div class="col-6">
<div class="form-check form-switch fs-3">
<input class="form-check-input" type="checkbox" @bind="@useOdl">
<input class="form-check-input" type="checkbox" @bind="@UseOdl">
<label class="form-check-label">@selMessage</label>
</div>
</div>
MP-TAB3/Components/ScrapMan.razor.cs
+70 -45
View File
@@ -10,12 +10,67 @@ namespace MP_TAB3.Components
{
#region Public Properties
[Parameter]
public EventCallback<string> E_MachSel { get; set; }
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
#endregion Public Properties
#region Public Methods
#region Protected Properties
protected bool enableScarti { get; set; } = true;
protected List<RegistroScartiModel> ListComplete { get; set; } = new List<RegistroScartiModel>();
protected List<RegistroScartiModel> ListPaged { get; set; } = new List<RegistroScartiModel>();
[Inject]
protected MessageService MServ { get; set; } = null!;
[Inject]
protected SharedMemService SMServ { get; set; } = null!;
[Inject]
protected TabDataService TabDServ { get; set; } = null!;
#endregion Protected Properties
#region Protected Methods
protected async Task ForceReload(bool DoClose)
{
if (DoClose)
{
selItem = null;
}
await ReloadData();
}
protected override async Task OnInitializedAsync()
{
await Task.Delay(1);
if (RecMSE != null)
{
enableScarti = SMServ.GetConfBool("enableScarti");
IdxMaccSel = RecMSE.IdxMacchina;
bool isMulti = SMServ.DictMacchMulti[IdxMaccSel] == 1;
if (isMulti)
{
var idxMSel = MServ.UserPrefGet(IdxMaccSel);
if (!string.IsNullOrEmpty(idxMSel))
{
IdxMaccSel = idxMSel;
}
}
DateTime fine = DateTime.Today.AddDays(1);
DateTime inizio = fine.AddDays(-8);
CurrPeriodo = new Periodo(inizio, fine);
await ReloadData();
}
}
/// <summary>
/// Aggiorno valori produzione alla data richiesta...
@@ -36,50 +91,6 @@ namespace MP_TAB3.Components
await Task.Delay(1);
}
protected async Task ForceReload(bool DoClose)
{
if (DoClose)
{
selItem = null;
}
await ReloadData();
}
#endregion Public Methods
#region Protected Properties
protected bool enableScarti { get; set; } = true;
protected List<RegistroScartiModel> ListComplete { get; set; } = new List<RegistroScartiModel>();
protected List<RegistroScartiModel> ListPaged { get; set; } = new List<RegistroScartiModel>();
[Inject]
protected MessageService MServ { get; set; } = null!;
[Inject]
protected SharedMemService SMServ { get; set; } = null!;
[Inject]
protected TabDataService TabDServ { get; set; } = null!;
#endregion Protected Properties
#region Protected Methods
protected override async Task OnInitializedAsync()
{
await Task.Delay(1);
if (RecMSE != null)
{
enableScarti = SMServ.GetConfBool("enableScarti");
IdxMaccSel = RecMSE.IdxMacchina;
DateTime fine = DateTime.Today.AddDays(1);
DateTime inizio = fine.AddDays(-8);
CurrPeriodo = new Periodo(inizio, fine);
await ReloadData();
}
}
protected void SaveNumRec(int newNum)
{
NumRecPage = newNum;
@@ -105,6 +116,7 @@ namespace MP_TAB3.Components
await ReloadData();
isProcessing = false;
await Task.Delay(1);
await E_MachSel.InvokeAsync(selIdxMacc);
}
protected async Task SetOdl(int selIdxOdl)
@@ -188,6 +200,19 @@ namespace MP_TAB3.Components
get => useOdl ? "Periodo da ODL" : "Periodo Libero";
}
private bool UseOdl
{
get => useOdl;
set
{
useOdl = value;
if (!value)
{
IdxOdl = 0;
}
}
}
#endregion Private Properties
}
}
MP-TAB3/Components/ShowProcessing.razor
+1 -6
View File
@@ -12,9 +12,4 @@
</div>
</div>
}
@code {
[Parameter]
public bool IsProcessing { get; set; } = false;
[Parameter]
public string Message { get; set; } = "ELABORAZIONE IN CORSO";
}
MP-TAB3/Components/ShowProcessing.razor.cs
+17
View File
@@ -0,0 +1,17 @@
using Microsoft.AspNetCore.Components;
namespace MP_TAB3.Components
{
public partial class ShowProcessing
{
#region Public Properties
[Parameter]
public bool IsProcessing { get; set; } = false;
[Parameter]
public string Message { get; set; } = "ELABORAZIONE IN CORSO";
#endregion Public Properties
}
}
MP-TAB3/MP-TAB3.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2312.1908</Version>
<Version>6.16.2312.1919</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB3</RootNamespace>
</PropertyGroup>
MP-TAB3/Pages/Controls.razor
+2 -2
View File
@@ -8,6 +8,6 @@
else
{
<CheckControls RecMSE="CurrMSE"></CheckControls>
<MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
<ControlsMan RecMSE="CurrMSE" E_Updated="ForceReload"></ControlsMan>
<MachineBlock RecMSE="CurrMSE" FullMode="false" IdxMacchSub="@IdxMaccSubSel"></MachineBlock>
<ControlsMan RecMSE="CurrMSE" E_Updated="ForceReload" E_MachSel="SetMacc"></ControlsMan>
}
MP-TAB3/Pages/Controls.razor.cs
+16 -5
View File
@@ -18,6 +18,13 @@ namespace MP_TAB3.Pages
#region Protected Methods
protected async Task ForceReload()
{
IsLoading = true;
await Task.Delay(50);
IsLoading = false;
}
protected override async Task OnInitializedAsync()
{
await ReloadData();
@@ -41,16 +48,20 @@ namespace MP_TAB3.Pages
await InvokeAsync(StateHasChanged);
}
protected async Task ForceReload()
protected void SetMacc(string selIdxMacc)
{
IsLoading = true;
await Task.Delay(50);
IsLoading = false;
IdxMaccSubSel = selIdxMacc;
}
private bool IsLoading = false;
#endregion Protected Methods
#region Private Fields
private string IdxMaccSubSel = "";
private bool IsLoading = false;
#endregion Private Fields
#region Private Methods
private async Task ReloadData()
MP-TAB3/Pages/Declarations.razor
+2 -2
View File
@@ -8,6 +8,6 @@
else
{
<CheckControls RecMSE="CurrMSE"></CheckControls>
<MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
<DeclarMan RecMSE="CurrMSE"></DeclarMan>
<MachineBlock RecMSE="CurrMSE" FullMode="false" IdxMacchSub="@IdxMaccSubSel"></MachineBlock>
<DeclarMan RecMSE="CurrMSE" E_MachSel="SetMacc"></DeclarMan>
}
MP-TAB3/Pages/Declarations.razor.cs
+11
View File
@@ -41,8 +41,19 @@ namespace MP_TAB3.Pages
await InvokeAsync(StateHasChanged);
}
protected void SetMacc(string selIdxMacc)
{
IdxMaccSubSel = selIdxMacc;
}
#endregion Protected Methods
#region Private Fields
private string IdxMaccSubSel = "";
#endregion Private Fields
#region Private Methods
private async Task ReloadData()
MP-TAB3/Pages/MachineDetail.razor
-1
View File
@@ -11,5 +11,4 @@ else
<CheckControls RecMSE="CurrMSE"></CheckControls>
<MachineBlock RecMSE="CurrMSE" FullMode="false" IdxMacchSub="@IdxMaccSubSel"></MachineBlock>
<ProdConfirm RecMSE="CurrMSE" E_Updated="RefreshData" E_MachSel="SetMacc"></ProdConfirm>
<ProdStat RecMSE="CurrMSE"></ProdStat>
}
MP-TAB3/Pages/Scrap.razor
+2 -2
View File
@@ -8,6 +8,6 @@
else
{
<CheckControls RecMSE="CurrMSE"></CheckControls>
<MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
<ScrapMan RecMSE="CurrMSE"></ScrapMan>
<MachineBlock RecMSE="CurrMSE" FullMode="false" IdxMacchSub="@IdxMaccSubSel"></MachineBlock>
<ScrapMan RecMSE="CurrMSE" E_MachSel="SetMacc"></ScrapMan>
}
MP-TAB3/Pages/Scrap.razor.cs
+6
View File
@@ -59,5 +59,11 @@ namespace MP_TAB3.Pages
}
#endregion Private Methods
protected void SetMacc(string selIdxMacc)
{
IdxMaccSubSel = selIdxMacc;
}
private string IdxMaccSubSel = "";
}
}
MP-TAB3/Pages/StatusMap.razor
-11
View File
@@ -8,17 +8,6 @@
}
else
{
@if (Width < 640)
{
<div class="d-flex justify-content-center">
<label class="form-check-label me-2" for="">Nascondi dettagli</label>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" id="flexSwitchCheckDefault" @bind="ShowCard">
<label class="form-check-label" for="flexSwitchCheckDefault">Mostra dettagli</label>
</div>
</div>
}
@foreach (var item in ListMSE)
{
<div class="col-6 col-sm-6 col-md-4 col-lg-4 col-xl-3 mb-2 px-1 bloccoMacc">
MP-TAB3/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2312.1908</h4>
<h4>Versione: 6.16.2312.1919</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB3/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2312.1908
6.16.2312.1919
MP-TAB3/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2312.1908</version>
<version>6.16.2312.1919</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>