From 22084c552fc5405860bcd4c7052736a48fb7a516 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 12 Oct 2019 15:04:36 +0200 Subject: [PATCH] Update to three groups. --- carousel.js | 4 ++++ client/mainwindow.cpp | 1 + client/mainwindow.ui | 7 +++++++ score.html | 1 + 4 files changed, 13 insertions(+) diff --git a/carousel.js b/carousel.js index b5bf8e2..bbab9aa 100644 --- a/carousel.js +++ b/carousel.js @@ -624,6 +624,7 @@ function showschedule(page) get_group('Group A', cb); get_group('Group B', cb); + get_group('Group C', cb); get_group('Playoffs', cb); }; @@ -661,6 +662,8 @@ function showcarousel() [ 13000, function() { display_group_parsed(teams_per_group['Group A'], games_per_group['Group A'], 'Group A'); } ], [ 2000, function() { hidetable(); } ], [ 13000, function() { display_group_parsed(teams_per_group['Group B'], games_per_group['Group B'], 'Group B'); } ], + [ 2000, function() { hidetable(); } ], + [ 13000, function() { display_group_parsed(teams_per_group['Group C'], games_per_group['Group C'], 'Group C'); } ], [ 2000, function() { hidetable(); } ] ]; let num_pages = find_num_pages(combined_games); @@ -675,6 +678,7 @@ function showcarousel() get_group('Group A', cb); get_group('Group B', cb); + get_group('Group C', cb); get_group('Playoffs', cb); }; diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp index d6d3200..26f684e 100644 --- a/client/mainwindow.cpp +++ b/client/mainwindow.cpp @@ -135,6 +135,7 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->show_scorebug_btn, &QPushButton::clicked, this, &MainWindow::show_scorebug_clicked); connect(ui->show_group_a_btn, &QPushButton::clicked, this, [this]() { show_group_clicked("Group A"); }); connect(ui->show_group_b_btn, &QPushButton::clicked, this, [this]() { show_group_clicked("Group B"); }); + connect(ui->show_group_c_btn, &QPushButton::clicked, this, [this]() { show_group_clicked("Group C"); }); connect(ui->show_schedule_btn, &QPushButton::clicked, this, &MainWindow::show_schedule_clicked); connect(ui->show_carousel_btn, &QPushButton::clicked, this, &MainWindow::show_carousel_clicked); connect(ui->show_nothing_btn, &QPushButton::clicked, this, &MainWindow::show_nothing_clicked); diff --git a/client/mainwindow.ui b/client/mainwindow.ui index 44418ef..2ce9b6a 100644 --- a/client/mainwindow.ui +++ b/client/mainwindow.ui @@ -140,6 +140,13 @@ + + + + Group C + + + diff --git a/score.html b/score.html index 70d5889..3cb90b2 100644 --- a/score.html +++ b/score.html @@ -85,6 +85,7 @@ show roster 1+2 show group A show group B + show group C show schedule show carousel table out -- 2.39.2