fix rebase

jesscall · Nov 9, 2023 · b0e9d28 · b0e9d28
1 parent 75a9820
commit b0e9d28
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/SQL/New_patches/2021-07-28_diagnosis_evolution.sql b/SQL/New_patches/2021-07-28_diagnosis_evolution.sql
@@ -20,4 +20,4 @@ CREATE TABLE `candidate_diagnosis_evolution_rel` (
   CONSTRAINT `PK_candidate_diagnosis_evolution_rel` PRIMARY KEY (`CandID`, `DxEvolutionID`),
   CONSTRAINT `FK_candidate_diagnosis_evolution_rel_CandID` FOREIGN KEY (`CandID`) REFERENCES `candidate` (`CandID`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `FK_candidate_diagnosis_evolution_rel_DxEvolutionID` FOREIGN KEY (`DxEvolutionID`) REFERENCES `diagnosis_evolution` (`DxEvolutionID`) ON DELETE RESTRICT ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/modules/configuration/jsx/DiagnosisEvolution.js b/modules/configuration/jsx/DiagnosisEvolution.js
@@ -121,6 +121,17 @@ class DiagnosisEvolution extends Component {
                         onUserInput={this.confirmDelete}
                     />
                 ) : null;
+        const errorMessage = this.state.errorMessage[id] ?
+            this.state.errorMessage[id] :
+            {
+                Name: null,
+                ProjectID: null,
+                visitLabel: null,
+                instrumentName: null,
+                sourceField: null,
+                orderNumber: null,
+            };
+
         return (
             <TabPane TabId={`${dxEvolutionID}`} key={dxEvolutionID}>
                 <div className='row'>

diff --git a/modules/configuration/php/diagnosis_evolution.class.inc b/modules/configuration/php/diagnosis_evolution.class.inc
@@ -73,4 +73,4 @@ class Diagnosis_Evolution extends \NDB_Page
             [$baseURL . "/configuration/css/configuration.css"]
         );
     }
-}
+}