Show same place for equal sweepstakes score

sushain97 · Feb 22, 2015 · 01433c1 · 01433c1
1 parent cfcbc9e
commit 01433c1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/war/html/templates/categorySweepstakes.html b/war/html/templates/categorySweepstakes.html
@@ -15,12 +15,24 @@ <h2>
 							<th title="Click to sort">Score</th>
 						</tr>
 					</thead>
+						#set($lastPlacingScore = -1)
+						#set($lastPlace = -1)
 						#foreach($school in $winners.get($test))
+							#set($score = $school.getScore($test))
 							#if($foreach.count > $trophy * 2 && !$admin)
 								#break
 							#end
 							<tr>
-								<td> $foreach.count #if($foreach.count <= $trophy) <i class="fa fa-trophy"></i> #end</td>
+								<td>
+								#if($score.equals($lastPlacingScore))
+									$lastPlace
+								#else
+									$foreach.count
+									#set($lastPlace = $foreach.count)
+									#set($lastPlacingScore = $score)
+								#end
+								#if($foreach.count <= $trophy) <i class="fa fa-trophy"></i> #end
+								</td>
 
 								#set($schoolName = $school.getName())
 								#if($admin)
@@ -37,7 +49,7 @@ <h2>
 												$student.getScore($test).getScoreNum() <br>
 											#end">
 
-										$school.getScore($test)
+										$score
 									</a>
 								</td>
 							</tr>

diff --git a/war/html/templates/categoryWinners.html b/war/html/templates/categoryWinners.html
@@ -26,7 +26,8 @@ <h2>
 				#if($foreach.count > $trophy + $medal && !$admin)
 					#break
 				#end
-				<td> #if($score.equals($lastPlacingScore))
+				<td>
+					#if($score.equals($lastPlacingScore))
 						$lastPlace
 					#else
 						$foreach.count