diff --git a/NKC_WF/Site.Master b/NKC_WF/Site.Master index 4811a9e..c4417e6 100644 --- a/NKC_WF/Site.Master +++ b/NKC_WF/Site.Master @@ -29,7 +29,7 @@
- + <%--To learn more about bundling scripts in ScriptManager see https://go.microsoft.com/fwlink/?LinkID=301884 --%> <%--Framework Scripts--%> diff --git a/NKC_WF/Site.Master.designer.cs b/NKC_WF/Site.Master.designer.cs index b612d28..ecc2751 100644 --- a/NKC_WF/Site.Master.designer.cs +++ b/NKC_WF/Site.Master.designer.cs @@ -14,6 +14,15 @@ namespace NKC_WF public partial class SiteMaster { + /// + /// NkcScriptMan control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.ScriptManager NkcScriptMan; + /// /// cmp_menuTop control. /// diff --git a/NKC_WF/SiteContent.master.designer.cs b/NKC_WF/SiteContent.master.designer.cs index 469d3f4..8eeae31 100644 --- a/NKC_WF/SiteContent.master.designer.cs +++ b/NKC_WF/SiteContent.master.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ namespace NKC_WF @@ -15,20 +15,20 @@ namespace NKC_WF { /// - /// Controllo uplBody. + /// uplBody control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.UpdatePanel uplBody; /// - /// Controllo MainContent. + /// MainContent control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; } diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx b/NKC_WF/WebUserControls/cmp_batchList.ascx index 2210256..642367a 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx @@ -10,6 +10,12 @@ + + + + + +
@@ -48,10 +54,6 @@
- - - -
diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs index 9083823..11be1e7 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs @@ -452,16 +452,11 @@ namespace NKC_WF.WebUserControls private void fixDetails() { - //divDetail.Visible = false; - //updPanelDetail.Update(); lastSelRow = currSelRow; divDetail.Visible = currSelRow >= 0; if (divDetail.Visible) { // recupero BatchId selezionato - cmp_batchDetail.BatchId = 0; - cmp_batchDetail.doUpdate(); - updPanelDetail.Update(); cmp_batchDetail.BatchId = BatchIdSel; cmp_batchDetail.doUpdate(); updPanelDetail.Update(); @@ -470,13 +465,11 @@ namespace NKC_WF.WebUserControls private void resetSelezione() { - //updPanelDetail.Update(); checkFixOds(); grView.SelectedIndex = -1; lastSelRow = -1; grView.DataBind(); divDetail.Visible = false; - updPanelDetail.Visible = true; updPanelDetail.Update(); raiseReset(); } diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_batchList.ascx.designer.cs index 2f5d407..b55b314 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx.designer.cs @@ -59,6 +59,15 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.HiddenField hfCreatePng; + /// + /// updPanelGrView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel updPanelGrView; + /// /// chkShowSplit control. /// @@ -86,15 +95,6 @@ namespace NKC_WF.WebUserControls /// protected global::NKC_WF.WebUserControls.cmp_numRow cmp_numRow; - /// - /// updPanelGrView control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.UpdatePanel updPanelGrView; - /// /// grView control. /// diff --git a/NKC_WF/WebUserControls/cmp_footer.ascx b/NKC_WF/WebUserControls/cmp_footer.ascx index a68cb91..0be4f6c 100644 --- a/NKC_WF/WebUserControls/cmp_footer.ascx +++ b/NKC_WF/WebUserControls/cmp_footer.ascx @@ -1,31 +1,35 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_footer.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_footer" %>
-
-
- - -  |  - -
-
-
-
- + + +
+
+ + +  |  +
-
- - - - - - - +
+
+
+ +
+
+ + + + + + + +
+
-
-
- - + + + +
diff --git a/NKC_WF/WebUserControls/cmp_footer.ascx.cs b/NKC_WF/WebUserControls/cmp_footer.ascx.cs index 5bb5342..849e12c 100644 --- a/NKC_WF/WebUserControls/cmp_footer.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_footer.ascx.cs @@ -26,6 +26,7 @@ namespace NKC_WF.WebUserControls /// private void setTimer() { + Timer1.Tick += Timer1_Tick; Timer1.Interval = memLayer.ML.confReadInt("intUpdatePagina_ms"); } diff --git a/NKC_WF/WebUserControls/cmp_footer.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_footer.ascx.designer.cs index 1158324..7634716 100644 --- a/NKC_WF/WebUserControls/cmp_footer.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_footer.ascx.designer.cs @@ -14,6 +14,15 @@ namespace NKC_WF.WebUserControls public partial class cmp_footer { + /// + /// upnlFooter control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdatePanel upnlFooter; + /// /// lblDateTime control. /// diff --git a/NKC_WF/site/OrderManager.aspx b/NKC_WF/site/OrderManager.aspx index 67d28ff..637a5aa 100644 --- a/NKC_WF/site/OrderManager.aspx +++ b/NKC_WF/site/OrderManager.aspx @@ -19,10 +19,10 @@
- +
- \ No newline at end of file +