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

Merge branch 'release/AddSmartUnloadLog01'

Browse Source
This commit is contained in:
Samuele Locatelli
2023-12-19 11:00:24 +01:00
parent e664a30d3d ff73f8d804
commit 81aa06961d
5 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NKC_WF/Web.config
+2 -2
View File
@@ -63,8 +63,8 @@
<appSettings>
<!--Configurazioni generali-->
<add key="intUpdatePagina_ms" value="120000"/>
<!--Dopo 1 minuto da ultima lettura (300000) svuota barcode in pagine smart-->
<add key="smartForceReloadPagina_ms" value="300000"/>
<!--Dopo 5 minuto da ultima lettura (180000) svuota barcode in pagine smart-->
<add key="smartForceReloadPagina_ms" value="180000"/>
<add key="kittingPageRefresh" value="3000"/>
<add key="appName" value="NKC"/>
<add key="CodModulo" value="NKC"/>
NKC_WF/WebUserControls/cmp_barcode.ascx.cs
+7 -3
View File
@@ -147,9 +147,11 @@ namespace NKC_WF.WebUserControls
protected void UiTimer_Tick(object sender, EventArgs e)
{
// controllo, se ultima operazione > 1 minuto --> reload!
if (DateTime.Now.Subtract(lastDtInput).TotalMilliseconds > memLayer.ML.confReadInt("smartForceReloadPagina_ms"))
// controllo, se ultima operazione > smartForceReloadPagina_ms --> reload!
var tsLastUpdate = DateTime.Now.Subtract(lastDtInput);
if (tsLastUpdate.TotalMilliseconds > memLayer.ML.confReadInt("smartForceReloadPagina_ms"))
{
lgInfo($"cmp_barcode | Reload page for timeout: {tsLastUpdate.TotalSeconds} sec from last update");
inputAcquired = "##";
Response.Redirect(Request.RawUrl);
}
@@ -174,13 +176,15 @@ namespace NKC_WF.WebUserControls
raiseEvent();
}
}
#if false
else
{
if (string.IsNullOrEmpty(inputAcquired))
{
resetInput();
}
}
}
#endif
resetInput();
}
NKC_WF/WebUserControls/cmp_unloadSmart.ascx
+2 -1
View File
@@ -20,7 +20,7 @@
<asp:HiddenField runat="server" ID="hfShowSecOp" />
</div>
<div class="col-12 my-0">
<asp:UpdateProgress ID="updProgSmartUnload" runat="server" DisplayAfter="0" DynamicLayout="true">
<asp:UpdateProgress ID="updProgSmartUnload" runat="server" DisplayAfter="100" DynamicLayout="true">
<ProgressTemplate>
<div class="alert alert-info">
<h1>Processing...</h1>
@@ -29,6 +29,7 @@
<div class="progress-bar progress-bar-striped progress-bar-animated" style="width: 75%"></div>
</div>
</div>
<asp:LinkButton runat="server" ID="lbtForceReload" CssClass="btn btn-success btn-lg w-100" OnClick="lbtForceReload_Click"><i class="fa fa-refresh" aria-hidden="true"></i> Force Reload <i class="fa fa-refresh" aria-hidden="true"></i></asp:LinkButton>
</div>
</ProgressTemplate>
</asp:UpdateProgress>
NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs
+6
View File
@@ -888,5 +888,11 @@ namespace NKC_WF.WebUserControls
}
#endregion Protected Methods
protected void lbtForceReload_Click(object sender, EventArgs e)
{
lgInfo("UnloadSmart: Requested ForceReload by user");
Response.Redirect(Request.RawUrl);
}
}
}
NKC_WF/site/DBG_QRCode_Unload.aspx
+12 -10
View File
@@ -27,19 +27,21 @@
</div>
<div>
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>
<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:ListItem Text="Huge" Value="128"></asp:ListItem>
<asp:ListItem Text="Max" Value="256"></asp:ListItem>
</asp:DropDownList>
</div>
<div>
NUM Righe:
<asp:DropDownList runat="server" ID="ddlNumRow" AutoPostBack="True" OnSelectedIndexChanged="ddlNumRow_SelectedIndexChanged">
<asp:ListItem Text="10" Value="10" Selected="True"></asp:ListItem>
<asp:ListItem Text="25" Value="25"></asp:ListItem>
<asp:ListItem Text="50" Value="50"></asp:ListItem>
</asp:DropDownList>
<asp:DropDownList runat="server" ID="ddlNumRow" AutoPostBack="True" OnSelectedIndexChanged="ddlNumRow_SelectedIndexChanged">
<asp:ListItem Text="10" Value="10" Selected="True"></asp:ListItem>
<asp:ListItem Text="25" Value="25"></asp:ListItem>
<asp:ListItem Text="50" Value="50"></asp:ListItem>
</asp:DropDownList>
</div>
</div>
</div>