Rnaught Web

From 9cf25e707fbd49d357cf295ad62f83d805c59c2c Mon Sep 17 00:00:00 2001 From: Naeem Model Date: Sun, 26 May 2024 02:38:19 +0000 Subject: Update Shiny app - Refactor data upload and sample data - Create custom data upload button - Create script.js - Change Shiny notification colour - Bug fix: ensure the case counts in bulk data that have only one row are treated as a data frame, by wrapping them in 'data.frame' before passing to 'apply' --- inst/app/index.html | 7 +- inst/app/scripts/data.R | 183 ++++++++++++++------- inst/app/templates/content/data/enter-data.html | 6 +- .../content/data/enter-data/bulk-entry.html | 33 ++-- .../content/data/enter-data/load-samples.html | 17 ++ inst/app/www/script.js | 21 +++ inst/app/www/styles.css | 6 +- 7 files changed, 195 insertions(+), 78 deletions(-) create mode 100644 inst/app/templates/content/data/enter-data/load-samples.html create mode 100644 inst/app/www/script.js (limited to 'inst/app') diff --git a/inst/app/index.html b/inst/app/index.html index b0f1245..504918d 100644 --- a/inst/app/index.html +++ b/inst/app/index.html @@ -5,12 +5,7 @@ {{ headContent() }} Rnaught Web - - +

+ {{ htmlTemplate("templates/content/data/enter-data/bulk-entry.html") }} + {{ htmlTemplate("templates/content/data/enter-data/load-samples.html") }} +Bulk entry - Show required format -

Enter one or more rows in the following format:

Manually enter rows or upload a CSV file in the following format:

Dataset name,Time units,Case counts

@@ -27,11 +25,24 @@

- - +

+ Enter manually + +

+ +

+ + + +Upload a CSV file +

+ +

- - + diff --git a/inst/app/templates/content/data/enter-data/load-samples.html b/inst/app/templates/content/data/enter-data/load-samples.html new file mode 100644 index 0000000..a42a8c8 --- /dev/null +++ b/inst/app/templates/content/data/enter-data/load-samples.html @@ -0,0 +1,17 @@ +

Load samples

+{{ + checkboxInput(inputId = "covid_canada", label = "COVID-19 Canada, 2020/03/03 - 2020/03/31 (Weekly)", + value = FALSE, width = "100%" + ) +}} +{{ + checkboxInput(inputId = "covid_ontario", label = "COVID-19 Ontario, 2020/03/03 - 2020/03/31 (Weekly)", + value = FALSE, width = "100%" + ) +}} +

+ +

+ diff --git a/inst/app/www/script.js b/inst/app/www/script.js new file mode 100644 index 0000000..c31584f --- /dev/null +++ b/inst/app/www/script.js @@ -0,0 +1,21 @@ +$(document).ready(() => { + // Enable tooltips. + $('[data-bs-toggle="tooltip"]').tooltip(); + + // Toggle the text in the bulk data help button. + $('#bulk-help-toggle').on('click', event => { + btn = $(event.target); + show_format = 'Show required format'; + btn.text(btn.text() === show_format ? 'Hide required format' : show_format); + }); + + // Trigger the file selector via a custom button. + $('#data-upload-select').on('click', () => { + $('#data_upload').trigger('click'); + }); + + // Display the name of the uploaded file. + $('#data_upload').on('change', event => { + $('#data-upload-name').attr('placeholder', event.target.files[0].name); + }); +}); diff --git a/inst/app/www/styles.css b/inst/app/www/styles.css index f6c4407..d53a387 100644 --- a/inst/app/www/styles.css +++ b/inst/app/www/styles.css @@ -20,7 +20,11 @@ noscript { margin-top: -0.5rem; } -td.selected { +td.selected, .shiny-notification { background-color: black; color: white; } + +#data_upload { + display: none; +} -- cgit v1.2.3