X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Fshow-tournament.pl;h=61c3badf7226c2d285226a0da8be07e54dc2e853;hp=7d0d608ad9ccc1fa949bf75c212c8ed6031543fb;hb=a6500d8a7d1a7fc0bd172373f1a670b8ee7ce92e;hpb=8605d403534d6a2015750a7a5c9cb2cc9e3b900a

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 7d0d608..61c3bad 100755
--- 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,9 +61,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'})) {
@@ -60,6 +71,27 @@ 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.
+
 my $num_rounds = scalar @rounds;
 my $num_rankings = scalar @$rankings;
 
@@ -67,7 +99,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 +117,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 +133,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;