diff --git a/DESCRIPTION b/DESCRIPTION index dcd64587..6a51302e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: inti Type: Package -Version: 0.6.3 +Version: 0.6.4 Title: Tools and Statistical Procedures in Plant Science Description: The 'inti' package is part of the 'inkaverse' project for developing different procedures and tools used in plant science and experimental designs. @@ -8,7 +8,7 @@ Description: The 'inti' package is part of the 'inkaverse' project for developin experiments and data collection (tarpuy()), data analysis and graphics (yupana()) , and technical writing. Learn more about the 'inkaverse' project at . -Date: 2023-10-26 +Date: 2024-02-05 Authors@R: c( person("Flavio", "Lozano-Isla", email = "flavjack@gmail.com", role = c("aut", "cre") , comment = c(ORCID = "0000-0002-0714-669X")), diff --git a/NEWS.md b/NEWS.md index 23b7708a..3638918c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -8,13 +8,13 @@ # inti 0.6.4 +- Update bootstrap in apps - Tarpuy: - Alows to exclude or delete `{when}` or `{sample}` colums - - Allow `defaultValue` for numeric traits + - Allow `defaultValue` for traits - Rticles - Include images using markdown syntax `![]()` - => Fix if "defaultvalue" is in the trait table # inti 0.6.3 diff --git a/R/tarpuy_traits.R b/R/tarpuy_traits.R index 09947d4e..fbd53672 100644 --- a/R/tarpuy_traits.R +++ b/R/tarpuy_traits.R @@ -76,7 +76,7 @@ #' fb <- ds %>% tarpuy_design() #' #' url_trt <- paste0("https://docs.google.com/spreadsheets/d/" -#' , "1kIoI__uHQpZ8qXMPFoZpimBhywU8J0Rw49KgjJcovMY/edit#gid=1056776892") +#' , "1fBSnEq6CmYKK9Pdxlz0egEEflezJRnlAOylQwbythBE/edit#gid=179601173") #' #' traits <- gsheet2tbl(url_trt) #' @@ -111,8 +111,8 @@ tarpuy_traits <- function(fieldbook = NULL # ------------------------------------------------------------------------- - cols <- c("trait" = NA_real_, "format" = NA_real_, "default" = NA_real_ - , "minimum" = NA_real_, "maximum" = NA_real_, "details" = NA_real_ + cols <- c("trait" = NA_real_, "format" = NA_real_, "default" = NA_real_ + , "minimum" = NA_real_, "maximum" = NA_real_, "details" = NA_real_ , "categories" = NA_real_) # ------------------------------------------------------------------------- @@ -131,6 +131,7 @@ tarpuy_traits <- function(fieldbook = NULL } %>% dplyr::bind_rows() %>% tibble::add_column(!!!cols[!names(cols) %in% names(.)]) %>% + dplyr::rename("defaultValue" = "default") %>% dplyr::filter(!grepl("X", .data$abbreviation)) traitsnames <- traitstb %>% @@ -163,7 +164,7 @@ tarpuy_traits <- function(fieldbook = NULL dplyr::mutate(isVisible = "true") %>% dplyr::mutate(defaultValue = dplyr::case_when( .data$format %in% "boolean" ~ "false" - , TRUE ~ .data$defaultValue + , TRUE ~ as.character(.data$defaultValue) )) %>% dplyr::rowwise() %>% dplyr::mutate(categories = case_when( diff --git a/docs/404.html b/docs/404.html index 67ae50af..6a2fff05 100644 --- a/docs/404.html +++ b/docs/404.html @@ -13,8 +13,8 @@ - - + + @@ -37,7 +37,7 @@ inti - 0.6.3 + 0.6.4