lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX : filter only if t.task_duration checked

Browse Source
This commit is contained in:
Gauthier PC portable 024 2023-01-02 16:58:33 +01:00
parent 3ed5edc003
commit c84d17eced
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/projet/tasks/time.php
View File

@ -1629,6 +1629,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
$sql .= " AND t.task_date <= '".$db->idate($search_date_end)."'"; $sql .= " AND t.task_date <= '".$db->idate($search_date_end)."'";
} }
if (!empty($arrayfields['t.task_duration']['checked'])) {
if ($search_timespent_starthour || $search_timespent_startmin) { if ($search_timespent_starthour || $search_timespent_startmin) {
$timespent_duration_start = $search_timespent_starthour * 60 * 60; // We store duration in seconds $timespent_duration_start = $search_timespent_starthour * 60 * 60; // We store duration in seconds
$timespent_duration_start += ($search_timespent_startmin ? $search_timespent_startmin : 0) * 60; // We store duration in seconds $timespent_duration_start += ($search_timespent_startmin ? $search_timespent_startmin : 0) * 60; // We store duration in seconds
@ -1641,6 +1643,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
$sql .= " AND t.task_duration <= " . $timespent_duration_end; $sql .= " AND t.task_duration <= " . $timespent_duration_end;
} }
}
$sql .= dolSqlDateFilter('t.task_datehour', $search_day, $search_month, $search_year); $sql .= dolSqlDateFilter('t.task_datehour', $search_day, $search_month, $search_year);
// Add where from hooks // Add where from hooks