From df61315b81554cbc4fdf0b06a829b7f4c7742826 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 21 Sep 2018 22:51:28 +0200 Subject: [PATCH] fix comportamento numKeyb: chiudo quando eseguito... --- C-TRACK/WebUserControls/mod_faseCurr.ascx.cs | 2 ++ C-TRACK/barcode.aspx.cs | 3 +-- Jenkinsfile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/C-TRACK/WebUserControls/mod_faseCurr.ascx.cs b/C-TRACK/WebUserControls/mod_faseCurr.ascx.cs index 7b91158..f0bc070 100644 --- a/C-TRACK/WebUserControls/mod_faseCurr.ascx.cs +++ b/C-TRACK/WebUserControls/mod_faseCurr.ascx.cs @@ -23,6 +23,8 @@ namespace C_TRACK.WebUserControls { txtQta.Text = mod_numKeyb.numSelected.ToString(); refreshQtaSel(); + // nascondo keyb... + mod_numKeyb.Visible = false; } } diff --git a/C-TRACK/barcode.aspx.cs b/C-TRACK/barcode.aspx.cs index a6c1663..912f11c 100644 --- a/C-TRACK/barcode.aspx.cs +++ b/C-TRACK/barcode.aspx.cs @@ -475,8 +475,7 @@ namespace C_TRACK private void eseguiComando() { // in primis: sono in esecuzione, x cui il comando รจ valido... - string msg2show = ""; - string currState = ""; + string msg2show = ""; var testNumTask = Regex.Match(mod_barcode1.comandoRegistrato.valore, reNumTask); // verifico se cmd setup utente... if (mod_barcode1.comandoRegistrato.prevCmdIn == "RESOP") diff --git a/Jenkinsfile b/Jenkinsfile index 409686e..f7e712f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=58']) { + withEnv(['NEXT_BUILD_NUMBER=59']) { // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'C.TRACK'