X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Ftemplates%2Fshow-tournament.tmpl;h=87d551810e07789ca5b80cb69c2b5e7aedcc8031;hp=c7566430271a6c0bec6bdeeb2172541e2fa0b05b;hb=ff55c14b1f03015d95af6203edec4595bf6b583f;hpb=f2a075e3a1d402fbc1922c3dcf7a4d7fb4370832

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index c756643..87d5518 100644
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -3,19 +3,20 @@
 
   <div>
     <ul>
-      <li>Sesong: [% tournament.seasonname %]</li>
-      <li>Land: [% tournament.countryname %]</li>
-      <li>Sted: [% tournament.location %]</li>
-      <li>Dato: [% tournament.date %]</li>
-      <li>Maskin: [% tournament.machinename %]</li>
-      <li>Scoresystem: [% tournament.scoringsystemname %]</li>
+      <li><_>Sesong</_>: [% tournament.seasonname %]</li>
+      <li><_>Land</_>: [% tournament.countryname %]</li>
+      <li><_>Sted</_>: [% tournament.location %]</li>
+      <li><_>Dato</_>: [% tournament.date %]</li>
+      <li><_>Maskin</_>: [% tournament.machinename %]</li>
+      <li><_>Scoresystem</_>: [% tournament.scoringsystemname %]</li>
     </ul>
   </div>
 
+[% IF closing_valid && !public %]
   <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 && !public %]
+  <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>
@@ -59,9 +79,9 @@
     <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 %]
-      <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>
@@ -69,46 +89,173 @@
 [% END %]
 
 [% FOR r = rounds %]
-  <h2>Runde [% r.round %]</h2>
+[% IF r.locked || !public %]
+  <h2><a name="round[% r.round %]">Runde [% r.round %]</a></h2>
 
   <div>
 
-[% FOR p = r.parallels %]
+  [% FOR p = r.parallels %]
+    [% IF bigscreen && !public %]
+  <form method="post" action="do-set-active-round.pl">
+    <p>
+      <input type="hidden" name="tournament" value="[% tournament.tournament %]" />
+      <input type="hidden" name="round" value="[% r.round %]" />
+      <input type="hidden" name="parallel" value="[% p.parallel %]" />
+      [% IF p.bigscreen %]
+      <input type="hidden" name="show" value="false" />
+      <input type="submit" value="Fjern fra storskjerm" />
+      [% ELSE %]
+      <input type="hidden" name="show" value="true" />
+      <input type="submit" value="Vis på storskjerm" />
+      Antall maskiner: <input name="nummachines" value="1" size="1" />
+      Antall spillere samtidig på hver maskin: <input name="playerspermachine" value="1" size="1" />
+      [% END %]
+    </p>
+  </form>
+    [% END %]
+  
+  <form method="post" action="do-edit-scores.pl">
   <table class="scores">
     <tr>
-[% IF p.parallel == 0 %]
-      <th></th>
-[% ELSE %]
-      <th>Gruppe [% p.parallel %]</th>
-[% END %]
-[% FOR s = p.songs %]
-[% IF s == '' %]
-      <th colspan="2">Selvvalgt</th>
-[% ELSE %]
-      <th>[% s %]</th>
-[% END %]
-[% END %]
-[% IF p.num_songs > 1 %]
+    [% IF p.parallel == 0 %]
+      <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>
+        <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.song == -1 %]
+      <th colspan="4">Selvvalgt</th>
+      [% ELSE %]
+      <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 %]      
+    [% END %]      
+      <th>Rank</th>
+    [% IF !r.locked %]
+      <th></th>
+    [% END %]      
     </tr>
     
-[% FOR pl = p.players %]
+    [% FOR pl = p.players %]
+      [% IF r.locked %]
     <tr>
-      <th>[% pl.nick %]</th>
-[% FOR s = pl.songs %]
-      <td>[% s.score %]</td>
-[% IF s.chosen %]
-      <td>[% s.title %]</td>
-[% END %]
-[% END %]
-[% IF p.num_songs > 1 %]
+      <th>
+        <a href="player.pl?id=[% pl.player %]">[% pl.nick %]</a>
+      </th>
+        [% FOR s = pl.songs %]
+      <td class="score">[% s.score %]</td>
+      <td class="playmode">[% s.playmode %]</td>
+      <td class="difficulty">[% s.difficulty %]</td>
+          [% IF s.chosen %]
+      <td><a href="song.pl?id=[% s.song %]">[% s.title %]</a></td>
+          [% END %]
+        [% END %]
+        [% IF p.num_songs > 1 %]
      <td>[% pl.total %]</td>
-[% END %]      
+        [% END %]  
+[% IF pl.best_rank == pl.worst_rank %]
+     <td>[% pl.best_rank %]
+[% ELSE %]     
+     <td>[% pl.best_rank %]-[% pl.worst_rank %]</td>
+[% END %]     
     </tr>
-[% END %]
+      [% ELSE %]
+    <tr>
+      <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 %]" />
+        <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' %]
+	  <option value="single" selected="selected">S</option>
+	 [% ELSE %]
+	  <option value="single">S</option>
+	 [% END %]
+         [% IF s.playmode == 'double' %]
+	  <option value="double" selected="selected">D</option>
+	 [% ELSE %]
+	  <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' %]
+	  <option value="beginner" selected="selected">B</option>
+	 [% ELSE %]
+	  <option value="beginner">B</option>
+	 [% END %]
+         [% IF s.difficulty == 'standard' %]
+	  <option value="standard" selected="selected">S</option>
+	 [% ELSE %]
+	  <option value="standard">S</option>
+	 [% END %]
+         [% IF s.difficulty == 'difficult' %]
+	  <option value="difficult" selected="selected">D</option>
+	 [% ELSE %]
+	  <option value="difficult">D</option>
+	 [% END %]
+         [% IF s.difficulty == 'expert' %]
+	  <option value="expert" selected="selected">E</option>
+	 [% ELSE %]
+	  <option value="expert">E</option>
+	 [% END %]
+         [% IF s.difficulty == 'challenge' %]
+	  <option value="challenge" selected="selected">C</option>
+	 [% ELSE %]
+	  <option value="challenge">C</option>
+	 [% END %]
+	</select>
+      </td>
+          [% IF s.chosen %]
+      <td>
+        <input type="hidden" name="old-song[% pl.player %]-[% s.songnumber %]" value="[% s.song %]" />
+        <select name="song[% pl.player %]-[% s.songnumber %]">
+          <option value=""> </option>
+            [% FOR ss = songs %]
+              [% IF s.song == ss.song %]
+          <option value="[% ss.song %]" selected="selected">[% ss.title %]</option>
+              [% ELSE %]	  
+          <option value="[% ss.song %]">[% ss.title %]</option>
+              [% END %]	  
+            [% END %]
+        </select>
+      </td>
+          [% END %]
+        [% END %]
+        [% IF p.num_songs > 1 %]
+     <td>[% pl.total %]</td>
+        [% END %]
+     <td>[% pl.rank %]</td>
+     <td><input type="submit" value="Oppdater" /></td>
+    </tr>
+      [% END %]
+    [% END %]
   </table>
-[% END %]
+  </form> 
+  [% END %]
 
   </div>
 [% END %]
+[% END %]