From 4a563fffbf805a197e21201bf737f2b9017d0dc7 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 12 Apr 2017 11:45:47 +0200
Subject: [PATCH] correzione erorre in jenkinsfile + minor fix in review
 timbrature

---
 GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx | 4 ++--
 Jenkinsfile                                         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx
index f37698e..6c57f68 100644
--- a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx
+++ b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx
@@ -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>
diff --git a/Jenkinsfile b/Jenkinsfile
index 7232dfb..948413b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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 {