From dd92ce4d75f994628a295354657d5b75851011bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edgar=20David=20Guam=C3=A1n?=
 <edgardavid2015@users.noreply.github.com>
Date: Tue, 24 Aug 2021 13:07:06 -0500
Subject: [PATCH 1/3] style: TT-320 Improve customers and users tables (#737)

Co-authored-by: Edgar Guaman <edgar.guaman@ioet.com>
---
 .../time-entries-table/time-entries-table.component.html      | 4 ++--
 .../users/components/users-list/users-list.component.html     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html
index ee771bcb7..fee2f96b6 100644
--- a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html
+++ b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html
@@ -10,7 +10,7 @@
         <th class="hidden-col">ID</th>
         <th class="col md-col">User email</th>
         <th class="col sm-col">Date</th>
-        <th class="col x-sm-col" title="Duration (hours)">Duration (hours)</th>
+        <th class="col sm-col" title="Duration (hours)">Duration</th>
         <th class="col x-sm-col" title="Time in">Time in</th>
         <th class="col x-sm-col" title="Time out">Time out</th>
         <th class="col md-col">Project</th>
@@ -31,7 +31,7 @@
         <td class="col sm-col">
           {{ entry.start_date | date: 'MM/dd/yyyy' }}
         </td>
-        <td class="col x-sm-col">
+        <td class="col sm-col">
           {{ entry.end_date | substractDate: entry.start_date }}
         </td>
         <td class="col x-sm-col">{{ entry.start_date | date: 'HH:mm' }}</td>
diff --git a/src/app/modules/users/components/users-list/users-list.component.html b/src/app/modules/users/components/users-list/users-list.component.html
index 517d4271f..c91ec16f4 100644
--- a/src/app/modules/users/components/users-list/users-list.component.html
+++ b/src/app/modules/users/components/users-list/users-list.component.html
@@ -7,16 +7,16 @@
     [dtOptions]="dtOptions">
     <thead class="thead-blue">
       <tr class="d-flex flex-wrap">
-        <th class="col-4">User Email</th>
         <th class="col-5">Names</th>
+        <th class="col-4">User Email</th>
         <th class="col-3">Groups</th>
       </tr>
     </thead>
     <app-loading-bar *ngIf="isLoading$ | async"></app-loading-bar>
     <tbody>
       <tr class="d-flex flex-wrap" *ngFor="let user of users">
-        <td class="col-4 text-break">{{ user.email }}</td>
         <td class="col-5 text-break">{{ user.name }}</td>
+        <td class="col-4 text-break">{{ user.email }}</td>
         <td class="col-3 text-center">
           <ui-switch
             size="small"

From 3fe8fecc19f0e6a19ef07a931ad11af83a055454 Mon Sep 17 00:00:00 2001
From: jcalarcon98 <jeancalarcon98@gmail.com>
Date: Mon, 23 Aug 2021 17:31:20 -0500
Subject: [PATCH 2/3] feat: TT-321 Improve modal interface

---
 .../details-fields/details-fields.component.html    |  2 +-
 .../time-entries/pages/time-entries.component.html  | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.html b/src/app/modules/shared/components/details-fields/details-fields.component.html
index 3c9c1839a..30fc74870 100644
--- a/src/app/modules/shared/components/details-fields/details-fields.component.html
+++ b/src/app/modules/shared/components/details-fields/details-fields.component.html
@@ -173,6 +173,6 @@
   </div>
   <div class="modal-footer">
     <button type="submit" class="btn btn-primary">Save</button>
-    <button #closeModal type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+    <button #closeModal type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
   </div>
 </form>
diff --git a/src/app/modules/time-entries/pages/time-entries.component.html b/src/app/modules/time-entries/pages/time-entries.component.html
index ac2060ef3..bede2cf1f 100644
--- a/src/app/modules/time-entries/pages/time-entries.component.html
+++ b/src/app/modules/time-entries/pages/time-entries.component.html
@@ -96,11 +96,16 @@
 <div class="modal fade" id="editRecordsByDate" tabindex="-1" role="dialog">
   <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
     <div class="modal-content" cdkDrag (cdkDragEnded)="resetDraggablePosition($event)">
-      <div class="modal-header" cdkDragHandle>
+      <div class="modal-header">
         <h5 class="modal-title">{{ entryId ? 'Edit Entry' : 'New Entry' }}</h5>
-        <button type="button" class="btn" (click)="detailsFields.cleanFieldsForm()">
-          <i class="fa fa-undo" aria-hidden="true"></i>
-        </button>
+        <div>
+          <button class="btn shadow-none"  data-bs-toggle="tooltip" title="Clean form values"  (click)="detailsFields.cleanFieldsForm()">
+            <i class="fa fa-eraser"></i>
+          </button>
+          <button class="btn shadow-none"  data-bs-toggle="tooltip" title="Drag modal" cdkDragHandle>
+            <i class="fa fa-grip-vertical"></i>
+          </button>
+        </div>
       </div>
       <div class="modal-body">
         <app-details-fields

From fe57269e94f9229a56d1fcb7e0ebc50daa67e97a Mon Sep 17 00:00:00 2001
From: jcalarcon98 <jeancalarcon98@gmail.com>
Date: Mon, 23 Aug 2021 17:48:15 -0500
Subject: [PATCH 3/3] code-smell: TT-321 Fix code smells provided by sonarcloud

---
 .../modules/time-entries/pages/time-entries.component.html  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/modules/time-entries/pages/time-entries.component.html b/src/app/modules/time-entries/pages/time-entries.component.html
index bede2cf1f..17aecac39 100644
--- a/src/app/modules/time-entries/pages/time-entries.component.html
+++ b/src/app/modules/time-entries/pages/time-entries.component.html
@@ -99,11 +99,11 @@
       <div class="modal-header">
         <h5 class="modal-title">{{ entryId ? 'Edit Entry' : 'New Entry' }}</h5>
         <div>
-          <button class="btn shadow-none"  data-bs-toggle="tooltip" title="Clean form values"  (click)="detailsFields.cleanFieldsForm()">
-            <i class="fa fa-eraser"></i>
+          <button class="btn shadow-none"  data-bs-toggle="tooltip" title="Clean form values" (click)="detailsFields.cleanFieldsForm()">
+            <em class="fa fa-eraser"> </em>
           </button>
           <button class="btn shadow-none"  data-bs-toggle="tooltip" title="Drag modal" cdkDragHandle>
-            <i class="fa fa-grip-vertical"></i>
+            <em class="fa fa-grip-vertical"></em>
           </button>
         </div>
       </div>