From 441cd75fe5ecfd861af6894504723eac31cc65d5 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 3 Oct 2019 19:22:44 +0200
Subject: [PATCH] =?UTF-8?q?Continuato=20fix=20attivit=C3=A0...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WebUserControls/mod_commAttivita.ascx     | 171 ++++++++++--------
 1 file changed, 92 insertions(+), 79 deletions(-)

diff --git a/GPW_Smart/WebUserControls/mod_commAttivita.ascx b/GPW_Smart/WebUserControls/mod_commAttivita.ascx
index f0c3901..f852152 100644
--- a/GPW_Smart/WebUserControls/mod_commAttivita.ascx
+++ b/GPW_Smart/WebUserControls/mod_commAttivita.ascx
@@ -4,88 +4,101 @@
 <link href="~/css/Style.css" rel="stylesheet" type="text/css" />
 <% } %>
 
-<div class="row">
-  <div class="col">
-    <asp:TextBox runat="server" ID="txtData" TextMode="Date" OnTextChanged="txtData_TextChanged" />
+<div class="row mt-2 small py-2">
+  <div class="col-4 pr-0">
+    <asp:TextBox runat="server" ID="txtData" TextMode="Date" OnTextChanged="txtData_TextChanged" Width="9em" />
   </div>
-  <div class="col">
-          <asp:LinkButton runat="server" ID="lnkCreateNew" Text="Aggiungi" OnClick="lnkCreateNew_Click" data-icon="plus" data-mini="true" data-iconpos="right" data-role="button" />
+  <div class="col-4 px-1">
+    <asp:LinkButton runat="server" ID="lnkCreateNew" OnClick="lnkCreateNew_Click" CssClass="btn btn-sm btn-success btn-block"><i class="fa fa-plus" aria-hidden="true"></i> Aggiungi</asp:LinkButton>
   </div>
-  <div class="col">
-          <asp:Label runat="server" ID="lblTotOreRA" Style="font-weight: normal; font-size: 12pt;" Text="..." CssClass="ui-li-count"
-            ToolTip="Ore caricate a commessa / ore lavorate da timbrature" />
+  <div class="col-4 pl-0">
+    <asp:Label runat="server" ID="lblTotOreRA" Style="font-weight: normal; font-size: 12pt;" Text="..." CssClass="ui-li-count"
+      ToolTip="Ore caricate a commessa / ore lavorate da timbrature" />
   </div>
 </div>
+<div class="row mb-5">
+  <div class="col">
+    <ul class="list-group">
+      <asp:Repeater ID="repRegAtt" runat="server" DataSourceID="odsRegAtt">
+        <ItemTemplate>
+          <li class="list-group-item px-1">
+            <asp:LinkButton runat="server" ID="lnkEdit" OnClick="lnkEdit_Click" CommandArgument='<%# Eval("idxRA") %>'>
+              <div class="d-flex">
+                <div class="px-2 py-0 flex-grow-1">
+                  <div class="d-flex font-weight-bold">
+                    <div class="px-1 flex-fill">
+                      <asp:Label ID="lblCli" runat="server" Style="font-size: 10pt;" Text='<%# cliByIdxFase(Eval("idxFase")) %>' ForeColor="#6988AA" />
+                    </div>
+                    <div class="px-1 flex-fill text-right">
+                      <asp:Label ID="lblPrj" runat="server" Style="font-size: 10pt;" Text='<%# prjByIdxFase(Eval("idxFase")) %>' />
+                    </div>
+                  </div>
+                  <div class="d-flex small">
+                    <div class="px-1 flex-grow-1">
+                      <asp:Label ID="lblFase" runat="server" Text='<%# faseByIdx(Eval("idxFase")) %>' CssClass="text-dark" />
+                    </div>
+                    <div class="px-1 text-right">
+                      <asp:Label ID="inizioLabel" runat="server" Text='<%# Eval("inizio","{0:HH:mm}") %>' CssClass="text-dark" />&nbsp;-&nbsp;<asp:Label ID="fineLabel" runat="server" Text='<%# Eval("fine","{0:HH:mm}") %>' CssClass="text-dark" />
+                    </div>
+                  </div>
+                  <div class="d-flex small">
+                    <div class="px-1 flex-fill small">
+                      <asp:Label ID="descrizioneLabel" runat="server" Text='<%# Eval("descrizione") %>' />
+                    </div>
+                  </div>
 
