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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-01-27 19:58:17 +01:00
parent 3f827f5a89 b72c753df2
commit 546a8cb302
16 changed files with 177 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NKC_WF/ErrorPages/Oops.aspx
+4 -2
View File
@@ -3,8 +3,10 @@
<div class="row">
<div class="col-4"></div>
<div class="col-4">
<asp:HyperLink runat="server" ID="hlDefault" NavigateUrl="../Default">Return to home page</asp:HyperLink>
<div class="col-4 text-center">
<h2>Error raised</h2>
<asp:HyperLink runat="server" ID="hlDefault" NavigateUrl="../Default" CssClass="btn btn-block btn-success"><i class="fa fa-home" aria-hidden="true"></i> Return to home page</asp:HyperLink>
<i>Error log recorded</i>: developer can access <a href="../elmah.axd">detailed information about errors here</a>.
</div>
<div class="col-4"></div>
</div>
NKC_WF/Web.config
+2 -1
View File
@@ -35,7 +35,7 @@
<add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah"/>
<add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah"/>
</httpModules>
<customErrors mode="RemoteOnly" defaultRedirect="~/ErrorPages/Oops.aspx"/>
<customErrors mode="On" defaultRedirect="~/ErrorPages/Oops.aspx"/>
</system.web>
<appSettings>
<!--Configurazioni generali-->
@@ -45,6 +45,7 @@
<add key="copyRight" value="Egaltech &amp; Steamware "/>
<add key="authSenzaDominio" value="true"/>
<add key="_safePages" value="Test#Home#Default"/>
<add key="BaseUrl" value="http://IIS02/NKC"/>
<!--area DEV/testing-->
<add key="enableSimProd" value="true"/>
<!--area logger-->
NKC_WF/WebUserControls/cmp_MU_Items.ascx
+2 -1
View File
@@ -10,7 +10,7 @@
<Columns>
<asp:TemplateField HeaderText="QR">
<ItemTemplate>
<asp:Image runat="server" Height="64" Visible='<%# hfShowQr.Value.ToLower()=="true" %>' ImageUrl='<%# getImgUrl(Eval("ItemDtmx")) %>' />
<asp:Image runat="server" Height='<%# qrSize %>' Visible='<%# hfShowQr.Value.ToLower()=="true" %>' ImageUrl='<%# getImgUrl(Eval("ItemDtmx")) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="ItemID" HeaderText="ItemID" InsertVisible="False" ReadOnly="True" SortExpression="ItemID" />
@@ -31,6 +31,7 @@
</asp:ObjectDataSource>
<asp:HiddenField ID="hfSheetID" runat="server" />
<asp:HiddenField ID="hfShowQr" runat="server" Value="false" />
<asp:HiddenField ID="hfQrSize" runat="server" Value="32" />
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_MU_Items.ascx.cs
+17
View File
@@ -62,5 +62,22 @@ namespace NKC_WF.WebUserControls
{
grView.DataBind();
}
/// <summary>
/// Dimensione QRCode
/// </summary>
public int qrSize
{
get
{
int answ = 32;
int.TryParse(hfQrSize.Value, out answ);
return answ;
}
set
{
hfQrSize.Value = value.ToString();
doUpdate();
}
}
}
}
NKC_WF/WebUserControls/cmp_MU_Items.ascx.designer.cs
Generated
+9
View File
@@ -49,5 +49,14 @@ namespace NKC_WF.WebUserControls
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfShowQr;
/// <summary>
/// Controllo hfQrSize.
/// </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.HiddenField hfQrSize;
}
}
NKC_WF/WebUserControls/cmp_MU_bins.ascx
+4 -2
View File
@@ -16,8 +16,9 @@
<Columns>
<asp:TemplateField HeaderText="Cod" SortExpression="BinDtmx">
<ItemTemplate>
<asp:Image runat="server" Height="64" Visible='<%# hfShowQr.Value.ToLower()=="true" %>' ImageUrl='<%# getImgUrl(Eval("BinDtmx")) %>' />
<b><asp:Label ID="Label1" runat="server" Text='<%# Eval("BinIndex","B{0}") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>' /></b>
<asp:Image runat="server" Height='<%# qrSize %>' Visible='<%# hfShowQr.Value.ToLower()=="true" %>' ImageUrl='<%# getImgUrl(Eval("BinDtmx")) %>' />
<b><asp:Label ID="lblBinIndex" runat="server" Text='<%# Eval("BinIndex","B{0}") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>' /></b>
<asp:Label ID="lblBinDtmx" runat="server" Visible='<%# hfShowQr.Value.ToLower()=="true" %>' Text='<%# Eval("BinDtmx") %>' CssClass="small" />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="D/T" SortExpression="TotItem">
@@ -39,6 +40,7 @@
</asp:ObjectDataSource>
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfShowQr" runat="server" Value="false" />
<asp:HiddenField ID="hfQrSize" runat="server" Value="32" />
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs
+17
View File
@@ -100,5 +100,22 @@ namespace NKC_WF.WebUserControls
}
return answ;
}
/// <summary>
/// Dimensione QRCode
/// </summary>
public int qrSize
{
get
{
int answ = 32;
int.TryParse(hfQrSize.Value, out answ);
return answ;
}
set
{
hfQrSize.Value = value.ToString();
doUpdate();
}
}
}
}
NKC_WF/WebUserControls/cmp_MU_bins.ascx.designer.cs
Generated
+9
View File
@@ -49,5 +49,14 @@ namespace NKC_WF.WebUserControls
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfShowQr;
/// <summary>
/// Controllo hfQrSize.
/// </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.HiddenField hfQrSize;
}
}
NKC_WF/WebUserControls/cmp_MU_carts.ascx
+4 -2
View File
@@ -16,8 +16,9 @@
<Columns>
<asp:TemplateField HeaderText="Cod" SortExpression="CartDtmx">
<ItemTemplate>
<asp:Image runat="server" Height="64" Visible='<%# hfShowQr.Value.ToLower()=="true" %>' ImageUrl='<%# getImgUrl(Eval("CartDtmx")) %>' />
<b><asp:Label ID="Label1" runat="server" Text='<%# Eval("CartIndex","C{0}") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>' /></b>
<asp:Image runat="server" Height='<%# qrSize %>' Visible='<%# hfShowQr.Value.ToLower()=="true" %>' ImageUrl='<%# getImgUrl(Eval("CartDtmx")) %>' />
<b><asp:Label ID="lblCartIndex" runat="server" Text='<%# Eval("CartIndex","C{0}") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>' /></b>
<asp:Label ID="lblCartDtmx" runat="server" Visible='<%# hfShowQr.Value.ToLower()=="true" %>' Text='<%# Eval("CartDtmx") %>' CssClass="small" />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="D/T" SortExpression="TotItem">
@@ -39,6 +40,7 @@
</asp:ObjectDataSource>
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfShowQr" runat="server" Value="false" />
<asp:HiddenField ID="hfQrSize" runat="server" Value="32" />
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs
+17
View File
@@ -100,5 +100,22 @@ namespace NKC_WF.WebUserControls
}
return answ;
}
/// <summary>
/// Dimensione QRCode
/// </summary>
public int qrSize
{
get
{
int answ = 32;
int.TryParse(hfQrSize.Value, out answ);
return answ;
}
set
{
hfQrSize.Value = value.ToString();
doUpdate();
}
}
}
}
NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs
Generated
+9
View File
@@ -49,5 +49,14 @@ namespace NKC_WF.WebUserControls
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfShowQr;
/// <summary>
/// Controllo hfQrSize.
/// </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.HiddenField hfQrSize;
}
}
NKC_WF/site/BatchPreview.aspx
+6 -4
View File
@@ -10,15 +10,17 @@
<asp:HiddenField ID="hfBatchID" runat="server" />
<div class="row text-center small">
<div class="col-1 pr-0 small">
<uc1:cmp_BP_bunkList runat="server" id="cmp_BP_bunkList" />
<uc1:cmp_BP_bunkList runat="server" ID="cmp_BP_bunkList" />
</div>
<div class="col-9 px-0">
<h3>Batch preview</h3>
<uc1:cmp_slider runat="server" id="cmp_slider" />
<uc1:cmp_MU_svgViewer runat="server" id="cmp_MU_svgViewer" />
<uc1:cmp_slider runat="server" ID="cmp_slider" />
<uc1:cmp_MU_svgViewer runat="server" ID="cmp_MU_svgViewer" />
</div>
<div class="col-2 pl-0 small">
<uc1:cmp_BP_sheetList runat="server" id="cmp_BP_sheetList" />
<asp:Panel runat="server" ID="pnlSheets" Height="80em" ScrollBars="Auto">
<uc1:cmp_BP_sheetList runat="server" ID="cmp_BP_sheetList" />
</asp:Panel>
</div>
</div>
</asp:Content>
NKC_WF/site/BatchPreview.aspx.designer.cs
Generated
+9
View File
@@ -50,6 +50,15 @@ namespace NKC_WF.site
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_MU_svgViewer cmp_MU_svgViewer;
/// <summary>
/// Controllo pnlSheets.
/// </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.Panel pnlSheets;
/// <summary>
/// Controllo cmp_BP_sheetList.
/// </summary>
NKC_WF/site/DBG_QRCode_Unload.aspx
+13 -1
View File
@@ -8,9 +8,21 @@
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfSheetID" runat="server" />
<div class="row">
<div class="col-12">
<div class="col-2 text-left">
<asp:Image runat="server" Height="64" id="imgQrLogin"/>
<b>LOGIN</b> Page
</div>
<div class="col-8">
<h1 class="text-center">DEBUG UNLOAD PAGE</h1>
</div>
<div class="col-2 text-right">
QR size
<asp:DropDownList runat="server" ID="ddlQrSize" AutoPostBack="True" OnSelectedIndexChanged="ddlQrSize_SelectedIndexChanged">
<asp:ListItem Text="Small" Value="16"></asp:ListItem>
<asp:ListItem Text="Medium" Value="32" Selected="True"></asp:ListItem>
<asp:ListItem Text="Large" Value="64"></asp:ListItem>
</asp:DropDownList>
</div>
<div class="col-12">
<uc1:cmp_MU_Items runat="server" ID="cmp_MU_Items" />
</div>
NKC_WF/site/DBG_QRCode_Unload.aspx.cs
+37 -1
View File
@@ -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
}
}
/// <summary>
/// restituisce URL immagine QRCode
/// </summary>
/// <returns></returns>
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;
}
}
/// <summary>
/// Aggiorna componente principale e child components
/// </summary>
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;
}
}
}
NKC_WF/site/DBG_QRCode_Unload.aspx.designer.cs
Generated
+18
View File
@@ -32,6 +32,24 @@ namespace NKC_WF.site
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfSheetID;
/// <summary>
/// Controllo imgQrLogin.
/// </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.Image imgQrLogin;
/// <summary>
/// Controllo ddlQrSize.
/// </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.DropDownList ddlQrSize;
/// <summary>
/// Controllo cmp_MU_Items.
/// </summary>