Team of individuals: initial display of results page ok

view-webapp/src/main/webapp/tour-pairing.inc.html

@@ -12,6 +12,11 @@
   #set($pairables = $roundPairing.pairables)
   #set($games = $roundPairing.games)
   #set($unpairables = $roundPairing.unpairables)
+  #if($tour.type.startsWith('TEAM'))
+    #set($individualGames = $roundPairing.individualGames)
+  #else
+    #set($individualGames = $games)
+  #end
 #end
 <div class="tab-content" id="pairing-tab">
   <div id="pairing-content">
@@ -77,7 +82,9 @@
             </div>
 #end
           </div>
+#if(!$tour.type.startsWith('TEAM'))
           <div class="result-sheets"><a href="result-sheets?id=${tour.id}&round=${round}" target="_blank" class="ui mini floating icon button">result sheets <i class="fa fa-external-link"></i></a></div>
+#end
         </div>
       </div>
     </div>

view-webapp/src/main/webapp/tour-registration.inc.html

@@ -2,10 +2,12 @@
 #if($tour.type == 'INDIVIDUAL')
   ## Standard tournament
   #set($pmap = $utils.toMap($parts))
+  #set($plmap = $pmap)
 #else
   ## Pairgo, rengo and teams of individuals
   #set($teams = $api.get("tour/${params.id}/team"))
   #set($pmap = $utils.toMap($teams))
+  #set($plmap = $utils.toMap($parts))
   #set($tmap = $utils.getTeamMap($teams))
 #end
 

view-webapp/src/main/webapp/tour-results.inc.html

@@ -4,7 +4,7 @@
     <button class="ui floating choose-round prev-round button">&laquo;</button>
     <span class="active-round">$round</span>
     <button class="ui floating choose-round next-round button">&raquo;</button>
-#set($stats = $utils.getResultsStats($games))
+#set($stats = $utils.getResultsStats($individualGames))
     <span class="norbeak">( <span id="known">$stats.known</span> / $stats.total )</span>
     <div id="results-filter" class="toggle">
       <input type="checkbox" value="true"/>
@@ -25,9 +25,9 @@
       </thead>
       <tbody>
 #set($dispRst = {'?':'?', 'w':'1-0', 'b':'0-1', '=':'½-½', 'X':'X', '#':'1-1', '0':'0-0'})
-#foreach($game in $games)
-  #set($white = $pmap[$game.w])
-  #set($black = $pmap[$game.b])
+#foreach($game in $individualGames)
+  #set($white = $plmap[$game.w])
+  #set($black = $plmap[$game.b])
   #if($black && $white)
         <tr id="result-$game.id" data-id="$game.id">
           <td data-sort="$game.t">${game.t}.</td>