From 173f45e4ad4c72dbb68e3e32db3a70fa9d82d1cf Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 9 Aug 2018 13:03:53 +0200
Subject: [PATCH] Update elenco azioni

---
 Jenkinsfile                           |  2 +-
 PUB/WebUserContols/mod_ER_acts.ascx   | 28 +++++++++++++--------------
 PUB/WebUserContols/mod_ER_detail.ascx |  1 -
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index bd0d213..20fd476 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=128']) {
+        withEnv(['NEXT_BUILD_NUMBER=129']) {
           // env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
             env.APP_NAME = 'SOSCONDOMINI'
diff --git a/PUB/WebUserContols/mod_ER_acts.ascx b/PUB/WebUserContols/mod_ER_acts.ascx
index 8c6b9c4..ec41ccb 100644
--- a/PUB/WebUserContols/mod_ER_acts.ascx
+++ b/PUB/WebUserContols/mod_ER_acts.ascx
@@ -2,24 +2,24 @@
 
 <asp:HiddenField runat="server" ID="hfIdxRichiesta" />
 
-<asp:GridView runat="server" ID="grView" AutoGenerateColumns="False" DataKeyNames="idxAzione" AllowSorting="true" DataSourceID="ods" ClientIDMode="Predictable" ClientIDRowSuffix="IdxAzione" CssClass="table table-striped table-condensed">
+
+
+
+<asp:GridView runat="server" ID="grView" AutoGenerateColumns="False" DataKeyNames="idxAzione" AllowSorting="true" DataSourceID="ods" ClientIDMode="Predictable" ClientIDRowSuffix="IdxAzione" CssClass="table table-condensed" CellPadding="0" CellSpacing="0">
   <Columns>
-    <asp:TemplateField HeaderText="Data" SortExpression="dataRif">
+    <asp:TemplateField HeaderText="Registro Attivita" SortExpression="dataRif">
       <ItemTemplate>
-        <div class="row mw-100">
-          <div class="col-4 text-left strong">
-            <asp:LinkButton runat="server" ID="lbtShowDet" CssClass='<%# "btn btn-sm " + Eval("cssButton")  %>' data-toggle="collapse" data-target='<%# Eval("idxAzione", "#MainContent_MainContent_mod_ER_detail_frmView_mod_ER_acts_grView_lblMessage_{0}") %>'>
-            <i class="fas fa-angle-double-down"></i> | <b><i class='<%# Eval("cssIcon") %>'></i>&nbsp;<%# Eval("classe") %></b>&nbsp;|&nbsp;<%# Eval("descrAzione") %> 
+        <div class="row">
+          <div class="col-12 text-left">
+            <asp:LinkButton runat="server" ID="lbtShowDet" CssClass='<%# "p-0 btn btn-sm btn-block " + Eval("cssButton")  %>' data-toggle="collapse" data-target='<%# Eval("idxAzione", "#MainContent_MainContent_mod_ER_detail_frmView_mod_ER_acts_grView_divMess_{0}") %>'>
+            <i class="fas fa-angle-double-down"></i> | <b><i class='<%# Eval("cssIcon") %>'></i>&nbsp;<%# Eval("classe") %>| <%# Eval("descrAzione") %></b>
+              <div class="small text-truncate text-secondary">
+                <div class="font-weight-bold"><%# Eval("dataRif","{0:ddd dd.MM.yyyy, HH:mm:ss}") %> - <span class="small"><%# Eval("attore") %></span></div>
+              </div>
             </asp:LinkButton>
           </div>
-          <div class="col-4 text-center">
-            <%# Eval("attore") %>
-          </div>
-          <div class="col-4 text-right">
-            <%# Eval("dataRif","{0:ddd dd.MM.yyyy, HH:mm:ss}") %>
-          </div>
-          <div class="col-12 text-left mt-3">
-            <asp:Label runat="server" ID="lblMessage" class="collapse" ClientIDMode="Predictable"><%# Eval("messaggio") %></asp:Label>
+          <div class="col-12 text-left mt-3 collapse" runat="server" id="divMess" clientidmode="Predictable">
+            <asp:Label runat="server" ID="lblMessage"><%# Eval("messaggio") %></asp:Label>
           </div>
         </div>
       </ItemTemplate>
diff --git a/PUB/WebUserContols/mod_ER_detail.ascx b/PUB/WebUserContols/mod_ER_detail.ascx
index 102bf04..b8964fa 100644
--- a/PUB/WebUserContols/mod_ER_detail.ascx
+++ b/PUB/WebUserContols/mod_ER_detail.ascx
@@ -104,7 +104,6 @@
             <div class="col-12 col-sm-6">
               <div class="row">
                 <div class="col-12 small my-3 text-right">
-                  <h5>Registro attività</h5>
                   <uc1:mod_ER_acts runat="server" ID="mod_ER_acts" IdxRichiesta='<%# Eval("IdxRichiesta") %>' />
                 </div>
               </div>