Skip to content

fix: TTA-29 Selecting multiple time entries and show total of hours o… #896

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 5 commits into from
Jul 18, 2022
Merged

fix: TTA-29 Selecting multiple time entries and show total of hours o… #896

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
835d03c
fix: TTA-29 Selecting multiple time entries and show total of hours o…
wilc0519 Jul 4, 2022
d6c4865
refactor test TimeEntriesTableComponent
wilc0519 Jul 5, 2022
a46002d
Refactor sumHoursEntriesSelected
wilc0519 Jul 6, 2022
e49cc43
resolved conflicts
wilc0519 Jul 18, 2022
68cdc69
resolved conflicts
wilc0519 Jul 18, 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
Refactor sumHoursEntriesSelected
  • Loading branch information
@wilc0519
wilc0519 committed Jul 6, 2022
commit a46002dc3d8d725ea2393234a2386ffa06228842
9 changes: 2 additions & 7 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 @@ -168,13 +168,8 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn
sumHoursEntriesSelected(entry: Entry, checked: boolean){
this.resultSumEntriesSelected = new TotalHours();
const duration = moment.duration(moment(entry.end_date).diff(moment(entry.start_date)));
if(checked){
this.totalTimeSelected = this.totalTimeSelected.add(duration);
}
else{
this.totalTimeSelected = this.totalTimeSelected.subtract(duration);
}
let daysTotalInHours = this.totalTimeSelected.days() * 24;
this.totalTimeSelected = checked ? this.totalTimeSelected.add(duration) : this.totalTimeSelected.subtract(duration);
const daysTotalInHours = this.totalTimeSelected.days() * 24;
this.resultSumEntriesSelected.hours = this.totalTimeSelected.hours() + daysTotalInHours;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

daysTotalInHours is never reassigned, use 'const' instead of 'let'.

this.resultSumEntriesSelected.minutes = this.totalTimeSelected.minutes();
this.resultSumEntriesSelected.seconds = this.totalTimeSelected.seconds();
Expand Down