Merge pull request #1137 from mcneilco/ACAS-729-clone

Clone of ACAS-729 (Experiment Upload Bug Fix) for 2023.2.x
mcneilco · Dec 6, 2023 · 7cc8bb4 · 7cc8bb4
2 parents 70dfbf7 + cc34014
commit 7cc8bb4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/GenericDataParser/src/server/generic_data_parser.R b/modules/GenericDataParser/src/server/generic_data_parser.R
@@ -256,7 +256,7 @@ saveEndpointCodeTables <- function(codes, codeKind) {
   }
 
   # we don't want to work with other codeKinds (this is set up for endpoint manager only right now... )
-  validCodeKinds = c("column name", "column units", "concentration units", "time units")
+  validCodeKinds = c("column name", "column units", "column conc units", "time units")
 
   #Before we save the incoming code, we need to check if the code/codeKind pair already exists... 
   #get relevant ddict data
@@ -3664,7 +3664,7 @@ runMain <- function(pathToGenericDataFormatExcelFile, reportFilePath=NULL,
     # also save the new endpoints of the protocol 
     saveEndpointCodeTables(selColumnOrderInfo$Units, "column units")
     saveEndpointCodeTables(selColumnOrderInfo$valueKind, "column name")
-    saveEndpointCodeTables(selColumnOrderInfo$concUnits, "concentration units")
+    saveEndpointCodeTables(selColumnOrderInfo$concUnits, "column conc units")
     saveEndpointCodeTables(selColumnOrderInfo$timeUnit, "time units")
 
     if (newProtocol) {