Skip to content

TT-664 fix bad UX #872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

TT-664 fix bad UX #872

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dd90c81
TT-664 fix bad UX
ngalvare10 May 19, 2022
1874f43
TT-664 fix bad UX console log
ngalvare10 May 19, 2022
5a19ec4
TT-664 fix bad UX review
ngalvare10 May 19, 2022
4b9c606
TT-664 fix bad UX review
ngalvare10 May 19, 2022
ce73ef8
TT-664 fix bad UX review
ngalvare10 May 19, 2022
30e3d22
TT-664 fix bad UX review
ngalvare10 May 24, 2022
6550335
TT-664 fix bad UX QA
ngalvare10 May 26, 2022
4fe8fd8
TT-664 fix bad UX QA
ngalvare10 May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
TT-664 fix bad UX QA
  • Loading branch information
@ngalvare10
ngalvare10 committed May 26, 2022
commit 6550335c20d8bcdcbde514f8e8ee2f1905f8b536
4 changes: 2 additions & 2 deletions src/app/modules/reports/components/time-entries-table/time-entries-table.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="row scroll-table mt-5 ml-0">
<app-search-user [users]="users" (selectedUserId)="user($event)"></app-search-user>

<div class="table-responsive">

<table class="table table-striped mb-0" datatable [dtTrigger]="dtTrigger" [dtOptions]="dtOptions" *ngIf="(reportDataSource$ | async) as dataSource">
<thead class="thead-blue">
<tr class="d-flex">
Expand Down Expand Up @@ -57,6 +57,6 @@
</tr>
</tbody>
</table>
</div>

</div>
<div class="alert alert-dark mt-3">Total: {{this.resultSum.hours}} hours, {{this.resultSum.minutes}} minutes</div>
3 changes: 0 additions & 3 deletions src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn
selectOptionNames = [15, 30, 50, 100, 'All'];
users: User[] = [];
dtOptions: any = {
scrollY: '590px',
sScrollX: '100%',
bScrollCollapse: true,
dom: '<"d-flex justify-content-between"B<"d-flex"<"mr-5"l>f>>rtip',
pageLength: 30,
lengthMenu: [this.selectOptionValues, this.selectOptionNames],
buttons: [
Expand Down
4 changes: 2 additions & 2 deletions src/app/modules/time-entries/pages/time-entries.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</div>
</div>
<div id="listView" [hidden]="displayGridView">
<div class="table-responsive">

<table class="table table-sm table-striped mb-0 " datatable [dtTrigger]="dtTrigger" [dtOptions]="dtOptions" *ngIf="(timeEntriesDataSource$ | async) as dataSource">
<caption></caption>
<thead class="thead-blue">
Expand Down Expand Up @@ -54,7 +54,7 @@
</tr>
</tbody>
</table>
</div>

</div>
</div>
<div class="modal fade" id="editRecordsByDate" tabindex="-1" role="dialog">
Expand Down