Merge branch 'main' into 2021_09_22_Consent_module

CHANGELOG.md

@@ -16,6 +16,7 @@ changes in the following format: PR #1234***
 #### Bug Fixes
 - Fix examiner site display (PR #8967)
 - bvl_feedback updates in real-time (PR #8966)
+- DoB and DoD format respected in candidate parameters (PR #9001)
 
 ## LORIS 25.0 (Release Date: ????-??-??)
 ### Core

SQL/0000-00-00-schema.sql

@@ -2278,7 +2278,7 @@ CREATE TABLE `consent` (
 CREATE TABLE `candidate_consent_rel` (
   `CandidateID` int(6) NOT NULL,
   `ConsentID` integer unsigned NOT NULL,
-  `Status` enum('yes','no') DEFAULT NULL,
+  `Status` enum('yes','no','not_applicable') DEFAULT NULL,
   `DateGiven` datetime DEFAULT NULL,
   `DateWithdrawn` datetime DEFAULT NULL,
   `Comment` varchar(255) DEFAULT NULL,
@@ -2348,7 +2348,7 @@ CREATE TABLE `candidate_consent_history` (
   `PSCID` varchar(255) NOT NULL,
   `ConsentName` varchar(255) NOT NULL,
   `ConsentLabel` varchar(255) NOT NULL,
-  `Status` enum('yes','no') DEFAULT NULL,
+  `Status` enum('yes','no', 'not_applicable') DEFAULT NULL,
   `EntryStaff` varchar(255) DEFAULT NULL,
   `version` DECIMAL(5,2) DEFAULT NULL,
   `Comment` varchar(255) DEFAULT NULL,

SQL/New_patches/2023-06-06-add_NA_to_consent_status.sql

@@ -0,0 +1,2 @@
+ALTER TABLE candidate_consent_rel MODIFY COLUMN `Status` enum('yes', 'no', 'not_applicable') DEFAULT NULL;
+ALTER TABLE candidate_consent_history MODIFY COLUMN `Status` enum('yes', 'no', 'not_applicable') DEFAULT NULL;

modules/brainbrowser/css/brainbrowser.css

@@ -193,4 +193,4 @@ body {
     text-transform: none;
     font-size: 26px;
     font-weight: normal;
-}
+}

modules/brainbrowser/js/brainbrowser.loris.js

@@ -5,17 +5,17 @@
  * @param variable
  */
 function getQueryVariable(variable) {
-    'use strict';
-    let query = window.location.search.substring(1);
-        let vars = query.split('&');
-        let i;
-        let pair;
-    for (i = 0; i < vars.length; i += 1) {
-        pair = vars[i].split('=');
-        if (pair[0] === variable) {
-            return unescape(pair[1]);
-        }
+  'use strict';
+  let query = window.location.search.substring(1);
+  let vars = query.split('&');
+  let i;
+  let pair;
+  for (i = 0; i < vars.length; i += 1) {
+    pair = vars[i].split('=');
+    if (pair[0] === variable) {
+        return unescape(pair[1]);
     }
+  }
 }
 
 
@@ -34,6 +34,7 @@ $(function() {
   BrainBrowser.VolumeViewer.start('brainbrowser', function(viewer) {
     let loadingDiv = $('#loading');
     let mincIDs;
+    let fileUrls;
     let mincVolumes = [];
     let mincFilenames = [];
     let bboptions = {};
@@ -773,12 +774,8 @@ $(function() {
       }
     }); // Should cursors in all panels be synchronized?
 
-    mincIDs = getQueryVariable('minc_id');
-    if (mincIDs[0] === '[') {
-      // An array was passed. Get rid of the brackets
-      mincIDs = mincIDs.substring(1, mincIDs.length - 1);
-    }
-
+    mincIDs = getQueryVariable('minc_id') || [];
+    fileUrls = getQueryVariable('file_url') || [];
     if (getQueryVariable('overlay') === 'true') {
       bboptions.overlay = {
         template: {
@@ -812,7 +809,7 @@ $(function() {
     viewer.setDefaultPanelSize(panelSize, panelSize);
 
     fetch(
-      'imageinfo?files=' + mincIDs,
+      'imageinfo?fileids=' + mincIDs + '&fileurls=' + fileUrls,
       {credentials: 'same-origin', method: 'GET'}
     )
     .then((resp) => resp.json())