V6.3.6 dev feat/standardise df#665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timcadman merged 29 commits into from
Jul 6, 2026
Merged

V6.3.6 dev feat/standardise df #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f131520
Merge pull request #645 from datashield/v6.3.5
StuartWheater Jan 12, 2026
dce4504
feat: add ds.standardiseDf
timcadman Apr 21, 2026
6290957
feat: add test data and connection functions for standardise
timcadman Apr 21, 2026
256499f
fix: replace snapshot tests with regex, update NAMESPACE
timcadman Apr 21, 2026
ed24ee4
test: add perf test for ds.standardiseDf
timcadman Apr 21, 2026
eb57c2f
trigger CI
timcadman May 14, 2026
9333df9
Merge branch 'master' of github.com:datashield/dsBaseClient into v6.3…
timcadman May 14, 2026
cd179cd
Merge branch 'v6.3.6-dev' into v6.3.6-dev-feat/standardise-df
StuartWheater Jun 8, 2026
6740d52
added myself as author
timcadman Jun 23, 2026
aef399b
fixed import issues
timcadman Jun 23, 2026
a5b7a42
Merge pull request #71 from StuartWheater/v6.3.6-dev
StuartWheater Jun 23, 2026
ca12139
revert: set roxygen to 8.0
timcadman Jun 23, 2026
9e26604
Increased ping timeout plus additional per entry
StuartWheater Jun 24, 2026
dfc6145
Merge branch 'v6.3.6-dev-feat/standardise-df' into v6.3.6-dev-feat/st…
StuartWheater Jun 24, 2026
966a91f
fixed connection path
timcadman Jun 25, 2026
fdc9913
removed datsahield print
timcadman Jun 25, 2026
4f3c472
updated dsBase tar
timcadman Jun 25, 2026
5a637a9
Merge #684: fixed connection path
timcadman Jun 25, 2026
6985c70
Merge branch 'v6.3.6-dev' into v6.3.6-dev-feat/standardise-df
timcadman Jun 26, 2026
b9bb03d
try: print errors to diagnose test failure
timcadman Jun 26, 2026
1f9ee2c
updated dsBase tar
timcadman Jun 26, 2026
e21498c
revert: don't print errors
timcadman Jun 26, 2026
0af6b22
fix data source for opal
timcadman Jun 29, 2026
ebedec9
Update tars for dsBase_6.3.6
StuartWheater Jun 29, 2026
02dab81
remove tibble dependency
timcadman Jun 29, 2026
815f3d8
Merge branch 'v6.3.6-dev-feat/standardise-df' of https://github.com/d…
timcadman Jun 30, 2026
29af097
Merge pull request #687 from datashield/v6.3.6-dev
StuartWheater Jul 2, 2026
3abecdd
Increase R version required
StuartWheater Jul 2, 2026
770e9e5
Update to 'hp-laptop-quay' performance profile
StuartWheater Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ Authors@R: c(person(given = "Paul",
comment = c(ORCID = "0009-0003-2419-1964")))
License: GPL-3
Depends:
R (>= 4.0.0),
R (>= 4.1.0),
DSI (>= 1.7.1)
Imports:
fields,
Expand All@@ -69,7 +69,10 @@ Imports:
gridExtra,
data.table,
methods,
dplyr
dplyr,
purrr,
assertthat,
cli
Suggests:
lme4,
httr,
Expand Down
26 changes: 25 additions & 1 deletion NAMESPACE
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,6 +105,7 @@ export(ds.setDefaultOpals)
export(ds.setSeed)
export(ds.skewness)
export(ds.sqrt)
export(ds.standardiseDf)
export(ds.subset)
export(ds.subsetByClass)
export(ds.summary)
Expand All@@ -120,7 +121,30 @@ export(ds.var)
export(ds.vectorCalc)
export(subsetHelper)
import(DSI)
import(data.table)
importFrom(DSI,datashield.aggregate)
importFrom(DSI,datashield.assign)
importFrom(assertthat,assert_that)
importFrom(cli,cli_abort)
importFrom(cli,cli_alert_danger)
importFrom(cli,cli_alert_info)
importFrom(cli,cli_alert_success)
importFrom(cli,cli_alert_warning)
importFrom(cli,cli_end)
importFrom(cli,cli_li)
importFrom(cli,cli_ol)
importFrom(cli,cli_text)
importFrom(cli,cli_ul)
importFrom(data.table,.SD)
importFrom(dplyr,"%>%")
importFrom(dplyr,all_of)
importFrom(dplyr,bind_rows)
importFrom(dplyr,case_when)
importFrom(dplyr,row_number)
importFrom(dplyr,where)
importFrom(purrr,map)
importFrom(purrr,map_lgl)
importFrom(purrr,pmap)
importFrom(purrr,pmap_lgl)
importFrom(stats,as.formula)
importFrom(stats,na.omit)
importFrom(stats,ts)
Expand Down
2 changes: 1 addition & 1 deletion R/computeWeightedMeans.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@
#' @param by character vector of the columns to group by
#' @return Returns a data table object with computed weighted means.
#'
#' @import data.table
#' @importFrom data.table .SD
#' @importFrom stats as.formula na.omit ts weighted.mean
#' @keywords internal
computeWeightedMeans <- function(data_table, variables, weight, by) {
Expand Down
1 change: 0 additions & 1 deletion R/ds.bp_standards.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
#' blood pressure in children and adolescents:
#' https://www.nhlbi.nih.gov/sites/default/files/media/docs/hbp_ped.pdf
#' @author Demetris Avraam for DataSHIELD Development Team
#' @import data.table
#' @export
ds.bp_standards <- function(sex=NULL, age=NULL, height=NULL, bp=NULL, systolic=TRUE,
newobj=NULL, datasources=NULL){
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

V6.3.6 dev feat/standardise df#665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timcadman merged 29 commits into from
Jul 6, 2026
Merged

V6.3.6 dev feat/standardise df #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f131520
Merge pull request #645 from datashield/v6.3.5
StuartWheater Jan 12, 2026
dce4504
feat: add ds.standardiseDf
timcadman Apr 21, 2026
6290957
feat: add test data and connection functions for standardise
timcadman Apr 21, 2026
256499f
fix: replace snapshot tests with regex, update NAMESPACE
timcadman Apr 21, 2026
ed24ee4
test: add perf test for ds.standardiseDf
timcadman Apr 21, 2026
eb57c2f
trigger CI
timcadman May 14, 2026
9333df9
Merge branch 'master' of github.com:datashield/dsBaseClient into v6.3…
timcadman May 14, 2026
cd179cd
Merge branch 'v6.3.6-dev' into v6.3.6-dev-feat/standardise-df
StuartWheater Jun 8, 2026
6740d52
added myself as author
timcadman Jun 23, 2026
aef399b
fixed import issues
timcadman Jun 23, 2026
a5b7a42
Merge pull request #71 from StuartWheater/v6.3.6-dev
StuartWheater Jun 23, 2026
ca12139
revert: set roxygen to 8.0
timcadman Jun 23, 2026
9e26604
Increased ping timeout plus additional per entry
StuartWheater Jun 24, 2026
dfc6145
Merge branch 'v6.3.6-dev-feat/standardise-df' into v6.3.6-dev-feat/st…
StuartWheater Jun 24, 2026
966a91f
fixed connection path
timcadman Jun 25, 2026
fdc9913
removed datsahield print
timcadman Jun 25, 2026
4f3c472
updated dsBase tar
timcadman Jun 25, 2026
5a637a9
Merge #684: fixed connection path
timcadman Jun 25, 2026
6985c70
Merge branch 'v6.3.6-dev' into v6.3.6-dev-feat/standardise-df
timcadman Jun 26, 2026
b9bb03d
try: print errors to diagnose test failure
timcadman Jun 26, 2026
1f9ee2c
updated dsBase tar
timcadman Jun 26, 2026
e21498c
revert: don't print errors
timcadman Jun 26, 2026
0af6b22
fix data source for opal
timcadman Jun 29, 2026
ebedec9
Update tars for dsBase_6.3.6
StuartWheater Jun 29, 2026
02dab81
remove tibble dependency
timcadman Jun 29, 2026
815f3d8
Merge branch 'v6.3.6-dev-feat/standardise-df' of https://github.com/d…
timcadman Jun 30, 2026
29af097
Merge pull request #687 from datashield/v6.3.6-dev
StuartWheater Jul 2, 2026
3abecdd
Increase R version required
StuartWheater Jul 2, 2026
770e9e5
Update to 'hp-laptop-quay' performance profile
StuartWheater Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ Authors@R: c(person(given = "Paul",
comment = c(ORCID = "0009-0003-2419-1964")))
License: GPL-3
Depends:
R (>= 4.0.0),
R (>= 4.1.0),
DSI (>= 1.7.1)
Imports:
fields,
Expand All@@ -69,7 +69,10 @@ Imports:
gridExtra,
data.table,
methods,
dplyr
dplyr,
purrr,
assertthat,
cli
Suggests:
lme4,
httr,
Expand Down
26 changes: 25 additions & 1 deletion NAMESPACE
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,6 +105,7 @@ export(ds.setDefaultOpals)
export(ds.setSeed)
export(ds.skewness)
export(ds.sqrt)
export(ds.standardiseDf)
export(ds.subset)
export(ds.subsetByClass)
export(ds.summary)
Expand All@@ -120,7 +121,30 @@ export(ds.var)
export(ds.vectorCalc)
export(subsetHelper)
import(DSI)
import(data.table)
importFrom(DSI,datashield.aggregate)
importFrom(DSI,datashield.assign)
importFrom(assertthat,assert_that)
importFrom(cli,cli_abort)
importFrom(cli,cli_alert_danger)
importFrom(cli,cli_alert_info)
importFrom(cli,cli_alert_success)
importFrom(cli,cli_alert_warning)
importFrom(cli,cli_end)
importFrom(cli,cli_li)
importFrom(cli,cli_ol)
importFrom(cli,cli_text)
importFrom(cli,cli_ul)
importFrom(data.table,.SD)
importFrom(dplyr,"%>%")
importFrom(dplyr,all_of)
importFrom(dplyr,bind_rows)
importFrom(dplyr,case_when)
importFrom(dplyr,row_number)
importFrom(dplyr,where)
importFrom(purrr,map)
importFrom(purrr,map_lgl)
importFrom(purrr,pmap)
importFrom(purrr,pmap_lgl)
importFrom(stats,as.formula)
importFrom(stats,na.omit)
importFrom(stats,ts)
Expand Down
2 changes: 1 addition & 1 deletion R/computeWeightedMeans.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@
#' @param by character vector of the columns to group by
#' @return Returns a data table object with computed weighted means.
#'
#' @import data.table
#' @importFrom data.table .SD
#' @importFrom stats as.formula na.omit ts weighted.mean
#' @keywords internal
computeWeightedMeans <- function(data_table, variables, weight, by) {
Expand Down
1 change: 0 additions & 1 deletion R/ds.bp_standards.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
#' blood pressure in children and adolescents:
#' https://www.nhlbi.nih.gov/sites/default/files/media/docs/hbp_ped.pdf
#' @author Demetris Avraam for DataSHIELD Development Team
#' @import data.table
#' @export
ds.bp_standards <- function(sex=NULL, age=NULL, height=NULL, bp=NULL, systolic=TRUE,
newobj=NULL, datasources=NULL){
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

V6.3.6 dev feat/standardise df#665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timcadman merged 29 commits into from
Jul 6, 2026
Merged

V6.3.6 dev feat/standardise df #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f131520
Merge pull request #645 from datashield/v6.3.5
StuartWheater Jan 12, 2026
dce4504
feat: add ds.standardiseDf
timcadman Apr 21, 2026
6290957
feat: add test data and connection functions for standardise
timcadman Apr 21, 2026
256499f
fix: replace snapshot tests with regex, update NAMESPACE
timcadman Apr 21, 2026
ed24ee4
test: add perf test for ds.standardiseDf
timcadman Apr 21, 2026
eb57c2f
trigger CI
timcadman May 14, 2026
9333df9
Merge branch 'master' of github.com:datashield/dsBaseClient into v6.3…
timcadman May 14, 2026
cd179cd
Merge branch 'v6.3.6-dev' into v6.3.6-dev-feat/standardise-df
StuartWheater Jun 8, 2026
6740d52
added myself as author
timcadman Jun 23, 2026
aef399b
fixed import issues
timcadman Jun 23, 2026
a5b7a42
Merge pull request #71 from StuartWheater/v6.3.6-dev
StuartWheater Jun 23, 2026
ca12139
revert: set roxygen to 8.0
timcadman Jun 23, 2026
9e26604
Increased ping timeout plus additional per entry
StuartWheater Jun 24, 2026
dfc6145
Merge branch 'v6.3.6-dev-feat/standardise-df' into v6.3.6-dev-feat/st…
StuartWheater Jun 24, 2026
966a91f
fixed connection path
timcadman Jun 25, 2026
fdc9913
removed datsahield print
timcadman Jun 25, 2026
4f3c472
updated dsBase tar
timcadman Jun 25, 2026
5a637a9
Merge #684: fixed connection path
timcadman Jun 25, 2026
6985c70
Merge branch 'v6.3.6-dev' into v6.3.6-dev-feat/standardise-df
timcadman Jun 26, 2026
b9bb03d
try: print errors to diagnose test failure
timcadman Jun 26, 2026
1f9ee2c
updated dsBase tar
timcadman Jun 26, 2026
e21498c
revert: don't print errors
timcadman Jun 26, 2026
0af6b22
fix data source for opal
timcadman Jun 29, 2026
ebedec9
Update tars for dsBase_6.3.6
StuartWheater Jun 29, 2026
02dab81
remove tibble dependency
timcadman Jun 29, 2026
815f3d8
Merge branch 'v6.3.6-dev-feat/standardise-df' of https://github.com/d…
timcadman Jun 30, 2026
29af097
Merge pull request #687 from datashield/v6.3.6-dev
StuartWheater Jul 2, 2026
3abecdd
Increase R version required
StuartWheater Jul 2, 2026
770e9e5
Update to 'hp-laptop-quay' performance profile
StuartWheater Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ Authors@R: c(person(given = "Paul",
comment = c(ORCID = "0009-0003-2419-1964")))
License: GPL-3
Depends:
R (>= 4.0.0),
R (>= 4.1.0),
DSI (>= 1.7.1)
Imports:
fields,
Expand All@@ -69,7 +69,10 @@ Imports:
gridExtra,
data.table,
methods,
dplyr
dplyr,
purrr,
assertthat,
cli
Suggests:
lme4,
httr,
Expand Down
26 changes: 25 additions & 1 deletion NAMESPACE
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,6 +105,7 @@ export(ds.setDefaultOpals)
export(ds.setSeed)
export(ds.skewness)
export(ds.sqrt)
export(ds.standardiseDf)
export(ds.subset)
export(ds.subsetByClass)
export(ds.summary)
Expand All@@ -120,7 +121,30 @@ export(ds.var)
export(ds.vectorCalc)
export(subsetHelper)
import(DSI)
import(data.table)
importFrom(DSI,datashield.aggregate)
importFrom(DSI,datashield.assign)
importFrom(assertthat,assert_that)
importFrom(cli,cli_abort)
importFrom(cli,cli_alert_danger)
importFrom(cli,cli_alert_info)
importFrom(cli,cli_alert_success)
importFrom(cli,cli_alert_warning)
importFrom(cli,cli_end)
importFrom(cli,cli_li)
importFrom(cli,cli_ol)
importFrom(cli,cli_text)
importFrom(cli,cli_ul)
importFrom(data.table,.SD)
importFrom(dplyr,"%>%")
importFrom(dplyr,all_of)
importFrom(dplyr,bind_rows)
importFrom(dplyr,case_when)
importFrom(dplyr,row_number)
importFrom(dplyr,where)
importFrom(purrr,map)
importFrom(purrr,map_lgl)
importFrom(purrr,pmap)
importFrom(purrr,pmap_lgl)
importFrom(stats,as.formula)
importFrom(stats,na.omit)
importFrom(stats,ts)
Expand Down
2 changes: 1 addition & 1 deletion R/computeWeightedMeans.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@
#' @param by character vector of the columns to group by
#' @return Returns a data table object with computed weighted means.
#'
#' @import data.table
#' @importFrom data.table .SD
#' @importFrom stats as.formula na.omit ts weighted.mean
#' @keywords internal
computeWeightedMeans <- function(data_table, variables, weight, by) {
Expand Down
1 change: 0 additions & 1 deletion R/ds.bp_standards.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
#' blood pressure in children and adolescents:
#' https://www.nhlbi.nih.gov/sites/default/files/media/docs/hbp_ped.pdf
#' @author Demetris Avraam for DataSHIELD Development Team
#' @import data.table
#' @export
ds.bp_standards <- function(sex=NULL, age=NULL, height=NULL, bp=NULL, systolic=TRUE,
newobj=NULL, datasources=NULL){
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

V6.3.6 dev feat/standardise df#665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timcadman merged 29 commits into from
Jul 6, 2026
Merged

V6.3.6 dev feat/standardise df #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f131520
Merge pull request #645 from datashield/v6.3.5
StuartWheater Jan 12, 2026
dce4504
feat: add ds.standardiseDf
timcadman Apr 21, 2026
6290957
feat: add test data and connection functions for standardise
timcadman Apr 21, 2026
256499f
fix: replace snapshot tests with regex, update NAMESPACE
timcadman Apr 21, 2026
ed24ee4
test: add perf test for ds.standardiseDf
timcadman Apr 21, 2026
eb57c2f
trigger CI
timcadman May 14, 2026
9333df9
Merge branch 'master' of github.com:datashield/dsBaseClient into v6.3…
timcadman May 14, 2026
cd179cd
Merge branch 'v6.3.6-dev' into v6.3.6-dev-feat/standardise-df
StuartWheater Jun 8, 2026
6740d52
added myself as author
timcadman Jun 23, 2026
aef399b
fixed import issues
timcadman Jun 23, 2026
a5b7a42
Merge pull request #71 from StuartWheater/v6.3.6-dev
StuartWheater Jun 23, 2026
ca12139
revert: set roxygen to 8.0
timcadman Jun 23, 2026
9e26604
Increased ping timeout plus additional per entry
StuartWheater Jun 24, 2026
dfc6145
Merge branch 'v6.3.6-dev-feat/standardise-df' into v6.3.6-dev-feat/st…
StuartWheater Jun 24, 2026
966a91f
fixed connection path
timcadman Jun 25, 2026
fdc9913
removed datsahield print
timcadman Jun 25, 2026
4f3c472
updated dsBase tar
timcadman Jun 25, 2026
5a637a9
Merge #684: fixed connection path
timcadman Jun 25, 2026
6985c70
Merge branch 'v6.3.6-dev' into v6.3.6-dev-feat/standardise-df
timcadman Jun 26, 2026
b9bb03d
try: print errors to diagnose test failure
timcadman Jun 26, 2026
1f9ee2c
updated dsBase tar
timcadman Jun 26, 2026
e21498c
revert: don't print errors
timcadman Jun 26, 2026
0af6b22
fix data source for opal
timcadman Jun 29, 2026
ebedec9
Update tars for dsBase_6.3.6
StuartWheater Jun 29, 2026
02dab81
remove tibble dependency
timcadman Jun 29, 2026
815f3d8
Merge branch 'v6.3.6-dev-feat/standardise-df' of https://github.com/d…
timcadman Jun 30, 2026
29af097
Merge pull request #687 from datashield/v6.3.6-dev
StuartWheater Jul 2, 2026
3abecdd
Increase R version required
StuartWheater Jul 2, 2026
770e9e5
Update to 'hp-laptop-quay' performance profile
StuartWheater Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ Authors@R: c(person(given = "Paul",
comment = c(ORCID = "0009-0003-2419-1964")))
License: GPL-3
Depends:
R (>= 4.0.0),
R (>= 4.1.0),
DSI (>= 1.7.1)
Imports:
fields,
Expand All@@ -69,7 +69,10 @@ Imports:
gridExtra,
data.table,
methods,
dplyr
dplyr,
purrr,
assertthat,
cli
Suggests:
lme4,
httr,
Expand Down
26 changes: 25 additions & 1 deletion NAMESPACE
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,6 +105,7 @@ export(ds.setDefaultOpals)
export(ds.setSeed)
export(ds.skewness)
export(ds.sqrt)
export(ds.standardiseDf)
export(ds.subset)
export(ds.subsetByClass)
export(ds.summary)
Expand All@@ -120,7 +121,30 @@ export(ds.var)
export(ds.vectorCalc)
export(subsetHelper)
import(DSI)
import(data.table)
importFrom(DSI,datashield.aggregate)
importFrom(DSI,datashield.assign)
importFrom(assertthat,assert_that)
importFrom(cli,cli_abort)
importFrom(cli,cli_alert_danger)
importFrom(cli,cli_alert_info)
importFrom(cli,cli_alert_success)
importFrom(cli,cli_alert_warning)
importFrom(cli,cli_end)
importFrom(cli,cli_li)
importFrom(cli,cli_ol)
importFrom(cli,cli_text)
importFrom(cli,cli_ul)
importFrom(data.table,.SD)
importFrom(dplyr,"%>%")
importFrom(dplyr,all_of)
importFrom(dplyr,bind_rows)
importFrom(dplyr,case_when)
importFrom(dplyr,row_number)
importFrom(dplyr,where)
importFrom(purrr,map)
importFrom(purrr,map_lgl)
importFrom(purrr,pmap)
importFrom(purrr,pmap_lgl)
importFrom(stats,as.formula)
importFrom(stats,na.omit)
importFrom(stats,ts)
Expand Down
2 changes: 1 addition & 1 deletion R/computeWeightedMeans.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@
#' @param by character vector of the columns to group by
#' @return Returns a data table object with computed weighted means.
#'
#' @import data.table
#' @importFrom data.table .SD
#' @importFrom stats as.formula na.omit ts weighted.mean
#' @keywords internal
computeWeightedMeans <- function(data_table, variables, weight, by) {
Expand Down
1 change: 0 additions & 1 deletion R/ds.bp_standards.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
#' blood pressure in children and adolescents:
#' https://www.nhlbi.nih.gov/sites/default/files/media/docs/hbp_ped.pdf
#' @author Demetris Avraam for DataSHIELD Development Team
#' @import data.table
#' @export
ds.bp_standards <- function(sex=NULL, age=NULL, height=NULL, bp=NULL, systolic=TRUE,
newobj=NULL, datasources=NULL){
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

V6.3.6 dev feat/standardise df#665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timcadman merged 29 commits into from
Jul 6, 2026
Merged

V6.3.6 dev feat/standardise df #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f131520
Merge pull request #645 from datashield/v6.3.5
StuartWheater Jan 12, 2026
dce4504
feat: add ds.standardiseDf
timcadman Apr 21, 2026
6290957
feat: add test data and connection functions for standardise
timcadman Apr 21, 2026
256499f
fix: replace snapshot tests with regex, update NAMESPACE
timcadman Apr 21, 2026
ed24ee4
test: add perf test for ds.standardiseDf
timcadman Apr 21, 2026
eb57c2f
trigger CI
timcadman May 14, 2026
9333df9
Merge branch 'master' of github.com:datashield/dsBaseClient into v6.3…
timcadman May 14, 2026
cd179cd
Merge branch 'v6.3.6-dev' into v6.3.6-dev-feat/standardise-df
StuartWheater Jun 8, 2026
6740d52
added myself as author
timcadman Jun 23, 2026
aef399b
fixed import issues
timcadman Jun 23, 2026
a5b7a42
Merge pull request #71 from StuartWheater/v6.3.6-dev
StuartWheater Jun 23, 2026
ca12139
revert: set roxygen to 8.0
timcadman Jun 23, 2026
9e26604
Increased ping timeout plus additional per entry
StuartWheater Jun 24, 2026
dfc6145
Merge branch 'v6.3.6-dev-feat/standardise-df' into v6.3.6-dev-feat/st…
StuartWheater Jun 24, 2026
966a91f
fixed connection path
timcadman Jun 25, 2026
fdc9913
removed datsahield print
timcadman Jun 25, 2026
4f3c472
updated dsBase tar
timcadman Jun 25, 2026
5a637a9
Merge #684: fixed connection path
timcadman Jun 25, 2026
6985c70
Merge branch 'v6.3.6-dev' into v6.3.6-dev-feat/standardise-df
timcadman Jun 26, 2026
b9bb03d
try: print errors to diagnose test failure
timcadman Jun 26, 2026
1f9ee2c
updated dsBase tar
timcadman Jun 26, 2026
e21498c
revert: don't print errors
timcadman Jun 26, 2026
0af6b22
fix data source for opal
timcadman Jun 29, 2026
ebedec9
Update tars for dsBase_6.3.6
StuartWheater Jun 29, 2026
02dab81
remove tibble dependency
timcadman Jun 29, 2026
815f3d8
Merge branch 'v6.3.6-dev-feat/standardise-df' of https://github.com/d…
timcadman Jun 30, 2026
29af097
Merge pull request #687 from datashield/v6.3.6-dev
StuartWheater Jul 2, 2026
3abecdd
Increase R version required
StuartWheater Jul 2, 2026
770e9e5
Update to 'hp-laptop-quay' performance profile
StuartWheater Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ Authors@R: c(person(given = "Paul",
comment = c(ORCID = "0009-0003-2419-1964")))
License: GPL-3
Depends:
R (>= 4.0.0),
R (>= 4.1.0),
DSI (>= 1.7.1)
Imports:
fields,
Expand All@@ -69,7 +69,10 @@ Imports:
gridExtra,
data.table,
methods,
dplyr
dplyr,
purrr,
assertthat,
cli
Suggests:
lme4,
httr,
Expand Down
26 changes: 25 additions & 1 deletion NAMESPACE
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,6 +105,7 @@ export(ds.setDefaultOpals)
export(ds.setSeed)
export(ds.skewness)
export(ds.sqrt)
export(ds.standardiseDf)
export(ds.subset)
export(ds.subsetByClass)
export(ds.summary)
Expand All@@ -120,7 +121,30 @@ export(ds.var)
export(ds.vectorCalc)
export(subsetHelper)
import(DSI)
import(data.table)
importFrom(DSI,datashield.aggregate)
importFrom(DSI,datashield.assign)
importFrom(assertthat,assert_that)
importFrom(cli,cli_abort)
importFrom(cli,cli_alert_danger)
importFrom(cli,cli_alert_info)
importFrom(cli,cli_alert_success)
importFrom(cli,cli_alert_warning)
importFrom(cli,cli_end)
importFrom(cli,cli_li)
importFrom(cli,cli_ol)
importFrom(cli,cli_text)
importFrom(cli,cli_ul)
importFrom(data.table,.SD)
importFrom(dplyr,"%>%")
importFrom(dplyr,all_of)
importFrom(dplyr,bind_rows)
importFrom(dplyr,case_when)
importFrom(dplyr,row_number)
importFrom(dplyr,where)
importFrom(purrr,map)
importFrom(purrr,map_lgl)
importFrom(purrr,pmap)
importFrom(purrr,pmap_lgl)
importFrom(stats,as.formula)
importFrom(stats,na.omit)
importFrom(stats,ts)
Expand Down
2 changes: 1 addition & 1 deletion R/computeWeightedMeans.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@
#' @param by character vector of the columns to group by
#' @return Returns a data table object with computed weighted means.
#'
#' @import data.table
#' @importFrom data.table .SD
#' @importFrom stats as.formula na.omit ts weighted.mean
#' @keywords internal
computeWeightedMeans <- function(data_table, variables, weight, by) {
Expand Down
1 change: 0 additions & 1 deletion R/ds.bp_standards.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
#' blood pressure in children and adolescents:
#' https://www.nhlbi.nih.gov/sites/default/files/media/docs/hbp_ped.pdf
#' @author Demetris Avraam for DataSHIELD Development Team
#' @import data.table
#' @export
ds.bp_standards <- function(sex=NULL, age=NULL, height=NULL, bp=NULL, systolic=TRUE,
newobj=NULL, datasources=NULL){
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

V6.3.6 dev feat/standardise df#665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timcadman merged 29 commits into from
Jul 6, 2026
Merged

V6.3.6 dev feat/standardise df #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f131520
Merge pull request #645 from datashield/v6.3.5
StuartWheater Jan 12, 2026
dce4504
feat: add ds.standardiseDf
timcadman Apr 21, 2026
6290957
feat: add test data and connection functions for standardise
timcadman Apr 21, 2026
256499f
fix: replace snapshot tests with regex, update NAMESPACE
timcadman Apr 21, 2026
ed24ee4
test: add perf test for ds.standardiseDf
timcadman Apr 21, 2026
eb57c2f
trigger CI
timcadman May 14, 2026
9333df9
Merge branch 'master' of github.com:datashield/dsBaseClient into v6.3…
timcadman May 14, 2026
cd179cd
Merge branch 'v6.3.6-dev' into v6.3.6-dev-feat/standardise-df
StuartWheater Jun 8, 2026
6740d52
added myself as author
timcadman Jun 23, 2026
aef399b
fixed import issues
timcadman Jun 23, 2026
a5b7a42
Merge pull request #71 from StuartWheater/v6.3.6-dev
StuartWheater Jun 23, 2026
ca12139
revert: set roxygen to 8.0
timcadman Jun 23, 2026
9e26604
Increased ping timeout plus additional per entry
StuartWheater Jun 24, 2026
dfc6145
Merge branch 'v6.3.6-dev-feat/standardise-df' into v6.3.6-dev-feat/st…
StuartWheater Jun 24, 2026
966a91f
fixed connection path
timcadman Jun 25, 2026
fdc9913
removed datsahield print
timcadman Jun 25, 2026
4f3c472
updated dsBase tar
timcadman Jun 25, 2026
5a637a9
Merge #684: fixed connection path
timcadman Jun 25, 2026
6985c70
Merge branch 'v6.3.6-dev' into v6.3.6-dev-feat/standardise-df
timcadman Jun 26, 2026
b9bb03d
try: print errors to diagnose test failure
timcadman Jun 26, 2026
1f9ee2c
updated dsBase tar
timcadman Jun 26, 2026
e21498c
revert: don't print errors
timcadman Jun 26, 2026
0af6b22
fix data source for opal
timcadman Jun 29, 2026
ebedec9
Update tars for dsBase_6.3.6
StuartWheater Jun 29, 2026
02dab81
remove tibble dependency
timcadman Jun 29, 2026
815f3d8
Merge branch 'v6.3.6-dev-feat/standardise-df' of https://github.com/d…
timcadman Jun 30, 2026
29af097
Merge pull request #687 from datashield/v6.3.6-dev
StuartWheater Jul 2, 2026
3abecdd
Increase R version required
StuartWheater Jul 2, 2026
770e9e5
Update to 'hp-laptop-quay' performance profile
StuartWheater Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ Authors@R: c(person(given = "Paul",
comment = c(ORCID = "0009-0003-2419-1964")))
License: GPL-3
Depends:
R (>= 4.0.0),
R (>= 4.1.0),
DSI (>= 1.7.1)
Imports:
fields,
Expand All@@ -69,7 +69,10 @@ Imports:
gridExtra,
data.table,
methods,
dplyr
dplyr,
purrr,
assertthat,
cli
Suggests:
lme4,
httr,
Expand Down
26 changes: 25 additions & 1 deletion NAMESPACE
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,6 +105,7 @@ export(ds.setDefaultOpals)
export(ds.setSeed)
export(ds.skewness)
export(ds.sqrt)
export(ds.standardiseDf)
export(ds.subset)
export(ds.subsetByClass)
export(ds.summary)
Expand All@@ -120,7 +121,30 @@ export(ds.var)
export(ds.vectorCalc)
export(subsetHelper)
import(DSI)
import(data.table)
importFrom(DSI,datashield.aggregate)
importFrom(DSI,datashield.assign)
importFrom(assertthat,assert_that)
importFrom(cli,cli_abort)
importFrom(cli,cli_alert_danger)
importFrom(cli,cli_alert_info)
importFrom(cli,cli_alert_success)
importFrom(cli,cli_alert_warning)
importFrom(cli,cli_end)
importFrom(cli,cli_li)
importFrom(cli,cli_ol)
importFrom(cli,cli_text)
importFrom(cli,cli_ul)
importFrom(data.table,.SD)
importFrom(dplyr,"%>%")
importFrom(dplyr,all_of)
importFrom(dplyr,bind_rows)
importFrom(dplyr,case_when)
importFrom(dplyr,row_number)
importFrom(dplyr,where)
importFrom(purrr,map)
importFrom(purrr,map_lgl)
importFrom(purrr,pmap)
importFrom(purrr,pmap_lgl)
importFrom(stats,as.formula)
importFrom(stats,na.omit)
importFrom(stats,ts)
Expand Down
2 changes: 1 addition & 1 deletion R/computeWeightedMeans.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@
#' @param by character vector of the columns to group by
#' @return Returns a data table object with computed weighted means.
#'
#' @import data.table
#' @importFrom data.table .SD
#' @importFrom stats as.formula na.omit ts weighted.mean
#' @keywords internal
computeWeightedMeans <- function(data_table, variables, weight, by) {
Expand Down
1 change: 0 additions & 1 deletion R/ds.bp_standards.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
#' blood pressure in children and adolescents:
#' https://www.nhlbi.nih.gov/sites/default/files/media/docs/hbp_ped.pdf
#' @author Demetris Avraam for DataSHIELD Development Team
#' @import data.table
#' @export
ds.bp_standards <- function(sex=NULL, age=NULL, height=NULL, bp=NULL, systolic=TRUE,
newobj=NULL, datasources=NULL){
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

V6.3.6 dev feat/standardise df#665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timcadman merged 29 commits into from
Jul 6, 2026
Merged

V6.3.6 dev feat/standardise df #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f131520
Merge pull request #645 from datashield/v6.3.5
StuartWheater Jan 12, 2026
dce4504
feat: add ds.standardiseDf
timcadman Apr 21, 2026
6290957
feat: add test data and connection functions for standardise
timcadman Apr 21, 2026
256499f
fix: replace snapshot tests with regex, update NAMESPACE
timcadman Apr 21, 2026
ed24ee4
test: add perf test for ds.standardiseDf
timcadman Apr 21, 2026
eb57c2f
trigger CI
timcadman May 14, 2026
9333df9
Merge branch 'master' of github.com:datashield/dsBaseClient into v6.3…
timcadman May 14, 2026
cd179cd
Merge branch 'v6.3.6-dev' into v6.3.6-dev-feat/standardise-df
StuartWheater Jun 8, 2026
6740d52
added myself as author
timcadman Jun 23, 2026
aef399b
fixed import issues
timcadman Jun 23, 2026
a5b7a42
Merge pull request #71 from StuartWheater/v6.3.6-dev
StuartWheater Jun 23, 2026
ca12139
revert: set roxygen to 8.0
timcadman Jun 23, 2026
9e26604
Increased ping timeout plus additional per entry
StuartWheater Jun 24, 2026
dfc6145
Merge branch 'v6.3.6-dev-feat/standardise-df' into v6.3.6-dev-feat/st…
StuartWheater Jun 24, 2026
966a91f
fixed connection path
timcadman Jun 25, 2026
fdc9913
removed datsahield print
timcadman Jun 25, 2026
4f3c472
updated dsBase tar
timcadman Jun 25, 2026
5a637a9
Merge #684: fixed connection path
timcadman Jun 25, 2026
6985c70
Merge branch 'v6.3.6-dev' into v6.3.6-dev-feat/standardise-df
timcadman Jun 26, 2026
b9bb03d
try: print errors to diagnose test failure
timcadman Jun 26, 2026
1f9ee2c
updated dsBase tar
timcadman Jun 26, 2026
e21498c
revert: don't print errors
timcadman Jun 26, 2026
0af6b22
fix data source for opal
timcadman Jun 29, 2026
ebedec9
Update tars for dsBase_6.3.6
StuartWheater Jun 29, 2026
02dab81
remove tibble dependency
timcadman Jun 29, 2026
815f3d8
Merge branch 'v6.3.6-dev-feat/standardise-df' of https://github.com/d…
timcadman Jun 30, 2026
29af097
Merge pull request #687 from datashield/v6.3.6-dev
StuartWheater Jul 2, 2026
3abecdd
Increase R version required
StuartWheater Jul 2, 2026
770e9e5
Update to 'hp-laptop-quay' performance profile
StuartWheater Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ Authors@R: c(person(given = "Paul",
comment = c(ORCID = "0009-0003-2419-1964")))
License: GPL-3
Depends:
R (>= 4.0.0),
R (>= 4.1.0),
DSI (>= 1.7.1)
Imports:
fields,
Expand All@@ -69,7 +69,10 @@ Imports:
gridExtra,
data.table,
methods,
dplyr
dplyr,
purrr,
assertthat,
cli
Suggests:
lme4,
httr,
Expand Down
26 changes: 25 additions & 1 deletion NAMESPACE
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,6 +105,7 @@ export(ds.setDefaultOpals)
export(ds.setSeed)
export(ds.skewness)
export(ds.sqrt)
export(ds.standardiseDf)
export(ds.subset)
export(ds.subsetByClass)
export(ds.summary)
Expand All@@ -120,7 +121,30 @@ export(ds.var)
export(ds.vectorCalc)
export(subsetHelper)
import(DSI)
import(data.table)
importFrom(DSI,datashield.aggregate)
importFrom(DSI,datashield.assign)
importFrom(assertthat,assert_that)
importFrom(cli,cli_abort)
importFrom(cli,cli_alert_danger)
importFrom(cli,cli_alert_info)
importFrom(cli,cli_alert_success)
importFrom(cli,cli_alert_warning)
importFrom(cli,cli_end)
importFrom(cli,cli_li)
importFrom(cli,cli_ol)
importFrom(cli,cli_text)
importFrom(cli,cli_ul)
importFrom(data.table,.SD)
importFrom(dplyr,"%>%")
importFrom(dplyr,all_of)
importFrom(dplyr,bind_rows)
importFrom(dplyr,case_when)
importFrom(dplyr,row_number)
importFrom(dplyr,where)
importFrom(purrr,map)
importFrom(purrr,map_lgl)
importFrom(purrr,pmap)
importFrom(purrr,pmap_lgl)
importFrom(stats,as.formula)
importFrom(stats,na.omit)
importFrom(stats,ts)
Expand Down
2 changes: 1 addition & 1 deletion R/computeWeightedMeans.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@
#' @param by character vector of the columns to group by
#' @return Returns a data table object with computed weighted means.
#'
#' @import data.table
#' @importFrom data.table .SD
#' @importFrom stats as.formula na.omit ts weighted.mean
#' @keywords internal
computeWeightedMeans <- function(data_table, variables, weight, by) {
Expand Down
1 change: 0 additions & 1 deletion R/ds.bp_standards.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
#' blood pressure in children and adolescents:
#' https://www.nhlbi.nih.gov/sites/default/files/media/docs/hbp_ped.pdf
#' @author Demetris Avraam for DataSHIELD Development Team
#' @import data.table
#' @export
ds.bp_standards <- function(sex=NULL, age=NULL, height=NULL, bp=NULL, systolic=TRUE,
newobj=NULL, datasources=NULL){
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

V6.3.6 dev feat/standardise df#665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timcadman merged 29 commits into from
Jul 6, 2026
Merged

V6.3.6 dev feat/standardise df #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f131520
Merge pull request #645 from datashield/v6.3.5
StuartWheater Jan 12, 2026
dce4504
feat: add ds.standardiseDf
timcadman Apr 21, 2026
6290957
feat: add test data and connection functions for standardise
timcadman Apr 21, 2026
256499f
fix: replace snapshot tests with regex, update NAMESPACE
timcadman Apr 21, 2026
ed24ee4
test: add perf test for ds.standardiseDf
timcadman Apr 21, 2026
eb57c2f
trigger CI
timcadman May 14, 2026
9333df9
Merge branch 'master' of github.com:datashield/dsBaseClient into v6.3…
timcadman May 14, 2026
cd179cd
Merge branch 'v6.3.6-dev' into v6.3.6-dev-feat/standardise-df
StuartWheater Jun 8, 2026
6740d52
added myself as author
timcadman Jun 23, 2026
aef399b
fixed import issues
timcadman Jun 23, 2026
a5b7a42
Merge pull request #71 from StuartWheater/v6.3.6-dev
StuartWheater Jun 23, 2026
ca12139
revert: set roxygen to 8.0
timcadman Jun 23, 2026
9e26604
Increased ping timeout plus additional per entry
StuartWheater Jun 24, 2026
dfc6145
Merge branch 'v6.3.6-dev-feat/standardise-df' into v6.3.6-dev-feat/st…
StuartWheater Jun 24, 2026
966a91f
fixed connection path
timcadman Jun 25, 2026
fdc9913
removed datsahield print
timcadman Jun 25, 2026
4f3c472
updated dsBase tar
timcadman Jun 25, 2026
5a637a9
Merge #684: fixed connection path
timcadman Jun 25, 2026
6985c70
Merge branch 'v6.3.6-dev' into v6.3.6-dev-feat/standardise-df
timcadman Jun 26, 2026
b9bb03d
try: print errors to diagnose test failure
timcadman Jun 26, 2026
1f9ee2c
updated dsBase tar
timcadman Jun 26, 2026
e21498c
revert: don't print errors
timcadman Jun 26, 2026
0af6b22
fix data source for opal
timcadman Jun 29, 2026
ebedec9
Update tars for dsBase_6.3.6
StuartWheater Jun 29, 2026
02dab81
remove tibble dependency
timcadman Jun 29, 2026
815f3d8
Merge branch 'v6.3.6-dev-feat/standardise-df' of https://github.com/d…
timcadman Jun 30, 2026
29af097
Merge pull request #687 from datashield/v6.3.6-dev
StuartWheater Jul 2, 2026
3abecdd
Increase R version required
StuartWheater Jul 2, 2026
770e9e5
Update to 'hp-laptop-quay' performance profile
StuartWheater Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ Authors@R: c(person(given = "Paul",
comment = c(ORCID = "0009-0003-2419-1964")))
License: GPL-3
Depends:
R (>= 4.0.0),
R (>= 4.1.0),
DSI (>= 1.7.1)
Imports:
fields,
Expand All@@ -69,7 +69,10 @@ Imports:
gridExtra,
data.table,
methods,
dplyr
dplyr,
purrr,
assertthat,
cli
Suggests:
lme4,
httr,
Expand Down
26 changes: 25 additions & 1 deletion NAMESPACE
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,6 +105,7 @@ export(ds.setDefaultOpals)
export(ds.setSeed)
export(ds.skewness)
export(ds.sqrt)
export(ds.standardiseDf)
export(ds.subset)
export(ds.subsetByClass)
export(ds.summary)
Expand All@@ -120,7 +121,30 @@ export(ds.var)
export(ds.vectorCalc)
export(subsetHelper)
import(DSI)
import(data.table)
importFrom(DSI,datashield.aggregate)
importFrom(DSI,datashield.assign)
importFrom(assertthat,assert_that)
importFrom(cli,cli_abort)
importFrom(cli,cli_alert_danger)
importFrom(cli,cli_alert_info)
importFrom(cli,cli_alert_success)
importFrom(cli,cli_alert_warning)
importFrom(cli,cli_end)
importFrom(cli,cli_li)
importFrom(cli,cli_ol)
importFrom(cli,cli_text)
importFrom(cli,cli_ul)
importFrom(data.table,.SD)
importFrom(dplyr,"%>%")
importFrom(dplyr,all_of)
importFrom(dplyr,bind_rows)
importFrom(dplyr,case_when)
importFrom(dplyr,row_number)
importFrom(dplyr,where)
importFrom(purrr,map)
importFrom(purrr,map_lgl)
importFrom(purrr,pmap)
importFrom(purrr,pmap_lgl)
importFrom(stats,as.formula)
importFrom(stats,na.omit)
importFrom(stats,ts)
Expand Down
2 changes: 1 addition & 1 deletion R/computeWeightedMeans.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@
#' @param by character vector of the columns to group by
#' @return Returns a data table object with computed weighted means.
#'
#' @import data.table
#' @importFrom data.table .SD
#' @importFrom stats as.formula na.omit ts weighted.mean
#' @keywords internal
computeWeightedMeans <- function(data_table, variables, weight, by) {
Expand Down
1 change: 0 additions & 1 deletion R/ds.bp_standards.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
#' blood pressure in children and adolescents:
#' https://www.nhlbi.nih.gov/sites/default/files/media/docs/hbp_ped.pdf
#' @author Demetris Avraam for DataSHIELD Development Team
#' @import data.table
#' @export
ds.bp_standards <- function(sex=NULL, age=NULL, height=NULL, bp=NULL, systolic=TRUE,
newobj=NULL, datasources=NULL){
Expand Down
Loading