Feature; excel; create and update input and output columns #482
Conversation
Enable update of input column
Added summaries
src/Client/Update/InterfaceUpdate.fs
Outdated
| | Some Swatehost.Browser | Some Swatehost.ARCitect -> | ||
| let cmd = Spreadsheet.AddAnnotationBlock minBuildingBlockInfo |> SpreadsheetMsg |> Cmd.ofMsg | ||
| model, cmd | ||
| | _ -> failwith "not implemented" | ||
| | AddAnnotationBlocks minBuildingBlockInfos -> | ||
| | AddAnnotationBlocks compositeColumn -> |
| checkIfBuildingBlockExisting newBB existingBuildingBlocks | ||
| // if newBB is output column and output column already exists in table this returns (Some outputcolumn-building-block), else None. | ||
| let outputColOpt = checkHasExistingOutput newBB existingBuildingBlocks | ||
| let oldInputColumn = annotationTable.columns.items.[(int) inputColumn.Value.index].name |
There was a problem hiding this comment.
This is inputColumn.Value.name?
|
|
||
| let rowCount = arcTable.RowCount + 1 | ||
|
|
||
| let createCol name = |
There was a problem hiding this comment.
Maybe make this generic and reuseable for other functions
| annotationTable.Value.columns.load(propertyNames = U2.Case2 (ResizeArray[|"items"; "name"; "values"; "index"; "count"|])) | ||
|
|
||
| let! result = context.sync().``then``(fun _ -> | ||
| if newBB.Header.isInput then |
There was a problem hiding this comment.
active pattern instead of if-else
| @@ -51,6 +51,14 @@ module OfficeInteropExtensions = | |||
| |> Seq.map (snd >> Seq.map snd >> Seq.toArray) | |||
| |> Seq.toArray | |||
|
|
|||
| static member addCollumn (annotationTable:Table) name rowCount value = | |||
| @@ -135,6 +143,38 @@ module OfficeInteropExtensions = | |||
| else return None | |||
| } | |||
|
|
|||
| static member tryGetFromExcelTable (annotationTable:Table, context:RequestContext) = | |||
There was a problem hiding this comment.
maybe rename "annotationTable" everywhere to "excelTable" or "eTable" for more clarity.
| let! result = context.sync().``then``(fun _ -> | ||
| if newBB.Header.isInput then | ||
|
|
||
| let (|Input|_|) (newBuildingBlock:CompositeColumn) = |
There was a problem hiding this comment.
I am not sure if these are really helpful.
I had something like this in mind. Which can be used as a generic helper for future functions:
/// This is a mockup
type ExcelTable =
abstract member GetHeaderIndex: string -> int
/// This returns excel table index for the input column
let (|Input|_|) (arctable: ArcTable) (excelTable: ExcelTable) =
match arctable.TryGetInputColumn() with
| Some c ->
let headerName = c.ToString()
excelTable.GetHeaderIndex(headerName)
|> Some
| _ -> None
/// This returns excel table index for the input column
let (|Ouput|_|) (arctable: ArcTable) (excelTable: ExcelTable) =
match arctable.TryGetOutputColumn() with
| Some c ->
let headerName = c.ToString()
excelTable.GetHeaderIndex(headerName)
|> Some
| _ -> None
// opened an issue for this: https://github.com/nfdi4plants/ARCtrl/issues/416
let (|Unique|_|) (header:CompositeHeader) (arctable: ArcTable) (excelTable: ExcelTable) =
match (header.IsFeaturedColumn || header.IsSingleColumn) with
| true ->
match arctable.TryGetColumnByHeader header with
| Some c ->
let headerName = c.ToString()
excelTable.GetHeaderIndex(headerName)
|> Some
| _ -> None
| _ -> NoneThere was a problem hiding this comment.
Ok, shall I implement the generic method in this issue or not?
It could be better when I finish the different single building blocks first and create the general tool at the end. Then I have a better overview of the required data and so.
There was a problem hiding this comment.
As you see fit. But the current implementation of let (|Input|_|) (newBuildingBlock:CompositeColumn) =, let (|Output|_|) (newBuildingBlock:CompositeColumn) = seems more complicated than it helps.
| let updateInputColumn (excelTable:Table) (arcTable:ArcTable) (newBB:CompositeColumn) = | ||
|
|
||
| let possibleInputColumn = arcTable.TryGetInputColumn() | ||
| let inputColumnName = |
There was a problem hiding this comment.
Do not default to column name to "" if it is empty, just work with options. No reason to run the code below if we get a None here.
Option.map (fun c -> c.Header.ToString())
|> Option.map (fun cName -> excelTable.columns.item.Find (fun s -> ...)| let annotationTable = sheet.tables.getItem(annotationTableName) | ||
| //let activeSheet = context.workbook.worksheets.getActiveWorksheet() | ||
| //Try to get the name of the currently active sheet | ||
| let! excelTableName = tryGetActiveAnnotationTableName context |
There was a problem hiding this comment.
fail if this isNone, then shadow it with its own .Value
| let! result = context.sync().``then``(fun _ -> | ||
| if newBB.Header.isInput then | ||
|
|
||
| let (|Input|_|) (newBuildingBlock:CompositeColumn) = |
There was a problem hiding this comment.
As you see fit. But the current implementation of let (|Input|_|) (newBuildingBlock:CompositeColumn) =, let (|Output|_|) (newBuildingBlock:CompositeColumn) = seems more complicated than it helps.
Closes Issue #470
Enable the addition of new input- and output columns and also update existing ones, when they are already available