Merge branch 'develop'

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}')

SteamWareLib/devInfoParam.cs

@@ -5,6 +5,11 @@
   /// </summary>
   public class devInfoParam
   {
+    /// <summary>
+    /// Init classe dummy
+    /// </summary>
+    public devInfoParam()
+    { }
     /// <summary>
     /// creazione oggetto parametri per stampa
     /// </summary>
@@ -28,31 +33,31 @@
     /// <summary>
     /// formato output
     /// </summary>
-    public string OutputFormat { get; set; }
+    public string OutputFormat { get; set; } = "";
     /// <summary>
     /// altezza
     /// </summary>
-    public string PageHeight { get; set; }
+    public string PageHeight { get; set; } = "";
     /// <summary>
     /// larghezza
     /// </summary>
-    public string PageWidth { get; set; }
+    public string PageWidth { get; set; } = "";
     /// <summary>
     /// margine Sx
     /// </summary>
-    public string MarginLeft { get; set; }
+    public string MarginLeft { get; set; } = "";
     /// <summary>
     /// margine Dx
     /// </summary>
-    public string MarginRight { get; set; }
+    public string MarginRight { get; set; } = "";
     /// <summary>
     /// margine Top
     /// </summary>
-    public string MarginTop { get; set; }
+    public string MarginTop { get; set; } = "";
     /// <summary>
     /// margine Bottom
     /// </summary>
-    public string MarginBottom { get; set; }
+    public string MarginBottom { get; set; } = "";
 
     /// <summary>
     /// Gets the XML parameter.

SteamWareLib/reportGenObj.cs

@@ -29,9 +29,9 @@ namespace SteamWare
     /// </summary>
     public devInfoParam deviceInfoParam { get; set; }
     /// <summary>
-    /// Nome del ReportDataSource da impiegare
+    /// Array dei ReportDataSource da impiegare
     /// </summary>
-    public string rdsName { get; set; } = "ReportDataSource";
+    public List<string> rdsNames { get; set; }
   }
   /// <summary>
   /// Istanza dei dati di stampa di un SINGOLO docuemnto (report SSRS)
@@ -43,9 +43,9 @@ namespace SteamWare
     /// </summary>
     public string ticketNum { get; set; } = "";
     /// <summary>
-    /// Contenuto tabellare del ReportDataSource
+    /// Dictionary degli RDS da impiegare, chiave = nome RDS, valore = tabella RDS
     /// </summary>
-    public DataTable rdsTable { get; set; }
+    public Dictionary<string, DataTable> rdsData { get; set; }
   }
   /// <summary>
   /// Corpo risposta alla chiamata