#156 [TimeSpent] fix: missing daterange with conf DOLISIRH_SHOW_ONLY_…

…TASKS_WITH_TIMESPENT
Evarisk · Feb 8, 2023 · decdd0a · decdd0a
1 parent a3ff033
commit decdd0a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/lib/dolisirh_function.lib.php b/lib/dolisirh_function.lib.php
@@ -621,6 +621,7 @@ function doliSirhGetTasksArray($usert = null, $userp = null, $projectid = 0, $so
 			} else if ($timeMode == 'day') {
 				$sql .= " AND DAY(ptt.task_date) = " . $timeArray['day'];
 			}
+            $sql .=  ' AND (ptt.task_date >= "' . $db->idate($timeArray['firstdaytoshow']) . '" AND ptt.task_date < "' . $db->idate(dol_time_plus_duree($timeArray['lastdaytoshow'], 1, 'd')) . '")';
 		}
 
 	} elseif ($mode == 1) {

diff --git a/view/timespent_month.php b/view/timespent_month.php
@@ -431,7 +431,7 @@
      $morewherefilter .= Categorie::getFilterSelectQuery(Categorie::TYPE_PROJECT, 'p.rowid', $search_category_array);
  }
 
-$timeArray  = ['year' => $year, 'month' => $month, 'week' => $week, 'day' => $day];
+$timeArray  = ['year' => $year, 'month' => $month, 'week' => $week, 'day' => $day, 'firstdaytoshow' => $firstdaytoshow, 'lastdaytoshow' => $lastdaytoshow];
 $tasksarray = [];
 $tasksarray = doliSirhGetTasksArray(0, 0, ($project->id ?: 0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid ? $search_usertoprocessid : 0), 0, $extrafields,0,array(), 0,$timeArray, 'month');
 

diff --git a/view/timespent_week.php b/view/timespent_week.php
@@ -427,7 +427,7 @@
 	$morewherefilter .= Categorie::getFilterSelectQuery(Categorie::TYPE_PROJECT, 'p.rowid', $search_category_array);
 }
 
-$timeArray  = array('year' => $year, 'month' => $month, 'week' => $week, 'day' => $day);
+$timeArray  = ['year' => $year, 'month' => $month, 'week' => $week, 'day' => $day, 'firstdaytoshow' => $firstdaytoshow, 'lastdaytoshow' => $lastdaytoshow];
 $tasksarray = [];
 $tasksarray = doliSirhGetTasksArray(0, 0, ($project->id ?: 0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid ? $search_usertoprocessid : 0), 0, $extrafields,0,array(), 0, $timeArray, 'week');