Merge branch 'v6.3.6-dev' of github.com:StuartWheater/dsBaseClient into v6.3.6-dev

Author: StuartWheater

DESCRIPTION

@@ -59,7 +59,7 @@ Authors@R: c(person(given = "Paul",
                     comment = c(ORCID = "0009-0003-2419-1964")))
 License: GPL-3
 Depends:
-    R (>= 4.0.0),
+    R (>= 4.1.0),
     DSI (>= 1.7.1)
 Imports:
     fields,
@@ -69,7 +69,10 @@ Imports:
     gridExtra,
     data.table,
     methods,
-    dplyr
+    dplyr,
+    purrr,
+    assertthat,
+    cli
 Suggests:
     lme4,
     httr,

NAMESPACE

@@ -105,6 +105,7 @@ export(ds.setDefaultOpals)
 export(ds.setSeed)
 export(ds.skewness)
 export(ds.sqrt)
+export(ds.standardiseDf)
 export(ds.subset)
 export(ds.subsetByClass)
 export(ds.summary)
@@ -120,7 +121,30 @@ export(ds.var)
 export(ds.vectorCalc)
 export(subsetHelper)
 import(DSI)
-import(data.table)
+importFrom(DSI,datashield.aggregate)
+importFrom(DSI,datashield.assign)
+importFrom(assertthat,assert_that)
+importFrom(cli,cli_abort)
+importFrom(cli,cli_alert_danger)
+importFrom(cli,cli_alert_info)
+importFrom(cli,cli_alert_success)
+importFrom(cli,cli_alert_warning)
+importFrom(cli,cli_end)
+importFrom(cli,cli_li)
+importFrom(cli,cli_ol)
+importFrom(cli,cli_text)
+importFrom(cli,cli_ul)
+importFrom(data.table,.SD)
+importFrom(dplyr,"%>%")
+importFrom(dplyr,all_of)
+importFrom(dplyr,bind_rows)
+importFrom(dplyr,case_when)
+importFrom(dplyr,row_number)
+importFrom(dplyr,where)
+importFrom(purrr,map)
+importFrom(purrr,map_lgl)
+importFrom(purrr,pmap)
+importFrom(purrr,pmap_lgl)
 importFrom(stats,as.formula)
 importFrom(stats,na.omit)
 importFrom(stats,ts)

R/computeWeightedMeans.R

@@ -11,7 +11,7 @@
 #' @param by character vector of the columns to group by
 #' @return Returns a data table object with computed weighted means.
 #'
-#' @import data.table
+#' @importFrom data.table .SD
 #' @importFrom stats as.formula na.omit ts weighted.mean
 #' @keywords internal
 computeWeightedMeans <- function(data_table, variables, weight, by) {

R/ds.bp_standards.R

@@ -26,7 +26,6 @@
 #' blood pressure in children and adolescents:
 #' https://www.nhlbi.nih.gov/sites/default/files/media/docs/hbp_ped.pdf
 #' @author Demetris Avraam for DataSHIELD Development Team
-#' @import data.table
 #' @export
 ds.bp_standards <- function(sex=NULL, age=NULL, height=NULL, bp=NULL, systolic=TRUE, 
                             newobj=NULL, datasources=NULL){