+
diff --git a/NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx b/NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx
new file mode 100644
index 0000000..ab46317
--- /dev/null
+++ b/NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx
@@ -0,0 +1,37 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_KS_OkoiCart.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_KS_OkoiCart" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx.cs
new file mode 100644
index 0000000..86317d6
--- /dev/null
+++ b/NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace NKC_WF.WebUserControls
+{
+ public partial class cmp_KS_OkoiCart : BaseUserControl
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+
+ public string Dtmx
+ {
+ get
+ {
+ return hfDtmx.Value;
+ }
+ set
+ {
+ hfDtmx.Value = value.Trim();
+ grView.DataBind();
+ }
+ }
+
+ internal void doUpdate()
+ {
+ grView.DataBind();
+ }
+ }
+}
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx.designer.cs
new file mode 100644
index 0000000..8231470
--- /dev/null
+++ b/NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx.designer.cs
@@ -0,0 +1,44 @@
+//------------------------------------------------------------------------------
+//
+// Codice generato da uno strumento.
+//
+// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+// il codice viene rigenerato.
+//
+//------------------------------------------------------------------------------
+
+namespace NKC_WF.WebUserControls
+{
+
+
+ public partial class cmp_KS_OkoiCart
+ {
+
+ ///
+ /// Controllo grView.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.WebControls.GridView grView;
+
+ ///
+ /// Controllo ods.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.WebControls.ObjectDataSource ods;
+
+ ///
+ /// Controllo hfDtmx.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.WebControls.HiddenField hfDtmx;
+ }
+}
diff --git a/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx b/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx
index 2fb75d7..1efd1b8 100644
--- a/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx
+++ b/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx
@@ -1 +1,35 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_KS_OkoiOI.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_KS_OkoiOI" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx.cs
index 61dfec8..df773c6 100644
--- a/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx.cs
@@ -7,11 +7,29 @@ using System.Web.UI.WebControls;
namespace NKC_WF.WebUserControls
{
- public partial class cmp_KS_OkoiOI : System.Web.UI.UserControl
+ public partial class cmp_KS_OkoiOI : BaseUserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
+
+ public string Dtmx
+ {
+ get
+ {
+ return hfDtmx.Value;
+ }
+ set
+ {
+ hfDtmx.Value = value.Trim();
+ grView.DataBind();
+ }
+ }
+
+ internal void doUpdate()
+ {
+ grView.DataBind();
+ }
}
}
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx.designer.cs
index 90ae75d..bcbdd52 100644
--- a/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx.designer.cs
+++ b/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx.designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
-//
+//
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-// il codice viene rigenerato.
-//
+// il codice viene rigenerato.
+//
//------------------------------------------------------------------------------
namespace NKC_WF.WebUserControls
@@ -13,5 +13,32 @@ namespace NKC_WF.WebUserControls
public partial class cmp_KS_OkoiOI
{
+
+ ///
+ /// Controllo grView.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.WebControls.GridView grView;
+
+ ///
+ /// Controllo ods.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.WebControls.ObjectDataSource ods;
+
+ ///
+ /// Controllo hfDtmx.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.WebControls.HiddenField hfDtmx;
}
}
diff --git a/NKC_WF/WebUserControls/cmp_KS_OtherCart.ascx b/NKC_WF/WebUserControls/cmp_KS_OtherCart.ascx
deleted file mode 100644
index d6e5f85..0000000
--- a/NKC_WF/WebUserControls/cmp_KS_OtherCart.ascx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_KS_OtherCart.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_KS_OtherCart" %>
diff --git a/NKC_WF/WebUserControls/cmp_KS_OtherCart.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_OtherCart.ascx.cs
deleted file mode 100644
index dd32c6e..0000000
--- a/NKC_WF/WebUserControls/cmp_KS_OtherCart.ascx.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace NKC_WF.WebUserControls
-{
- public partial class cmp_KS_OtherCart : System.Web.UI.UserControl
- {
- protected void Page_Load(object sender, EventArgs e)
- {
-
- }
- }
-}
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_KS_OtherCart.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_KS_OtherCart.ascx.designer.cs
deleted file mode 100644
index c38d3f1..0000000
--- a/NKC_WF/WebUserControls/cmp_KS_OtherCart.ascx.designer.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// Codice generato da uno strumento.
-//
-// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-// il codice viene rigenerato.
-//
-//------------------------------------------------------------------------------
-
-namespace NKC_WF.WebUserControls
-{
-
-
- public partial class cmp_KS_OtherCart
- {
- }
-}
diff --git a/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx b/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx
index 833f514..7740366 100644
--- a/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx
+++ b/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx
@@ -1,9 +1,9 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_KS_OtherItemsCart.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_KS_OtherItemsCart" %>
<%@ Register Src="~/WebUserControls/cmp_KS_currOI.ascx" TagPrefix="uc1" TagName="cmp_KS_currOI" %>
<%@ Register Src="~/WebUserControls/cmp_KS_currCart.ascx" TagPrefix="uc1" TagName="cmp_KS_currCart" %>
-<%@ Register Src="~/WebUserControls/cmp_KS_OkibBin.ascx" TagPrefix="uc1" TagName="cmp_KS_OkibBin" %>
-<%@ Register Src="~/WebUserControls/cmp_KS_OkibCart.ascx" TagPrefix="uc1" TagName="cmp_KS_OkibCart" %>
<%@ Register Src="~/WebUserControls/cmp_KS_OkoiSum.ascx" TagPrefix="uc1" TagName="cmp_KS_OkoiSum" %>
+<%@ Register Src="~/WebUserControls/cmp_KS_OkoiOI.ascx" TagPrefix="uc1" TagName="cmp_KS_OkoiOI" %>
+
@@ -24,12 +24,6 @@
diff --git a/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.cs
index 1fba68c..71992da 100644
--- a/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.cs
@@ -59,18 +59,14 @@ namespace NKC_WF.WebUserControls
{
// controllo visualizazione in base ai dati presenti
cmp_KS_currOI.Visible = otherItemOk;
- cmp_KS_currCart.Visible = cartOk;
+ cmp_KS_currCart.Visible = showBtns;
if (showBtns)
{
- cmp_KS_OkoiSum.Visible = true;
- cmp_KS_OkibBin.Visible = false;
- cmp_KS_OkibCart.Visible = false;
+ cmp_KS_OkoiOI.Visible = false;
}
else
{
- cmp_KS_OkoiSum.Visible = false;
- cmp_KS_OkibBin.Visible = otherItemOk;
- cmp_KS_OkibCart.Visible = cartOk;
+ cmp_KS_OkoiOI.Visible = otherItemOk;
}
lbtAddAll.Visible = showBtns;
// se ho bin e cart --> mostro buttons calcolati!
@@ -87,20 +83,9 @@ namespace NKC_WF.WebUserControls
public void doUpdate()
{
fixVisibility();
- if (showBtns)
+ if (otherItemOk && !cartOk)
{
- cmp_KS_OkoiSum.doUpdate();
- }
- else
- {
- if (otherItemOk)
- {
- cmp_KS_OkibBin.doUpdate();
- }
- if (cartOk)
- {
- cmp_KS_OkibCart.doUpdate();
- }
+ cmp_KS_OkoiOI.doUpdate();
}
}
@@ -116,7 +101,6 @@ namespace NKC_WF.WebUserControls
set
{
cmp_KS_currCart.CurrId = value;
- cmp_KS_OkoiSum.CartID = value;
}
}
///
@@ -131,7 +115,6 @@ namespace NKC_WF.WebUserControls
set
{
cmp_KS_currCart.Dtmx = value;
- cmp_KS_OkibCart.Dtmx = value;
}
}
///
@@ -146,7 +129,6 @@ namespace NKC_WF.WebUserControls
set
{
cmp_KS_currOI.CurrId = value;
- cmp_KS_OkoiSum.OtherItemID = value;
}
}
///
@@ -161,7 +143,7 @@ namespace NKC_WF.WebUserControls
set
{
cmp_KS_currOI.Dtmx = value;
- cmp_KS_OkibBin.Dtmx = value;
+ cmp_KS_OkoiOI.Dtmx = value;
}
}
diff --git a/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.designer.cs
index 704458b..1d3b4dd 100644
--- a/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.designer.cs
+++ b/NKC_WF/WebUserControls/cmp_KS_OtherItemsCart.ascx.designer.cs
@@ -51,30 +51,12 @@ namespace NKC_WF.WebUserControls
protected global::NKC_WF.WebUserControls.cmp_KS_currCart cmp_KS_currCart;
///
- /// Controllo cmp_KS_OkibBin.
+ /// Controllo cmp_KS_OkoiOI.
///
///
/// 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_KS_OkibBin cmp_KS_OkibBin;
-
- ///
- /// Controllo cmp_KS_OkibCart.
- ///
- ///
- /// 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_KS_OkibCart cmp_KS_OkibCart;
-
- ///
- /// Controllo cmp_KS_OkoiSum.
- ///
- ///
- /// 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_KS_OkoiSum cmp_KS_OkoiSum;
+ protected global::NKC_WF.WebUserControls.cmp_KS_OkoiOI cmp_KS_OkoiOI;
}
}