diff --git a/Jenkinsfile b/Jenkinsfile index 8836f2b..0bafec8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=220']) { + withEnv(['NEXT_BUILD_NUMBER=221']) { // 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/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 2e8f868..13e9884 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -343,6 +343,7 @@ fonts.css + @@ -380,6 +381,7 @@ + @@ -540,6 +542,13 @@ + + DBG_QRCode_Unload.aspx + ASPXCodeBehind + + + DBG_QRCode_Unload.aspx + Default.aspx ASPXCodeBehind @@ -830,6 +839,13 @@ cmp_MU_carts.ascx + + cmp_MU_Items.ascx + ASPXCodeBehind + + + cmp_MU_Items.ascx + cmp_MU_singleStat.ascx ASPXCodeBehind diff --git a/NKC_WF/Site.Master b/NKC_WF/Site.Master index dbb8351..04be675 100644 --- a/NKC_WF/Site.Master +++ b/NKC_WF/Site.Master @@ -11,8 +11,14 @@ + - <%: Page.Title %> - Applicazione ASP.NET + + + + + + NKC <%: Page.Title %> <%: Scripts.Render("~/bundles/modernizr") %> diff --git a/NKC_WF/WebUserControls/cmp_MU_Items.ascx b/NKC_WF/WebUserControls/cmp_MU_Items.ascx new file mode 100644 index 0000000..b81be3b --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_Items.ascx @@ -0,0 +1,37 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_MU_Items.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_MU_Items" %> + + +
+
ITEMS
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
diff --git a/NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs new file mode 100644 index 0000000..48ce98a --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs @@ -0,0 +1,66 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.WebUserControls +{ + public partial class cmp_MU_Items : System.Web.UI.UserControl + { + /// + /// Sheet corrente... + /// + public int SheetID + { + set + { + hfSheetID.Value = value.ToString(); + doUpdate(); + } + get + { + int answ = 0; + int.TryParse(hfSheetID.Value, out answ); + return answ; + } + } + /// + /// Indica se mostrare o meno QRCode + /// + public bool ShowQr + { + set + { + hfShowQr.Value = value.ToString(); + } + get + { + bool answ = false; + bool.TryParse(hfShowQr.Value, out answ); + return answ; + } + } + /// + /// restituisce URL immagine QRCode + /// + /// + /// + public string getImgUrl(object currId) + { + string baseUrl = "https://qrcode.steamware.net/HOME/QR_site/JSON?val="; + string payload = "{'baseUrl':'{0}','parameters':['" + currId.ToString() + "']}"; + string answ = $"{baseUrl}{payload}"; + return answ; + } + protected void Page_Load(object sender, EventArgs e) + { + + } + public void doUpdate() + { + grView.DataBind(); + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_MU_Items.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_Items.ascx.designer.cs new file mode 100644 index 0000000..765ec6b --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_Items.ascx.designer.cs @@ -0,0 +1,53 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace NKC_WF.WebUserControls +{ + + + public partial class cmp_MU_Items + { + + /// + /// Controllo grView. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// Controllo ods. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + + /// + /// Controllo hfSheetID. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfSheetID; + + /// + /// Controllo hfShowQr. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfShowQr; + } +} diff --git a/NKC_WF/WebUserControls/cmp_MU_bins.ascx b/NKC_WF/WebUserControls/cmp_MU_bins.ascx index 2133eee..fc78380 100644 --- a/NKC_WF/WebUserControls/cmp_MU_bins.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_bins.ascx @@ -16,6 +16,7 @@ + @@ -37,6 +38,7 @@ + diff --git a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs index 3bf967d..76657e7 100644 --- a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs @@ -26,6 +26,34 @@ namespace NKC_WF.WebUserControls return answ; } } + /// + /// Indica se mostrare o meno QRCode + /// + public bool ShowQr + { + set + { + hfShowQr.Value = value.ToString(); + } + get + { + bool answ = false; + bool.TryParse(hfShowQr.Value, out answ); + return answ; + } + } + /// + /// restituisce URL immagine QRCode + /// + /// + /// + public string getImgUrl(object currId) + { + string baseUrl = "https://qrcode.steamware.net/HOME/QR_site/JSON?val="; + string payload = "{'baseUrl':'{0}','parameters':['" + currId.ToString() + "']}"; + string answ = $"{baseUrl}{payload}"; + return answ; + } protected void Page_Load(object sender, EventArgs e) { diff --git a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.designer.cs index f4fc38b..d77b6b0 100644 --- a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.designer.cs @@ -40,5 +40,14 @@ namespace NKC_WF.WebUserControls /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.HiddenField hfBatchID; + + /// + /// Controllo hfShowQr. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfShowQr; } } diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx b/NKC_WF/WebUserControls/cmp_MU_carts.ascx index 5174a46..01897a7 100644 --- a/NKC_WF/WebUserControls/cmp_MU_carts.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx @@ -16,6 +16,7 @@ + @@ -37,6 +38,7 @@ + diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs index bb1bd87..bf7addd 100644 --- a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs @@ -26,6 +26,34 @@ namespace NKC_WF.WebUserControls return answ; } } + /// + /// Indica se mostrare o meno QRCode + /// + public bool ShowQr + { + set + { + hfShowQr.Value = value.ToString(); + } + get + { + bool answ = false; + bool.TryParse(hfShowQr.Value, out answ); + return answ; + } + } + /// + /// restituisce URL immagine QRCode + /// + /// + /// + public string getImgUrl(object currId) + { + string baseUrl = "https://qrcode.steamware.net/HOME/QR_site/JSON?val="; + string payload = "{'baseUrl':'{0}','parameters':['" + currId.ToString() + "']}"; + string answ = $"{baseUrl}{payload}"; + return answ; + } protected void Page_Load(object sender, EventArgs e) { diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs index d70d0cd..c83f2fe 100644 --- a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs @@ -40,5 +40,14 @@ namespace NKC_WF.WebUserControls /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.HiddenField hfBatchID; + + /// + /// Controllo hfShowQr. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfShowQr; } } diff --git a/NKC_WF/favicon.ico b/NKC_WF/favicon.ico index a3a7999..4f0e0ad 100644 Binary files a/NKC_WF/favicon.ico and b/NKC_WF/favicon.ico differ diff --git a/NKC_WF/site/DBG_QRCode_Unload.aspx b/NKC_WF/site/DBG_QRCode_Unload.aspx new file mode 100644 index 0000000..f783b8f --- /dev/null +++ b/NKC_WF/site/DBG_QRCode_Unload.aspx @@ -0,0 +1,27 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="DBG_QRCode_Unload.aspx.cs" Inherits="NKC_WF.site.DBG_QRCode_Unload" %> + +<%@ Register Src="~/WebUserControls/cmp_MU_carts.ascx" TagPrefix="uc1" TagName="cmp_MU_carts" %> +<%@ Register Src="~/WebUserControls/cmp_MU_bins.ascx" TagPrefix="uc1" TagName="cmp_MU_bins" %> +<%@ Register Src="~/WebUserControls/cmp_MU_Items.ascx" TagPrefix="uc1" TagName="cmp_MU_Items" %> + + + + + + + +
+
+

DEBUG UNLOAD PAGE

+
+
+ +
+
+ +
+
+ +
+
+ diff --git a/NKC_WF/site/DBG_QRCode_Unload.aspx.cs b/NKC_WF/site/DBG_QRCode_Unload.aspx.cs new file mode 100644 index 0000000..1779ea8 --- /dev/null +++ b/NKC_WF/site/DBG_QRCode_Unload.aspx.cs @@ -0,0 +1,67 @@ +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 DBG_QRCode_Unload : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + doUpdate(); + } + } + /// + /// Batch corrente... + /// + public int BatchId + { + set + { + hfBatchID.Value = value.ToString(); + } + get + { + int answ = 0; + int.TryParse(hfBatchID.Value, out answ); + return answ; + } + }/// + /// Sheet corrente... + /// + public int SheetID + { + set + { + hfSheetID.Value = value.ToString(); + } + get + { + int answ = 0; + int.TryParse(hfSheetID.Value, out answ); + return answ; + } + } + /// + /// Aggiorna componente principale e child components + /// + private void doUpdate() + { + //!!!FIXME!!! fare calcolo del VERO batch corrente... + BatchId = 242; // fixed x test! + SheetID = 770; + // aggiorno child + cmp_MU_bins.ShowQr = true; + cmp_MU_bins.BatchId = BatchId; + cmp_MU_carts.ShowQr = true; + cmp_MU_carts.BatchId = BatchId; + cmp_MU_Items.ShowQr = true; + cmp_MU_Items.SheetID = SheetID; + } + } +} \ No newline at end of file diff --git a/NKC_WF/site/DBG_QRCode_Unload.aspx.designer.cs b/NKC_WF/site/DBG_QRCode_Unload.aspx.designer.cs new file mode 100644 index 0000000..5b5b508 --- /dev/null +++ b/NKC_WF/site/DBG_QRCode_Unload.aspx.designer.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace NKC_WF.site +{ + + + public partial class DBG_QRCode_Unload + { + + /// + /// Controllo hfBatchID. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfBatchID; + + /// + /// Controllo hfSheetID. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfSheetID; + + /// + /// Controllo cmp_MU_Items. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_MU_Items cmp_MU_Items; + + /// + /// Controllo cmp_MU_carts. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_MU_carts cmp_MU_carts; + + /// + /// Controllo cmp_MU_bins. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_MU_bins cmp_MU_bins; + } +}