adding to do lists

sbalci · Feb 1, 2020 · 9dca99b · 9dca99b
1 parent b50269d
commit 9dca99b
Show file tree

Hide file tree

Showing 70 changed files with 1,364 additions and 395 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -3,7 +3,12 @@ Type: Package
 Title: Analysis for Clinicopathological Research
 Version: 0.0.1
 Date: 2020-01-29
-Author: Serdar Balci
+Authors@R: 
+    person(given = "Serdar",
+           family = "Balci",
+           role = c("aut", "cre"),
+           email = "[email protected]",
+           comment = c(ORCID = "0000-0002-7852-3851"))
 Maintainer: Serdar Balci <[email protected]>
 Description: Using many different R-project packages.
     So credit should go to main authors.
@@ -29,11 +34,14 @@ Imports:
     tangram,
     irr,
     rlang,
-    tidyselect
+    tidyselect,
+    psycho,
+    explore
 Remotes:
     easystats/insight,
     easystats/parameters,
-    easystats/report
+    easystats/report,
+    easystats/correlation
 Suggests:
     remotes,
     devtools,
@@ -194,7 +202,14 @@ Suggests:
     pamr,
     superpc,
     Cubist,
-    rpart
+    rpart,
+    qgraph,
+    nFactors,
+    ppcor,
+    rstanarm,
+    MuMIn,
+    blavaan,
+    effectsize
 RoxygenNote: 7.0.2
 URL: https://github.com/sbalci/ClinicoPathJamoviModule
 BugReports: https://github.com/sbalci/ClinicoPathJamoviModule/issues
diff --git a/R/00jmv.R b/R/00jmv.R
@@ -199,4 +199,11 @@
         `year`=2020, 
         `title`="caret: Classification and Regression Training", 
         `publisher`="[R package]. Retrieved from https://CRAN.R-project.org/package=caret", 
-        `url`="https://CRAN.R-project.org/package=caret"))
+        `url`="https://CRAN.R-project.org/package=caret"), 
+    `psycho`=list(
+        `type`="software", 
+        `author`="Makowski, D.", 
+        `year`=2018, 
+        `title`="The Psycho Package: An Efficient and Publishing-Oriented Workflow for Psychological Science. Journal of Open Source Software, 3(22), 470.", 
+        `publisher`="[R package]. Retrieved from https://CRAN.R-project.org/package=psycho.R", 
+        `url`="https://CRAN.R-project.org/package=psycho.R"))
diff --git a/R/agreement.b.R b/R/agreement.b.R
@@ -14,9 +14,25 @@ agreementClass <- if (requireNamespace('jmvcore')) R6::R6Class(
 
 
 
-            if (length(self$options$vars) == 0)
+            if (length(self$options$vars) < 2)
                 return()
 
+
+            # TODO
+
+            todo <- glue::glue(
+                "This Module is still under development
+                -
+                -
+                "
+            )
+
+            self$results$todo$setContent(todo)
+
+
+            ####
+
+
             mydata <- self$data
 
             formula <- jmvcore::constructFormula(terms = self$options$vars)

diff --git a/R/agreement.h.R b/R/agreement.h.R
@@ -29,6 +29,7 @@ agreementOptions <- if (requireNamespace('jmvcore')) R6::R6Class(
 agreementResults <- if (requireNamespace('jmvcore')) R6::R6Class(
     inherit = jmvcore::Group,
     active = list(
+        todo = function() private$.items[["todo"]],
         text1 = function() private$.items[["text1"]],
         text2 = function() private$.items[["text2"]]),
     private = list(),
@@ -39,6 +40,10 @@ agreementResults <- if (requireNamespace('jmvcore')) R6::R6Class(
                 name="",
                 title="Interrater Intrarater Reliability",
                 refs="irr")
+            self$add(jmvcore::Preformatted$new(
+                options=options,
+                name="todo",
+                title="To Do"))
             self$add(jmvcore::Preformatted$new(
                 options=options,
                 name="text1",
@@ -76,6 +81,7 @@ agreementBase <- if (requireNamespace('jmvcore')) R6::R6Class(
 #'   numeric
 #' @return A results object containing:
 #' \tabular{llllll}{
+#'   \code{results$todo} \tab \tab \tab \tab \tab a preformatted \cr
 #'   \code{results$text1} \tab \tab \tab \tab \tab a preformatted \cr
 #'   \code{results$text2} \tab \tab \tab \tab \tab a preformatted \cr
 #' }

diff --git a/R/cluster.b.R b/R/cluster.b.R
@@ -9,6 +9,24 @@ clusterClass <- if (requireNamespace('jmvcore')) R6::R6Class(
     private = list(
         .run = function() {
 
+
+
+            # TODO
+
+            todo <- glue::glue(
+                "This Module is still under development
+                -
+                -
+                "
+            )
+
+            self$results$todo$setContent(todo)
+
+
+            ####
+
+
+
             # `self$data` contains the data
             # `self$options` contains the options
             # `self$results` contains the results object (to populate)

diff --git a/R/cluster.h.R b/R/cluster.h.R
@@ -56,6 +56,7 @@ clusterOptions <- if (requireNamespace('jmvcore')) R6::R6Class(
 clusterResults <- if (requireNamespace('jmvcore')) R6::R6Class(
     inherit = jmvcore::Group,
     active = list(
+        todo = function() private$.items[["todo"]],
         text = function() private$.items[["text"]]),
     private = list(),
     public=list(
@@ -64,6 +65,10 @@ clusterResults <- if (requireNamespace('jmvcore')) R6::R6Class(
                 options=options,
                 name="",
                 title="Cluster Analysis")
+            self$add(jmvcore::Preformatted$new(
+                options=options,
+                name="todo",
+                title="To Do"))
             self$add(jmvcore::Preformatted$new(
                 options=options,
                 name="text",
@@ -98,6 +103,7 @@ clusterBase <- if (requireNamespace('jmvcore')) R6::R6Class(
 #' @param varEq .
 #' @return A results object containing:
 #' \tabular{llllll}{
+#'   \code{results$todo} \tab \tab \tab \tab \tab a preformatted \cr
 #'   \code{results$text} \tab \tab \tab \tab \tab a preformatted \cr
 #' }
 #'