diff --git a/MP-TAB3/Components/CheckControls.razor.cs b/MP-TAB3/Components/CheckControls.razor.cs index c3cd6cd1..5f5c1a8b 100644 --- a/MP-TAB3/Components/CheckControls.razor.cs +++ b/MP-TAB3/Components/CheckControls.razor.cs @@ -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; } diff --git a/MP-TAB3/Components/ControlsMan.razor b/MP-TAB3/Components/ControlsMan.razor index 97f4ad5e..7709e613 100644 --- a/MP-TAB3/Components/ControlsMan.razor +++ b/MP-TAB3/Components/ControlsMan.razor @@ -28,7 +28,7 @@
- +
diff --git a/MP-TAB3/Components/ControlsMan.razor.cs b/MP-TAB3/Components/ControlsMan.razor.cs index cefeb78c..5a78327a 100644 --- a/MP-TAB3/Components/ControlsMan.razor.cs +++ b/MP-TAB3/Components/ControlsMan.razor.cs @@ -10,6 +10,9 @@ namespace MP_TAB3.Components { #region Public Properties + [Parameter] + public EventCallback E_MachSel { get; set; } + [Parameter] public EventCallback E_Updated { get; set; } @@ -49,7 +52,9 @@ namespace MP_TAB3.Components } protected bool enableControlli { get; set; } = true; + protected List ListComplete { get; set; } = new List(); + protected List ListPaged { get; set; } = new List(); [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 } } \ No newline at end of file diff --git a/MP-TAB3/Components/DeclarEditor.razor.cs b/MP-TAB3/Components/DeclarEditor.razor.cs index cf5201fc..7cdf20b1 100644 --- a/MP-TAB3/Components/DeclarEditor.razor.cs +++ b/MP-TAB3/Components/DeclarEditor.razor.cs @@ -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); } diff --git a/MP-TAB3/Components/DeclarMan.razor b/MP-TAB3/Components/DeclarMan.razor index 53ff08ca..cadac2f2 100644 --- a/MP-TAB3/Components/DeclarMan.razor +++ b/MP-TAB3/Components/DeclarMan.razor @@ -1,7 +1,5 @@  - -
@@ -13,7 +11,7 @@
- +
diff --git a/MP-TAB3/Components/DeclarMan.razor.cs b/MP-TAB3/Components/DeclarMan.razor.cs index c660eb88..ca2d229c 100644 --- a/MP-TAB3/Components/DeclarMan.razor.cs +++ b/MP-TAB3/Components/DeclarMan.razor.cs @@ -11,6 +11,9 @@ namespace MP_TAB3.Components { #region Public Properties + [Parameter] + public EventCallback E_MachSel { get; set; } + [Parameter] public MappaStatoExpl? RecMSE { get; set; } = null; @@ -44,14 +47,12 @@ namespace MP_TAB3.Components protected List ListComplete { get; set; } = new List(); protected List ListPaged { get; set; } = new List(); - 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 } } \ No newline at end of file diff --git a/MP-TAB3/Components/FixOdl.razor.cs b/MP-TAB3/Components/FixOdl.razor.cs index 6cdc6bf3..c2c73da4 100644 --- a/MP-TAB3/Components/FixOdl.razor.cs +++ b/MP-TAB3/Components/FixOdl.razor.cs @@ -27,6 +27,9 @@ namespace MP_TAB3.Components protected List ListComplete { get; set; } = new List(); protected List ListPaged { get; set; } = new List(); + [Parameter] + public EventCallback 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() diff --git a/MP-TAB3/Components/LongStopList.razor b/MP-TAB3/Components/LongStopList.razor index f9981a6b..8e1f759e 100644 --- a/MP-TAB3/Components/LongStopList.razor +++ b/MP-TAB3/Components/LongStopList.razor @@ -3,7 +3,7 @@
-
+
@currFnq.Stato diff --git a/MP-TAB3/Components/NotesEditor.razor.cs b/MP-TAB3/Components/NotesEditor.razor.cs index f5fd8e15..6ade2864 100644 --- a/MP-TAB3/Components/NotesEditor.razor.cs +++ b/MP-TAB3/Components/NotesEditor.razor.cs @@ -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(); diff --git a/MP-TAB3/Components/OdlMan.razor b/MP-TAB3/Components/OdlMan.razor index 37d69700..aac711f2 100644 --- a/MP-TAB3/Components/OdlMan.razor +++ b/MP-TAB3/Components/OdlMan.razor @@ -56,7 +56,7 @@ @if (!odlOk) {
- +
} } diff --git a/MP-TAB3/Components/OdlMan.razor.cs b/MP-TAB3/Components/OdlMan.razor.cs index c886eb50..e1781ce0 100644 --- a/MP-TAB3/Components/OdlMan.razor.cs +++ b/MP-TAB3/Components/OdlMan.razor.cs @@ -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; diff --git a/MP-TAB3/Components/ProdConfirm.razor b/MP-TAB3/Components/ProdConfirm.razor index a3252d8b..7a1437d5 100644 --- a/MP-TAB3/Components/ProdConfirm.razor +++ b/MP-TAB3/Components/ProdConfirm.razor @@ -27,7 +27,7 @@
-@if (showInnov) +@if (confProdActive) {
@@ -165,16 +165,17 @@
-
+@if (!confProdActive) +{ + +
+} @if (!string.IsNullOrEmpty(lblOut)) {
@@ -183,4 +184,8 @@
} - \ No newline at end of file + +@if (!confProdActive) +{ + +} \ No newline at end of file diff --git a/MP-TAB3/Components/ProdConfirm.razor.cs b/MP-TAB3/Components/ProdConfirm.razor.cs index e8369421..a8746515 100644 --- a/MP-TAB3/Components/ProdConfirm.razor.cs +++ b/MP-TAB3/Components/ProdConfirm.razor.cs @@ -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"; } /// @@ -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 /// 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 - - } } \ No newline at end of file diff --git a/MP-TAB3/Components/ScrapEditor.razor b/MP-TAB3/Components/ScrapEditor.razor index c3cbe104..3a89797c 100644 --- a/MP-TAB3/Components/ScrapEditor.razor +++ b/MP-TAB3/Components/ScrapEditor.razor @@ -12,7 +12,7 @@
@if(errMsg != "") { -
+
@errMsg
} diff --git a/MP-TAB3/Components/ScrapEditor.razor.cs b/MP-TAB3/Components/ScrapEditor.razor.cs index 61384da0..e339a29d 100644 --- a/MP-TAB3/Components/ScrapEditor.razor.cs +++ b/MP-TAB3/Components/ScrapEditor.razor.cs @@ -31,11 +31,15 @@ namespace MP_TAB3.Components } } + protected string errMsg { get; set; } = ""; protected List ListComplete { get; set; } = new List(); [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 = ""; } } diff --git a/MP-TAB3/Components/ScrapMan.razor b/MP-TAB3/Components/ScrapMan.razor index 8b27c012..34e19143 100644 --- a/MP-TAB3/Components/ScrapMan.razor +++ b/MP-TAB3/Components/ScrapMan.razor @@ -21,7 +21,7 @@
- +
diff --git a/MP-TAB3/Components/ScrapMan.razor.cs b/MP-TAB3/Components/ScrapMan.razor.cs index 6c23ebc8..fc309996 100644 --- a/MP-TAB3/Components/ScrapMan.razor.cs +++ b/MP-TAB3/Components/ScrapMan.razor.cs @@ -10,12 +10,67 @@ namespace MP_TAB3.Components { #region Public Properties + [Parameter] + public EventCallback 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 ListComplete { get; set; } = new List(); + + protected List ListPaged { get; set; } = new List(); + + [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(); + } + } /// /// 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 ListComplete { get; set; } = new List(); - protected List ListPaged { get; set; } = new List(); - - [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 } } \ No newline at end of file diff --git a/MP-TAB3/Components/ShowProcessing.razor b/MP-TAB3/Components/ShowProcessing.razor index 6f44bfa4..1ad41064 100644 --- a/MP-TAB3/Components/ShowProcessing.razor +++ b/MP-TAB3/Components/ShowProcessing.razor @@ -12,9 +12,4 @@
} -@code { - [Parameter] - public bool IsProcessing { get; set; } = false; - [Parameter] - public string Message { get; set; } = "ELABORAZIONE IN CORSO"; -} + diff --git a/MP-TAB3/Components/ShowProcessing.razor.cs b/MP-TAB3/Components/ShowProcessing.razor.cs new file mode 100644 index 00000000..fae22eae --- /dev/null +++ b/MP-TAB3/Components/ShowProcessing.razor.cs @@ -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 + } +} \ No newline at end of file diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 1ac9e97c..4227df3a 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2312.1908 + 6.16.2312.1919 enable MP_TAB3 diff --git a/MP-TAB3/Pages/Controls.razor b/MP-TAB3/Pages/Controls.razor index 8f7e5fe9..8a35b6c9 100644 --- a/MP-TAB3/Pages/Controls.razor +++ b/MP-TAB3/Pages/Controls.razor @@ -8,6 +8,6 @@ else { - - + + } diff --git a/MP-TAB3/Pages/Controls.razor.cs b/MP-TAB3/Pages/Controls.razor.cs index 007c7f29..192b6cd9 100644 --- a/MP-TAB3/Pages/Controls.razor.cs +++ b/MP-TAB3/Pages/Controls.razor.cs @@ -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() diff --git a/MP-TAB3/Pages/Declarations.razor b/MP-TAB3/Pages/Declarations.razor index 5a45a974..bdb96323 100644 --- a/MP-TAB3/Pages/Declarations.razor +++ b/MP-TAB3/Pages/Declarations.razor @@ -8,6 +8,6 @@ else { - - + + } diff --git a/MP-TAB3/Pages/Declarations.razor.cs b/MP-TAB3/Pages/Declarations.razor.cs index dbb966f7..30e3a328 100644 --- a/MP-TAB3/Pages/Declarations.razor.cs +++ b/MP-TAB3/Pages/Declarations.razor.cs @@ -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() diff --git a/MP-TAB3/Pages/MachineDetail.razor b/MP-TAB3/Pages/MachineDetail.razor index a068cce3..86ccbfec 100644 --- a/MP-TAB3/Pages/MachineDetail.razor +++ b/MP-TAB3/Pages/MachineDetail.razor @@ -11,5 +11,4 @@ else - } diff --git a/MP-TAB3/Pages/Scrap.razor b/MP-TAB3/Pages/Scrap.razor index 65c20614..6ffaf1a3 100644 --- a/MP-TAB3/Pages/Scrap.razor +++ b/MP-TAB3/Pages/Scrap.razor @@ -8,6 +8,6 @@ else { - - + + } diff --git a/MP-TAB3/Pages/Scrap.razor.cs b/MP-TAB3/Pages/Scrap.razor.cs index 0b7e29fc..76d40e31 100644 --- a/MP-TAB3/Pages/Scrap.razor.cs +++ b/MP-TAB3/Pages/Scrap.razor.cs @@ -59,5 +59,11 @@ namespace MP_TAB3.Pages } #endregion Private Methods + + protected void SetMacc(string selIdxMacc) + { + IdxMaccSubSel = selIdxMacc; + } + private string IdxMaccSubSel = ""; } } \ No newline at end of file diff --git a/MP-TAB3/Pages/StatusMap.razor b/MP-TAB3/Pages/StatusMap.razor index 37a4a0d2..83c2368c 100644 --- a/MP-TAB3/Pages/StatusMap.razor +++ b/MP-TAB3/Pages/StatusMap.razor @@ -8,17 +8,6 @@ } else { - @if (Width < 640) - { - -
- -
- - -
-
- } @foreach (var item in ListMSE) {
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 1d695333..ad0c712a 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2312.1908

+

Versione: 6.16.2312.1919


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index d393ad2f..030af30a 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2312.1908 +6.16.2312.1919 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index f3cd9ff7..3abafee6 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2312.1908 + 6.16.2312.1919 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false