From 8d6dd33b77319cdf11131da25ba3e3b462dfbca0 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 19 Feb 2005 14:26:48 +0000 Subject: [PATCH 1/1] Only show the bigscreen buttons on the tournament that is actually on the bigscreen. --- html/show-tournament.pl | 28 +++++++++++++++++++--------- html/templates/show-tournament.tmpl | 8 +++++--- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/html/show-tournament.pl b/html/show-tournament.pl index 7be0036..1de3b0c 100755 --- a/html/show-tournament.pl +++ b/html/show-tournament.pl @@ -24,8 +24,15 @@ if ($ref->{'num_incomplete'} == 0) { $closing_valid = 0; } -# Find all groups currently shown on the bigscreen. -my $active_groups = ccbs::db_fetch_all($dbh, 'SELECT * FROM bigscreen.active_groups WHERE tournament=?', $id); +# 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) @@ -48,12 +55,14 @@ 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; + 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; + } } } @@ -147,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; diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl index 86854cd..6409463 100644 --- a/html/templates/show-tournament.tmpl +++ b/html/templates/show-tournament.tmpl @@ -94,20 +94,22 @@
[% FOR p = r.parallels %] + [% IF bigscreen %]

- [% IF p.bigscreen %] + [% IF p.bigscreen %] - [% ELSE %] + [% ELSE %] - [% END %] + [% END %]

+ [% END %]
-- 2.39.2