typo fixed and next button on every page (c4214565) · Commits · Stephanie Wegscheidl / cocoVisR

dashboard/server.R

+19 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,6 +9,12 @@ library(knitr)
	server <- function(input, output, session) {		server <- function(input, output, session) {
	set.seed(122)		set.seed(122)

			#Continue to data page
			observeEvent(input$dataSite, {

			updateTabItems(session, "tabs",selected = "data")

			})
	#DATA PAGE		#DATA PAGE

	#last coconut_name		#last coconut_name
	@@ -164,6 +170,13 @@ server <- function(input, output, session) {
	}		}
	})		})

			#Continue to control page
			observeEvent(input$controlSide, {

			updateTabItems(session, "tabs",selected = "controls")

			})

	#CONTROLLS PAGE		#CONTROLLS PAGE

	#Title Input		#Title Input
	@@ -229,7 +242,12 @@ server <- function(input, output, session) {
	})		})


			#Continue to dashboard page
			observeEvent(input$dashboardSite, {

			updateTabItems(session, "tabs",selected = "dashboard")

			})

	#DASHBOARD PAGE		#DASHBOARD PAGE

dashboard/ui.R

+12 −9

Original line number	Original line	Diff line number	Diff line
	@@ -11,9 +11,10 @@ ui <- dashboardPage(
	dashboardHeader(title="CoCoVisR"),		dashboardHeader(title="CoCoVisR"),
	dashboardSidebar(		dashboardSidebar(
	sidebarMenu(		sidebarMenu(
			id="tabs",
	menuItem("Upload", tabName = "upload", icon =icon("upload")),		menuItem("Upload", tabName = "upload", icon =icon("upload")),
	menuItem("Data", tabName = "data", icon =icon("list")),		menuItem("Data", tabName = "data", icon =icon("list")),
	menuItem("Contolls", tabName = "controlls", icon = icon("cog")),		menuItem("Contols", tabName = "controls", icon = icon("cog")),
	menuItem("Dashboard", tabName = "dashboard", icon = icon("dashboard")),		menuItem("Dashboard", tabName = "dashboard", icon = icon("dashboard")),
	menuItem("Help", tabName = "help", icon = icon("book"))		menuItem("Help", tabName = "help", icon = icon("book"))
	)		)
	@@ -39,8 +40,9 @@ ui <- dashboardPage(
	accept = c(		accept = c(
	"text/json",		"text/json",
	"text/comma-separated-values,text/plain",		"text/comma-separated-values,text/plain",
	".json"))		".json")),
			actionButton("dataSite", "next
			")

	),		),

	@@ -58,14 +60,14 @@ ui <- dashboardPage(
	textOutput("lastLoadedQuest"),		textOutput("lastLoadedQuest"),
	h4("Starttime: "),		h4("Starttime: "),
	textOutput("totalStarttime"),		textOutput("totalStarttime"),
	dataTableOutput("quest")		dataTableOutput("quest"),
			actionButton("controlSide", "next")
	),		),


	# Controlls tab content		# Controls tab content
	tabItem(tabName = "controlls",		tabItem(tabName = "controls",
	h2("Controlls here:"),		h2("Controls here:"),
	textInput("title", "Title", " "),		textInput("title", "Title", " "),
	#HISTOGRAM		#HISTOGRAM
	checkboxInput("check_hist", "Histogram", FALSE),		checkboxInput("check_hist", "Histogram", FALSE),
	@@ -83,7 +85,8 @@ ui <- dashboardPage(
	#LINEGRAPH		#LINEGRAPH
	checkboxInput("check_line", "Linegraph", FALSE),		checkboxInput("check_line", "Linegraph", FALSE),
	uiOutput("input_line_x"),		uiOutput("input_line_x"),
	uiOutput("input_line_y")		uiOutput("input_line_y"),
			actionButton("dashboardSite", "go to dashboard")
	),		),

	# Dashboard tab content		# Dashboard tab content