Skip to content

fix: #312 include activity and project names in time-entries list #321

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 1, 2020
Merged

fix: #312 include activity and project names in time-entries list #321

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
fix: #312 include activity and project names in time-entries list
  • Loading branch information
@enriquezrene
enriquezrene committed Jun 1, 2020
commit f1a20bc7fc594dc956eea7804c3cc696f157f723
6 changes: 4 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 @@ -22,7 +22,8 @@
<th class="col">Date</th>
<th class="col">Time in - out</th>
<th class="col">Duration</th>
<th class="col">Ticket</th>
<th class="col">Project</th>
<th class="col">Activity</th>
<th class="col"></th>
</tr>
</thead>
Expand All @@ -34,7 +35,8 @@
<td class="col"> {{ entry.start_date | date: 'dd/MM/yyyy' }} </td>
<td class="col"> {{ entry.start_date | date: 'shortTime' }} - {{ entry.end_date | date: 'shortTime' }}</td>
<td class="col"> {{ entry.end_date | substractDate: entry.start_date }} </td>
<td class="col"> {{ entry.uri }} </td>
<td class="col"> {{ entry.project_name }} </td>
<td class="col"> {{ entry.activity_name }} </td>
<td class="col">
<button
class="btn btn-sm btn-primary"
Expand Down