Don't show the "start next round" form until we can actually do so.

[ccbs] / html / show-tournament.pl

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 7d0d608ad9ccc1fa949bf75c212c8ed6031543fb..01c301e4f0f2b833ae9791611950699b54203e59 100755 (executable)
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -13,6 +13,16 @@ 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;
+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 +35,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'};
@@ -67,7 +77,6 @@ my $num_rankings = scalar @$rankings;
 for my $r (0..$#rounds-1) {
        $rounds[$r]->{'locked'} = 1;
 }
-$rounds[$#rounds]->{'locked'} = 0;
 
 # If there have been no rounds, check out the number of participants; if not, check the
 # number of qualified from the last round
@@ -88,6 +97,7 @@ 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
 });
 $dbh->disconnect;