Merge pull request #52 from pydemull/dev

Dev

Author: pydemull

.github/workflows/R-CMD-check.yaml

@@ -19,7 +19,6 @@ jobs:
       matrix:
         config:
           - {os: windows-latest, r: 'release'}
-          - {os: ubuntu-latest,   r: 'oldrel-1'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

DESCRIPTION

@@ -12,35 +12,35 @@ Description: A tool to analyse 'ActiGraph' accelerometer data and to implement
 License: GPL (>= 3)
 Imports: 
     assertthat,
-    dbplyr (>= 2.1.1),
-    dplyr (>= 1.1.0),
-    flextable (>= 0.8.2),
-    forcats (>= 0.5.2),
-    ggplot2 (>= 3.4.0),
-    golem (>= 0.3.4),
-    hms (>= 1.1.2),
-    lubridate (>= 1.8.0),
-    magrittr (>= 2.0.3),
-    modelr (>= 0.1.9),
-    patchwork (>= 1.1.2),
+    dbplyr,
+    dplyr,
+    flextable,
+    forcats,
+    ggplot2,
+    golem,
+    hms,
+    lubridate,
+    magrittr,
+    modelr,
+    patchwork,
     PhysicalActivity,
-    plyr (>= 1.8.7),
-    reactable (>= 0.3.0),
-    rmarkdown (>= 2.16),
+    plyr,
+    reactable,
+    rmarkdown,
     RSQLite,
-    shiny (>= 1.7.2),
-    shinycssloaders (>= 1.0.0),
-    shinydashboard (>= 0.7.2),
-    shinydashboardPlus (>= 2.0.3),
-    shinyFeedback (>= 0.4.0),
-    shinyjs (>= 2.1.0),
-    stringr (>= 1.4.1),
-    tidyr (>= 1.2.1),
+    shiny,
+    shinycssloaders,
+    shinydashboard,
+    shinydashboardPlus,
+    shinyFeedback,
+    shinyjs,
+    stringr,
+    tidyr,
     zoo
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.2
 URL: https://pydemull.github.io/activAnalyzer/, https://github.com/pydemull/activAnalyzer
 BugReports: https://github.com/pydemull/activAnalyzer/issues
 Suggests: 

R/app_server.R

@@ -1517,7 +1517,7 @@ app_server <- function(input, output, session) {
                 period_info_12$corr_mets() >= 0,
                 period_info_13$corr_mets() >= 0,
                 period_info_14$corr_mets() >= 0,
-                period_info_15$corr_mets() >= 0,
+                period_info_15$corr_mets() >= 0
                 )
 
 
@@ -1654,7 +1654,7 @@ app_server <- function(input, output, session) {
                       # Thanks to https://stackoverflow.com/questions/29661269/increment-by-1-for-every-change-in-column 
                       # for the code block below
                       df_with_computed_metrics$intensity_category <- as.factor(df_with_computed_metrics$intensity_category)
-                      df_with_computed_metrics$intensity_category_num <- as.numeric(as.character(forcats::fct_recode(df_with_computed_metrics$intensity_category , "0" = "Nonwear", "1" = "SED", "2" = "LPA", "3" = "MVPA")))
+                      df_with_computed_metrics$intensity_category_num <- as.numeric(as.character(forcats::fct_recode(df_with_computed_metrics$intensity_category, "0" = "Nonwear", "1" = "SED", "2" = "LPA", "3" = "MVPA")))
                       df_with_computed_metrics$bout <- cumsum(c(1, as.numeric(diff(df_with_computed_metrics$intensity_category_num))!= 0))
               }
 
@@ -2010,15 +2010,13 @@ app_server <- function(input, output, session) {
   output$int_dist_analysis_fig1 <- renderPlot({
 
     results_list()$results_by_day$p_band
-  }, width = "auto", height = function(){round(nlevels(as.factor(results_list()$df_with_computed_metrics$date))/3, 0) * 370}
-  , res = 100)
+  }, width = "auto", height = function(){round(nlevels(as.factor(results_list()$df_with_computed_metrics$date))/3, 0) * 370}, res = 100)
 
   # Plotting intensity distribution analysis (2)
   output$int_dist_analysis_fig1bis <- renderPlot({
 
     results_list()$results_by_day$p_log
-  }, width = "auto", height = function(){round(nlevels(as.factor(results_list()$df_with_computed_metrics$date))/3, 0) * 370}
-  , res = 100)
+  }, width = "auto", height = function(){round(nlevels(as.factor(results_list()$df_with_computed_metrics$date))/3, 0) * 370}, res = 100)
 
   # Showing results summarized over valid days in a table (means)
   output$results_summary_int_dist_means <- reactable::renderReactable({

R/globals.R

@@ -133,5 +133,6 @@ utils::globalVariables(c(
   "bin_label",
   "lm",
   "days",
-  "."
+  ".",
+  ".x"
   ))