Fixed so the form shows the current active tournament.

[ccbs] / html / templates / show-tournament.tmpl

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index d8aae62547784ae87ff21623e0503e32040c18f8..ee2be73e69f0e8a4ff3e5a573296fcabd1bcecca 100644 (file)
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -12,10 +12,11 @@
     </ul>
   </div>
 
+[% IF closing_valid %]
   <h2>Start ny runde</h2>
 
   <div>
-    <p>For øyeblikket har det vært avholdt <strong>[% num_rounds %]</strong> runder,
+    <p>For øyeblikket har det vært avholdt <strong>[% num_rounds %]</strong> fulle runder,
       hvilket vil si at du kan begynne runde <strong>[% num_rounds + 1 %]</strong>
       om du skulle ønske det. Vær oppmerksom på at du ikke kan begynne en ny runde
       før den forrige er gjort helt ferdig.</p>
@@ -51,6 +52,25 @@
       </table>
     </form>
   </div>
+[% END %]
+  
+[% IF finishing_valid %]
+  <h2>Avslutt turnering</h2>
+
+  <div>
+    <p>Ettersom det bare er igjen én gruppe og runden er ferdigspilt, kan du om du ønsker
+      det avslutte turneringen. Vær obs på at når du har avsluttet turneringen vil rankinglister
+      genereres og CC-poeng utdeles, og det er ingen vei tilbake (dvs. turneringen er permanent
+      avsluttet).</p>
+
+    <form method="post" action="do-finish-tournament.pl">
+      <p>
+        <input type="hidden" name="tournament" value="[% tournament.tournament %]" />
+        <input type="submit" value="Avslutt turneringen" />
+      </p>
+    </form>
+  </div>
+[% END %]
 
 [% IF num_rankings > 0 %]
   <h2>Rankingliste</h2>
@@ -81,45 +101,61 @@
       <th>
         <input type="hidden" name="tournament" value="[% tournament.tournament %]" />
         <input type="hidden" name="round" value="[% r.round %]" />
+        <input type="hidden" name="group" value="[% p.parallel %]" />
       </th>
     [% ELSE %]
-      <th>Gruppe [% p.parallel %]</th>
+      <th>
+        <input type="hidden" name="tournament" value="[% tournament.tournament %]" />
+        <input type="hidden" name="round" value="[% r.round %]" />
+        <input type="hidden" name="group" value="[% p.parallel %]" />
+        Gruppe [% p.parallel %]
+      </th>
     [% END %]
     [% FOR s = p.songs %]
-      [% IF s == '' %]
-      <th colspan="2">Selvvalgt</th>
+      [% IF s.song == -1 %]
+      <th colspan="4">Selvvalgt</th>
       [% ELSE %]
-      <th>[% s %]</th>
+      <th colspan="3"><a href="song.pl?id=[% s.song %]">[% s.title %]</a></th>
       [% END %]
     [% END %]
     [% IF p.num_songs > 1 %]
       <th>Total</th>
     [% END %]      
+      <th>Rank</th>
+    [% IF !r.locked %]
       <th></th>
+    [% END %]      
     </tr>
     
     [% FOR pl = p.players %]
-      [% IF pl.locked %]
+      [% IF r.locked %]
     <tr>
       <th>
         [% pl.nick %]
       </th>
         [% FOR s = pl.songs %]
-      <td>[% s.score %]</td>
+      <td class="score">[% s.score %]</td>
+      <td class="playmode">[% s.playmode %]</td>
+      <td class="difficulty">[% s.difficulty %]</td>
           [% IF s.chosen %]
-      <td>[% s.title %]</td>
+      <td><a href="song.pl?id=[% s.song %]">[% s.title %]</a></td>
           [% END %]
         [% END %]
         [% IF p.num_songs > 1 %]
      <td>[% pl.total %]</td>
         [% END %]      
+     <td>[% pl.rank %]</td>
     </tr>
       [% ELSE %]
     <tr>
       <th>[% pl.nick %]</th>
         [% FOR s = pl.songs %]
-      <td class="nowrap">
+      <td class="score">
+        <input type="hidden" name="old-score[% pl.player %]-[% s.songnumber %]" value="[% s.score %]" />
         <input name="score[% pl.player %]-[% s.songnumber %]" value="[% s.score %]" size="5" />
+      </td>
+      <td class="playmode">
+        <input type="hidden" name="old-playmode[% pl.player %]-[% s.songnumber %]" value="[% s.playmode %]" />
        <select name="playmode[% pl.player %]-[% s.songnumber %]">
          <option value=""> </option>
          [% IF s.playmode == 'single' %]
@@ -133,6 +169,12 @@
          <option value="double">D</option>
         [% END %]
        </select>
+      </td>
+      <td class="difficulty">
+[% IF !s.chosen %]
+        <input type="hidden" name="song[% pl.player %]-[% s.songnumber %]" value="[% s.song %]" />
+[% END %]      
+        <input type="hidden" name="old-difficulty[% pl.player %]-[% s.songnumber %]" value="[% s.difficulty %]" />
        <select name="difficulty[% pl.player %]-[% s.songnumber %]">
          <option value=""> </option>
          [% IF s.difficulty == 'beginner' %]
@@ -164,6 +206,7 @@
       </td>
           [% IF s.chosen %]
       <td>
+        <input type="hidden" name="old-song[% pl.player %]-[% s.songnumber %]" value="[% ss.song %]" />
         <select name="song[% pl.player %]-[% s.songnumber %]">
           <option value=""> </option>
             [% FOR ss = songs %]
@@ -180,7 +223,8 @@
         [% IF p.num_songs > 1 %]
      <td>[% pl.total %]</td>
         [% END %]
-     <td><input type="submit" name="update[% pl.player %]" value="Oppdater" /></td>
+     <td>[% pl.rank %]</td>
+     <td><input type="submit" value="Oppdater" /></td>
     </tr>
       [% END %]
     [% END %]