Improve some UX

robot-rumble · Feb 10, 2024 · d0ff6d2 · d0ff6d2
1 parent 6e079a4
commit d0ff6d2
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 29 deletions.
diff --git a/app/models/Schema.scala b/app/models/Schema.scala
@@ -120,7 +120,19 @@ object Schema {
       rating: Int,
       deviation: Double,
       volatility: Double,
-  )
+  ) {
+    val publishedFormatter = new DateTimeFormatterBuilder()
+      .appendMonthOfYear(2)
+      .appendLiteral('/')
+      .appendDayOfMonth(2)
+      .appendLiteral('/')
+      .appendTwoDigitYear(0)
+      .toFormatter
+
+    def formatPublished(): String = {
+      publishedFormatter.print(created)
+    }
+  }
 
   object PRobot {
     def apply(rId: RobotId, boardId: BoardId, code: String, glickoSettings: GlickoSettings) =
@@ -187,6 +199,8 @@ object Schema {
       .appendMonthOfYear(2)
       .appendLiteral('/')
       .appendDayOfMonth(2)
+      .appendLiteral('/')
+      .appendTwoDigitYear(0)
       .toFormatter
 
     def formatCreated(): String = {

diff --git a/app/views/board/robot.scala.html b/app/views/board/robot.scala.html
@@ -8,32 +8,34 @@ <h1><a href="@routes.BoardController.view(boardWithBattles.board.id.id)">@boardW
     <div class="_table">
         <table class="_battles _body">
         @for(FullBattle(battle, r1, r2) <- boardWithBattles.battles) {
-            <tr>
-                <td class="text-gray">@battle.formatCreated()</td>
-                <td><a href="@routes.BattleController.view(battle.id.id)">
-                    <img src="@assetsFinder.path("images/battle.svg")">
-                    #@battle.id.id
-                </a></td>
-                <td class="_robot pr-0
-                    @{if (battle.didRobotWin(r1.id).contains(true)) " _winner" else ""}
-                "><a href="@routes.RobotController.viewById(battle.r1Id.id)">
-                    <img src="@assetsFinder.path("images/robot.svg")">
-                    @r1.name
-                </a></td>
-                <td class="_robot _rating
-                    @{if (battle.didRobotWin(r1.id).contains(true)) " _winner" else ""}
-                ">@battle.pr1Rating</td>
-                <td>vs</td>
-                <td class="_robot pr-0
-                    @{if (battle.didRobotWin(r2.id).contains(true)) "_winner" else ""}
-                "><a href="@routes.RobotController.viewById(battle.r2Id.id)">
-                    <img src="@assetsFinder.path("images/robot.svg")">
-                    @r2.name
-                </a></td>
-                <td class="_robot _rating
-                    @{if (battle.didRobotWin(r2.id).contains(true)) " _winner" else ""}
-                ">@battle.pr2Rating</td>
-            </tr>
+            @defining(if (r1.id == robot.id) { (r1, r2) } else (r2, r1)) { case (ourR, otherR) =>
+                <tr>
+                    <td class="text-gray">@battle.formatCreated()</td>
+                    <td><a href="@routes.BattleController.view(battle.id.id)">
+                        <img src="@assetsFinder.path("images/battle.svg")">
+                        #@battle.id.id
+                    </a></td>
+                    <td class="_robot pr-0
+                        @{if (battle.didRobotWin(ourR.id).contains(true)) " _winner" else ""}
+                    "><a href="@routes.RobotController.viewById(ourR.id.id)">
+                        <img src="@assetsFinder.path("images/robot.svg")">
+                        @ourR.name
+                    </a></td>
+                    <td class="_robot _rating
+                        @{if (battle.didRobotWin(ourR.id).contains(true)) " _winner" else ""}
+                    ">@{if (r1.id == robot.id) battle.pr1Rating else battle.pr2Rating}</td>
+                    <td>vs</td>
+                    <td class="_robot pr-0
+                        @{if (battle.didRobotWin(otherR.id).contains(true)) "_winner" else ""}
+                    "><a href="@routes.RobotController.viewById(otherR.id.id)">
+                        <img src="@assetsFinder.path("images/robot.svg")">
+                        @otherR.name
+                    </a></td>
+                    <td class="_robot _rating
+                        @{if (battle.didRobotWin(otherR.id).contains(true)) " _winner" else ""}
+                    ">@{if (r1.id == robot.id) battle.pr2Rating else battle.pr1Rating}</td>
+                </tr>
+            }
         }
         </table>
         <div class="_footer">

diff --git a/app/views/robot/view.scala.html b/app/views/robot/view.scala.html
@@ -84,12 +84,16 @@ <h2>Battles</h2>
                 <div class="_table mb-3">
                     <div class="_header">
                         <p>
-                            @board.name <span class="text-grey">
+                            @board.name
                             @if(board.password.isDefined) {
                                 <img src="@assetsFinder.path("images/lock.svg")">
                             }
-                            &nbsp;rating: @pRobot.rating</span>
                         </p>
+
+                        <div>
+                            <span class="text-grey">rating: @pRobot.rating&nbsp;</span>
+                            <span class="text-grey">last published: @pRobot.formatPublished()</span>
+                        </div>
                     </div>
                     <table class="_body _battles">
                     @if(battles.nonEmpty) {