2025.0.0 update

DESCRIPTION

@@ -36,6 +36,7 @@ Remotes:
     github::PHSKC-APDE/rads, github::PHSKC-APDE/dtsurvey
 Suggests: 
     httr,
+    keyring,
     knitr,
     progress,
     rmarkdown,

NAMESPACE

@@ -1,6 +1,8 @@
 # Generated by roxygen2: do not edit by hand
 
 export(chi_calc)
+export(chi_chars_ccs)
+export(chi_chars_injury)
 export(chi_compare_estimates)
 export(chi_count_by_age)
 export(chi_drop_illogical_ages)
@@ -9,13 +11,17 @@ export(chi_generate_instructions_pop)
 export(chi_generate_metadata)
 export(chi_generate_tro_shell)
 export(chi_get_cols)
+export(chi_get_proper_pop)
 export(chi_get_yaml)
+export(chi_keep_proper_ages)
 export(chi_qa_tro)
 export(chi_update_sql)
+import(data.table)
 import(dtsurvey)
 import(future)
 import(future.apply)
 import(progressr)
+import(rads)
 importFrom(DBI,Id)
 importFrom(DBI,dbConnect)
 importFrom(DBI,dbDisconnect)
@@ -26,7 +32,9 @@ importFrom(data.table,"%between%")
 importFrom(data.table,":=")
 importFrom(data.table,.GRP)
 importFrom(data.table,.SD)
+importFrom(data.table,CJ)
 importFrom(data.table,`:=`)
+importFrom(data.table,as.data.table)
 importFrom(data.table,between)
 importFrom(data.table,copy)
 importFrom(data.table,data.table)
@@ -47,6 +55,9 @@ importFrom(future.apply,future_lapply)
 importFrom(glue,glue)
 importFrom(glue,glue_sql)
 importFrom(odbc,odbc)
+importFrom(progressr,handlers)
+importFrom(progressr,progressor)
+importFrom(progressr,with_progress)
 importFrom(rads,calc)
 importFrom(rads,round2)
 importFrom(rads,string_clean)
@@ -57,6 +68,7 @@ importFrom(stats,na.omit)
 importFrom(stats,qnorm)
 importFrom(tidyr,crossing)
 importFrom(tools,toTitleCase)
+importFrom(utils,capture.output)
 importFrom(utils,tail)
 importFrom(yaml,read_yaml)
 importFrom(yaml,yaml.load)

R/chi_calc.R

@@ -196,10 +196,11 @@ chi_calc <- function(ph.data = NULL,
           tempbv <- unique(na.omit(c(tempbv1, tempbv2)))
           tempend <- current_row$end
           tempstart <- current_row$start
+          temptab <- current_row$tab
 
           # use calc()----
           if(rate == FALSE){ # standard proportion analysis
-            if(any(grepl('wastate', tempbv))){
+            if(temptab == '_wastate'){
               tempest <- rads::calc(ph.data = ph.data[chi_year >= tempstart & chi_year <= tempend],
                               what = current_row$indicator_key,
                               by = tempbv,
@@ -214,7 +215,7 @@ chi_calc <- function(ph.data = NULL,
             }
           }
           if(rate == TRUE){
-            if(any(grepl('wastate', tempbv))){
+            if(temptab == '_wastate'){
               tempest <- rads::calc(ph.data = ph.data[chi_year >= tempstart & chi_year <= tempend],
                               what = current_row$indicator_key,
                               by = tempbv,