Merge branch 'develop' into SDK

Jenkinsfile

@@ -11,7 +11,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=306']) {
+        withEnv(['NEXT_BUILD_NUMBER=307']) {
           // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')

NKC_WF/Controllers/PrintQueueController.cs

@@ -155,7 +155,7 @@ namespace NKC_WF.Controllers
             {
                 // recupero da dbe e salvo
                 answ = countWaitingDb;
-                memLayer.ML.setRSV(redQueueCount, answ.ToString(), 30);
+                memLayer.ML.setRSV(redQueueCount, answ.ToString(), memLayer.ML.CRI("cacheQueueSec"));
             }
             return answ;
         }

NKC_WF/Reports/Bin.rdlc

@@ -11,7 +11,7 @@
           </TablixColumns>
           <TablixRows>
             <TablixRow>
-              <Height>6.94949in</Height>
+              <Height>8.20162in</Height>
               <TablixCells>
                 <TablixCell>
                   <CellContents>
@@ -21,13 +21,13 @@
                           <Source>External</Source>
                           <Value>=Fields!PathImageFull.Value &amp; First(Fields!ItemExtCode.Value, "stp_prt_Bin") &amp; ".png"</Value>
                           <Sizing>FitProportional</Sizing>
-                          <Top>3.59532in</Top>
-                          <Left>0.36334in</Left>
-                          <Height>3.35417in</Height>
-                          <Width>6.71875in</Width>
+                          <Top>3.12657in</Top>
+                          <Left>0.39459in</Left>
+                          <Height>117mm</Height>
+                          <Width>166mm</Width>
                           <Style>
                             <Border>
-                              <Style>Solid</Style>
+                              <Style>None</Style>
                             </Border>
                           </Style>
                         </Image>
@@ -308,7 +308,7 @@
         </PageBreak>
         <Top>0.1343in</Top>
         <Left>0.00001cm</Left>
-        <Height>6.94949in</Height>
+        <Height>8.20162in</Height>
         <Width>7.37604in</Width>
         <Style>
           <FontFamily>Tahoma</FontFamily>
@@ -317,7 +317,7 @@
         </Style>
       </Tablix>
     </ReportItems>
-    <Height>7.08379in</Height>
+    <Height>8.33592in</Height>
     <Style />
   </Body>
   <Width>7.5in</Width>
@@ -328,7 +328,7 @@
     <BottomMargin>0.5in</BottomMargin>
     <Style />
   </Page>
-  <Author>v. 1.1.1</Author>
+  <Author>v. 1.2.1</Author>
   <AutoRefresh>0</AutoRefresh>
   <DataSources>
     <DataSource Name="Sauder_NKC">

NKC_WF/Reports/queueConf.json

@@ -80,12 +80,12 @@
         "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",
+            "PageHeight": "2in",
+            "PageWidth": "4.09in",
+            "MarginLeft": "0in",
+            "MarginRight": "0in",
+            "MarginTop": "0in",
+            "MarginBottom": "0in",
             "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>"
         }
     },
@@ -95,12 +95,12 @@
         "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",
+            "PageHeight": "2in",
+            "PageWidth": "4.09in",
+            "MarginLeft": "0in",
+            "MarginRight": "0in",
+            "MarginTop": "0in",
+            "MarginBottom": "0in",
             "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/Web.config

@@ -57,6 +57,8 @@
         <add key="_logLevel" value="6"/>
         <add key="_logMaxMb" value="30"/>
         <add key="logMitigSec" value="30"/>
+        <!--gestione coda stampa-->
+        <add key="cacheQueueSec" value="2"/>
         <!--Impostazione gestione serializzazione variabili in sessione (es per Redis)-->
         <add key="serializeSession" value="true"/>
         <add key="errorPageRedirect" value="./Reset?Action=CDV"/>