switch to v2.0.5 merge conflict correction

Merge branch 'main' of https://github.com/OHDSI/Capr into develop # Conflicts: # NEWS.md # README.md # docs/news/index.html # docs/pkgdown.yml # extras/Capr.pdf # extras/pdf_vignette/Capr-conceptSets.pdf # extras/pdf_vignette/Examples.pdf # extras/pdf_vignette/Using-Capr.pdf # extras/pdf_vignette/capr_design.pdf # extras/pdf_vignette/capr_templates.pdf
OHDSI · Jul 3, 2023 · c3596bb · c3596bb
2 parents c26f195 + 561033d
commit c3596bb
Show file tree

Hide file tree

Showing 116 changed files with 152 additions and 127 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: Capr
 Title: Cohort Definition Application Programming
-Version: 2.0.4
+Version: 2.0.5
 Authors@R: c(
     person("Martin", "Lavallee", , "[email protected]", role = c("aut", "cre")),
     person("Adam", "Black", , "[email protected]", role = "aut")

diff --git a/NEWS.md b/NEWS.md
@@ -1,9 +1,15 @@
-Capr 2.0.4
+Capr 2.0.5
 ==========
 - change query functions to match known syntax (i.e. drug => drugExposure, condition => conditionOccurrence)
 - require a name for `cs()`
 - improve documentation (add vignette for query, count and group)
 
+
+Capr 2.0.4
+==========
+- hot fix add procedure occurrence into query
+
+
 Capr 2.0.3
 ==========
 - add opAttribute super class

diff --git a/R/query.R b/R/query.R
@@ -27,6 +27,7 @@ setValidity("Query", function(object) {
   validDomains <- c("ConditionEra",
                     "ConditionOccurrence",
                     "Death",
+                    "ProcedureOccurrence",
                     "DeviceExposure",
                     "DoseEra",
                     "DrugExposure",

diff --git a/README.md b/README.md
@@ -29,10 +29,15 @@ devtools::install_github("ohdsi/Capr")
 
 Documentation can be found on the [package website](https://ohdsi.github.io/Capr/).
 
--   Vignette: [Using Capr](https://ohdsi.github.io/Capr/articles/Using-Capr.html)
--   Vignette: [Examples](https://ohdsi.github.io/Capr/articles/Examples.html)
--   Vignette: [Capr Components](https://ohdsi.github.io/Capr/articles/capr_objects.html)
--   [Design Document](https://ohdsi.github.io/Capr/articles/capr_design.html)
+
+PDF versions of the documentation are also available:
+
+-   Vignette: [Using Capr](https://raw.githubusercontent.com/OHDSI/Capr/main/extras/pdf_vignette/Using-Capr.pdf)
+-   Vignette: [Capr Examples](https://raw.githubusercontent.com/OHDSI/Capr/main/extras/pdf_vignette/Examples.pdf)
+-   Vignette: [Working with Concept Sets in Capr](https://raw.githubusercontent.com/OHDSI/Capr/main/extras/pdf_vignette/Capr-conceptSets.pdf)
+-   Vignette: [Capr for Templating Cohort Definitions](https://raw.githubusercontent.com/OHDSI/Capr/main/extras/pdf_vignette/capr_templatesr.pdf)
+-   Vignette: [Capr components](https://raw.githubusercontent.com/OHDSI/Capr/main/extras/pdf_vignette/capr_objects.pdf)
+-   [Design Document](https://raw.githubusercontent.com/OHDSI/Capr/main/extras/pdf_vignette/capr_design.pdf)
 -   [Package manual](https://raw.githubusercontent.com/OHDSI/Capr/main/extras/Capr.pdf)
 
 # Support

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/articles/Capr-conceptSets.html b/docs/articles/Capr-conceptSets.html
diff --git a/docs/articles/Examples.html b/docs/articles/Examples.html
diff --git a/docs/articles/Using-Capr.html b/docs/articles/Using-Capr.html
diff --git a/docs/articles/capr_design.html b/docs/articles/capr_design.html
diff --git a/docs/articles/capr_objects.html b/docs/articles/capr_objects.html
diff --git a/docs/articles/capr_templates.html b/docs/articles/capr_templates.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -8,5 +8,5 @@ articles:
   capr_templates: capr_templates.html
   Examples: Examples.html
   Using-Capr: Using-Capr.html
-last_built: 2023-07-03T17:05Z
+last_built: 2023-07-03T17:28Z
 
diff --git a/docs/reference/Capr-package.html b/docs/reference/Capr-package.html
diff --git a/docs/reference/CensoringCriteria-class.html b/docs/reference/CensoringCriteria-class.html
diff --git a/docs/reference/Concept-class.html b/docs/reference/Concept-class.html
diff --git a/docs/reference/ConceptAttribute-class.html b/docs/reference/ConceptAttribute-class.html
diff --git a/docs/reference/ConceptSet-class.html b/docs/reference/ConceptSet-class.html
diff --git a/docs/reference/ConceptSetItem-class.html b/docs/reference/ConceptSetItem-class.html
diff --git a/docs/reference/Criteria-class.html b/docs/reference/Criteria-class.html
diff --git a/docs/reference/DrugExposureExit-class.html b/docs/reference/DrugExposureExit-class.html
diff --git a/docs/reference/Endpoint-class.html b/docs/reference/Endpoint-class.html
diff --git a/docs/reference/EventAperture-class.html b/docs/reference/EventAperture-class.html
diff --git a/docs/reference/EventWindow-class.html b/docs/reference/EventWindow-class.html
diff --git a/docs/reference/FixedDurationExit-class.html b/docs/reference/FixedDurationExit-class.html
diff --git a/docs/reference/Group-class.html b/docs/reference/Group-class.html
diff --git a/docs/reference/LogicAttribute-class.html b/docs/reference/LogicAttribute-class.html
diff --git a/docs/reference/ObservationExit-class.html b/docs/reference/ObservationExit-class.html
diff --git a/docs/reference/ObservationWindow-class.html b/docs/reference/ObservationWindow-class.html
diff --git a/docs/reference/Occurrence-class.html b/docs/reference/Occurrence-class.html
diff --git a/docs/reference/Query-class.html b/docs/reference/Query-class.html
diff --git a/docs/reference/age.html b/docs/reference/age.html
diff --git a/docs/reference/as.data.frame-ConceptSet-method.html b/docs/reference/as.data.frame-ConceptSet-method.html
diff --git a/docs/reference/as.json.html b/docs/reference/as.json.html