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

Revisione BunkManager x smart device

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-01-31 09:28:51 +01:00
parent 5dbb91e7c4
commit f5f509e2e9
7 changed files with 39 additions and 38 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/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"><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>
</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 textCondens";
if (divSelected.Visible)
{
titleClass += " table-info";
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 textCondens";
if (divSelected.Visible)
{
titleClass += " table-primary";
NKC_WF/site/StackManager.aspx
+1 -1
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" %>