From 6c33505e84d7d60abf9afe1b1556fbbcdc05212d Mon Sep 17 00:00:00 2001
From: Laetitia Fesselier <laetitia.fesselier@mail.mcgill.ca>
Date: Mon, 27 Mar 2023 14:35:16 +0000
Subject: [PATCH] Fix annotations issues

---
 .../css/electrophysiology_browser.css                |  5 +++--
 .../src/series/components/EventManager.tsx           |  3 ---
 .../php/models/electrophysioannotations.class.inc    | 12 +++++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/electrophysiology_browser/css/electrophysiology_browser.css b/modules/electrophysiology_browser/css/electrophysiology_browser.css
index 08aa9060ca4..a97cb229417 100644
--- a/modules/electrophysiology_browser/css/electrophysiology_browser.css
+++ b/modules/electrophysiology_browser/css/electrophysiology_browser.css
@@ -45,7 +45,7 @@ svg {
 .list-group-item {
   position: relative;
   display: flex;
-  flex-direction: row;
+  flex-direction: column;
   justify-content: space-between;
   align-items: center;
 }
@@ -65,13 +65,14 @@ svg {
   justify-content: center;
   align-items: center;
   position: absolute;
-  right: 0;
+  right: 10px;
 }
 
 .epoch-tag {
   padding: 5px;
   background: #e7e4e4;
   border-left: 5px solid #797878;
+  width: 100%;
 }
 
 .epoch-tag p {
diff --git a/modules/electrophysiology_browser/jsx/react-series-data-viewer/src/series/components/EventManager.tsx b/modules/electrophysiology_browser/jsx/react-series-data-viewer/src/series/components/EventManager.tsx
index 69a0daae007..fdbc1481e4b 100644
--- a/modules/electrophysiology_browser/jsx/react-series-data-viewer/src/series/components/EventManager.tsx
+++ b/modules/electrophysiology_browser/jsx/react-series-data-viewer/src/series/components/EventManager.tsx
@@ -187,9 +187,6 @@ const EventManager = ({
                   (epoch.type == 'Annotation' ? 'annotation ' : '')
                   + 'list-group-item list-group-item-action'
                 }
-                style={{
-                  position: 'relative',
-                }}
               >
                 <div
                   className="epoch-details"
diff --git a/modules/electrophysiology_browser/php/models/electrophysioannotations.class.inc b/modules/electrophysiology_browser/php/models/electrophysioannotations.class.inc
index a25be0a59aa..82e23adadf4 100644
--- a/modules/electrophysiology_browser/php/models/electrophysioannotations.class.inc
+++ b/modules/electrophysiology_browser/php/models/electrophysioannotations.class.inc
@@ -145,6 +145,8 @@ class ElectrophysioAnnotations
 
             //Insert new files and data into DB
             if (empty($annotationFIDs)) {
+                //Create new annotation files
+                $this->_createFiles();
 
                 //Get new annotation file ID
                 $annotation_tsv_ID = $db->pselectOne(
@@ -164,8 +166,6 @@ class ElectrophysioAnnotations
                 );
 
                 $metadata['AnnotationFileID'] = $annotation_json_ID;
-                $instance['AnnotationFileID'] = $annotation_tsv_ID;
-
                 $db->insert("physiological_annotation_parameter", $metadata);
 
                 //Get new metadata file ID
@@ -176,8 +176,8 @@ class ElectrophysioAnnotations
                     ['annotation_ID' => $annotation_json_ID]
                 );
 
+                $instance['AnnotationFileID']      = $annotation_tsv_ID;
                 $instance['AnnotationParameterID'] = $metadata_ID;
-
                 $db->insert("physiological_annotation_instance", $instance);
 
             } else {
@@ -584,8 +584,10 @@ class ElectrophysioAnnotations
                 WHERE PhysiologicalFileID=:PFID",
                 ['PFID' => $this->_physioFileID]
             );
-            $filepath = $dataDir.$filepath;
-
+            if (!$filepath) {
+                continue;
+            }
+            $filepath  = $dataDir.$filepath;
             $arch_file = new \PharData($filepath);
             foreach ($paths as $path) {
                 $arch_file->addFile($path, basename($path));