X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Fshow-tournament.pl;h=3d0db3c945f38c8bb363b93362b30d20637e329e;hp=01c301e4f0f2b833ae9791611950699b54203e59;hb=db78ca4c7bad712e4d49337858e1970547b1d20a;hpb=b0b74d8d081b73ba0716ae4edd25dde9c63a3aef

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 01c301e..3d0db3c 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 {
@@ -50,9 +51,9 @@ for my $score (@$scores) {
 	}
 	if ($score->{'position'} == 1) {
 		if ($score->{'chosen'}) {
-			push @{$p->[$#$p]->{'songs'}}, '';
+			push @{$p->[$#$p]->{'songs'}}, { song => -1, title => '' };
 		} else {
-			push @{$p->[$#$p]->{'songs'}}, $score->{'title'};
+			push @{$p->[$#$p]->{'songs'}}, $score;
 		}
 		$p->[$#$p]->{'num_songs'}++;
 	}
@@ -60,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'})) {
@@ -70,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;
 
@@ -78,6 +100,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 > 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
 my $num_qualified;
@@ -89,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,
@@ -98,6 +134,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;