Skip to content

TT-593 On Reports page, add filter by user name #839

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

Merged
merged 18 commits into from
Apr 28, 2022
Merged

TT-593 On Reports page, add filter by user name #839

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
601da91
feat: TT-593 add filter for searching a specific user
codigodehoy Mar 29, 2022
1d79433
feat: TT-593 added the ngOnChanges event
codigodehoy Mar 30, 2022
bd407e2
style: TT-593 added the length of the search button
wilc0519 Mar 29, 2022
4708862
fix: TT-593 resolved keys
wilc0519 Mar 30, 2022
7e0c9db
fix: TT-593 added the time-tracker-ui CD-prod file
wilc0519 Mar 30, 2022
832bf7a
fix: TT-593 added the time-tracker-ui-cd-prod file
wilc0519 Mar 30, 2022
dede01b
fix: TT-593 fixed the CI-time-tracker-ui.yml file
codigodehoy Apr 6, 2022
a58b78a
fix: TT-593 refactor
wilc0519 Apr 20, 2022
63c9ead
Merge branch 'master' into TT-593-on-reports-page-add-filter-by-user-…
wilc0519 Apr 20, 2022
504c500
Merge branch 'TT-593-on-reports-page-add-filter-by-user-name' of gith…
wilc0519 Apr 20, 2022
6e55792
fix: TT-593 refactor
wilc0519 Apr 20, 2022
91f5114
fix: TT-593 unit test
wilc0519 Apr 22, 2022
d8bdea8
fix: TT-593 refactor unit tets
wilc0519 Apr 22, 2022
986fd43
fix: TT-539 conflict resolution
wilc0519 Apr 22, 2022
1d5656a
fix: TT-593 unit test coverage
wilc0519 Apr 27, 2022
6bedc07
fix: TT-593 unit test implementation
wilc0519 Apr 27, 2022
b9ea8e9
fix: TT-593 coverage time-entries-table
wilc0519 Apr 28, 2022
17208d2
fix: TT-593 coverage time-entries-table
wilc0519 Apr 28, 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
fix: TT-539 conflict resolution
  • Loading branch information
@wilc0519
wilc0519 committed Apr 22, 2022
commit 986fd43954e74779239f3e40b1a75ac5b0431739
112 changes: 54 additions & 58 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,63 +1,59 @@
<div class="row scroll-table mt-5 ml-0">
<app-search-user [users]="users" (selectedUserId)="user($event)"></app-search-user>
<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">
<th class="hidden-col">ID</th>
<th class="col md-col">User email</th>
<th class="col sm-col">Date</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>
<th class="hidden-col">Project ID</th>
<th class="col md-col">Customer</th>
<th class="hidden-col">Customer ID</th>
<th class="col md-col">Activity</th>
<th class="col lg-col">Ticket</th>
<th class="col lg-col">Description</th>
<th class="col lg-col">Technologies</th>
</tr>
</thead>
<app-loading-bar *ngIf="dataSource.isLoading"></app-loading-bar>
<tbody *ngIf="!dataSource.isLoading">
<tr class="d-flex col-height" *ngFor="let entry of dataSource.data">
<td class="hidden-col">{{ entry.id }}</td>
<td class="col md-col">{{ entry.owner_email }}</td>
<td class="col sm-col">
{{ entry.start_date | date: 'MM/dd/yyyy' }}
</td>
<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>
<td class="col x-sm-col">{{ entry.end_date | date: 'HH:mm' }}</td>
<td class="col md-col">{{ entry.project_name }}</td>
<td class="hidden-col">{{ entry.project_id }}</td>
<td class="col md-col">{{ entry.customer_name }}</td>
<td class="hidden-col">{{ entry.customer_id }}</td>
<td class="col md-col">{{ entry.activity_name }}</td>
<td class="col lg-col">
<ng-container *ngIf="entry.uri !== null">
<a [class.is-url]="isURL(entry.uri)" (click)="openURLInNewTab(entry.uri)">

