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.

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

Bugfix/351 residual flipping #354

Merged
merged 4 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
- fix bug in Model Fitting module (panel had a duplicate ID, resulting in some weird behaviour)
- remove gpairs dependency
- fix bug where variables swap after saving residuals

- major update: integrate instance-configurability to allow various instances to run on the same deployment (e.g., the Census at School build)

Expand Down
68 changes: 29 additions & 39 deletions panels/C1_Visualize/2_visualize-panel-server.R
Original file line number Diff line number Diff line change
Expand Up @@ -6985,56 +6985,46 @@ output$old_advanced_options_panel = renderUI({


## switch variables selected
observe({
input$switch1

isolate({
if(!is.null(input$vari2) && input$vari2 != "none") {
observeEvent(input$switch1, {
if(!is.null(input$vari2) && input$vari2 != "none") {

var1.old = input$vari1
var2.old = input$vari2
var1.old = input$vari1
var2.old = input$vari2

updateSelectInput(session, "vari1", selected = var2.old)
updateSelectInput(session, "vari1", selected = var2.old)

ch = colnames(vis.data())
# if(!is.null(input$vari1) && input$vari1 %in% ch){
ch = ch[-which(ch %in% var2.old)]
# }
ch = c("none", ch)
ch = colnames(vis.data())
# if(!is.null(input$vari1) && input$vari1 %in% ch){
ch = ch[-which(ch %in% var2.old)]
# }
ch = c("none", ch)

updateSelectInput(session,"vari2", choices = ch, selected = var1.old)
}
})
updateSelectInput(session,"vari2", choices = ch, selected = var1.old)
}
})

observe({
input$switch2
isolate({
if((!is.null(input$vari2) && input$vari2 != "none") ||
(!is.null(input$subs1) && input$subs1 != "none")) {
var2.old = input$vari2
var3.old = input$subs1
observeEvent(input$switch2, {
if((!is.null(input$vari2) && input$vari2 != "none") ||
(!is.null(input$subs1) && input$subs1 != "none")) {
var2.old = input$vari2
var3.old = input$subs1

updateSelectInput(session, "vari2", selected = var3.old)
updateSelectInput(session, "vari2", selected = var3.old)

ch = colnames(vis.data())
ch = ch[-which(ch %in% input$vari1)]
if(!is.null(var3.old) && var3.old != "none")
ch = ch[-which(ch %in% var3.old)]
updateSelectInput(session, "subs1", choices = ch, selected = var2.old)
}
})
ch = colnames(vis.data())
ch = ch[-which(ch %in% input$vari1)]
if(!is.null(var3.old) && var3.old != "none")
ch = ch[-which(ch %in% var3.old)]
updateSelectInput(session, "subs1", choices = ch, selected = var2.old)
}
})

observe({
input$switch3
isolate({
var3.old = input$subs1
var4.old = input$subs2
observeEvent(input$switch3, {
var3.old = input$subs1
var4.old = input$subs2

updateSelectInput(session, "subs1", selected = var4.old)
updateSelectInput(session, "subs2", selected = var3.old)
})
updateSelectInput(session, "subs1", selected = var4.old)
updateSelectInput(session, "subs2", selected = var3.old)
})


Expand Down