diff --git a/Server/Results.R b/Server/Results.R index 95c90b4..581a727 100644 --- a/Server/Results.R +++ b/Server/Results.R @@ -30,8 +30,8 @@ matchesForTeam <- function(input, output) { getFilteredResultsForTeam(input), extensions = 'Buttons', options = list( - lengthMenu = list(c(5, 10, -1), c('5', '10', '20', 'All')), - pageLength = 20, + lengthMenu = list(c(5, 10, -1), c('5', '10', 'All')), + pageLength = 10, searching = FALSE ) ) diff --git a/Server/Server.R b/Server/Server.R index 9061e19..8827ec7 100644 --- a/Server/Server.R +++ b/Server/Server.R @@ -6,7 +6,6 @@ source("Server/Results.R") source("Server/DataProcessor.R") source("Server/SummaryStatistics.R") -# source("Server/InteractiveMapStatistics.R") # Server logic server <- function(input, output) { @@ -19,7 +18,4 @@ server <- function(input, output) { balanceBetweenTeams(input, output) balancePercentage(input, output) resultsWithPagination(input, output) - - # Tab 3 - # interactiveMapStatistics(input, output) } diff --git a/UI/SidebarPanel.R b/UI/SidebarPanel.R index 23c6ac1..37b9969 100644 --- a/UI/SidebarPanel.R +++ b/UI/SidebarPanel.R @@ -19,18 +19,6 @@ teamsSidebarPanel <- function() { end = max_date_to, min = min_date_from, 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) - #) ) ) ) diff --git a/UI/UI.R b/UI/UI.R index d3c5a17..b7ab9c7 100644 --- a/UI/UI.R +++ b/UI/UI.R @@ -18,31 +18,31 @@ ui <- navbarPage( teamSidebarPanel() ), column(9, - tabsetPanel( - tabPanel( - "Charts", - h2("Matches balance charts"), - fluidRow( - column(6, - wellPanel( - plotOutput("balance_for_team") - ) - ), - column(6, - wellPanel( - verbatimTextOutput("Test") - ) + fluidRow( + column( + 6, + tabsetPanel( + tabPanel( + "Charts", + h2("Matches balance charts"), + wellPanel( + plotOutput("balance_for_team") + ) ) ) ), - tabPanel( - "Summary", - tableOutput("summary_statistics") - - ), - tabPanel( - "All matches", - dataTableOutput("matches_for_team") + column( + 6, + wellPanel( + tableOutput("summary_statistics") + ) + ) + ) + , + fluidRow( + column( + 12, + DT::dataTableOutput("matches_for_team") ) ) )