Yet more refactoring.

[ccbs] / html / show-tournament.pl

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 3d0db3c945f38c8bb363b93362b30d20637e329e..1de3b0c7cf0295b3390b5ba33d8635e5e87211e5 100755 (executable)
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -24,6 +24,16 @@ if ($ref->{'num_incomplete'} == 0) {
        $closing_valid = 0;
 }
 
+# Check if this tournament is on the bigscreen or not.
+my $ref = $dbh->selectrow_hashref('SELECT * FROM bigscreen.active_tournament');
+my $bigscreen = ($ref->{'tournament'} == $id) ? 1 : 0;
+
+my $active_groups;
+if ($bigscreen) {
+       # Find all groups currently shown on the bigscreen.
+       $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)
 my $scores = ccbs::db_fetch_all($dbh,
@@ -45,6 +55,17 @@ for my $score (@$scores) {
                push @$p, { parallel => $parallel, players => [], songs => [], num_songs => 0 };
                $player = '';
 
+               if ($bigscreen) {
+                       # 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)
@@ -135,6 +156,7 @@ ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'},
        num_qualified => $num_qualified,
        songs => $songs,
        closing_valid => $closing_valid,
-       finishing_valid => $finishing_valid
+       finishing_valid => $finishing_valid,
+       bigscreen => $bigscreen
 });
 $dbh->disconnect;