Added a "finish tournament" button that is shown if one can finish the tournament.

[ccbs] / html / show-tournament.pl

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 57bd379a16f2a68df1b2430f4bc619e84e7754a7..230621bba7294f51edd67df4efc7689fce82a906 100755 (executable)
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -11,11 +11,23 @@ my $dbh = ccbs::db_connect();
 
 my $tournament = $dbh->selectrow_hashref('SELECT * FROM tournaments NATURAL JOIN seasons NATURAL JOIN countries NATURAL JOIN machines NATURAL JOIN scoringsystems WHERE tournament=?', undef, $id);
 my $rankings = ccbs::db_fetch_all($dbh, 'SELECT ranking,nick,COALESCE(points,-1) AS points FROM tournamentrankings NATURAL JOIN players WHERE tournament=? ORDER BY ranking', $id);
+my $songs = ccbs::db_fetch_all($dbh, 'SELECT song,title FROM machinesongs NATURAL JOIN songs WHERE machine=? ORDER BY LOWER(title)', $tournament->{'machine'});
+
+# 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,$finishing_valid);
+$finishing_valid = 0;
+if ($ref->{'num_incomplete'} == 0) {
+       $closing_valid = 1;
+} else {
+       $closing_valid = 0;
+}
 
 # 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,playmode,difficulty,songnumber,player,nick,song,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 = ();
@@ -24,7 +36,7 @@ my ($round, $parallel, $player) = (-1,-1,'');
 for my $score (@$scores) {
        if ($score->{'round'} != $round) {
                $round = $score->{'round'};
-               push @rounds, { round => $round, parallels => [] };
+               push @rounds, { round => $round, parallels => [], locked => 0 };
                $parallel = -1;
        }
        my $p = $rounds[$#rounds]->{'parallels'};
@@ -49,21 +61,30 @@ for my $score (@$scores) {
        my $pl = $p->[$#$p]->{'players'};
        if ($score->{'nick'} ne $player) {
                $player = $score->{'nick'};
-               push @$pl, { nick => $player, songs => [], total => 0 };
-
+               push @$pl, { player => $score->{'player'}, nick => $player, songs => [], total => 0 };
        }
        
-       push @{$pl->[$#$pl]->{'songs'}}, {
-               title => $score->{'title'},
-               chosen => $score->{'chosen'},
-               score => $score->{'score'}
-       };
-       $pl->[$#$pl]->{'total'} += $score->{'score'};
+       push @{$pl->[$#$pl]->{'songs'}}, $score;
+
+       if (defined($score->{'score'})) {
+               $pl->[$#$pl]->{'total'} += $score->{'score'};
+       }
 }
 
 my $num_rounds = scalar @rounds;
 my $num_rankings = scalar @$rankings;
 
+# Lock all rounds but the last (active?) one
+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[$#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;
@@ -71,7 +92,7 @@ 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);
+       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'};
 }
 
@@ -82,6 +103,9 @@ ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'},
        num_rankings => $num_rankings,
        rounds => \@rounds,
        num_rounds => $num_rounds,
-       num_qualified => $num_qualified
+       num_qualified => $num_qualified,
+       songs => $songs,
+       closing_valid => $closing_valid,
+       finishing_valid => $finishing_valid
 });
 $dbh->disconnect;