From 7a6c49924a4fc1bcea22a2bc90bd38e6ccc4803d Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 9 Oct 2019 22:23:09 +0200
Subject: [PATCH] Fix buttons approvazione

---
 GPW_Smart/WebUserControls/mod_mancTimb.ascx | 16 ++++++++--------
 Jenkinsfile                                 |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/GPW_Smart/WebUserControls/mod_mancTimb.ascx b/GPW_Smart/WebUserControls/mod_mancTimb.ascx
index 1333a32..269e5d4 100644
--- a/GPW_Smart/WebUserControls/mod_mancTimb.ascx
+++ b/GPW_Smart/WebUserControls/mod_mancTimb.ascx
@@ -33,9 +33,14 @@
         <label for="grView">
           Richieste in corso:
         </label>
-        <asp:GridView ID="grView" nome="grView" runat="server" AllowPaging="True" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="dataOra,idxDipendente" CssClass="table table-striped table-sm table-condensed w-100 small" GridLines="None" OnSelectedIndexChanged="grView_SelectedIndexChanged" OnRowUpdated="grView_RowUpdated" OnRowDeleted="grView_RowDeleted">
+        <asp:GridView ID="grView" nome="grView" runat="server" AllowPaging="True" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="dataOra,idxDipendente" CssClass="table table-striped table-sm table-condensed w-100 small" GridLines="None" OnSelectedIndexChanged="grView_SelectedIndexChanged" OnRowUpdated="grView_RowUpdated" OnRowDeleted="grView_RowDeleted" PageSize="5">
           <Columns>
-            <asp:TemplateField ItemStyle-HorizontalAlign="Left">
+            <asp:TemplateField>
+              <ItemTemplate>
+                <asp:LinkButton runat="server" ID="lbApprova" Visible='<%# userCanApprove %>' Text="Approva" CssClass="btn btn-block btn-sm p-1 btn-success" CommandArgument="approva" CommandName="Select"><i class="fa fa-thumbs-o-up" aria-hidden="true"></i> OK</asp:LinkButton>
+              </ItemTemplate>
+            </asp:TemplateField>
+            <asp:TemplateField ItemStyle-HorizontalAlign="center">
               <ItemTemplate>
                 <asp:Label ID="lblDip" runat="server" Text='<%# cognomeNome(Eval("idxDipendente")) %>' Visible='<%# userCanApprove %>' />
               </ItemTemplate>
@@ -57,12 +62,7 @@
             </asp:TemplateField>
             <asp:TemplateField>
               <ItemTemplate>
-                <asp:LinkButton runat="server" ID="lbDelete" Text="Elimina" CssClass="btn btn-block btn-sm p-1 btn-danger" CommandArgument="Elimina" CommandName="Delete"><i class="fa fa-ban" aria-hidden="true"></i></asp:LinkButton>
-              </ItemTemplate>
-            </asp:TemplateField>
-            <asp:TemplateField>
-              <ItemTemplate>
-                <asp:LinkButton runat="server" ID="lbApprova" Visible='<%# userCanApprove %>' Text="Approva" CssClass="btn btn-block btn-sm p-1 btn-success" CommandArgument="approva" CommandName="Select"><i class="fa fa-check-circle-o" aria-hidden="true"></i></asp:LinkButton>
+                <asp:LinkButton runat="server" ID="lbDelete" Text="Elimina" CssClass="btn btn-block btn-sm p-1 btn-danger" CommandArgument="Elimina" CommandName="Delete"><i class="fa fa-thumbs-o-down" aria-hidden="true"></i> NO</asp:LinkButton>
               </ItemTemplate>
             </asp:TemplateField>
           </Columns>
diff --git a/Jenkinsfile b/Jenkinsfile
index 15ca76c..5543865 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=4081']) {
+        withEnv(['NEXT_BUILD_NUMBER=4083']) {
           // env.versionNumber = VersionNumber(versionNumberString : '2.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '2.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
             env.APP_NAME = 'GPW'