diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index b6f4768..39299f0 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -12466,6 +12466,7 @@ namespace AppData.DS_AppTableAdapters { this._commandCollection[8].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BasePath", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[9].Connection = this.Connection; this._commandCollection[9].CommandText = "dbo.stp_Batch_resetNesting"; @@ -12657,7 +12658,7 @@ namespace AppData.DS_AppTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int redoPartValid(string BasePath) { + public virtual int redoPartValid(string BasePath, string Takt) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; if ((BasePath == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -12665,6 +12666,12 @@ namespace AppData.DS_AppTableAdapters { else { command.Parameters[1].Value = ((string)(BasePath)); } + if ((Takt == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(Takt)); + } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index e9ef1c3..8bae37b 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -123,6 +123,7 @@ + diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index c84a3f8..aa024bb 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -6,7 +6,7 @@ --> - + @@ -25,8 +25,8 @@ - - + + diff --git a/Jenkinsfile b/Jenkinsfile index b73194b..e5b85fe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=155']) { + withEnv(['NEXT_BUILD_NUMBER=159']) { // env.versionNumber = VersionNumber(versionNumberString : '0.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'NKC' diff --git a/NKC_WF/PartValidation.aspx.cs b/NKC_WF/PartValidation.aspx.cs index e8f3a8d..3e27ea1 100644 --- a/NKC_WF/PartValidation.aspx.cs +++ b/NKC_WF/PartValidation.aspx.cs @@ -7,6 +7,12 @@ namespace NKC_WF protected void Page_Load(object sender, EventArgs e) { cmp_validationSummary.eh_doRefresh += Cmp_validationSummary_eh_doRefresh; + cmp_batchList.eh_doReset += Cmp_batchList_eh_doReset; + } + + private void Cmp_batchList_eh_doReset(object sender, EventArgs e) + { + cmp_validationSummary.doUpdate(false); } private void Cmp_validationSummary_eh_doRefresh(object sender, EventArgs e) diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx b/NKC_WF/WebUserControls/cmp_batchList.ascx index d6d80a8..9ec7242 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx @@ -36,7 +36,6 @@   -
@@ -54,7 +53,8 @@ - + + @@ -65,9 +65,8 @@ - - <%# Eval("NumErrPre") %> err - <%# Eval("NumErr") %> err + <%# $"{Eval("Errors")} (tot: {Eval("NumErrPre")} err)" %> + <%# $"{Eval("Errors")} (tot: {Eval("NumErr")} err)" %> diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs index 70477a5..66cf69d 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs @@ -1,5 +1,6 @@ using AppData; using NKC_SDK; +using SteamWare; using System; using System.Web.UI; using System.Web.UI.WebControls; @@ -168,6 +169,7 @@ namespace NKC_WF.WebUserControls grView.SelectedIndex = -1; grView.DataBind(); divDetail.Visible = false; + raiseReset(); } /// @@ -207,5 +209,17 @@ namespace NKC_WF.WebUserControls { checkFixOds(); } + + protected void lbRedoEval_Click(object sender, EventArgs e) + { + LinkButton lbt = (LinkButton)sender; + if (!string.IsNullOrEmpty(lbt.CommandArgument)) + { + // eseguo richiesta reset + DataLayer.man.taBL.redoPartValid(memLayer.ML.CRS("cadBaseBath"), lbt.CommandArgument); + // refresh! + resetSelezione(); + } + } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_validationSummary.ascx b/NKC_WF/WebUserControls/cmp_validationSummary.ascx index ecd886e..c260bf7 100644 --- a/NKC_WF/WebUserControls/cmp_validationSummary.ascx +++ b/NKC_WF/WebUserControls/cmp_validationSummary.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_validationSummary.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_validationSummary" %>
-

Validation Summary

+

Validation Summary

FORCE REVALIDATE diff --git a/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs b/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs index 9642af6..2417af1 100644 --- a/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs @@ -57,11 +57,17 @@ namespace NKC_WF.WebUserControls // update! doUpdate(); } - - private void doUpdate() + /// + /// Update forzato + /// + public void doUpdate(bool reportEvent = true) { + fixVisibility(); frmView.DataBind(); - raiseEvent(); + if (reportEvent) + { + raiseEvent(); + } } protected void lbtRevalAll_Click(object sender, EventArgs e) @@ -83,7 +89,7 @@ namespace NKC_WF.WebUserControls // rimetto da validare tramite stored try { - DataLayer.man.taBL.redoPartValid(memLayer.ML.CRS("cadBaseBath")); + DataLayer.man.taBL.redoPartValid(memLayer.ML.CRS("cadBaseBath"), "*"); // eventualmente mando primo batch da validare... bool newValidSent = ComLib.sendFirstValidationBatch(); }