Merge pull request #158 from kadrim/147-Spend-hours-in-goals-not-displayed

mtierltd · web-flow · commit b18dc1d35354 · 2022-01-17T13:27:15.000+01:00
update debt when using multiple repItems per interval
diff --git a/lib/Controller/AjaxController.php b/lib/Controller/AjaxController.php
@@ -1250,12 +1250,10 @@ public function getGoals(){
 					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;	
 						} 
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -1250,12 +1250,10 @@ public function getGoals(){`
`1250`	`1250`	`if ($goal->interval == 'Weekly'){`
`1251`	`1251`	`if ($interval == $this->getStartOfWeek($repItem->time)->format('Y-m-d')) {`
`1252`	`1252`	`$workedInInterval += $repItem->totalDuration;`
`1253`		`- break;`
`1254`	`1253`	`}`
`1255`	`1254`	`} elseif ($goal->interval == 'Monthly'){`
`1256`	`1255`	`if ($interval == $this->getStartOfMonth($repItem->time)->format('Y-m')) {`
`1257`	`1256`	`$workedInInterval += $repItem->totalDuration;`
`1258`		`- break;`
`1259`	`1257`	`}`
`1260`	`1258`	`}`
`1261`	`1259`	`}`