Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refresh

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-02-12 23:15:13 +01:00
parent f4bf9ee6a3
commit 6486c074ad
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1170']) {
withEnv(['NEXT_BUILD_NUMBER=1171']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-TAB/WebUserControls/cmp_dettODL.ascx
+11 -14
View File
@@ -23,17 +23,17 @@
<asp:Label ID="KeyRichiestaLabel" runat="server" Text='<%# Eval("KeyRichiesta") %>' />
</div>
<div class="col-sm-1 small pr-0 mr-0">
CodArt:
Cod:
</div>
<div class="col-sm-3 text-right font-weight-bold">
<asp:Label ID="CodArticoloLabel" runat="server" Text='<%# Eval("CodArticolo") %>' />
</div>
</div>
<div class="row table-warning">
<div class="col-sm-1 small pr-0 mr-0">
<div class="col-sm-2 small pr-0 mr-0">
Articolo:
</div>
<div class="col-sm-11 text-right font-weight-bold">
<div class="col-sm-10 text-right font-weight-bold">
<asp:Label ID="DescArticoloLabel" runat="server" Text='<%# Eval("DescArticolo") %>' />
</div>
</div>
@@ -50,32 +50,29 @@
<div class="col-sm-3 text-right font-weight-bold">
<asp:Label ID="TCAssegnatoLabel" runat="server" Text='<%# Eval("TCAssegnato", "{0:N2}") %>' />
</div>
<div class="col-sm-1 small pr-0 mr-0">
<div class="col-sm-2 small">
Pz/pallet:
</div>
<div class="col-sm-3 text-right font-weight-bold">
<div class="col-sm-2 text-right font-weight-bold">
<asp:Label ID="PzPalletLabel" runat="server" Text='<%# Eval("PzPallet") %>' />
</div>
</div>
</div>
<div class="card-footer">
<div class="row">
<div class="col-sm-1 small pr-0 mr-0">
Nome:
</div>
<div class="col-sm-3 text-right font-weight-bold">
<div class="col-sm-4 text-left font-weight-bold">
<asp:Label ID="NomeLabel" runat="server" Text='<%# Eval("Nome") %>' />
</div>
<div class="col-sm-1 small pr-0 mr-0">
<div class="col-sm-2 small">
Priorita:
</div>
<div class="col-sm-3 text-right font-weight-bold">
<div class="col-sm-2 text-right font-weight-bold">
<asp:Label ID="PrioritaLabel" runat="server" Text='<%# Eval("Priorita") %>' />
</div>
<div class="col-sm-1 small pr-0 mr-0">
DueDate:
<div class="col-sm-2 small">
Data:
</div>
<div class="col-sm-3 text-right font-weight-bold">
<div class="col-sm-2 text-right font-weight-bold">
<asp:Label ID="DueDateLabel" runat="server" Text='<%# Eval("DueDate","{0:dd.MM.yy}") %>' />
</div>
</div>