Added template code for showing rank.

[ccbs] / html / show-tournament.pl

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 7d0d608ad9ccc1fa949bf75c212c8ed6031543fb..f5ecf31955d859f450cdc65b9f73b304ab982f6b 100755 (executable)
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -13,6 +13,17 @@ my $tournament = $dbh->selectrow_hashref('SELECT * FROM tournaments NATURAL JOIN
 my $rankings = ccbs::db_fetch_all($dbh, 'SELECT ranking,nick,COALESCE(points,-1) AS points FROM tournamentrankings NATURAL JOIN players WHERE tournament=? ORDER BY ranking', $id);
 my $songs = ccbs::db_fetch_all($dbh, 'SELECT song,title FROM machinesongs NATURAL JOIN songs WHERE machine=? ORDER BY LOWER(title)', $tournament->{'machine'});
 
+# Check if the last round is valid for closing (by checking if all scores
+# entered are valid)
+my $ref = $dbh->selectrow_hashref('SELECT COUNT(*) AS num_incomplete FROM scores WHERE tournament=? AND (song IS NULL OR playmode IS NULL OR difficulty IS NULL OR chosen IS NULL or score IS NULL)', undef, $tournament->{'tournament'});
+my ($closing_valid,$finishing_valid);
+$finishing_valid = 0;
+if ($ref->{'num_incomplete'} == 0) {
+       $closing_valid = 1;
+} else {
+       $closing_valid = 0;
+}
+
 # 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,
@@ -25,7 +36,7 @@ my ($round, $parallel, $player) = (-1,-1,'');
 for my $score (@$scores) {
        if ($score->{'round'} != $round) {
                $round = $score->{'round'};
-               push @rounds, { round => $round, parallels => [] };
+               push @rounds, { round => $round, parallels => [], locked => 0 };
                $parallel = -1;
        }
        my $p = $rounds[$#rounds]->{'parallels'};
@@ -50,7 +61,7 @@ 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;
@@ -60,6 +71,9 @@ for my $score (@$scores) {
        }
 }
 
+# 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.
+
 my $num_rounds = scalar @rounds;
 my $num_rankings = scalar @$rankings;
 
@@ -67,7 +81,12 @@ my $num_rankings = scalar @$rankings;
 for my $r (0..$#rounds-1) {
        $rounds[$r]->{'locked'} = 1;
 }
-$rounds[$#rounds]->{'locked'} = 0;
+
+# If there's only one group left and it's valid for closing, we can also finish
+# the entire tournament if we'd like
+if ($closing_valid && (scalar @rounds > 0 && scalar @{$rounds[$#rounds]->{'parallels'}}) == 1) {
+       $finishing_valid = 1;
+}
 
 # If there have been no rounds, check out the number of participants; if not, check the
 # number of qualified from the last round
@@ -80,6 +99,14 @@ if ($num_rounds == 0) {
        $num_qualified = $ref->{'numqualifying'};
 }
 
+# And last: If there is a ranking list, the tournament is closed and we really can't
+# do anything more
+if ($num_rankings > 0) {
+       $closing_valid = 0;
+       $finishing_valid = 0;
+       $rounds[$#rounds]->{'locked'} = 1;
+}
+
 ccbs::print_header();
 ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'}, {
        tournament => $tournament,
@@ -88,6 +115,8 @@ ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'},
        rounds => \@rounds,
        num_rounds => $num_rounds,
        num_qualified => $num_qualified,
-       songs => $songs
+       songs => $songs,
+       closing_valid => $closing_valid,
+       finishing_valid => $finishing_valid
 });
 $dbh->disconnect;