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

Fix grafico x mostrare path CNC

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-18 15:33:13 +02:00
parent e6fd2d05e2
commit fbf8577bb5
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=340']) {
withEnv(['NEXT_BUILD_NUMBER=341']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx
+1 -1
View File
@@ -3,7 +3,7 @@
<asp:HiddenField runat="server" ID="hfDrawingPath" />
<div class="row" runat ="server" id="divDrawings">
<div class="col-12">
<h5><%: traduci("Drawings") %></h5>
<h3><%: traduci("Drawings") %></h3>
</div>
<asp:Repeater ID="repDraw" runat="server">
<ItemTemplate>
NKC_WF/WebUserControls/cmp_offOrderDetail.ascx
+2 -2
View File
@@ -14,11 +14,11 @@
<%--<svg width="710" height="305" viewBox='0 0 1420 710' xmlns='http://www.w3.org/2000/svg' runat="server" id="svgTable" Visible='<%# Eval("DrawFilePath").ToString() != "" %>'>
</svg>--%>
</div>
<div class="col-12">
<div class="col-12 textCondens">
<uc1:cmp_OOIL_drawings runat="server" ID="cmp_OOIL_drawings" DrawingPath='<%# Eval("DrawFilePath") %>' />
</div>
</div>
<div class="row text-left textCondens bg-primary text-light my-2">
<div class="row text-left textCondens bg-primary text-light my-2 mx-0">
<div class="col-2">
<asp:Label ID="CncFilePathLabel" runat="server" Text='<%# traduci("CncFilePath") %>' />
</div>