Skip to content

Commit

Permalink
Merge branch 'alondhe-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
t-abdul-basser committed Oct 11, 2018
2 parents b71c4ec + d79b966 commit 222b091
Show file tree
Hide file tree
Showing 39 changed files with 6,247 additions and 4,509 deletions.
11 changes: 6 additions & 5 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
^.*\.Rproj$
^\.Rproj\.user$
^.travis.yml$
deploy.sh
^\.github$
^.*\.Rproj$
^\.Rproj\.user$
^.travis.yml$
deploy.sh
^\.github$

8 changes: 4 additions & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
inst/doc/* linguist-documentation
vignettes/* linguist-documentation
man/* linguist-documentation
extras/* linguist-documentation
inst/doc/* linguist-documentation
vignettes/* linguist-documentation
man/* linguist-documentation
extras/* linguist-documentation
9 changes: 2 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
.Rproj.user
.Rhistory
.RData
env_vars
docker-compose.yml
errorReport.txt
output/
man/Achilles.Rd
.Rproj.user
68 changes: 43 additions & 25 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,25 +1,43 @@
Package: Achilles
Type: Package
Title: Creates Descriptive Statistics Summary for an Entire OMOP CDM Instance
Version: 1.6.2
Date: 2018-10-04
Author: Patrick Ryan, Martijn Schuemie, Vojtech Huser, Chris Knoll, Ajit Londhe
Maintainer: Patrick Ryan <[email protected]>
LazyData: true
Description: Creates descriptive statistics summary for an entire OMOP CDM
instance. Since Aug 2016 only CDM v5 is actively being extended. Achilles
Heel component does data quality assesment.
Depends:
SqlRender,
DatabaseConnector (>= 2.0.0),
rjson
Suggests:
testthat,
dplyr,
R.utils,
OhdsiRTools
Remotes:
OHDSI/OhdsiRTools
License: Apache License
Roxygen: list(wrap = FALSE)
RoxygenNote: 6.1.0
Package: Achilles
Type: Package
Title: Creates Descriptive Statistics Summary for an Entire OMOP CDM Instance
Version: 1.6.3
Date: 2018-10-05
Authors@R: c(
person("Patrick", "Ryan", email = "[email protected]", role = c("aut", "cre")),
person("Martijn", "Schuemie", email = "[email protected]", role = c("aut")),
person("Vojtech", "Huser", role = c("aut")),
person("Chris", "Knoll", role = c("aut")),
person("Ajit", "Londhe", email = "[email protected]", role = c("aut")),
person("Taha", "Abdul-Basser", role = c("aut")),
person("Observational Health Data Science and Informatics", role = c("cph"))
)
Maintainer: Patrick Ryan <[email protected]>
LazyData: true
Description: Creates descriptive statistics summary for an entire OMOP CDM
instance. Since Aug 2016 only CDM v5 is actively being extended. Achilles
Heel component does data quality assesment.
Depends:
SqlRender,
DatabaseConnector (>= 2.0.0)
Imports:
dplyr,
rjson,
ParallelLogger
Suggests:
testthat,
R.utils,
shiny,
DT,
shinydashboard,
magrittr,
tidyr,
knitr,
rmarkdown
VignetteBuilder: knitr
Remotes:
OHDSI/OhdsiRTools
License: Apache License
Roxygen: list(wrap = FALSE)
RoxygenNote: 6.1.0
Encoding: UTF-8
74 changes: 38 additions & 36 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,36 +1,38 @@
# Generated by roxygen2: do not edit by hand

export(achilles)
export(achillesHeel)
export(addDatasource)
export(createConceptHierarchy)
export(createIndices)
export(dropAllScratchTables)
export(exportConditionEraToJson)
export(exportConditionToJson)
export(exportDashboardToJson)
export(exportDataDensityToJson)
export(exportDeathToJson)
export(exportDrugEraToJson)
export(exportDrugToJson)
export(exportHeelToJson)
export(exportMeasurementToJson)
export(exportMetaToJson)
export(exportObservationPeriodToJson)
export(exportObservationToJson)
export(exportPersonToJson)
export(exportProcedureToJson)
export(exportToJson)
export(exportVisitToJson)
export(fetchAchillesAnalysisResults)
export(fetchAchillesHeelResults)
export(getAnalysisDetails)
export(showReportTypes)
export(validateSchema)
import(DatabaseConnector)
import(SqlRender)
import(rjson)
importFrom(utils,compareVersion)
importFrom(utils,packageVersion)
importFrom(utils,read.csv)
importFrom(utils,zip)
# Generated by roxygen2: do not edit by hand

export(achilles)
export(achillesHeel)
export(addDataSource)
export(createConceptHierarchy)
export(createIndices)
export(dropAllScratchTables)
export(exportConditionEraToJson)
export(exportConditionToJson)
export(exportDashboardToJson)
export(exportDataDensityToJson)
export(exportDeathToJson)
export(exportDrugEraToJson)
export(exportDrugToJson)
export(exportHeelToJson)
export(exportMeasurementToJson)
export(exportMetaToJson)
export(exportObservationPeriodToJson)
export(exportObservationToJson)
export(exportPersonToJson)
export(exportProcedureToJson)
export(exportToJson)
export(exportVisitToJson)
export(fetchAchillesAnalysisResults)
export(fetchAchillesHeelResults)
export(getAnalysisDetails)
export(launchHeelResultsViewer)
export(showReportTypes)
export(validateSchema)
import(DatabaseConnector)
import(OhdsiRTools)
import(SqlRender)
import(rjson)
importFrom(utils,compareVersion)
importFrom(utils,packageVersion)
importFrom(utils,read.csv)
importFrom(utils,zip)
11 changes: 6 additions & 5 deletions R/Achilles-package.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#' @import DatabaseConnector
#' @import SqlRender
#' @import rjson
#' @importFrom utils compareVersion packageVersion read.csv zip
NULL
#' @import DatabaseConnector
#' @import OhdsiRTools
#' @import SqlRender
#' @import rjson
#' @importFrom utils compareVersion packageVersion read.csv zip
NULL
Loading

0 comments on commit 222b091

Please sign in to comment.