Merge pull request #273 from Pixilib/dev

1.5.0
Pixilib · Jul 19, 2021 · 8def780 · 8def780
2 parents cfc1e01 + 6e5bea3
commit 8def780
Show file tree

Hide file tree

Showing 22 changed files with 521 additions and 678 deletions.
diff --git a/src/assets/css/gaelO-uploader.css b/src/assets/css/gaelO-uploader.css
diff --git a/src/assets/javascripts/uppyCsvPlugin.js b/src/assets/javascripts/uppyCsvPlugin.js
@@ -31,29 +31,32 @@
   }
 
   checkCSV(filesIDs){
-      console.log(filesIDs)
+
       let file = this.uppy.getFile(filesIDs[0])
-      console.log(file)
 
       let csvParser = new PetCtCSVParser(file.data)
 
       return csvParser.parseCSV().then( () => {
 
         let checkPatientIdentity = csvParser.checkAcquisition(this.patientId, this.studyDate)
         let checkThreshold = csvParser.checkTMTVThreshold(this.suvLo)
+
         this.notify({
           Tmtv : csvParser.getTmtvValue(),
           suvLo : csvParser.getSuvLow(),
           checkPatientIdentity : checkPatientIdentity,
           checkThreshold : checkThreshold
         })
-        console.log(checkPatientIdentity)
-        console.log(checkThreshold)
+
         return (checkPatientIdentity && checkThreshold)
       }).then((resultCheck)=> {
         if(!resultCheck) this.uppy.removeFile(file.id)
         else this.uppy.emit('preprocess-complete', file.id)
-
+      }).catch( () => {
+        this.notify({
+          otherError : 'Error Reading CSV'
+        })
+        this.uppy.removeFile(file.id)
       })
 
   }

diff --git a/src/data/install/database/database.sql b/src/data/install/database/database.sql
@@ -658,6 +658,7 @@ CREATE TABLE `visits` (
   `review_status` set('Not Done','Ongoing','Wait Adjudication','Done') NOT NULL DEFAULT 'Not Done',
   `review_conclusion_value` tinytext,
   `review_conclusion_date` datetime DEFAULT NULL,
+  `review_target_lesions` text,
   `last_reminder_upload` datetime DEFAULT NULL,
   `deleted` tinyint(1) NOT NULL DEFAULT '0'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -671,7 +672,7 @@ CREATE TABLE `visits` (
 CREATE TABLE `visit_group` (
   `id` int(11) NOT NULL,
   `study` varchar(32) NOT NULL,
-  `group_modality` set('PT','MR','CT') NOT NULL
+  `group_modality` set('PT','MR','CT', 'RTSTRUCT') NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- --------------------------------------------------------
@@ -692,7 +693,8 @@ CREATE TABLE `visit_type` (
   `optional` tinyint(1) NOT NULL,
   `limit_low_days` int(11) NOT NULL,
   `limit_up_days` int(11) NOT NULL,
-  `anon_profile` set('Default','Full') NOT NULL
+  `anon_profile` set('Default','Full') NOT NULL,
+  `dicom_constraints` text
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 --

diff --git a/src/includes/jsLibrairies.php b/src/includes/jsLibrairies.php
@@ -121,14 +121,14 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/PapaParse/5.1.0/papaparse.min.js"></script>
 
 <!-- GaelO Uploader -->
-<script src="https://unpkg.com/gaelo-uploader@1.1.0/dist/bundle.js"></script>
+<script src="https://unpkg.com/gaelo-uploader@3.1.2/dist/bundle.js"></script>
+<link rel="stylesheet" href="https://unpkg.com/gaelo-uploader@3.1.2/dist/main.css">
 
 <script type="text/javascript" src="assets/javascripts/gaelO.js" ></script>
 <link rel="stylesheet" href="assets/css/gaelO-specific.css">
 <link rel="stylesheet" href="assets/css/gaelO-static.css">
 <link rel="stylesheet" href="assets/css/gaelO-fonts.css">
 <link rel="stylesheet" href="assets/css/gaelO.css">
-<link rel="stylesheet" href="assets/css/gaelO-uploader.css">
 
 
 <script type="text/javascript" src="assets/javascripts/PetCtCSVParser.js" ></script>