From 23b2e5fcbe1539593250fdcebee9813ebc2ce10e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 11 Jun 2021 19:06:53 +0200 Subject: [PATCH] Refresh visualizzazione e filtraggio --- AppData/ComLib.cs | 10 +-- AppData/DS_App.Designer.cs | 13 +++- AppData/DS_App.xsd | 1 + AppData/DS_App.xss | 78 +++++++++---------- NKC_WF/WebUserControls/cmp_batchList.ascx | 9 ++- .../cmp_batchList.ascx.designer.cs | 9 +++ 6 files changed, 71 insertions(+), 49 deletions(-) diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index 778d86a..6623cb9 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -183,8 +183,8 @@ namespace AppData if (!valido) { // in primis controllo SE ci siano task running, nel qual caso รจ false e basta... - int numEst = DLMan.taBL.getByStatus((int)BatchStatus.EstimationRequested, "", 0).Count; - int numNest = DLMan.taBL.getByStatus((int)BatchStatus.NestRequested, "", 0).Count; + int numEst = DLMan.taBL.getByStatus((int)BatchStatus.EstimationRequested, "", true, 0).Count; + int numNest = DLMan.taBL.getByStatus((int)BatchStatus.NestRequested, "", true, 0).Count; // ora controllo anche offline orders... int numOffOrd = DLMan.taOffOL.getRunning().Count; // ora la somma di tutti DEVE essere zero... @@ -2048,15 +2048,15 @@ namespace AppData DataLayer DLMan = new DataLayer(); bool answ = false; // verifico se NON CI SIANO GIA' validazioni in corso... - var tabBatchRunning = DLMan.taBL.getByStatus(1, "", 0); + var tabBatchRunning = DLMan.taBL.getByStatus(1, "", true, 0); if (tabBatchRunning.Count == 0) { // ora verifico, se ci sono batch per FILE (dxf) VALIDATION in stato 8 (da validare) --> metto in coda! - DS_App.BatchListDataTable tabBatch = DLMan.taBL.getByStatus(8, "", 2); + DS_App.BatchListDataTable tabBatch = DLMan.taBL.getByStatus(8, "", true, 2); // se non ne ho cerco nei PartValidation if (tabBatch.Count == 0) { - tabBatch = DLMan.taBL.getByStatus(8, "", 1); + tabBatch = DLMan.taBL.getByStatus(8, "", true, 1); } if (tabBatch.Count > 0) { diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index e7adee0..9c4cabd 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -26491,6 +26491,7 @@ namespace AppData.DS_AppTableAdapters { this._commandCollection[10].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[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SearchVal", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ShowSplit", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PartValid", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[11] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[11].Connection = this.Connection; @@ -26629,7 +26630,7 @@ namespace AppData.DS_AppTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_App.BatchListDataTable getByStatus(global::System.Nullable Status, string SearchVal, global::System.Nullable PartValid) { + public virtual DS_App.BatchListDataTable getByStatus(global::System.Nullable Status, string SearchVal, global::System.Nullable ShowSplit, global::System.Nullable PartValid) { this.Adapter.SelectCommand = this.CommandCollection[10]; if ((Status.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Status.Value)); @@ -26643,12 +26644,18 @@ namespace AppData.DS_AppTableAdapters { else { this.Adapter.SelectCommand.Parameters[2].Value = ((string)(SearchVal)); } - if ((PartValid.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[3].Value = ((int)(PartValid.Value)); + if ((ShowSplit.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((bool)(ShowSplit.Value)); } else { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } + if ((PartValid.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[4].Value = ((int)(PartValid.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; + } DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 06dd43a..5dbf64f 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -153,6 +153,7 @@ FROM v_BatchList + diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index f1107a4..c2904db 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,46 +4,46 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx b/NKC_WF/WebUserControls/cmp_batchList.ascx index 106275c..b687c47 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx @@ -14,7 +14,11 @@
<%: traduci("CallList") %>
-
+
+ + + <%: traduci("ShowSplitBatch") %> + <%: traduci("FilterStatus") %> @@ -111,10 +115,11 @@ - + + diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_batchList.ascx.designer.cs index 0a08481..388a212 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx.designer.cs @@ -50,6 +50,15 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.HiddenField hfLastSelRow; + /// + /// chkShowSplit control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CheckBox chkShowSplit; + /// /// ddlStatus control. ///