Skip to content

fix: #319 include email in reports table #348

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 1 commit into from
Jun 4, 2020
Merged

fix: #319 include email in reports table #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 10 additions & 8 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
Expand Up @@ -3,27 +3,29 @@
<table class="table table-sm table-striped" datatable [dtTrigger]="dtTrigger" [dtOptions]="dtOptions">
<thead class="thead-blue">
<tr class="d-flex">
<th class="col md-col">User email</th>
<th class="col md-col">Date</th>
<th class="col sm-col">Duration</th>
<th class="col md-col">Project</th>
<th class="col md-col">Activity</th>
<th class="col md-col">Ticket</th>
<th class="col lg-col">Description</th>
<th class="col lg-col">Technologies</th>
<th class="col sm-col">Activity</th>
<th class="col sm-col">Ticket</th>
<th class="col md-col">Description</th>
<th class="col md-col">Technologies</th>
</tr>
</thead>
<tbody>
<tr
class="d-flex"
*ngFor="let entry of data"
>
<td class="col md-col multiline-col"> {{ entry.owner_email }} </td>
<td class="col md-col"> {{ entry.start_date | date: 'dd/MM/yyyy' }} </td>
<td class="col sm-col"> {{ entry.end_date | substractDate: entry.start_date }} </td>
<td class="col md-col"> {{ entry.project_name }} </td>
<td class="col md-col"> {{ entry.activity_name }} </td>
<td class="col md-col"> {{ entry.uri }} </td>
<td class="col lg-col multiline-col"> {{ entry.description }} </td>
<td class="col lg-col multiline-col"> {{ entry.technologies }} </td>
<td class="col sm-col"> {{ entry.activity_name }} </td>
<td class="col sm-col"> {{ entry.uri }} </td>
<td class="col md-col multiline-col"> {{ entry.description }} </td>
<td class="col md-col multiline-col"> {{ entry.technologies }} </td>
</tr>
</tbody>
</table>
Expand Down
1 change: 1 addition & 0 deletions src/app/modules/shared/models/entry.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export interface Entry {
comments?: string;
uri?: string;
project_id?: string;
owner_email?: string;
}

export interface NewEntry {
Expand Down