Interface improvement. Box for classified data download is now genera…

…ted server side.
AEBilgrau · Feb 6, 2019 · 62fb956 · 62fb956
1 parent edec486
commit 62fb956
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/inst/shiny/server.R b/inst/shiny/server.R
@@ -70,7 +70,6 @@ shinyServer(function(input, output, session) {
     validate(need(user_data(), "Please upload some data."))
 
     tagList(
-      h1("Dataset loaded"),
       p(sprintf("%i rows and %i columns detected. Showing %i rows below.",
                 nrow(user_data()),
                 ncol(user_data()),
@@ -424,7 +423,7 @@ shinyServer(function(input, output, session) {
 
 
 
-  # sigma input functionality -----
+  # Sigma input functionality -----
   # Update full_start_theta reactiveVal upon edit event
   observe({
     req(rv$m)
@@ -555,6 +554,7 @@ shinyServer(function(input, output, session) {
   })
 
 
+  # Pie plot ----
   output$full_plot_pie <- renderUI({
     req(fit <- full_fit())
 
@@ -884,6 +884,24 @@ shinyServer(function(input, output, session) {
     }
   )
 
+  output$full_classified_data <- renderUI({
+    req(full_prob())
+    req(full_classification())
+
+    box(
+      title = "Classified data",
+      footer = downloadButton('full_downloadData', 'Download'),
+      status = "info",
+      width = 12,
+      collapsible = TRUE,
+      collapsed = TRUE,
+      solidHeader = TRUE,
+
+      DTOutput("full_out_file_table")
+    )
+  })
+
+
 
   # DEBUG ----
   output$DEBUG <- renderPrint({

diff --git a/inst/shiny/ui.R b/inst/shiny/ui.R
@@ -65,7 +65,6 @@ shinyUI(
             collapsible = TRUE,
             solidHeader = FALSE,
 
-
             # Content
             htmlOutput("input_file_description"),
             DTOutput("in_file_table")
@@ -167,24 +166,14 @@ shinyUI(
           uiOutput("full_mu_box"),
           uiOutput("full_sigma_box"),
           uiOutput("full_plot_pie"),
+          uiOutput("full_ui_selectize_model_cols_xy"),
+          uiOutput("full_res_theta_plot"),
           uiOutput("full_res_mu"),
           uiOutput("full_res_sigma"),
           uiOutput("full_obs_plot"),
           uiOutput("full_rank_plot"),
           uiOutput("full_latent_plot"),
-          uiOutput("full_ui_selectize_model_cols_xy"),
-          uiOutput("full_res_theta_plot"),
-          box(
-            title = "Classified data",
-            footer = downloadButton('full_downloadData', 'Download'),
-            status = "info",
-            width = 12,
-            collapsible = TRUE,
-            collapsed = TRUE,
-            solidHeader = TRUE,
-
-            DTOutput("full_out_file_table")
-          ),
+          uiOutput("full_classified_data"),
           uiOutput("full_fit_log")
           #,verbatimTextOutput("DEBUG")
         )