Link to the player page from the scores.

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 9db40c4da7f9d17fe6a9e84d2a5d8de5c4721a52..ab58b647f476c7bd04f2e606c3d75ce3592b19e2 100755 (executable)
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -13,9 +13,9 @@ my $tournament = $dbh->selectrow_hashref('SELECT * FROM tournaments NATURAL JOIN
 
 my $rankings;
 if ($tournament->{'country'} == 1) {
 
 my $rankings;
 if ($tournament->{'country'} == 1) {

-       $rankings = ccbs::db_fetch_all($dbh, 'SELECT ranking,nick || \' (\' || countrycode::varchar || \')\' AS nick,COALESCE(points,-1) AS points FROM tournamentrankings NATURAL JOIN players NATURAL JOIN countries WHERE tournament=? ORDER BY ranking', $id);
+       $rankings = ccbs::db_fetch_all($dbh, 'SELECT ranking,player,nick || \' (\' || countrycode::varchar || \')\' AS nick,COALESCE(points,-1) AS points FROM tournamentrankings NATURAL JOIN players NATURAL JOIN countries WHERE tournament=? ORDER BY ranking', $id);

 } else {
 } else {

-       $rankings = ccbs::db_fetch_all($dbh, 'SELECT ranking,COALESCE(nick || \' (\' || clubcode::varchar || \')\', nick) AS nick,COALESCE(points,-1) AS points FROM tournamentrankings NATURAL JOIN players NATURAL LEFT JOIN clubs WHERE tournament=? ORDER BY ranking', $id);
+       $rankings = ccbs::db_fetch_all($dbh, 'SELECT ranking,player,COALESCE(nick || \' (\' || clubcode::varchar || \')\', nick) AS nick,COALESCE(points,-1) AS points FROM tournamentrankings NATURAL JOIN players NATURAL LEFT JOIN clubs 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'});
 }
 
 my $songs = ccbs::db_fetch_all($dbh, 'SELECT song,title FROM machinesongs NATURAL JOIN songs WHERE machine=? ORDER BY LOWER(title)', $tournament->{'machine'});

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index 32cd6267e0d79c8882f30dc495f849ca43e7383c..162558dd9d290f012bad337abd453775635cc7af 100644 (file)
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -79,9 +79,9 @@
     <ul>
 [% FOR r = rankings %]
 [% IF r.points == -1 %]
     <ul>
 [% FOR r = rankings %]
 [% IF r.points == -1 %]

-      <li>[% r.ranking %]. plass: [% r.nick %]</li>
+      <li>[% r.ranking %]. plass: <a href="player.pl?id=[% r.player %]">[% r.nick %]</a></li>

 [% ELSE %]
 [% ELSE %]

-      <li>[% r.ranking %]. plass: [% r.nick %], med [% r.points %] poeng.</li>
+      <li>[% r.ranking %]. plass: <a href="player.pl?id=[% r.player %]">[% r.nick %]</a>, med [% r.points %] poeng.</li>

 [% END %]
 [% END %]
     </ul>
 [% END %]
 [% END %]
     </ul>


@@ -151,7 +151,7 @@
       [% IF r.locked %]
     <tr>
       <th>
       [% IF r.locked %]
     <tr>
       <th>

-        [% pl.nick %]
+        <a href="player.pl?id=[% pl.player %]">[% pl.nick %]</a>

       </th>
         [% FOR s = pl.songs %]
       <td class="score">[% s.score %]</td>
       </th>
         [% FOR s = pl.songs %]
       <td class="score">[% s.score %]</td>


@@ -168,7 +168,7 @@
     </tr>
       [% ELSE %]
     <tr>
     </tr>
       [% ELSE %]
     <tr>

-      <th>[% pl.nick %]</th>
+      <th><a href="player.pl?id=[% pl.player %]">[% pl.nick %]</a></th>

         [% FOR s = pl.songs %]
       <td class="score">
         <input type="hidden" name="old-score[% pl.player %]-[% s.songnumber %]" value="[% s.score %]" />
         [% FOR s = pl.songs %]
       <td class="score">
         <input type="hidden" name="old-score[% pl.player %]-[% s.songnumber %]" value="[% s.score %]" />