Skip to content

fix: #397 display time-in and time-out columns #475

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 2 commits into from
Jul 22, 2020
Merged

fix: #397 display time-in and time-out columns #475

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ea7a90
fix: #397 display time-in and time-out columns
enriquezrene Jul 22, 2020
5f8336f
fix: #397 remove dead code
enriquezrene Jul 22, 2020
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
Next Next commit
fix: #397 display time-in and time-out columns
  • Loading branch information
@enriquezrene
enriquezrene committed Jul 22, 2020
commit 4ea7a908bf0cbd0fb1a5309959a050e6b961b656
4 changes: 4 additions & 0 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 @@ -7,6 +7,8 @@
<th class="col md-col">User email</th>
<th class="col sm-col">Date</th>
<th class="col sm-col">Duration (hours)</th>
<th class="col sm-col">Time in</th>
<th class="col sm-col">Time out</th>
<th class="col md-col">Project</th>
<th class="col lg-col">Project ID</th>
<th class="col md-col">Customer</th>
Expand All @@ -26,6 +28,8 @@
<td class="col md-col multiline-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 sm-col"> {{ entry.start_date | date: 'HH:mm' }} </td>
<td class="col sm-col"> {{ entry.end_date | date: 'HH:mm' }} </td>
<td class="col md-col"> {{ entry.project_name }} </td>
<td class="col md-col"> {{ entry.project_id }} </td>
<td class="col md-col"> {{ entry.customer_name }} </td>
Expand Down