Skip to content

Fix end date in time entry when is in progress #854

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

Fix end date in time entry when is in progress #854

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fe2f0b3
Adjust start_date and end_date report depending of the administrator …
sbateca Mar 23, 2022
03518df
Parsing date in the reports using timezone_offset with moment.js
sbateca Mar 28, 2022
299f7ae
Adjust entry.service.ts to do loadEntriesByTimeRange without timezone…
sbateca Mar 31, 2022
29f5c07
Implement test to ParseDateTimeOffset
sbateca Apr 4, 2022
51c2d5e
Resolve mMerge changes
sbateca Apr 4, 2022
cd5bc4e
Merging master branch into TT-589
sbateca Apr 21, 2022
89d1e6a
Adjust default text when end-date value is null
sbateca Apr 22, 2022
0560507
Merge master branch into TT-589
sbateca Apr 22, 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
Merge master branch into TT-589
  • Loading branch information
@sbateca
sbateca committed Apr 22, 2022
commit 05605071efc806697b347a994af255fc8c9ef7ee
6 changes: 3 additions & 3 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 @@ -20,7 +20,7 @@
</thead>
<app-loading-bar *ngIf="dataSource.isLoading"></app-loading-bar>
<tbody *ngIf="!dataSource.isLoading">
<tr class="d-flex" *ngFor="let entry of dataSource.data">
<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">
Expand All @@ -43,8 +43,8 @@
</a>
</ng-container>
</td>
<td class="col lg-col">{{ entry.description }}</td>
<td class="col lg-col">
<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 }}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.