Skip to content

Commit 4fe8fd8

Browse files
ngalvare10ngalvare10
committed
TT-664 fix bad UX QA
1 parent 6550335 commit 4fe8fd8

File tree

3 files changed

+88
-95
lines changed

3 files changed

+88
-95
lines changed

‎src/app/modules/reports/components/time-entries-table/time-entries-table.component.html‎

Lines changed: 55 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,59 @@
11
<div class="row scroll-table mt-5 ml-0">
22
<app-search-user [users]="users" (selectedUserId)="user($event)"></app-search-user>
3-
4-
5-
<table class="table table-striped mb-0" datatable [dtTrigger]="dtTrigger" [dtOptions]="dtOptions" *ngIf="(reportDataSource$ | async) as dataSource">
6-
<thead class="thead-blue">
7-
<tr class="d-flex">
8-
<th class="hidden-col">ID</th>
9-
<th class="col md-col">User email</th>
10-
<th class="col sm-col">Date</th>
11-
<th class="col sm-col" title="Duration (hours)">Duration</th>
12-
<th class="col x-sm-col" title="Time in">Time in</th>
13-
<th class="col x-sm-col" title="Time out">Time out</th>
14-
<th class="col md-col">Project</th>
15-
<th class="hidden-col">Project ID</th>
16-
<th class="col md-col">Customer</th>
17-
<th class="hidden-col">Customer ID</th>
18-
<th class="col md-col">Activity</th>
19-
<th class="col lg-col">Ticket</th>
20-
<th class="col lg-col">Description</th>
21-
<th class="col lg-col">Technologies</th>
22-
</tr>
23-
</thead>
24-
<app-loading-bar *ngIf="dataSource.isLoading"></app-loading-bar>
25-
<tbody *ngIf="!dataSource.isLoading">
26-
<tr class="d-flex col-height" *ngFor="let entry of dataSource.data">
27-
<td class="hidden-col">{{ entry.id }}</td>
28-
<td class="col md-col">{{ entry.owner_email }}</td>
29-
<td class="col sm-col">
30-
{{ entry.start_date | date: 'MM/dd/yyyy' }}
31-
</td>
32-
<td class="col sm-col">
33-
{{ entry.end_date | substractDate: entry.start_date }}
34-
</td>
35-
<td class="col x-sm-col">{{ dateTimeOffset.parseDateTimeOffset(entry.start_date,entry.timezone_offset) }}</td>
36-
<td class="col x-sm-col">{{ dateTimeOffset.parseDateTimeOffset(entry.end_date , entry.timezone_offset) }}</td>
37-
<td class="col md-col">{{ entry.project_name }}</td>
38-
<td class="hidden-col">{{ entry.project_id }}</td>
39-
<td class="col md-col">{{ entry.customer_name }}</td>
40-
<td class="hidden-col">{{ entry.customer_id }}</td>
41-
<td class="col md-col">{{ entry.activity_name }}</td>
42-
<td class="col lg-col">
43-
<ng-container *ngIf="entry.uri !== null">
44-
<a [class.is-url]="isURL(entry.uri)" (click)="openURLInNewTab(entry.uri)">
45-
{{ entry.uri }}
46-
</a>
47-
</ng-container>
48-
</td>
49-
<td class="col lg-scroll">{{ entry.description }}</td>
50-
<td class="col lg-scroll">
51-
<ng-container *ngIf="entry.technologies.length > 0">
52-
<div *ngFor="let technology of entry.technologies" class="badge bg-secondary text-wrap">
53-
{{ technology }}
54-
</div>
55-
</ng-container>
56-
</td>
57-
</tr>
58-
</tbody>
59-
</table>
60-
3+
<table class="table table-striped mb-0" datatable [dtTrigger]="dtTrigger" [dtOptions]="dtOptions" *ngIf="(reportDataSource$ | async) as dataSource">
4+
<thead class="thead-blue">
5+
<tr class="d-flex">
6+
<th class="hidden-col">ID</th>
7+
<th class="col md-col">User email</th>
8+
<th class="col sm-col">Date</th>
9+
<th class="col sm-col" title="Duration (hours)">Duration</th>
10+
<th class="col x-sm-col" title="Time in">Time in</th>
11+
<th class="col x-sm-col" title="Time out">Time out</th>
12+
<th class="col md-col">Project</th>
13+
<th class="hidden-col">Project ID</th>
14+
<th class="col md-col">Customer</th>
15+
<th class="hidden-col">Customer ID</th>
16+
<th class="col md-col">Activity</th>
17+
<th class="col lg-col">Ticket</th>
18+
<th class="col lg-col">Description</th>
19+
<th class="col lg-col">Technologies</th>
20+
</tr>
21+
</thead>
22+
<app-loading-bar *ngIf="dataSource.isLoading"></app-loading-bar>
23+
<tbody *ngIf="!dataSource.isLoading">
24+
<tr class="d-flex col-height" *ngFor="let entry of dataSource.data">
25+
<td class="hidden-col">{{ entry.id }}</td>
26+
<td class="col md-col">{{ entry.owner_email }}</td>
27+
<td class="col sm-col">
28+
{{ entry.start_date | date: 'MM/dd/yyyy' }}
29+
</td>
30+
<td class="col sm-col">
31+
{{ entry.end_date | substractDate: entry.start_date }}
32+
</td>
33+
<td class="col x-sm-col">{{ dateTimeOffset.parseDateTimeOffset(entry.start_date,entry.timezone_offset) }}</td>
34+
<td class="col x-sm-col">{{ dateTimeOffset.parseDateTimeOffset(entry.end_date , entry.timezone_offset) }}</td>
35+
<td class="col md-col">{{ entry.project_name }}</td>
36+
<td class="hidden-col">{{ entry.project_id }}</td>
37+
<td class="col md-col">{{ entry.customer_name }}</td>
38+
<td class="hidden-col">{{ entry.customer_id }}</td>
39+
<td class="col md-col">{{ entry.activity_name }}</td>
40+
<td class="col lg-col">
41+
<ng-container *ngIf="entry.uri !== null">
42+
<a [class.is-url]="isURL(entry.uri)" (click)="openURLInNewTab(entry.uri)">
43+
{{ entry.uri }}
44+
</a>
45+
</ng-container>
46+
</td>
47+
<td class="col lg-scroll">{{ entry.description }}</td>
48+
<td class="col lg-scroll">
49+
<ng-container *ngIf="entry.technologies.length > 0">
50+
<div *ngFor="let technology of entry.technologies" class="badge bg-secondary text-wrap">
51+
{{ technology }}
52+
</div>
53+
</ng-container>
54+
</td>
55+
</tr>
56+
</tbody>
57+
</table>
6158
</div>
6259
<div class="alert alert-dark mt-3">Total: {{this.resultSum.hours}} hours, {{this.resultSum.minutes}} minutes</div>

