zs

Author: jinseob2kim

Diff for: DESCRIPTION

@@ -1,7 +1,7 @@
 Package: jsmodule
 Title: 'RStudio' Addins and 'Shiny' Modules for Medical Research
-Version: 1.0.3
-Date: 2019-11-12
+Version: 1.0.4
+Date: 2019-11-21
 Authors@R: c(person("Jinseob", "Kim", email = "[email protected]", role = c("aut", "cre"),  comment = c(ORCID = "0000-0002-9403-605X")),
              person("Zarathu", role = c("cph", "fnd"))
              )

Diff for: NEWS.md

@@ -1,3 +1,9 @@
+# jsmodule 1.0.4
+
+## Bug fixes
+
+* **Cox model** of Basic statistics module.
+
 # jsmodule 1.0.3
 
 ## Bug fixes

Diff for: R/coxph.R

@@ -183,10 +183,11 @@ coxModule <- function(input, output, session, data, data_label, data_varStruct =
                           function(v){
                             if (is.null(id.cluster)){
                               forms <- as.formula(paste("survival::Surv(", input$time_cox, ",", input$event_cox, ") ~ ", v, sep = ""))
+                              coef <- tryCatch(summary(survival::coxph(forms, data = data.cox))$coefficients, error = function(e){return(NULL)})
                             } else{
                               forms <- as.formula(paste("survival::Surv(", input$time_cox, ",", input$event_cox, ") ~ ", v, " + cluster(", id.cluster(), ")", sep = ""))
+                              coef <- tryCatch(summary(survival::coxph(forms, data = data.cox, robust = T))$coefficients, error = function(e){return(NULL)})
                             }
-                            coef <- tryCatch(summary(survival::coxph(forms, data = data.cox, robust = T))$coefficients, error = function(e){return(NULL)})
                             sigOK <- ifelse(is.null(coef), F, !all(coef[, "Pr(>|z|)"] > 0.05))
                             return(sigOK)
                           })
@@ -324,7 +325,11 @@ coxModule <- function(input, output, session, data, data_label, data_varStruct =
     )
 
     if (is.null(design.survey)){
-      cc <- substitute(survival::coxph(.form, data= data.cox, model = T, robust = T), list(.form= form.cox()))
+      if (is.null(id.cluster)){
+        cc <- substitute(survival::coxph(.form, data= data.cox, model = T), list(.form= form.cox()))
+      } else{
+        cc <- substitute(survival::coxph(.form, data= data.cox, model = T, robust = T), list(.form= form.cox()))
+      }
       res.cox <- eval(cc)
       tb.cox <- jstable::cox2.display(res.cox, dec = input$decimal)
       tb.cox <- jstable::LabeljsCox(tb.cox, ref = label.regress)