X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Fshow-tournament.pl;h=230621bba7294f51edd67df4efc7689fce82a906;hp=01c301e4f0f2b833ae9791611950699b54203e59;hb=ce2049430f3c984487fce48dc40184caca97c626;hpb=c88ada628f39026c983b389ef6f3b0ae4874e7d4

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 01c301e..230621b 100755
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -16,7 +16,8 @@ my $songs = ccbs::db_fetch_all($dbh, 'SELECT song,title FROM machinesongs NATURA
 # 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;
+my ($closing_valid,$finishing_valid);
+$finishing_valid = 0;
 if ($ref->{'num_incomplete'} == 0) {
 	$closing_valid = 1;
 } else {
@@ -78,6 +79,12 @@ for my $r (0..$#rounds-1) {
 	$rounds[$r]->{'locked'} = 1;
 }
 
+# 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[$#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
 my $num_qualified;
@@ -98,6 +105,7 @@ ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'},
 	num_rounds => $num_rounds,
 	num_qualified => $num_qualified,
 	songs => $songs,
-	closing_valid => $closing_valid
+	closing_valid => $closing_valid,
+	finishing_valid => $finishing_valid
 });
 $dbh->disconnect;