From a3c1d8f22a191f1231d9454fda5968c6caa52c20 Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Sat, 15 Jan 2022 05:17:33 -0800
Subject: [PATCH] Add job column to PlayerTab (#6181)

---
 .../Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs |  2 ++
 .../UI/Tabs/PlayerTab/PlayerTabEntry.xaml              |  9 +++++++--
 .../UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs           |  3 ++-
 Content.Server/Administration/AdminSystem.cs           | 10 ++++++++--
 Content.Shared/Administration/PlayerInfo.cs            |  2 +-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
index 3a9624106b..903c3c2578 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
@@ -51,6 +51,7 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab
 
             PlayerList.AddChild(new PlayerTabEntry("Username",
                 "Character",
+                "Job",
                 "Antagonist",
                 new StyleBoxFlat(altColor),
                 true));
@@ -61,6 +62,7 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab
             {
                 var entry = new PlayerTabEntry(player.Username,
                     player.CharacterName,
+                    player.StartingJob,
                     player.Antag ? "YES" : "NO",
                     new StyleBoxFlat(useAltColor ? altColor : defaultColor),
                     player.Connected);
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
index c54571d778..93482c294c 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
@@ -6,12 +6,17 @@
                   HorizontalExpand="True"
                   SeparationOverride="4">
         <Label Name="UsernameLabel"
-               SizeFlagsStretchRatio="2"
+               SizeFlagsStretchRatio="3"
                HorizontalExpand="True"
                ClipText="True"/>
         <customControls:VSeparator/>
         <Label Name="CharacterLabel"
-               SizeFlagsStretchRatio="2"
+               SizeFlagsStretchRatio="3"
+               HorizontalExpand="True"
+               ClipText="True"/>
+        <customControls:VSeparator/>
+        <Label Name="JobLabel"
+               SizeFlagsStretchRatio="3"
                HorizontalExpand="True"
                ClipText="True"/>
         <customControls:VSeparator/>
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
index d6d773388d..5c3aeb356f 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
@@ -11,13 +11,14 @@ public partial class PlayerTabEntry : ContainerButton
 {
     public EntityUid? PlayerUid;
 
-    public PlayerTabEntry(string username, string character, string antagonist, StyleBox styleBox, bool connected)
+    public PlayerTabEntry(string username, string character, string job, string antagonist, StyleBox styleBox, bool connected)
     {
         RobustXamlLoader.Load(this);
 
         UsernameLabel.Text = username;
         if (!connected)
             UsernameLabel.StyleClasses.Add("Disabled");
+        JobLabel.Text = job;
         CharacterLabel.Text = character;
         AntagonistLabel.Text = antagonist;
         BackgroundColorPanel.PanelOverride = styleBox;
diff --git a/Content.Server/Administration/AdminSystem.cs b/Content.Server/Administration/AdminSystem.cs
index b04ced17a0..61e57de557 100644
--- a/Content.Server/Administration/AdminSystem.cs
+++ b/Content.Server/Administration/AdminSystem.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using Content.Server.Administration.Managers;
 using Content.Server.Players;
@@ -112,11 +113,16 @@ namespace Content.Server.Administration
             if (session.AttachedEntity != null)
                 username = EntityManager.GetComponent<MetaDataComponent>(session.AttachedEntity.Value).EntityName;
 
-            var antag = session.ContentData()?.Mind?.AllRoles.Any(r => r.Antagonist) ?? false;
+            var mind = session.ContentData()?.Mind;
+
+            var job = mind?.AllRoles.FirstOrDefault(role => role is Job);
+            var startingRole = job != null ? CultureInfo.CurrentCulture.TextInfo.ToTitleCase(job.Name) : string.Empty;
+
+            var antag = mind?.AllRoles.Any(r => r.Antagonist) ?? false;
 
             var connected = session.Status is SessionStatus.Connected or SessionStatus.InGame;
 
-            return new PlayerInfo(name, username, antag, session.AttachedEntity.GetValueOrDefault(), session.UserId,
+            return new PlayerInfo(name, username, startingRole, antag, session.AttachedEntity.GetValueOrDefault(), session.UserId,
                 connected);
         }
     }
diff --git a/Content.Shared/Administration/PlayerInfo.cs b/Content.Shared/Administration/PlayerInfo.cs
index ab201dc829..dcb188a9d5 100644
--- a/Content.Shared/Administration/PlayerInfo.cs
+++ b/Content.Shared/Administration/PlayerInfo.cs
@@ -6,5 +6,5 @@ using Robust.Shared.Serialization;
 namespace Content.Shared.Administration
 {
     [Serializable, NetSerializable]
-    public record PlayerInfo(string Username, string CharacterName, bool Antag, EntityUid EntityUid, NetUserId SessionId, bool Connected);
+    public record PlayerInfo(string Username, string CharacterName, string StartingJob, bool Antag, EntityUid EntityUid, NetUserId SessionId, bool Connected);
 }