merge conflicts solved (2)

Merge branch 'master' of https://github.com/CIP-RIU/fbcheck # Conflicts: # R/fbcheck_server_sbase.R
CIP-RIU · Jul 5, 2018 · fefaf54 · fefaf54
2 parents 17b3885 + dbf8073
commit fefaf54
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/R/fbcheck_server_sbase.R b/R/fbcheck_server_sbase.R
@@ -72,6 +72,8 @@ fbcheck_server_sbase <- function(input, output, session, values) {
       shinysky::showshinyalert(session, "alert_fbapp_warning_sbase", paste("ERROR: Your data file has only one row of data. Please upload the right one. "), styleclass = "danger")  
     } else {
       hot_bdata_sbase2 <- dt #fbapp2hidap(fieldbook = dt)
+      names(hot_bdata_sbase2) <- gsub("[[:space:]]", "", names(hot_bdata_sbase2)) #remove whitespaces
+      hot_bdata_sbase2
     }
 
     ####### Create Unique ID ######## 
@@ -85,13 +87,13 @@ fbcheck_server_sbase <- function(input, output, session, values) {
     fileNameExtFile<- fileNameExtFile()
 
     ####### Reactive values  #######
-    hot_bdata_sbase <- hot_bdata_sbase2 
-      values <-  shiny::reactiveValues(
+    hot_bdata_sbase <- hot_bdata_sbase2
+
+    values <-  shiny::reactiveValues(
         hot_btable_fbapp_sbase = hot_bdata_sbase#()
-      )
+    )
     DF <- NULL
 
-# <<<<<<< HEAD
 #     ####### Detect if hot_btable_fbapp_sbase has data  #######
 #     if (!is.null(input$hot_btable_fbapp_sbase)) {
 #       print("if 1")
@@ -110,9 +112,7 @@ fbcheck_server_sbase <- function(input, output, session, values) {
 #           DF <- hot_bdata_sbase2
 #         } 
 #     }
-# =======
 
-
     if(!is.null(input$hot_btable_fbapp_sbase)) {
        DF = hot_to_r(input$hot_btable_fbapp_sbase)
 
@@ -131,7 +131,6 @@ fbcheck_server_sbase <- function(input, output, session, values) {
     } else if (!is.null(values[["hot_btable_fbapp_sbase"]])) {
       DF = values[["hot_btable_fbapp_sbase"]]
     } 
-
 
     if(!is.null(DF)){