Skip to content

Commit f86f400

Browse files
authored
Merge branch 'main' into TranslateModuleManager
2 parents 1c476f2 + 1e4b675 commit f86f400

File tree

819 files changed

+23474
-11808
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

819 files changed

+23474
-11808
lines changed

.github/workflows/loristest.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
# (see https://github.com/actions/runner-images/blob/releases/ubuntu22/20230305/images/linux/Ubuntu2204-Readme.md)
2323
# that updated the list of installed apt packages/apt repositories. That issue may disappear in future Ubuntu images.
2424
run: |
25+
sudo apt-get update
2526
sudo apt install -y imagemagick-6-common libmagickcore-6.q16-7t64 libmagickwand-6.q16-7t64 \
2627
libprotobuf-dev libprotobuf32t64 libprotoc32t64 protobuf-compiler
2728
cd modules/electrophysiology_browser/jsx/react-series-data-viewer/
@@ -259,7 +260,7 @@ jobs:
259260
restore-keys: ${{ runner.os }}-composer-
260261

261262
- name: Change PHP Version in Dockerfile
262-
run: sed -i "s/8.0/${{ matrix.php }}/g" Dockerfile.test.php8
263+
run: sed -i "s/8.3/${{ matrix.php }}/g" Dockerfile.test.php8
263264

