Merge remote-tracking branch 'aces/main' into HEAD

Author: skarya22

Makefile

@@ -108,6 +108,7 @@ POFILES=locale/fr/LC_MESSAGES/loris.po \
 	modules/electrophysiology_uploader/locale/ja/LC_MESSAGES/electrophysiology_uploader.po \
 	modules/electrophysiology_uploader/locale/hi/LC_MESSAGES/electrophysiology_uploader.po \
 	modules/acknowledgements/locale/ja/LC_MESSAGES/acknowledgements.po \
+	modules/survey_accounts/locale/hi/LC_MESSAGES/survey_accounts.po \
 	modules/survey_accounts/locale/ja/LC_MESSAGES/survey_accounts.po \
 	modules/battery_manager/locale/fr/LC_MESSAGES/battery_manager.po \
 	modules/battery_manager/locale/ja/LC_MESSAGES/battery_manager.po \
@@ -311,7 +312,10 @@ my_preferences: $(filter modules/my_preferences/%,$(MOFILES)) $(filter modules/m
 	target=my_preferences npm run compile
 
 electrophysiology_browser: $(filter modules/electrophysiology_browser/%,$(MOFILES)) $(filter modules/electrophysiology_browser/%,$(I18NJSONFILES))
-    target=electrophysiology_browser npm run compile
+	target=electrophysiology_browser npm run compile
+
+survey_accounts: $(filter modules/survey_accounts/%,$(MOFILES)) $(filter modules/survey_accounts/%,$(I18NJSONFILES))
+	target=survey_accounts npm run compile
 
 dicom_archive: $(filter modules/dicom_archive/%,$(MOFILES)) $(filter modules/dicom_archive/%,$(I18NJSONFILES))
-    target=dicom_archive npm run compile
+	target=dicom_archive npm run compile

SQL/0000-00-03-ConfigTables.sql

@@ -196,6 +196,7 @@ INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType,
 INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, Label, OrderNumber) VALUES ('eeg_pipeline', 'EEG Pipeline settings', 1, 0, 'EEG Pipeline', 15);
 INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'EEGS3DataPath', 'EEG S3 data path for assembly data', 1, 0, 'text', ID, 'EEG S3 data path', 15 FROM ConfigSettings WHERE Name = 'eeg_pipeline';
 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="eeg_pipeline";
+INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'EEGChunksPath', 'Path to store the EEG chunks for Visualization', 1, 0, 'text', ID, 'EEG chunks path', 16 FROM ConfigSettings WHERE Name="eeg_pipeline";
 
 -- REDCap settings
 INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, Label, OrderNumber) VALUES ('redcap', 'Settings related to REDCap interoperability', 1, 0, 'REDCap', 16);

SQL/New_patches/2026-04-21_add-eegchunkspath-config.sql

@@ -0,0 +1,10 @@
+INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber)
+SELECT 'EEGChunksPath', 'Path to store the EEG chunks for Visualization', 1, 0, 'text', ID, 'EEG chunks path', 16
+FROM ConfigSettings WHERE Name="eeg_pipeline";
+
+INSERT INTO `Config` (`ConfigID`, `Value`)
+SELECT cPath.ID, dPathConfig.Value
+FROM ConfigSettings cPath
+JOIN ConfigSettings dPath ON dPath.Name = 'dataDirBasepath'
+JOIN Config dPathConfig ON dPathConfig.ConfigID = dPath.ID
+WHERE cPath.`Name` = 'EEGChunksPath' LIMIT 1;