#72 [TimeSpent] fix: time spent on non-worked days is no more counted

Evarisk · Nov 9, 2022 · 47d359b · 47d359b
1 parent f61ca29
commit 47d359b
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/dolisirh_function.lib.php b/lib/dolisirh_function.lib.php
@@ -375,11 +375,10 @@ function loadTimeSpentWithinRange($datestart, $dateend, $isavailable, $userid =
 			$hours = floor($timeSpentSingle->timespent_duration / 3600);
 			$minutes = floor($timeSpentSingle->timespent_duration / 60);
 
-			$timeSpent['hours'] += $hours;
-			$timeSpent['minutes'] += $minutes;
-			$timeSpent['total'] += $timeSpentSingle->timespent_duration;
-
-			if ($isavailable[$timeSpentSingle->timespent_date]) {
+			if ($isavailable[$timeSpentSingle->timespent_date]['morning'] && $isavailable[$timeSpentSingle->timespent_date]['afternoon']) {
+				$timeSpent['hours'] += $hours;
+				$timeSpent['minutes'] += $minutes;
+				$timeSpent['total'] += $timeSpentSingle->timespent_duration;
 				$days_worked[$timeSpentSingle->timespent_date] = 1;
 			}
 		}