From e882877a706b440b8e9a403ab7aba61dcecc1d5c Mon Sep 17 00:00:00 2001 From: henry senyondo Date: Tue, 2 Jan 2024 11:24:50 -0500 Subject: [PATCH] Update version and NEWS (#372) * Update version and NEWS * Switch to Plausible for more ethical usage tracking fix https://github.com/weecology/portal-forecast-web/issues/55 --- .github/ISSUE_TEMPLATE/config.yml | 6 +++--- DESCRIPTION | 2 +- NEWS.md | 11 +++++++++++ R/webapp_ui.R | 17 ++++++++++++++--- codemeta.json | 2 +- 5 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index bc61f743f..cba4f9be5 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -6,9 +6,9 @@ contact_links: - name: PortalData url: https://github.com/weecology/PortalData about: Direct issues associated with the raw data to the PortalData repo. - - name: portalPredictions - url: https://github.com/weecology/portalPredictions - about: Issues on the CI/CD system should be directed to the portalPredictions repo. + - name: portal-forecasts + url: https://github.com/weecology/portal-forecasts + about: Issues on the CI/CD system should be directed to the portal-forecasts repo. - name: portal-forecast-web url: https://github.com/weecology/portal-forecast-web about: Website issues belong in the website repo. \ No newline at end of file diff --git a/DESCRIPTION b/DESCRIPTION index 31cdd67e0..e39194908 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: portalcasting Title: Model and Forecast Portal Rodent Dynamics -Version: 0.60.2 +Version: 0.60.4 Authors@R: c( person(c("Juniper", "L."), "Simonis", email = "juniper.simonis@weecology.org", role = c("aut", "cre"), diff --git a/NEWS.md b/NEWS.md index 83fe47e14..0c6e4a8de 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,17 @@ # portalcasting (development version) Version numbers follow [Semantic Versioning](https://semver.org/). +# [portalcasting 0.60.4](https://github.com/weecology/portalcasting/releases/tag/v0.60.4) +*01-01-2024* + +## Zip resources forecast +* Zipping forecast folder in resources + +# [portalcasting 0.60.3](https://github.com/weecology/portalcasting/releases/tag/v0.60.3) +*12-16-2023* + +## Add tests +* Tests for zip and unszip functions # [portalcasting 0.60.2](https://github.com/weecology/portalcasting/releases/tag/v0.60.2) *11-16-2023* diff --git a/R/webapp_ui.R b/R/webapp_ui.R index 998ad6819..d3e9b5730 100644 --- a/R/webapp_ui.R +++ b/R/webapp_ui.R @@ -161,6 +161,7 @@ subtitle_panel <- function ( ) { about_tab <- function (global = global_list( )) { tabPanel(title = "About", + tags$head(tags$script(defer = "defer", data_domain = "portal.naturecast.org", src = "https://plausible.io/js/script.js")), includeMarkdown(global$about_md_path)) } @@ -172,6 +173,7 @@ about_tab <- function (global = global_list( )) { models_tab <- function (global = global_list( )) { tabPanel(title = "Models", + tags$head(tags$script(defer = "defer", data_domain = "portal.naturecast.org", src = "https://plausible.io/js/script.js")), includeHTML(global$models_html_path)) } @@ -183,6 +185,7 @@ models_tab <- function (global = global_list( )) { rodents_profiles_tab <- function (global = global_list( )) { tabPanel(title = "Rodent Profiles", + tags$head(tags$script(defer = "defer", data_domain = "portal.naturecast.org", src = "https://plausible.io/js/script.js")), includeHTML(global$rodents_profiles_html_path)) } @@ -202,9 +205,10 @@ forecast_tab <- function (global = global_list( )) { } else { tabPanel(title = "Forecast", + tags$head(tags$script(defer = "defer", data_domain = "portal.naturecast.org", src = "https://plausible.io/js/script.js")), br( ), forecast_tab_input_selection_row(global = global), - # forecast_tab_input_selection_checks_row( ), # used for checking reactive inputs in dev + #forecast_tab_input_selection_checks_row( ), # used for checking reactive inputs in dev plotOutput("forecast_tab_ts_plot", height = "300px"), br( ), plotOutput("forecast_tab_ss_plot"), @@ -319,9 +323,12 @@ evaluation_tab <- function (global = global_list( )) { } else { tabPanel(title = "Evaluation", + tags$head(tags$script(defer = "defer", data_domain = "portal.naturecast.org", src = "https://plausible.io/js/script.js")), + br( ), + HTML(''), br( ), evaluation_tab_input_selection_row(global = global), - # evaluation_tab_input_selection_checks_row( ), # used for checking reactive inputs in dev + #evaluation_tab_input_selection_checks_row( ), # used for checking reactive inputs in dev plotOutput("evaluation_tab_sp_plot"), br( ), plotOutput("evaluation_tab_RMSE_plot", height = "300px"), @@ -453,7 +460,10 @@ covariates_tab <- function (global = global_list( )) { br( )) } else { - tabPanel(title = "Covariates", + tabPanel(title = "Covariates", + tags$head(tags$script(defer = "defer", data_domain = "portal.naturecast.org", src = "https://plausible.io/js/script.js")), + br( ), + HTML(''), br( ), p("These are the covariates (without lags imposed) used in forecasting models. Solid lines are historic data, dashed lines are forecasts."), br( ), @@ -576,6 +586,7 @@ write_rodents_profiles_tab_html <- function (main = ".") { padding: 15px; } +
diff --git a/codemeta.json b/codemeta.json index d09b74280..18c63f34f 100644 --- a/codemeta.json +++ b/codemeta.json @@ -2,7 +2,7 @@ "@context": "https://doi.org/10.5063/schema/codemeta-2.0", "@type": "SoftwareSourceCode", "identifier": "portalcasting", - "description": "Create a directory, populate it with data, build models, forecast rodent populations, and visualize the results. This package provides the functionality underlying the Portal Predictions Project as well as support for exploring and developing new models in sandbox environments.", + "description": "Create a directory, populate it with data, build models, forecast rodent populations, and visualize the results. This package provides the functionality underlying the Portal Predictions forecasts Project as well as support for exploring and developing new models in sandbox environments.", "name": "portalcasting: Functions Used in Predicting Portal Rodent Dynamics", "relatedLink": "https://weecology.github.io/portalcasting/", "codeRepository": "https://github.com/weecology/portalcasting",