From 286bea1c0ad0208a0e4ec1f348a7fecb0364d0d7 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 10 Aug 2018 20:24:35 +0200
Subject: [PATCH] Fix grafico elenco interventi...

---
 Jenkinsfile                          |   2 +-
 PUB/WebUserContols/mod_ER_doAct.ascx |   3 -
 PUB/WebUserContols/mod_ER_grid.ascx  | 146 ++++++++++-----------------
 3 files changed, 54 insertions(+), 97 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ac0c9e6..7b76434 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=161']) {
+        withEnv(['NEXT_BUILD_NUMBER=163']) {
           // env.versionNumber = VersionNumber(versionNumberString : '1.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '1.0.${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_doAct.ascx b/PUB/WebUserContols/mod_ER_doAct.ascx
index 5a32647..428bf0c 100644
--- a/PUB/WebUserContols/mod_ER_doAct.ascx
+++ b/PUB/WebUserContols/mod_ER_doAct.ascx
@@ -21,9 +21,6 @@
   <div class="col my-1">
     <asp:LinkButton runat="server" ID="lbtMessaggio" CssClass="btn btn-sm btn-success btn-block" OnClick="lbtMessaggio_Click"><i class="fas fa-pencil-alt"></i> Modifica Messaggio</asp:LinkButton>
   </div>  
-  <%--<div class="col my-1">
-    <asp:LinkButton runat="server" ID="lbtConfPag" CssClass="btn btn-sm btn-success btn-block" OnClick="lbtConfPag_Click"><i class="far fa-thumbs-up"></i> Conferma Pagamento</asp:LinkButton>
-  </div>--%>   
   <div class="col my-1">
     <asp:LinkButton runat="server" ID="lbtNota01" CssClass="btn btn-sm btn-success btn-block" OnClick="lbtNota_Click"><i class="fas fa-plus"></i> Aggiungi Nota</asp:LinkButton>
   </div>
diff --git a/PUB/WebUserContols/mod_ER_grid.ascx b/PUB/WebUserContols/mod_ER_grid.ascx
index 4e1f034..09d50c4 100644
--- a/PUB/WebUserContols/mod_ER_grid.ascx
+++ b/PUB/WebUserContols/mod_ER_grid.ascx
@@ -11,102 +11,62 @@
   <EmptyDataTemplate>
     Nessun record trovato    
   </EmptyDataTemplate>
-  <Columns>
-    <%--<asp:TemplateField>
-      <HeaderTemplate>
-        <asp:LinkButton ID="lbtReset" runat="server" CausesValidation="False" OnClick="lbtReset_Click"><i class="fa fa-sync-alt"></i></asp:LinkButton>
-      </HeaderTemplate>
-      <ItemTemplate>
-        <asp:LinkButton ID="lbtSel" runat="server" CausesValidation="False" CommandName="Select"><i class="fa fa-search"></i></asp:LinkButton>
-        <asp:LinkButton ID="lbtEdit" runat="server" CausesValidation="False" CommandName="Edit"><i class="fa fa-edit"></i></asp:LinkButton>
-      </ItemTemplate>
-      <EditItemTemplate>
-        <asp:LinkButton ID="lbtUpdate" runat="server" CausesValidation="False" CommandName="Update"><i class="fa fa-check text-success"></i></asp:LinkButton>
-        <asp:LinkButton ID="lbtCancel" runat="server" CausesValidation="False" CommandName="Cancel"><i class="fa fa-ban text-danger"></i></asp:LinkButton>
-      </EditItemTemplate>
-    </asp:TemplateField>--%>
-    <asp:TemplateField HeaderText="Richiesta" SortExpression="dataRich">
-      <ItemTemplate>
-        <div class="d-flex text-info">
-          <div class="p-2 flex-grow-1 text-info">
-            <asp:LinkButton runat="server" ID="lbtSelCond" OnClick="lbtSelCond_Click" CausesValidation="False" CommandArgument='<%# Eval("idxCond") %>'> 
-              <i class="far fa-building"></i>
-            </asp:LinkButton>
-            <asp:Label ID="Label5" runat="server" Text='<%# Eval("nom_cond") %>' />
-          </div>
-          <div class="p-2 flex-grow-1 text-info">
-            <asp:Label ID="Label3" runat="server" Text='<%# Eval("dataRich","{0:ddd dd.MM.yyyy}") %>' />,
-            <asp:Label ID="Label4" runat="server" Text='<%# Eval("dataRich","{0:HH:mm:ss}") %>' />
-          </div>
-          <div class="p-2 text-warning">
-            <asp:Label ID="Label6" runat="server" Text='<%# Eval("cod_fornitore") %>' />
-            <i class="fas fa-industry"></i>
-          </div>
-        </div>
-        <div class="d-flex small">
-          <div class="p-2 flex-grow-1 text-secondary">
-            <i class="fas fa-phone"></i>
-            <asp:Label ID="Label9" runat="server" Text='<%# Eval("telContatto") %>' />
-            (<asp:Label ID="Label7" runat="server" Text='<%# Eval("genContatto") %>' />)     
-          </div>
-          <div class="p-2 flex-grow-1 text-primary text-center">
-            Num Attività (completare)
-          </div>
-          <div class="p-2 text-secondary">
-            <asp:Label ID="Label8" runat="server" Text='<%# Eval("collaboratore") %>' />
-            <i class="far fa-user"></i>
-          </div>
-        </div>
-        <div class="d-flex small">
-          <div class="p-2 flex-grow-1">
-            <i class="far fa-bell"></i>
-            <asp:Label ID="lblFullText" runat="server" CssClass="small" Text='<%# Eval("messaggio") %>' />
-          </div>
-          <div class="p-2 text-warning">
-            <asp:Label ID="lblNote" runat="server" CssClass="small" Text='<%# Eval("note") %>' />
-            <i class="far fa-comment"></i>
-          </div>
-        </div>
-      </ItemTemplate>
-      <EditItemTemplate>
-        <div class="row">
-          <div class="col-6 text-info">
-            <i class="far fa-building"></i>
-            <asp:Label ID="Label5" runat="server" Text='<%# Eval("nom_cond") %>' />
-          </div>
-          <div class="col-6 text-right text-warning">
-            <asp:Label ID="Label6" runat="server" Text='<%# Eval("cod_fornitore") %>' />
-            <i class="fas fa-industry"></i>
-          </div>
-          <div class="col-6 text-secondary small">
-            <i class="fas fa-phone"></i>
-            <asp:Label ID="Label9" runat="server" Text='<%# Eval("telContatto") %>' />
-            (<asp:Label ID="Label7" runat="server" Text='<%# Eval("genContatto") %>' />)
-          </div>
-          <div class="col-6 text-secondary text-right small">
-            <asp:Label ID="Label8" runat="server" Text='<%# Eval("collaboratore") %>' />
-            <i class="far fa-user"></i>
-          </div>
-          <div class="col-12 small">
-            <i class="far fa-bell"></i>Messaggio
-            <asp:TextBox ID="txtMessaggio" runat="server" CssClass="form-control" Width="100%" Text='<%# Bind("messaggio") %>' Height="10em" TextMode="MultiLine" />
-          </div>
-          <div class="col-12 text-warning small">
-            <i class="far fa-comment"></i>Note
-            <asp:TextBox ID="txtNote" runat="server" CssClass="form-control" Text='<%# Bind("note") %>' Height="5em" TextMode="MultiLine" />
-          </div>
-        </div>
-      </EditItemTemplate>
-    </asp:TemplateField>
+  <Columns>                   
     <asp:TemplateField HeaderText="Stato" SortExpression="idxStato">
       <ItemTemplate>
         <div class="text-center">
-          <i class='<%# Eval("cssStato") %>'></i>
-          <br />
-          <asp:Label ID="Label1" runat="server" Text='<%# Eval("stato") %>'></asp:Label>
-          <br />
-          <asp:Label CssClass='<%# getCssScad(Eval("dataScad")) %>' ID="Label2" runat="server" ToolTip='<%# Eval("dataScad","Risposta entro {0:dd.MM.yyyy HH:mm}") %>'>Urg: <b><%# Eval("idxPriorita") %></b></asp:Label>
-          <asp:LinkButton runat="server" ID="lbtRiprogramma" CausesValidation="false" Visible='<%# isScad(Eval("dataScad")) %>' CssClass="btn btn-danger btn-sm btn-block" CommandName="Select" CommandArgument="ShowDetail"><i class="fa fa-wrench"></i></asp:LinkButton>
+          <asp:LinkButton runat="server" ID="lbtShowDet" CausesValidation="false" CssClass="btn btn-outline-dark btn-sm btn-block" CommandName="Select" CommandArgument="ShowDetail" ToolTip="Mostra dettaglio">
+            <div>
+              <i class='<%# Eval("cssStato") %>'></i>
+            </div>
+            <div class="text-uppercase">
+              <asp:Label ID="Label1" CssClass="text-truncate" runat="server" Text='<%# Eval("stato") %>'></asp:Label>
+            </div>
+            <asp:Label CssClass='<%# getCssScad(Eval("dataScad")) %>' ID="Label2" runat="server" ToolTip='<%# Eval("dataScad","Risposta entro {0:dd.MM.yyyy HH:mm}") %>'>Urg: <b><%# Eval("idxPriorita") %></b></asp:Label>
+          </asp:LinkButton>
+        </div>
+      </ItemTemplate>
+    </asp:TemplateField>
+    <asp:TemplateField HeaderText="Richiesta" SortExpression="dataRich">
+      <ItemTemplate>
+        <div class="row">
+          <div class="col-12 col-sm-4">
+            <asp:LinkButton runat="server" ID="lbtSelCond" OnClick="lbtSelCond_Click" CausesValidation="False" CommandArgument='<%# Eval("idxCond") %>' CssClass="btn btn-sm btn-outline-dark">
+              <i class="far fa-building"></i>
+              <asp:Label ID="Label5" runat="server" Text='<%# Eval("nom_cond") %>' />
+            </asp:LinkButton>
+          </div>
+          <div class="col-12 col-sm-4">
+            <asp:Label ID="Label3" runat="server" Text='<%# Eval("dataRich","{0:ddd dd.MM.yy HH:mm:ss}") %>' />
+          </div>
+          <div class="col-12 col-sm-4 text-warning text-sm-right">
+            <asp:Label ID="Label6" runat="server" Text='<%# Eval("cod_fornitore") %>' />
+            <i class="fas fa-industry"></i>
+          </div>
+        </div>
+        <div class="row text-info">
+          <div class="col-12 col-sm-4">
+            <i class="fas fa-phone"></i>
+            <asp:Label ID="Label9" runat="server" Text='<%# Eval("telContatto") %>' />
+            (<asp:Label ID="Label7" runat="server" Text='<%# Eval("genContatto") %>' />)  
+          </div>
+          <div class="col-12 col-sm-4">
+            Num Attività (completare)
+          </div>
+          <div class="col-12 col-sm-4 text-sm-right">
+            <asp:Label ID="Label8" runat="server" Text='<%# Eval("collaboratore") %>' />
+            <i class="far fa-user"></i>
+          </div>
+        </div>
+        <div class="row text-secondary small">
+          <div class="col-12 col-sm-6">
+            <i class="far fa-bell"></i>
+            <asp:Label ID="lblFullText" runat="server" CssClass="small" Text='<%# Eval("messaggio") %>' />
+          </div>
+          <div class="col-12 col-sm-6">
+            <asp:Label ID="lblNote" runat="server" CssClass="small" Text='<%# Eval("note") %>' />
+            <i class="far fa-comment"></i>
+          </div>
         </div>
       </ItemTemplate>
     </asp:TemplateField>