diff --git a/NKC_WF/ErrorPages/Oops.aspx b/NKC_WF/ErrorPages/Oops.aspx index f27fb05..1b5ee3f 100644 --- a/NKC_WF/ErrorPages/Oops.aspx +++ b/NKC_WF/ErrorPages/Oops.aspx @@ -3,8 +3,10 @@
-
- Return to home page +
+

Error raised

+ Return to home page + Error log recorded: developer can access detailed information about errors here.
diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config index 1727c9d..6a67ed7 100644 --- a/NKC_WF/Web.config +++ b/NKC_WF/Web.config @@ -35,7 +35,7 @@ - + @@ -45,6 +45,7 @@ + diff --git a/NKC_WF/WebUserControls/cmp_MU_Items.ascx b/NKC_WF/WebUserControls/cmp_MU_Items.ascx index b81be3b..f82675b 100644 --- a/NKC_WF/WebUserControls/cmp_MU_Items.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_Items.ascx @@ -10,7 +10,7 @@ - + @@ -31,6 +31,7 @@ +
diff --git a/NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs index 48ce98a..7b0acc3 100644 --- a/NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs @@ -62,5 +62,22 @@ namespace NKC_WF.WebUserControls { grView.DataBind(); } + /// + /// Dimensione QRCode + /// + public int qrSize + { + get + { + int answ = 32; + int.TryParse(hfQrSize.Value, out answ); + return answ; + } + set + { + hfQrSize.Value = value.ToString(); + doUpdate(); + } + } } } \ 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 index 765ec6b..7acb48a 100644 --- a/NKC_WF/WebUserControls/cmp_MU_Items.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_MU_Items.ascx.designer.cs @@ -49,5 +49,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 hfShowQr; + + /// + /// Controllo hfQrSize. + /// + /// + /// 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 hfQrSize; } } diff --git a/NKC_WF/WebUserControls/cmp_MU_bins.ascx b/NKC_WF/WebUserControls/cmp_MU_bins.ascx index fc78380..f1030ba 100644 --- a/NKC_WF/WebUserControls/cmp_MU_bins.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_bins.ascx @@ -16,8 +16,9 @@ - - + + + @@ -39,6 +40,7 @@ + diff --git a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs index 76657e7..3a5b60e 100644 --- a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs @@ -100,5 +100,22 @@ namespace NKC_WF.WebUserControls } return answ; } + /// + /// Dimensione QRCode + /// + public int qrSize + { + get + { + int answ = 32; + int.TryParse(hfQrSize.Value, out answ); + return answ; + } + set + { + hfQrSize.Value = value.ToString(); + doUpdate(); + } + } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.designer.cs index d77b6b0..ba93f90 100644 --- a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.designer.cs @@ -49,5 +49,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 hfShowQr; + + /// + /// Controllo hfQrSize. + /// + /// + /// 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 hfQrSize; } } diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx b/NKC_WF/WebUserControls/cmp_MU_carts.ascx index 01897a7..cd89b1f 100644 --- a/NKC_WF/WebUserControls/cmp_MU_carts.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx @@ -16,8 +16,9 @@ - - + + + @@ -39,6 +40,7 @@ + diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs index bf7addd..81e42f7 100644 --- a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs @@ -100,5 +100,22 @@ namespace NKC_WF.WebUserControls } return answ; } + /// + /// Dimensione QRCode + /// + public int qrSize + { + get + { + int answ = 32; + int.TryParse(hfQrSize.Value, out answ); + return answ; + } + set + { + hfQrSize.Value = value.ToString(); + doUpdate(); + } + } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs index c83f2fe..238cb60 100644 --- a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs @@ -49,5 +49,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 hfShowQr; + + /// + /// Controllo hfQrSize. + /// + /// + /// 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 hfQrSize; } } diff --git a/NKC_WF/site/BatchPreview.aspx b/NKC_WF/site/BatchPreview.aspx index f563d1c..b946c22 100644 --- a/NKC_WF/site/BatchPreview.aspx +++ b/NKC_WF/site/BatchPreview.aspx @@ -10,15 +10,17 @@
- +

