Merge ac719c7 into ebb65c3

Author: edgardavid2015

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>

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"