" FROM ConfigSettings WHERE Name="StudyDescription";
INSERT INTO Config (ConfigID, Value) SELECT ID, "images/neurorgb_web.jpg" FROM ConfigSettings WHERE Name="studylogo";
INSERT INTO Config (ConfigID, Value) SELECT ID, "false" FROM ConfigSettings WHERE Name="useEDC";
+INSERT INTO Config (ConfigID, Value) SELECT ID, "false" FROM ConfigSettings WHERE Name="useDoB";
INSERT INTO Config (ConfigID, Value) SELECT ID, 8 FROM ConfigSettings WHERE Name="ageMin";
INSERT INTO Config (ConfigID, Value) SELECT ID, 11 FROM ConfigSettings WHERE Name="ageMax";
INSERT INTO Config (ConfigID, Value) SELECT ID, "false" FROM ConfigSettings WHERE Name="useFamilyID";
diff --git a/SQL/New_patches/2023-12-08_useDoB.sql b/SQL/New_patches/2023-12-08_useDoB.sql
new file mode 100644
index 00000000000..e96a7cf02e7
--- /dev/null
+++ b/SQL/New_patches/2023-12-08_useDoB.sql
@@ -0,0 +1,2 @@
+INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'useDoB', 'Use DoB (Date of Birth)', 1, 0, 'boolean', ID, 'Use DoB', 31 FROM ConfigSettings WHERE Name="study";
+INSERT INTO Config (ConfigID, Value) SELECT ID, "false" FROM ConfigSettings WHERE Name="useDoB";
diff --git a/SQL/New_patches/2024-07-19-issuetracker_AddsInstrumentToIssuesTable.sql b/SQL/New_patches/2024-07-19-issuetracker_AddsInstrumentToIssuesTable.sql
new file mode 100644
index 00000000000..e0a8045d543
--- /dev/null
+++ b/SQL/New_patches/2024-07-19-issuetracker_AddsInstrumentToIssuesTable.sql
@@ -0,0 +1,11 @@
+ALTER TABLE `issues`
+ ADD `instrument` int(10) unsigned DEFAULT NULL
+ AFTER `description`;
+
+ALTER TABLE `issues`
+ ADD CONSTRAINT `fk_issues_instrument`
+ FOREIGN KEY (`instrument`) REFERENCES `test_names` (`ID`)
+ ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE `issues_history`
+ MODIFY `fieldChanged` enum('assignee','status','comment','sessionID','centerID','title','category','module','lastUpdatedBy','priority','candID', 'description','watching','instrument') NOT NULL DEFAULT 'comment';
diff --git a/SQL/New_patches/2024-10-02-Data_Release_Project_separation.sql b/SQL/New_patches/2024-10-02-Data_Release_Project_separation.sql
new file mode 100644
index 00000000000..d067ce80fc8
--- /dev/null
+++ b/SQL/New_patches/2024-10-02-Data_Release_Project_separation.sql
@@ -0,0 +1,4 @@
+ALTER TABLE data_release
+ADD COLUMN ProjectID INT(10) UNSIGNED NULL DEFAULT NULL,
+ADD CONSTRAINT FK_ProjectID
+FOREIGN KEY (ProjectID) REFERENCES Project (ProjectID);
\ No newline at end of file
diff --git a/SQL/New_patches/2024_05_13_Add_DDE_To_Battery.sql b/SQL/New_patches/2024_05_13_Add_DDE_To_Battery.sql
new file mode 100644
index 00000000000..5e508c7ef28
--- /dev/null
+++ b/SQL/New_patches/2024_05_13_Add_DDE_To_Battery.sql
@@ -0,0 +1,9 @@
+ALTER TABLE test_battery ADD COLUMN DoubleDataEntryEnabled enum("Y", "N") DEFAULT "N";
+
+UPDATE test_battery SET DoubleDataEntryEnabled = 'Y' WHERE Test_name IN (
+ SELECT Value from Config WHERE ConfigID = (SELECT ID FROM ConfigSettings WHERE Name = 'DoubleDataEntryInstruments')
+);
+
+DELETE FROM Config WHERE ConfigID IN (SELECT ID FROM ConfigSettings WHERE Name = 'DoubleDataEntryInstruments');
+
+DELETE FROM ConfigSettings WHERE Name = 'DoubleDataEntryInstruments';
diff --git a/docker-compose.yml b/docker-compose.yml
index 36f6a6d60c8..2b20f2ccfb5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '3.8'
services:
db:
build:
@@ -13,12 +13,9 @@ services:
- MYSQL_RANDOM_ROOT_PASSWORD=yes
selenium:
- image: selenium/standalone-firefox-debug:3.141.59-zirconium
- volumes:
- - /dev/shm:/dev/shm
+ image: selenium/standalone-firefox:4.25
ports:
- "5900:5900"
-
web:
build:
context: .
@@ -62,58 +59,3 @@ services:
- selenium
- web
entrypoint: /app/test/wait-for-services.sh
-
- selenium-debug:
- image: selenium/standalone-firefox-debug:3.141.59-zirconium
- links:
- - web-debug:web
- ports:
- - "5901:5900"
-
- web-debug:
- build:
- context: .
- dockerfile: Dockerfile.test.php8.debug
- volumes:
- - ./:/app
- - ./test/test_instrument:/app/project/instruments
- environment:
- - LORIS_DB_CONFIG=/app/test/config.xml
- - XDEBUG_CONFIG=remote_host=${XDEBUG_REMOTE_HOST}
- - PHP_IDE_CONFIG=serverName=LorisTests
- depends_on:
- - db
- command: php -S 0.0.0.0:8000 -t /app/htdocs /app/htdocs/router.php
-
- unit-tests-debug:
- build:
- context: .
- dockerfile: Dockerfile.test.php8.debug
- volumes:
- - ./:/app
- working_dir: /app
- environment:
- - LORIS_DB_CONFIG=test/config.xml
- - XDEBUG_CONFIG=remote_host=${XDEBUG_REMOTE_HOST}
- - PHP_IDE_CONFIG=serverName=LorisTests
- depends_on:
- - db
- entrypoint: /app/test/wait-for-services.sh
-
- integration-tests-debug:
- build:
- context: .
- dockerfile: Dockerfile.test.php8.debug
- volumes:
- - ./:/app
- working_dir: /app
- environment:
- - LORIS_DB_CONFIG=test/config.xml
- - SELENIUM_REQUIRED=true
- - XDEBUG_CONFIG=remote_host=${XDEBUG_REMOTE_HOST}
- - PHP_IDE_CONFIG=serverName=LorisTests
- links:
- - db
- - selenium-debug:selenium
- - web-debug:web
- entrypoint: /app/test/wait-for-services.sh
diff --git a/htdocs/js/advancedMenu.js b/htdocs/js/advancedMenu.js
index 5aa6dc082e4..e52a52a8e14 100644
--- a/htdocs/js/advancedMenu.js
+++ b/htdocs/js/advancedMenu.js
@@ -8,8 +8,8 @@ function isElementSet() {
let set = 0;
let options = $('.advancedOptions option:selected'); // get all the selected dropdowns for the TR with the ID advancedOptions
let texts = $('.advancedOptions input[type=text]');
- // brows through the selected dropdowns
- // if any of the dropdown is not equal to 'All' then set the variable set to true
+ // brows through the selected dropdowns
+ // if any of the dropdown is not equal to 'All' then set the variable set to true
options.each(function() {
let value = $(this).text();
if (value !== 'All') {
@@ -17,8 +17,8 @@ function isElementSet() {
return;
}
});
- // browse though the text elements
- // /if any of the text element is not empty then set the variable set to true
+ // browse though the text elements
+ // /if any of the text element is not empty then set the variable set to true
texts.each(function() {
let value = $(this).val();
if (value !== '') {
diff --git a/htdocs/js/instrument_controlpanel_control.js b/htdocs/js/instrument_controlpanel_control.js
index 88b65888465..fe6e6983009 100644
--- a/htdocs/js/instrument_controlpanel_control.js
+++ b/htdocs/js/instrument_controlpanel_control.js
@@ -1,3 +1,3 @@
$(function() {
- $('[data-toggle="tooltip"]').tooltip();
+ $('[data-toggle="tooltip"]').tooltip();
});
diff --git a/htdocs/js/invalid_form_scroll.js b/htdocs/js/invalid_form_scroll.js
index 046cc86fcee..d74c750af41 100644
--- a/htdocs/js/invalid_form_scroll.js
+++ b/htdocs/js/invalid_form_scroll.js
@@ -4,8 +4,8 @@
*/
$(document).ready(function bindInvalidFormListeners() {
- // This will make sure that the flag indicating whether we scrolled
- // to an invalid element when the form is submitted is reset
+ // This will make sure that the flag indicating whether we scrolled
+ // to an invalid element when the form is submitted is reset
document.getElementsByName('fire_away')[0].addEventListener(
'click',
function() {
@@ -13,26 +13,26 @@ $(document).ready(function bindInvalidFormListeners() {
}
);
- // Override default event handler for invalid input elements
- // This will make sure that the invalid element appears at the top
- // of the page.
+ // Override default event handler for invalid input elements
+ // This will make sure that the invalid element appears at the top
+ // of the page.
let elements = document.querySelectorAll('input,select,textarea');
let navbarHeader = document.getElementsByClassName('navbar-header');
for (let i = elements.length; i--;) {
elements[i].addEventListener('invalid', function() {
- // Only make the uppermost invalid element visible when the
- // form is submitted
+ // Only make the uppermost invalid element visible when the
+ // form is submitted
if (!bindInvalidFormListeners.scrollingDone) {
this.scrollIntoView(true);
- // scrollingIntoView is not enough: the navigation bar will appear
- // over the invalid element and hide it.
- // We have to scroll an additional number of pixels down so that
- // the elements becomes visible.
+ // scrollingIntoView is not enough: the navigation bar will appear
+ // over the invalid element and hide it.
+ // We have to scroll an additional number of pixels down so that
+ // the elements becomes visible.
if (navbarHeader) {
window.scrollBy(0, -$(navbarHeader).height() - 10);
}
- // Only scroll once
+ // Only scroll once
bindInvalidFormListeners.scrollingDone = true;
}
});
diff --git a/htdocs/js/jquery.fileupload.js b/htdocs/js/jquery.fileupload.js
index 4d95b85a8d9..b631cab4ae9 100644
--- a/htdocs/js/jquery.fileupload.js
+++ b/htdocs/js/jquery.fileupload.js
@@ -26,8 +26,8 @@
$(element).change(function() {
let filename = $(this).val().split('\\').pop();
let placeHolder = $(this)
- .parent().parent().parent()
- .find('.file-caption-name');
+ .parent().parent().parent()
+ .find('.file-caption-name');
$(placeHolder).html(filename);
});
});
diff --git a/jslib/fetchDataStream.js b/jslib/fetchDataStream.js
index 6cf94a5cf83..c86a6e57779 100644
--- a/jslib/fetchDataStream.js
+++ b/jslib/fetchDataStream.js
@@ -10,35 +10,35 @@
* indicating whether the end of the stream has been reached.
*/
async function processLines(data, rowcb, endstreamcb) {
- const utf8Decoder = new TextDecoder('utf-8');
- let row = [];
- let colStart = -1;
- let rowStart = 0;
- for (let i = 0; i < data.length; i++) {
- switch (data[i]) {
- case 0x1e: // end of column
- const rowdata = data.slice(colStart+1, i);
- const encoded = utf8Decoder.decode(rowdata);
- colStart = i;
- row.push(encoded);
- continue;
- case 0x1f: // end of row
- const rowdata2 = data.slice(colStart+1, i);
- const encoded2 = utf8Decoder.decode(rowdata2);
- row.push(encoded2);
+ const utf8Decoder = new TextDecoder('utf-8');
+ let row = [];
+ let colStart = -1;
+ let rowStart = 0;
+ for (let i = 0; i < data.length; i++) {
+ switch (data[i]) {
+ case 0x1e: // end of column
+ const rowdata = data.slice(colStart+1, i);
+ const encoded = utf8Decoder.decode(rowdata);
+ colStart = i;
+ row.push(encoded);
+ continue;
+ case 0x1f: // end of row
+ const rowdata2 = data.slice(colStart+1, i);
+ const encoded2 = utf8Decoder.decode(rowdata2);
+ row.push(encoded2);
- rowcb(row);
+ rowcb(row);
- rowStart = i+1;
- colStart = i;
- row = [];
- continue;
- case 0x04: // end of stream
- endstreamcb(row);
- return {remainder: [], eos: true};
- }
+ rowStart = i+1;
+ colStart = i;
+ row = [];
+ continue;
+ case 0x04: // end of stream
+ endstreamcb(row);
+ return {remainder: [], eos: true};
}
- return {remainder: data.slice(rowStart), eos: false};
+ }
+ return {remainder: data.slice(rowStart), eos: false};
}
/**
@@ -55,44 +55,44 @@ async function processLines(data, rowcb, endstreamcb) {
* @param {string} method - the HTTP method to use for the request
*/
async function fetchDataStream(dataURL, rowcb, chunkcb, endstreamcb, method) {
- const response = await fetch(
- dataURL,
- {
- method: method || 'get',
- credentials: 'same-origin',
- },
- );
+ const response = await fetch(
+ dataURL,
+ {
+ method: method || 'get',
+ credentials: 'same-origin',
+ },
+ );
- const reader = response.body.getReader();
+ const reader = response.body.getReader();
- let remainder = [];
- let doneLoop = false;
- while (!doneLoop) {
- await reader.read().then(({done, value}) => {
- let combined;
- if (remainder.length == 0) {
- combined = value;
- } else {
- combined = new Uint8Array(
- value.length + remainder.length
- );
- for (let i = 0; i < remainder.length; i++) {
- combined[i] = remainder[i];
- }
- for (let i = 0; i < value.length; i++) {
- combined[i+remainder.length] = value[i];
- }
- }
- return processLines(combined, rowcb, endstreamcb);
- }).then(({remainder: rem, eos}) => {
- chunkcb(eos);
- doneLoop = eos;
- remainder = rem;
- }).catch((err) => {
- console.error(err);
- doneLoop = true;
- });
- }
+ let remainder = [];
+ let doneLoop = false;
+ while (!doneLoop) {
+ await reader.read().then(({done, value}) => {
+ let combined;
+ if (remainder.length == 0) {
+ combined = value;
+ } else {
+ combined = new Uint8Array(
+ value.length + remainder.length
+ );
+ for (let i = 0; i < remainder.length; i++) {
+ combined[i] = remainder[i];
+ }
+ for (let i = 0; i < value.length; i++) {
+ combined[i+remainder.length] = value[i];
+ }
+ }
+ return processLines(combined, rowcb, endstreamcb);
+ }).then(({remainder: rem, eos}) => {
+ chunkcb(eos);
+ doneLoop = eos;
+ remainder = rem;
+ }).catch((err) => {
+ console.error(err);
+ doneLoop = true;
+ });
+ }
}
export default fetchDataStream;
diff --git a/jsx/Breadcrumbs.js b/jsx/Breadcrumbs.js
index cef326354d6..c5ab758b09b 100644
--- a/jsx/Breadcrumbs.js
+++ b/jsx/Breadcrumbs.js
@@ -106,9 +106,9 @@ class Breadcrumbs extends Component {
} else {
breadcrumbs.push(
+ href={url}
+ className='btn btn-primary'
+ onClick={onClick}>