diff --git a/DESCRIPTION b/DESCRIPTION index 5555a6d..6dd6305 100755 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -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 diff --git a/R/fbcheck_ui_sbase.R b/R/fbcheck_ui_sbase.R index db1e98d..e374b16 100755 --- a/R/fbcheck_ui_sbase.R +++ b/R/fbcheck_ui_sbase.R @@ -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%") ) ) diff --git a/man/get_pvs_param.Rd b/man/get_pvs_param.Rd index b7fe0a5..315b7af 100755 --- a/man/get_pvs_param.Rd +++ b/man/get_pvs_param.Rd @@ -4,7 +4,8 @@ \alias{get_pvs_param} \title{Function to obtain parameter from Participatory Varietal Selection's fieldbooks (PVS).} \usage{ -get_pvs_param(pvs_data, col_param = "Mother", row_param = "Plot_size_(m2)") +get_pvs_param(pvs_data, col_param = "Mother", + row_param = "Plot_size_(m2)") } \arguments{ \item{pvs_data}{fieldbook path} diff --git a/man/get_solgenomic_headers.Rd b/man/get_solgenomic_headers.Rd new file mode 100644 index 0000000..533948a --- /dev/null +++ b/man/get_solgenomic_headers.Rd @@ -0,0 +1,11 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/utils.R +\name{get_solgenomic_headers} +\alias{get_solgenomic_headers} +\title{Get headers from Solgenomic Databases} +\usage{ +get_solgenomic_headers() +} +\description{ +Get headers from Solgenomic Databases +} diff --git a/man/upload_studies.Rd b/man/upload_studies.Rd index 1ee5dfe..9335216 100755 --- a/man/upload_studies.Rd +++ b/man/upload_studies.Rd @@ -5,8 +5,8 @@ \title{Upload \code{FieldBookApp} data or studies from HIDAP to SweetPotatoBase trough Breeding API (BrAPI)} \usage{ upload_studies(dbname = "sweetpotatobase", - urltoken = "sgn:eggplant@sweetpotatobase-test.sgn.cornell.edu/brapi/v1/token", - urlput = "sgn:eggplant@sweetpotatobase-test.sgn.cornell.edu/brapi/v1/observations", + urltoken = "https://sweetpotatobase.org/brapi/v1/token", + urlput = "https://sweetpotatobase.org/brapi/v1/observations", user = "obenites", password = ";c8U:G&z:X", dfr) } \arguments{ diff --git a/tests/testthat/excel/combine_fb_1.rds b/tests/testthat/excel/combine_fb_1.rds old mode 100644 new mode 100755 diff --git a/tests/testthat/test_multiple_files.R b/tests/testthat/test_multiple_files.R old mode 100644 new mode 100755 index c1b4c09..e709bef --- a/tests/testthat/test_multiple_files.R +++ b/tests/testthat/test_multiple_files.R @@ -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")