diff --git a/Jenkinsfile b/Jenkinsfile
index 5349783c..e906a397 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=901']) {
+ withEnv(['NEXT_BUILD_NUMBER=903']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
diff --git a/MP-Site/WebUserControls/mod_AnPro_PODL.ascx b/MP-Site/WebUserControls/mod_AnPro_PODL.ascx
index 1fcf6354..5429aff7 100644
--- a/MP-Site/WebUserControls/mod_AnPro_PODL.ascx
+++ b/MP-Site/WebUserControls/mod_AnPro_PODL.ascx
@@ -5,7 +5,15 @@
@@ -36,6 +44,7 @@
+
@@ -43,4 +52,4 @@
-
\ No newline at end of file
+
diff --git a/MP-Site/WebUserControls/mod_AnPro_PODL.ascx.designer.cs b/MP-Site/WebUserControls/mod_AnPro_PODL.ascx.designer.cs
index 95b252d3..9b863add 100644
--- a/MP-Site/WebUserControls/mod_AnPro_PODL.ascx.designer.cs
+++ b/MP-Site/WebUserControls/mod_AnPro_PODL.ascx.designer.cs
@@ -12,6 +12,15 @@ namespace MoonPro.WebUserControls {
public partial class mod_AnPro_PODL {
+ ///
+ /// Controllo chkByGroup.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.WebControls.CheckBox chkByGroup;
+
///
/// Controllo grView.
///
diff --git a/MapoDb/DS_ProdTempi.Designer.cs b/MapoDb/DS_ProdTempi.Designer.cs
index 573145ff..6e290643 100644
--- a/MapoDb/DS_ProdTempi.Designer.cs
+++ b/MapoDb/DS_ProdTempi.Designer.cs
@@ -27694,6 +27694,7 @@ FROM MappaStatoExpl";
this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxMulti", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@byGroup", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[5].Connection = this.Connection;
this._commandCollection[5].CommandText = "dbo.stp_PODL_insertQuery";
@@ -27811,7 +27812,7 @@ FROM MappaStatoExpl";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
- public virtual DS_ProdTempi.PromesseODLDataTable getByMultiMacc(string idxMulti) {
+ public virtual DS_ProdTempi.PromesseODLDataTable getByMultiMacc(string idxMulti, global::System.Nullable byGroup) {
this.Adapter.SelectCommand = this.CommandCollection[4];
if ((idxMulti == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
@@ -27819,6 +27820,12 @@ FROM MappaStatoExpl";
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(idxMulti));
}
+ if ((byGroup.HasValue == true)) {
+ this.Adapter.SelectCommand.Parameters[2].Value = ((bool)(byGroup.Value));
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+ }
DS_ProdTempi.PromesseODLDataTable dataTable = new DS_ProdTempi.PromesseODLDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
diff --git a/MapoDb/DS_ProdTempi.xsd b/MapoDb/DS_ProdTempi.xsd
index fd3f63ce..29a34643 100644
--- a/MapoDb/DS_ProdTempi.xsd
+++ b/MapoDb/DS_ProdTempi.xsd
@@ -2148,6 +2148,7 @@ ORDER BY idxPromessa DESC
+
@@ -2672,7 +2673,7 @@ FROM v_ECP
-
+
@@ -2753,7 +2754,7 @@ FROM v_ECP
-
+
@@ -2782,7 +2783,7 @@ FROM v_ECP
-
+
@@ -2794,7 +2795,7 @@ FROM v_ECP
-
+
@@ -2819,7 +2820,7 @@ FROM v_ECP
-
+
@@ -2857,7 +2858,7 @@ FROM v_ECP
-
+
@@ -2896,7 +2897,7 @@ FROM v_ECP
-
+
@@ -2962,7 +2963,7 @@ FROM v_ECP
-
+
@@ -2984,7 +2985,7 @@ FROM v_ECP
-
+
@@ -3054,7 +3055,7 @@ FROM v_ECP
-
+
diff --git a/MapoDb/DS_ProdTempi.xss b/MapoDb/DS_ProdTempi.xss
index 26873afb..2d8ddf9a 100644
--- a/MapoDb/DS_ProdTempi.xss
+++ b/MapoDb/DS_ProdTempi.xss
@@ -4,32 +4,32 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
-
+
-
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
\ No newline at end of file