[data] bug fix in datatable+excel time format

Author: mcwimm

R_scripts/functions/fun_data.R

@@ -71,14 +71,14 @@ unify.datetime = function(rawData){
          # Define columns with lower case names for further processing
          rawData$date = date_col[[1]]
          rawData$time = time_col[[1]]
-
          datetimeformat = get.datetime.format(rawData[1,]$date, rawData[1,]$time)
          dateformat = get.date.format(rawData[1,]$date)
 
          rawData = rawData %>% 
             rowwise() %>% 
             mutate(datetime = as.POSIXct(x = paste(date, time),
-                                         format = datetimeformat),
+                                         format = datetimeformat,
+                                         tz = "GMT"),
                    date = as.Date(date,
                                   format = dateformat))
       }

server.R

@@ -432,6 +432,8 @@ shinyServer(function(input, output, session) {
       if ("dTime" %in% colnames(rawData)){
         rawDataTable = rawData %>% 
                mutate(dTime = round(dTime, 2))
+        rawDataTable = datatable(rawDataTable )%>% 
+          formatDate("datetime", "toLocaleString")
       } else {
         rawDataTable = tab.with.message(message.fail.upload)
       }
@@ -442,10 +444,15 @@ shinyServer(function(input, output, session) {
     #' (Data > Upload > Preview data)
     output$raw.long <- DT::renderDataTable(rownames = FALSE, {
       an.error.occured = FALSE
-      tryCatch( { tab  = deltaTempLongNoFilter() %>% 
-                            mutate_if(is.numeric, round, 3) },
-                error = function(e) {an.error.occured <<- TRUE})
-      if (an.error.occured){
+      tryCatch({
+        tab  = datatable(deltaTempLongNoFilter() %>%
+                           mutate_if(is.numeric, round, 3)) %>%
+          formatDate("datetime", "toLocaleString")
+      },
+      error = function(e) {
+        an.error.occured <<- TRUE
+      })
+      if (an.error.occured) {
         tab = tab.with.message(message.fail.upload)
       }
       return(tab)