cleanup Submissions/View a bit, show submitted game version, and show…

… submitted rom under game version, when game version exists
TASVideos · Aug 31, 2024 · ca43991 · ca43991
1 parent 5f7d9fb
commit ca43991
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/TASVideos/Pages/Submissions/View.cshtml b/TASVideos/Pages/Submissions/View.cshtml
@@ -127,7 +127,7 @@
 						@Model.Submission.GameVersion
 					</a>
 				</div>
-				<div condition="!Model.Submission.GameVersionId.HasValue">@Model.Submission.GameVersion</div>
+				(Submitted: @Model.Submission.RomName @Model.Submission.SubmittedGameVersion)
 			</div>
 			<div class="sub-info-cell">
 				<label>Emulator</label>
@@ -171,10 +171,14 @@
 					</small>
 				</div>
 			</div>
-			<div condition="!string.IsNullOrWhiteSpace(Model.Submission.RomName) && Model.Submission.RomName != Model.Submission.GameVersion" class="sub-info-cell">
+			<div condition="!string.IsNullOrWhiteSpace(Model.Submission.RomName) && !(Model.Submission.GameVersionId > 0)" class="sub-info-cell">
 				<label>Submitted ROM</label>
 				<div>@Model.Submission.RomName</div>
 			</div>
+			<div condition="!string.IsNullOrWhiteSpace(Model.Submission.SubmittedGameVersion) && !(Model.Submission.GameVersionId > 0)" class="sub-info-cell">
+				<label>Submitted Game Version</label>
+				<div>@Model.Submission.SubmittedGameVersion</div>
+			</div>
 		</div>
 
 		<div condition="!string.IsNullOrWhiteSpace(Model.Submission.Annotations)" class="sub-info-cell mb-2">

diff --git a/TASVideos/Pages/Submissions/View.cshtml.cs b/TASVideos/Pages/Submissions/View.cshtml.cs
@@ -27,7 +27,8 @@ public async Task<IActionResult> OnGet()
 				SystemDisplayName = s.System!.DisplayName,
 				GameName = s.GameId != null ? s.Game!.DisplayName : null,
 				SubmittedGameName = s.GameName,
-				GameVersion = s.GameVersionId != null ? s.GameVersion!.Name : s.SubmittedGameVersion,
+				GameVersion = s.GameVersionId != null ? s.GameVersion!.Name : "",
+				SubmittedGameVersion = s.SubmittedGameVersion,
 				RomName = s.RomName,
 				Branch = s.Branch,
 				Goal = s.GameGoal != null
@@ -107,6 +108,7 @@ public class SubmissionDisplay : ISubmissionDisplay
 		public string? GameName { get; init; }
 		public string? SubmittedGameName { get; init; }
 		public string? GameVersion { get; init; }
+		public string? SubmittedGameVersion { get; init; }
 		public string? RomName { get; init; }
 		public string? Branch { get; init; }
 		public string? Goal { get; init; }