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 0a59d71c9af14cfa0cd5c81386990730a42381ab..7be00367df10cb0b4077e6d4d968c1ea809f40f8 100755 (executable)
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -24,6 +24,9 @@ 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);
+
 # 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,15 +48,24 @@ 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)
        }
        if ($score->{'position'} == 1) {
                if ($score->{'chosen'}) {
-                       push @{$p->[$#$p]->{'songs'}}, '';
+                       push @{$p->[$#$p]->{'songs'}}, { song => -1, title => '' };
                } else {
-                       push @{$p->[$#$p]->{'songs'}}, $score->{'title'};
+                       push @{$p->[$#$p]->{'songs'}}, $score;
                }
                $p->[$#$p]->{'num_songs'}++;
        }
@@ -61,9 +73,9 @@ for my $score (@$scores) {
        my $pl = $p->[$#$p]->{'players'};
        if ($score->{'nick'} ne $player) {
                $player = $score->{'nick'};
-               push @$pl, { player => $score->{'player'}, nick => $player, songs => [], total => 0 };
+               push @$pl, { player => $score->{'player'}, nick => $player, songs => [], total => 0, rank => 1 };
        }
-       
+
        push @{$pl->[$#$pl]->{'songs'}}, $score;
 
        if (defined($score->{'score'})) {
@@ -71,6 +83,24 @@ for my $score (@$scores) {
        }
 }
 
+# Find the rank of all the players in every group, via simple insertion-like
+# sort
+for my $r (@rounds) {
+       for my $p (@{$r->{'parallels'}}) {
+               my $pls = $p->{'players'};
+               for my $i (0..$#$pls) {
+                       my $rank = 1;
+                       for my $j (0..($i-1)) {
+                               if ($pls->[$i]->{'total'} < $pls->[$j]->{'total'}) {
+                                       $pls->[$i]->{'rank'}++;
+                               } elsif ($pls->[$i]->{'total'} > $pls->[$j]->{'total'}) {
+                                       $pls->[$j]->{'rank'}++;
+                               }
+                       }
+               }
+       }
+}
+
 # FIXME: In some odd cases, there _might_ be an empty group right at the end. Fix this when
 #        we are able to add/delete people in groups.