diff --git a/DESCRIPTION b/DESCRIPTION index 5de382ad..16cc349b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -35,8 +35,7 @@ Imports: irr, rlang, tidyselect, - psycho, - explore + psycho Remotes: easystats/insight, easystats/parameters, diff --git a/R/agreement.b.R b/R/agreement.b.R index cd195e21..0de924e5 100644 --- a/R/agreement.b.R +++ b/R/agreement.b.R @@ -1,6 +1,7 @@ #' Agreement #' #' +#' #' @importFrom R6 R6Class #' @import jmvcore diff --git a/R/decision.b.R b/R/decision.b.R index f4740248..2d90f639 100644 --- a/R/decision.b.R +++ b/R/decision.b.R @@ -12,9 +12,9 @@ decisionClass <- if (requireNamespace('jmvcore')) R6::R6Class( # TODO todo <- glue::glue( - "This Module is still under development", - " - ", - " - " + "This Module is still under development + - + - " ) self$results$todo$setContent(todo) diff --git a/R/decisioncalculator.b.R b/R/decisioncalculator.b.R index 59aa0b84..4236cd4e 100644 --- a/R/decisioncalculator.b.R +++ b/R/decisioncalculator.b.R @@ -13,9 +13,9 @@ decisioncalculatorClass <- if (requireNamespace('jmvcore')) R6::R6Class( # TODO todo <- glue::glue( - "This Module is still under development", - " - ", - " - " + "This Module is still under development + - + - " ) self$results$todo$setContent(todo) diff --git a/R/frequencies.b.R b/R/frequencies.b.R index ec1b42cf..498ec088 100644 --- a/R/frequencies.b.R +++ b/R/frequencies.b.R @@ -14,9 +14,9 @@ frequenciesClass <- if (requireNamespace('jmvcore')) R6::R6Class( # TODO todo <- glue::glue( - "This Module is still under development", - " - ", - " - " + "This Module is still under development + - + - " ) self$results$todo$setContent(todo) diff --git a/R/multisurvival.b.R b/R/multisurvival.b.R index 632fb978..da8f8b70 100644 --- a/R/multisurvival.b.R +++ b/R/multisurvival.b.R @@ -22,7 +22,7 @@ multisurvivalClass <- if (requireNamespace('jmvcore')) R6::R6Class( self$results$todo$setContent(todo) - if (length(self$options$explanatory) + length(self$options$outcome) + length(self$options$overalltime) < 3) + if (length(self$options$explanatory) < 1 | (length(self$options$outcome) + length(self$options$overalltime) < 2)) return() mydata <- self$data diff --git a/R/report.b.R b/R/report.b.R index 07892af7..1c2374a6 100644 --- a/R/report.b.R +++ b/R/report.b.R @@ -14,9 +14,9 @@ reportClass <- if (requireNamespace('jmvcore')) R6::R6Class( # TODO todo <- glue::glue( - "This Module is still under development", - " - ", - " - " + "This Module is still under development + - + - " ) self$results$todo$setContent(todo) diff --git a/R/statsplot2.b.R b/R/statsplot2.b.R index ed93119f..ef40dc4f 100644 --- a/R/statsplot2.b.R +++ b/R/statsplot2.b.R @@ -13,9 +13,9 @@ statsplot2Class <- if (requireNamespace('jmvcore')) R6::R6Class( # TODO todo <- glue::glue( - "This Module is still under development", - " - ", - " - " + "This Module is still under development + - + - " ) self$results$todo$setContent(todo) diff --git a/R/tableone.b.R b/R/tableone.b.R index 920f6235..075c9b5f 100644 --- a/R/tableone.b.R +++ b/R/tableone.b.R @@ -13,9 +13,9 @@ tableoneClass <- if (requireNamespace('jmvcore')) R6::R6Class( # TODO todo <- glue::glue( - "This Module is still under development", - " - ", - " - " + "This Module is still under development + - + - " ) self$results$todo$setContent(todo) diff --git a/docs/reference/figures/jamovi-and-CrossTable-FinalFit.png b/docs/reference/figures/jamovi-and-CrossTable-FinalFit.png new file mode 100644 index 00000000..94bb6122 Binary files /dev/null and b/docs/reference/figures/jamovi-and-CrossTable-FinalFit.png differ diff --git a/tododata/histopathology-template2019-11-25.omv b/tododata/histopathology-template2019-11-25.omv index 522f2c96..424c0046 100644 Binary files a/tododata/histopathology-template2019-11-25.omv and b/tododata/histopathology-template2019-11-25.omv differ