X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Fshow-tournament.pl;h=1de3b0c7cf0295b3390b5ba33d8635e5e87211e5;hp=89ba78d8d5bc84882c101f1ab23f6f2f31fceb34;hb=11b5968454610745e6cd47fb71edea1218f835dd;hpb=a4ddf9a2d1481470bc42cf335aaaa810c28cab8f

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 89ba78d..1de3b0c 100755
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -24,6 +24,16 @@ if ($ref->{'num_incomplete'} == 0) {
 	$closing_valid = 0;
 }
 
+# Check if this tournament is on the bigscreen or not.
+my $ref = $dbh->selectrow_hashref('SELECT * FROM bigscreen.active_tournament');
+my $bigscreen = ($ref->{'tournament'} == $id) ? 1 : 0;
+
+my $active_groups;
+if ($bigscreen) {
+	# Find all groups currently shown on the bigscreen.
+	$active_groups = ccbs::db_fetch_all($dbh, 'SELECT * FROM bigscreen.active_groups WHERE tournament=?', $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,
@@ -45,15 +55,26 @@ for my $score (@$scores) {
 		push @$p, { parallel => $parallel, players => [], songs => [], num_songs => 0 };
 		$player = '';
 
+		if ($bigscreen) {
+			# suboptimal, but heck :-)
+			$p->[$#$p]->{'bigscreen'} = 0;
+			for my $ag (@$active_groups) {
+				if ($ag->{'round'} == $round && $ag->{'parallel'} == $parallel) {
+					$p->[$#$p]->{'bigscreen'} = 1;
+					last;
+				}
+			}
+		}
+
 		# Information on songs is not selected from roundrandomsongs etc.,
 		# but is filled in the first time the song is seen for this round
 		# (ie. below)
 	}
 	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 +82,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 +92,24 @@ 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.
 
@@ -84,7 +123,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;
 }
 
@@ -117,6 +156,7 @@ ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'},
 	num_qualified => $num_qualified,
 	songs => $songs,
 	closing_valid => $closing_valid,
-	finishing_valid => $finishing_valid
+	finishing_valid => $finishing_valid,
+	bigscreen => $bigscreen
 });
 $dbh->disconnect;