both data class and data type included

This commit is contained in:
Andreas Gammelgaard Damsbo 2025-03-20 11:45:17 +01:00
parent 1b425b5a94
commit c69baaaac1
No known key found for this signature in database

View file

@ -31,16 +31,18 @@ columnSelectInput <- function(inputId, label, data, selected = "", ...,
{ {
"name": "%s", "name": "%s",
"label": "%s", "label": "%s",
"dataclass": "%s",
"datatype": "%s" "datatype": "%s"
}'), }'),
col, col,
attr(datar()[[col]], "label") %||% "", attr(datar()[[col]], "label") %||% "",
IDEAFilter:::get_dataFilter_class(datar()[[col]]) IDEAFilter:::get_dataFilter_class(datar()[[col]]),
data_type(datar()[[col]])
) )
}, col = names(datar())) }, col = names(datar()))
if (!"none" %in% names(datar())){ if (!"none" %in% names(datar())){
labels <- c("none"=list(sprintf('\n {\n \"name\": \"none\",\n \"label\": \"%s\",\n \"datatype\": \"\"\n }',none_label)),labels) labels <- c("none"=list(sprintf('\n {\n \"name\": \"none\",\n \"label\": \"%s\",\n \"dataclass\": \"\",\n \"datatype\": \"\"\n }',none_label)),labels)
choices <- setNames(names(labels), labels) choices <- setNames(names(labels), labels)
choices <- choices[match(if (length(col_subsetr()) == 0 || isTRUE(col_subsetr() == "")) names(datar()) else col_subsetr(), choices)] choices <- choices[match(if (length(col_subsetr()) == 0 || isTRUE(col_subsetr() == "")) names(datar()) else col_subsetr(), choices)]
} else { } else {
@ -62,7 +64,10 @@ columnSelectInput <- function(inputId, label, data, selected = "", ...,
return '<div style=\"padding: 3px 12px\">' + return '<div style=\"padding: 3px 12px\">' +
'<div><strong>' + '<div><strong>' +
escape(item.data.name) + ' ' + escape(item.data.name) + ' ' +
'<span style=\"opacity: 0.3;\"><code style=\"color: black;\"> ' + '<span style=\"opacity: 0.9;\"><code style=\"color: black;\"> ' +
item.data.dataclass +
'</code></span>' + ' ' +
'<span style=\"opacity: 0.9;\"><code style=\"color: black;\"> ' +
item.data.datatype + item.data.datatype +
'</code></span>' + '</code></span>' +
'</strong></div>' + '</strong></div>' +