diff --git a/Jenkinsfile b/Jenkinsfile index 45b0c08..aed8058 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=716']) { + withEnv(['NEXT_BUILD_NUMBER=717']) { // 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/SteamWare.csproj b/SteamWareLib/SteamWare.csproj index 70b4444..c44f7a7 100644 --- a/SteamWareLib/SteamWare.csproj +++ b/SteamWareLib/SteamWare.csproj @@ -244,7 +244,7 @@ - + SteamWare.tt True diff --git a/SteamWareLib/reportGen.cs b/SteamWareLib/reportGen.cs deleted file mode 100644 index 3ba6ef5..0000000 --- a/SteamWareLib/reportGen.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SteamWare -{ - /// - /// classe contenente oggetti generazione report SSRS (configurazioni + tabella valori) - /// - public class reportData - { - /// - /// Template report (rdlc) - /// - public string template { get; set; } = ""; - /// - /// Configurazione device di stampa - /// - public devInfoParam deviceInfoParam { get; set; } - /// - /// Nome del ReportDataSource - /// - public string rdsName { get; set; } = ""; - /// - /// Contenuto tabellare del ReportDataSource - /// - public DataTable rdsTable { get; set; } - } -} diff --git a/SteamWareLib/reportGenObj.cs b/SteamWareLib/reportGenObj.cs new file mode 100644 index 0000000..79bceae --- /dev/null +++ b/SteamWareLib/reportGenObj.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SteamWare +{ + /// + /// Configuraizone di una coda di stampa (1 coda = 1 tipo di report + stampante) + /// + public class queueConf + { + /// + /// Nome coda + /// + public string name { get; set; } = "default"; + /// + /// Template report (rdlc) + /// + public string template { get; set; } = "default.rdlc"; + /// + /// Nome stampante (opzionale) + /// + public string printerName { get; set; } = "Microsoft Print to PDF"; + /// + /// Configurazione device di stampa + /// + public devInfoParam deviceInfoParam { get; set; } + /// + /// Nome del ReportDataSource da impiegare + /// + public string rdsName { get; set; } = "ReportDataSource"; + } + /// + /// Istanza dei dati di stampa di un SINGOLO docuemnto (report SSRS) + /// + public class reportData + { + /// + /// Numero di ticket della richeista di stampa (per poter chiudere) + /// + public string ticketNum { get; set; } = ""; + /// + /// Contenuto tabellare del ReportDataSource + /// + public DataTable rdsTable { get; set; } + } +}