diff --git a/NKC_WF/Content/Site.css b/NKC_WF/Content/Site.css index 1c9e597..6073662 100644 --- a/NKC_WF/Content/Site.css +++ b/NKC_WF/Content/Site.css @@ -19,6 +19,9 @@ body { font-family: 'Roboto', sans-serif; /*font-family: 'Open Sans', sans-serif;*/ } +.textBig { + font-size: 1.5em; +} /* Responsive: Portrait tablets and up */ @media screen and (min-width: 768px) { .jumbotron { diff --git a/NKC_WF/Content/Site.less b/NKC_WF/Content/Site.less index 514049d..a2fd82e 100644 --- a/NKC_WF/Content/Site.less +++ b/NKC_WF/Content/Site.less @@ -22,6 +22,9 @@ body { font-family: 'Roboto', sans-serif; /*font-family: 'Open Sans', sans-serif;*/ } +.textBig{ + font-size: 1.5em; +} /* Responsive: Portrait tablets and up */ @media screen and (min-width: 768px) { diff --git a/NKC_WF/Content/Site.min.css b/NKC_WF/Content/Site.min.css index 7ac06e6..48f0e44 100644 --- a/NKC_WF/Content/Site.min.css +++ b/NKC_WF/Content/Site.min.css @@ -1 +1 @@ -body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}}.border-thick{border-width:3px !important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;} \ No newline at end of file +body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}.textBig{font-size:1.5em;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}}.border-thick{border-width:3px !important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;} \ No newline at end of file diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 4200d29..e30ed68 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -464,7 +464,6 @@ - @@ -1197,13 +1196,6 @@ cmp_ML_ShDet.ascx - - cmp_ML_smart.ascx - ASPXCodeBehind - - - cmp_ML_smart.ascx - cmp_MU_carts.ascx ASPXCodeBehind diff --git a/NKC_WF/WebUserControls/cmp_ML_smart.ascx b/NKC_WF/WebUserControls/cmp_ML_smart.ascx deleted file mode 100644 index 3726c24..0000000 --- a/NKC_WF/WebUserControls/cmp_ML_smart.ascx +++ /dev/null @@ -1,17 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_ML_smart.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_ML_smart" %> - -
-
-

<%: traduci("MachineLoadSmart") %>

