Merging documentation

Merge branch 'develop' # Conflicts: # docs/articles/MultipleAnalyses.html # docs/articles/ResultsSchema.html # docs/articles/SingleStudies.html # docs/articles/SingleStudies_files/figure-html/unnamed-chunk-57-1.png # docs/pkgdown.yml # docs/pull_request_template.html
OHDSI · Jun 10, 2024 · 67b26f6 · 67b26f6
2 parents 4aa9d57 + fd8bccf
commit 67b26f6
Show file tree

Hide file tree

Showing 89 changed files with 201 additions and 149 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: SelfControlledCaseSeries
 Type: Package
 Title: Self-Controlled Case Series
-Version: 5.2.1
-Date: 2024-06-06
+Version: 5.2.2
+Date: 2024-06-10
 Authors@R: c(
   person("Martijn", "Schuemie", , "[email protected]", role = c("aut", "cre")),
 	person("Patrick", "Ryan", role = c("aut")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,10 @@
+SelfControlledCaseSeries 5.2.2
+==============================
+
+Bugfixes
+
+1. Fix export when there are multiple exposure-outcomes per SCCS data file.
+
 SelfControlledCaseSeries 5.2.1
 ==============================
 

diff --git a/R/Export.R b/R/Export.R
@@ -238,7 +238,7 @@ exportExposuresOutcomes <- function(outputFolder, exportFolder) {
 
   esoList <- readRDS(file.path(outputFolder, "exposuresOutcomeList.rds"))
   ref <- getFileReference(outputFolder) %>%
-    distinct(exposuresOutcomeSetId, exposuresOutcomeSetSeqId)
+    distinct(.data$exposuresOutcomeSetId, .data$exposuresOutcomeSetSeqId)
 
   # exposure = eso$exposures[[1]]
   convertExposureToTable <- function(exposure) {
@@ -762,23 +762,23 @@ exportGroup <- function(group, sccsDiagnosticThresholds, outputFolder, databaseI
                                                     .data$preExposureDiagnostic != "FAIL", 1, 0)) %>%
       select(-"eraId")
     sccsDiagnosticsSummary[[length(sccsDiagnosticsSummary) + 1]] <- table
-    return(list(
-      sccsAgeSpanning = sccsAgeSpanning,
-      sccsAttrition = sccsAttrition,
-      sccsCalendarTimeSpanning = sccsCalendarTimeSpanning,
-      sccsCensorModel = sccsCensorModel,
-      sccsCovariate = sccsCovariate,
-      sccsCovariateResult = sccsCovariateResult,
-      sccsEra = sccsEra,
-      sccsEventDepObservation = sccsEventDepObservation,
-      sccsLikelihoodProfile = sccsLikelihoodProfile,
-      sccsSpline = sccsSpline,
-      sccsTimeToEvent = sccsTimeToEvent,
-      sccsTimeTrend = sccsTimeTrend,
-      sccsTimePeriod = sccsTimePeriod,
-      sccsDiagnosticsSummary = sccsDiagnosticsSummary
-    ))
   }
+  return(list(
+    sccsAgeSpanning = sccsAgeSpanning,
+    sccsAttrition = sccsAttrition,
+    sccsCalendarTimeSpanning = sccsCalendarTimeSpanning,
+    sccsCensorModel = sccsCensorModel,
+    sccsCovariate = sccsCovariate,
+    sccsCovariateResult = sccsCovariateResult,
+    sccsEra = sccsEra,
+    sccsEventDepObservation = sccsEventDepObservation,
+    sccsLikelihoodProfile = sccsLikelihoodProfile,
+    sccsSpline = sccsSpline,
+    sccsTimeToEvent = sccsTimeToEvent,
+    sccsTimeTrend = sccsTimeTrend,
+    sccsTimePeriod = sccsTimePeriod,
+    sccsDiagnosticsSummary = sccsDiagnosticsSummary
+  ))
 }
 
 computeSpans <- function(studyPopulation, variable = "age") {

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/articles/MultipleAnalyses.html b/docs/articles/MultipleAnalyses.html
diff --git a/docs/articles/MultipleAnalyses_files/figure-html/unnamed-chunk-17-1.png b/docs/articles/MultipleAnalyses_files/figure-html/unnamed-chunk-17-1.png
diff --git a/docs/articles/MultipleAnalyses_files/figure-html/unnamed-chunk-19-1.png b/docs/articles/MultipleAnalyses_files/figure-html/unnamed-chunk-19-1.png
diff --git a/docs/articles/MultipleAnalyses_files/figure-html/unnamed-chunk-21-1.png b/docs/articles/MultipleAnalyses_files/figure-html/unnamed-chunk-21-1.png
diff --git a/docs/articles/MultipleAnalyses_files/figure-html/unnamed-chunk-23-1.png b/docs/articles/MultipleAnalyses_files/figure-html/unnamed-chunk-23-1.png
diff --git a/docs/articles/MultipleAnalyses_files/figure-html/unnamed-chunk-25-1.png b/docs/articles/MultipleAnalyses_files/figure-html/unnamed-chunk-25-1.png
diff --git a/docs/articles/ResultsSchema.html b/docs/articles/ResultsSchema.html