Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-01-31 09:38:09 +01:00
parent e92529a057 471452c336
commit 8dccc4b843
16 changed files with 122 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=241']) {
withEnv(['NEXT_BUILD_NUMBER=242']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/Content/Site.css
+12 -12
View File
@@ -12,8 +12,8 @@ body {
padding-right: 15px;
}
.textCondens {
font-family: 'Roboto Condensed', sans-serif;
/*font-family: 'Open Sans Condensed', sans-serif;*/
/*font-family: 'Roboto Condensed', sans-serif;*/
font-family: 'Open Sans Condensed', sans-serif;
}
.textNormal {
font-family: 'Roboto', sans-serif;
@@ -134,10 +134,10 @@ body {
text-align: center;
}
.shortcuts .shortcut {
min-width: 180px;
min-height: 100px;
min-width: 9rem;
min-height: 5rem;
display: inline-block;
padding: 13.33333333px 0;
padding: 0.66666667rem 0;
margin: 0 2px 1em;
vertical-align: top;
text-decoration: none;
@@ -150,13 +150,13 @@ body {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
border: 1px solid #ddd;
box-sizing: border-box;
border-radius: 10px;
border-radius: 0.5rem;
}
.shortcuts .shortcut-sm {
min-width: 90px;
min-height: 60px;
min-width: 4.5rem;
min-height: 3rem;
display: inline-block;
padding: 5px 0;
padding: 0.25rem 0;
margin: 0 2px 1em;
vertical-align: top;
text-decoration: none;
@@ -169,20 +169,20 @@ body {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
border: 1px solid #ddd;
box-sizing: border-box;
border-radius: 10px;
border-radius: 0.5rem;
}
.shortcuts .shortcut .shortcut-icon {
width: 100%;
margin-top: 0;
margin-bottom: 0;
font-size: 40px;
font-size: 2rem;
color: #333;
}
.shortcuts .shortcut-sm .shortcut-icon {
width: 100%;
margin-top: 0;
margin-bottom: 0;
font-size: 40px;
font-size: 2rem;
color: #333;
}
.shortcuts .shortcut:hover {
NKC_WF/Content/Site.less
+2 -2
View File
@@ -15,8 +15,8 @@ body {
.textCondens {
font-family: 'Roboto Condensed', sans-serif;
/*font-family: 'Open Sans Condensed', sans-serif;*/
/*font-family: 'Roboto Condensed', sans-serif;*/
font-family: 'Open Sans Condensed', sans-serif;
}
.textNormal {
font-family: 'Roboto', sans-serif;
NKC_WF/Content/Site.min.css
Vendored
+1 -1
View File
@@ -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:'Roboto 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;}@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;}
NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs
+1 -1
View File
@@ -29,7 +29,7 @@ namespace NKC_WF.WebUserControls
var estimAnsw = ComLib.man.getEstAnsw(value);
var nestAnsw = ComLib.man.getNestAnsw(value);
StringBuilder sb = new StringBuilder();
sb.AppendLine("DEBUG INFO:");
sb.AppendLine("DETAIL INFO:");
// elenchi x ricerca duplicati
List<int> partListEstim = new List<int>();
List<int> partListEstimDupl = new List<int>();
NKC_WF/WebUserControls/cmp_stackBuilding.ascx
+32 -31
View File
@@ -9,51 +9,52 @@
</div>
<div class="col-12 text-center">
<div class="row mb-1" runat="server" id="divPrint">
<div class="col-2 col-lg-3">
<div class="col-lg-3">
</div>
<div class="col-8 col-lg-6">
<div class="col-12 col-lg-6">
<%--<asp:HyperLink runat="server" ID="hlPrint" NavigateUrl="https://qrcode.steamware.net/HOME/QR_site/JSON?val={%27baseUrl%27:%27http://10.74.82.219/StockMan/STEA/Items/Details/{0}?StockItemID={0}%27,%27parameters%27:[%27534%27]}" Target="_blank" CssClass="btn btn-lg btn-success btn-block">--%>
<asp:LinkButton runat="server" ID="lbtPrint" CssClass="btn btn-lg btn-success btn-block" OnClick="lbtPrint_Click">
<div class="row text-center">
<div class="col-4"><i class="fa fa-print fa-2x" aria-hidden="true"></i></div>
<div class="col-4 bigText">PRINT</div>
<div class="col-8 bigText">PRINT</div>
<div class="col-4"><i class="fa fa-print fa-2x" aria-hidden="true"></i></div>
</div>
</asp:LinkButton>
<%--</asp:HyperLink>--%>
</div>
<div class="col-2 col-lg-3">
<div class="col-lg-3">
</div>
</div>
<div class="col-12">
<asp:HiddenField runat="server" ID="hfBarcode" />
<uc1:cmp_barcode runat="server" ID="cmp_barcode" />
</div>
<div class="col-12">
<asp:Repeater ID="repCtrl" runat="server" DataSourceID="ods">
<ItemTemplate>
<div class="row text-center my-1">
<div class="col-1 px-0 col-lg-3 px-lg-2 text-right">
<asp:Label runat="server" ID="lblNext" CssClass="text-primary px-1" Width="100%" Visible='<%# Eval("IsNext").ToString()=="1" %>'><span class="d-none d-lg-inline">NEXT </span><i class="fa fa-arrow-circle-right" aria-hidden="true"></i></asp:Label>
<asp:Label runat="server" ID="lblDone" CssClass="text-success px-1" Visible='<%# Eval("Prepared").ToString()!="" %>'><span class="d-none d-lg-inline"><%# Eval("Prepared","{0:ddd yyyy-MM-dd HH:mm}") %></span><i class="fa fa-check-circle" aria-hidden="true"></i></asp:Label>
</div>
<div runat="server" id="divMain" class='<%# "col-11 col-lg-9 " + cssByPrepared(Eval("Prepared"),Eval("IsNext")) %>'>
<div class="row">
<div class="col-1 px-1 col-md-2 px-md-2"><b><%# Eval("SheetIndex") %></b></div>
<div class="col-8 col-md-8 px-md-2"><%# Eval("MatDesc") %></div>
<div class="col-3 col-md-2"><b><%# Eval("MatExtCode") %></b></div>
<div class="row">
<div class="col-12">
<asp:HiddenField runat="server" ID="hfBarcode" />
<uc1:cmp_barcode runat="server" ID="cmp_barcode" />
</div>
<div class="col-12">
<asp:Repeater ID="repCtrl" runat="server" DataSourceID="ods">
<ItemTemplate>
<div class="row text-center my-1">
<div class="col-1 px-0 col-lg-3 px-lg-2 text-right">
<asp:Label runat="server" ID="lblNext" CssClass="text-primary px-1" Width="100%" Visible='<%# Eval("IsNext").ToString()=="1" %>'><span class="d-none d-lg-inline">NEXT </span><i class="fa fa-arrow-circle-right" aria-hidden="true"></i></asp:Label>
<asp:Label runat="server" ID="lblDone" CssClass="text-success px-1" Visible='<%# Eval("Prepared").ToString()!="" %>'><span class="d-none d-lg-inline"><%# Eval("Prepared","{0:ddd yyyy-MM-dd HH:mm}") %></span><i class="fa fa-check-circle" aria-hidden="true"></i></asp:Label>
</div>
<div runat="server" id="divMain" class='<%# "col-11 col-lg-9 " + cssByPrepared(Eval("Prepared"),Eval("IsNext")) %>'>
<div class="row">
<div class="col-1 px-1 col-md-2 px-md-2 small"><%# Eval("SheetIndex") %></div>
<div class="col-8 col-md-8 px-md-2 text-truncate"><%# Eval("MatDesc") %></div>
<div class="col-3 col-md-2"><b><%# Eval("MatExtCode") %></b></div>
</div>
</div>
</div>
</div>
</ItemTemplate>
</asp:Repeater>
<asp:HiddenField ID="hfStackId" runat="server" />
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStack" TypeName="AppData.DS_AppTableAdapters.SheetListTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfStackId" DefaultValue="0" Name="StackID" PropertyName="Value" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
</ItemTemplate>
</asp:Repeater>
<asp:HiddenField ID="hfStackId" runat="server" />
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStack" TypeName="AppData.DS_AppTableAdapters.SheetListTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfStackId" DefaultValue="0" Name="StackID" PropertyName="Value" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_stackList.ascx
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="row">
<div class="col-12">
<div runat="server" id="divTitle">
<div class="col-6 pr-0">
<div class="col-6 pr-0 font-weight-bold">
BUNK List
</div>
<div class="col-6 pl-0 text-right" runat="server" id="divSelected">
NKC_WF/WebUserControls/cmp_stackList.ascx.cs
+1 -1
View File
@@ -22,7 +22,7 @@ namespace NKC_WF.WebUserControls
divSelected.Visible = StackIdSel > 0;
grView.Visible = !divSelected.Visible;
// imposto css titolo...
string titleClass = "row font-weight-bold";
string titleClass = "row";
if (divSelected.Visible)
{
titleClass += " table-info";
NKC_WF/WebUserControls/cmp_stackLoading.ascx
+2 -2
View File
@@ -6,10 +6,10 @@
<div class="col-12 shortcuts small" runat="server" id="divSim">
<div class="row table-warning">
<div class="col">
<h3>Testing PROD</h3>
<h3>PROD simul</h3>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtAdvanceProd" class="shortcut" OnClick="lbtAdvanceProd_Click"> <i class="fa fa-wrench shortcut-icon"></i><span class="shortcut-label"><b>AVANZA</b> prod</span> </asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtAdvanceProd" class="shortcut" OnClick="lbtAdvanceProd_Click"> <i class="fa fa-wrench shortcut-icon"></i><span class="shortcut-label"><b>ADVANCE</b> prod</span> </asp:LinkButton>
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_taktList.ascx
+2 -2
View File
@@ -4,10 +4,10 @@
<div class="row">
<div class="col-12">
<div runat="server" id="divTitle">
<div class="col-6 pr-0">
<div class="col-4 col-lg-6 pr-0 font-weight-bold">
BATCH List
</div>
<div class="col-6 pl-0 text-right" runat="server" id="divSelected">
<div class="col-8 col-lg-6 pl-0 text-right" runat="server" id="divSelected">
<asp:Label runat="server" ID="lblTakt" />
<asp:LinkButton ID="lbtResetGlob" runat="server" OnClick="lbtReset_Click" CssClass="btn btn-sm btn-primary" Visible="true" ToolTip="Reset"><i class="fa fa-refresh"></i></asp:LinkButton>
</div>
NKC_WF/WebUserControls/cmp_taktList.ascx.cs
+1 -1
View File
@@ -23,7 +23,7 @@ namespace NKC_WF.WebUserControls
divSelected.Visible = BatchIdSel > 0;
grView.Visible = !divSelected.Visible;
// imposto css titolo...
string titleClass = "row font-weight-bold";
string titleClass = "row";
if (divSelected.Visible)
{
titleClass += " table-primary";
NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs
+2 -2
View File
@@ -209,7 +209,7 @@ namespace NKC_WF.WebUserControls
{
case codeType.UNK:
cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action");
resetSelection(true);
resetSelection(false);
doRaiseEv = true;
break;
case codeType.Item:
@@ -248,7 +248,7 @@ namespace NKC_WF.WebUserControls
break;
default:
cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action");
resetSelection(true);
resetSelection(false);
break;
}
NKC_WF/site/DBG_QRCode_Unload.aspx
+26 -21
View File
@@ -7,30 +7,35 @@
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfSheetID" runat="server" />
<div class="row">
<div class="col-2 text-left">
<asp:Image runat="server" Height="64" id="imgQrLogin"/>
<b>LOGIN</b> Page
</div>
<div class="col-8">
<h1 class="text-center">DEBUG UNLOAD PAGE</h1>
</div>
<div class="col-2 text-right">
QR size
<asp:Timer ID="timerRefresh" runat="server" Interval="5000" OnTick="timerRefresh_Tick"></asp:Timer>
<asp:UpdatePanel runat="server" ID="upnlDebug">
<ContentTemplate>
<div class="row">
<div class="col-2 text-left">
<asp:Image runat="server" Height="64" ID="imgQrLogin" />
<b>LOGIN</b> Page
</div>
<div class="col-8">
<h1 class="text-center">DEBUG UNLOAD PAGE</h1>
</div>
<div class="col-2 text-right">
QR size
<asp:DropDownList runat="server" ID="ddlQrSize" AutoPostBack="True" OnSelectedIndexChanged="ddlQrSize_SelectedIndexChanged">
<asp:ListItem Text="Small" Value="16"></asp:ListItem>
<asp:ListItem Text="Medium" Value="32" Selected="True"></asp:ListItem>
<asp:ListItem Text="Large" Value="64"></asp:ListItem>
</asp:DropDownList>
</div>
<div class="col-12">
<uc1:cmp_MU_Items runat="server" ID="cmp_MU_Items" />
</div>
<div class="col-6">
<uc1:cmp_MU_carts runat="server" ID="cmp_MU_carts" />
</div>
<div class="col-6">
<uc1:cmp_MU_bins runat="server" ID="cmp_MU_bins" />
</div>
</div>
</div>
<div class="col-12">
<uc1:cmp_MU_Items runat="server" ID="cmp_MU_Items" />
</div>
<div class="col-6">
<uc1:cmp_MU_carts runat="server" ID="cmp_MU_carts" />
</div>
<div class="col-6">
<uc1:cmp_MU_bins runat="server" ID="cmp_MU_bins" />
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
</asp:Content>
NKC_WF/site/DBG_QRCode_Unload.aspx.cs
+5
View File
@@ -115,5 +115,10 @@ namespace NKC_WF.site
cmp_MU_carts.qrSize = qrSize;
cmp_MU_Items.qrSize = qrSize;
}
protected void timerRefresh_Tick(object sender, EventArgs e)
{
doUpdate();
}
}
}
NKC_WF/site/DBG_QRCode_Unload.aspx.designer.cs
Generated
+18
View File
@@ -32,6 +32,24 @@ namespace NKC_WF.site
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfSheetID;
/// <summary>
/// Controllo timerRefresh.
/// </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.Timer timerRefresh;
/// <summary>
/// Controllo upnlDebug.
/// </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.UpdatePanel upnlDebug;
/// <summary>
/// Controllo imgQrLogin.
/// </summary>
NKC_WF/site/StackManager.aspx
+15 -9
View File
@@ -1,4 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.Master" AutoEventWireup="true" CodeBehind="StackManager.aspx.cs" Inherits="NKC_WF.StackManager" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="StackManager.aspx.cs" Inherits="NKC_WF.StackManager" %>
<%@ Register Src="~/WebUserControls/cmp_taktList.ascx" TagPrefix="uc1" TagName="cmp_taktList" %>
<%@ Register Src="~/WebUserControls/cmp_stackList.ascx" TagPrefix="uc1" TagName="cmp_stackList" %>
@@ -7,16 +7,22 @@
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="card" style="width: 100%;">
<h4 class="card-header text-uppercase text-center"><%: traduci("StackManager") %></h4>
<div class="card-body py-1">
<div class="row">
<div class="col-12">
<uc1:cmp_taktList runat="server" ID="cmp_taktList" />
<uc1:cmp_stackList runat="server" ID="cmp_stackList" />
<uc1:cmp_stackBuilding runat="server" ID="cmp_stackBuilding" />
<div class="row">
<div class="col-lg-3"></div>
<div class="col-12 col-lg-6">
<div class="card" style="width: 100%;">
<h4 class="card-header text-uppercase text-center"><%: traduci("StackManager") %></h4>
<div class="card-body py-1 textCondens">
<div class="row">
<div class="col-12">
<uc1:cmp_taktList runat="server" ID="cmp_taktList" />
<uc1:cmp_stackList runat="server" ID="cmp_stackList" />
<uc1:cmp_stackBuilding runat="server" ID="cmp_stackBuilding" />
</div>
</div>
</div>
</div>
</div>
<div class="col-lg-3"></div>
</div>
</asp:Content>