Skip to content

Commit af8270a

Browse files
jr-98jr-98
committed
fix: TT-144 Problem-with-data-loading-bar-corrected
1 parent 06a7dfe commit af8270a

File tree

4 files changed

+58
-61
lines changed

4 files changed

+58
-61
lines changed

‎src/app/modules/activities-management/components/activity-list/activity-list.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="activity-list">
2-
<table class="table table-responsive-sm table-bordered table-striped">
2+
<table class="table table-sm table-bordered table-striped">
33
<thead class="thead-blue">
44
<tr class="d-flex">
55
<th class="col-4 text-center">Activity ID</th>

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

Lines changed: 51 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,54 @@
11
<div class="row mt-5">
2-
<div class="table-responsive-sm">
3-
<table
4-
class="table table-sm table-striped mb-0"
5-
datatable
6-
[dtTrigger]="dtTrigger"
7-
[dtOptions]="dtOptions"
8-
*ngIf="(reportDataSource$ | async) as dataSource"
9-
>
10-
<thead class="thead-blue">
11-
<tr class="d-flex">
12-
<th class="hidden-col" >ID</th>
13-
<th class="col md-col">User email</th>
14-
<th class="col sm-col">Date</th>
15-
<th class="col x-sm-col" title="Duration (hours)">Duration (hours)</th>
16-
<th class="col x-sm-col" title="Time in">Time in</th>
17-
<th class="col x-sm-col" title="Time out">Time out</th>
18-
<th class="col md-col">Project</th>
19-
<th class="hidden-col">Project ID</th>
20-
<th class="col md-col">Customer</th>
21-
<th class="hidden-col">Customer ID</th>
22-
<th class="col md-col">Activity</th>
23-
<th class="col lg-col">Ticket</th>
24-
<th class="col lg-col">Description</th>
25-
<th class="col lg-col">Technologies</th>
26-
</tr>
27-
</thead>
28-
<app-loading-bar
29-
*ngIf="dataSource.isLoading"
30-
></app-loading-bar>
31-
<tbody *ngIf="!dataSource.isLoading">
32-
<tr
33-
class="d-flex"
34-
*ngFor="let entry of dataSource.data"
35-
>
36-
<td class="hidden-col">{{ entry.id }}</td>
37-
<td class="col md-col">{{ entry.owner_email }}</td>
38-
<td class="col sm-col">
39-
{{ entry.start_date | date: 'MM/dd/yyyy' }}
40-
</td>
41-
<td class="col x-sm-col">
42-
{{ entry.end_date | substractDate: entry.start_date }}
43-
</td>
44-
<td class="col x-sm-col">{{ entry.start_date | date: 'HH:mm' }}</td>
45-
<td class="col x-sm-col">{{ entry.end_date | date: 'HH:mm' }}</td>
46-
<td class="col md-col">{{ entry.project_name }}</td>
47-
<td class="hidden-col">{{ entry.project_id }}</td>
48-
<td class="col md-col">{{ entry.customer_name }}</td>
49-
<td class="hidden-col">{{ entry.customer_id }}</td>
50-
<td class="col md-col">{{ entry.activity_name }}</td>
51-
<td class="col lg-col">{{ entry.uri }}</td>
52-
<td class="col lg-col">{{ entry.description }}</td>
53-
<td class="col lg-col">{{ entry.technologies }}</td>
54-
</tr>
55-
</tbody>
56-
</table>
2+
<div>
3+
<div class="table-responsive">
4+
<table
5+
class="table table-sm table-striped mb-0"
6+
datatable
7+
[dtTrigger]="dtTrigger"
8+
[dtOptions]="dtOptions"
9+
*ngIf="(reportDataSource$ | async) as dataSource">
10+
<thead class="thead-blue">
11+
<tr class="d-flex">
12+
<th class="hidden-col">ID</th>
13+
<th class="col md-col">User email</th>
14+
<th class="col sm-col">Date</th>
15+
<th class="col x-sm-col" title="Duration (hours)">Duration (hours)</th>
16+
<th class="col x-sm-col" title="Time in">Time in</th>
17+
<th class="col x-sm-col" title="Time out">Time out</th>
18+
<th class="col md-col">Project</th>
19+
<th class="hidden-col">Project ID</th>
20+
<th class="col md-col">Customer</th>
21+
<th class="hidden-col">Customer ID</th>
22+
<th class="col md-col">Activity</th>
23+
<th class="col lg-col">Ticket</th>
24+
<th class="col lg-col">Description</th>
25+
<th class="col lg-col">Technologies</th>
26+
</tr>
27+
</thead>
28+
<app-loading-bar *ngIf="dataSource.isLoading"></app-loading-bar>
29+
<tbody *ngIf="!dataSource.isLoading">
30+
<tr class="d-flex" *ngFor="let entry of dataSource.data">
31+
<td class="hidden-col">{{ entry.id }}</td>
32+
<td class="col md-col">{{ entry.owner_email }}</td>
33+
<td class="col sm-col">
34+
{{ entry.start_date | date: 'MM/dd/yyyy' }}
35+
</td>
36+
<td class="col x-sm-col">
37+
{{ entry.end_date | substractDate: entry.start_date }}
38+
</td>
39+
<td class="col x-sm-col">{{ entry.start_date | date: 'HH:mm' }}</td>
40+
<td class="col x-sm-col">{{ entry.end_date | date: 'HH:mm' }}</td>
41+
<td class="col md-col">{{ entry.project_name }}</td>
42+
<td class="hidden-col">{{ entry.project_id }}</td>
43+
<td class="col md-col">{{ entry.customer_name }}</td>
44+
<td class="hidden-col">{{ entry.customer_id }}</td>
45+
<td class="col md-col">{{ entry.activity_name }}</td>
46+
<td class="col lg-col">{{ entry.uri }}</td>
47+
<td class="col lg-col">{{ entry.description }}</td>
48+
<td class="col lg-col">{{ entry.technologies }}</td>
49+
</tr>
50+
</tbody>
51+
</table>
52+
</div>
5753
</div>
5854
</div>

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@
2626
.hidden-col{
2727
display: none;
2828
}
29-
.table.dataTable th,
30-
.table.dataTable td {
31-
box-sizing: border-box;
32-
width: auto;
29+
.table {
30+
overflow-x: auto;
31+
}
32+
.row{
33+
width: 100%;
34+
display: grid;
3335
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { getReportDataSource } from '../../../time-clock/store/entry.selectors';
1818
export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewInit {
1919
dtOptions: any = {
2020
scrollY: '590px',
21-
scrollX: '500px',
2221
paging: false,
2322
dom: 'Bfrtip',
2423
buttons: [

0 commit comments

Comments
 (0)