The "edit scores" backend now finds out which update button was pressed.

[ccbs] / html / show-tournament.pl

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 9b987a06a1d4f26739066329be5c79071df50801..fa95fb4d67a86d8443602c9e432c2d462ec93199 100755 (executable)
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -10,11 +10,13 @@ my $id = $cgi->param('id');
 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'});
 
 # 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 = ();
@@ -29,7 +31,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.,
@@ -42,22 +44,46 @@ 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, { player => $score->{'player'}, nick => $player, songs => [], total => 0, locked => 1 };
        }
        
-       push @{$pl->[$#$pl]->{'songs'}}, {
-               title => $score->{'title'},
-               chosen => $score->{'chosen'},
-               score => $score->{'score'}
-       };
+       push @{$pl->[$#$pl]->{'songs'}}, $score;
+
+       if (defined($score->{'score'})) {
+               $pl->[$#$pl]->{'total'} += $score->{'score'};
+       } else {
+               $pl->[$#$pl]->{'locked'} = 0;
+       }
+}
+
+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, rounds => \@rounds });
+ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'}, {
+       tournament => $tournament,
+       rankings => $rankings,
+       num_rankings => $num_rankings,
+       rounds => \@rounds,
+       num_rounds => $num_rounds,
+       num_qualified => $num_qualified,
+       songs => $songs
+});
 $dbh->disconnect;