minor changes

* Fixed failing tests
* format_results() and format_sites() provide message instead of warning about extra columns

Author: msorlien

R/format_results.R

@@ -95,10 +95,8 @@ format_results <- function(df, in_format, out_format, date_format = "m/d/Y",
     message("\tDropped ", toString(length(drop_col)), " columns")
   } else {
     df <- dplyr::select(df, dplyr::all_of(c(keep_col, drop_col)))
-    warning(
-      "\tUnable to rename ", toString(length(drop_col)), " columns: ",
-      paste(drop_col, collapse = ", "),
-      call. = FALSE
+    message(
+      "\tRetaining ", toString(length(drop_col)), " surplus columns"
     )
   }
 

R/format_sites.R

@@ -76,10 +76,8 @@ format_sites <- function(df, in_format, out_format, drop_extra_col = TRUE) {
     message("\tDropped ", toString(length(drop_col)), " columns")
   } else {
     df <- dplyr::select(df, dplyr::all_of(c(keep_col, drop_col)))
-    warning(
-      "\tUnable to rename ", toString(length(drop_col)), " columns: ",
-      paste(drop_col, collapse = ", "),
-      call. = FALSE
+    message(
+      "\tRetaining ", toString(length(drop_col)), " surplus columns"
     )
   }
 

R/utils_format_results.R

@@ -297,10 +297,10 @@ results_to_mwr <- function(.data) {
 
   # Update qualifiers, result value
   q_under <- c(
-    "<2B", "2-5B", "BQL", "BRL", "D>T", "DL", "IDL", "K", "LTGTE", "U"
+    "<2B", "2-5B", "BQL", "BRL", "D>T", "DL", "IDL", "K", "LTGTE", "U", "BDL"
   )
 
-  q_over <- c("GT", "E", "EE")
+  q_over <- c("GT", "E", "EE", "AQL")
 
   dat <- .data %>%
     dplyr::mutate(