-<div class="elTimbSmart" style="padding: 0 15px;">
-  <ul data-role="listview" data-inset="false" data-theme="d" data-divider-theme="b">
-    <%--<li data-role="list-divider">
-      <asp:Panel runat="server" data-role="popup" ID="popupBasic" ClientIDMode="Static">
-        <p>
-          <asp:Calendar runat="server" ID="calDataRif" OnSelectionChanged="calDataRif_SelectionChanged" />
-          <p>
-      </asp:Panel>
-      <div class="ui-grid-b">
-        <div class="ui-block-a">
-          <a href="#popupBasic" data-rel="popup" data-role="button" data-mini="true">
-            <asp:Label runat="server" ID="lblDataRif" /></a>
-        </div>
-        <div class="ui-block-b">
-        </div>
-        <div class="ui-block-c">
-        </div>
-      </div>
-    </li>--%>
-    <asp:Repeater ID="repRegAtt" runat="server" DataSourceID="odsRegAtt">
-      <ItemTemplate>
-        <li>
-          <asp:LinkButton runat="server" ID="lnkEdit" OnClick="lnkEdit_Click" CommandArgument='<%# Eval("idxRA") %>'>
-            <p>
-              <b>
-                <asp:Label ID="lblCli" runat="server" Style="font-size: 10pt;" Text='<%# cliByIdxFase(Eval("idxFase")) %>' ForeColor="#6988AA" />&nbsp;-&nbsp;
-                            <asp:Label ID="lblPrj" runat="server" Style="font-size: 10pt;" Text='<%# prjByIdxFase(Eval("idxFase")) %>' /></b>
-            </p>
-            <div class="ui-li-count">
-              <asp:Label ID="inizioLabel" runat="server" Text='<%# Eval("inizio","{0:HH:mm}") %>' />&nbsp;-&nbsp;<asp:Label ID="fineLabel" runat="server" Text='<%# Eval("fine","{0:HH:mm}") %>' />
-            </div>
-            <p>
-              <asp:Label ID="lblFase" runat="server" Text='<%# faseByIdx(Eval("idxFase")) %>' ForeColor="#696969" />
-            </p>
-            <p>
-              <asp:Label ID="descrizioneLabel" runat="server" Text='<%# Eval("descrizione") %>' />
-            </p>
-          </asp:LinkButton><asp:LinkButton runat="server" ID="lnkClona" OnClick="lnkClona_Click" CommandArgument='<%# Eval("idxRA") %>' data-icon="plus"
-            Text="Duplica" />
-        </li>
-      </ItemTemplate>
-      <AlternatingItemTemplate>
-        <li style="background-color: #EAEAEA;">
-          <asp:LinkButton runat="server" ID="lnkEdit" OnClick="lnkEdit_Click" CommandArgument='<%# Eval("idxRA") %>'>
-            <p>
-              <b>
-                <asp:Label ID="lblCli" runat="server" Style="font-size: 10pt;" Text='<%# cliByIdxFase(Eval("idxFase")) %>' ForeColor="#6988AA" />&nbsp;-&nbsp;
-                            <asp:Label ID="lblPrj" runat="server" Style="font-size: 10pt;" Text='<%# prjByIdxFase(Eval("idxFase")) %>' /></b>
-            </p>
-            <div class="ui-li-count">
-              <asp:Label ID="inizioLabel" runat="server" Text='<%# Eval("inizio","{0:HH:mm}") %>' />&nbsp;-&nbsp;<asp:Label ID="fineLabel" runat="server" Text='<%# Eval("fine","{0:HH:mm}") %>' />
-            </div>
-            <p>
-              <asp:Label ID="lblFase" runat="server" Text='<%# faseByIdx(Eval("idxFase")) %>' ForeColor="#696969" />
-            </p>
-            <p>
-              <asp:Label ID="descrizioneLabel" runat="server" Text='<%# Eval("descrizione") %>' />
-            </p>
-          </asp:LinkButton><asp:LinkButton runat="server" ID="lnkCLona" OnClick="lnkEdit_Click" CommandArgument='<%# Eval("idxRA") %>' data-icon="plus" Text="Duplica" />
-        </li>
-      </AlternatingItemTemplate>
-    </asp:Repeater>
-    <asp:ObjectDataSource ID="odsRegAtt" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByDipData"
-      TypeName="GPW_data.DS_ApplicazioneTableAdapters.RegAttivitaTableAdapter">
-      <SelectParameters>
-        <asp:SessionParameter DefaultValue="1" Name="idxDipendente" SessionField="idxDipendente" Type="Int32" />
-        <asp:SessionParameter Name="dataFrom" SessionField="dataFromRA" Type="DateTime" />
-        <asp:SessionParameter Name="dataTo" SessionField="dataToRA" Type="DateTime" />
-      </SelectParameters>
-    </asp:ObjectDataSource>
-  </ul>
+                </div>
+                <div class="px-2 py-0">
+                  <asp:LinkButton runat="server" ID="lnkClona" OnClick="lnkClona_Click" CommandArgument='<%# Eval("idxRA") %>' css="btn btn-info btn-sm"><i class="fa fa-magic" aria-hidden="true"></i></asp:LinkButton>
+                </div>
+              </div>
+            </asp:LinkButton>
+          </li>
+        </ItemTemplate>
+        <AlternatingItemTemplate>
+          <li class="list-group-item list-group-item-secondary">
+            <asp:LinkButton runat="server" ID="lnkEdit" OnClick="lnkEdit_Click" CommandArgument='<%# Eval("idxRA") %>'>
+              <div class="d-flex">
+                <div class="px-2 py-0 flex-grow-1">
+                  <div class="d-flex font-weight-bold">
+                    <div class="px-1 flex-fill">
+                      <asp:Label ID="lblCli" runat="server" Style="font-size: 10pt;" Text='<%# cliByIdxFase(Eval("idxFase")) %>' ForeColor="#6988AA" />
+                    </div>
+                    <div class="px-1 flex-fill text-right">
+                      <asp:Label ID="lblPrj" runat="server" Style="font-size: 10pt;" Text='<%# prjByIdxFase(Eval("idxFase")) %>' />
+                    </div>
+                  </div>
+                  <div class="d-flex small">
+                    <div class="px-1 flex-grow-1">
+                      <asp:Label ID="lblFase" runat="server" Text='<%# faseByIdx(Eval("idxFase")) %>' CssClass="text-dark" />
+                    </div>
+                    <div class="px-1 text-right">
+                      <asp:Label ID="inizioLabel" runat="server" Text='<%# Eval("inizio","{0:HH:mm}") %>' CssClass="text-dark" />&nbsp;-&nbsp;<asp:Label ID="fineLabel" runat="server" Text='<%# Eval("fine","{0:HH:mm}") %>' CssClass="text-dark" />
+                    </div>
+                  </div>
+                  <div class="d-flex small">
+                    <div class="px-1 flex-fill small">
+                      <asp:Label ID="descrizioneLabel" runat="server" Text='<%# Eval("descrizione") %>' />
+                    </div>
+                  </div>
+
+                </div>
+                <div class="px-2 py-0">
+                  <asp:LinkButton runat="server" ID="lnkClona" OnClick="lnkClona_Click" CommandArgument='<%# Eval("idxRA") %>' css="btn btn-info btn-sm"><i class="fa fa-magic" aria-hidden="true"></i></asp:LinkButton>
+                </div>
+              </div>
+            </asp:LinkButton>
+          </li>
+        </AlternatingItemTemplate>
+      </asp:Repeater>
+      <asp:ObjectDataSource ID="odsRegAtt" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByDipData"
+        TypeName="GPW_data.DS_ApplicazioneTableAdapters.RegAttivitaTableAdapter">
+        <SelectParameters>
+          <asp:SessionParameter DefaultValue="1" Name="idxDipendente" SessionField="idxDipendente" Type="Int32" />
+          <asp:SessionParameter Name="dataFrom" SessionField="dataFromRA" Type="DateTime" />
+          <asp:SessionParameter Name="dataTo" SessionField="dataToRA" Type="DateTime" />
+        </SelectParameters>
+      </asp:ObjectDataSource>
+    </ul>
+  </div>
 </div>