]> git.sesse.net Git - ultimatescore/commitdiff
Update to three groups.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 12 Oct 2019 13:04:36 +0000 (15:04 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 12 Oct 2019 13:04:36 +0000 (15:04 +0200)
carousel.js
client/mainwindow.cpp
client/mainwindow.ui
score.html

index b5bf8e294ee80b01d1a8368ee766714536def05c..bbab9aafe300ea0787f291a32a75fd33efbaebf5 100644 (file)
@@ -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);
 };
 
index d6d32008e73ba6f89f8ae8ea2dda007b18a278af..26f684ece2caf52a94e8f35abd5bba06b4040469 100644 (file)
@@ -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);
index 44418ef7b2240d5d890a274801854ea13b76843c..2ce9b6a75feba8389f2ed2a36eb3db63fd2c22ac 100644 (file)
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QPushButton" name="show_group_c_btn">
+          <property name="text">
+           <string>Group C</string>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QPushButton" name="show_schedule_btn">
           <property name="text">
index 70d5889fd0af592128638770bd6abd8fab83942f..3cb90b263d9b48b907f7a157f2c7440827e0efe2 100644 (file)
@@ -85,6 +85,7 @@
         <a href="javascript:stopcarousel();showrostercarousel('TFK', 'ESK')">show roster 1+2</a>
         <a href="javascript:stopcarousel();showgroup('Group A')">show group A</a>
         <a href="javascript:stopcarousel();showgroup('Group B')">show group B</a>
+        <a href="javascript:stopcarousel();showgroup('Group C')">show group C</a>
         <a href="javascript:stopcarousel();showschedule()">show schedule</a>
         <a href="javascript:stopcarousel();showcarousel()">show carousel</a>
         <a href="javascript:stopcarousel();hidetable()">table out</a>