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

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index fd78a3c..230621b 100755
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -13,10 +13,21 @@ 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,
-	'SELECT round,parallel,position,playmode,difficulty,songnumber,nick,song,title,chosen,score FROM roundparticipation NATURAL JOIN players NATURAL JOIN scores NATURAL LEFT JOIN songs WHERE tournament=? ORDER BY round,parallel,position,songnumber',
+	'SELECT round,parallel,position,playmode,difficulty,songnumber,player,nick,song,title,chosen,score FROM roundparticipation NATURAL JOIN players NATURAL JOIN scores NATURAL LEFT JOIN songs WHERE tournament=? ORDER BY round,parallel,position,songnumber',
 	$id);
 
 my @rounds = ();
@@ -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,21 +61,30 @@ for my $score (@$scores) {
 	my $pl = $p->[$#$p]->{'players'};
 	if ($score->{'nick'} ne $player) {
 		$player = $score->{'nick'};
-		push @$pl, { nick => $player, songs => [], total => 0, locked => 1 };
+		push @$pl, { player => $score->{'player'}, nick => $player, songs => [], total => 0 };
 	}
 	
 	push @{$pl->[$#$pl]->{'songs'}}, $score;
 
 	if (defined($score->{'score'})) {
 		$pl->[$#$pl]->{'total'} += $score->{'score'};
-	} else {
-		$pl->[$#$pl]->{'locked'} = 0;
 	}
 }
 
 my $num_rounds = scalar @rounds;
 my $num_rankings = scalar @$rankings;
 
+# Lock all rounds but the last (active?) one
+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;
@@ -84,6 +104,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;