X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Fshow-tournament.pl;h=b4b6e04b47d478161ecf202fbab859beb9975f11;hp=b204270422048e58ee57d461c324df362a509efb;hb=81edbdf60931cc5343964a86e95a43a4dfd6d103;hpb=682984b549e3e4d53ebe5cc50202226445cf4e60

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index b204270..b4b6e04 100755
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -15,7 +15,7 @@ my $rankings = ccbs::db_fetch_all($dbh, 'SELECT ranking,nick,COALESCE(points,-1)
 # 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,nick,title,chosen,score FROM scores NATURAL JOIN players NATURAL JOIN songs NATURAL JOIN roundparticipation WHERE tournament=? ORDER BY round,parallel,position,songnumber',
+	'SELECT round,parallel,position,nick,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 = ();
@@ -39,7 +39,7 @@ for my $score (@$scores) {
 	}
 	if ($score->{'position'} == 1) {
 		if ($score->{'chosen'}) {
-			push @{$p->[$#$p]->{'songs'}}, '';
+			push @{$p->[$#$p]->{'songs'}}, 'Selvvalgt';
 		} else {
 			push @{$p->[$#$p]->{'songs'}}, $score->{'title'};
 		}
@@ -50,7 +50,6 @@ for my $score (@$scores) {
 	if ($score->{'nick'} ne $player) {
 		$player = $score->{'nick'};
 		push @$pl, { nick => $player, songs => [], total => 0 };
-
 	}
 	
 	push @{$pl->[$#$pl]->{'songs'}}, {
@@ -58,13 +57,32 @@ for my $score (@$scores) {
 		chosen => $score->{'chosen'},
 		score => $score->{'score'}
 	};
-	$pl->[$#$pl]->{'total'} += $score->{'score'};
+	if (defined($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 SUM(numqualifying) AS numqualifying FROM rounds NATURAL JOIN groups 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;