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

diff --git a/html/do-set-active-tournament.pl b/html/do-set-active-tournament.pl
index 4405e4270c02b67c4eb11df39cd6760a8c5488eb..c27ebf5b18599445eab4c20d1f5d8bcdf32c52df 100755 (executable)
--- a/html/do-set-active-tournament.pl
+++ b/html/do-set-active-tournament.pl
@@ -10,7 +10,7 @@ my $cgi = new CGI;
 my $tournament = $cgi->param('tournament');
 $dbh->{AutoCommit} = 0;
 
-$dbh->do('DELETE FROM bigscreen.active_rounds');
+$dbh->do('DELETE FROM bigscreen.active_groups');
 $dbh->do('DELETE FROM bigscreen.active_tournament');
 if ($tournament != -1) {
        $dbh->do('INSERT INTO bigscreen.active_tournament VALUES (?)', undef, $tournament);

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)

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index 82a05d3464e70d15c2b385b624ae553a685e7db1..86854cd0f43c14cdbc97d1b57dd0a86036c23417 100644 (file)
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -93,10 +93,12 @@
 
   <div>
 
+  [% FOR p = r.parallels %]
   <form method="post" action="do-set-active-round.pl">
     <p>
       <input type="hidden" name="tournament" value="[% tournament.tournament %]" />
       <input type="hidden" name="round" value="[% r.round %]" />
+      <input type="hidden" name="parallel" value="[% p.parallel %]" />
   [% IF p.bigscreen %]
       <input type="hidden" name="show" value="false" />
       <input type="submit" value="Fjern fra storskjerm" />
@@ -107,7 +109,6 @@
     </p>
   </form>
   
-  [% FOR p = r.parallels %]
   <form method="post" action="do-edit-scores.pl">
   <table class="scores">
     <tr>

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index 0140141c4e029195e2ad77254b105ac439a87350..c3005d142eaa5261b2175a9efee8661370caf81c 100644 (file)
--- a/sql/ccbs.sql
+++ b/sql/ccbs.sql
@@ -163,11 +163,12 @@ CREATE SCHEMA bigscreen;
 CREATE TABLE bigscreen.active_tournament (
        tournament INTEGER NOT NULL PRIMARY KEY REFERENCES tournaments
 );
-CREATE TABLE bigscreen.active_rounds (
+CREATE TABLE bigscreen.active_groups (
        tournament INTEGER NOT NULL REFERENCES bigscreen.active_tournament,
        round INTEGER NOT NULL,
+       parallel INTEGER NOT NULL,
 
-       PRIMARY KEY ( tournament, round ),
-       FOREIGN KEY ( tournament, round ) REFERENCES rounds
+       PRIMARY KEY ( tournament, round, parallel ),
+       FOREIGN KEY ( tournament, round, parallel ) REFERENCES groups
 );
 );