diff --git a/Jenkinsfile b/Jenkinsfile index 299806b..b789b85 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=291']) { + withEnv(['NEXT_BUILD_NUMBER=292']) { // env.versionNumber = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '0.10.${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_batchDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs index f82f7ae..e1f67c4 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs @@ -204,6 +204,12 @@ namespace NKC_WF.WebUserControls return answ; } } + + internal void doUpdate() + { + frmView.DataBind(); + } + /// /// Effettua divisione evitando zeri a den... /// diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx b/NKC_WF/WebUserControls/cmp_batchList.ascx index 81a503f..0c2b583 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx @@ -78,8 +78,10 @@ - - +
+ + +
diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs index 3e978b4..7daf9b7 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs @@ -205,6 +205,7 @@ namespace NKC_WF.WebUserControls public void doUpdate() { + cmp_batchDetail.doUpdate(); grView.DataBind(); } diff --git a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx index c045b03..3b3d441 100644 --- a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx +++ b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx @@ -2,7 +2,6 @@ <%@ Register Src="~/WebUserControls/cmp_barcode.ascx" TagPrefix="uc1" TagName="cmp_barcode" %> -

BUNK BUILDING

@@ -23,43 +22,48 @@
- - - -
-
- NEXT - <%# Eval("Prepared","{0:ddd yyyy-MM-dd HH:mm}") %> -
-
-
-
<%# Eval("SheetIndex") %>
-
<%# Eval("MatDesc") %>
-
<%# Eval("MatExtCode") %>
+ + + + + +
+
+ NEXT + <%# Eval("Prepared","{0:ddd yyyy-MM-dd HH:mm}") %> +
+
+
+
<%# Eval("SheetIndex") %>
+
<%# Eval("MatDesc") %>
+
<%# Eval("MatExtCode") %>
+
+
-
-
- - - - - - - - - - - -
-
-
-
-
- - - - - + + + + + + + + + + + +
+
+
+
+
+ + + + + + + +
diff --git a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs index 5db4c68..a69ec62 100644 --- a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs @@ -184,5 +184,10 @@ namespace NKC_WF.WebUserControls answ = $"width: {num * 100 / den}%"; return answ; } + + protected void Unnamed1_Tick(object sender, EventArgs e) + { + doUpdate(); + } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.designer.cs index 397364a..b005300 100644 --- a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.designer.cs @@ -50,6 +50,15 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.HiddenField hfLastBCode; + /// + /// Controllo updBunk. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdatePanel updBunk; + /// /// Controllo chkRedux. ///