From 6a623c2a99551f32ad84eaf0a8a5ba7dc2234ee5 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 10 Oct 2019 22:44:15 +0200
Subject: [PATCH] Fix dettaglio commesse

---
 GPW_Smart/WebUserControls/mod_commAttivita.ascx | 12 ++++--------
 Jenkinsfile                                     |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/GPW_Smart/WebUserControls/mod_commAttivita.ascx b/GPW_Smart/WebUserControls/mod_commAttivita.ascx
index ff55c5a..e3b1c16 100644
--- a/GPW_Smart/WebUserControls/mod_commAttivita.ascx
+++ b/GPW_Smart/WebUserControls/mod_commAttivita.ascx
@@ -1,8 +1,4 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_commAttivita.ascx.cs" Inherits="GPW.WebUserControls.mod_commAttivita" %>
-<% if (false)
-  { %>
-<link href="~/css/Style.css" rel="stylesheet" type="text/css" />
-<% } %>
 
 <div class="row mt-2 small py-2">
   <div class="col-4 pr-0">
@@ -25,11 +21,11 @@
         <asp:TemplateField>
           <ItemTemplate>
             <asp:LinkButton runat="server" ID="lnkEdit" OnClick="lnkEdit_Click" CommandArgument='<%# Eval("idxRA") %>'>
-              <div class="row">
-                <div class="col-6">
+              <div class="d-flex">
+                <div class="p-0">
                   <asp:Label ID="lblCli" runat="server" Text='<%# cliByIdxFase(Eval("idxFase")) %>' CssClass="text-dark font-weight-bold" />
                 </div>
-                <div class="col-6 text-right">
+                <div class="p-0 flex-grow-1 text-right small">
                   <asp:Label ID="lblPrj" runat="server" Text='<%# prjByIdxFase(Eval("idxFase")) %>' CssClass="text-dark" />
                 </div>
               </div>
@@ -53,7 +49,7 @@
         </asp:TemplateField>
         <asp:TemplateField>
           <ItemTemplate>
-            <asp:LinkButton runat="server" ID="lnkClona" OnClick="lnkClona_Click" CommandArgument='<%# Eval("idxRA") %>' CssClass="btn btn-info btn-sm"><i class="fa fa-magic" aria-hidden="true"></i></asp:LinkButton>
+            <asp:LinkButton runat="server" ID="lnkClona" OnClick="lnkClona_Click" CommandArgument='<%# Eval("idxRA") %>' CssClass="btn btn-warning py-3 px-1"><i class="fa fa-magic" aria-hidden="true"></i></asp:LinkButton>
           </ItemTemplate>
         </asp:TemplateField>
       </Columns>
diff --git a/Jenkinsfile b/Jenkinsfile
index 09213a9..5f8b551 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=4083']) {
+        withEnv(['NEXT_BUILD_NUMBER=4084']) {
           // 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'