Merge pull request #81 from GSK-Biostatistics/prep-release

Prep release
GSK-Biostatistics · Apr 8, 2024 · 7d9de36 · 7d9de36
2 parents a132801 + 5b5e7c2
commit 7d9de36
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: tfrmtbuilder
 Title: 'shiny' App Companion to the 'tfrmt' Package
-Version: 0.0.5.9000
+Version: 0.0.6
 Authors@R: 
   c(person(given = "Becca",
                     family = "Krouse",

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# tfrmtbuilder development version
+# tfrmtbuilder 0.0.6
 
 * New features:
   - Add support for `page_plan`

diff --git a/R/mod_load.R b/R/mod_load.R
@@ -43,7 +43,7 @@ load_ui <- function(id){
                                      choices = c("Auto", "Upload", "Example"), selected = "Auto"),
                    fluidRow(
                      conditionalPanel("input.data_source=='Upload'",
-                                      column(6, fileInput(ns("data_load"), buttonLabel = "Load Data", label = NULL, accept = c(".csv",".sas7bdat",".rds"))),
+                                      column(6, fileInput(ns("data_load"), buttonLabel = "Load Data", label = NULL, accept = c(".csv",".sas7bdat",".rds",".xpt"))),
                                       ns = ns)
                    ),
                    fluidRow(

diff --git a/R/mod_table_inner.R b/R/mod_table_inner.R
@@ -19,8 +19,7 @@ table_inner_ui <- function(id){
         htmlOutput(ns("tbl_view"))
       ),
       full_screen = TRUE,
-      #height = "380px",
-      max_height = "380px",
+      height = "430px",
       style = "border: 1px solid #AAC0E8 !important;"
     ),
     shinyjs::hidden(

diff --git a/R/tfrmtbuilder_server.R b/R/tfrmtbuilder_server.R
@@ -72,7 +72,7 @@ tfrmtbuilder_server <- function(id) {
       data_out <- reactive({
         if (!settings()$mode=="mock_no_data"){
           # original data loaded in
-          settings()$data
+          settings_orig$data()
         } else {
           req(tfrmt_app_out())
           # regenerate mock data from new tfrmt

diff --git a/R/tfrmtbuilder_ui.R b/R/tfrmtbuilder_ui.R
@@ -92,7 +92,7 @@ tfrmtbuilder_ui <- function(id){
                              "header.append('<div style=\"float:right; margin-bottom:0; color:#fff;\">",
                                 "<div class=\"form-group shiny-input-container\" style = \"margin-bottom:0; color:#fff;\">",
                                     "<div class=\"pretty p-default p-switch p-fill\">",
-                                      "<input id=\"", ns("mockmode"), "\" type=\"checkbox\"/ checked=\"checked\" class = \"shiny-bound-input\">",
+                                      "<input id=\"", ns("mockmode"), "\" type=\"checkbox\"/ checked=\"checked\">",
                                       "<div class=\"state p-danger\">",
                                         "<label>",
                                         "<span >Mock Mode</span>",