fix #147

Author: David Tahir

lib/Controller/AjaxController.php

@@ -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;
 				}
 			}