Skip to content

Commit

Permalink
fix issues in upload multiple trials
Browse files Browse the repository at this point in the history
  • Loading branch information
CIP-RIU committed Oct 21, 2019
1 parent 62f4641 commit c309991
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 6 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ Imports:
Remotes: CIP-RIU/traittools
License: MIT + file LICENSE
LazyData: true
RoxygenNote: 6.1.0
RoxygenNote: 6.1.1
Suggests: testthat
2 changes: 1 addition & 1 deletion R/fbcheck_ui_sbase.R
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ fbcheck_ui_sbase <- function(type="tab", title="Data Quality and Processing", na
fluidRow(
column(
12,
shinysky::shinyalert("alert_fbapp_warning_sbase", FALSE, auto.close.after = 8),
shinysky::shinyalert("alert_fbapp_warning_sbase", FALSE, auto.close.after = 11),
rHandsontableOutput("hot_btable_fbapp_sbase",height = "600px",width = "100%")
)
)
Expand Down
3 changes: 2 additions & 1 deletion man/get_pvs_param.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions man/get_solgenomic_headers.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/upload_studies.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file modified tests/testthat/excel/combine_fb_1.rds
100644 → 100755
Empty file.
3 changes: 2 additions & 1 deletion tests/testthat/test_multiple_files.R
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ context("Test combination of multiple fieldbook App files")

test_that("Combination of two files with same headers", {

dfr <- readRDS(file="tests/testthat/excel/combine_fb_1.rds")
file <- rprojroot::find_testthat_root_file("excel","combine_fb_1.rds")
dfr <- readRDS(file=file)
fb <- fbapp2json(dfr, token="lfsermmo93;3r")
testthat::expect_equal(class(fb),"json")

Expand Down

0 comments on commit c309991

Please sign in to comment.