diff --git a/NKC_SDK/Enums.cs b/NKC_SDK/Enums.cs index 5ab6d68..7dd8a2f 100644 --- a/NKC_SDK/Enums.cs +++ b/NKC_SDK/Enums.cs @@ -18,7 +18,12 @@ /// /// Modalità validazione file (NON ancora particolari in ordini CSV) /// - FileEval + FileEval, + + /// + /// Modalità normale (stima/nesting) + /// + FullHistory } /// diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx b/NKC_WF/WebUserControls/cmp_batchList.ascx index d98bf4b..74f2f1b 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx @@ -116,4 +116,4 @@ - + \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs index 30da21a..e9895d6 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs @@ -138,6 +138,11 @@ namespace NKC_WF.WebUserControls isPartVal = "2"; break; + case BatchListMode.FullHistory: + isPartVal = "3"; + ods.FilterExpression = ""; + break; + case BatchListMode.Standard: default: isPartVal = "0"; @@ -319,6 +324,7 @@ namespace NKC_WF.WebUserControls public void doUpdate() { + checkFixOds(); grView.DataBind(); currSelRow = lastSelRow; fixDetails(); diff --git a/NKC_WF/site/OrderHistory.aspx b/NKC_WF/site/OrderHistory.aspx index d7d97da..a0b623d 100644 --- a/NKC_WF/site/OrderHistory.aspx +++ b/NKC_WF/site/OrderHistory.aspx @@ -1,5 +1,6 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="OrderHistory.aspx.cs" Inherits="NKC_WF.site.OrderHistory" %> +<%@ Register Src="~/WebUserControls/cmp_batchList.ascx" TagPrefix="uc1" TagName="cmp_batchList" %>
@@ -9,7 +10,7 @@
- FULL orders List +
diff --git a/NKC_WF/site/OrderHistory.aspx.designer.cs b/NKC_WF/site/OrderHistory.aspx.designer.cs index 0fb1732..2ed6f89 100644 --- a/NKC_WF/site/OrderHistory.aspx.designer.cs +++ b/NKC_WF/site/OrderHistory.aspx.designer.cs @@ -22,5 +22,14 @@ namespace NKC_WF.site /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divFileList; + + /// + /// Controllo cmp_batchList. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_batchList cmp_batchList; } }