Skip to content

Settings ui refactor #181

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

Merged
bzkrouse merged 10 commits into from
Feb 15, 2019
Merged

Settings ui refactor #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
57c35eb
integrate field data checks on data UI standard message
Feb 8, 2019
b168a5b
modify for new generateSettings func
Feb 8, 2019
b366eb5
change to vertical layout
Feb 8, 2019
56e0d88
Merge pull request #169 from ASA-DIA-InteractiveSafetyGraphics/dev-v0…
Feb 8, 2019
0b900ea
update per new detectStandard() output
Feb 12, 2019
f911f11
add info/details icons
Feb 12, 2019
a5967a3
move to single-column, collapsible layout
Feb 12, 2019
b70d1e5
Merge pull request #179 from ASA-DIA-InteractiveSafetyGraphics/dev-v0…
Feb 13, 2019
e342c7e
update per validateSettings update, fix #144
Feb 13, 2019
babe332
second fix for #144
Feb 15, 2019
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
17 changes: 11 additions & 6 deletions inst/eDISH_app/modules/dataUpload/dataUpload.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,14 @@ dataUpload <- function(input, output, session){
names(choices)[i] <- paste0("<p>", names(dd$data)[i], " - <em style='color:green; font-size:12px;'>", dd$standard[[i]]$standard, "</em></p>")
# If partial data spec match - give the fraction of variables matched
} else {
fraction_cols <- paste0(toString(length(dd$standard[[i]]$details[[temp_standard]]$matched_columns)), "/" ,
toString(length(dd$standard[[i]]$details[[temp_standard]]$missing_columns) +
length(dd$standard[[i]]$details[[temp_standard]]$matched_columns)))

valid_count <- dd$standard[[i]]$details[[temp_standard]]$valid_count
total_count <- dd$standard[[i]]$details[[temp_standard]]$invalid_count + valid_count

fraction_cols <- paste0(valid_count, "/" ,total_count)

names(choices)[i] <- paste0("<p>", names(dd$data)[i], " - <em style='color:green; font-size:12px;'>", "Partial ",
dd$standard[[i]]$standard, " (", fraction_cols, " columns)", "</em></p>")
dd$standard[[i]]$standard, " (", fraction_cols, " data settings)", "</em></p>")
}
}
return(choices)
Expand Down Expand Up @@ -129,9 +131,12 @@ dataUpload <- function(input, output, session){
partial <- ifelse(standard()$details[[current_standard]]$match == "Partial", TRUE, FALSE)

if (partial) {
partial_cols <- standard()$details[[current_standard]]$matched_columns
partial_keys <- standard()$details[[current_standard]]$checks %>%
filter(valid==TRUE) %>%
select(text_key) %>%
pull()
Copy link
Copy Markdown
Contributor

@jwildfire jwildfire Feb 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

been looking for this function - no more unlist() for me.


generateSettings(standard=current_standard, chart="eDish", partial=partial, partial_cols = partial_cols)
generateSettings(standard=current_standard, chart="eDish", partial=partial, partial_keys = partial_keys)

} else {
generateSettings(standard=current_standard, chart="eDish")
Expand Down
85 changes: 62 additions & 23 deletions inst/eDISH_app/modules/renderSettings/renderSettings.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,26 @@ renderSettings <- function(input, output, session, data, settings, status){
choices_tb <- unique(c(settings$measure_values$TB, as.character(data()[,settings$measure_col])))
choices_alp <- unique(c(settings$measure_values$ALP, as.character(data()[,settings$measure_col])))

updateSelectizeInput(session, "measure_values--ALT", choices = choices_alt)
updateSelectizeInput(session, "measure_values--AST", choices = choices_ast)
updateSelectizeInput(session, "measure_values--TB", choices = choices_tb)
updateSelectizeInput(session, "measure_values--ALP", choices = choices_alp)
updateSelectizeInput(session, "measure_values--ALT", choices = choices_alt,
options = list (onInitialize = I('function() {
//console.log("initializing input with value")
//console.log(this)
}')))
updateSelectizeInput(session, "measure_values--AST", choices = choices_ast,
options = list (onInitialize = I('function() {
//console.log("initializing input with value")
//console.log(this)
}')))
updateSelectizeInput(session, "measure_values--TB", choices = choices_tb,
options = list (onInitialize = I('function() {
//console.log("initializing input with value")
//console.log(this)
}')))
updateSelectizeInput(session, "measure_values--ALP", choices = choices_alp,
options = list (onInitialize = I('function() {
//console.log("initializing input with value")
//console.log(this)
}')))
} else {
choices_ast <- unique(data()[,input$measure_col])
choices_alt <- unique(data()[,input$measure_col])
Expand All @@ -34,20 +50,32 @@ renderSettings <- function(input, output, session, data, settings, status){

updateSelectizeInput(session, "measure_values--ALT", choices = choices_alt,
options = list(
placeholder = '',
onInitialize = I('function() { this.setValue(""); }')))
onInitialize = I('function() {
//console.log("initializing input w/o value")
//console.log(this)
this.setValue("");
}')))
updateSelectizeInput(session, "measure_values--AST", choices = choices_ast,
options = list(
placeholder = '',
onInitialize = I('function() { this.setValue(""); }')))
onInitialize = I('function() {
//console.log("initializing input w/o value")
//console.log(this)
this.setValue("");
}')))
updateSelectizeInput(session, "measure_values--TB", choices = choices_tb,
options = list(
placeholder = '',
onInitialize = I('function() { this.setValue(""); }')))
onInitialize = I('function() {
//console.log("initializing input w/o value")
//console.log(this)
this.setValue("");
}')))
updateSelectizeInput(session, "measure_values--ALP", choices = choices_alp,
options = list(
placeholder = '',
onInitialize = I('function() { this.setValue(""); }')))
onInitialize = I('function() {
//console.log("initializing input w/o value")
//console.log(this)
this.setValue("");
}')))
}
} else {
updateSelectizeInput(session, "measure_values--ALT", choices = "")
Expand All @@ -71,15 +99,22 @@ renderSettings <- function(input, output, session, data, settings, status){
choices <- unique(c(settings$baseline$values, as.character(data()[,settings$baseline$value_col])))
choices <- sort(choices)

updateSelectizeInput(session, "baseline--values", choices = choices)
updateSelectizeInput(session, "baseline--values", choices = choices,
options = list (onInitialize = I('function() {
//console.log("initializing input with value")
//console.log(this)
}')))
} else {
choices <- unique(data()[,input$`baseline--value_col`])
choices <- sort(choices)

updateSelectizeInput(session, "baseline--values", choices = choices,
options = list(
placeholder = '',
onInitialize = I('function() { this.setValue(""); }')))
onInitialize = I('function() {
//console.log("initializing input w/o value")
//console.log(this)
this.setValue("");
}')))
}
} else {
updateSelectizeInput(session, "baseline--values", choices = "")
Expand All @@ -99,14 +134,21 @@ renderSettings <- function(input, output, session, data, settings, status){
if (!is.null(settings$analysisFlag$value_col) && input$`analysisFlag--value_col`==settings$analysisFlag$value_col){
choices <- unique(c(settings$analysisFlag$values, as.character(data()[,settings$analysisFlag$value_col])))

updateSelectizeInput(session, "analysisFlag--values", choices = choices)
updateSelectizeInput(session, "analysisFlag--values", choices = choices,,
options = list (onInitialize = I('function() {
//console.log("initializing input with value")
//console.log(this)
}')))
} else {
choices <- unique(data()[,input$`analysisFlag--value_col`])

updateSelectizeInput(session, "analysisFlag--values", choices = choices,
options = list(
placeholder = '',
onInitialize = I('function() { this.setValue(""); }')))
onInitialize = I('function() {
//console.log("initializing input w/o value")
//console.log(this)
this.setValue("");
}')))
}
} else {
updateSelectizeInput(session, "analysisFlag--values", choices = "")
Expand Down Expand Up @@ -222,10 +264,8 @@ renderSettings <- function(input, output, session, data, settings, status){
#Setting Status information (from failed checks only)
status_df <- reactive({
req(status_new())
status_new()$checkList %>%
map(., ~ keep(., names(.) %in% c("text_key","valid","message")) %>%
data.frame(., stringsAsFactors = FALSE)) %>%
bind_rows %>%

status_new()$checks %>%
group_by(text_key) %>%
mutate(num_fail = sum(valid==FALSE)) %>%
mutate(message_long = paste(message, collapse = " ") %>% trimws(),
Expand Down Expand Up @@ -336,7 +376,6 @@ renderSettings <- function(input, output, session, data, settings, status){
}
})


### return updated settings and status to global env.
return(list(settings = reactive(settings_new()),
status = reactive(status_new())))
Expand Down
Loading