From: TheSaminator <TheSaminator@users.noreply.github.com>
Date: Thu, 10 Feb 2022 16:22:08 +0000 (-0500)
Subject: Add more data to battle record
X-Git-Url: https://gitweb.starshipfights.net/?a=commitdiff_plain;h=8a9e281f170245f119e25980f672859209d21484;p=starship-fights

Add more data to battle record
---

diff --git a/src/jsMain/kotlin/starshipfights/game/popup.kt b/src/jsMain/kotlin/starshipfights/game/popup.kt
index cfe1a43..cac0087 100644
--- a/src/jsMain/kotlin/starshipfights/game/popup.kt
+++ b/src/jsMain/kotlin/starshipfights/game/popup.kt
@@ -158,6 +158,9 @@ sealed class Popup<out T> {
 					if (battleSize <= maxBattleSize)
 						button {
 							+battleSize.displayName
+							+" ("
+							+battleSize.numPoints.toString()
+							+")"
 							onClickFunction = { e ->
 								e.preventDefault()
 								callback(battleSize)
@@ -299,6 +302,9 @@ sealed class Popup<out T> {
 						td {
 							style = "text-align:center"
 							+joinable.battleInfo.size.displayName
+							+" ("
+							+joinable.battleInfo.size.numPoints.toString()
+							+")"
 						}
 						td {
 							style = "text-align:center"
diff --git a/src/jvmMain/kotlin/starshipfights/data/admiralty/battle_records.kt b/src/jvmMain/kotlin/starshipfights/data/admiralty/battle_records.kt
index 83a36fa..bf7ce74 100644
--- a/src/jvmMain/kotlin/starshipfights/data/admiralty/battle_records.kt
+++ b/src/jvmMain/kotlin/starshipfights/data/admiralty/battle_records.kt
@@ -8,6 +8,7 @@ import starshipfights.data.DocumentTable
 import starshipfights.data.Id
 import starshipfights.data.auth.User
 import starshipfights.data.invoke
+import starshipfights.game.BattleInfo
 import starshipfights.game.GlobalSide
 import java.time.Instant
 
@@ -16,6 +17,8 @@ data class BattleRecord(
 	@SerialName("_id")
 	override val id: Id<BattleRecord> = Id(),
 	
+	val battleInfo: BattleInfo,
+	
 	val whenStarted: @Contextual Instant,
 	val whenEnded: @Contextual Instant,
 	
diff --git a/src/jvmMain/kotlin/starshipfights/game/server_game.kt b/src/jvmMain/kotlin/starshipfights/game/server_game.kt
index 2651825..4b08a72 100644
--- a/src/jvmMain/kotlin/starshipfights/game/server_game.kt
+++ b/src/jvmMain/kotlin/starshipfights/game/server_game.kt
@@ -64,6 +64,8 @@ object GameManager {
 			}
 			
 			val battleRecord = BattleRecord(
+				battleInfo = session.state.value.battleInfo,
+				
 				whenStarted = startedAt,
 				whenEnded = endedAt,
 				
diff --git a/src/jvmMain/kotlin/starshipfights/info/views_user.kt b/src/jvmMain/kotlin/starshipfights/info/views_user.kt
index a9b740e..324c2b8 100644
--- a/src/jvmMain/kotlin/starshipfights/info/views_user.kt
+++ b/src/jvmMain/kotlin/starshipfights/info/views_user.kt
@@ -353,6 +353,7 @@ suspend fun ApplicationCall.admiralPage(): HTML.() -> Unit {
 			table {
 				tr {
 					th { +"When" }
+					th { +"Size" }
 					th { +"Role" }
 					th { +"Against" }
 					th { +"Result" }
@@ -372,6 +373,12 @@ suspend fun ApplicationCall.admiralPage(): HTML.() -> Unit {
 								+record.whenEnded.toEpochMilli().toString()
 							}
 						}
+						td {
+							+record.battleInfo.size.displayName
+							+" ("
+							+record.battleInfo.size.numPoints.toString()
+							+")"
+						}
 						td {
 							+when (recordRoles[record.id]) {
 								GlobalSide.HOST -> "Host"