<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">
<th class="hidden-col">ID</th>
<th class="col md-col">User email</th>
<th class="col sm-col">Date</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>
<th class="hidden-col">Project ID</th>
<th class="col md-col">Customer</th>
<th class="hidden-col">Customer ID</th>
<th class="col md-col">Activity</th>
<th class="col lg-col">Ticket</th>
<th class="col lg-col">Description</th>
<th class="col lg-col">Technologies</th>
</tr>
</thead>
<app-loading-bar *ngIf="dataSource.isLoading"></app-loading-bar>
<tbody *ngIf="!dataSource.isLoading">
<tr class="d-flex col-height" *ngFor="let entry of dataSource.data">
<td class="hidden-col">{{ entry.id }}</td>
<td class="col md-col">{{ entry.owner_email }}</td>
<td class="col sm-col">
{{ entry.start_date | date: 'MM/dd/yyyy' }}
</td>
<td class="col sm-col">
{{ entry.end_date | substractDate: entry.start_date }}
</td>
<td class="col x-sm-col">{{ dateTimeOffset.parseDateTimeOffset(entry.start_date,entry.timezone_offset) }}</td>
<td class="col x-sm-col">{{ dateTimeOffset.parseDateTimeOffset(entry.end_date , entry.timezone_offset) }}</td>
<td class="col md-col">{{ entry.project_name }}</td>
<td class="hidden-col">{{ entry.project_id }}</td>
<td class="col md-col">{{ entry.customer_name }}</td>
<td class="hidden-col">{{ entry.customer_id }}</td>
<td class="col md-col">{{ entry.activity_name }}</td>
<td class="col lg-col">
<ng-container *ngIf="entry.uri !== null">
<a [class.is-url]="isURL(entry.uri)" (click)="openURLInNewTab(entry.uri)">
{{ entry.uri }}
</a>
</ng-container>
</td>
<td class="col lg-scroll">{{ entry.description }}</td>
<td class="col lg-scroll">
<ng-container *ngIf="entry.technologies.length > 0">
<div *ngFor="let technology of entry.technologies" class="badge bg-secondary text-wrap">
{{ technology }}
</div>
</ng-container>
</td>
</tr>
</tbody>
</table>
</ng-container>
</td>
<td class="col lg-scroll">{{ entry.description }}</td>
<td class="col lg-scroll">
<ng-container *ngIf="entry.technologies.length > 0">
<div *ngFor="let technology of entry.technologies" class="badge bg-secondary text-wrap">
{{ technology }}
</div>
</ng-container>
</td>
</tr>
</tbody>
</table>
</div>
30 changes: 0 additions & 30 deletions src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,36 +31,6 @@
border: none;
}

@mixin scroll-style {
width: 40em;
overflow: hidden;
white-space: normal;
display: -webkit-box;
-webkit-box-orient: vertical;
margin: 8px 10px 0px 10px;
border: none;
overflow-y: auto;
overflow-wrap: break-word;

&::-webkit-scrollbar {
width: 0.5em;
}

&::-webkit-scrollbar-track {
box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
}

&::-webkit-scrollbar-thumb {
background-color: #7a8486;
outline: 1px solid #7a8486;
border-radius: 0.5em;
}
}

.lg-scroll {
@include scroll-style;
}

@mixin scroll-style {
width: 18em;
overflow: hidden;
Expand Down
1 change: 1 addition & 0 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 @@ -11,6 +11,7 @@ import { EntryState } from '../../../time-clock/store/entry.reducer';
import { getReportDataSource } from '../../../time-clock/store/entry.selectors';
import { User } from 'src/app/modules/users/models/users';
import { LoadUsers, UserActionTypes } from 'src/app/modules/users/store/user.actions';
import { ParseDateTimeOffset } from '../../../shared/formatters/parse-date-time-offset/parse-date-time-offset';

@Component({
selector: 'app-time-entries-table',
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.