Merge branch 'release/UpdateCanyonReports01'

NKC_WF/Controllers/ReportConfController.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using static NKC_WF.WebUserControls.cmp_OOIL_drawings;
+using SteamWare;
+
+namespace NKC_WF.Controllers
+{
+    public class ReportConfController : ApiController
+    {
+        /// <summary>
+        /// Restituisce un array JSon x le conf dei report
+        /// GET: api/PrintQueueConf
+        /// </summary>
+        /// <returns>lista oggetto Json in formato SteamwareSDK.queueConf</returns>
+        public List<SteamWare.Reports.reportConf> Get()
+        {
+            List<SteamWare.Reports.reportConf> answ = MagData.MagDataLayer.man.reportConfJson;
+            // se vuoto... creo!
+            if (answ.Count == 0)
+            {
+                SteamWare.Reports.reportConf currConf = new SteamWare.Reports.reportConf()
+                {
+                    name = "none",
+                    template = "none.rdlc"
+                };
+                answ.Add(currConf);
+            }
+            return answ;
+        }
+    }
+}

NKC_WF/NKC_WF.csproj

@@ -134,6 +134,9 @@
     <Reference Include="SteamWare.Logger, Version=5.2.2206.1310, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\SteamWare.Logger.5.2.2206.1310\lib\net462\SteamWare.Logger.dll</HintPath>
     </Reference>
+    <Reference Include="SteamWare.Reports, Version=5.2.2204.2910, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SteamWare.Reports.5.2.2204.2910\lib\net462\SteamWare.Reports.dll</HintPath>
+    </Reference>
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>

NKC_WF/Reports/queueConf.json

@@ -208,5 +208,20 @@
       "MarginBottom": "0in",
       "xmlParam": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>4.09in</PageWidth><PageHeight>2in</PageHeight><MarginTop>0in</MarginTop><MarginLeft>0in</MarginLeft><MarginRight>0in</MarginRight><MarginBottom>0in</MarginBottom></DeviceInfo>"
     }
+  },
+  {
+    "name": "queueSpecialPart",
+    "template": "SpecialParts.rdlc",
+    "printerName": "Microsoft Print to PDF",
+    "deviceInfoParam": {
+      "OutputFormat": "EMF",
+      "PageHeight": "11in",
+      "PageWidth": "8.5in",
+      "MarginLeft": "0.5in",
+      "MarginRight": "0.5in",
+      "MarginTop": "0.5in",
+      "MarginBottom": "0.5in",
+      "xmlParam": "<DeviceInfo><OutputFormat>EMF</OutputFormat><PageWidth>8.5in</PageWidth><PageHeight>11in</PageHeight><MarginTop>0.5in</MarginTop><MarginLeft>0.5in</MarginLeft><MarginRight>0.5in</MarginRight><MarginBottom>0.5in</MarginBottom></DeviceInfo>"
+    }
   }
 ]

NKC_WF/packages.config

@@ -57,6 +57,7 @@
   <package id="StackExchange.Redis" version="2.6.70" targetFramework="net462" />
   <package id="SteamWare" version="5.2.2206.1310" targetFramework="net462" />
   <package id="SteamWare.Logger" version="5.2.2206.1310" targetFramework="net462" />
+  <package id="SteamWare.Reports" version="5.2.2204.2910" targetFramework="net462" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net462" />
   <package id="System.Diagnostics.PerformanceCounter" version="6.0.1" targetFramework="net462" />
   <package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />