Merge pull request #18 from acornamr/dev

v2.5.8
acornamr · Jan 26, 2023 · 63b4ede · 63b4ede
2 parents cb73ce9 + a97d954
commit 63b4ede
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: acorn
 Type: Package
 Title: A Dashboard for ACORN AMR Data
-Version: 2.5.7
+Version: 2.5.8
 Authors@R: c(person(given = "Olivier", family = "Celhay", 
                 email = "[email protected]", 
                 role = c("aut", "cre"), comment = c(ORCID = "https://orcid.org/0000-0002-2971-9110")),

diff --git a/inst/acorn/app.R b/inst/acorn/app.R
@@ -1,4 +1,4 @@
-app_version <- "2.5.7"  # Make sure that the app version is identical in DESCRIPTION
+app_version <- "2.5.8"  # Make sure that the app version is identical in DESCRIPTION
 session_start_time <- format(Sys.time(), "%Y-%m-%d_%HH%M")
 
 # IMPORTANT: ensure that there is a match between the calls below and:
@@ -19,19 +19,25 @@ library(markdown)  # The includeMarkdown function requires the markdown package.
 library(REDCapR)
 library(shiny)
 library(shiny.i18n)  # i18n$t()
-library(shinyWidgets)  # prettyCheckboxGroup()
+library(shinyWidgets)
 library(tidyverse)
 
+cols_sir <- c(
+  "S" = "#2c3e50",
+  "I" = "#f39c12", 
+  "R" = "#e74c3c"
+)
 
-cols_sir <- c("#2c3e50", "#f39c12", "#e74c3c")  # resp. S, I and R
-cols_aware <- c("Access" = "#2c3e50", 
-                "Watch" = "#f39c12", 
-                "Reserve" = "#e74c3c", 
-                "Unknown" = "#969696")
+cols_aware <- c(
+  "Access"  = "#2c3e50", 
+  "Watch"   = "#f39c12", 
+  "Reserve" = "#e74c3c", 
+  "Unknown" = "#969696"
+)
 
-acorn_theme    <- bs_theme(version = 5, bootswatch = "flatly", "border-width" = "2px")
-acorn_theme_la <- bs_theme(version = 5, bootswatch = "flatly", "border-width" = "2px", base_font = "Phetsarath OT")
-acorn_theme_vn <- bs_theme(version = 5, bootswatch = "flatly", "border-width" = "2px", base_font = "Arial")
+acorn_theme    <- bslib::bs_theme(version = 4, bootswatch = "flatly", "border-width" = "2px")
+acorn_theme_la <- bslib::bs_theme(version = 4, bootswatch = "flatly", "border-width" = "2px", base_font = "Phetsarath OT")
+acorn_theme_vn <- bslib::bs_theme(version = 4, bootswatch = "flatly", "border-width" = "2px", base_font = "Arial")
 
 hc_export_kind <- c("downloadJPEG", "downloadCSV")
 hc_acorn_theme <- hc_theme_google() # mirror in startup.R, highchart_sir.R and highchart_sir_evolution.R
@@ -348,7 +354,8 @@ ui <- page(
                        nav(title = i18n$t("Load .acorn from cloud"), value = "load_cloud",
                            br(),
                            fluidRow(
-                             column(3,
+                             column(
+                               width = 3,
                                     pickerInput("acorn_files_server", choices = NULL, label = NULL,
                                                 options = pickerOptions(actionsBox = TRUE, noneSelectedText = "No file selected", liveSearch = FALSE,
                                                                         showTick = TRUE, header = "10 most recent files:"))

diff --git a/inst/acorn/www/R/update_input_widgets.R b/inst/acorn/www/R/update_input_widgets.R
@@ -12,7 +12,8 @@ updatePickerInput(session, "filter_ward_type",
                   selected = sort(unique(redcap_f01f05_dta()$ward_type)), 
                   options = list(status = "primary",
                                  `selected-text-format` = paste0("count > ", length(unique(redcap_f01f05_dta()$ward_type)) - 1), 
-                                 `count-selected-text` = "All Type of Wards"))
+                                 `count-selected-text` = "All Type of Wards"),
+                  clearOptions = TRUE)
 
 updateDateRangeInput(session, "filter_date_enrolment", 
                      start = min(redcap_f01f05_dta()$date_episode_enrolment, na.rm = TRUE),