Skip to content

Commit e7ec18c

Browse files
clairblacketerclairblacketer
authored
Merge pull request #815 from OHDSI/release-prep-v1.1.0
Release prep v1.1.0
2 parents 9e643b7 + d762413 commit e7ec18c

58 files changed

Lines changed: 2563 additions & 894 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎DESCRIPTION‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: CommonDataModel
22
Type: Package
33
Title: OMOP CDM DDL and Documentation Generator
4-
Version: 1.0.1
4+
Version: 1.1.0
55
Authors@R: person(given = "Clair",
66
family = "Blacketer",
77
role = c("aut", "cre"),
@@ -12,20 +12,20 @@ License: Apache License 2.0
1212
Encoding: UTF-8
1313
LazyData: true
1414
Depends:
15+
R (>= 4.1.0)
16+
Imports:
1517
DatabaseConnector,
1618
SqlRender,
17-
rJava
18-
Imports:
19-
rmarkdown,
2019
stringr,
21-
DBI,
22-
dplyr,
2320
readr
2421
Suggests:
25-
knitr,
26-
testthat (>= 3.0.0),
27-
RSQLite,
28-
withr
22+
DBI,
23+
dplyr,
24+
knitr,
25+
rmarkdown,
26+
RSQLite,
27+
testthat (>= 3.0.0),
28+
withr
2929
NeedsCompilation: no
30-
RoxygenNote: 7.3.3
3130
Config/testthat/edition: 3
31+
Config/roxygen2/version: 8.1.0

‎NAMESPACE‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ export(writeDdl)
1414
export(writeForeignKeys)
1515
export(writeIndex)
1616
export(writePrimaryKeys)
17-
import(DatabaseConnector)
18-
import(SqlRender)
19-
import(rJava)
20-
importFrom(utils,download.file)
21-
importFrom(utils,read.csv)
22-
importFrom(utils,write.csv)
17+
importFrom(utils,
18+
download.file,
19+
read.csv,
20+
write.csv
21+
)

‎NEWS.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
CommonDataModel v5.5.0
2+
======================
3+
4+
Provides suport for the OMOP Common Data Model v5.5 - announcement and release notes are found here: https://forums.ohdsi.org/t/omop-cdm-v5-5-release/25881
5+
6+
17
CommonDataModel v5.4.2
28
======================
39

‎R/CommonDataModel-package.R‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
#' @import rJava
2-
#' @import DatabaseConnector
3-
#' @import SqlRender
1+
#' @keywords internal
2+
"_PACKAGE"
3+
4+
## usethis namespace: start
5+
## usethis namespace: end
6+
7+
## mockable bindings: start
8+
## mockable bindings: end
49
NULL

‎R/utils.R‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docs/background.html‎

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,23 @@
22
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
33

44
<meta charset="utf-8">
5-
<meta name="generator" content="quarto-1.7.29">
5+
<meta name="generator" content="quarto-1.10.18">
66

77
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
88

99

1010
<title> OMOP CDM Background – OMOP Common Data Model</title>
1111
<style>
12-
code{white-space: pre-wrap;}
12+
/* Default styles provided by pandoc.
13+
** See https://pandoc.org/MANUAL.html#variables-for-html for config info.
14+
*/
1315
span.smallcaps{font-variant: small-caps;}
14-
div.columns{display: flex; gap: min(4vw, 1.5em);}
15-
div.column{flex: auto; overflow-x: auto;}
16+
div.columns{display: flex; gap: 1.5em;}
17+
div.column{flex: auto;}
18+
@media screen {
19+
div.columns{gap: min(4vw, 1.5em);}
20+
div.column{overflow-x: auto;}
21+
}
1622
div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
1723
ul.task-list{list-style: none;}
1824
ul.task-list li input[type="checkbox"] {
@@ -37,14 +43,14 @@
3743
<script src="site_libs/quarto-html/tippy.umd.min.js"></script>
3844
<script src="site_libs/quarto-html/anchor.min.js"></script>
3945
<link href="site_libs/quarto-html/tippy.css" rel="stylesheet">
40-
<link href="site_libs/quarto-html/quarto-syntax-highlighting-0815c480559380816a4d1ea211a47e91.css" rel="stylesheet" class="quarto-color-scheme" id="quarto-text-highlighting-styles">
41-
<link href="site_libs/quarto-html/quarto-syntax-highlighting-dark-748b535e376f14d4692bf2b2e5fd6380.css" rel="stylesheet" class="quarto-color-scheme quarto-color-alternate" id="quarto-text-highlighting-styles">
42-
<link href="site_libs/quarto-html/quarto-syntax-highlighting-0815c480559380816a4d1ea211a47e91.css" rel="stylesheet" class="quarto-color-scheme-extra" id="quarto-text-highlighting-styles">
46+
<link href="site_libs/quarto-html/quarto-syntax-highlighting-64a204ab8560d761af7679ceaba22944.css" rel="stylesheet" class="quarto-color-scheme" id="quarto-text-highlighting-styles">
47+
<link href="site_libs/quarto-html/quarto-syntax-highlighting-dark-b85bc7c33db8c58e0ec93c3465666fed.css" rel="stylesheet" class="quarto-color-scheme quarto-color-alternate" id="quarto-text-highlighting-styles">
48+
<link href="site_libs/quarto-html/quarto-syntax-highlighting-64a204ab8560d761af7679ceaba22944.css" rel="stylesheet" class="quarto-color-scheme-extra" id="quarto-text-highlighting-styles">
4349
<script src="site_libs/bootstrap/bootstrap.min.js"></script>
4450
<link href="site_libs/bootstrap/bootstrap-icons.css" rel="stylesheet">
45-
<link href="site_libs/bootstrap/bootstrap-c1fac2584b48ed01fb6e278e36375074.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme" id="quarto-bootstrap" data-mode="light">
46-
<link href="site_libs/bootstrap/bootstrap-dark-ccd81253fefb92e9cd3f9eb5b5d87b54.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme quarto-color-alternate" id="quarto-bootstrap" data-mode="dark">
47-
<link href="site_libs/bootstrap/bootstrap-c1fac2584b48ed01fb6e278e36375074.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme-extra" id="quarto-bootstrap" data-mode="light">
51+
<link href="site_libs/bootstrap/bootstrap-172ba59bd5e0b52282274ba0c0cc16fc.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme" id="quarto-bootstrap" data-mode="light">
52+
<link href="site_libs/bootstrap/bootstrap-dark-8b348f4b4b74a528bf910da1e8c5139e.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme quarto-color-alternate" id="quarto-bootstrap" data-mode="dark">
53+
<link href="site_libs/bootstrap/bootstrap-172ba59bd5e0b52282274ba0c0cc16fc.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme-extra" id="quarto-bootstrap" data-mode="light">
4854
<script id="quarto-search-options" type="application/json">{
4955
"location": "navbar",
5056
"copy-button": false,
@@ -73,17 +79,27 @@
7379
}
7480
}</script>
7581
<!-- Google tag (gtag.js) -->
82+
7683
<script async="" src="https://www.googletagmanager.com/gtag/js?id=G-37JJNBGH0H"></script>
84+
7785
<script>
86+
7887
window.dataLayer = window.dataLayer || [];
88+
7989
function gtag(){dataLayer.push(arguments);}
90+
8091
gtag('js', new Date());
8192

93+
94+
8295
gtag('config', 'G-37JJNBGH0H');
96+
8397
</script>
98+
8499
<link rel="shortcut icon" type="image/x-icon" href="man/favicon.ico">
85100

86101

102+
87103
<link rel="stylesheet" href="man/style.css">
88104
</head>
89105

@@ -241,6 +257,7 @@
241257
toggleColorMode(toAlternate);
242258
setStyleSentinel(toAlternate);
243259
toggleGiscusIfUsed(toAlternate, darkModeDefault);
260+
window.dispatchEvent(new Event('resize'));
244261
};
245262
// Switch to dark mode if need be
246263
if (hasAlternateSentinel()) {
@@ -256,7 +273,8 @@
256273
<div class="navbar-container container-fluid">
257274
<div class="navbar-brand-container mx-auto">
258275
<a href="./index.html" class="navbar-brand navbar-brand-logo">
259-
<img src="./man/ohdsi16x16.png" alt="" class="navbar-logo">
276+
<img src="./man/ohdsi16x16.png" alt="" class="navbar-logo light-content">
277+
<img src="./man/ohdsi16x16.png" alt="" class="navbar-logo dark-content">
260278
</a>
261279
<a class="navbar-brand" href="./index.html">
262280
<span class="navbar-title">OMOP Common Data Model</span>
@@ -595,13 +613,14 @@ <h2 class="anchored" data-anchor-id="design-principles">Design Principles</h2>
595613
e.clearSelection();
596614
}
597615
const getTextToCopy = function(trigger) {
598-
const codeEl = trigger.previousElementSibling.cloneNode(true);
599-
for (const childEl of codeEl.children) {
600-
if (isCodeAnnotation(childEl)) {
601-
childEl.remove();
602-
}
616+
const outerScaffold = trigger.parentElement.cloneNode(true);
617+
const codeEl = outerScaffold.querySelector('code');
618+
for (const childEl of codeEl.children) {
619+
if (isCodeAnnotation(childEl)) {
620+
childEl.remove();
603621
}
604-
return codeEl.innerText;
622+
}
623+
return codeEl.innerText;
605624
}
606625
const clipboard = new window.ClipboardJS('.code-copy-button:not([data-in-quarto-modal])', {
607626
text: getTextToCopy

‎docs/cdm30.html‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,23 @@
22
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
33

44
<meta charset="utf-8">
5-
<meta name="generator" content="quarto-1.7.29">
5+
<meta name="generator" content="quarto-1.10.18">
66

77
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
88

99

1010
<title>CDM v3 – OMOP Common Data Model</title>
1111
<style>
12-
code{white-space: pre-wrap;}
12+
/* Default styles provided by pandoc.
13+
** See https://pandoc.org/MANUAL.html#variables-for-html for config info.
14+
*/
1315
span.smallcaps{font-variant: small-caps;}
14-
div.columns{display: flex; gap: min(4vw, 1.5em);}
15-
div.column{flex: auto; overflow-x: auto;}
16+
div.columns{display: flex; gap: 1.5em;}
17+
div.column{flex: auto;}
18+
@media screen {
19+
div.columns{gap: min(4vw, 1.5em);}
20+
div.column{overflow-x: auto;}
21+
}
1622
div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
1723
ul.task-list{list-style: none;}
1824
ul.task-list li input[type="checkbox"] {
@@ -37,14 +43,14 @@
3743
<script src="site_libs/quarto-html/tippy.umd.min.js"></script>
3844
<script src="site_libs/quarto-html/anchor.min.js"></script>
3945
<link href="site_libs/quarto-html/tippy.css" rel="stylesheet">
40-
<link href="site_libs/quarto-html/quarto-syntax-highlighting-0815c480559380816a4d1ea211a47e91.css" rel="stylesheet" class="quarto-color-scheme" id="quarto-text-highlighting-styles">
41-
<link href="site_libs/quarto-html/quarto-syntax-highlighting-dark-748b535e376f14d4692bf2b2e5fd6380.css" rel="stylesheet" class="quarto-color-scheme quarto-color-alternate" id="quarto-text-highlighting-styles">
42-
<link href="site_libs/quarto-html/quarto-syntax-highlighting-0815c480559380816a4d1ea211a47e91.css" rel="stylesheet" class="quarto-color-scheme-extra" id="quarto-text-highlighting-styles">
46+
<link href="site_libs/quarto-html/quarto-syntax-highlighting-64a204ab8560d761af7679ceaba22944.css" rel="stylesheet" class="quarto-color-scheme" id="quarto-text-highlighting-styles">
47+
<link href="site_libs/quarto-html/quarto-syntax-highlighting-dark-b85bc7c33db8c58e0ec93c3465666fed.css" rel="stylesheet" class="quarto-color-scheme quarto-color-alternate" id="quarto-text-highlighting-styles">
48+
<link href="site_libs/quarto-html/quarto-syntax-highlighting-64a204ab8560d761af7679ceaba22944.css" rel="stylesheet" class="quarto-color-scheme-extra" id="quarto-text-highlighting-styles">
4349
<script src="site_libs/bootstrap/bootstrap.min.js"></script>
4450
<link href="site_libs/bootstrap/bootstrap-icons.css" rel="stylesheet">
45-
<link href="site_libs/bootstrap/bootstrap-c1fac2584b48ed01fb6e278e36375074.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme" id="quarto-bootstrap" data-mode="light">
46-
<link href="site_libs/bootstrap/bootstrap-dark-ccd81253fefb92e9cd3f9eb5b5d87b54.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme quarto-color-alternate" id="quarto-bootstrap" data-mode="dark">
47-
<link href="site_libs/bootstrap/bootstrap-c1fac2584b48ed01fb6e278e36375074.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme-extra" id="quarto-bootstrap" data-mode="light">
51+
<link href="site_libs/bootstrap/bootstrap-172ba59bd5e0b52282274ba0c0cc16fc.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme" id="quarto-bootstrap" data-mode="light">
52+
<link href="site_libs/bootstrap/bootstrap-dark-8b348f4b4b74a528bf910da1e8c5139e.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme quarto-color-alternate" id="quarto-bootstrap" data-mode="dark">
53+
<link href="site_libs/bootstrap/bootstrap-172ba59bd5e0b52282274ba0c0cc16fc.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme-extra" id="quarto-bootstrap" data-mode="light">
4854
<script id="quarto-search-options" type="application/json">{
4955
"location": "navbar",
5056
"copy-button": false,
@@ -73,17 +79,27 @@
7379
}
7480
}</script>
7581
<!-- Google tag (gtag.js) -->
82+
7683
<script async="" src="https://www.googletagmanager.com/gtag/js?id=G-37JJNBGH0H"></script>
84+
7785
<script>
86+
7887
window.dataLayer = window.dataLayer || [];
88+
7989
function gtag(){dataLayer.push(arguments);}
90+
8091
gtag('js', new Date());
8192

93+
94+
8295
gtag('config', 'G-37JJNBGH0H');
96+
8397
</script>
98+
8499
<link rel="shortcut icon" type="image/x-icon" href="man/favicon.ico">
85100

86101

102+
87103
<link rel="stylesheet" href="man/style.css">
88104
</head>
89105

‎docs/cdm53.html‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,23 @@
22
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
33

44
<meta charset="utf-8">
5-
<meta name="generator" content="quarto-1.8.27">
5+
<meta name="generator" content="quarto-1.10.18">
66

77
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
88

99

1010
<title>OMOP CDM v5.3 – OMOP Common Data Model</title>
1111
<style>
12-
code{white-space: pre-wrap;}
12+
/* Default styles provided by pandoc.
13+
** See https://pandoc.org/MANUAL.html#variables-for-html for config info.
14+
*/
1315
span.smallcaps{font-variant: small-caps;}
14-
div.columns{display: flex; gap: min(4vw, 1.5em);}
15-
div.column{flex: auto; overflow-x: auto;}
16+
div.columns{display: flex; gap: 1.5em;}
17+
div.column{flex: auto;}
18+
@media screen {
19+
div.columns{gap: min(4vw, 1.5em);}
20+
div.column{overflow-x: auto;}
21+
}
1622
div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
1723
ul.task-list{list-style: none;}
1824
ul.task-list li input[type="checkbox"] {
@@ -37,14 +43,14 @@
3743
<script src="site_libs/quarto-html/tippy.umd.min.js"></script>
3844
<script src="site_libs/quarto-html/anchor.min.js"></script>
3945
<link href="site_libs/quarto-html/tippy.css" rel="stylesheet">
40-
<link href="site_libs/quarto-html/quarto-syntax-highlighting-0815c480559380816a4d1ea211a47e91.css" rel="stylesheet" class="quarto-color-scheme" id="quarto-text-highlighting-styles">
41-
<link href="site_libs/quarto-html/quarto-syntax-highlighting-dark-748b535e376f14d4692bf2b2e5fd6380.css" rel="stylesheet" class="quarto-color-scheme quarto-color-alternate" id="quarto-text-highlighting-styles">
42-
<link href="site_libs/quarto-html/quarto-syntax-highlighting-0815c480559380816a4d1ea211a47e91.css" rel="stylesheet" class="quarto-color-scheme-extra" id="quarto-text-highlighting-styles">
46+
<link href="site_libs/quarto-html/quarto-syntax-highlighting-64a204ab8560d761af7679ceaba22944.css" rel="stylesheet" class="quarto-color-scheme" id="quarto-text-highlighting-styles">
47+
<link href="site_libs/quarto-html/quarto-syntax-highlighting-dark-b85bc7c33db8c58e0ec93c3465666fed.css" rel="stylesheet" class="quarto-color-scheme quarto-color-alternate" id="quarto-text-highlighting-styles">
48+
<link href="site_libs/quarto-html/quarto-syntax-highlighting-64a204ab8560d761af7679ceaba22944.css" rel="stylesheet" class="quarto-color-scheme-extra" id="quarto-text-highlighting-styles">
4349
<script src="site_libs/bootstrap/bootstrap.min.js"></script>
4450
<link href="site_libs/bootstrap/bootstrap-icons.css" rel="stylesheet">
45-
<link href="site_libs/bootstrap/bootstrap-c1fac2584b48ed01fb6e278e36375074.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme" id="quarto-bootstrap" data-mode="light">
46-
<link href="site_libs/bootstrap/bootstrap-dark-ccd81253fefb92e9cd3f9eb5b5d87b54.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme quarto-color-alternate" id="quarto-bootstrap" data-mode="dark">
47-
<link href="site_libs/bootstrap/bootstrap-c1fac2584b48ed01fb6e278e36375074.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme-extra" id="quarto-bootstrap" data-mode="light">
51+
<link href="site_libs/bootstrap/bootstrap-172ba59bd5e0b52282274ba0c0cc16fc.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme" id="quarto-bootstrap" data-mode="light">
52+
<link href="site_libs/bootstrap/bootstrap-dark-8b348f4b4b74a528bf910da1e8c5139e.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme quarto-color-alternate" id="quarto-bootstrap" data-mode="dark">
53+
<link href="site_libs/bootstrap/bootstrap-172ba59bd5e0b52282274ba0c0cc16fc.min.css" rel="stylesheet" append-hash="true" class="quarto-color-scheme-extra" id="quarto-bootstrap" data-mode="light">
4854
<script id="quarto-search-options" type="application/json">{
4955
"location": "navbar",
5056
"copy-button": false,
@@ -73,17 +79,27 @@
7379
}
7480
}</script>
7581
<!-- Google tag (gtag.js) -->
82+
7683
<script async="" src="https://www.googletagmanager.com/gtag/js?id=G-37JJNBGH0H"></script>
84+
7785
<script>
86+
7887
window.dataLayer = window.dataLayer || [];
88+
7989
function gtag(){dataLayer.push(arguments);}
90+
8091
gtag('js', new Date());
8192

93+
94+
8295
gtag('config', 'G-37JJNBGH0H');
96+
8397
</script>
98+
8499
<link rel="shortcut icon" type="image/x-icon" href="man/favicon.ico">
85100

86101

102+
87103
<link rel="stylesheet" href="man/style.css">
88104
</head>
89105

0 commit comments

Comments
 (0)