diff --git a/Jenkinsfile b/Jenkinsfile
index 184faaf..b1899ef 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=312']) {
+ withEnv(['NEXT_BUILD_NUMBER=313']) {
// 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}')
diff --git a/NKC_WF/Controllers/PrintQueueController.cs b/NKC_WF/Controllers/PrintQueueController.cs
index 9a00e39..a38740a 100644
--- a/NKC_WF/Controllers/PrintQueueController.cs
+++ b/NKC_WF/Controllers/PrintQueueController.cs
@@ -2,6 +2,7 @@
using Newtonsoft.Json;
using NKC_SDK;
using SteamWare;
+using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
@@ -27,10 +28,10 @@ namespace NKC_WF.Controllers
{
int answ = 0;
// resetto conteggio in redis...
- DS_Report.PrintJobQueueDataTable nextJob = DataLayer.man.taPJQ.getWaiting();
- if (nextJob != null)
+ DS_Report.PrintJobQueueDataTable tabPJQ = DataLayer.man.taPJQ.getWaiting();
+ if (tabPJQ != null)
{
- answ = nextJob.Count;
+ answ = tabPJQ.Count;
}
return answ;
}
@@ -153,7 +154,9 @@ namespace NKC_WF.Controllers
}
else
{
- // recupero da dbe e salvo
+ // chiudo gli zombie (stampe non chiuse)...
+ DataLayer.man.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.CRI("zombieMsTime")));
+ // recupero da db e salvo
answ = countWaitingDb;
memLayer.ML.setRSV(redQueueCount, answ.ToString(), memLayer.ML.CRI("cacheQueueSec"));
}
@@ -222,7 +225,7 @@ namespace NKC_WF.Controllers
int.TryParse(printAnsw.ticketNum, out idxPJQ);
DataLayer.man.taPJQ.updateStato(idxPJQ, printAnsw.newStatus);
// resetto conteggio in redis...
- memLayer.ML.setRSV(redQueueCount, countWaitingDb.ToString(), 30);
+ memLayer.ML.setRSV(redQueueCount, countWaitingDb.ToString(), memLayer.ML.CRI("cacheQueueSec"));
answ = "OK";
}
}
@@ -233,6 +236,5 @@ namespace NKC_WF.Controllers
}
#endregion
-
}
}
diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj
index 94d0347..4200d29 100644
--- a/NKC_WF/NKC_WF.csproj
+++ b/NKC_WF/NKC_WF.csproj
@@ -400,6 +400,7 @@
+
@@ -713,6 +714,13 @@
Global.asax
+
+ ForceReload.aspx
+ ASPXCodeBehind
+
+
+ ForceReload.aspx
+
GlobalSearch.aspx
ASPXCodeBehind
diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config
index 78fcff6..8fcfdb6 100644
--- a/NKC_WF/Web.config
+++ b/NKC_WF/Web.config
@@ -59,8 +59,6 @@
-
-
@@ -71,8 +69,6 @@
-
-
diff --git a/NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs
index 5c95027..0f7eea8 100644
--- a/NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs
@@ -1,4 +1,5 @@
-using System;
+using SteamWare;
+using System;
namespace NKC_WF.WebUserControls
{
@@ -44,7 +45,7 @@ namespace NKC_WF.WebUserControls
///
public string getImgUrl(object currId)
{
- string baseUrl = "https://qrcode.steamware.net/HOME/QR_site/JSON?val=";
+ string baseUrl = $"{memLayer.ML.CRS("matrixUrl")}/HOME/QR_site/JSON?val=";
string payload = "{'baseUrl':'{0}','parameters':['" + currId.ToString() + "']}";
string answ = $"{baseUrl}{payload}";
return answ;
diff --git a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs
index cd39977..be47993 100644
--- a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs
@@ -1,5 +1,6 @@
using AppData;
using NKC_SDK;
+using SteamWare;
using System;
namespace NKC_WF.WebUserControls
@@ -88,7 +89,7 @@ namespace NKC_WF.WebUserControls
///
public string getImgUrl(object currId)
{
- string baseUrl = "https://qrcode.steamware.net/HOME/QR_site/JSON?val=";
+ string baseUrl = $"{memLayer.ML.CRS("matrixUrl")}/HOME/QR_site/JSON?val=";
string payload = "{'baseUrl':'{0}','parameters':['" + currId.ToString() + "']}";
string answ = $"{baseUrl}{payload}";
return answ;
diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs
index 0862130..e0684e9 100644
--- a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs
@@ -1,5 +1,6 @@
using AppData;
using NKC_SDK;
+using SteamWare;
using System;
namespace NKC_WF.WebUserControls
@@ -105,7 +106,7 @@ namespace NKC_WF.WebUserControls
///
public string getImgUrl(object currId)
{
- string baseUrl = "https://qrcode.steamware.net/HOME/QR_site/JSON?val=";
+ string baseUrl = $"{memLayer.ML.CRS("matrixUrl")}/HOME/QR_site/JSON?val=";
string payload = "{'baseUrl':'{0}','parameters':['" + currId.ToString() + "']}";
string answ = $"{baseUrl}{payload}";
return answ;
diff --git a/NKC_WF/WebUserControls/cmp_menuTop.ascx b/NKC_WF/WebUserControls/cmp_menuTop.ascx
index 9efb3b1..ff55cb8 100644
--- a/NKC_WF/WebUserControls/cmp_menuTop.ascx
+++ b/NKC_WF/WebUserControls/cmp_menuTop.ascx
@@ -1,8 +1,8 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_menuTop.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_menuTop" %>