From b8c6d103c6de31241fc6a7196875f1cc043a5d1e Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 12 Feb 2020 13:06:57 +0100 Subject: [PATCH 1/3] Update metodo x pubblicazione iniziale printQueue --- Jenkinsfile | 2 +- .../Controllers/PrintQueueConfController.cs | 75 +++++++++++++++++++ NKC_WF/Controllers/ReportController.cs | 16 ---- NKC_WF/NKC_WF.csproj | 5 +- NKC_WF/packages.config | 2 +- 5 files changed, 80 insertions(+), 20 deletions(-) create mode 100644 NKC_WF/Controllers/PrintQueueConfController.cs diff --git a/Jenkinsfile b/Jenkinsfile index 7e19c49..0953f86 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=256']) { + withEnv(['NEXT_BUILD_NUMBER=257']) { // env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/Controllers/PrintQueueConfController.cs b/NKC_WF/Controllers/PrintQueueConfController.cs new file mode 100644 index 0000000..9c6aa56 --- /dev/null +++ b/NKC_WF/Controllers/PrintQueueConfController.cs @@ -0,0 +1,75 @@ +using Newtonsoft.Json; +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Web; +using System.Web.Http; + +namespace NKC_WF.Controllers +{ + + public class ResponseModel + { + public List queueList { set; get; } = new List(); + } + public class PrintQueueConfController : ApiController + { + /// + /// Restituisce un array JSon x le conf delle code di stampa + /// GET: api/PrintQueue + /// + /// lista oggetto Json in formato SteamwareSDK.queueConf + public List Get() + { + ResponseModel fullAnsw = new ResponseModel(); + List answ = new List(); + // !!!FIXME!!! per ora hard coded, da usare conf file... + queueConf currConf; + string outForm = "EMF"; + string pagWidth = "8.5in"; + string pagHeigth = "11in"; + string margin = "0.5in"; + devInfoParam currDevInfoParam = new devInfoParam(outForm, pagHeigth, pagWidth, margin, margin, margin, margin); + currConf = new queueConf() + { + name = "queueBin", + template = "BinLabel.rdlc", + printerName = "Microsoft Print to PDF", + deviceInfoParam = currDevInfoParam, + rdsName = "stp_prt_BinLabel" + }; + answ.Add(currConf); + currConf = new queueConf() + { + name = "queueBunk", + template = "StackLabel.rdlc", + printerName = "Microsoft Print to PDF", + deviceInfoParam = currDevInfoParam, + rdsName = "stp_prt_StackLabel" + }; + answ.Add(currConf); + currConf = new queueConf() + { + name = "queueCart", + template = "CartLabel.rdlc", + printerName = "Microsoft Print to PDF", + deviceInfoParam = currDevInfoParam, + rdsName = "stp_prt_CartLabel" + }; + answ.Add(currConf); + fullAnsw.queueList = answ; + //return fullAnsw; + return answ; + } + + // GET: api/PrintQueue/5 + public string Get(int id) + { + return "value"; + } + + } +} diff --git a/NKC_WF/Controllers/ReportController.cs b/NKC_WF/Controllers/ReportController.cs index b34a9f4..8651a30 100644 --- a/NKC_WF/Controllers/ReportController.cs +++ b/NKC_WF/Controllers/ReportController.cs @@ -89,21 +89,5 @@ namespace NKC_WF.Controllers return answ; } -#if false - // POST: api/Report - public void Post([FromBody]string value) - { - } - - // PUT: api/Report/5 - public void Put(int id, [FromBody]string value) - { - } - - // DELETE: api/Report/5 - public void Delete(int id) - { - } -#endif } } diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index d04efcc..b0ac369 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -125,8 +125,8 @@ ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.3.5.2002.716\lib\net462\SteamWare.dll + + ..\packages\SteamWare.3.5.2002.717\lib\net462\SteamWare.dll ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll @@ -513,6 +513,7 @@ + Default.aspx diff --git a/NKC_WF/packages.config b/NKC_WF/packages.config index 9db42b5..84ea62f 100644 --- a/NKC_WF/packages.config +++ b/NKC_WF/packages.config @@ -56,7 +56,7 @@ - + From 9b36e4a237ca657f5b79949e3d04dc854414db17 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 12 Feb 2020 13:07:30 +0100 Subject: [PATCH 2/3] Update steamwarelibs --- NKC_WF/NKC_WF.csproj | 4 +- NKC_WF/Web.config | 423 ++++++++++++++++++++--------------------- NKC_WF/mongocrypt.dll | Bin 332800 -> 0 bytes NKC_WF/packages.config | 2 +- 4 files changed, 209 insertions(+), 220 deletions(-) delete mode 100644 NKC_WF/mongocrypt.dll diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index b0ac369..eaa5237 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -125,8 +125,8 @@ ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.3.5.2002.717\lib\net462\SteamWare.dll + + ..\packages\SteamWare.3.5.2002.718\lib\net462\SteamWare.dll ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config index a074241..8e4d410 100644 --- a/NKC_WF/Web.config +++ b/NKC_WF/Web.config @@ -6,396 +6,385 @@ -
-
-
-
+
+
+
+
- - + + - + - - + + - + - - - + + + - + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - + + + - - + + - - - - - + + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + + + + - + - - - - + + + + @@ -403,20 +392,20 @@ See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for more information on remote access and securing ELMAH. --> - + - + - + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - + + + - - + + - - - - - + + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + + + + - + - - - - + + + + @@ -392,20 +403,20 @@ See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for more information on remote access and securing ELMAH. --> - + - + - +