diff --git a/DESCRIPTION b/DESCRIPTION index a118e5e..c7ecfa1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: ABCindex Title: A Shiny app to calculate ABCI for checkerboard assays -Version: 0.99.75 +Version: 0.99.78 Authors@R: person(given = "Travis", family = "Blimkie", diff --git a/R/2_upload.R b/R/2_upload.R index 5c6c7e6..e3a3782 100644 --- a/R/2_upload.R +++ b/R/2_upload.R @@ -370,13 +370,13 @@ fill_card <- function(expt) { p(strong("Treatment in the columns: "), expt$cols$name), p( tags$b("Detected concentrations: "), - paste(expt$cols$conc, collapse = ", ") + paste(sort(expt$cols$conc, decreasing = TRUE), collapse = ", ") ), hr(), p(strong("Treatment in the rows: "), expt$rows$name), p( strong("Detected concentrations: "), - paste(expt$rows$conc, collapse = ", ") + paste(sort(expt$rows$conc, decreasing = TRUE), collapse = ", ") ), ) } @@ -413,6 +413,8 @@ make_card <- function(title, height = NULL, class = NULL, content) { #' @return A shiny notification bubble #' notify <- function(id = NULL, list) { + stopifnot(all(c("type", "status", "message", "suggest") %in% names(list))) + showNotification( id = id, type = list$type, diff --git a/app.R b/app.R index 8e45491..072fca6 100644 --- a/app.R +++ b/app.R @@ -13,7 +13,11 @@ suppressPackageStartupMessages({ app_theme <- bs_theme( version = 5, bootswatch = "cosmo", - base_font = font_collection(font_google("Inter", local = FALSE), "Roboto", "sans-serif"), + base_font = font_collection( + font_google("Inter", local = FALSE), + "Roboto", + "sans-serif" + ), font_scale = 0.9, primary = "#cc002c", secondary = "#373a3c", diff --git a/www/help/help.html b/www/help/help.html index cfc0bfa..1df4c7b 100644 --- a/www/help/help.html +++ b/www/help/help.html @@ -3,19 +3,40 @@
- The first section covers the use of the app. Click - here to jump to the next section, which details - the calculation of the ABCI values. + The first section covers how to use the app, while the second section + details the calculation of ABCI values.
-Interpretation and visualization of checkerboard assays.
-ABCindex takes any form of checkerboard assay data (e.g. crystal violet or TTC) in the same format produced by microplate readers. Data can @@ -46,7 +67,7 @@
Click "Upload plate data" and select an .xlsx or .ods file formatted as detailed above. An input preview will appear to the right of @@ -75,7 +96,7 @@
ABCindex lets you visualize two types of information:
ABCindex aims to overcome the main challenges presented when evaluating antibiofilm combination therapies and, in more general terms, provide a @@ -325,7 +348,7 @@
The Anti-Biofilm Combination Index (ABCI) is calculated for each specific combination of drug concentrations (i.e., each well on a 96-well plate). @@ -423,7 +446,7 @@
Checkerboard data uploaded to ABCindex goes through the following steps:
@@ -454,7 +477,7 @@