Merge branch 'master' into dev

jinseob2kim · Feb 22, 2024 · f0c762b · f0c762b
2 parents 391ba83 + 722c263
commit f0c762b
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 11 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -10,3 +10,4 @@
 ^CRAN-RELEASE$
 ^\.github$
 ^CRAN-SUBMISSION$
+^cla$
diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
@@ -1,3 +1,3 @@
-Version: 1.4.2
-Date: 2023-08-08 14:04:37 UTC
-SHA: 73e6fe097b351763af69e3df059fcb0232f42357
+Version: 1.4.4
+Date: 2023-12-07 02:27:21 UTC
+SHA: eba4c48441733627041c71a95c0e4a58f030387e
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -13,7 +13,7 @@ Description: 'RStudio' addins and 'Shiny' modules for descriptive statistics, re
 Depends: R (>= 3.4.0)
 License: Apache License 2.0 
 Encoding: UTF-8
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 Imports: utils, stats, data.table, shiny, readxl, DT, jstable, labelled, methods, GGally, ggplot2, haven, rstudioapi, shinycustomloader, MatchIt(>= 3.0.0), survey, jskm(>= 0.4.4), survival, purrr, geepack, maxstat, survIDINRI, timeROC, shinyWidgets, pROC, Hmisc, see, readr, RColorBrewer, ggpubr, officer, rvg, epiDisplay, forestploter
 URL: https://github.com/jinseob2kim/jsmodule
 BugReports: https://github.com/jinseob2kim/jsmodule/issues

diff --git a/R/jsBasicGadget.R b/R/jsBasicGadget.R
@@ -278,7 +278,7 @@ jsBasicGadget <- function(data, nfactor.limit = 20) {
         title = "subgroup cox",
         sidebarLayout(
           sidebarPanel(
-            forestcoxUI('Forest')
+            forestcoxUI("Forest")
           ),
           mainPanel(
             tabsetPanel(
@@ -297,6 +297,7 @@ jsBasicGadget <- function(data, nfactor.limit = 20) {
                 plotOutput("forestplot", width = "100%"),
                 ggplotdownUI("Forest")
               )
+
             )
           )
         )
@@ -305,9 +306,10 @@ jsBasicGadget <- function(data, nfactor.limit = 20) {
         title = "subgroup regression",
         sidebarLayout(
           sidebarPanel(
-            forestglmUI('Forest_glm')
+            forestglmUI("Forest_glm")
           ),
           mainPanel(
+
             tabsetPanel(
               type = "pills",
               tabPanel(
@@ -324,6 +326,7 @@ jsBasicGadget <- function(data, nfactor.limit = 20) {
                 plotOutput("forestplot_glm", width = "100%"),
                 ggplotdownUI("Forest_glm")
               )
+
             )
           )
         )
@@ -332,7 +335,7 @@ jsBasicGadget <- function(data, nfactor.limit = 20) {
         title = "subgroup logistic regression",
         sidebarLayout(
           sidebarPanel(
-            forestglmUI('Forest_glmbi')
+            forestglmUI("Forest_glmbi")
           ),
           mainPanel(
             tabsetPanel(
@@ -351,6 +354,7 @@ jsBasicGadget <- function(data, nfactor.limit = 20) {
                 plotOutput("forestplot_glmbi", width = "100%"),
                 ggplotdownUI("Forest_glmbi")
               )
+
             )
           )
         )
@@ -740,6 +744,7 @@ jsBasicGadget <- function(data, nfactor.limit = 20) {
       caption.placement = "top"
     )
 
+
     outtable<-forestcoxServer('Forest',data=data,data_label=data.label)
     output$tablesub<-renderDT({
       outtable()[[1]]
@@ -760,6 +765,7 @@ jsBasicGadget <- function(data, nfactor.limit = 20) {
     })
     output$forestplot_glmbi<-renderPlot({
       outtable_glmbi()[[2]]
+
     })
     session$onSessionEnded(function() {
       stopApp()
@@ -1114,9 +1120,10 @@ jsBasicExtAddin <- function(nfactor.limit = 20, max.filesize = 2048) {
         title = "subgroup cox",
         sidebarLayout(
           sidebarPanel(
-            forestcoxUI('Forest')
+            forestcoxUI("Forest")
           ),
           mainPanel(
+
             tabsetPanel(
               type = "pills",
               tabPanel(
@@ -1132,6 +1139,7 @@ jsBasicExtAddin <- function(nfactor.limit = 20, max.filesize = 2048) {
                 plotOutput("forestplot", width = "100%"),
                 ggplotdownUI("Forest")
               )
+
             )
           )
         )
@@ -1140,7 +1148,7 @@ jsBasicExtAddin <- function(nfactor.limit = 20, max.filesize = 2048) {
         title = "subgroup regression",
         sidebarLayout(
           sidebarPanel(
-            forestglmUI('Forest_glm')
+            forestglmUI("Forest_glm")
           ),
           mainPanel(
             tabsetPanel(
@@ -1158,6 +1166,7 @@ jsBasicExtAddin <- function(nfactor.limit = 20, max.filesize = 2048) {
                 plotOutput("forestplot_glm", width = "100%"),
                 ggplotdownUI("Forest_glm")
               )
+
             )
           )
         )
@@ -1166,7 +1175,7 @@ jsBasicExtAddin <- function(nfactor.limit = 20, max.filesize = 2048) {
         title = "subgroup logistic regression",
         sidebarLayout(
           sidebarPanel(
-            forestglmUI('Forest_glmbi')
+            forestglmUI("Forest_glmbi")
           ),
           mainPanel(
             tabsetPanel(
@@ -1184,8 +1193,8 @@ jsBasicExtAddin <- function(nfactor.limit = 20, max.filesize = 2048) {
                 plotOutput("forestplot_glmbi", width = "100%"),
                 ggplotdownUI("Forest_glmbi")
               )
-            )
 
+            )
           )
         )
       )
@@ -1445,6 +1454,7 @@ jsBasicExtAddin <- function(nfactor.limit = 20, max.filesize = 2048) {
     })
     output$forestplot_glmbi<-renderPlot({
       outtable_glmbi()[[2]]
+
     })
     session$onSessionEnded(function() {
       stopApp()

diff --git a/cla/cla.json b/cla/cla.json
@@ -7,6 +7,14 @@
       "created_at": "2023-12-12T10:55:16Z",
       "repoId": 152427784,
       "pullRequestNo": 17
+    },
+    {
+      "name": "cyk0315",
+      "id": 91959343,
+      "comment_id": 1923062718,
+      "created_at": "2024-02-02T06:52:12Z",
+      "repoId": 152427784,
+      "pullRequestNo": 18
     }
   ]
 }