Further change rating change display

robot-rumble · Mar 31, 2024 · 66b4651 · 66b4651
1 parent 91ab7f5
commit 66b4651
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/app/views/battle/view.scala.html b/app/views/battle/view.scala.html
@@ -10,11 +10,10 @@
 }
 
 
-@ratingChange(change: Int) = {
-    @if(change > 0) {
+@ratingChange(change: Int, didWin: Boolean) = {
+    @if(didWin) {
         (+@change)
-    }
-    @if(change < 0) {
+    } else {
         (@change)
     }
 }
@@ -40,10 +39,10 @@ <h1 class="mt-3 mb-2 text-center">
     <h3 class="text-center">
         @fullBattle.b.winner match {
             case Some(Team.R1) => {
-                @fullBattle.b.pr1Rating @ratingChange(fullBattle.b.pr1RatingChange) <span style="color: var(--grey-2)">/</span> @fullBattle.b.pr2Rating @ratingChange(fullBattle.b.pr2RatingChange)
+                @fullBattle.b.pr1Rating @ratingChange(fullBattle.b.pr1RatingChange, true) <span style="color: var(--grey-2)">/</span> @fullBattle.b.pr2Rating @ratingChange(fullBattle.b.pr2RatingChange, false)
             }
             case Some(Team.R2) => {
-                @fullBattle.b.pr2Rating @ratingChange(fullBattle.b.pr2RatingChange) <span style="color: var(--grey-2)">/</span> @fullBattle.b.pr1Rating @ratingChange(fullBattle.b.pr1RatingChange)
+                @fullBattle.b.pr2Rating @ratingChange(fullBattle.b.pr2RatingChange, true) <span style="color: var(--grey-2)">/</span> @fullBattle.b.pr1Rating @ratingChange(fullBattle.b.pr1RatingChange, false)
             }
             case None => {
             }

diff --git a/app/views/robot/view.scala.html b/app/views/robot/view.scala.html
@@ -2,11 +2,11 @@
 @import services.Markdown
 @(fullRobot: FullRobot, boardsWithBattles: Seq[(PRobot, BoardWithBattles)], isOwner: Boolean, assetsFinder: AssetsFinder)(implicit request: Request[AnyContent])
 
-@ratingChange(change: Int) = {
-    @if(change > 0) {
+@ratingChange(change: Int, didWin: Option[Boolean]) = {
+    @if(didWin.contains(true)) {
         (+@change)
     }
-    @if(change < 0) {
+    @if(didWin.contains(false)) {
         (@change)
     }
 }
@@ -121,9 +121,9 @@ <h2>Battles</h2>
                                 <td class="_rating">
                                 @ratingChangeImg(battle.didRobotWin(fullRobot.robot.id))
                                 @if(fullRobot.robot.id == battle.r1Id) {
-                                    @ratingChange(battle.pr1RatingChange)
+                                    @ratingChange(battle.pr1RatingChange, battle.didRobotWin(fullRobot.robot.id))
                                 } else {
-                                    @ratingChange(battle.pr2RatingChange)
+                                    @ratingChange(battle.pr2RatingChange, battle.didRobotWin(fullRobot.robot.id))
                                 }
                                 </td>
                                 <td class="_robot pr-0"><a href="@routes.RobotController.viewById(otherR.id.id)">