Phan pt 2

CamilleBeau · Jan 15, 2024 · 05d1420 · 05d1420
1 parent 3d593be
commit 05d1420
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/modules/candidate_parameters/ajax/getData.php b/modules/candidate_parameters/ajax/getData.php
@@ -444,14 +444,15 @@ function getConsentStatusFields()
         ];
     }
 
+    $comments = [];
+
     foreach ($consentDetails as $consentID=>$consent) {
         $consentName = $consent['Name'];
         $consentList[$consentName] = $consent['Label'];
         $groupID = $consent['ConsentGroupID'];
 
         // Append consent as a child to its group
         $consentGroups[$groupID]['Children'][] = $consentName;
-        $comments = [];
 
         if (isset($candidateConsent[$consentID])) {
             $candidateConsentID     = $candidateConsent[$consentID];

diff --git a/php/libraries/Candidate.class.inc b/php/libraries/Candidate.class.inc
@@ -896,14 +896,8 @@ class Candidate implements \LORIS\StudyEntities\AccessibleResource,
 
         $candID = $this->getCandID();
 
-        $query = "SELECT 
-            ConsentID,
-            Name,
-            Status,
-            DateGiven,
-            DateWithdrawn,
-            Label,
-            Comment
+        $query = "SELECT cc.ConsentID, c.Name, cc.Status, cc.DateGiven,
+        cc.DateWithdrawn, c.Label, cc.Comment
         FROM candidate_consent_rel cc JOIN consent c USING (ConsentID)
         WHERE CandidateID=:cid";
         $where = ['cid' => $candID];