Znk fix 233 (#238)

* import epikit and fix some bugs

* add versions, fix docs

* add epikit for the remotes

* add drat additional repo

* remove version req for epikit (will add later)

* add news; bump version

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: sitrep
 Title: Report templates and helper functions for EPI
-Version: 0.1.4
+Version: 0.1.5
 Authors@R: 
     c(person(given = "Dirk",
              family = "Schumacher",
@@ -65,8 +65,9 @@ Imports:
     srvyr,
     stats,
     utils,
-    apyramid,
-    epidict
+    apyramid (>= 0.1.0),
+    epidict (>= 0.0.0.9001),
+    epikit
 Suggests:
     testthat (>= 2.1.0),
     sessioninfo,
@@ -75,36 +76,32 @@ Suggests:
 Remotes:
   reconhub/linelist,
   R4EPI/apyramid,
-  R4EPI/epidict
+  R4EPI/epidict,
+  R4EPI/epikit
+Additional_repositories: https://r4epi.github.io/drat
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.0.2
 Collate: 
     'add_weights_cluster.R'
     'add_weights_strata.R'
-    'age-categories.R'
     'age-pyramid.R'
-    'cfr.R'
     'check_templates.R'
     'data_frame_from_2x2.R'
     'descriptive-table.R'
-    'find_breaks.R'
     'find_date_cause.R'
     'gen_eligible_interviewed.R'
     'gen_population.R'
     'gen_polygon.R'
-    'helpers.R'
-    'inline_fun.R'
     'msf_dict_rename_helper.R'
     'epidict_exports.R'
+    'epikit_exports.R'
     'prettify_tabulation.R'
-    'relabel_proportions.R'
     'sample-size.R'
     'tab_descriptive.R'
     'tab_univariate.R'
     'tabulate_survey.R'
     'transpose_pretty.R'
     'two_by_two_funs.R'
-    'unite_ci.R'
     'zcurve.R'

NAMESPACE

@@ -12,6 +12,8 @@ export(case_fatality_rate_df)
 export(check_sitrep_templates)
 export(constrain_dates)
 export(data_frame_from_2x2)
+export(dots_to_charlist)
+export(fac_from_num)
 export(find_breaks)
 export(find_date_cause)
 export(find_end_date)
@@ -52,6 +54,25 @@ importFrom(dplyr,ungroup)
 importFrom(epidict,gen_data)
 importFrom(epidict,msf_dict)
 importFrom(epidict,msf_dict_survey)
+importFrom(epikit,age_categories)
+importFrom(epikit,attack_rate)
+importFrom(epikit,augment_redundant)
+importFrom(epikit,case_fatality_rate)
+importFrom(epikit,case_fatality_rate_df)
+importFrom(epikit,dots_to_charlist)
+importFrom(epikit,fac_from_num)
+importFrom(epikit,find_breaks)
+importFrom(epikit,fmt_ci)
+importFrom(epikit,fmt_ci_df)
+importFrom(epikit,fmt_count)
+importFrom(epikit,fmt_pci)
+importFrom(epikit,fmt_pci_df)
+importFrom(epikit,group_age_categories)
+importFrom(epikit,merge_ci_df)
+importFrom(epikit,merge_pci_df)
+importFrom(epikit,mortality_rate)
+importFrom(epikit,rename_redundant)
+importFrom(epikit,unite_ci)
 importFrom(ggplot2,aes)
 importFrom(ggplot2,expand_scale)
 importFrom(ggplot2,geom_density)

NEWS.md

@@ -1,3 +1,9 @@
+# sitrep 0.1.5
+
+* Import {epikit}. This replaces several small formatting functions like 
+  `fmt_ci()` and `rename_redundant()`. It also replaces `age_categories()` and
+  `attack_rate()` etc.
+
 # sitrep 0.1.4
 
 * Rename import of {msfdict} to {epidict}