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

Merge branch 'develop' into SDK

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-07-25 15:58:32 +02:00
parent 859828f5e6 736969c7b6
commit cf99ecdf85
5 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NKC_WF/WebUserControls/cmp_batchList.ascx
+2 -1
View File
@@ -62,6 +62,7 @@
<ItemTemplate>
<asp:HyperLink runat="server" ID="hlSheetPreview" Target="_blank" NavigateUrl='<%# $"../site/BatchPreview?BatchId={Eval("BatchID")}" %>' Visible='<%# isPreviewVisible(Eval("Status")) %>' ToolTip="Show Batch preview" CssClass="btn btn-info"><i class="fa fa-object-group" aria-hidden="true"></i></asp:HyperLink>
<asp:Label ID="lblStatus" runat="server" CssClass='<%# cssByStatus(Eval("Status")) %>'><%# BStatus(Eval("Status")) %></asp:Label>
<i class="fa fa-spinner fa-spin" aria-hidden="true" runat="server" visible='<%# Eval("Status").ToString()=="1" || Eval("Status").ToString()=="3" %>'></i>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Errors" SortExpression="Errors">
@@ -88,7 +89,7 @@
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:HiddenField id="hfDeleteEnabled" runat="server" />
<asp:HiddenField ID="hfDeleteEnabled" runat="server" />
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStatus" TypeName="AppData.DS_AppTableAdapters.BatchListTableAdapter" DeleteMethod="deleteTree">
<SelectParameters>
<asp:ControlParameter ControlID="ddlStatus" DefaultValue="-1" Name="Status" PropertyName="SelectedValue" Type="Int32" />
NKC_WF/WebUserControls/cmp_batchList.ascx.cs
+1 -1
View File
@@ -205,7 +205,7 @@ namespace NKC_WF.WebUserControls
public void doUpdate()
{
resetSelezione();
grView.DataBind();
}
protected void grView_PageIndexChanged(object sender, EventArgs e)
NKC_WF/site/OrderManager.aspx
+7 -1
View File
@@ -15,7 +15,13 @@
<uc1:cmp_fileUpload runat="server" ID="cmp_fileUpload" isWriteEnabled="true" />
</div>
<div class="col-12" runat="server" id="divBatchList">
<uc1:cmp_batchList runat="server" ID="cmp_batchList" />
<asp:UpdatePanel ID="UpdatePanel1" runat="server">
<ContentTemplate>
<uc1:cmp_batchList runat="server" ID="cmp_batchList" />
<asp:Timer ID="Timer1" runat="server" Interval="2000" OnTick="Timer1_Tick"></asp:Timer>
</ContentTemplate>
</asp:UpdatePanel>
</div>
</div>
</div>
NKC_WF/site/OrderManager.aspx.cs
+4
View File
@@ -229,5 +229,9 @@ namespace NKC_WF
cmp_batchList.doUpdate();
}
protected void Timer1_Tick(object sender, EventArgs e)
{
doUpdate();
}
}
}
NKC_WF/site/OrderManager.aspx.designer.cs
Generated
+45 -27
View File
@@ -11,34 +11,52 @@ namespace NKC_WF
{
public partial class OrderManager
{
public partial class OrderManager
{
/// <summary>
/// Controllo cmp_fileUpload.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserContols.cmp_fileUpload cmp_fileUpload;
/// <summary>
/// Controllo cmp_fileUpload.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserContols.cmp_fileUpload cmp_fileUpload;
/// <summary>
/// Controllo divBatchList.
/// </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 divBatchList;
/// <summary>
/// Controllo divBatchList.
/// </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 divBatchList;
/// <summary>
/// Controllo cmp_batchList.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_batchList cmp_batchList;
}
/// <summary>
/// Controllo UpdatePanel1.
/// </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.UpdatePanel UpdatePanel1;
/// <summary>
/// Controllo cmp_batchList.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_batchList cmp_batchList;
/// <summary>
/// Controllo Timer1.
/// </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.Timer Timer1;
}
}