Commit 1dc3f219 authored by Stephanie Wegscheidl's avatar Stephanie Wegscheidl
Browse files

Button instead of checkbox. 

Selectinputs again in viewpanel not in chartboxes.

Plots more width.
Timeline height reduced.

multiple barcharts not working
parent f500043c

dashboard/server.R

+34 −27
Original line number Diff line number Diff line
@@ -272,7 +272,8 @@ server <- function(input, output, session) { 
    insertUI(

      

      selector= "#viewpanel", #wo will ichs hinhaben

      ui= box(  title="Barchart",

      ui= box(  width = 12,

                title="Barchart",

                status= "warning",

                solidHeader = TRUE,

                collapsible = TRUE,
@@ -289,20 +290,23 @@ server <- function(input, output, session) { 
  #DASHBOARD  

  #BAR VIEW

  

  local({

  output[[plotname]] <- renderPlot({

    print(plotname)



    data<- structure(list(V1=as.numeric(coconut.df[[input$xplotname]]),

                          V2=as.numeric(coconut.df[[input$yplotname]])),

                     .Names=c("V1","V2"), row.names=c(NA,6L), class = "data.frame")

    #Neues Plot

    barplot(data$V1,data$V2,

            ylab= input$yplotname,

            xlab=input$xplotname)



  })

  })

  # #local({     

  #   

  #   

  #   # 

  #   # output[[plotname]] <- renderPlot({

  #   #   print(plotname)

  #   # 

  #   #   data<- structure(list(V1=as.numeric(coconut.df[[input$xplotname]]),

  #   #                         V2=as.numeric(coconut.df[[input$yplotname]])),

  #   #                    .Names=c("V1","V2"), row.names=c(NA,6L), class = "data.frame")

  #   #   #Neues Plot

  #   #   barplot(data$V1,data$V2,

  #   #           ylab= input$yplotname,

  #   #           xlab=input$xplotname)

  #   # 

  #   # })

  # #})

  

  ## ALTES PLOT

  #a=1
@@ -326,11 +330,12 @@ server <- function(input, output, session) { 
  #TIMELINE

  output$time_box <- renderUI({

    if(input$check_time)

      box(  title="Timeline",

      box(  width = 12,

            title="Timeline",

            status= "warning",

            solidHeader = TRUE,

            collapsible = TRUE,

            timevisOutput("time", height = 250)

            timevisOutput("time", height = 150)

      )

  })
@@ -365,12 +370,12 @@ server <- function(input, output, session) { 
  #linechart

  output$line_box <- renderUI({

    if(input$check_line)

      box(  title="Linechart",

      box(  width = 12,

            title="Linechart",

            status= "warning",

            solidHeader = TRUE,

            collapsible = TRUE,

            selectInput("line_x", "x-axis", choices=colnames(coconut.df)),

            selectInput("line_y", "y-axis", choices=colnames(coconut.df)),

            

            #add_tooltip(data_tooltip, "hover"),

            plotOutput("line", height = 250))

  })
@@ -388,12 +393,12 @@ server <- function(input, output, session) { 
  # Scatterplot

  output$scat_box <- renderUI({

    if(input$check_scat)

      box(  title="Scatterplot",

      box(  width = 12,

            title="Scatterplot",

            status= "warning",

            solidHeader = TRUE,

            collapsible = TRUE,

            selectInput("scat_x", "x-axis", choices=colnames(coconut.df)),

            selectInput("scat_y", "y-axis", choices=colnames(coconut.df)),

           

            plotOutput("scat", height = 250))

  })
@@ -410,11 +415,12 @@ server <- function(input, output, session) { 
  # Boxplot

  output$box_box <- renderUI({

    if(input$check_box)

      box(  title="Boxplot",

      box(  width = 12,

            title="Boxplot",

            status= "warning",

            solidHeader = TRUE,

            collapsible = TRUE,

            selectInput("box_x", "x-axis", choices=colnames(coconut.df)),

            

            plotOutput("box", height = 250))

  })
@@ -430,11 +436,12 @@ server <- function(input, output, session) { 
  #MAP

  output$map_box <- renderUI({

    if(input$check_map)

      box(  title="Map",

      box(  width = 12,

            title="Map",

            status= "warning",

            solidHeader = TRUE,

            collapsible = TRUE,

            selectInput("map_data", "data", choices=colnames(coconut.df)),

           

            leafletOutput("map", height = 250))

  })

dashboard/ui.R

+11 −4
Original line number Diff line number Diff line
@@ -82,14 +82,17 @@ ui <- dashboardPage( 
                                       ),

                                       #TIMELINE

                                       tabPanel("Timeline",

                                       actionButton("check_time", "add Timeline"),

                                       textOutput("texttimeline")

                                       

                                       textOutput("texttimeline"),

                                       actionButton("check_time", "add Timeline")

                                       #selectInput("time_data", "data", choices=colnames(coconut.df))

                                       #uiOutput("input_time_x"),

                                       #uiOutput("input_time_y")

                                       ),

                                       #Linechart

                                       tabPanel("Linechart",

                                                selectInput("line_x", "x-axis", choices=colnames(coconut.df)),

                                                selectInput("line_y", "y-axis", choices=colnames(coconut.df)),

                                                actionButton("check_line", "add Linechart")

                                       

                                       #uiOutput("input_line_x"),
@@ -97,17 +100,21 @@ ui <- dashboardPage( 
                                       ),

                                       #Scatterplot

                                       tabPanel("Scatterplot",

                                                selectInput("scat_x", "x-axis", choices=colnames(coconut.df)),

                                                selectInput("scat_y", "y-axis", choices=colnames(coconut.df)),

                                                actionButton("check_scat", " add Scatterplot")

                                                

                                                ),

                                       #Boxplot

                                       tabPanel("Boxplot",

                                                selectInput("box_x", "x-axis", choices=colnames(coconut.df)),

                                                actionButton("check_box", "add Boxplot")



                                                #selectInput("box_y", "y-axis", choices=colnames(coconut.df))

                                       ),

                                       #MAP

                                       tabPanel("Map",

                                                selectInput("map_data", "data", choices=colnames(coconut.df)),

                                                actionButton("check_map", "add Map")

                                       

                                       )