diff --git a/Jenkinsfile b/Jenkinsfile
index 9b025f8..09c1c8a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=719']) {
+ withEnv(['NEXT_BUILD_NUMBER=720']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '3.5.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
diff --git a/SteamWareLib/devInfoParam.cs b/SteamWareLib/devInfoParam.cs
index 5a9361c..76d7904 100644
--- a/SteamWareLib/devInfoParam.cs
+++ b/SteamWareLib/devInfoParam.cs
@@ -5,6 +5,11 @@
///
public class devInfoParam
{
+ ///
+ /// Init classe dummy
+ ///
+ public devInfoParam()
+ { }
///
/// creazione oggetto parametri per stampa
///
@@ -28,31 +33,31 @@
///
/// formato output
///
- public string OutputFormat { get; set; }
+ public string OutputFormat { get; set; } = "";
///
/// altezza
///
- public string PageHeight { get; set; }
+ public string PageHeight { get; set; } = "";
///
/// larghezza
///
- public string PageWidth { get; set; }
+ public string PageWidth { get; set; } = "";
///
/// margine Sx
///
- public string MarginLeft { get; set; }
+ public string MarginLeft { get; set; } = "";
///
/// margine Dx
///
- public string MarginRight { get; set; }
+ public string MarginRight { get; set; } = "";
///
/// margine Top
///
- public string MarginTop { get; set; }
+ public string MarginTop { get; set; } = "";
///
/// margine Bottom
///
- public string MarginBottom { get; set; }
+ public string MarginBottom { get; set; } = "";
///
/// Gets the XML parameter.
diff --git a/SteamWareLib/reportGenObj.cs b/SteamWareLib/reportGenObj.cs
index d8bbc53..88d7f8d 100644
--- a/SteamWareLib/reportGenObj.cs
+++ b/SteamWareLib/reportGenObj.cs
@@ -29,9 +29,9 @@ namespace SteamWare
///
public devInfoParam deviceInfoParam { get; set; }
///
- /// Nome del ReportDataSource da impiegare
+ /// Array dei ReportDataSource da impiegare
///
- public string rdsName { get; set; } = "ReportDataSource";
+ public List rdsNames { get; set; }
}
///
/// Istanza dei dati di stampa di un SINGOLO docuemnto (report SSRS)
@@ -43,9 +43,9 @@ namespace SteamWare
///
public string ticketNum { get; set; } = "";
///
- /// Contenuto tabellare del ReportDataSource
+ /// Dictionary degli RDS da impiegare, chiave = nome RDS, valore = tabella RDS
///
- public DataTable rdsTable { get; set; }
+ public Dictionary rdsData { get; set; }
}
///
/// Corpo risposta alla chiamata