[dashboard] Add project filter for tasks widget

CHANGELOG.md

@@ -15,6 +15,7 @@ changes in the following format: PR #1234***
 
 #### Updates and Improvements
 - Create new `sex` table to hold candidate sex options, and change Sex and ProbandSex columns of `candidate` table to a varchar(255) datatype that is restricted by the `sex` table (PR #9025)
+- Add Project filter for "My tasks" counts in dashboard (PR #9220)
 
 #### Bug Fixes
 - Fix examiner site display (PR #8967)

modules/conflict_resolver/php/module.class.inc

@@ -122,6 +122,7 @@ class Module extends \Module
                          s.CenterID <> 1",
                     'access_all_profiles',
                     's.CenterID',
+                    's.ProjectID',
                     $baseURL . '/' . $this->getName(),
                     'conflict_resolver'
                 )

modules/dashboard/php/taskquerywidget.class.inc

@@ -33,21 +33,23 @@ class TaskQueryWidget extends TaskWidget
     /**
      * Construct a TaskQueryWidget
      *
-     * @param \User     $user      The user whose tasks are being displayed
-     * @param string    $label     The label for the task widget. It should be
-     *                             singular and phrased in a way that adding
-     *                             an "s" pluralizes.
-     * @param \Database $db        The database connection for the query.
-     * @param string    $dbquery   The query to run to get a count.
-     * @param string    $allperm   The permission to use to determine if the user
-     *                             has access to all sites, or only user sites.
-     *                             If the empty string, center permissions will
-     *                             not be used.
-     * @param string    $sitefield The field to use in the query to site-restrict
-     *                             the results.
-     * @param string    $link      The link for the widget to go to when clicked.
-     * @param string    $cssclass  An optional css class to add to the task for
-     *                             testing.
+     * @param \User     $user         The user whose tasks are being displayed
+     * @param string    $label        The label for the task widget. It should be
+     *                                singular and phrased in a way that adding
+     *                                an "s" pluralizes.
+     * @param \Database $db           The database connection for the query.
+     * @param string    $dbquery      The query to run to get a count.
+     * @param string    $allperm      The permission to use to determine if the user
+     *                                has access to all sites, or only user sites.
+     *                                If the empty string, center permissions will
+     *                                not be used.
+     * @param string    $sitefield    The field to use in the query to site-restrict
+     *                                the results.
+     * @param string    $projectfield The field to use in the query to restrict the
+     *                                project in results.
+     * @param string    $link         The link for the widget to go to when clicked.
+     * @param string    $cssclass     An optional css class to add to the task for
+     *                                testing.
      */
     public function __construct(
         \User $user,
@@ -56,6 +58,7 @@ class TaskQueryWidget extends TaskWidget
         string $dbquery,
         string $allperm,
         string $sitefield,
+        string $projectfield,
         string $link,
         string $cssclass
     ) {
@@ -69,6 +72,10 @@ class TaskQueryWidget extends TaskWidget
                 $siteLabel = 'Site: All User Sites';
             }
         }
+        if ($projectfield) {
+            $queryparams['ProjectID'] = implode(',', $user->getProjectIDs());
+            $dbquery .= " AND FIND_IN_SET($projectfield, :ProjectID)";
+        }
 
         $number = (int )$db->pselectOne($dbquery, $queryparams);
         if ($number != 1) {

modules/dashboard/test/DashboardTest.php

@@ -82,6 +82,13 @@ function setUp(): void
                 'Name'      => 'TESTinProject',
             ]
         );
+        $this->DB->insert(
+            "user_project_rel",
+            [
+                'UserID'    => $user_id,
+                'ProjectID' => '1',
+            ]
+        );
         $this->DB->insert(
             "candidate",
             [
@@ -316,6 +323,17 @@ public function tearDown(): void
             ["Value" => null],
             ["ConfigID" => 48]
         );
+        $user_id = $this->DB->pselectOne(
+            "SELECT ID FROM users WHERE UserID=:test_user_id",
+            ["test_user_id" => 'testUser1']
+        );
+        $this->DB->delete(
+            "user_project_rel",
+            [
+                'UserID'    => $user_id,
+                'ProjectID' => '1',
+            ]
+        );
         $this->DB->run('SET foreign_key_checks =1');
         parent::tearDown();
     }
@@ -406,7 +424,7 @@ public function testNewScans()
         $this->safeGet($this->url . '/dashboard/');
         $this->_testMytaskPanelAndLink(
             ".new-scans",
-            "10",
+            "4",
             "- Imaging Browser"
         );
         $this->resetPermissions();
@@ -436,7 +454,7 @@ public function testConflictResolver()
         $this->safeGet($this->url . '/dashboard/');
         $this->_testMytaskPanelAndLink(
             ".conflict_resolver",
-            "574",
+            "570",
             "- Conflict Resolver"
         );
         $this->resetPermissions();
@@ -513,7 +531,7 @@ public function testPendingUser()
         $this->safeGet($this->url . '/dashboard/');
         $this->_testMytaskPanelAndLink(
             ".pending-accounts",
-            "2",
+            "1",
             "- User Accounts"
         );
         $this->resetPermissions();

modules/imaging_browser/php/module.class.inc

@@ -80,6 +80,7 @@ class Module extends \Module
                          AND s.CenterID <> 1",
                     'imaging_browser_view_allsites',
                     's.CenterID',
+                    's.ProjectID',
                     $baseURL . "/imaging_browser/?pendingNew=N&pendingNew=P",
                     "new-scans"
                 )

modules/instruments/php/module.class.inc

@@ -135,6 +135,7 @@ class Module extends \Module
                         AND s.Active='Y' AND c.Active='Y'",
                     'access_all_profiles',
                     's.CenterID',
+                    's.ProjectID',
                     $baseURL . "/statistics/statistics_site/",
                     ""
                 ),

modules/issue_tracker/php/module.class.inc

@@ -96,6 +96,7 @@ class Module extends \Module
                      . $DB->quote($user->getUsername()),
                     '',
                     '',
+                    '',
                     $baseURL . "/issue_tracker/?$url",
                     "issue_tracker"
                 )

modules/user_accounts/php/module.class.inc

@@ -86,9 +86,11 @@ class Module extends \Module
                     $DB,
                     "SELECT COUNT(DISTINCT users.UserID) FROM users
                         LEFT JOIN user_psc_rel as upr ON (upr.UserID=users.ID)
+                        LEFT JOIN user_project_rel upr2 ON (upr2.UserID=users.ID)
                     WHERE users.Pending_approval='Y'",
                     'user_accounts_multisite',
                     'upr.CenterID',
+                    'upr2.ProjectID',
                     $baseURL . "/user_accounts/?pendingApproval=Y",
                     "pending-accounts"
                 )