-
-
-
- BARCODE -
-
- out messages -
-
-
-
-
diff --git a/NKC_WF/WebUserControls/cmp_ML_smart.ascx.cs b/NKC_WF/WebUserControls/cmp_ML_smart.ascx.cs deleted file mode 100644 index b5a7214..0000000 --- a/NKC_WF/WebUserControls/cmp_ML_smart.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_ML_smart : BaseUserControl - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_ML_smart.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_ML_smart.ascx.designer.cs deleted file mode 100644 index 353a9cc..0000000 --- a/NKC_WF/WebUserControls/cmp_ML_smart.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_ML_smart - { - } -} diff --git a/NKC_WF/WebUserControls/cmp_secScreen.ascx.cs b/NKC_WF/WebUserControls/cmp_secScreen.ascx.cs index cc39856..e3dfdcd 100644 --- a/NKC_WF/WebUserControls/cmp_secScreen.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_secScreen.ascx.cs @@ -1,6 +1,7 @@ using AppData; using NKC_SDK; using NKC_WF.Controllers; +using Newtonsoft.Json; using SteamWare; using System; using System.Collections.Generic; @@ -9,6 +10,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using System.Net; namespace NKC_WF.WebUserControls { @@ -175,10 +177,28 @@ namespace NKC_WF.WebUserControls hfItemPdf.Value = nameOnly; // svuoto files vecchi... removeOldTemp(); + // faccio verifica SE sia necessario fare sostituzioni + string rawData = memLayer.ML.cdv("pdfPathSanitizer"); + if (!string.IsNullOrEmpty(rawData)) + { + string[] listaSubst = null; + try + { + listaSubst = rawData.Split('|'); + } + catch + { } + // se trovato.. + if (listaSubst != null && listaSubst.Length > 0) + { + for (int i = 0; i < listaSubst.Length / 2; i++) + { + value = value.Replace(listaSubst[i], listaSubst[i + 1]); + } - // FIXME TODO - + } + } try { // loggo che sto x copiare diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx b/NKC_WF/WebUserControls/cmp_stackLoading.ascx index 7e8b620..23e3d90 100644 --- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx +++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx @@ -14,7 +14,8 @@
- + + <%: traduci("StackLoaded") %> diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs index 62d76e6..6ac4a1b 100644 --- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs @@ -12,14 +12,42 @@ namespace NKC_WF.WebUserControls if (!Page.IsPostBack) { // svuoto input barcode... - cmp_barcode.inputAcquired = ""; - lastCmd = ""; + if (enableBCode) + { + cmp_barcode.inputAcquired = ""; + lastCmd = ""; + } cmp_stackNextloading.BatchId = BatchIdCurr; raiseEvent(); doUpdate(); } - cmp_barcode.eh_doRefresh += Cmp_barcode_eh_doRefresh; + if (enableBCode) + { + cmp_barcode.eh_doRefresh += Cmp_barcode_eh_doRefresh; + } + fixDisplay(); } + + private void fixDisplay() + { + cmp_barcode.Visible = enableBCode; + frmView.Visible = !enableBCode; + } + + public bool enableBCode + { + get + { + bool answ = false; + bool.TryParse(hfEnableBCode.Value, out answ); + return answ; + } + set + { + hfEnableBCode.Value = value.ToString(); + } + } + /// /// Comando barcode letto /// @@ -250,7 +278,7 @@ namespace NKC_WF.WebUserControls protected void checkVisibility() { lblLoaded.Visible = StackId != 0; - frmView.Visible = !lblLoaded.Visible; + frmView.Visible = !lblLoaded.Visible && !enableBCode; // fix div di simulazione divSim.Visible = (memLayer.ML.CRS("environment") == "DEV"); } diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.designer.cs index 865ffe1..2e024b9 100644 --- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.designer.cs @@ -11,88 +11,97 @@ namespace NKC_WF.WebUserControls { - public partial class cmp_stackLoading - { + public partial class cmp_stackLoading + { - /// - /// Controllo divSim. - /// - /// - /// 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 divSim; + /// + /// Controllo divSim. + /// + /// + /// 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 divSim; - /// - /// Controllo lbtAdvanceProd. - /// - /// - /// 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.LinkButton lbtAdvanceProd; + /// + /// Controllo lbtAdvanceProd. + /// + /// + /// 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.LinkButton lbtAdvanceProd; - /// - /// Controllo hfBarcode. - /// - /// - /// 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 hfBarcode; + /// + /// Controllo hfBarcode. + /// + /// + /// 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 hfBarcode; - /// - /// Controllo hfStackId. - /// - /// - /// 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 hfStackId; + /// + /// Controllo hfEnableBCode. + /// + /// + /// 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 hfEnableBCode; - /// - /// Controllo lblLoaded. - /// - /// - /// 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.Label lblLoaded; + /// + /// Controllo hfStackId. + /// + /// + /// 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 hfStackId; - /// - /// Controllo frmView. - /// - /// - /// 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.FormView frmView; + /// + /// Controllo lblLoaded. + /// + /// + /// 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.Label lblLoaded; - /// - /// 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 frmView. + /// + /// + /// 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.FormView frmView; - /// - /// Controllo cmp_barcode. - /// - /// - /// 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_barcode cmp_barcode; + /// + /// 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 cmp_stackNextloading. - /// - /// - /// 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_stackNextloading cmp_stackNextloading; - } + /// + /// Controllo cmp_barcode. + /// + /// + /// 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_barcode cmp_barcode; + + /// + /// Controllo cmp_stackNextloading. + /// + /// + /// 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_stackNextloading cmp_stackNextloading; + } } diff --git a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx index 5dbbb7c..6c43c1d 100644 --- a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx +++ b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx @@ -17,40 +17,40 @@
-
+
PREVIOUS BUNK: ()
-
+
CURRENT BUNK: ()
-
-
-
+
+
+
sheets:
-
+
printed:
-
+
worked:
-
+
To Redo:
-
+
Items:
-
+
Items:
@@ -67,17 +67,17 @@
-
+
NEXT BUNK: ()
-
+
sheets: | printed: | worked:
-
+
Items:
@@ -85,10 +85,10 @@
-
+
NO NEXT BUNK
-
+
BATCH complete
diff --git a/NKC_WF/site/MachineLoad.aspx b/NKC_WF/site/MachineLoad.aspx index 06b73eb..c867a0c 100644 --- a/NKC_WF/site/MachineLoad.aspx +++ b/NKC_WF/site/MachineLoad.aspx @@ -1,40 +1,42 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.Master" AutoEventWireup="true" CodeBehind="MachineLoad.aspx.cs" Inherits="NKC_WF.MachineLoad" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="MachineLoad.aspx.cs" Inherits="NKC_WF.MachineLoad" %> <%@ Register Src="~/WebUserControls/cmp_stackLoading.ascx" TagPrefix="uc1" TagName="cmp_stackLoading" %> <%@ Register Src="~/WebUserControls/cmp_ML_ShDet.ascx" TagPrefix="uc1" TagName="cmp_ML_ShDet" %> - -
-

<%: traduci("MachineLoad") %>

-
- - -
-
- +
+ +
+

<%: traduci("MachineLoad") %>

+
+ + +
+
+ +
-
- - - - -
-
- + + + + +
+
+ +
+
+ +
+
+ +
+
+ +
-
- -
-
- -
-
- -
-
- - + + +
diff --git a/NKC_WF/site/MachineLoad.aspx.cs b/NKC_WF/site/MachineLoad.aspx.cs index d253933..80060be 100644 --- a/NKC_WF/site/MachineLoad.aspx.cs +++ b/NKC_WF/site/MachineLoad.aspx.cs @@ -8,7 +8,7 @@ namespace NKC_WF { if (!Page.IsPostBack) { - ((SiteContent)this.Master).showSearch = false; + ((SiteMaster)this.Master).showSearch = false; forceRefresh(); } cmp_stackLoading.eh_doRefresh += Cmp_stackLoading_eh_doRefresh; diff --git a/NKC_WF/site/MachineLoadSmart.aspx b/NKC_WF/site/MachineLoadSmart.aspx index 5efe691..3065dd5 100644 --- a/NKC_WF/site/MachineLoadSmart.aspx +++ b/NKC_WF/site/MachineLoadSmart.aspx @@ -1,10 +1,22 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="MachineLoadSmart.aspx.cs" Inherits="NKC_WF.site.MachineLoadSmart" %> -<%@ Register Src="~/WebUserControls/cmp_ML_smart.ascx" TagPrefix="uc1" TagName="cmp_ML_smart" %> - +<%@ Register Src="~/WebUserControls/cmp_stackLoading.ascx" TagPrefix="uc1" TagName="cmp_stackLoading" %>
- +
+

<%: traduci("MachineLoad") %>

+
+ + +
+
+ +
+
+
+
+
+
diff --git a/NKC_WF/site/MachineLoadSmart.aspx.cs b/NKC_WF/site/MachineLoadSmart.aspx.cs index 1724f9c..c293753 100644 --- a/NKC_WF/site/MachineLoadSmart.aspx.cs +++ b/NKC_WF/site/MachineLoadSmart.aspx.cs @@ -14,49 +14,20 @@ namespace NKC_WF.site if (!Page.IsPostBack) { ((SiteMaster)this.Master).showSearch = false; -#if false - doUpdate(); -#endif + forceRefresh(); } + cmp_stackLoading.eh_doRefresh += Cmp_stackLoading_eh_doRefresh; } -#if false - /// - /// Batch corrente... - /// - public int BatchId + + private void Cmp_stackLoading_eh_doRefresh(object sender, EventArgs e) { - set - { - hfBatchID.Value = value.ToString(); - } - get - { - int answ = 0; - int.TryParse(hfBatchID.Value, out answ); - return answ; - } + forceRefresh(); } - /// - /// Aggiorna componente principale e child components - /// - private void doUpdate() + + private void forceRefresh() { - setCurrData(); - // aggiorno child - cmp_unloadSmart.BatchId = BatchId; + } - /// - /// Imposta dati correnti (Bunk / Sheet) - /// - private void setCurrData() - { - // recupero bunk corrente... - DS_App.StackListRow currBunk = ComLib.getCurrBunk(); - if (currBunk != null) - { - BatchId = currBunk.BatchID; - } - } -#endif + } } \ No newline at end of file diff --git a/NKC_WF/site/MachineLoadSmart.aspx.designer.cs b/NKC_WF/site/MachineLoadSmart.aspx.designer.cs index b175025..4493031 100644 --- a/NKC_WF/site/MachineLoadSmart.aspx.designer.cs +++ b/NKC_WF/site/MachineLoadSmart.aspx.designer.cs @@ -15,12 +15,21 @@ namespace NKC_WF.site { /// - /// Controllo cmp_ML_smart. + /// Controllo upnlBCode. /// /// /// 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_ML_smart cmp_ML_smart; + protected global::System.Web.UI.UpdatePanel upnlBCode; + + /// + /// Controllo cmp_stackLoading. + /// + /// + /// 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_stackLoading cmp_stackLoading; } } diff --git a/NKC_WF/temp/119748.pdf b/NKC_WF/temp/119748.pdf deleted file mode 100644 index 5ee27c6..0000000 Binary files a/NKC_WF/temp/119748.pdf and /dev/null differ