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

Jump to bottom

Enable check for metadata sheetname and is meta data sheet for arc template #456

Merged
merged 3 commits into from
Oct 21, 2024
Merged

Enable check for metadata sheetname and is meta data sheet for arc template #456

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
100fc34
Enable check for metadata sheetname and is meta data sheet
Etschbeijer Oct 18, 2024
a0eeeed
Implented review changes
Etschbeijer Oct 18, 2024
cb87cba
Implement review fix
Etschbeijer Oct 21, 2024
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
28 changes: 17 additions & 11 deletions src/Spreadsheet/Template.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,16 @@ module Template =
(ResizeArray tags)
lastUpdated

let isMetadataSheetName (name : string) =
name = metaDataSheetName || name = obsoletemetaDataSheetName

let isMetadataSheet (sheet : FsWorksheet) =
isMetadataSheetName sheet.Name

let tryGetMetadataSheet (doc : FsWorkbook) =
doc.GetWorksheets()
|> Seq.tryFind isMetadataSheet

let toMetadataSheet (template : Template) : FsWorksheet =
let sheet = FsWorksheet(metaDataSheetName)
Template.toRows template
Expand All @@ -261,19 +271,15 @@ module Template =

/// Reads an assay from a spreadsheet
let fromFsWorkbook (doc : FsWorkbook) =
// Reading the "Assay" metadata sheet. Here metadata
let templateInfo, ers, tags, authors =

match doc.TryGetWorksheetByName metaDataSheetName with
// Reading the "Template" metadata sheet. Here metadata
let templateInfo, ers, tags, authors =
match tryGetMetadataSheet doc with
| Option.Some sheet ->
fromMetadataSheet sheet
| None ->
match doc.TryGetWorksheetByName obsoletemetaDataSheetName with
| Option.Some sheet ->
fromMetadataSheet sheet
| None ->
Metadata.Template.TemplateInfo.empty, [], [], []

| None ->
printfn "Could not find metadata sheet with sheetname \"isa_template\" or deprecated sheetname \"Template\""
Metadata.Template.TemplateInfo.empty, [], [], []

let tryTableNameMatches (ws : FsWorksheet) =
if ws.Tables |> Seq.exists (fun t -> t.Name = templateInfo.Table) then Some ws else None

Expand Down
Loading