update

spell00 · Nov 3, 2020 · 0e89111 · 0e89111
1 parent 451bee8
commit 0e89111
Show file tree

Hide file tree

Showing 116 changed files with 7,443 additions and 7,475 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/modules/api/docs/LorisRESTAPI_v0.0.4-dev.md b/modules/api/docs/LorisRESTAPI_v0.0.4-dev.md
@@ -263,37 +263,6 @@ will return a JSON object of the form:
 }
 ```
 
-#### 2.1.6 Single project dicoms tar files
-```
-GET /projects/$ProjectName/dicoms
-```
-
-will return a JSON object of the form:
-```js
-{
-  "Dicoms": [
-    {
-        "Candidate": "587630",
-        "PSCID": "DCC090",
-        "Entity_type": "Human",
-        "Visit": "V1",
-        "Visit_date": "2018-04-20",
-        "CenterID": "1",
-        "Site": "Data Coordinating Center",
-        "date_acquired": "2018-04-20",
-        "date_first_archived": "2019-05-23 13:46:39",
-        "date_last_archived": "2019-05-23 13:46:39",
-        "tarchiveid": "27",
-        "DicomArchiveID": "1.2.840.113745.101000.1022000.39911.6153.5242769",
-        "Archive": "2018/DCM_2018-04-20_ImagingUpload-13-42-zcoZR0.tar",
-        "Source": "/tmp/ImagingUpload-13-42-zcoZR0",
-        "FileName": "DCM_2018-04-20_ImagingUpload-13-42-zcoZR0.tar"
-    },
-    ...
-  ]
-}
-```
-
 ### 2.2 Instrument Forms
 
 ```

diff --git a/modules/api/php/endpoints/candidate/visit/electrophysiology/channels.class.inc b/modules/api/php/endpoints/candidate/visit/electrophysiology/channels.class.inc
@@ -143,4 +143,4 @@ class Channels extends Endpoint implements \LORIS\Middleware\ETagCalculator
     {
         return md5(json_encode($this->_handleGET($request)->getBody()));
     }
-}
+}
diff --git a/modules/api/php/endpoints/candidate/visit/electrophysiology/metadata.class.inc b/modules/api/php/endpoints/candidate/visit/electrophysiology/metadata.class.inc
@@ -156,4 +156,4 @@ class Metadata extends Endpoint implements \LORIS\Middleware\ETagCalculator
     {
         return md5(json_encode($this->_handleGET($request)->getBody()));
     }
-}
+}
diff --git a/modules/api/php/endpoints/candidate/visit/electrophysiology/recording.class.inc b/modules/api/php/endpoints/candidate/visit/electrophysiology/recording.class.inc
@@ -218,4 +218,4 @@ class Recording extends Endpoint implements \LORIS\Middleware\ETagCalculator
 
         return md5(json_encode($signature));
     }
-}
+}
diff --git a/modules/api/php/endpoints/project/dicoms.class.inc b/modules/api/php/endpoints/project/dicoms.class.inc
diff --git a/modules/api/php/endpoints/project/project.class.inc b/modules/api/php/endpoints/project/project.class.inc
@@ -116,9 +116,6 @@ class Project extends Endpoint implements \LORIS\Middleware\ETagCalculator
         case 'recordings':
             $handler = new Recordings($this->_project);
             break;
-        case 'dicoms':
-            $handler = new Dicoms($this->_project);
-            break;
         default:
             return new \LORIS\Http\Response\JSON\NotFound();
         }

diff --git a/modules/api/php/endpoints/project/recordings.class.inc b/modules/api/php/endpoints/project/recordings.class.inc
@@ -181,4 +181,4 @@ class Recordings extends Endpoint implements \LORIS\Middleware\ETagCalculator
     {
         return md5(json_encode($this->_handleGET($request)->getBody()));
     }
-}
+}
diff --git a/modules/api/php/models/projectdicomsobject.class.inc b/modules/api/php/models/projectdicomsobject.class.inc
diff --git a/modules/api/php/provisioners/projectdicomsobjectprovisioner.class.inc b/modules/api/php/provisioners/projectdicomsobjectprovisioner.class.inc
diff --git a/modules/api/test/login_Test.php b/modules/api/test/login_Test.php
@@ -75,7 +75,7 @@ public function testLoginSuccess(): void
     {
         $this->_authenticator->expects($this->once())
             ->method('passwordAuthenticate')
-            ->with('test_username', 'test_password')
+            ->with(['test_username', 'test_password'])
             ->willReturn(true);
 
         $handler = $this->getMockBuilder('\LORIS\api\Endpoints\Login')

diff --git a/modules/behavioural_qc/php/behavioural_qc.class.inc b/modules/behavioural_qc/php/behavioural_qc.class.inc
@@ -180,7 +180,7 @@ class Behavioural_QC extends \NDB_Form
      * all the feedback at all levels. In the case of just a candidate
      * set we return all feedbacks at every level for that candidate.
      *
-     * @param null       $test_name   the value of test name
+     * @param ?string    $test_name   the value of test name
      * @param null       $candID      the value of candidate ID
      * @param null       $visit_label the value of visit label
      * @param int|string $site        the id or default value of the site

diff --git a/modules/candidate_parameters/ajax/formHandler.php b/modules/candidate_parameters/ajax/formHandler.php
@@ -300,6 +300,10 @@ function editFamilyInfoFields(\Database $db)
         $db->update('family', $updateValues, ['ID' => $siblingID]);
 
         $i++;
+
+        // Otherwise there is an error about a possible infinite loop
+        // How is siblingCandID updated to get updated to null eventually?
+        $siblingCandID = $siblingCandID;
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         {
             return md5(json_encode($this->_handleGET($request)->getBody()));
         }
-    }
+    }