Batch preview

- - + +
- + + +
diff --git a/NKC_WF/site/BatchPreview.aspx.designer.cs b/NKC_WF/site/BatchPreview.aspx.designer.cs index e6fdb58..ec2624c 100644 --- a/NKC_WF/site/BatchPreview.aspx.designer.cs +++ b/NKC_WF/site/BatchPreview.aspx.designer.cs @@ -50,6 +50,15 @@ namespace NKC_WF.site /// protected global::NKC_WF.WebUserControls.cmp_MU_svgViewer cmp_MU_svgViewer; + /// + /// Controllo pnlSheets. + /// + /// + /// 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.Panel pnlSheets; + /// /// Controllo cmp_BP_sheetList. /// diff --git a/NKC_WF/site/DBG_QRCode_Unload.aspx b/NKC_WF/site/DBG_QRCode_Unload.aspx index 9b653e3..e4469ed 100644 --- a/NKC_WF/site/DBG_QRCode_Unload.aspx +++ b/NKC_WF/site/DBG_QRCode_Unload.aspx @@ -8,9 +8,21 @@
-
+
+ + LOGIN Page +
+

DEBUG UNLOAD PAGE

+
+ QR size + + + + + +
diff --git a/NKC_WF/site/DBG_QRCode_Unload.aspx.cs b/NKC_WF/site/DBG_QRCode_Unload.aspx.cs index 1779ea8..4ae89c7 100644 --- a/NKC_WF/site/DBG_QRCode_Unload.aspx.cs +++ b/NKC_WF/site/DBG_QRCode_Unload.aspx.cs @@ -1,4 +1,5 @@ -using System; +using SteamWare; +using System; using System.Collections.Generic; using System.Linq; using System.Web; @@ -48,10 +49,32 @@ namespace NKC_WF.site } } /// + /// restituisce URL immagine QRCode + /// + /// + public string getLoginUrl() + { + string baseUrl = "https://qrcode.steamware.net/HOME/QR_site/JSON?val="; + string payload = "{'baseUrl':'{0}','parameters':['" + memLayer.ML.CRS("BaseUrl") + "']}"; + string answ = $"{baseUrl}{payload}"; + return answ; + } + protected int qrSize + { + get + { + int answ = 32; + int.TryParse(ddlQrSize.SelectedValue, out answ); + return answ; + } + } + /// /// Aggiorna componente principale e child components /// private void doUpdate() { + imgQrLogin.ImageUrl = getLoginUrl(); + updateSize(); //!!!FIXME!!! fare calcolo del VERO batch corrente... BatchId = 242; // fixed x test! SheetID = 770; @@ -63,5 +86,18 @@ namespace NKC_WF.site cmp_MU_Items.ShowQr = true; cmp_MU_Items.SheetID = SheetID; } + + protected void ddlQrSize_SelectedIndexChanged(object sender, EventArgs e) + { + updateSize(); + } + + private void updateSize() + { + imgQrLogin.Height = qrSize * 2; + cmp_MU_bins.qrSize = qrSize; + cmp_MU_carts.qrSize = qrSize; + cmp_MU_Items.qrSize = qrSize; + } } } \ 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 index 5b5b508..29d6660 100644 --- a/NKC_WF/site/DBG_QRCode_Unload.aspx.designer.cs +++ b/NKC_WF/site/DBG_QRCode_Unload.aspx.designer.cs @@ -32,6 +32,24 @@ namespace NKC_WF.site /// protected global::System.Web.UI.WebControls.HiddenField hfSheetID; + /// + /// Controllo imgQrLogin. + /// + /// + /// 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.Image imgQrLogin; + + /// + /// Controllo ddlQrSize. + /// + /// + /// 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.DropDownList ddlQrSize; + /// /// Controllo cmp_MU_Items. ///