-
+
-
diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx
index 3532eed..a0d411f 100644
--- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx
+++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx
@@ -49,20 +49,6 @@
-
diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs
index aa06a1a..2da0333 100644
--- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs
@@ -89,17 +89,6 @@ namespace NKC_WF.WebUserControls
return answ;
}
}
- protected string secOp
- {
- get
- {
- return hfSecOp.Value;
- }
- set
- {
- hfSecOp.Value = value;
- }
- }
///
/// Aggiorna dati correnti (IP, batch, sheet...)
///
@@ -531,8 +520,6 @@ namespace NKC_WF.WebUserControls
// verifico cosa devo mostrare come PROX passaggio...
showCart = string.IsNullOrEmpty(itemRow.ProcessesReq);
showBin = (itemRow.ProcessesReq.Contains("PaintFlag"));
- secOp = itemRow.PostProcList;
- showSecOp = (!string.IsNullOrEmpty(secOp));
doUpdate();
break;
case 3:
@@ -671,18 +658,10 @@ namespace NKC_WF.WebUserControls
private void doUpdate()
{
// reset grafico
- icnCart.Attributes.Remove("class");
- icnCart.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary");
- icnBin.Attributes.Remove("class");
- icnBin.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary");
- icnSecOp.Attributes.Remove("class");
- icnSecOp.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary");
// in base al secondo mostro uno o altro...
if (showCart)
{
- icnCart.Attributes.Remove("class");
- icnCart.Attributes.Add("class", "btn btn-sm btn-block btn-success");
lblMessage.Text = "Item recognized";
// controllo SE HO cart
if (currCartTab.Count == 1)
@@ -699,8 +678,6 @@ namespace NKC_WF.WebUserControls
}
else if (showBin)
{
- icnBin.Attributes.Remove("class");
- icnBin.Attributes.Add("class", "btn btn-sm btn-block btn-primary");
lblMessage.Text = "Item recognized";
if (currBinTab.Count == 1)
{
@@ -715,10 +692,7 @@ namespace NKC_WF.WebUserControls
}
if (showSecOp)
{
- icnSecOp.Attributes.Remove("class");
- icnSecOp.Attributes.Add("class", "btn btn-sm btn-block btn-info");
lblMessage.Text = "Item recognized";
- lblLastBCode.Text = $"DO SEC OP: {secOp}";
lblLastBCode.CssClass = "text-info";
}
// fix btn reset!
diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs
index 0fbd15b..8d383ff 100644
--- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs
+++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs
@@ -185,42 +185,6 @@ namespace NKC_WF.WebUserControls
///
protected global::NKC_WF.WebUserControls.cmp_KS_OkibBin cmp_KS_OkibBin;
- ///
- /// Controllo hfSecOp.
- ///
- ///
- /// 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 hfSecOp;
-
- ///
- /// Controllo icnCart.
- ///
- ///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
- ///
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl icnCart;
-
- ///
- /// Controllo icnBin.
- ///
- ///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
- ///
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl icnBin;
-
- ///
- /// Controllo icnSecOp.
- ///
- ///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
- ///
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl icnSecOp;
-
///
/// Controllo lbtCancel.
///
diff --git a/NKC_WF/site/KittingSmart.aspx b/NKC_WF/site/KittingSmart.aspx
index fd7e80e..be60006 100644
--- a/NKC_WF/site/KittingSmart.aspx
+++ b/NKC_WF/site/KittingSmart.aspx
@@ -1,4 +1,4 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="KittingSmart.aspx.cs" Inherits="NKC_WF.site.KittingSmart" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="KittingSmart.aspx.cs" Inherits="NKC_WF.site.KittingSmart" %>
<%@ Register Src="~/WebUserControls/cmp_kittingSmart.ascx" TagPrefix="uc1" TagName="cmp_kittingSmart" %>
<%@ Register Src="~/WebUserControls/cmp_kitRunning.ascx" TagPrefix="uc1" TagName="cmp_kitRunning" %>
diff --git a/NKC_WF/site/KittingSmart.aspx.cs b/NKC_WF/site/KittingSmart.aspx.cs
index 15df822..7e97e22 100644
--- a/NKC_WF/site/KittingSmart.aspx.cs
+++ b/NKC_WF/site/KittingSmart.aspx.cs
@@ -10,7 +10,7 @@ namespace NKC_WF.site
{
if (!Page.IsPostBack)
{
- ((SiteMaster)this.Master).showSearch = false;
+ ((SiteContent)this.Master).showSearch = false;
doUpdate();
}
cmp_kittingSmart.eh_doRefresh += cmp_kittingSmart_eh_doRefresh;