Commit 2711e1a3 authored by Stephanie's avatar Stephanie

updated Help, raw scetched Controlls and not working try of CoCoQuest import

parent d88a581e
...@@ -36,22 +36,21 @@ server <- function(input, output) { ...@@ -36,22 +36,21 @@ server <- function(input, output) {
) )
) )
#coconut.df$timestamp <- anytime((as.numeric(coconut.df$timestamp)/1000)) #coconut.df$timestamp <- anytime((as.numeric(coconut.df$timestamp)/1000))
}) })
#TODO: CoCoQuest Output --> Ansätze data[] raus nehmen oder flatten richtig funken
output$file2 <- renderDataTable({ output$file2 <- renderDataTable({
inFile <- input$file2 inFile <- input$file2
if (is.null(inFile)) if (is.null(inFile))
return(NULL) return(NULL)
json_data_quest <- fromJSON(paste(inFile$datapath, sep = ""), simplifyVector = TRUE, simplifyDataFrame = simplifyVector,
json_data_quest <- fromJSON(paste(inFile$datapath, sep = ""), flatten = TRUE) simplifyMatrix = simplifyVector, flatten = FALSE)
#json_data <-map() #flatten(json_data_quest)
#print(json_for_from) #json_data <-map() <-- ansatz zum parsen?
}) })
......
...@@ -19,6 +19,7 @@ ui <- dashboardPage( ...@@ -19,6 +19,7 @@ ui <- dashboardPage(
menuItem("Help", tabName = "help", icon = icon("book")) menuItem("Help", tabName = "help", icon = icon("book"))
) )
), ),
dashboardBody( dashboardBody(
#tags$head( #tags$head(
# tags$link(rel = "stylesheet", type = "text/css", href = "custom.css") # tags$link(rel = "stylesheet", type = "text/css", href = "custom.css")
...@@ -49,7 +50,7 @@ ui <- dashboardPage( ...@@ -49,7 +50,7 @@ ui <- dashboardPage(
h2("CoConUT Data here:"), h2("CoConUT Data here:"),
dataTableOutput("file1"), dataTableOutput("file1"),
h2("CoCoQuest Data here:"), h2("CoCoQuest Data here:"),
...@@ -61,14 +62,20 @@ ui <- dashboardPage( ...@@ -61,14 +62,20 @@ ui <- dashboardPage(
# Controlls tab content # Controlls tab content
tabItem(tabName = "controlls", tabItem(tabName = "controlls",
h2("Controlls here:"), h2("Controlls here:"),
#TODO: SelectInput --> Get data out of loaded json to select it
checkboxInput("histogram", "Histogram", FALSE), checkboxInput("histogram", "Histogram", FALSE),
#selectInput('in6', 'Data', data.name, multiple=TRUE, selectize=TRUE), selectInput('in1', "x-Axis: " , "Bluetoothdevices", multiple=TRUE, selectize=TRUE),
selectInput('in4', "y-Axis: " , "Bluetoothdevices", multiple=TRUE, selectize=TRUE),
checkboxInput("timeline", "Timeline", FALSE), checkboxInput("timeline", "Timeline", FALSE),
#selectInput('in6', 'Data', data.name, multiple=TRUE, selectize=TRUE), selectInput('in2', "x-Axis: " , "Bluetoothdevices", multiple=TRUE, selectize=TRUE),
selectInput('in4', "y-Axis: " , "Bluetoothdevices", multiple=TRUE, selectize=TRUE),
checkboxInput("map", "Map", FALSE), checkboxInput("map", "Map", FALSE),
#selectInput('in6', 'Data', data.name, multiple=TRUE, selectize=TRUE), selectInput('in3', "x-Axis: " , "Bluetoothdevices", multiple=TRUE, selectize=TRUE),
checkboxInput("lingegraph","Linegraph",FALSE) selectInput('in4', "y-Axis: " , "Bluetoothdevices", multiple=TRUE, selectize=TRUE),
#selectInput('in6', 'Data', data.name, multiple=TRUE, selectize=TRUE) checkboxInput("lingegraph","Linegraph",FALSE),
selectInput('in4', "x-Axis: " , "Bluetoothdevices", multiple=TRUE, selectize=TRUE),
selectInput('in4', "y-Axis: " , "Bluetoothdevices", multiple=TRUE, selectize=TRUE)
), ),
# Dashboard tab content # Dashboard tab content
...@@ -119,8 +126,11 @@ ui <- dashboardPage( ...@@ -119,8 +126,11 @@ ui <- dashboardPage(
Then the name of the selected file and a loadingbar will apear. 'Upload complete' will show you that the upload worked and is finished.", br(), Then the name of the selected file and a loadingbar will apear. 'Upload complete' will show you that the upload worked and is finished.", br(),
"Please make sure, that you upload the right data into the right field.", br(), "Please make sure, that you upload the right data into the right field.", br(),
"First field: CoConUT and second field: CoCoQuest. Otherwise the visualization won't work.", "First field: CoConUT and second field: CoCoQuest. Otherwise the visualization won't work.",
h3("Data"),
"After correctly loading up the right json files, in this vies will apear a table that shows the data that were red from the jsons.", br(),
h3("Controlls"), h3("Controlls"),
"", br(), "On this page you are able to select the visualizations you want to use and which data should be in them.", br(),
"To show a visualization on the dashboard you have to enable the right checkbox. After that you need to select the x- and y-axis for this visualisation and then it will be added to the dashboard. ",
h3("Dashboard"), h3("Dashboard"),
"", br() "", br()
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment