correzione erorre in jenkinsfile + minor fix in review timbrature

This commit is contained in:
Samuele E. Locatelli
2017-04-12 11:45:47 +02:00
parent 129120b69f
commit 4a563fffbf
2 changed files with 3 additions and 3 deletions
@@ -5,7 +5,7 @@
<%@ Register Src="mod_elencoTimbr.ascx" TagName="mod_elencoTimbr" TagPrefix="uc3" %>
<%@ Register Src="mod_commAttivitaDesk.ascx" TagName="mod_commAttivitaDesk" TagPrefix="uc4" %>
<% if (false)
{ %>
{ %>
<link href="~/css/Style.css" rel="stylesheet" type="text/css" />
<% } %>
<div class="filtro_1" style="height: 28px; padding: 2px;">
@@ -147,7 +147,7 @@
<asp:Label ID="lblIsOkTim" runat="server" Text="T" ForeColor="Red" Visible='<%# invBool(Eval("isOkTim")) %>' ToolTip="Errore Entrata/Uscita: non corrispondono." />
<asp:Label ID="lblIsOkApp" runat="server" Text="A" ForeColor="Red" Visible='<%# invBool(Eval("isOkApp")) %>' ToolTip="Errore: timbrature non approvate." />
<asp:Label ID="lblIsOkLav" runat="server" Text="O" ForeColor="Red" Visible='<%# invBool(Eval("isOkLav")) %>' ToolTip="Errore: manca copertura ore ordinarie." />
<asp:Label ID="lblChkFun" runat="server" Text='<%# Eval("chkFunCod") %>' ForeColor='<%# coloreMPP(Eval("minMpp")) %>' Visible='<%# Eval("chkFunCod")!="" %>' ToolTip='<%# Eval("chkFunRes") %>' />
<asp:Label ID="lblChkFun" runat="server" Text='<%# Eval("chkFunCod") %>' ForeColor='<%# coloreMPP(Eval("minMpp")) %>' Visible='<%# Eval("chkFunCod").ToString() != "" %>' ToolTip='<%# Eval("chkFunRes") %>' />
<asp:Label ID="lblIsOk" runat="server" Text="Ok" ForeColor="Green" Visible='<%# toBool(Eval("isOk")) %>' ToolTip="Errore di uno o più fra timbrature / giustificativi / approvazione" />
</b>
</ItemTemplate>
Vendored
+1 -1
View File
@@ -162,7 +162,7 @@ pipeline {
/*sleep 1
echo 'Copia...'
bat "E:\\Jenkins\\exportDropbox.bat TestSam\\Test\\pipeline_test\\lastSuccessfulBuild\\archive\\ScratchTest\\ScratchTest\\bin\\Release TestSam\\CLI_01 Build_${env.versionNumber}"*/
},>
},
failFast: false)
}
else {