#374 [TimeSpent] add: project status info

Evarisk · Jul 10, 2023 · 892cfaa · 892cfaa
1 parent 5ca086f
commit 892cfaa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/dolisirh_timespent.lib.php b/lib/dolisirh_timespent.lib.php
@@ -428,7 +428,6 @@ function doliSirhGetTasksArray($usert = null, $userp = null, $projectid = 0, $so
         }
     }
 
-
     $sql .= " ORDER BY p.ref, t.rang, t.dateo";
 
     //print $sql;exit;
@@ -948,7 +947,7 @@ function doliSirhTaskLinesWithinRange(&$inc, $firstdaytoshow, $lastdaytoshow, $f
                     }
 
                     print '<tr class="oddeven trforbreak nobold">' . "\n";
-                    print '<td colspan="' . (2 + $addcolspan + $daysInRange) . '">';
+                    print '<td colspan="' . (2 + $addcolspan + $daysInRange) . '"' . ($projectstatic->status == $projectstatic::STATUS_CLOSED ? 'style="background-color: #CBCDCD!important;"' : '') . '>';
                     print $projectstatic->getNomUrl(1, '', 0, '<strong>' . $langs->transnoentitiesnoconv("YourRole") . ':</strong> ' . $projectsrole[$lines[$i]->fk_project]);
                     if ($thirdpartystatic->id > 0) {
                         print ' - ' . $thirdpartystatic->getNomUrl(1);
@@ -957,6 +956,7 @@ function doliSirhTaskLinesWithinRange(&$inc, $firstdaytoshow, $lastdaytoshow, $f
                         print ' - ';
                         print '<span class="secondary" title="' . $projectstatic->title . '">' . dol_trunc($projectstatic->title, '64') . '</span>';
                     }
+                    print ' - ' . $projectstatic->getLibStatut(5);
 
                     print '</td>';
                     print '</tr>';

diff --git a/view/timespent_month.php b/view/timespent_month.php
@@ -314,7 +314,7 @@
 	$project->fetch_thirdparty();
 }
 
- $onlyopenedproject = 1; // or -1
+ $onlyopenedproject = -1; // or -1
  $morewherefilter = '';
 
  if ($search_project_ref) {

diff --git a/view/timespent_week.php b/view/timespent_week.php
@@ -320,7 +320,7 @@
 	$project->fetch_thirdparty();
 }
 
-$onlyopenedproject = 1; // or -1
+$onlyopenedproject = -1; // or -1
 $morewherefilter = '';
 
 if ($search_project_ref) {