Merge branch 'develop' into SDK
This commit is contained in:
Samuele E. Locatelli
@@ -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 {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Vendored
+1
-1
@@ -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;}
|
||||
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;}
|
||||
@@ -464,7 +464,6 @@
|
||||
<Content Include="WebUserControls\cmp_labelsPrint.ascx" />
|
||||
<Content Include="WebUserControls\cmp_login.ascx" />
|
||||
<Content Include="WebUserControls\cmp_ML_ShDet.ascx" />
|
||||
<Content Include="WebUserControls\cmp_ML_smart.ascx" />
|
||||
<Content Include="WebUserControls\cmp_MU_carts.ascx" />
|
||||
<Content Include="WebUserControls\cmp_MU_Items.ascx" />
|
||||
<Content Include="WebUserControls\cmp_MU_singleStat.ascx" />
|
||||
@@ -1197,13 +1196,6 @@
|
||||
<Compile Include="WebUserControls\cmp_ML_ShDet.ascx.designer.cs">
|
||||
<DependentUpon>cmp_ML_ShDet.ascx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="WebUserControls\cmp_ML_smart.ascx.cs">
|
||||
<DependentUpon>cmp_ML_smart.ascx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="WebUserControls\cmp_ML_smart.ascx.designer.cs">
|
||||
<DependentUpon>cmp_ML_smart.ascx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="WebUserControls\cmp_MU_carts.ascx.cs">
|
||||
<DependentUpon>cmp_MU_carts.ascx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_ML_smart.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_ML_smart" %>
|
||||
|
||||
<div class="mx-0">
|
||||
<div class="card text-center" style="width: 100%;">
|
||||
<h4 class="card-header p-1 bg-secondary text-light"><%: traduci("MachineLoadSmart") %></h4>
|
||||
<div class="card-body py-1">
|
||||
<div class="row mt-2" style="min-height: 25rem;">
|
||||
<div class="col-12 px-0">
|
||||
BARCODE
|
||||
</div>
|
||||
<div class="col-12 px-0">
|
||||
out messages
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <generato automaticamente>
|
||||
// Codice generato da uno strumento.
|
||||
//
|
||||
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
|
||||
// il codice viene rigenerato.
|
||||
// </generato automaticamente>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace NKC_WF.WebUserControls
|
||||
{
|
||||
|
||||
|
||||
public partial class cmp_ML_smart
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -14,7 +14,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<asp:HiddenField runat="server" ID="hfBarcode" />
|
||||
<asp:HiddenField ID="hfBarcode" runat="server" />
|
||||
<asp:HiddenField ID="hfEnableBCode" runat="server" />
|
||||
<asp:HiddenField ID="hfStackId" runat="server" />
|
||||
<asp:Label runat="server" ID="lblLoaded" CssClass="text-success border border-success rounded py-1 px-5 m-2"><%: traduci("StackLoaded") %></asp:Label>
|
||||
<asp:FormView ID="frmView" runat="server" DataKeyNames="BatchID" DataSourceID="ods" Width="100%" OnDataBound="frmView_DataBound">
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Comando barcode letto
|
||||
/// </summary>
|
||||
@@ -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");
|
||||
}
|
||||
|
||||
+84
-75
@@ -11,88 +11,97 @@ namespace NKC_WF.WebUserControls
|
||||
{
|
||||
|
||||
|
||||
public partial class cmp_stackLoading
|
||||
{
|
||||
public partial class cmp_stackLoading
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Controllo divSim.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSim;
|
||||
/// <summary>
|
||||
/// Controllo divSim.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSim;
|
||||
|
||||
/// <summary>
|
||||
/// Controllo lbtAdvanceProd.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.LinkButton lbtAdvanceProd;
|
||||
/// <summary>
|
||||
/// Controllo lbtAdvanceProd.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.LinkButton lbtAdvanceProd;
|
||||
|
||||
/// <summary>
|
||||
/// Controllo hfBarcode.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.HiddenField hfBarcode;
|
||||
/// <summary>
|
||||
/// Controllo hfBarcode.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.HiddenField hfBarcode;
|
||||
|
||||
/// <summary>
|
||||
/// Controllo hfStackId.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.HiddenField hfStackId;
|
||||
/// <summary>
|
||||
/// Controllo hfEnableBCode.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.HiddenField hfEnableBCode;
|
||||
|
||||
/// <summary>
|
||||
/// Controllo lblLoaded.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label lblLoaded;
|
||||
/// <summary>
|
||||
/// Controllo hfStackId.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.HiddenField hfStackId;
|
||||
|
||||
/// <summary>
|
||||
/// Controllo frmView.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.FormView frmView;
|
||||
/// <summary>
|
||||
/// Controllo lblLoaded.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label lblLoaded;
|
||||
|
||||
/// <summary>
|
||||
/// Controllo ods.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
|
||||
/// <summary>
|
||||
/// Controllo frmView.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.FormView frmView;
|
||||
|
||||
/// <summary>
|
||||
/// Controllo cmp_barcode.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::NKC_WF.WebUserControls.cmp_barcode cmp_barcode;
|
||||
/// <summary>
|
||||
/// Controllo ods.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
|
||||
|
||||
/// <summary>
|
||||
/// Controllo cmp_stackNextloading.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::NKC_WF.WebUserControls.cmp_stackNextloading cmp_stackNextloading;
|
||||
}
|
||||
/// <summary>
|
||||
/// Controllo cmp_barcode.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::NKC_WF.WebUserControls.cmp_barcode cmp_barcode;
|
||||
|
||||
/// <summary>
|
||||
/// Controllo cmp_stackNextloading.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::NKC_WF.WebUserControls.cmp_stackNextloading cmp_stackNextloading;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,40 +17,40 @@
|
||||
<asp:TemplateField>
|
||||
<ItemTemplate>
|
||||
<div class="row border border-success rounded">
|
||||
<div class="col-4 text-left text-secondary" runat="server" visible='<%# Eval("NumSheets").ToString() == Eval("NumSheetsWorked").ToString() %>'>
|
||||
<div class="col-12 col-lg-4 text-left text-secondary" runat="server" visible='<%# Eval("NumSheets").ToString() == Eval("NumSheetsWorked").ToString() %>'>
|
||||
<b>PREVIOUS</b> BUNK: <b>
|
||||
<asp:Label ID="Label1" runat="server" Text='<%# Eval("StackDtmx") %>' /></b>
|
||||
(<asp:Label ID="Label2" runat="server" Text='<%# Eval("StackIndex") %>' />)
|
||||
</div>
|
||||
<div class="col-4 text-left text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsWorked").ToString() %>'>
|
||||
<div class="col-12 col-lg-4 text-left text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsWorked").ToString() %>'>
|
||||
<b>CURRENT</b> BUNK: <b>
|
||||
<asp:Label ID="StackIDLabel" runat="server" Text='<%# Eval("StackDtmx") %>' /></b>
|
||||
(<asp:Label ID="StackIndexLabel" runat="server" Text='<%# Eval("StackIndex") %>' />)
|
||||
</div>
|
||||
<div class="col-5 text-center px-0">
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<div class="col-12 col-lg-5 text-center px-0">
|
||||
<div class="row textCondens">
|
||||
<div class="col-3 pr-0">
|
||||
sheets:<b><asp:Label ID="NumSheetsLabel" runat="server" Text='<%# Eval("NumSheets") %>' /></b>
|
||||
</div>
|
||||
<div class="col">
|
||||
<div class="col-3 px-0">
|
||||
printed: <b>
|
||||
<asp:Label ID="NumSheetsPrintedLabel" runat="server" Text='<%# Eval("NumSheetsPrinted") %>' /></b>
|
||||
</div>
|
||||
<div class="col">
|
||||
<div class="col-3 px-0">
|
||||
worked: <b>
|
||||
<asp:Label ID="NumSheetsWorkedLabel" runat="server" Text='<%# Eval("NumSheetsWorked") %>' /></b>
|
||||
</div>
|
||||
<div class="col text-danger">
|
||||
<div class="col-3 pl-0 text-danger">
|
||||
To Redo: <b>
|
||||
<asp:Label ID="NumSheetsToRedoLabel" runat="server" Text='<%# Eval("NumSheetsToRedo") %>' /></b>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-3 text-right text-secondary" runat="server" visible='<%# Eval("NumSheets").ToString() == Eval("NumSheetsWorked").ToString() %>'>
|
||||
<div class="col-12 col-lg-3 text-right text-secondary" runat="server" visible='<%# Eval("NumSheets").ToString() == Eval("NumSheetsWorked").ToString() %>'>
|
||||
Items: <b>
|
||||
<asp:Label ID="lblNumItems" runat="server" Text='<%# Eval("NumItems") %>' /></b>
|
||||
</div>
|
||||
<div class="col-3 text-right text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsWorked").ToString() %>'>
|
||||
<div class="col-12 col-lg-3 text-right text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsWorked").ToString() %>'>
|
||||
Items: <b>
|
||||
<asp:Label ID="Label3" runat="server" Text='<%# Eval("NumItems") %>' /></b>
|
||||
</div>
|
||||
@@ -67,17 +67,17 @@
|
||||
<asp:FormView ID="frmViewNext" runat="server" DataKeyNames="StackID" DataSourceID="odsNext" Width="100%">
|
||||
<ItemTemplate>
|
||||
<div class="row border border-primary rounded">
|
||||
<div class="col-4 text-left text-primary">
|
||||
<div class="col-12 col-lg-4 text-left text-primary">
|
||||
<b>NEXT</b> BUNK: <b>
|
||||
<asp:Label ID="StackIDLabel" runat="server" Text='<%# Eval("StackDtmx") %>' /></b>
|
||||
(<asp:Label ID="StackIndexLabel" runat="server" Text='<%# Eval("StackIndex") %>' />)
|
||||
</div>
|
||||
<div class="col-4 text-center">
|
||||
<div class="col-12 col-lg-4 text-center textCondens">
|
||||
sheets:<b><asp:Label ID="NumSheetsLabel" runat="server" Text='<%# Eval("NumSheets") %>' /></b> | printed: <b>
|
||||
<asp:Label ID="NumSheetsPrintedLabel" runat="server" Text='<%# Eval("NumSheetsPrinted") %>' /></b> | worked: <b>
|
||||
<asp:Label ID="NumSheetsWorkedLabel" runat="server" Text='<%# Eval("NumSheetsWorked") %>' /></b>
|
||||
</div>
|
||||
<div class="col-4 text-right text-primary">
|
||||
<div class="col-12 col-lg-4 text-right text-primary">
|
||||
Items: <b>
|
||||
<asp:Label ID="lblNumItems" runat="server" Text='<%# Eval("NumItems") %>' /></b>
|
||||
</div>
|
||||
@@ -85,10 +85,10 @@
|
||||
</ItemTemplate>
|
||||
<EmptyDataTemplate>
|
||||
<div class="row border border-primary rounded">
|
||||
<div class="col-6 text-left text-secondary">
|
||||
<div class="col-12 col-lg-6 text-left text-secondary">
|
||||
<b>NO NEXT BUNK</b>
|
||||
</div>
|
||||
<div class="col-6 text-right text-secondary">
|
||||
<div class="col-12 col-lg-6 text-right text-secondary">
|
||||
BATCH complete
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -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" %>
|
||||
|
||||
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
|
||||
<asp:Timer ID="timerLoad" runat="server" Interval="2000" OnTick="timerLoad_Tick"></asp:Timer>
|
||||
<div class="card text-center" style="width: 100%;">
|
||||
<h3 class="card-header"><%: traduci("MachineLoad") %></h3>
|
||||
<div class="card-body py-1">
|
||||
<asp:UpdatePanel runat="server" ID="upnlBCode" UpdateMode="Conditional" ChildrenAsTriggers="true">
|
||||
<ContentTemplate>
|
||||
<div class="row">
|
||||
<div class="col-12 mb-2">
|
||||
<uc1:cmp_stackLoading runat="server" ID="cmp_stackLoading" />
|
||||
<div class="container2 px-1 textBig">
|
||||
<asp:Timer ID="timerLoad" runat="server" Interval="2000" OnTick="timerLoad_Tick"></asp:Timer>
|
||||
<div class="card text-center" style="width: 100%;">
|
||||
<h4 class="card-header p-1 bg-secondary text-light"><%: traduci("MachineLoad") %></h4>
|
||||
<div class="card-body py-1">
|
||||
<asp:UpdatePanel runat="server" ID="upnlBCode" UpdateMode="Conditional" ChildrenAsTriggers="true">
|
||||
<ContentTemplate>
|
||||
<div class="row">
|
||||
<div class="col-12 mb-2">
|
||||
<uc1:cmp_stackLoading runat="server" ID="cmp_stackLoading" enableBCode="false" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
<asp:UpdatePanel runat="server" ID="upnlLoad" UpdateMode="Always">
|
||||
<ContentTemplate>
|
||||
<div class="row">
|
||||
<div class="col-3">
|
||||
<uc1:cmp_ML_ShDet runat="server" ID="cmp_ML_ShDet" StatusReqStart="0" StatusReqEnd="0" />
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
<asp:UpdatePanel runat="server" ID="upnlLoad" UpdateMode="Always">
|
||||
<ContentTemplate>
|
||||
<div class="row">
|
||||
<div class="col-3">
|
||||
<uc1:cmp_ML_ShDet runat="server" ID="cmp_ML_ShDet" StatusReqStart="0" StatusReqEnd="0" />
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<uc1:cmp_ML_ShDet runat="server" ID="cmp_ML_ShDet1" StatusReqStart="1" StatusReqEnd="2" />
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<uc1:cmp_ML_ShDet runat="server" ID="cmp_ML_ShDet2" StatusReqStart="3" StatusReqEnd="4" />
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<uc1:cmp_ML_ShDet runat="server" ID="cmp_ML_ShDet3" StatusReqStart="5" StatusReqEnd="5" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<uc1:cmp_ML_ShDet runat="server" ID="cmp_ML_ShDet1" StatusReqStart="1" StatusReqEnd="2" />
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<uc1:cmp_ML_ShDet runat="server" ID="cmp_ML_ShDet2" StatusReqStart="3" StatusReqEnd="4" />
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<uc1:cmp_ML_ShDet runat="server" ID="cmp_ML_ShDet3" StatusReqStart="5" StatusReqEnd="5" />
|
||||
</div>
|
||||
</div>
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</asp:Content>
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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" %>
|
||||
|
||||
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
|
||||
<div class="container px-1">
|
||||
<uc1:cmp_ML_smart runat="server" id="cmp_ML_smart" />
|
||||
<div class="card text-center" style="width: 100%;">
|
||||
<h4 class="card-header p-1 bg-secondary text-light"><%: traduci("MachineLoad") %></h4>
|
||||
<div class="card-body py-1">
|
||||
<asp:UpdatePanel runat="server" ID="upnlBCode" UpdateMode="Conditional" ChildrenAsTriggers="true">
|
||||
<ContentTemplate>
|
||||
<div class="row">
|
||||
<div class="col-12 mb-2">
|
||||
<uc1:cmp_stackLoading runat="server" ID="cmp_stackLoading" enableBCode="true" />
|
||||
</div>
|
||||
</div>
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</asp:Content>
|
||||
|
||||
@@ -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
|
||||
/// <summary>
|
||||
/// Batch corrente...
|
||||
/// </summary>
|
||||
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();
|
||||
}
|
||||
/// <summary>
|
||||
/// Aggiorna componente principale e child components
|
||||
/// </summary>
|
||||
private void doUpdate()
|
||||
|
||||
private void forceRefresh()
|
||||
{
|
||||
setCurrData();
|
||||
// aggiorno child
|
||||
cmp_unloadSmart.BatchId = BatchId;
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// Imposta dati correnti (Bunk / Sheet)
|
||||
/// </summary>
|
||||
private void setCurrData()
|
||||
{
|
||||
// recupero bunk corrente...
|
||||
DS_App.StackListRow currBunk = ComLib.getCurrBunk();
|
||||
if (currBunk != null)
|
||||
{
|
||||
BatchId = currBunk.BatchID;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
}
|
||||
+11
-2
@@ -15,12 +15,21 @@ namespace NKC_WF.site
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Controllo cmp_ML_smart.
|
||||
/// Controllo upnlBCode.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::NKC_WF.WebUserControls.cmp_ML_smart cmp_ML_smart;
|
||||
protected global::System.Web.UI.UpdatePanel upnlBCode;
|
||||
|
||||
/// <summary>
|
||||
/// Controllo cmp_stackLoading.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Campo generato automaticamente.
|
||||
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||
/// </remarks>
|
||||
protected global::NKC_WF.WebUserControls.cmp_stackLoading cmp_stackLoading;
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user