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

Completato review pagina LOADING

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-09-24 16:57:23 +02:00
parent 693675d468
commit dc9990fdc3
2 changed files with 5 additions and 5 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=109']) {
withEnv(['NEXT_BUILD_NUMBER=111']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'NKC'
NKC_WF/WebUserControls/cmp_stackNextloading.ascx
+4 -4
View File
@@ -18,12 +18,12 @@
<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("NumSheetsPrinted").ToString() %>'>
<div class="col-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") %>' />/2)
</div>
<div class="col-4 text-left text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsPrinted").ToString() %>'>
<div class="col-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") %>' />/2)
@@ -33,11 +33,11 @@
<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-secondary" runat="server" visible='<%# Eval("NumSheets").ToString() == Eval("NumSheetsPrinted").ToString() %>'>
<div class="col-4 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-4 text-right text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsPrinted").ToString() %>'>
<div class="col-4 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>