src/main/java/com/warhammer/domain/UnitArmy.java

@@ -1,11 +1,9 @@
 package com.warhammer.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.warhammer.enums.Rank;
 
 import javax.persistence.*;
-import javax.validation.constraints.*;
+import javax.validation.constraints.NotNull;
-
 import java.io.Serializable;
 
 /**
@@ -40,15 +38,6 @@ public class UnitArmy implements Serializable {
     @Column(name = "enemy_psychic_destroyed")
     private Integer enemyPsychicDestroyed;
 
-    @Column(name = "agenda_one_tally")
-    private Long agendaOneTally;
-
-    @Column(name = "agenda_two_tally")
-    private Long agendaTwoTally;
-
-    @Column(name = "agenda_three_tally")
-    private Long agendaThreeTally;
-
     @Column(name = "equipment")
     private String equipment;
 
@@ -177,45 +166,6 @@ public class UnitArmy implements Serializable {
         this.enemyMeleeDestroyed = enemyMeleeDestroyed;
     }
 
-    public Long getAgendaOneTally() {
-        return agendaOneTally;
-    }
-
-    public UnitArmy agendaOneTally(Long agendaOneTally) {
-        this.agendaOneTally = agendaOneTally;
-        return this;
-    }
-
-    public void setAgendaOneTally(Long agendaOneTally) {
-        this.agendaOneTally = agendaOneTally;
-    }
-
-    public Long getAgendaTwoTally() {
-        return agendaTwoTally;
-    }
-
-    public UnitArmy agendaTwoTally(Long agendaTwoTally) {
-        this.agendaTwoTally = agendaTwoTally;
-        return this;
-    }
-
-    public void setAgendaTwoTally(Long agendaTwoTally) {
-        this.agendaTwoTally = agendaTwoTally;
-    }
-
-    public Long getAgendaThreeTally() {
-        return agendaThreeTally;
-    }
-
-    public UnitArmy agendaThreeTally(Long agendaThreeTally) {
-        this.agendaThreeTally = agendaThreeTally;
-        return this;
-    }
-
-    public void setAgendaThreeTally(Long agendaThreeTally) {
-        this.agendaThreeTally = agendaThreeTally;
-    }
-
     public String getEquipment() {
         return equipment;
     }
@@ -482,9 +432,6 @@ public class UnitArmy implements Serializable {
             ", enemyPsychicDestroyed=" + getEnemyPsychicDestroyed() +
             ", enemyRangedDestroyed=" + getEnemyRangedDestroyed() +
             ", enemyMeleeDestroyed=" + getEnemyMeleeDestroyed() +
-            ", agendaOneTally=" + getAgendaOneTally() +
-            ", agendaTwoTally=" + getAgendaTwoTally() +
-            ", agendaThreeTally=" + getAgendaThreeTally() +
             ", equipment='" + getEquipment() + "'" +
             ", psychicPowersTaken='" + getPsychicPowersTaken() + "'" +
             ", warlordTraits='" + getWarlordTraits() + "'" +

src/main/resources/config/liquibase/changelog/20220304184800_remove_agenda_unit_army.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.9.xsd
+                        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
+
+    <property name="autoIncrement" value="true"/>
+
+    <!--
+        Update the entity UnitArmy.
+        to remove entity agenda tally
+    -->
+    <changeSet id="20220304184800_remove_agenda_unit_army-1" author="mitch" runOnChange="true">
+        <dropColumn tableName="unit_army">
+            <column name="agenda_one_tally"/>
+        </dropColumn>
+        <dropColumn tableName="unit_army">
+            <column name="agenda_two_tally"/>
+        </dropColumn>
+        <dropColumn tableName="unit_army">
+            <column name="agenda_three_tally"/>
+        </dropColumn>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/config/liquibase/master.xml

@@ -23,6 +23,7 @@
     <include file="config/liquibase/changelog/20200823170000_merge_unit_army_and_base.xml" relativeToChangelogFile="false"/>
     <include file="config/liquibase/changelog/20210808083300_add_codex_points.xml" relativeToChangelogFile="false"/>
     <include file="config/liquibase/changelog/20210808130500_add_army_race.xml" relativeToChangelogFile="false"/>
+    <include file="config/liquibase/changelog/20220304184800_remove_agenda_unit_army.xml" relativeToChangelogFile="false"/>
     <!-- jhipster-needle-liquibase-add-constraints-changelog - JHipster will add liquibase constraints changelogs here -->
     <!-- jhipster-needle-liquibase-add-incremental-changelog - JHipster will add incremental liquibase changelogs here -->
 </databaseChangeLog>

src/main/webapp/app/entities/army/army-detail-mobile.html

@@ -35,15 +35,17 @@
         </div>
     </div>
 
+    <div *ngFor="let unit of army.units; let rowIndex=index">
+
+        <br/>
         <div class="crusade-cards" style="padding-top: 10px">
             <div class="row" style="justify-content: center">
-            <div class="col-md-6-mobile" style="width: 30%">Name</div>
+                <div class="col-md-6-mobile-header" style="width: 30%">Name</div>
-            <div class="col-md-6-mobile" style="width: 15%">PL</div>
+                <div class="col-md-6-mobile-header" style="width: 15%">PL</div>
-            <div class="col-md-6-mobile" style="width: 15%">CP</div>
+                <div class="col-md-6-mobile-header" style="width: 15%">CP</div>
-            <div class="col-md-6-mobile" style="width: 15%"></div>
+                <div class="col-md-6-mobile-header" style="width: 15%"></div>
             </div>
         </div>
-    <div *ngFor="let unit of army.units; let rowIndex=index">
         <div class="row" style="justify-content: center">
             <div class="col-md-6-mobile" style="width: 30%">
                 <a [routerLink]="['/unit-army', unit.id, 'view']">{{unit.unitName}}</a></div>
@@ -55,6 +57,18 @@
                         >BTN</button>
             </div>
         </div>
+        <div class="row" style="justify-content: center;">
+            <div class="col-md-6-mobile-header" style="width: 75%;"><b>Battle Honours </b></div>
+        </div>
+        <div class="row" style="justify-content: center">
+            <div class="col-md-6-mobile" style="width: 75%">{{unit.battleHonours}}</div>
+        </div>
+        <div class="row" style="justify-content: center">
+            <div class="col-md-6-mobile-header" style="width: 75%"><b>Battle Scars</b></div>
+        </div>
+        <div class="row" style="justify-content: center">
+            <div class="col-md-6-mobile" style="width: 75%">{{unit.battleScars}}</div>
+        </div>
     </div>
     <div class="row" style="justify-content: center">
         <button type="button" class="btn btn-danger btn-sm"

src/main/webapp/app/entities/force/force.component.html

@@ -154,42 +154,6 @@
                 {{ unitLocal.enemyMeleeDestroyed }}
             </div>
         </div>
-        <div class="row">
-            <div class="col-md-2" style="border: 1px solid black">
-                Agenda 1 tally:
-            </div>
-            <div class="col-md-4" style="border: 1px solid black">
-                <!--                <input type="number" class="form-control" name="agendaOneTally"-->
-                <!--                       formControlName="agendaOneTally"/>-->
-            </div>
-            <div class="col-md-4" style="border: 1px solid black">
-                <span>{{ unitLocal.agendaOneTally }}</span>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-md-2" style="border: 1px solid black">
-                Agenda 2 tally:
-            </div>
-            <div class="col-md-4" style="border: 1px solid black">
-                <!--                <input type="number" class="form-control" name="agendaTwoTally"-->
-                <!--                       formControlName="agendaTwoTally"/>-->
-            </div>
-            <div class="col-md-4" style="border: 1px solid black">
-                <span>{{ unitLocal.agendaTwoTally }}</span>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-md-2" style="border: 1px solid black">
-                Agenda 3 tally:
-            </div>
-            <div class="col-md-4" style="border: 1px solid black">
-                <!--                <input type="number" class="form-control" name="agendaThreeTally"-->
-                <!--                       formControlName="agendaThreeTally"/>-->
-            </div>
-            <div class="col-md-4" style="border: 1px solid black">
-                <span>{{ unitLocal.agendaThreeTally }}</span>
-            </div>
-        </div>
     </div>
     <div class="unit-header" align="center" >
         RANK

src/main/webapp/app/entities/unit-army/unit-army-detail.component.html

@@ -162,42 +162,6 @@
                 {{ unitArmy.enemyMeleeDestroyed }}
             </div>
         </div>
-        <div class="row">
-            <div class="col-md-2" style="border: 1px solid black">
-                Agenda 1 tally:
-            </div>
-            <div class="col-md-4" style="border: 1px solid black">
-<!--                <input type="number" class="form-control" name="agendaOneTally"-->
-<!--                       formControlName="agendaOneTally"/>-->
-            </div>
-            <div class="col-md-4" style="border: 1px solid black">
-                <span>{{ unitArmy.agendaOneTally }}</span>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-md-2" style="border: 1px solid black">
-                Agenda 2 tally:
-            </div>
-            <div class="col-md-4" style="border: 1px solid black">
-<!--                <input type="number" class="form-control" name="agendaTwoTally"-->
-<!--                       formControlName="agendaTwoTally"/>-->
-            </div>
-            <div class="col-md-4" style="border: 1px solid black">
-                <span>{{ unitArmy.agendaTwoTally }}</span>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-md-2" style="border: 1px solid black">
-                Agenda 3 tally:
-            </div>
-            <div class="col-md-4" style="border: 1px solid black">
-<!--                <input type="number" class="form-control" name="agendaThreeTally"-->
-<!--                       formControlName="agendaThreeTally"/>-->
-            </div>
-            <div class="col-md-4" style="border: 1px solid black">
-                <span>{{ unitArmy.agendaThreeTally }}</span>
-            </div>
-        </div>
     </div>
     <div class="unit-header" align="center" >
         RANK

src/main/webapp/app/entities/unit-army/unit-army-detail.component.ts

@@ -88,9 +88,6 @@ export class UnitArmyDetailComponent implements OnInit {
       enemyPsychicDestroyed: unitArmy.enemyPsychicDestroyed,
       enemyRangedDestroyed: unitArmy.enemyRangedDestroyed,
       enemyMeleeDestroyed: unitArmy.enemyMeleeDestroyed,
-      agendaOneTally: unitArmy.agendaOneTally,
-      agendaTwoTally: unitArmy.agendaTwoTally,
-      agendaThreeTally: unitArmy.agendaThreeTally,
       equipment: unitArmy.equipment,
       psychicPowersTaken: unitArmy.psychicPowersTaken,
       warlordTraits: unitArmy.warlordTraits,
@@ -136,9 +133,6 @@ export class UnitArmyDetailComponent implements OnInit {
       enemyPsychicDestroyed: this.editForm.get(['enemyPsychicDestroyed'])!.value,
       enemyRangedDestroyed: this.editForm.get(['enemyRangedDestroyed'])!.value,
       enemyMeleeDestroyed: this.editForm.get(['enemyMeleeDestroyed'])!.value,
-      agendaOneTally: this.editForm.get(['agendaOneTally'])!.value,
-      agendaTwoTally: this.editForm.get(['agendaTwoTally'])!.value,
-      agendaThreeTally: this.editForm.get(['agendaThreeTally'])!.value,
       equipment: this.editForm.get(['equipment'])!.value,
       psychicPowersTaken: this.editForm.get(['psychicPowersTaken'])!.value,
       warlordTraits: this.editForm.get(['warlordTraits'])!.value,

src/main/webapp/app/entities/unit-army/unit-army-update.component.html

@@ -72,24 +72,6 @@
                            formControlName="enemyMeleeDestroyed"/>
                 </div>
 
-                <div class="form-group">
-                    <label class="form-control-label" for="field_agendaOneTally">Agenda One Tally</label>
-                    <input type="number" class="form-control" name="agendaOneTally" id="field_agendaOneTally"
-                           formControlName="agendaOneTally"/>
-                </div>
-
-                <div class="form-group">
-                    <label class="form-control-label" for="field_agendaTwoTally">Agenda Two Tally</label>
-                    <input type="number" class="form-control" name="agendaTwoTally" id="field_agendaTwoTally"
-                           formControlName="agendaTwoTally"/>
-                </div>
-
-                <div class="form-group">
-                    <label class="form-control-label" for="field_agendaThreeTally">Agenda Three Tally</label>
-                    <input type="number" class="form-control" name="agendaThreeTally" id="field_agendaThreeTally"
-                           formControlName="agendaThreeTally"/>
-                </div>
-
                 <div class="form-group">
                     <label class="form-control-label" for="field_equipment">Equipment</label>
                     <input type="text" class="form-control" name="equipment" id="field_equipment"

src/main/webapp/app/entities/unit-army/unit-army-update.component.ts

@@ -33,9 +33,6 @@ export class UnitArmyUpdateComponent implements OnInit {
     enemyPsychicDestroyed: [],
     enemyRangedDestroyed: [],
     enemyMeleeDestroyed: [],
-    agendaOneTally: [],
-    agendaTwoTally: [],
-    agendaThreeTally: [],
     equipment: [],
     psychicPowersTaken: [],
     warlordTraits: [],
@@ -80,9 +77,6 @@ export class UnitArmyUpdateComponent implements OnInit {
       enemyUnitsDestroyed: unitArmy.enemyUnitsDestroyed,
       enemyRangedDestroyed: unitArmy.enemyRangedDestroyed,
       enemyMeleeDestroyed: unitArmy.enemyMeleeDestroyed,
-      agendaOneTally: unitArmy.agendaOneTally,
-      agendaTwoTally: unitArmy.agendaTwoTally,
-      agendaThreeTally: unitArmy.agendaThreeTally,
       equipment: unitArmy.equipment,
       psychicPowersTaken: unitArmy.psychicPowersTaken,
       warlordTraits: unitArmy.warlordTraits,
@@ -143,9 +137,6 @@ export class UnitArmyUpdateComponent implements OnInit {
       enemyPsychicDestroyed: this.editForm.get(['enemyPsychicDestroyed'])!.value,
       enemyRangedDestroyed: this.editForm.get(['enemyRangedDestroyed'])!.value,
       enemyMeleeDestroyed: this.editForm.get(['enemyMeleeDestroyed'])!.value,
-      agendaOneTally: this.editForm.get(['agendaOneTally'])!.value,
-      agendaTwoTally: this.editForm.get(['agendaTwoTally'])!.value,
-      agendaThreeTally: this.editForm.get(['agendaThreeTally'])!.value,
       equipment: this.editForm.get(['equipment'])!.value,
       psychicPowersTaken: this.editForm.get(['psychicPowersTaken'])!.value,
       warlordTraits: this.editForm.get(['warlordTraits'])!.value,

src/main/webapp/app/entities/unit-army/unit-army.component.html

@@ -64,9 +64,6 @@
                     <td>{{ unitArmy.enemyPsychicDestroyed }}</td>
                     <td>{{ unitArmy.enemyRangedDestroyed }}</td>
                     <td>{{ unitArmy.enemyMeleeDestroyed }}</td>
-                    <td>{{ unitArmy.agendaOneTally }}</td>
-                    <td>{{ unitArmy.agendaTwoTally }}</td>
-                    <td>{{ unitArmy.agendaThreeTally }}</td>
                     <td>{{ unitArmy.equipment }}</td>
                     <td>{{ unitArmy.psychicPowersTaken }}</td>
                     <td>{{ unitArmy.warlordTraits }}</td>

src/main/webapp/app/shared/model/unit-army.model.ts

@@ -11,9 +11,6 @@ export interface IUnitArmy {
   enemyPsychicDestroyed?: number;
   enemyRangedDestroyed?: number;
   enemyMeleeDestroyed?: number;
-  agendaOneTally?: number;
-  agendaTwoTally?: number;
-  agendaThreeTally?: number;
   equipment?: string;
   psychicPowersTaken?: string;
   warlordTraits?: string;
@@ -42,9 +39,6 @@ export class UnitArmy implements IUnitArmy {
     public enemyPsychicDestroyed?: number,
     public enemyRangedDestroyed?: number,
     public enemyMeleeDestroyed?: number,
-    public agendaOneTally?: number,
-    public agendaTwoTally?: number,
-    public agendaThreeTally?: number,
     public equipment?: string,
     public psychicPowersTaken?: string,
     public warlordTraits?: string,

src/main/webapp/content/scss/global.scss

@@ -209,6 +209,15 @@ entity detail page css
   border: 1px solid black;
 }
 
+.col-md-6-mobile-header {
+  padding: 2px;
+  width: 60px;
+  font-weight: bold;
+  background-color: whitesmoke;
+  color: black;
+  border: 1px solid black;
+}
+
 .unit {
   padding: 8px;
   border-bottom: 1px solid #dddddd;

src/test/java/com/warhammer/web/rest/UnitArmyResourceIT.java

@@ -131,9 +131,6 @@ public class UnitArmyResourceIT {
             .enemyUnitsDestroyed(DEFAULT_ENEMY_UNITS_DESTROYED)
             .enemyRangedDestroyed(DEFAULT_ENEMY_RANGED_DESTROYED)
             .enemyMeleeDestroyed(DEFAULT_ENEMY_MELEE_DESTROYED)
-            .agendaOneTally(DEFAULT_AGENDA_ONE_TALLY)
-            .agendaTwoTally(DEFAULT_AGENDA_TWO_TALLY)
-            .agendaThreeTally(DEFAULT_AGENDA_THREE_TALLY)
             .equipment(DEFAULT_EQUIPMENT)
             .psychicPowersTaken(DEFAULT_PSYCHIC_POWERS_TAKEN)
             .warlordTraits(DEFAULT_WARLORD_TRAITS)
@@ -174,9 +171,6 @@ public class UnitArmyResourceIT {
             .enemyUnitsDestroyed(UPDATED_ENEMY_UNITS_DESTROYED)
             .enemyRangedDestroyed(UPDATED_ENEMY_RANGED_DESTROYED)
             .enemyMeleeDestroyed(UPDATED_ENEMY_MELEE_DESTROYED)
-            .agendaOneTally(UPDATED_AGENDA_ONE_TALLY)
-            .agendaTwoTally(UPDATED_AGENDA_TWO_TALLY)
-            .agendaThreeTally(UPDATED_AGENDA_THREE_TALLY)
             .equipment(UPDATED_EQUIPMENT)
             .psychicPowersTaken(UPDATED_PSYCHIC_POWERS_TAKEN)
             .warlordTraits(UPDATED_WARLORD_TRAITS)
@@ -230,9 +224,6 @@ public class UnitArmyResourceIT {
         assertThat(testUnitArmy.getEnemyUnitsDestroyed()).isEqualTo(DEFAULT_ENEMY_UNITS_DESTROYED);
         assertThat(testUnitArmy.getEnemyRangedDestroyed()).isEqualTo(DEFAULT_ENEMY_RANGED_DESTROYED);
         assertThat(testUnitArmy.getEnemyMeleeDestroyed()).isEqualTo(DEFAULT_ENEMY_MELEE_DESTROYED);
-        assertThat(testUnitArmy.getAgendaOneTally()).isEqualTo(DEFAULT_AGENDA_ONE_TALLY);
-        assertThat(testUnitArmy.getAgendaTwoTally()).isEqualTo(DEFAULT_AGENDA_TWO_TALLY);
-        assertThat(testUnitArmy.getAgendaThreeTally()).isEqualTo(DEFAULT_AGENDA_THREE_TALLY);
         assertThat(testUnitArmy.getEquipment()).isEqualTo(DEFAULT_EQUIPMENT);
         assertThat(testUnitArmy.getPsychicPowersTaken()).isEqualTo(DEFAULT_PSYCHIC_POWERS_TAKEN);
         assertThat(testUnitArmy.getWarlordTraits()).isEqualTo(DEFAULT_WARLORD_TRAITS);
@@ -369,9 +360,6 @@ public class UnitArmyResourceIT {
             .enemyUnitsDestroyed(UPDATED_ENEMY_UNITS_DESTROYED)
             .enemyRangedDestroyed(UPDATED_ENEMY_RANGED_DESTROYED)
             .enemyMeleeDestroyed(UPDATED_ENEMY_MELEE_DESTROYED)
-            .agendaOneTally(UPDATED_AGENDA_ONE_TALLY)
-            .agendaTwoTally(UPDATED_AGENDA_TWO_TALLY)
-            .agendaThreeTally(UPDATED_AGENDA_THREE_TALLY)
             .equipment(UPDATED_EQUIPMENT)
             .psychicPowersTaken(UPDATED_PSYCHIC_POWERS_TAKEN)
             .warlordTraits(UPDATED_WARLORD_TRAITS)
@@ -402,9 +390,6 @@ public class UnitArmyResourceIT {
         assertThat(testUnitArmy.getEnemyUnitsDestroyed()).isEqualTo(UPDATED_ENEMY_UNITS_DESTROYED);
         assertThat(testUnitArmy.getEnemyRangedDestroyed()).isEqualTo(UPDATED_ENEMY_RANGED_DESTROYED);
         assertThat(testUnitArmy.getEnemyMeleeDestroyed()).isEqualTo(UPDATED_ENEMY_MELEE_DESTROYED);
-        assertThat(testUnitArmy.getAgendaOneTally()).isEqualTo(UPDATED_AGENDA_ONE_TALLY);
-        assertThat(testUnitArmy.getAgendaTwoTally()).isEqualTo(UPDATED_AGENDA_TWO_TALLY);
-        assertThat(testUnitArmy.getAgendaThreeTally()).isEqualTo(UPDATED_AGENDA_THREE_TALLY);
         assertThat(testUnitArmy.getEquipment()).isEqualTo(UPDATED_EQUIPMENT);
         assertThat(testUnitArmy.getPsychicPowersTaken()).isEqualTo(UPDATED_PSYCHIC_POWERS_TAKEN);
         assertThat(testUnitArmy.getWarlordTraits()).isEqualTo(UPDATED_WARLORD_TRAITS);