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

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 230621b..602e5cb 100755
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -24,6 +24,9 @@ if ($ref->{'num_incomplete'} == 0) {
 	$closing_valid = 0;
 }
 
+# Find all rounds currently shown on the bigscreen.
+my $active_rounds = $dbh->selectall_hashref('SELECT round FROM bigscreen.active_rounds WHERE tournament=?', 'round', undef, $id);
+
 # 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,
@@ -38,6 +41,12 @@ for my $score (@$scores) {
 		$round = $score->{'round'};
 		push @rounds, { round => $round, parallels => [], locked => 0 };
 		$parallel = -1;
+
+		if (defined($active_rounds->{$round})) {
+			$rounds[$#rounds]->{'bigscreen'} = 1;
+		} else {
+			$rounds[$#rounds]->{'bigscreen'} = 0;
+		}
 	}
 	my $p = $rounds[$#rounds]->{'parallels'};
 	if ($score->{'parallel'} != $parallel) {
@@ -51,9 +60,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'}++;
 	}
@@ -61,9 +70,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'})) {
@@ -71,6 +80,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;
 
@@ -81,7 +111,7 @@ for my $r (0..$#rounds-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) {
+if ($closing_valid && (scalar @rounds > 0 && scalar @{$rounds[$#rounds]->{'parallels'}}) == 1) {
 	$finishing_valid = 1;
 }
 
@@ -96,6 +126,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,