diff --git a/Jenkinsfile b/Jenkinsfile index c398d69..a04bcfa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=333']) { + withEnv(['NEXT_BUILD_NUMBER=334']) { // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs index 2dde18a..665cd6b 100644 --- a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs @@ -136,7 +136,8 @@ namespace NKC_WF.WebUserControls if (!Page.IsPostBack) { resetShowData(); - resetIcons(); + resetMessages(); + resetButtons(); updateCurrData(); } cmp_barcode.eh_doRefresh += Cmp_barcode_eh_doRefresh; @@ -147,12 +148,6 @@ namespace NKC_WF.WebUserControls lblDestination.Text = "--"; } - private void resetShowData() - { - showCart = false; - showBin = false; - showSecOp = false; - } /// /// Comando barcode letto @@ -189,7 +184,8 @@ namespace NKC_WF.WebUserControls } private void Cmp_barcode_eh_doReset(object sender, EventArgs e) { - resetIcons(); + resetMessages(); + resetButtons(); } private void Cmp_barcode_eh_doRefresh(object sender, EventArgs e) @@ -205,7 +201,7 @@ namespace NKC_WF.WebUserControls doUpdate(); if (doRaiseEv) { - resetMessages(); + resetMessageDivs(); } } @@ -282,16 +278,6 @@ namespace NKC_WF.WebUserControls ComLib.saveItemPickup(SheetID, DeviceId, itemDtmx); } /// - /// Resetta mesaggi ed errori - /// - protected void resetMessages() - { - divInfoMessage.Visible = false; - lblInfoMessage.Text = ""; - divItemError.Visible = false; - lblErrorMsg.Text = ""; - } - /// /// Processo il DataMatrix letto /// /// @@ -353,6 +339,7 @@ namespace NKC_WF.WebUserControls DataLayer.man.taIL.updateStatus(itemIdSelected, 3, PlaceId); lblDestination.Text = $"Item {itemIdSelected} PUT IN CART {rawData}"; resetSelection(false); + resetButtons(); } } } @@ -378,6 +365,7 @@ namespace NKC_WF.WebUserControls DataLayer.man.taIL.updateStatus(itemIdSelected, 4, PlaceId); lblDestination.Text = $"Item {itemIdSelected} PUT IN BIN {rawData}"; resetSelection(false); + resetButtons(); } } } @@ -388,7 +376,7 @@ namespace NKC_WF.WebUserControls { int defaultSecScreenShowTimeout = memLayer.ML.CRI("defaultSecScreenShowTimeout"); ComLib.setSecScreenRequest(rawData, lblItemDtmx.Text, 60 * defaultSecScreenShowTimeout); - displMessage($"ITEM Sent to second screen | {lblItemDtmx.Text} for {defaultSecScreenShowTimeout} min", true); + displMessage($"ITEM Sent to second screen | {lblItemDtmx.Text} for {defaultSecScreenShowTimeout} min", false); } else { @@ -422,32 +410,7 @@ namespace NKC_WF.WebUserControls divItemError.Visible = true; resetSelection(resetStatus); } - /// - /// Reset selezione item + blocchi suggerimento + sel REDIS x pagina unload - /// - /// - protected void resetSelection(bool resetStatus) - { - if (resetStatus) - { - try - { - // SE item esiste... - var tabItem = DataLayer.man.taIL.getBySearch(itemIdSelected, itemIdSelected.ToString(), 0, 999); - if (tabItem.Count == 1) - { - // riposto item a status 1... - DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId); - } - } - catch - { } - // elimino item sel... - itemIdSelected = 0; - } - resetShowData(); - ComLib.resetItemPickup(SheetID, DeviceId); - } + /// /// Mostra o nasconde dettaglio su ITEM letto /// @@ -508,7 +471,6 @@ namespace NKC_WF.WebUserControls break; } } - lbtResetSel.Visible = (itemIdSelected != 0); } public int itemIdSelected @@ -527,21 +489,74 @@ namespace NKC_WF.WebUserControls lbtCancel.Visible = showBtn; lbtScrapped.Visible = showBtn; lbtParkArea.Visible = showBtn; + lbtResetSel.Visible = showBtn; } } - - private void resetIcons() + /// + /// Resetto testi + /// + private void resetMessages() { lblDestination.CssClass = "text-secondary"; lblMessage.Text = ""; lblDestination.Text = ""; lblLastBCode.Text = ""; + } + /// + /// resetto buttons azioni + /// + private void resetButtons() + { lbtCancel.Visible = false; lbtScrapped.Visible = false; lbtParkArea.Visible = false; - lbtResetSel.Visible = (itemIdSelected != 0); + lbtResetSel.Visible = false; + } + /// + /// Reset selezione item + blocchi suggerimento + sel REDIS x pagina unload + /// + /// + protected void resetSelection(bool resetStatus) + { + if (resetStatus) + { + try + { + // SE item esiste... + var tabItem = DataLayer.man.taIL.getBySearch(itemIdSelected, itemIdSelected.ToString(), 0, 999); + if (tabItem.Count == 1) + { + // riposto item a status 1... + DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId); + } + } + catch + { } + // elimino item sel... + itemIdSelected = 0; + } + resetShowData(); + ComLib.resetItemPickup(SheetID, DeviceId); + } + /// + /// Reset booleani visualizzazione + /// + private void resetShowData() + { + showCart = false; + showBin = false; + showSecOp = false; + } + /// + /// Resetta mesaggi ed errori + /// + protected void resetMessageDivs() + { + divInfoMessage.Visible = false; + lblInfoMessage.Text = ""; + divItemError.Visible = false; + lblErrorMsg.Text = ""; } - protected DS_App.BinsDataTable currBinTab { get @@ -642,8 +657,6 @@ namespace NKC_WF.WebUserControls lblLastBCode.Text = $"DO SEC OP: {secOp}"; lblLastBCode.CssClass = "text-info"; } - // fix btn reset! - lbtResetSel.Visible = (itemIdSelected != 0); } protected void lbtCancel_Click(object sender, EventArgs e)