From f2dbcb6073d55a357a91ba70e3cab45c142bb123 Mon Sep 17 00:00:00 2001 From: Chris Bennett Date: Wed, 8 Nov 2023 14:26:25 +0000 Subject: [PATCH] add extra . to ./shinytest and ran tidy_code() to try and sort our pull request errors --- renv/settings.json | 19 +++++++++++++++++++ server.R | 5 +++-- tests/shinytest.R | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 renv/settings.json diff --git a/renv/settings.json b/renv/settings.json new file mode 100644 index 0000000..60536a5 --- /dev/null +++ b/renv/settings.json @@ -0,0 +1,19 @@ +{ + "bioconductor.version": null, + "external.libraries": [], + "ignored.packages": [], + "package.dependency.fields": [ + "Imports", + "Depends", + "LinkingTo" + ], + "ppm.enabled": null, + "ppm.ignored.urls": [], + "r.version": null, + "snapshot.type": "packrat", + "use.cache": true, + "vcs.ignore.cellar": true, + "vcs.ignore.library": true, + "vcs.ignore.local": true, + "vcs.manage.ignores": true +} diff --git a/server.R b/server.R index c8d3dac..335947f 100644 --- a/server.R +++ b/server.R @@ -174,12 +174,13 @@ server <- function(input, output, session) { prior_band_chart <- reactive({ req(input$qual_select) stud_percentages %>% - left_join(lookup_characters, by = c("ReportYr", + left_join(lookup_characters, by = c( + "ReportYr", "Qual_Description", "SUBLEVNO", "Subject", "SUBJ", "ASIZE", "GSIZE", "SIZE", "gradeStructure" )) %>% subset(ReportYr == input$ReportYr_select & - Qual_Description == input$qual_select & + Qual_Description == input$qual_select & Subject == input$subj_select & SIZE == input$size_select & gradeStructure == input$grade_structure_select) %>% diff --git a/tests/shinytest.R b/tests/shinytest.R index 5b003fe..db16081 100644 --- a/tests/shinytest.R +++ b/tests/shinytest.R @@ -1,2 +1,2 @@ library(shinytest) -shinytest::testApp("./") +shinytest::testApp("../")