Remove Annotations in favor of Events

jeffersoncasimir · Jan 30, 2024 · 6146f72 · 6146f72
1 parent d0982ce
commit 6146f72
Show file tree

Hide file tree

Showing 25 changed files with 1,449 additions and 1,722 deletions.
diff --git a/SQL/0000-00-05-ElectrophysiologyTables.sql b/SQL/0000-00-05-ElectrophysiologyTables.sql
@@ -382,105 +382,6 @@ CREATE TABLE `physiological_archive` (
     ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- SQL tables for BIDS derivative file structure
--- Create physiological_annotation_file_type table
-CREATE TABLE `physiological_annotation_file_type` (
-    `FileType`        VARCHAR(20)   NOT NULL UNIQUE,
-    `Description`     VARCHAR(255),
-    PRIMARY KEY (`FileType`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- Create physiological_annotation_file table
-CREATE TABLE `physiological_annotation_file` (
-    `AnnotationFileID`    INT(10)      UNSIGNED NOT NULL AUTO_INCREMENT,
-    `PhysiologicalFileID` INT(10)      UNSIGNED NOT NULL,
-    `FileType`            VARCHAR(20)  NOT NULL,
-    `FilePath`            VARCHAR(255),
-    `LastUpdate`          TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-    `LastWritten`         TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    PRIMARY KEY (`AnnotationFileID`),
-    CONSTRAINT `FK_phys_file_ID`
-        FOREIGN KEY (`PhysiologicalFileID`)
-        REFERENCES `physiological_file` (`PhysiologicalFileID`),
-    CONSTRAINT `FK_annotation_file_type`
-        FOREIGN KEY (`FileType`)
-        REFERENCES `physiological_annotation_file_type` (`FileType`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- Create annotation_archive which will store archives of all the annotation files for
--- Front-end download
-CREATE TABLE `physiological_annotation_archive` (
-  `AnnotationArchiveID` INT(10) UNSIGNED NOT NULL   AUTO_INCREMENT,
-  `PhysiologicalFileID` INT(10) UNSIGNED NOT NULL,
-  `Blake2bHash`         VARCHAR(128)     NOT NULL,
-  `FilePath`            VARCHAR(255)     NOT NULL,
-  PRIMARY KEY (`AnnotationArchiveID`),
-  CONSTRAINT `FK_physiological_file_ID`
-    FOREIGN KEY (`PhysiologicalFileID`)
-    REFERENCES `physiological_file` (`PhysiologicalFileID`)
-    ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- Create annotation_parameter table
--- Note: This corresponds with the JSON annotation files
-CREATE TABLE `physiological_annotation_parameter` (
-    `AnnotationParameterID` INT(10)      UNSIGNED NOT NULL AUTO_INCREMENT,
-    `AnnotationFileID`      INT(10)      UNSIGNED NOT NULL,
-    `Description`           TEXT         DEFAULT NULL,
-    `Sources`               VARCHAR(255),
-    `Author`                VARCHAR(255),
-    PRIMARY KEY (`AnnotationParameterID`),
-    CONSTRAINT `FK_annotation_file_ID`
-        FOREIGN KEY (`AnnotationFileID`)
-        REFERENCES `physiological_annotation_file` (`AnnotationFileID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- Create an annotation_label_type table
-CREATE TABLE `physiological_annotation_label` (
-  `AnnotationLabelID`    INT(5)       UNSIGNED NOT NULL AUTO_INCREMENT,
-  `AnnotationFileID`     INT(10)      UNSIGNED DEFAULT NULL,
-  `LabelName`            VARCHAR(255) NOT NULL,
-  `LabelDescription`     TEXT         DEFAULT NULL,
-  PRIMARY KEY (`AnnotationLabelID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- Create annotation_tsv table
--- Note: This corresponds with the .tsv annotation files
-CREATE TABLE `physiological_annotation_instance` (
-    `AnnotationInstanceID`  INT(10)         UNSIGNED NOT NULL AUTO_INCREMENT,
-    `AnnotationFileID`      INT(10)         UNSIGNED NOT NULL,
-    `AnnotationParameterID` INT(10)         UNSIGNED NOT NULL,
-    `Onset`                 DECIMAL(10, 4),
-    `Duration`              DECIMAL(10, 4)  DEFAULT 0,
-    `AnnotationLabelID`     INT(5)          UNSIGNED NOT NULL,
-    `Channels`              TEXT,
-    `AbsoluteTime`          TIMESTAMP,
-    `Description`           VARCHAR(255),
-    PRIMARY KEY (`AnnotationInstanceID`),
-    CONSTRAINT `FK_annotation_parameter_ID`
-        FOREIGN KEY (`AnnotationParameterID`)
-        REFERENCES `physiological_annotation_parameter` (`AnnotationParameterID`),
-    CONSTRAINT `FK_annotation_file`
-        FOREIGN KEY (`AnnotationFileID`)
-        REFERENCES `physiological_annotation_file` (`AnnotationFileID`),
-    CONSTRAINT `FK_annotation_label_ID`
-        FOREIGN KEY (`AnnotationLabelID`)
-        REFERENCES `physiological_annotation_label` (`AnnotationLabelID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- Create physiological_annotation_rel table
-CREATE TABLE `physiological_annotation_rel` (
-    `AnnotationTSV`  INT(10)    UNSIGNED NOT NULL,
-    `AnnotationJSON` INT(10)    UNSIGNED NOT NULL,
-    PRIMARY KEY (`AnnotationTSV`, `AnnotationJSON`),
-    CONSTRAINT `FK_AnnotationTSV`
-        FOREIGN KEY (`AnnotationTSV`)
-        REFERENCES `physiological_annotation_file` (`AnnotationFileID`),
-    CONSTRAINT `FK_AnnotationJSON`
-        FOREIGN KEY (`AnnotationJSON`)
-        REFERENCES `physiological_annotation_file` (`AnnotationFileID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
 -- Create EEG upload table
 CREATE TABLE `electrophysiology_uploader` (
     `UploadID` int(10) unsigned NOT NULL AUTO_INCREMENT,

diff --git a/SQL/New_patches/2024-01-29-Physiological-Events-Replace-Annotations.sql b/SQL/New_patches/2024-01-29-Physiological-Events-Replace-Annotations.sql
@@ -0,0 +1,9 @@
+-- Dropping all tables regarding annotations
+DROP TABLE physiological_annotation_archive;
+DROP TABLE physiological_annotation_rel;
+DROP TABLE physiological_annotation_instance;
+DROP TABLE physiological_annotation_parameter;
+DROP TABLE physiological_annotation_label;
+DROP TABLE physiological_annotation_file;
+DROP TABLE physiological_annotation_file_type;
+
diff --git a/modules/electrophysiology_browser/README.md b/modules/electrophysiology_browser/README.md
@@ -4,14 +4,14 @@
 
 The Electrophysiology Browser is intended to allow users to view candidate
 electrophysiology (EEG, MEG...) sessions collected for a study and any associated
-annotations for each recording.
+events for each recording.
 
 ## Intended Users
 
 The primary types of users are:
 1. Electrophysiology researchers who want to know details about the inserted datasets.
 2. Site coordinators or researchers ensuring the uploaded electrophysiology data have
-been correctly inserted into LORIS.
+   been correctly inserted into LORIS.
 
 ## Scope
 
@@ -26,22 +26,22 @@ sufficient to provide access to view data in the module. The third permission pr
 permissions to add or modify annotations for data from the sites the user has access to in this module.
 
 electrophysiology_browser_view_allsites
-  - This permission gives the user access to all electrophysiology datasets present in the database.
+ - This permission gives the user access to all electrophysiology datasets present in the database.
 
 electrophysiology_browser_view_site
-  - This permission gives the user access to electrophysiology datasets from their own site(s) only.
+ - This permission gives the user access to electrophysiology datasets from their own site(s) only.
 
 electrophysiology_browser_edit_annotations
-  - This permission allows the user to add, edit, and delete annotations for raw or derived datasets
+ - This permission allows the user to add, edit, and delete annotations for raw or derived datasets
 
 ## Download
 
 You can download all the files related to a recording (channel information,
-electrode information, task event information, the actual recording) -- as well as its annotations and their related metadata.
+electrode information, task event information, the actual recording) -- as well as its events and their related metadata.
 
 ## Updating Derivative Files
 
-New annotations or edits to existing annotations made through the browser must also be updated in the derivative files stored in the filesystem, before a user tries to download a derivative file package. To do this automatically, a script is provided under `tools/update_annotation_files.php`, and a cron job should be set up to execute it regularly, e.g. every evening.
+New events or edits to existing events made through the browser must also be updated in the derivative files stored in the filesystem, before a user tries to download a derivative file package. To do this automatically, a script is provided under `tools/update_event_files.php`, and a cron job should be set up to execute it regularly, e.g. every evening.
 
 ## Installation requirements to use the visualization features
 

diff --git a/modules/electrophysiology_browser/css/electrophysiology_browser.css b/modules/electrophysiology_browser/css/electrophysiology_browser.css
@@ -3,7 +3,7 @@
 }
 
 .react-series-data-viewer-scoped .dropdown-menu li {
-  margin-top: 0;
+  margin: 0;
   padding: 0 10px;
 }
 
@@ -14,6 +14,38 @@
   width: 100%;
 }
 
+.checkbox-flex-label > div > input[type="checkbox"] {
+  vertical-align: top;
+}
+
+.checkbox-flex-label {
+  display: flex;
+  align-items: center;
+  margin-bottom: 0;
+  justify-content: flex-end;
+}
+
+.btn-dropdown-toggle {
+  padding: 5px 10%;
+}
+
+.col-xs-12 > .btn-dropdown-toggle {
+  padding: 5px;
+  max-width: fit-content;
+}
+
+.col-xs-12 > .dropdown-menu {
+  width: max-content;
+  line-height: 14px;
+  padding: 0
+}
+
+.col-xs-12 > .dropdown-menu li {
+  margin: 0;
+  padding: 0;
+}
+
+
 .btn.btn-xs {
   font-size: 12px;
 }
@@ -46,42 +78,51 @@ svg:not(:root) {
   overflow: clip;
 }
 
-.list-group-item {
+.annotation.list-group-item {
   position: relative;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
   align-items: center;
+  padding: 0;
+  width: 100%;
 }
 
 .annotation {
   background: #fffae6;
-  border-left: 5px solid #ff6600;
+  border-left: 5px solid #8eecfa;
 }
 
 .epoch-details {
-  padding-right: 100px;
+  display: flex;
+  width: 100%;
+  padding: 10px 0;
 }
 
 .epoch-action {
   display: flex;
   flex-direction: row;
-  justify-content: center;
+  justify-content: end;
   align-items: center;
-  position: absolute;
-  right: 10px;
 }
 
 .epoch-tag {
-  padding: 5px;
+  padding: 10px;
   background: #e7e4e4;
-  border-left: 5px solid #797878;
+  word-wrap: break-word;
   width: 100%;
 }
 
-.epoch-tag p {
-  word-wrap: break-word;
-  width: 95%;
+.line-height-14 {
+  line-height: 14px;
+}
+
+.margin-top-10 {
+  margin-top: 10px;
+}
+
+.flex-basis-45 {
+  flex-basis: 45%
 }
 
 .event-list .btn.btn-primary {
@@ -111,8 +152,9 @@ svg:not(:root) {
 
 .btn-zoom {
   margin: 0 auto 3px auto;
-  width: 50px;
+  width: 55px;
   text-align: center;
+  text-wrap: unset;
 }
 
 .col-xs-title {
@@ -139,7 +181,7 @@ svg:not(:root) {
 .electrode:hover circle {
   stroke: #064785;
   cursor: pointer;
-  fill: #E4EBF2
+  fill: #E4EBF2;
 }
 
 .electrode:hover text {
@@ -181,6 +223,10 @@ svg:not(:root) {
   width: auto;
 }
 
+.cursor-default {
+  cursor: default;
+}
+
 /* Custom, iPhone Retina */
 @media only screen and (min-width : 320px) {
   .pagination-nav {

diff --git a/modules/electrophysiology_browser/help/sessions.md b/modules/electrophysiology_browser/help/sessions.md
@@ -10,5 +10,5 @@ Files can be downloaded containing only the recording signal, the events, or oth
 - EEG: the file containing the session recording data.    
 - Electrode info (tsv): contains electrode locations.    
 - Channels info (tsv): channel status and filter settings.
-- Events (tsv): events (both stimuli and responses) recorded during the session.   
-- Annotations (tsv): annotations (both stimuli and responses) recorded during the session.
+- Events (tsv): events (both stimuli and responses) recorded during the session.  
+