diff --git a/C-TRACK/WebUserControls/mod_faseCurr.ascx b/C-TRACK/WebUserControls/mod_faseCurr.ascx index 7057e06..351030f 100644 --- a/C-TRACK/WebUserControls/mod_faseCurr.ascx +++ b/C-TRACK/WebUserControls/mod_faseCurr.ascx @@ -3,16 +3,16 @@
-
+
<%: DescPost %>
<%: NomeOpr %> -
-
+ <%--
+
--%>
FASE
<%: DescFaseCurr %>
-
+
quantita evasa
diff --git a/C-TRACK/WebUserControls/mod_faseCurr.ascx.cs b/C-TRACK/WebUserControls/mod_faseCurr.ascx.cs index f0bc070..6d388a7 100644 --- a/C-TRACK/WebUserControls/mod_faseCurr.ascx.cs +++ b/C-TRACK/WebUserControls/mod_faseCurr.ascx.cs @@ -14,6 +14,13 @@ namespace C_TRACK.WebUserControls setupValori(); } mod_numKeyb.eh_comandoRegistrato += Mod_numKeyb_eh_comandoRegistrato; + mod_numKeyb.eh_reset += Mod_numKeyb_eh_reset; + } + + private void Mod_numKeyb_eh_reset(object sender, EventArgs e) + { + // nascondo keyb... + mod_numKeyb.Visible = false; } private void Mod_numKeyb_eh_comandoRegistrato(object sender, EventArgs e) diff --git a/C-TRACK/WebUserControls/mod_numKeyb.ascx.cs b/C-TRACK/WebUserControls/mod_numKeyb.ascx.cs index 878adf6..248a8a4 100644 --- a/C-TRACK/WebUserControls/mod_numKeyb.ascx.cs +++ b/C-TRACK/WebUserControls/mod_numKeyb.ascx.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; using System.Web.UI; using System.Web.UI.WebControls; @@ -13,6 +10,10 @@ namespace C_TRACK.WebUserControls /// evento comando registrato /// public event EventHandler eh_comandoRegistrato; + /// + /// evento comando registrato + /// + public event EventHandler eh_reset; protected void Page_Load(object sender, EventArgs e) { @@ -39,6 +40,14 @@ namespace C_TRACK.WebUserControls lblNumber.Text = ""; break; case "CLR": + if (lblNumber.Text == "") + { + // solleva evento + if (eh_reset != null) + { + eh_reset(this, new EventArgs()); + } + } lblNumber.Text = ""; break; default: diff --git a/Jenkinsfile b/Jenkinsfile index 376c8c1..5f94508 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=66']) { + withEnv(['NEXT_BUILD_NUMBER=67']) { // 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'