Done

view-webapp/src/main/webapp/result-sheets.html

@@ -28,60 +28,40 @@
   #stop
 #end
 #set($games = $utils.removeBye($roundPairing.games))
-#set($pages = ($games.size() + 3) / 4)
-#set($items = $pages * 4)
-#foreach($i in [1..$items])
-  #set($j = ($i - 1) / 4 + (($i - 1) % 4) * $pages)
-  #if($j < $games.size())
-    #set($game = $games[$j])
-    #set($white = $pmap[$game.w])
-    #set($black = $pmap[$game.b])
-  #else
-    #set($game = { 't': 'xxx', 'h': 'xxx' })
-    #set($white = { 'name': 'xxx', 'firstname': 'xxx', 'rank': -99, 'country': 'XX', 'club': 'xxx' })
-    #set($black = { 'name': 'xxx', 'firstname': 'xxx', 'rank': -99, 'country': 'XX', 'club': 'xxx' })
-  #end
-  #if($foreach.index % 4 == 0)
-  <div class="page">
-  #end
 
-    <div class="page-item">
-      <div class="title">$tour.name</div>
-      <div class="subtitle"></div>
-      <div class="details">
-        <div>Table $game.t</div>
+<table>
+  <tr>
+    <th>Table</th>
+    <th>Black</th>
+    <th>Rank</th>
+    <th>White</th>
+    <th>Rank</th>
+    <th>Handicap</th>
+    <th>Komi</th>
+  </tr>
+  
+#set($numOfPlay = $games.size() - 1)
+#foreach($i in [0..$numOfPlay])
+  
+  #set($game = $games[$i])
+  #set($white = $pmap[$game.w])
+  #set($black = $pmap[$game.b]) 
   #set($komi = $tour.komi)
   #if($game.h) #set($komi = $komi - $math.floor($komi)) #end
-        <div>Handicap $game.h &nbsp;&dash;&nbsp; Komi $komi</div>
-        <div>Round $round</div>
-      </div>
-      <div class="instructions">
-        Surround winner's name or ½-½
-      </div>
-      <div class="players">
-        <div class="white player">
-          <div class="color">White</div>
-          <div class="name">$white.name $!white.firstname #rank($white.rank)<br/>#if($white.country)($white.country.toUpperCase()#if($white.club), $white.club#end)#end</div>
-##          <div class="pin">$white.egf</div>
-        </div>
-        <div class="equal">½-½</div>
-        <div class="black player">
-          <div class="color">Black</div>
-          <div class="name">$black.name $!black.firstname #rank($black.rank)<br/>#if($black.country)($black.country.toUpperCase()#if($black.club), $black.club#end)#end</div>
-##          <div class="pin">$black.egf</div>
-        </div>
-      </div>
-      <div class="signatures">
-        <div class="signature">Signature:</div>
-        <div class="equal">&nbsp;&nbsp;&nbsp;</div>
-        <div class="signature">Signature:</div>
-      </div>
-    </div>
-
-  #if($foreach.index % 4 == 3)
-  </div>
-  #end
+  #set($table = $i + 1)
+  <tr>
+    <td>Table $table</td>
+    <td>$black.name $!black.firstname</td>
+    <td>#rank($black.rank)</td>
+    <td>$white.name $!white.firstname</td>
+    <td>#rank($white.rank)</td>
+    <td>$game.h</td>
+    <td>$komi</td>
+  </tr>
 #end
+
+</table>
+
 </div>
 <script type="text/javascript">
   onLoad(() => {