ho-dev#1288 new column HTMS in player overview

wsbrenk · Dec 25, 2022 · e167ef7 · e167ef7
1 parent 505b051
commit e167ef7
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/src/main/java/core/gui/model/PlayerOverviewModel.java b/src/main/java/core/gui/model/PlayerOverviewModel.java
@@ -44,7 +44,7 @@ public boolean userCanDisableColumns() {
 	 */
 	private void initialize() {
 		UserColumn[] basic = UserColumnFactory.createPlayerBasicArray();
-		columns = new UserColumn[60];
+		columns = new UserColumn[61];
 		columns[0] = basic[0];
 		columns[48] = basic[1];
 
@@ -82,6 +82,7 @@ private void initialize() {
 		columns[56] = additionalArray[19];
 		columns[57] = additionalArray[20];
 		columns[59] = additionalArray[21];
+		columns[60] = additionalArray[22];
 	}
 
     public Player getPlayer(int id) {

diff --git a/src/main/java/core/gui/model/UserColumnFactory.java b/src/main/java/core/gui/model/UserColumnFactory.java
@@ -507,7 +507,7 @@ public IHOTableEntry getTableEntry(PlayerMatchCBItem spielerCBItem) {
      * @return PlayerColumn[]
      */
     public static PlayerColumn[] createPlayerAdditionalArray() {
-        final PlayerColumn[] playerAdditionalArray = new PlayerColumn[22];
+        final PlayerColumn[] playerAdditionalArray = new PlayerColumn[23];
 
         playerAdditionalArray[0] = new PlayerColumn(10, "ls.player.shirtnumber.short", "ls.player.shirtnumber", 25) {
             @Override
@@ -912,7 +912,23 @@ public IHOTableEntry getTableEntry(Player player, Player playerCompare) {
                     t = "";
                     m = 0;
                 }
-                return new ColorLabelEntry(m, t, ColorLabelEntry.FG_STANDARD, ColorLabelEntry.BG_STANDARD, SwingConstants.LEFT);
+                return new ColorLabelEntry(m, t, ColorLabelEntry.FG_STANDARD, ColorLabelEntry.BG_STANDARD, SwingConstants.RIGHT);
+            }
+        };
+
+        playerAdditionalArray[22] = new PlayerColumn(896, "ls.player.htms", 50) {
+            @Override
+            public IHOTableEntry getTableEntry(Player player, Player playerCompare) {
+                var m = player.getHtms();
+                String t;
+                if ( m!= null){
+                    t = m.toString();
+                }
+                else {
+                    t = "";
+                    m = 0;
+                }
+                return new ColorLabelEntry(m, t, ColorLabelEntry.FG_STANDARD, ColorLabelEntry.BG_STANDARD, SwingConstants.RIGHT);
             }
         };
 

diff --git a/src/main/java/core/model/player/Player.java b/src/main/java/core/model/player/Player.java
@@ -329,7 +329,8 @@ public class Player extends AbstractTable.Storable {
     private String motherclubName;
     private Integer matchesCurrentTeam;
     private int hrf_id;
-
+    private Integer htms = null;
+    private Integer htms28 = null;
     public int getGameStartingTime() {
         return GameStartingTime;
     }
@@ -338,7 +339,6 @@ public void setGameStartingTime(int gameStartingTime) {
         GameStartingTime = gameStartingTime;
     }
 
-    private Integer htms28 = null;
 
     //~ Constructors -------------------------------------------------------------------------------
 
@@ -1722,6 +1722,13 @@ public Integer getHtms28() {
         return htms28;
     }
 
+    public Integer getHtms(){
+        if (htms == null){
+            htms= Htms.htms(getSkills());
+        }
+        return htms;
+    }
+
     private Map<Integer, Integer> getSkills() {
 
         var ret = new HashMap<Integer, Integer>();

diff --git a/src/main/resources/sprache/English.properties b/src/main/resources/sprache/English.properties
@@ -2238,6 +2238,7 @@ ls.update_status.complete=Complete
 
 ls.player_details.desc1=A {0} who is {1} and {2}.
 ls.player_details.desc2=Has {0} experience and {1} leadership. Has {2} loyalty.
+ls.player.htms=HTMS
 ls.player.htms28=HTMS-28
 
 ls.training.week=Training week