Display battle time

robot-rumble · Mar 10, 2024 · d69b587 · d69b587
1 parent ba12e44
commit d69b587
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/app/models/Schema.scala b/app/models/Schema.scala
@@ -227,7 +227,9 @@ object Schema {
       .appendHourOfDay(2)
       .appendLiteral(':')
       .appendMinuteOfHour(2)
+      .appendLiteral(" UTC")
       .toFormatter
+      .withZone(DateTimeZone.UTC)
 
     def formatCreatedTime(): String = {
       createdTimeFormatter.print(created)

diff --git a/app/views/battle/view.scala.html b/app/views/battle/view.scala.html
@@ -23,7 +23,7 @@
     <link rel="stylesheet" type="text/css" href="@assetsFinder.path("dist/battle_css.css")">
     <script src="@assetsFinder.path("dist/battle_js.js")" type="text/javascript"></script>
 
-    <h4 class="text-center text-gray">battle #@fullBattle.b.id.id, @fullBattle.b.formatCreated()</h4>
+    <h4 class="text-center text-gray">battle #@fullBattle.b.id.id, @fullBattle.b.formatCreatedTime()</h4>
     <h1 class="mt-3 mb-2 text-center">
         @fullBattle.b.winner match {
             case Some(Team.R1) => {

diff --git a/app/views/battleRows.scala.html b/app/views/battleRows.scala.html
@@ -3,7 +3,7 @@
 
 @for(FullBattle(battle, r1, r2) <- battles) {
     <tr>
-        <td class="text-gray">@battle.formatCreated()</td>
+        <td class="text-gray">@battle.formatCreatedTime()</td>
         <td><a href="@routes.BattleController.view(battle.id.id)">
             <img src="@assetsFinder.path("images/battle.svg")">
             #@battle.id.id

diff --git a/app/views/board/robot.scala.html b/app/views/board/robot.scala.html
@@ -10,7 +10,7 @@ <h1><a href="@routes.BoardController.view(boardWithBattles.board.id.id)">@boardW
         @for(FullBattle(battle, r1, r2) <- boardWithBattles.battles) {
             @defining(if (r1.id == robot.id) { (r1, r2) } else (r2, r1)) { case (ourR, otherR) =>
                 <tr>
-                    <td class="text-gray">@battle.formatCreated()</td>
+                    <td class="text-gray">@battle.formatCreatedTime()</td>
                     <td><a href="@routes.BattleController.view(battle.id.id)">
                         <img src="@assetsFinder.path("images/battle.svg")">
                         #@battle.id.id