Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-07 13:31:51 +02:00
parent b4c332fc1b ebd4d21266
commit 3a3071ac64
17 changed files with 158 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -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}')
NKC_WF/Controllers/PrintQueueController.cs
+8 -6
View File
@@ -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
}
}
NKC_WF/NKC_WF.csproj
+8
View File
@@ -400,6 +400,7 @@
<Content Include="site\DBG_QRCode_Unload.aspx" />
<Content Include="site\DevUtils.aspx" />
<Content Include="site\ErrorsLog.aspx" />
<Content Include="site\ForceReload.aspx" />
<Content Include="site\GlobalSearch.aspx" />
<Content Include="site\Home.aspx" />
<Content Include="Images\NoData.svg" />
@@ -713,6 +714,13 @@
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
<Compile Include="site\ForceReload.aspx.cs">
<DependentUpon>ForceReload.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="site\ForceReload.aspx.designer.cs">
<DependentUpon>ForceReload.aspx</DependentUpon>
</Compile>
<Compile Include="site\GlobalSearch.aspx.cs">
<DependentUpon>GlobalSearch.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
NKC_WF/Web.config
-4
View File
@@ -59,8 +59,6 @@
<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"/>
@@ -71,8 +69,6 @@
<add key="RedisConn" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password"/>
<add key="RedisConnAdmin" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password,allowAdmin=true"/>
<add key="redisDb" value="0"/>
<!--Gestione MatrixCode-->
<add key="matrixUrl" value="https://qrcode.steamware.net"/>
<!--MongoDB-->
<add key="mdbConnString" value="mongodb://W2019-MONGODB:27017"/>
<add key="enableMongo" value="true"/>
NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs
+3 -2
View File
@@ -1,4 +1,5 @@
using System;
using SteamWare;
using System;
namespace NKC_WF.WebUserControls
{
@@ -44,7 +45,7 @@ namespace NKC_WF.WebUserControls
/// <returns></returns>
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;
NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs
+2 -1
View File
@@ -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
/// <returns></returns>
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;
NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs
+2 -1
View File
@@ -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
/// <returns></returns>
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;
NKC_WF/WebUserControls/cmp_menuTop.ascx
+6 -3
View File
@@ -1,8 +1,8 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_menuTop.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_menuTop" %>
<nav class="navbar navbar-expand-lg navbar-dark bg-dark text-light py-1 mb-1">
<asp:LinkButton runat="server" ID="lbnUpdate" Text="---" OnClick="lbnUpdate_Click" CssClass="navbar-brand" ToolTip="Update + HOME">Sauder NKC <i class="fa fa-object-group" aria-hidden="true"></i></asp:LinkButton>
<%--<a class="navbar-brand" href="#">Sauder NKC <i class="fa fa-object-group" aria-hidden="true"></i></a>--%>
<%--<asp:LinkButton runat="server" ID="lbnUpdate" Text="---" OnClick="lbnUpdate_Click" CssClass="navbar-brand" ToolTip="HOME">Sauder NKC <i class="fa fa-object-group" aria-hidden="true"></i></asp:LinkButton>--%>
<a class="navbar-brand" href="../">Sauder NKC <i class="fa fa-object-group" aria-hidden="true"></i></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -32,7 +32,10 @@
<SeparatorTemplate>
</SeparatorTemplate>
</asp:Repeater>
<asp:XmlDataSource ID="XmlMenu" runat="server" EnableCaching="true" CacheDuration="5"></asp:XmlDataSource>
<asp:XmlDataSource ID="XmlMenu" runat="server" EnableCaching="true" CacheDuration="600"></asp:XmlDataSource>
<%--<li class="nav-item">
<a class="nav-link text-light" href="ForceReload"><i class="fa fa-retweet shortcut-icon"></i> <%: traduci("ForceReload") %></a>
</li>--%>
<li class="nav-item">
<a class="nav-link" href="About">About</a>
</li>
NKC_WF/WebUserControls/cmp_menuTop.ascx.cs
+2 -25
View File
@@ -5,7 +5,7 @@ using System.Web.UI;
namespace NKC_WF.WebUserControls
{
public partial class cmp_menuTop : System.Web.UI.UserControl
public partial class cmp_menuTop : BaseUserControl
{
public event EventHandler eh_doRefresh;
protected void Page_Load(object sender, EventArgs e)
@@ -96,30 +96,7 @@ namespace NKC_WF.WebUserControls
/// <param name="e"></param>
protected void lbnUpdate_Click(object sender, EventArgs e)
{
doDataUpdate(true);
}
/// <summary>
/// effettua un update completo dei valori in sessione
/// </summary>
private void doDataUpdate(bool doFullReset)
{
if (doFullReset)
{
// reset REDIS x css
ComLib.man.resetSheetUnload();
// aggiorno vocabolario
DataWrap.DW.resetVocabolario();
// reset dati in cache x DbConfig...
memLayer.ML.resetAppConf();
// svuoto session e cache per rileggere i dati da Db
Session.RemoveAll();
memLayer.ML.setSessionVal("nextPage", user_std.pagCorrente);
Response.Redirect("login");
}
else
{
Response.Redirect(user_std.pagCorrente);
}
Response.Redirect("default");
}
protected void lbtSearch_Click(object sender, EventArgs e)
{
NKC_WF/WebUserControls/cmp_menuTop.ascx.designer.cs
Generated
+43 -52
View File
@@ -11,61 +11,52 @@ namespace NKC_WF.WebUserControls
{
public partial class cmp_menuTop
{
public partial class cmp_menuTop
{
/// <summary>
/// Controllo lbnUpdate.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbnUpdate;
/// <summary>
/// Controllo menu.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater menu;
/// <summary>
/// Controllo menu.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater menu;
/// <summary>
/// Controllo XmlMenu.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.XmlDataSource XmlMenu;
/// <summary>
/// Controllo XmlMenu.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.XmlDataSource XmlMenu;
/// <summary>
/// Controllo divSearch.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSearch;
/// <summary>
/// Controllo divSearch.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSearch;
/// <summary>
/// Controllo txtSearch.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtSearch;
/// <summary>
/// Controllo txtSearch.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtSearch;
/// <summary>
/// Controllo lbtSearch.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtSearch;
}
/// <summary>
/// Controllo lbtSearch.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtSearch;
}
}
NKC_WF/WebUserControls/cmp_paint_bins.ascx.cs
+3 -2
View File
@@ -1,4 +1,5 @@
using System;
using SteamWare;
using System;
namespace NKC_WF.WebUserControls
{
@@ -136,7 +137,7 @@ namespace NKC_WF.WebUserControls
/// <returns></returns>
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;
NKC_WF/WebUserControls/cmp_secScreen.ascx.cs
+1 -1
View File
@@ -227,7 +227,7 @@ namespace NKC_WF.WebUserControls
/// <returns></returns>
public string getImageUrl()
{
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':['" + codSSC + "']}";
string answ = $"{baseUrl}{payload}";
return answ;
NKC_WF/site/DBG_QRCode_Unload.aspx.cs
+1 -1
View File
@@ -52,7 +52,7 @@ namespace NKC_WF.site
/// <returns></returns>
public string getLoginUrl()
{
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':['" + memLayer.ML.CRS("BaseUrl") + "']}";
string answ = $"{baseUrl}{payload}";
return answ;
NKC_WF/site/ForceReload.aspx
+16
View File
@@ -0,0 +1,16 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ForceReload.aspx.cs" Inherits="NKC_WF.site.ForceReload1" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title></title>
</head>
<body>
<form id="form1" runat="server">
<div>
</div>
</form>
</body>
</html>
NKC_WF/site/ForceReload.aspx.cs
+29
View File
@@ -0,0 +1,29 @@
using AppData;
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace NKC_WF.site
{
public partial class ForceReload1 : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
// reset REDIS x css
ComLib.man.resetSheetUnload();
// aggiorno vocabolario
DataWrap.DW.resetVocabolario();
// reset dati in cache x DbConfig...
memLayer.ML.resetAppConf();
// svuoto session e cache per rileggere i dati da Db
Session.RemoveAll();
memLayer.ML.setSessionVal("nextPage", user_std.pagCorrente);
Response.Redirect("default");
}
}
}
NKC_WF/site/ForceReload.aspx.designer.cs
Generated
+26
View File
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </auto-generated>
//------------------------------------------------------------------------------
namespace NKC_WF.site
{
public partial class ForceReload1
{
/// <summary>
/// Controllo form1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
}
}
NKC_WF/site/UpdateVoc.aspx.cs
+7 -2
View File
@@ -1,4 +1,5 @@
using SteamWare;
using AppData;
using SteamWare;
using System;
namespace NKC_WF
@@ -7,11 +8,15 @@ namespace NKC_WF
{
protected void Page_Load(object sender, EventArgs e)
{
// reset REDIS x css
ComLib.man.resetSheetUnload();
// aggiorno vocabolario
DataWrap.DW.resetVocabolario();
// reset dati in cache x DbConfig...
memLayer.ML.resetAppConf();
// torno a menu...
// svuoto session e cache per rileggere i dati da Db
Session.RemoveAll();
memLayer.ML.setSessionVal("nextPage", user_std.pagCorrente);
Response.Redirect("default");
}
}