Merge remote-tracking branch 'aces/main' into 2024-01-16-REDCapImport…

…Script

.editorconfig

@@ -17,3 +17,7 @@ indent_size = 2
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2
+

.github/workflows/loristest.yml

@@ -167,9 +167,8 @@ jobs:
         mysql ${{ env.DB_DATABASE}} -uroot -proot < SQL/0000-00-03-ConfigTables.sql
         mysql ${{ env.DB_DATABASE}} -uroot -proot < SQL/0000-00-04-Help.sql
         mysql ${{ env.DB_DATABASE}} -uroot -proot < SQL/0000-00-05-ElectrophysiologyTables.sql
-        find raisinbread/instruments/instrument_sql -name *.sql -exec sh -c "echo Sourcing {}; mysql ${{ env.DB_DATABASE}} -uroot -proot < {}" \;
+        find raisinbread/instruments/instrument_sql -name *.sql -not -name 9999-99-99-drop_instrument_tables.sql -exec sh -c "echo Sourcing {}; mysql ${{ env.DB_DATABASE}} -uroot -proot < {}" \;
         find raisinbread/RB_files/ -name *.sql -exec sh -c "echo Sourcing {}; mysql ${{ env.DB_DATABASE}} -uroot -proot < {}" \;
-
     - name: Source instrument schemas
       run: |
         find raisinbread/instruments/instrument_sql -name 0000-*.sql -exec sh -c "echo Sourcing {}; mysql ${{ env.DB_DATABASE}} -uroot -proot < {}" \;

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` date DEFAULT NULL,
   `DateWithdrawn` date DEFAULT NULL,
   CONSTRAINT `PK_candidate_consent_rel` PRIMARY KEY (`CandidateID`,`ConsentID`),
@@ -2294,7 +2294,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,
   CONSTRAINT `PK_candidate_consent_history` PRIMARY KEY (`CandidateConsentHistoryID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

SQL/9999-99-99-drop_tables.sql

@@ -7,13 +7,18 @@ DROP TABLE IF EXISTS dataquery_query_names;
 DROP TABLE IF EXISTS dataquery_queries;
 
 -- 0000-00-05-ElectrophysiologyTables.sql
+DROP TABLE IF EXISTS `physiological_event_parameter_category_level`;
+DROP TABLE IF EXISTS `physiological_event_parameter`;
+DROP TABLE IF EXISTS `physiological_event_archive`;
+DROP TABLE IF EXISTS `physiological_event_file`;
 DROP TABLE IF EXISTS `physiological_coord_system_electrode_rel`;
 DROP TABLE IF EXISTS `physiological_coord_system_point_3d_rel`;
 DROP TABLE IF EXISTS `point_3d`;
 DROP TABLE IF EXISTS `physiological_coord_system`;
 DROP TABLE IF EXISTS `physiological_coord_system_unit`;
 DROP TABLE IF EXISTS `physiological_coord_system_name`;
 DROP TABLE IF EXISTS `physiological_coord_system_type`;
+DROP TABLE IF EXISTS `electrophysiology_uploader`;
 DROP TABLE IF EXISTS `physiological_annotation_rel`;
 DROP TABLE IF EXISTS `physiological_annotation_instance`;
 DROP TABLE IF EXISTS `physiological_annotation_parameter`;
@@ -53,6 +58,7 @@ DROP TABLE IF EXISTS `issues`;
 DROP TABLE IF EXISTS `issues_categories`;
 
 -- 0000-00-02-Permission.sql
+DROP TABLE IF EXISTS `testnames_permissions_rel`;
 DROP TABLE IF EXISTS `user_perm_rel`;
 DROP TABLE IF EXISTS `notification_modules_perm_rel`;
 DROP TABLE IF EXISTS `permissions`;

SQL/Archive/25.0/2022-03-03-AddHEDTags.sql