‎src/app/modules/reports/components/time-range-form/time-range-form.component.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
required="true"
99
></app-input-date>
1010
</div>
11-
1211
<label class="col-12 col-md-2 col-form-label my-1">End date:</label>
1312
<div class="col-12 col-sm-6 col-md-3 my-1">
1413
<app-input-date
@@ -17,7 +16,6 @@
1716
required="true"
1817
></app-input-date>
1918
</div>
20-
2119
<div class="col-12 col-md-2 my-1">
2220
<button type="submit" class="btn btn-primary">Search</button>
2321
</div>

‎src/app/modules/time-entries/pages/time-entries.component.html‎

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,39 @@
2020
</div>
2121
</div>
2222
<div id="listView" [hidden]="displayGridView">
23-
24-
<table class="table table-sm table-striped mb-0 " datatable [dtTrigger]="dtTrigger" [dtOptions]="dtOptions" *ngIf="(timeEntriesDataSource$ | async) as dataSource">
25-
<caption></caption>
26-
<thead class="thead-blue">
27-
<tr class="d-flex">
28-
<th class="col">Date</th>
29-
<th class="col">Time in - out</th>
30-
<th class="col">Duration</th>
31-
<th class="col">Customer</th>
32-
<th class="col">Project</th>
33-
<th class="col">Activity</th>
34-
<th class="col"></th>
35-
</tr>
36-
</thead>
37-
<app-loading-bar *ngIf="dataSource.isLoading"></app-loading-bar>
38-
<tbody *ngIf="!dataSource.isLoading">
39-
<tr class="d-flex" *ngFor="let entry of dataSource.data">
40-
<td class="col">{{ entry.start_date | date: 'MM/dd/yyyy' }}</td>
41-
<td class="col">{{ dateTimeOffset.parseDateTimeOffset(entry.start_date,entry.timezone_offset) }} - {{ dateTimeOffset.parseDateTimeOffset(entry.end_date,entry.timezone_offset) }}</td>
42-
<td class="col">{{ entry.end_date | substractDate: entry.start_date }}</td>
43-
<td class="col">{{ entry.customer_name }}</td>
44-
<td class="col">{{ entry.project_name }}</td>
45-
<td class="col">{{ entry.activity_name }}</td>
46-
<td class="col">
47-
<button class="btn btn-sm btn-primary" data-toggle="modal" data-target="#editRecordsByDate" (click)="editEntry(entry.id)">
48-
<i class="fa fa-edit fa-xs"></i>
49-
</button>
50-
<button class="btn btn-sm btn-danger ml-2" data-toggle="modal" data-target="#deleteModal" (click)="openModal(entry)">
51-
<i class="fa fa-trash fa-xs"></i>
52-
</button>
53-
</td>
54-
</tr>
55-
</tbody>
56-
</table>
57-
23+
<table class="table table-sm table-striped mb-0 " datatable [dtTrigger]="dtTrigger" [dtOptions]="dtOptions" *ngIf="(timeEntriesDataSource$ | async) as dataSource">
24+
<caption></caption>
25+
<thead class="thead-blue">
26+
<tr class="d-flex">
27+
<th class="col">Date</th>
28+
<th class="col">Time in - out</th>
29+
<th class="col">Duration</th>
30+
<th class="col">Customer</th>
31+
<th class="col">Project</th>
32+
<th class="col">Activity</th>
33+
<th class="col"></th>
34+
</tr>
35+
</thead>
36+
<app-loading-bar *ngIf="dataSource.isLoading"></app-loading-bar>
37+
<tbody *ngIf="!dataSource.isLoading">
38+
<tr class="d-flex" *ngFor="let entry of dataSource.data">
39+
<td class="col">{{ entry.start_date | date: 'MM/dd/yyyy' }}</td>
40+
<td class="col">{{ dateTimeOffset.parseDateTimeOffset(entry.start_date,entry.timezone_offset) }} - {{ dateTimeOffset.parseDateTimeOffset(entry.end_date,entry.timezone_offset) }}</td>
41+
<td class="col">{{ entry.end_date | substractDate: entry.start_date }}</td>
42+
<td class="col">{{ entry.customer_name }}</td>
43+
<td class="col">{{ entry.project_name }}</td>
44+
<td class="col">{{ entry.activity_name }}</td>
45+
<td class="col">
46+
<button class="btn btn-sm btn-primary" data-toggle="modal" data-target="#editRecordsByDate" (click)="editEntry(entry.id)">
47+
<i class="fa fa-edit fa-xs"></i>
48+
</button>
49+
<button class="btn btn-sm btn-danger ml-2" data-toggle="modal" data-target="#deleteModal" (click)="openModal(entry)">
50+
<i class="fa fa-trash fa-xs"></i>
51+
</button>
52+
</td>
53+
</tr>
54+
</tbody>
55+
</table>
5856
</div>
5957
</div>
6058
<div class="modal fade" id="editRecordsByDate" tabindex="-1" role="dialog">

0 commit comments

Comments
 (0)