264265
- name: Install protoc-gen-js plugin
265266
run: npm install -g protoc-gen-js
@@ -270,6 +271,7 @@ jobs:
270271
# (see https://github.com/actions/runner-images/blob/releases/ubuntu22/20230305/images/linux/Ubuntu2204-Readme.md)
271272
# that updated the list of installed apt packages/apt repositories. That issue may disappear in future Ubuntu images.
272273
run: |
274+
sudo apt-get update
273275
sudo apt install -y imagemagick-6-common libmagickcore-6.q16-7t64 libmagickwand-6.q16-7t64 \
274276
libprotobuf-dev libprotobuf32t64 libprotoc32t64 protobuf-compiler gettext
275277
cd modules/electrophysiology_browser/jsx/react-series-data-viewer/

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ modules/*/js/.module-cache/
2626
htdocs/js/components/.module-cache/
2727
node_modules/
2828
modules/*/js/*.map
29+
**/LC_MESSAGES/*.json
2930
htdocs/js/components/*.map
3031
npm-debug.log*
3132
SQL/Archive/autogenerated/reversion/*.sql

CHANGELOG.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,40 @@ core section.***
88
- ***When possible please provide the number of the pull request(s) containing the
99
changes in the following format: PR #1234***
1010

11+
## LORIS 27.x (Release Date: TBD)
12+
### Core
13+
#### Summary
14+
- Minor release after v27 release
15+
### Notes For Existing Projects
16+
17+
Upgrading LORIS requires following the upgrade process each major and minor release (bug fix releases can be script) to ensure the schema is up to date.
18+
19+
For upgrading to 27.x from 27:
20+
- Run the `tools/single_use/27_Publication_Collaborators_Into_New_Entries.php` to move publication collaborators into their own database entries rather than relying on eachother.
21+
22+
## LORIS 27.0 (Release Date: 2025-06-20)
23+
### Core
24+
#### Summary
25+
The LORIS 27 release adds many new features and optimizations detailed below such as:
26+
- Optimizations for the new dataquery tool which also optimize various components throughout LORIS
27+
- Improvements to permission handling through different modules
28+
- A new "Batch Mode" for the issue tracker
29+
- The CandID in LORIS is now 10 digits instead of 6 to support larger projects
30+
- Foreign Key references to the `candidate` table are now standardized: `CandidateID` which refers to `candidate`.`ID`
31+
- Instrument's `flag`.`data` moved to `instrument_data` table
32+
- LORIS now has the ability to display summary statistics of the LORIS instance (either from an SQL query or a query built with the new data query tool) on the login page.
33+
- A new redcap module allows to importing of data from redcap into LORIS
34+
- Various other bug fixes and features detailed below
35+
36+
### Notes For Existing Projects
37+
38+
Upgrading LORIS requires following the upgrade process each major and minor release (bug fix releases can be script) to ensure the schema is up to date.
39+
40+
For upgrading to 27 from 26:
41+
- Source the `SQL/Release_patches/26.0_To_27.0_upgrade.sql`
42+
- Run the `tools/update_issues_with_description.php` to back-populate the new issue tracker description column. (The description was previously based on the first comment.)
43+
44+
1145
## LORIS 26.0 (Release Date: 2024-06-13)
1246
### Core
1347
#### Features

Dockerfile.test.db

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ RUN cat /sql/0000-00-00-schema.sql \
1313
/sql/0000-00-03-ConfigTables.sql \
1414
/sql/0000-00-04-Help.sql \
1515
/sql/0000-00-05-ElectrophysiologyTables.sql \
16+
/sql/0000-00-06-BiobankTables.sql \
1617
/instruments_sql/*.sql \
1718
/test_instrument.sql \
1819
/RB_files/*.sql \

Dockerfile.test.php8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.1
1+
FROM php:8.3
22

33
# Install necessary packages
44
RUN apt-get update && \

Dockerfile.test.php8.debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.1
1+
FROM php:8.3
22

33
RUN apt-get update && \
44
apt-get install -y mariadb-client libzip-dev

Makefile

Lines changed: 67 additions & 28 deletions
Large diffs are not rendered by default.

SQL/0000-00-00-schema.sql

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ CREATE TABLE `psc` (
5151
`Phone2` varchar(12) DEFAULT NULL,
5252
`Contact1` varchar(150) DEFAULT NULL,
5353
`Contact2` varchar(150) DEFAULT NULL,
54-
`Alias` char(3) NOT NULL DEFAULT '',
54+
`Alias` char(4) NOT NULL DEFAULT '',
5555
`MRI_alias` varchar(4) NOT NULL DEFAULT '',
5656
`Account` varchar(8) DEFAULT NULL,
5757
`Study_site` enum('N','Y') DEFAULT 'Y',
@@ -105,6 +105,7 @@ CREATE TABLE `users` (
105105
`Active` enum('Y','N') NOT NULL default 'Y',
106106
`Password_hash` varchar(255) default NULL,
107107
`PasswordChangeRequired` tinyint(1) NOT NULL default 0,
108+
`TOTPSecret` binary(64) DEFAULT NULL,
108109
`Pending_approval` enum('Y','N') default 'Y',
109110
`Doc_Repo_Notifications` enum('Y','N') default 'N',
110111
`language_preference` integer unsigned default NULL,
@@ -293,13 +294,12 @@ CREATE TABLE `flag` (
293294
`ID` int(10) unsigned NOT NULL auto_increment,
294295
`SessionID` int(10) unsigned NOT NULL,
295296
`TestID` int(10) unsigned NOT NULL,
296-
`CommentID` varchar(255) NOT NULL default '',
297+
`CommentID` varchar(255) NOT NULL,
297298
`Data_entry` enum('In Progress','Complete') default NULL,
298299
`Required_elements_completed` enum('Y','N') NOT NULL default 'N',
299300
`Administration` enum('None','Partial','All') default NULL,
300301
`Validity` enum('Questionable','Invalid','Valid') default NULL,
301302
`Exclusion` enum('Fail','Pass') default NULL,
302-
`UserID` varchar(255) default NULL,
303303
`Testdate` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
304304
`DataID` int(10) unsigned default NULL,
305305
PRIMARY KEY (`CommentID`),
@@ -309,12 +309,29 @@ CREATE TABLE `flag` (
309309
KEY `flag_Data_entry` (`Data_entry`),
310310
KEY `flag_Validity` (`Validity`),
311311
KEY `flag_Administration` (`Administration`),
312-
KEY `flag_UserID` (`UserID`),
313312
CONSTRAINT `FK_flag_1` FOREIGN KEY (`SessionID`) REFERENCES `session` (`ID`) ON DELETE CASCADE ON UPDATE CASCADE,
314313
CONSTRAINT `FK_flag_3` FOREIGN KEY (`DataID`) REFERENCES `instrument_data` (`ID`),
315314
CONSTRAINT `FK_ibfk_1` FOREIGN KEY (`TestID`) REFERENCES `test_names` (`ID`)
316315
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
317316

317+
CREATE TABLE `flag_editors` (
318+
`userID` int(10) unsigned NOT NULL,
319+
`CommentID` VARCHAR(255) NOT NULL,
320+
`editDate` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
321+
PRIMARY KEY (`userID`,`CommentID`),
322+
KEY `FK_flag_editors_2` (`CommentID`),
323+
CONSTRAINT `FK_flag_editors_2`
324+
FOREIGN KEY (`CommentID`)
325+
REFERENCES `flag` (`CommentID`)
326+
ON DELETE CASCADE
327+
ON UPDATE CASCADE,
328+
CONSTRAINT `FK_flag_editors_1`
329+
FOREIGN KEY (`userID`)
330+
REFERENCES `users` (`ID`)
331+
ON DELETE CASCADE
332+
ON UPDATE CASCADE
333+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
334+
318335
CREATE TABLE `history` (
319336
`id` int(11) NOT NULL auto_increment,
320337
`tbl` varchar(255) NOT NULL default '',
@@ -1204,10 +1221,12 @@ INSERT INTO notification_modules (module_name, operation_type, as_admin, templat
12041221
('document_repository', 'edit', 'N', 'notifier_document_repository_edit.tpl', 'Document Repository: Document Edited'),
12051222
('publication', 'submission', 'N', 'notifier_publication_submission.tpl', 'Publication: Submission Received'),
12061223
('publication', 'review', 'N', 'notifier_publication_review.tpl', 'Publication: Proposal has been reviewed'),
1207-
('publication', 'edit', 'N', 'notifier_publication_edit.tpl', 'Publication: Proposal has been edited');
1224+
('publication', 'edit', 'N', 'notifier_publication_edit.tpl', 'Publication: Proposal has been edited'),
1225+
('issue_tracker', 'create/edit', 'N', 'issue_change.tpl', 'Issue Tracker: All issues created or edited');
12081226

12091227
INSERT INTO notification_modules_services_rel SELECT nm.id, ns.id FROM notification_modules nm JOIN notification_services ns WHERE nm.module_name='document_repository' AND ns.service='email_text';
12101228
INSERT INTO notification_modules_services_rel SELECT nm.id, ns.id FROM notification_modules nm JOIN notification_services ns WHERE nm.module_name='publication' AND ns.service='email_text';
1229+
INSERT INTO notification_modules_services_rel SELECT nm.id, ns.id FROM notification_modules nm JOIN notification_services ns WHERE nm.module_name='issue_tracker' AND ns.service='email_text';
12111230

12121231
-- Transfer Document repository notifications to new system
12131232
INSERT INTO users_notifications_rel SELECT u.ID, nm.id, ns.id FROM users u JOIN notification_modules nm JOIN notification_services ns WHERE nm.module_name='document_repository' AND ns.service='email_text' AND u.Doc_Repo_Notifications='Y';
@@ -2453,7 +2472,6 @@ CREATE TABLE `publication_collaborator` (
24532472
CREATE TABLE `publication` (
24542473
`PublicationID` int(10) unsigned NOT NULL AUTO_INCREMENT,
24552474
`PublicationStatusID` int(2) unsigned NOT NULL default 1,
2456-
`LeadInvestigatorID` int(10) unsigned NOT NULL,
24572475
`UserID` int(10) unsigned NOT NULL,
24582476
`RatedBy` int(10) unsigned,
24592477
`DateProposed` date NOT NULL,
@@ -2467,12 +2485,13 @@ CREATE TABLE `publication` (
24672485
`link` varchar(255) DEFAULT NULL,
24682486
`publishingStatus` enum('In Progress','Published') DEFAULT NULL,
24692487
`project` int(10) unsigned DEFAULT NULL,
2488+
`LeadInvestigator` VARCHAR(255) DEFAULT NULL,
2489+
`LeadInvestigatorEmail` VARCHAR(255) DEFAULT NULL,
24702490
CONSTRAINT `FK_publication_project` FOREIGN KEY (project) REFERENCES Project(ProjectID),
24712491
CONSTRAINT `PK_publication` PRIMARY KEY(`PublicationID`),
24722492
CONSTRAINT `FK_publication_UserID` FOREIGN KEY(`UserID`) REFERENCES `users` (`ID`),
24732493
CONSTRAINT `FK_publication_RatedBy` FOREIGN KEY(`RatedBy`) REFERENCES `users` (`ID`),
24742494
CONSTRAINT `FK_publication_PublicationStatusID` FOREIGN KEY(`PublicationStatusID`) REFERENCES `publication_status` (`PublicationStatusID`),
2475-
CONSTRAINT `FK_publication_LeadInvestigatorID` FOREIGN KEY(`LeadInvestigatorID`) REFERENCES `publication_collaborator` (`PublicationCollaboratorID`),
24762495
CONSTRAINT `UK_publication_Title` UNIQUE (`Title`)
24772496
) ENGINE=InnoDB DEFAULT CHARSET='utf8';
24782497

@@ -2688,4 +2707,4 @@ CREATE TABLE `redcap_notification` (
26882707
`handled_dt` datetime NULL,
26892708
PRIMARY KEY (`id`),
26902709
KEY `i_redcap_notif_received_dt` (`received_dt`)
2691-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2710+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

SQL/0000-00-03-ConfigTables.sql

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,21 @@ CREATE TABLE `ConfigSettings` (
1212
`Parent` int(11) DEFAULT NULL,
1313
`Label` varchar(255) DEFAULT NULL,
1414
`OrderNumber` int(11) DEFAULT NULL,
15+
`Multilingual` boolean DEFAULT false,
1516
PRIMARY KEY (`ID`),
1617
UNIQUE KEY `Name` (`Name`)
1718
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1819

20+
CREATE TABLE `ConfigI18n` (
21+
`Value` text NOT NULL,
22+
`ConfigID` int(11) DEFAULT NULL,
23+
`LanguageID` int(10) unsigned DEFAULT NULL,
24+
KEY `ConfigID` (`ConfigID`),
25+
KEY `LanguageID` (`LanguageID`),
26+
CONSTRAINT `ConfigI18n_ibfk_1` FOREIGN KEY (`ConfigID`) REFERENCES `ConfigSettings` (`ID`),
27+
CONSTRAINT `ConfigI18n_ibfk_2` FOREIGN KEY (`LanguageID`) REFERENCES `language` (`language_id`)
28+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
29+
1930

2031
CREATE TABLE `Config` (
2132
`ID` int(11) NOT NULL AUTO_INCREMENT,
@@ -37,6 +48,11 @@ CREATE TABLE `Config` (
3748
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, Label, OrderNumber) VALUES ('study', 'Settings related to details of the study', 1, 0, 'Study', 1);
3849
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'title', 'Full descriptive title of the study', 1, 0, 'text', ID, 'Study title', 1 FROM ConfigSettings WHERE Name="study";
3950
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'studylogo', 'Filename containing logo of the study. File should be located under the htdocs/images/ folder', 1, 0, 'text', ID, 'Study logo', 2 FROM ConfigSettings WHERE Name="study";
51+
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'login_logo_left', 'Path for top left logo on the login page.', 1, 0, 'text', ID, 'Login Top Left Logo', 3 FROM ConfigSettings WHERE Name="study";
52+
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'login_logo_right', 'Path for top right logo on the login page.', 1, 0, 'text', ID, 'Login Top Right Logo', 3 FROM ConfigSettings WHERE Name="study";
53+
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'login_logo_left_link', 'Optional link to redirect when clicking on top left logo', 1, 0, 'text', ID, 'Login Top Left Logo Link', 4 FROM ConfigSettings WHERE Name="study";
54+
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'login_logo_right_link', 'Optional link to redirect when clicking on top right logo', 1, 0, 'text', ID, 'Login Top Right Logo Link', 4 FROM ConfigSettings WHERE Name="study";
55+
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'partner_logos', 'Logos for partners to be displayed in the homepage', 1, 1, 'text', ID, 'Partner Logos', 4 FROM ConfigSettings WHERE Name="study";
4056
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'startYear', "Start year for study recruitment or data collection", 1, 0, 'text', ID, 'Start year', 5 FROM ConfigSettings WHERE Name="study";
4157
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'endYear', "End year for study recruitment or data collection", 1, 0, 'text', ID, 'End year', 6 FROM ConfigSettings WHERE Name="study";
4258
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'ageMin', 'Minimum candidate age in years (0+)', 1, 0, 'text', ID, 'Minimum candidate age', 7 FROM ConfigSettings WHERE Name="study";
@@ -88,7 +104,7 @@ INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType,
88104

89105

90106
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, Label, OrderNumber) VALUES ('dashboard', 'Settings that affect the appearance of the dashboard and its charts', 1, 0, 'Dashboard', 5);
91-
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'projectDescription', 'Description of the study displayed in main dashboard panel', 1, 0, 'textarea', ID, 'Project Description', 1 FROM ConfigSettings WHERE Name="dashboard";
107+
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber, Multilingual) SELECT 'projectDescription', 'Description of the study displayed in main dashboard panel', 1, 0, 'textarea', ID, 'Project Description', 1, true FROM ConfigSettings WHERE Name="dashboard";
92108
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'recruitmentTarget', 'Target number of participants for the study', 1, 0, 'text', ID, 'Target number of participants', 2 FROM ConfigSettings WHERE Name="dashboard";
93109

94110
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, Label, OrderNumber) VALUES ('imaging_modules', 'DICOM Archive and Imaging Browser settings', 1, 0, 'Imaging Modules', 6);
@@ -193,6 +209,10 @@ INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType,
193209
INSERT INTO Config (ConfigID, Value) SELECT ID, 1 FROM ConfigSettings WHERE Name="additional_user_info";
194210
INSERT INTO Config (ConfigID, Value) SELECT ID, "Example Study" FROM ConfigSettings WHERE Name="title";
195211
INSERT INTO Config (ConfigID, Value) SELECT ID, "<h3>Example Study Description</h3>\r\n <p>This is a sample description for this study, because it is a new LORIS install that has not yet customized this text.</p>\r\n <p>A LORIS administrator can customize this text in the configuration module, under the configuration option labeled \"Study Description\"</p>\r\n <h3>Useful Links</h3>\r\n <ul>\r\n <li><a href=\"https://github.com/aces/Loris\" >LORIS GitHub Repository</a></li>\r\n <li><a href=\"https://github.com/aces/Loris/wiki/Setup\" >LORIS Setup Guide</a></li>\r\n <li><a href=\"https://www.youtube.com/watch?v=2Syd_BUbl5A\" >A video of a loris on YouTube</a></li>\r\n </ul>" FROM ConfigSettings WHERE Name="StudyDescription";
212+
INSERT INTO Config (ConfigID, Value) SELECT ID, "/images/LORIS_logo_white.svg" FROM ConfigSettings WHERE Name="login_logo_left";
213+
INSERT INTO Config (ConfigID, Value) SELECT ID, "/images/github-mark.svg" FROM ConfigSettings WHERE Name="login_logo_right";
214+
INSERT INTO Config (ConfigID, Value) SELECT ID, "/" FROM ConfigSettings WHERE Name="login_logo_left_link";
215+
INSERT INTO Config (ConfigID, Value) SELECT ID, "https://github.com/aces/Loris" FROM ConfigSettings WHERE Name="login_logo_right_link";
196216
INSERT INTO Config (ConfigID, Value) SELECT ID, "images/neurorgb_web.jpg" FROM ConfigSettings WHERE Name="studylogo";
197217
INSERT INTO Config (ConfigID, Value) SELECT ID, "false" FROM ConfigSettings WHERE Name="useEDC";
198218
INSERT INTO Config (ConfigID, Value) SELECT ID, "false" FROM ConfigSettings WHERE Name="useDoB";

SQL/0000-00-06-BiobankTables.sql

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -378,18 +378,27 @@ CREATE TABLE `biobank_container_shipment_rel` (
378378

379379
-- Insert units, processes, container status and shipment status
380380
INSERT INTO `biobank_unit` VALUES (1,'mL'),(2,'µL');
381-
INSERT INTO `biobank_specimen_attribute_datatype` VALUES (1, 'text'),(2, 'number'),(3, 'date'),(4, 'time'),(5, 'boolean');
382-
INSERT INTO `biobank_specimen_protocol` VALUES (1, 'Blood Collection', 1, 1), (2, 'Blood Preparation', 2, 1), (3, 'Serum Collection', 1, 2);
383-
INSERT INTO `biobank_specimen_type` VALUES (1,'Blood',0),(2,'Serum', 1);
384-
INSERT INTO `biobank_specimen_type_unit_rel` VALUES (1, 1), (2, 2);
385-
INSERT INTO `biobank_specimen_type_parent` VALUES (2, 1);
386-
INSERT INTO `biobank_container_dimension` VALUES (1, 1, 1, 1, 1, 0, 0), (2, 10, 1, 10, 0, 1, 0), (3, 1, 0, 5, 0, 1, 0);
387-
INSERT INTO `biobank_container_capacity` VALUES (1, 1, 1);
388-
INSERT INTO `biobank_container_type` VALUES (1, 'Brand', 'Product Number 1', 'Vial', 1, 1, 1), (2, 'Brand', 'Product Number 2', 'Matrix Box', 0, null, 2), (3, 'Brand', 'Product Number 3', 'Rack', 0, null, 3);
389-
INSERT INTO `biobank_specimen_type_container_type_rel` VALUES (1, 1), (2, 1);
390-
INSERT INTO `biobank_specimen_process` VALUES (2,'Analysis'),(1,'Collection'),(3,'Preparation');
391-
INSERT INTO `biobank_container_status` VALUES (1,'Available'),(4,'Discarded'),(3,'Dispensed');
381+
INSERT INTO `biobank_specimen_attribute_datatype` VALUES (1,'text'),(2,'number'),(3,'date'),(4,'time'),(5,'boolean');
382+
INSERT INTO `biobank_specimen_process` VALUES (1,'Collection'),(2,'Analysis'),(3,'Preparation');
383+
INSERT INTO `biobank_container_status` VALUES (1,'Available'),(3,'Dispensed'),(4,'Discarded');
392384
INSERT INTO `shipment_status` VALUES (1,'cancelled'),(2,'created'),(3,'received'),(4,'returned'),(5,'shipped');
385+
INSERT INTO `biobank_specimen_type` VALUES (1,'Blood',0),(2,'Serum',1);
386+
INSERT INTO `biobank_container_dimension`
387+
VALUES (1,1,1,1,1,0,0),
388+
(2,10,1,10,0,1,0),
389+
(3,1,0,5,0,1,0);
390+
INSERT INTO `biobank_container_capacity` VALUES (1,1,1);
391+
INSERT INTO `biobank_container_type`
392+
VALUES (1,'Brand','Product Number 1','Vial',1,1,1),
393+
(2,'Brand','Product Number 2','Matrix Box',0,NULL,2),
394+
(3,'Brand','Product Number 3','Rack',0,NULL,3);
395+
INSERT INTO `biobank_specimen_protocol`
396+
VALUES (1,'Blood Collection',1,1),
397+
(2,'Blood Preparation',2,1),
398+
(3,'Serum Collection',1,2);
399+
INSERT INTO `biobank_specimen_type_unit_rel` VALUES (1,1),(2,2);
400+
INSERT INTO `biobank_specimen_type_parent` VALUES (2,1);
401+
INSERT INTO `biobank_specimen_type_container_type_rel` VALUES (1,1),(2,1);
393402

394403
-- Insert ConfigSettings for label printing endpoint
395404
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, Label, OrderNumber) VALUES ('biobank', 'Settings related to the biobank module', 1, 0, 'Biobank', 16);

0 commit comments

Comments
 (0)