@@ -44,6 +44,7 @@ INSERT INTO physiological_event_file (PhysiologicalFileID, FilePath, FileType)
 UPDATE physiological_task_event te
     SET EventFileID=(SELECT EventFileID FROM physiological_event_file WHERE PhysiologicalFileID=te.PhysiologicalFileID)
 ;
+SET FOREIGN_KEY_CHECKS= 1;
 
 -- Delete FilePath column in `physiological_task_event` table
 ALTER TABLE physiological_task_event

SQL/New_patches/2023-04-25-FixIssueWrongModuleID.sql

@@ -0,0 +1,8 @@
+-- NOTE: This SQL patch follows up the running of single use tool `tools/single_use/Convert_LorisMenuID_to_ModuleID.php`
+-- that was necessary to upgrade the `issues` table from LORIS version 22 to version 23. The tool forgot
+-- to include an upgrade of the `issues_history` table, which is now tackled by this SQL patch.
+
+-- delete from issues_history any orphaned module IDs
+DELETE FROM issues_history WHERE fieldChanged='module' AND issueID IN (SELECT issueID FROM issues WHERE module IS NULL);
+-- set issues history module ID to correct moduleID, replacing old LorisMenu ID
+UPDATE issues_history ih SET newValue=(SELECT i.module FROM issues i WHERE i.issueID=ih.issueID) WHERE fieldChanged='module';

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;

SQL/Release_patches/24.1_To_25.0_upgrade.sql

@@ -1,11 +1,29 @@
+
+SELECT 'Running: SQL/Archive/25.0/2021-03-01-publication-add-columns.sql';
+
+ALTER TABLE publication
+    ADD COLUMN journal varchar(255) DEFAULT NULL,
+    ADD COLUMN doi text DEFAULT NULL,
+    ADD COLUMN datePublication date DEFAULT NULL,
+    ADD COLUMN link varchar(255) DEFAULT NULL,
+    ADD COLUMN publishingStatus enum('In Progress','Published') DEFAULT NULL,
+    ADD COLUMN project int(10) unsigned DEFAULT NULL,
+    ADD CONSTRAINT `FK_publication_project`
+    FOREIGN KEY (project) REFERENCES Project(ProjectID);
+
+SELECT 'Running: SQL/Archive/25.0/2021-09-13_fix_project_primary_key.sql';
+
 -- Add a unique constraint on Project.Name
 CREATE UNIQUE INDEX `u_ProjectName` ON `Project` (`Name`);
 
-ALTER TABLE `Project`
-MODIFY `Name` VARCHAR(255) NOT NULL;
+
+SELECT 'Running: SQL/Archive/25.0/2021-12-01-make_subproject_titles_unique.sql';
+
 ALTER TABLE subproject ADD UNIQUE (`title`);
-ALTER TABLE session
-	ADD COLUMN Date_status_change date DEFAULT NULL AFTER Date_visit;-- ############################## CAPTURE HEDVersion ########################## --
+
+SELECT 'Running: SQL/Archive/25.0/2022-03-03-AddHEDTags.sql';
+
+-- ############################## CAPTURE HEDVersion ########################## --
 -- HEDVersion from dataset_description.json to be added to parameter_type
 -- Entry in physiological_parameter_file will be added on dataset import**
 INSERT INTO parameter_type (Name, Type, Description, SourceFrom) VALUES
@@ -51,6 +69,7 @@ INSERT INTO physiological_event_file (PhysiologicalFileID, FilePath, FileType)
 UPDATE physiological_task_event te
     SET EventFileID=(SELECT EventFileID FROM physiological_event_file WHERE PhysiologicalFileID=te.PhysiologicalFileID)
 ;
+SET FOREIGN_KEY_CHECKS= 1;
 
 -- Delete FilePath column in `physiological_task_event` table
 ALTER TABLE physiological_task_event
