X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Fshow-tournament.pl;h=57bd379a16f2a68df1b2430f4bc619e84e7754a7;hp=8d6dc45009d8bf8ce86652cf7fd1bb9253f1a958;hb=f441216a623854ca492d416d0ebe825ae07ab40d;hpb=c6d4beb429904725988d107ddab644a52d217aab

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 8d6dc45..57bd379 100755
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -30,7 +30,7 @@ for my $score (@$scores) {
 	my $p = $rounds[$#rounds]->{'parallels'};
 	if ($score->{'parallel'} != $parallel) {
 		$parallel = $score->{'parallel'};
-		push @$p, { parallel => $parallel, players => [], songs => [] };
+		push @$p, { parallel => $parallel, players => [], songs => [], num_songs => 0 };
 		$player = '';
 
 		# Information on songs is not selected from roundrandomsongs etc.,
@@ -43,12 +43,13 @@ for my $score (@$scores) {
 		} else {
 			push @{$p->[$#$p]->{'songs'}}, $score->{'title'};
 		}
+		$p->[$#$p]->{'num_songs'}++;
 	}
 	
 	my $pl = $p->[$#$p]->{'players'};
 	if ($score->{'nick'} ne $player) {
 		$player = $score->{'nick'};
-		push @$pl, { nick => $player, songs => [] };
+		push @$pl, { nick => $player, songs => [], total => 0 };
 
 	}
 	
@@ -57,12 +58,30 @@ for my $score (@$scores) {
 		chosen => $score->{'chosen'},
 		score => $score->{'score'}
 	};
+	$pl->[$#$pl]->{'total'} += $score->{'score'};
+}
+
+my $num_rounds = scalar @rounds;
+my $num_rankings = scalar @$rankings;
+
+# 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;
+if ($num_rounds == 0) {
+	my $ref = $dbh->selectrow_hashref('SELECT COUNT(*) AS num_participants FROM tournamentparticipation WHERE tournament=?', undef, $id);
+	$num_qualified = $ref->{'num_participants'};
+} else {
+	my $ref = $dbh->selectrow_hashref('SELECT numqualifying FROM roundparticipation WHERE tournament=? AND round=?', undef, $id, $num_rounds);
+	$num_qualified = $ref->{'numqualifying'};
 }
 
 ccbs::print_header();
 ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'}, {
 	tournament => $tournament,
 	rankings => $rankings,
-	rounds => \@rounds
+	num_rankings => $num_rankings,
+	rounds => \@rounds,
+	num_rounds => $num_rounds,
+	num_qualified => $num_qualified
 });
 $dbh->disconnect;