We want to show _groups_ on the big screen, not _rounds_

[ccbs] / html / show-tournament.pl

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 602e5cb1696c1230f36fc457dbe3091666ea3c4e..7be00367df10cb0b4077e6d4d968c1ea809f40f8 100755 (executable)
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -24,8 +24,8 @@ if ($ref->{'num_incomplete'} == 0) {
        $closing_valid = 0;
 }
 
-# Find all rounds currently shown on the bigscreen.
-my $active_rounds = $dbh->selectall_hashref('SELECT round FROM bigscreen.active_rounds WHERE tournament=?', 'round', undef, $id);
+# Find all groups currently shown on the bigscreen.
+my $active_groups = ccbs::db_fetch_all($dbh, 'SELECT * FROM bigscreen.active_groups WHERE tournament=?', $id);
 
 # Swoop all the data in in a big join, then order it over to quasi-sane Perl objects.
 # (round -> parallel -> player -> songs -> title,chosen,score)
@@ -41,12 +41,6 @@ for my $score (@$scores) {
                $round = $score->{'round'};
                push @rounds, { round => $round, parallels => [], locked => 0 };
                $parallel = -1;
-
-               if (defined($active_rounds->{$round})) {
-                       $rounds[$#rounds]->{'bigscreen'} = 1;
-               } else {
-                       $rounds[$#rounds]->{'bigscreen'} = 0;
-               }
        }
        my $p = $rounds[$#rounds]->{'parallels'};
        if ($score->{'parallel'} != $parallel) {
@@ -54,6 +48,15 @@ for my $score (@$scores) {
                push @$p, { parallel => $parallel, players => [], songs => [], num_songs => 0 };
                $player = '';
 
+               # suboptimal, but heck :-)
+               $p->[$#$p]->{'bigscreen'} = 0;
+               for my $ag (@$active_groups) {
+                       if ($ag->{'round'} == $round && $ag->{'parallel'} == $parallel) {
+                               $p->[$#$p]->{'bigscreen'} = 1;
+                               last;
+                       }
+               }
+
                # Information on songs is not selected from roundrandomsongs etc.,
                # but is filled in the first time the song is seen for this round
                # (ie. below)