@@ -98,27 +117,9 @@ CREATE TABLE `physiological_event_parameter_category_level` (
     CONSTRAINT `FK_event_param_ID` FOREIGN KEY (`EventParameterID`) REFERENCES `physiological_event_parameter` (`EventParameterID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 ;
-INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'createVisit', 'Enable visit creation in the imaging pipeline', 1, 0, 'boolean', ID, 'Enable visit creation', 11 FROM ConfigSettings WHERE Name="imaging_pipeline";
-INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'default_project', 'Default project used when creating scan candidate or visit', 1, 0, 'text', ID, 'Default project', 12 FROM ConfigSettings WHERE Name="imaging_pipeline";
-INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'default_cohort', 'Default cohort used when creating scan visit', 1, 0, 'text', ID, 'Default cohort', 13 FROM ConfigSettings WHERE Name="imaging_pipeline";
 
-UPDATE ConfigSettings SET Label = 'Enable candidate creation' WHERE Name = 'createCandidates';
+SELECT 'Running: SQL/Archive/25.0/2022-11-22-eeg-additional-events-table.sql';
 
-UPDATE ConfigSettings SET OrderNumber = 14 WHERE Name = 'default_bids_vl';
-UPDATE ConfigSettings SET OrderNumber = 15 WHERE Name = 'is_qsub';
-UPDATE ConfigSettings SET OrderNumber = 16 WHERE Name = 'DTI_volumes';
-UPDATE ConfigSettings SET OrderNumber = 17 WHERE Name = 't1_scan_type';
-UPDATE ConfigSettings SET OrderNumber = 18 WHERE Name = 'reject_thresh';
-UPDATE ConfigSettings SET OrderNumber = 19 WHERE Name = 'niak_path';
-UPDATE ConfigSettings SET OrderNumber = 20 WHERE Name = 'QCed2_step';
-UPDATE ConfigSettings SET OrderNumber = 21 WHERE Name = 'excluded_series_description';
-UPDATE ConfigSettings SET OrderNumber = 22 WHERE Name = 'ComputeDeepQC';
-UPDATE ConfigSettings SET OrderNumber = 23 WHERE Name = 'MriConfigFile';
-UPDATE ConfigSettings SET OrderNumber = 24 WHERE Name = 'EnvironmentFile';
-UPDATE ConfigSettings SET OrderNumber = 25 WHERE Name = 'compute_snr_modalities';
-UPDATE ConfigSettings SET OrderNumber = 26 WHERE Name = 'reference_scan_type_for_defacing';
-UPDATE ConfigSettings SET OrderNumber = 27 WHERE Name = 'modalities_to_deface';
-UPDATE ConfigSettings SET OrderNumber = 28 WHERE Name = 'MriPythonConfigFile';
 -- Create `physiological_task_event_opt` table
 -- tracks additional events from bids archives
 CREATE TABLE `physiological_task_event_opt` (
@@ -130,34 +131,9 @@ CREATE TABLE `physiological_task_event_opt` (
     CONSTRAINT `FK_event_task_opt`
         FOREIGN KEY (`PhysiologicalTaskEventID`)
         REFERENCES `physiological_task_event` (`PhysiologicalTaskEventID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;-- Create EEG upload table
-CREATE TABLE `electrophysiology_uploader` (
-    `UploadID` int(10) unsigned NOT NULL AUTO_INCREMENT,
-    `UploadedBy` varchar(255) NOT NULL,
-    `UploadDate` DateTime NOT NULL,
-    `UploadLocation` varchar(255) NOT NULL,
-    `Status` enum('Not Started', 'Extracted', 'In Progress', 'Complete', 'Failed', 'Archived') DEFAULT 'Not Started',
-    `SessionID` int(10) unsigned,
-    `Checksum` varchar(40) DEFAULT NULL,
-    `MetaData` TEXT DEFAULT NULL,
-    PRIMARY KEY (`UploadID`),
-    KEY (`SessionID`),
-    CONSTRAINT `FK_eegupload_SessionID`
-        FOREIGN KEY (`SessionID`) REFERENCES `session` (`ID`),
-    CONSTRAINT `FK_eegupload_UploadedBy`
-        FOREIGN KEY (`UploadedBy`) REFERENCES `users` (`UserID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+SELECT 'Running: SQL/Archive/25.0/2022-11-24-electrode-coord-system.sql';
 
--- Add to module table
-INSERT INTO modules (Name, Active) VALUES ('electrophysiology_uploader', 'Y');
-
--- Add new configurations for eeg uploader
-INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber)
-    SELECT 'EEGUploadIncomingPath', 'Path to the upload directory for incoming EEG studies', 1, 0, 'text', ID, 'EEG Incoming Directory', 7 FROM ConfigSettings WHERE Name="paths";
-
--- Add new permissions for eeg uploader
-INSERT INTO permissions (code, description, moduleID, action, categoryID) VALUES
-    ('monitor_eeg_uploads','Monitor EEG uploads',(SELECT ID FROM modules WHERE Name='electrophysiology_uploader'),NULL,'2');
 -- -----------------------------------------------------
 -- ADDED
 -- Table `physiological_coord_system_type`
@@ -410,30 +386,9 @@ ALTER TABLE physiological_electrode
   DROP FOREIGN KEY FK_phys_file_FileID_3;
 ALTER TABLE physiological_electrode
   DROP COLUMN PhysiologicalFileID;
-INSERT INTO ConfigSettings
-    (
-        Name,
-        Description,
-        Visible,
-        AllowMultiple,
-        DataType,
-        Parent,
-        Label,
-        OrderNumber
-    )
-    SELECT
-        'UserMaximumDaysInactive',
-        'The maximum number of days since last login before making a user inactive',
-        1,
-        0,
-        'text',
-        ID,
-        'Maximum Days Before Making User Inactive',
-        30
-    FROM ConfigSettings
-    WHERE Name="study";
 
-INSERT INTO Config (ConfigID, Value) SELECT ID, "365" FROM ConfigSettings WHERE Name="UserMaximumDaysInactive";
+SELECT 'Running: SQL/Archive/25.0/2022-12-01-subprojects_no_more.sql';
+
 ALTER TABLE subproject RENAME TO cohort;
 ALTER TABLE project_subproject_rel RENAME TO project_cohort_rel;
 ALTER TABLE visit_project_subproject_rel RENAME TO visit_project_cohort_rel;
@@ -466,11 +421,9 @@ ALTER TABLE mri_protocol_group_target CHANGE `CohortID` `SubprojectID` int(10) u
 ALTER TABLE visit_project_subproject_rel CHANGE `VisitProjectCohortRelID` `VisitProjectSubprojectRelID` int(10) unsigned NOT NULL AUTO_INCREMENT;
 ALTER TABLE visit_project_subproject_rel CHANGE `ProjectCohortRelID` `ProjectSubprojectRelID` int(10) unsigned NOT NULL;
  */
--- ---------------------------------------------------------------------------------------------
--- alter MRICandidateErrors table to add PhaseEncodingDirection and EchoNumber
--- ---------------------------------------------------------------------------------------------
-ALTER TABLE MRICandidateErrors ADD COLUMN `PhaseEncodingDirection` VARCHAR(3)  DEFAULT NULL;
-ALTER TABLE MRICandidateErrors ADD COLUMN `EchoNumber`             VARCHAR(20) DEFAULT NULL;
+
+SELECT 'Running: SQL/Archive/25.0/2022-12-05-AddVizConfig.sql';
+
 -- Adds the option to toggle the EEG Browser visualization components (disabled by default).
 INSERT INTO ConfigSettings
   (
@@ -498,7 +451,8 @@ INSERT INTO ConfigSettings
     Name="gui";
 
 INSERT INTO Config (ConfigID, Value) SELECT ID, 'false' FROM ConfigSettings WHERE Name="useEEGBrowserVisualizationComponents";
-CREATE INDEX `i_violations_resolved_extid_type` ON `violations_resolved` (`ExtID`, `TypeTable`);
+
+SELECT 'Running: SQL/Archive/25.0/2022-12-20-instrumentpermissions.sql';
 
 CREATE TABLE `testnames_permissions_rel` (
     `TestID` int(10) unsigned NOT NULL,
@@ -507,3 +461,107 @@ CREATE TABLE `testnames_permissions_rel` (
     CONSTRAINT `FK_testnames_permissions_rel_test` FOREIGN KEY (`TestID`) REFERENCES `test_names` (`ID`),
     CONSTRAINT `FK_testnames_permissions_rel_perm` FOREIGN KEY (`permID`) REFERENCES `permissions` (`permID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+SELECT 'Running: SQL/Archive/25.0/2022-12-20-project-name-not-null.sql';
+
+ALTER TABLE `Project`
+MODIFY `Name` VARCHAR(255) NOT NULL;
+
+SELECT 'Running: SQL/Archive/25.0/2023-01-19_add_index_on_violations_resolved.sql';
+
+CREATE INDEX `i_violations_resolved_extid_type` ON `violations_resolved` (`ExtID`, `TypeTable`);
+
+
+SELECT 'Running: SQL/Archive/25.0/2023-01-31-add-date-stage-change.sql';
+
+ALTER TABLE session
+	ADD COLUMN Date_status_change date DEFAULT NULL AFTER Date_visit;
+SELECT 'Running: SQL/Archive/25.0/2023-02-17-imaging-new-config.sql';
+
+INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'createVisit', 'Enable visit creation in the imaging pipeline', 1, 0, 'boolean', ID, 'Enable visit creation', 11 FROM ConfigSettings WHERE Name="imaging_pipeline";
+INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'default_project', 'Default project used when creating scan candidate or visit', 1, 0, 'text', ID, 'Default project', 12 FROM ConfigSettings WHERE Name="imaging_pipeline";
+INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'default_cohort', 'Default cohort used when creating scan visit', 1, 0, 'text', ID, 'Default cohort', 13 FROM ConfigSettings WHERE Name="imaging_pipeline";
+
+UPDATE ConfigSettings SET Label = 'Enable candidate creation' WHERE Name = 'createCandidates';
+
+UPDATE ConfigSettings SET OrderNumber = 14 WHERE Name = 'default_bids_vl';
+UPDATE ConfigSettings SET OrderNumber = 15 WHERE Name = 'is_qsub';
+UPDATE ConfigSettings SET OrderNumber = 16 WHERE Name = 'DTI_volumes';
+UPDATE ConfigSettings SET OrderNumber = 17 WHERE Name = 't1_scan_type';
+UPDATE ConfigSettings SET OrderNumber = 18 WHERE Name = 'reject_thresh';
+UPDATE ConfigSettings SET OrderNumber = 19 WHERE Name = 'niak_path';
+UPDATE ConfigSettings SET OrderNumber = 20 WHERE Name = 'QCed2_step';
+UPDATE ConfigSettings SET OrderNumber = 21 WHERE Name = 'excluded_series_description';
+UPDATE ConfigSettings SET OrderNumber = 22 WHERE Name = 'ComputeDeepQC';
+UPDATE ConfigSettings SET OrderNumber = 23 WHERE Name = 'MriConfigFile';
+UPDATE ConfigSettings SET OrderNumber = 24 WHERE Name = 'EnvironmentFile';
+UPDATE ConfigSettings SET OrderNumber = 25 WHERE Name = 'compute_snr_modalities';
+UPDATE ConfigSettings SET OrderNumber = 26 WHERE Name = 'reference_scan_type_for_defacing';
+UPDATE ConfigSettings SET OrderNumber = 27 WHERE Name = 'modalities_to_deface';
+UPDATE ConfigSettings SET OrderNumber = 28 WHERE Name = 'MriPythonConfigFile';
+
+SELECT 'Running: SQL/Archive/25.0/2023-02-24-electrophysiology_uploader.sql';
+
+-- Create EEG upload table
+CREATE TABLE `electrophysiology_uploader` (
+    `UploadID` int(10) unsigned NOT NULL AUTO_INCREMENT,
+    `UploadedBy` varchar(255) NOT NULL,
+    `UploadDate` DateTime NOT NULL,
+    `UploadLocation` varchar(255) NOT NULL,
+    `Status` enum('Not Started', 'Extracted', 'In Progress', 'Complete', 'Failed', 'Archived') DEFAULT 'Not Started',
+    `SessionID` int(10) unsigned,
+    `Checksum` varchar(40) DEFAULT NULL,
+    `MetaData` TEXT DEFAULT NULL,
+    PRIMARY KEY (`UploadID`),
+    KEY (`SessionID`),
+    CONSTRAINT `FK_eegupload_SessionID`
+        FOREIGN KEY (`SessionID`) REFERENCES `session` (`ID`),
+    CONSTRAINT `FK_eegupload_UploadedBy`
+        FOREIGN KEY (`UploadedBy`) REFERENCES `users` (`UserID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- Add to module table
+INSERT INTO modules (Name, Active) VALUES ('electrophysiology_uploader', 'Y');
+
+-- Add new configurations for eeg uploader
+INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber)
+    SELECT 'EEGUploadIncomingPath', 'Path to the upload directory for incoming EEG studies', 1, 0, 'text', ID, 'EEG Incoming Directory', 7 FROM ConfigSettings WHERE Name="paths";
+
+-- Add new permissions for eeg uploader
+INSERT INTO permissions (code, description, moduleID, action, categoryID) VALUES
+    ('monitor_eeg_uploads','Monitor EEG uploads',(SELECT ID FROM modules WHERE Name='electrophysiology_uploader'),NULL,'2');
+
+SELECT 'Running: SQL/Archive/25.0/2023-02-28_create_max_days_inactive_config_for_users.sql';
+
+INSERT INTO ConfigSettings
+    (
+        Name,
+        Description,
+        Visible,
+        AllowMultiple,
+        DataType,
+        Parent,
+        Label,
+        OrderNumber
+    )
+    SELECT
+        'UserMaximumDaysInactive',
+        'The maximum number of days since last login before making a user inactive',
+        1,
+        0,
+        'text',
+        ID,
+        'Maximum Days Before Making User Inactive',
+        30
+    FROM ConfigSettings
+    WHERE Name="study";
+
+INSERT INTO Config (ConfigID, Value) SELECT ID, "365" FROM ConfigSettings WHERE Name="UserMaximumDaysInactive";
+
+SELECT 'Running: SQL/Archive/25.0/2023-04-24_add_phase_enc_dir_and_echo_number_to_MRICandidateErrors.sql';
+
+-- ---------------------------------------------------------------------------------------------
+-- alter MRICandidateErrors table to add PhaseEncodingDirection and EchoNumber
+-- ---------------------------------------------------------------------------------------------
+ALTER TABLE MRICandidateErrors ADD COLUMN `PhaseEncodingDirection` VARCHAR(3)  DEFAULT NULL;
+ALTER TABLE MRICandidateErrors ADD COLUMN `EchoNumber`             VARCHAR(20) DEFAULT NULL;

htdocs/AjaxHelper.php

@@ -94,7 +94,7 @@
     $loris = new \LORIS\LorisInstance(
         new \Database(),
         new \NDB_Config(),
-        [__DIR__ . "/../modules", __DIR__ . "/../project/modules"]
+        [__DIR__ . "/../project/modules", __DIR__ . "/../modules"]
     );
     $m     = $loris->getModule($Module);