Improved views

This commit is contained in:
Jakub Wajs 2019-06-14 22:56:24 +02:00
parent d6e61438fd
commit 70c70cd7f8
4 changed files with 24 additions and 40 deletions

View File

@ -30,8 +30,8 @@ matchesForTeam <- function(input, output) {
getFilteredResultsForTeam(input), getFilteredResultsForTeam(input),
extensions = 'Buttons', extensions = 'Buttons',
options = list( options = list(
lengthMenu = list(c(5, 10, -1), c('5', '10', '20', 'All')), lengthMenu = list(c(5, 10, -1), c('5', '10', 'All')),
pageLength = 20, pageLength = 10,
searching = FALSE searching = FALSE
) )
) )

View File

@ -6,7 +6,6 @@
source("Server/Results.R") source("Server/Results.R")
source("Server/DataProcessor.R") source("Server/DataProcessor.R")
source("Server/SummaryStatistics.R") source("Server/SummaryStatistics.R")
# source("Server/InteractiveMapStatistics.R")
# Server logic # Server logic
server <- function(input, output) { server <- function(input, output) {
@ -19,7 +18,4 @@ server <- function(input, output) {
balanceBetweenTeams(input, output) balanceBetweenTeams(input, output)
balancePercentage(input, output) balancePercentage(input, output)
resultsWithPagination(input, output) resultsWithPagination(input, output)
# Tab 3
# interactiveMapStatistics(input, output)
} }

View File

@ -19,18 +19,6 @@ teamsSidebarPanel <- function() {
end = max_date_to, end = max_date_to,
min = min_date_from, min = min_date_from,
max = max_date_to) max = max_date_to)
#dropdownButton(
# label = "Tournament types",
# circle = FALSE,
#radioButtons("tournament_all",
# "Select:",
# choices = c("All", "None"),
# selected = "All"),
# checkboxGroupInput("tournament_type",
# "Tournament type:",
# choices = tournament_types,
# selected = tournament_types)
#)
) )
) )
) )

44
UI/UI.R
View File

@ -18,31 +18,31 @@ ui <- navbarPage(
teamSidebarPanel() teamSidebarPanel()
), ),
column(9, column(9,
tabsetPanel( fluidRow(
tabPanel( column(
"Charts", 6,
h2("Matches balance charts"), tabsetPanel(
fluidRow( tabPanel(
column(6, "Charts",
wellPanel( h2("Matches balance charts"),
plotOutput("balance_for_team") wellPanel(
) plotOutput("balance_for_team")
), )
column(6,
wellPanel(
verbatimTextOutput("Test")
)
) )
) )
), ),
tabPanel( column(
"Summary", 6,
tableOutput("summary_statistics") wellPanel(
tableOutput("summary_statistics")
), )
tabPanel( )
"All matches", )
dataTableOutput("matches_for_team") ,
fluidRow(
column(
12,
DT::dataTableOutput("matches_for_team")
) )
) )
) )