Updated all packages and dealt with code issues as a result of the up…

…dates
dfe-analytical-services · Jan 8, 2024 · dc55767 · dc55767
1 parent d93cc06
commit dc55767
Show file tree

Hide file tree

Showing 4 changed files with 297 additions and 242 deletions.
diff --git a/R/dashboard_panels.R b/R/dashboard_panels.R
@@ -155,7 +155,7 @@ dashboard_panel <- function() {
                 selectizeInput(
                   inputId = "subj_select",
                   label = "3. Select a subject",
-                  choices = list(Subjects = sort(unique(qual_lookup$Subject))),
+                  choices = unique(qual_lookup$Subject),
                   selected = "Mathematics"
                 )
               ), 

diff --git a/global.R b/global.R
@@ -67,7 +67,7 @@ number_select_function <- function(ReportYr_sel, qual, subj, size, grade_structu
 
   table <- stud_numbers %>%
     filter(ReportYr == ReportYr_sel & QUAL_ID == filter_selection) %>%
-    select(PRIOR_BAND, grade_list)
+    select(PRIOR_BAND, all_of(grade_list))
 
   return(table)
 }
@@ -86,7 +86,7 @@ percentage_select_function <- function(ReportYr_sel, qual, subj, size, grade_str
 
   table <- stud_percentages %>%
     filter(ReportYr == ReportYr_sel & QUAL_ID == filter_selection) %>%
-    select(PRIOR_BAND, grade_list)
+    select(PRIOR_BAND, all_of(grade_list))
 
   return(table)
 }