Skip to content

Fix Spend hours in goals not displayed #147 #156

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
mtierltd merged 5 commits into from
Jan 12, 2022
Merged

Fix Spend hours in goals not displayed #147 #156

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46d3199
fix #147
Dec 11, 2021
eedc011
reset time for startOfWeek and startOfMonth
Jan 6, 2022
2e13dba
include current week in calculation
Jan 9, 2022
2aceddd
revert time calucation
Jan 9, 2022
29b98f3
allow mutliple repItems for one goal in each interval
Jan 10, 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
Next Next commit
fix #147
  • Loading branch information
David Tahir committed Dec 11, 2021
commit 46d3199eb8105c82f88a23daa9c786413e625644
20 changes: 14 additions & 6 deletions lib/Controller/AjaxController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,18 +1245,26 @@ public function getGoals(){
foreach($intervals as $interval){
$workedInInterval = 0;
foreach($repItems as $repItem) {
if ($interval == $repItem->time) {
$workedInInterval = $repItem->totalDuration;
break;
}

if ($goal->interval == 'Weekly'){
if ($interval == $this->getStartOfWeek($repItem->time)->format('Y-m-d')) {
$workedInInterval = $repItem->totalDuration;
break;
}
} elseif ($goal->interval == 'Monthly'){
if ($interval == $this->getStartOfMonth($repItem->time)->format('Y-m')) {
$workedInInterval = $repItem->totalDuration;
break;
}
}
}
$debtSeconds += ($goal->hours*3600 - $workedInInterval);
}

foreach($repItems as $period){
if ($goal->interval == 'Weekly' && $period->time == $weekStart){
if ($goal->interval == 'Weekly' && $this->getStartOfWeek($period->time)->format('Y-m-d') == $weekStart){
$workedSecondsCurrentPeriod += $period->totalDuration;
} elseif ($goal->interval == 'Monthly' && $period->time == $monthStart){
} elseif ($goal->interval == 'Monthly' && $this->getStartOfMonth($period->time)->format('Y-m') == $monthStart){
$workedSecondsCurrentPeriod += $period->totalDuration;
}
}
Expand Down