Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ Upmerge release/2023.2.x to release/2023.3.x #1139

Merged
merged 2 commits into from
Dec 6, 2023
Merged

⬆️ Upmerge release/2023.2.x to release/2023.3.x #1139

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc34014
convert concentration units to column conc units
hhan-schrodinger Dec 1, 2023
7cc8bb4
Merge pull request #1137 from mcneilco/ACAS-729-clone
brianbolt Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/GenericDataParser/src/server/generic_data_parser.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down
Loading