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

Minor refresh IOB info

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-06-28 18:23:33 +02:00
parent 8202f228e7
commit a98bfa04d2
4 changed files with 3 additions and 15 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=790']) {
withEnv(['NEXT_BUILD_NUMBER=791']) {
// env.versionNumber = VersionNumber(versionNumberString : '5.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '5.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-TAB/DettaglioMacchina.aspx
+2 -2
View File
@@ -30,10 +30,10 @@
<uc4:mod_confProd ID="mod_confProd1" runat="server" />
<div class="row">
<div class="col-6">
<asp:HyperLink runat="server" ID="hlScarti" NavigateUrl="~/Scarti.aspx" CssClass="btn btn-info btn-lg btn-block"><i class="fa fa-bug"></i>Reg. SCARTI</asp:HyperLink>
<asp:HyperLink runat="server" ID="hlScarti" NavigateUrl="~/Scarti.aspx" CssClass="btn btn-info btn-lg btn-block"><i class="fa fa-bug"></i> Reg. SCARTI</asp:HyperLink>
</div>
<div class="col-6">
<asp:HyperLink runat="server" ID="hlCOntrolli" NavigateUrl="~/Controlli.aspx" CssClass="btn btn-primary btn-lg btn-block"><i class="fa fa-wrench"></i> Reg. CONTROLLI</asp:HyperLink>
<asp:HyperLink runat="server" ID="hlCOntrolli" NavigateUrl="~/Controlli.aspx" CssClass="btn btn-primary btn-lg btn-block"><i class="fa fa-wrench"></i> Reg.CONTROLLI</asp:HyperLink>
</div>
</div>
<%--<uc3:mod_regScarti runat="server" ID="mod_regScarti" />
MP-TAB/IOB-info.aspx
-3
View File
@@ -28,9 +28,6 @@
<li class="list-group-item d-flex justify-content-between align-items-center">CNC Absolute counter: <b><%: IobFeeder.CNC_Counter %></b></li>
</ul>
</div>
<div class="card-footer">
<asp:HyperLink runat="server" ID="hlAbout" CssClass="btn btn-lg btn-block btn-success" NavigateUrl="~/About.aspx"><i class="fa fa-gear"></i> ABOUT PAGE</asp:HyperLink>
</div>
</div>
</div>
<div class="col-12 col-md-4 col-lg-3 col-xl-2">
MP-TAB/IOB-info.aspx.designer.cs
Generated
-9
View File
@@ -21,15 +21,6 @@ namespace MoonProTablet {
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_dettMacchina mod_dettMacchina1;
/// <summary>
/// Controllo hlAbout.
/// </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.WebControls.HyperLink hlAbout;
/// <summary>
/// Controllo mod_directLinks.
/// </summary>