From af3c4f8b4633d3cf54d03f1dc7b531f4e84b5ad7 Mon Sep 17 00:00:00 2001
From: HardiReady <hardi@noarch.de>
Date: Sun, 4 Aug 2019 13:16:11 +0200
Subject: [PATCH] Refactor fraction names in army management

---
 package.json                                      |  2 +-
 server/models/campaign.js                         | 10 ++++++++++
 server/models/decoration.js                       |  2 +-
 .../army/army-member/army-member.component.html   |  2 +-
 .../app/army/army-squad/army-squad.component.html |  2 +-
 static/src/app/army/army.component.html           |  8 ++++----
 .../decoration-item.component.html                |  2 ++
 .../decoration-list.component.html                |  4 +++-
 .../edit-decoration.component.html                |  6 ++++--
 .../ranks/edit-rank/edit-rank.component.html      |  4 ++--
 .../ranks/rank-list/rank-item.component.html      |  4 ++--
 .../ranks/rank-list/rank-list.component.html      |  4 ++--
 .../squads/edit-squad/edit-squad.component.html   |  4 ++--
 .../squads/squad-list/squad-item.component.html   |  4 ++--
 .../squads/squad-list/squad-list.component.html   |  4 ++--
 .../users/award-user/award-user.component.html    |  7 ++++---
 .../users/edit-user/edit-user.component.html      |  2 +-
 .../users/user-list/user-item.component.html      |  4 ++--
 .../users/user-list/user-list.component.html      |  4 ++--
 .../decoration-overview.component.html            |  2 ++
 .../decoration-overview.component.ts              |  5 +++--
 .../decoration-panel.component.html               |  3 +--
 .../decoration-panel.component.ts                 | 15 +++++++++++++++
 .../rank-overview/rank-overview.component.html    |  4 ++--
 .../rank-panel/rank-panel.component.ts            |  2 --
 .../user-list-sheet.component.html                |  4 ++--
 static/src/app/utils/fraction.enum.ts             |  7 ++++++-
 27 files changed, 79 insertions(+), 42 deletions(-)

diff --git a/package.json b/package.json
index daa0228..a0c1cf6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opt-cc",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "author": "Florian Hartwich <hardi@noarch.de>",
   "private": true,
   "scripts": {
diff --git a/server/models/campaign.js b/server/models/campaign.js
index ab4d9d5..49476cf 100644
--- a/server/models/campaign.js
+++ b/server/models/campaign.js
@@ -8,6 +8,16 @@ const CampaignSchema = new Schema({
     type: String,
     required: true,
   },
+  fractionMappingBlufor: {
+    type: String,
+    enum: ['BLUFOR', 'OPFOR', 'ARF', 'SWORD'],
+    default: 'BLUFOR',
+  },
+  fractionMappingOpfor: {
+    type: String,
+    enum: ['BLUFOR', 'OPFOR', 'ARF', 'SWORD'],
+    default: 'OPFOR',
+  },
 }, {
   collection: 'campaign',
   timestamps: {createdAt: 'timestamp'},
diff --git a/server/models/decoration.js b/server/models/decoration.js
index 5c6e2e2..8848281 100644
--- a/server/models/decoration.js
+++ b/server/models/decoration.js
@@ -10,7 +10,7 @@ const DecorationSchema = new Schema({
   },
   fraction: {
     type: String,
-    enum: ['BLUFOR', 'OPFOR', 'GLOBAL'],
+    enum: ['BLUFOR', 'OPFOR', 'ARF', 'SWORD', 'GLOBAL'],
     required: true,
   },
   description: {
diff --git a/static/src/app/army/army-member/army-member.component.html b/static/src/app/army/army-member/army-member.component.html
index a80a670..94ba07c 100644
--- a/static/src/app/army/army-member/army-member.component.html
+++ b/static/src/app/army/army-member/army-member.component.html
@@ -8,7 +8,7 @@
     </div>
 
     <h3 class="text-center" style="font-weight: 600"
-        [style.color]="user.squadId?.fraction === 'BLUFOR' ? fraction.COLOR_BLUFOR : fraction.COLOR_OPFOR">
+        [style.color]="user.squadId?.fraction === 'BLUFOR' ? fraction.COLOR_ARF : fraction.COLOR_SWORD">
       {{'public.army.member.headline' | translate:{name: user.username} }}
     </h3>
 
diff --git a/static/src/app/army/army-squad/army-squad.component.html b/static/src/app/army/army-squad/army-squad.component.html
index d737deb..050bbba 100644
--- a/static/src/app/army/army-squad/army-squad.component.html
+++ b/static/src/app/army/army-squad/army-squad.component.html
@@ -7,7 +7,7 @@
   </div>
   <div class=" middle-row">
     <div class="name-cell">
-      <div [style.color]="squadFraction === 'BLUFOR' ? fraction.COLOR_BLUFOR : fraction.COLOR_OPFOR"
+      <div [style.color]="squadFraction === 'BLUFOR' ? fraction.COLOR_ARF : fraction.COLOR_SWORD"
            *ngFor="let member of squad.members">
           <span class="member-link"
                 (click)="select(member._id)">
diff --git a/static/src/app/army/army.component.html b/static/src/app/army/army.component.html
index 92b49aa..3fba727 100644
--- a/static/src/app/army/army.component.html
+++ b/static/src/app/army/army.component.html
@@ -2,8 +2,8 @@
   <h1>{{'public.army.headline' | translate}}</h1>
 
   <div class="pull-left army-column" *ngIf="!isSmallLayout || singleViewSelected === fraction.BLUFOR">
-    <h3 class="army-head" [style.color]="fraction.COLOR_BLUFOR">
-      {{fraction.BLUFOR}}
+    <h3 class="army-head" [style.color]="fraction.COLOR_ARF">
+      {{fraction.ARF}}
       <button mat-icon-button class="switch-btn-blufor"
               (click)="singleViewSwitch(fraction.OPFOR)">
         <mat-icon svgIcon="chevron-right"></mat-icon>
@@ -18,12 +18,12 @@
   </div>
 
   <div class="pull-right army-column" *ngIf="!isSmallLayout || singleViewSelected === fraction.OPFOR">
-    <h3 class="army-head" [style.color]="fraction.COLOR_OPFOR">
+    <h3 class="army-head" [style.color]="fraction.COLOR_SWORD">
       <button mat-icon-button class="switch-btn-opfor"
               (click)="singleViewSwitch(fraction.BLUFOR)">
         <mat-icon svgIcon="chevron-right"></mat-icon>
       </button>
-      {{fraction.OPFOR}}
+      {{fraction.SWORD}}
     </h3>
     <cc-army-squad *ngFor="let squad of army[1].squads"
                    [squad]="squad"
diff --git a/static/src/app/manage/decorations/decoration-list/decoration-item.component.html b/static/src/app/manage/decorations/decoration-list/decoration-item.component.html
index 50d8fe5..b247494 100644
--- a/static/src/app/manage/decorations/decoration-list/decoration-item.component.html
+++ b/static/src/app/manage/decorations/decoration-list/decoration-item.component.html
@@ -6,6 +6,8 @@
         <a>{{decoration.name}}</a>
       </span>
       <br>
+      <small *ngIf="decoration.fraction == 'ARF'">{{fraction.ARF}}</small>
+      <small *ngIf="decoration.fraction == 'SWORD'">{{fraction.SWORD}}</small>
       <small *ngIf="decoration.fraction == 'OPFOR'">{{fraction.OPFOR}}</small>
       <small *ngIf="decoration.fraction == 'BLUFOR'">{{fraction.BLUFOR}}</small>
       <small *ngIf="decoration.fraction == 'GLOBAL'">{{'decorations.list.filter.global' | translate}}</small>
diff --git a/static/src/app/manage/decorations/decoration-list/decoration-list.component.html b/static/src/app/manage/decorations/decoration-list/decoration-list.component.html
index 984d419..d1aef07 100644
--- a/static/src/app/manage/decorations/decoration-list/decoration-list.component.html
+++ b/static/src/app/manage/decorations/decoration-list/decoration-list.component.html
@@ -1,6 +1,8 @@
 <div class="select-list">
   <cc-list-filter
-    [filterButtons]="[{label: fraction.BLUFOR, value: 'BLUFOR'},
+    [filterButtons]="[{label: fraction.ARF, value: 'ARF'},
+                      {label: fraction.SWORD, value: 'SWORD'},
+                      {label: fraction.BLUFOR, value: 'BLUFOR'},
                       {label: fraction.OPFOR, value: 'OPFOR'},
                       {label: 'decorations.list.filter.global', value: 'GLOBAL'}]"
     [addButton]="{svgIcon: 'add', tooltip: 'decorations.list.button.add'}"
diff --git a/static/src/app/manage/decorations/edit-decoration/edit-decoration.component.html b/static/src/app/manage/decorations/edit-decoration/edit-decoration.component.html
index dd71c06..cf312ab 100644
--- a/static/src/app/manage/decorations/edit-decoration/edit-decoration.component.html
+++ b/static/src/app/manage/decorations/edit-decoration/edit-decoration.component.html
@@ -17,8 +17,10 @@
     <select id="fraction" name="fraction" class="form-control btn dropdown-toggle"
             required
             [(ngModel)]="decoration.fraction">
-      <option value="OPFOR">{{fraction.OPFOR}}</option>
-      <option value="BLUFOR">{{fraction.BLUFOR}}</option>
+      <option value="{{fraction.ARF}}">{{fraction.ARF}}</option>
+      <option value="{{fraction.SWORD}}">{{fraction.SWORD}}</option>
+      <option value="{{fraction.OPFOR}}">{{fraction.OPFOR}}</option>
+      <option value="{{fraction.BLUFOR}}">{{fraction.BLUFOR}}</option>
       <option value="GLOBAL">{{'decorations.submit.field.fraction.global' | translate}}</option>
     </select>
     <show-error displayName="{{'decorations.submit.field.fraction' | translate}}" controlPath="fraction"></show-error>
diff --git a/static/src/app/manage/ranks/edit-rank/edit-rank.component.html b/static/src/app/manage/ranks/edit-rank/edit-rank.component.html
index e0b16a1..a0bfe6a 100644
--- a/static/src/app/manage/ranks/edit-rank/edit-rank.component.html
+++ b/static/src/app/manage/ranks/edit-rank/edit-rank.component.html
@@ -17,8 +17,8 @@
     <select id="fraction" name="fraction" class="form-control btn dropdown-toggle"
             required
             [(ngModel)]="rank.fraction">
-      <option value="OPFOR">{{fraction.OPFOR}}</option>
-      <option value="BLUFOR">{{fraction.BLUFOR}}</option>
+      <option value="OPFOR">{{fraction.SWORD}}</option>
+      <option value="BLUFOR">{{fraction.ARF}}</option>
     </select>
     <show-error displayName="{{'ranks.submit.field.fraction' | translate}}" controlPath="fraction"></show-error>
   </div>
diff --git a/static/src/app/manage/ranks/rank-list/rank-item.component.html b/static/src/app/manage/ranks/rank-list/rank-item.component.html
index b00d2a2..97d5bc0 100644
--- a/static/src/app/manage/ranks/rank-list/rank-item.component.html
+++ b/static/src/app/manage/ranks/rank-list/rank-item.component.html
@@ -6,8 +6,8 @@
         <a>{{rank.name}}</a>
       </span>
       <br>
-      <small *ngIf="rank.fraction == 'OPFOR'">{{fraction.OPFOR}}</small>
-      <small *ngIf="rank.fraction == 'BLUFOR'">{{fraction.BLUFOR}}</small>
+      <small *ngIf="rank.fraction == 'OPFOR'">{{fraction.SWORD}}</small>
+      <small *ngIf="rank.fraction == 'BLUFOR'">{{fraction.ARF}}</small>
       <small> {{'ranks.list.item.label.level' | translate:{level: rank.level} }}</small>
     </div>
 
diff --git a/static/src/app/manage/ranks/rank-list/rank-list.component.html b/static/src/app/manage/ranks/rank-list/rank-list.component.html
index 625e54b..2516951 100644
--- a/static/src/app/manage/ranks/rank-list/rank-list.component.html
+++ b/static/src/app/manage/ranks/rank-list/rank-list.component.html
@@ -1,7 +1,7 @@
 <div class="select-list">
   <cc-list-filter
-    [filterButtons]="[{label: fraction.BLUFOR, value: 'BLUFOR'},
-                      {label: fraction.OPFOR, value: 'OPFOR'}]"
+    [filterButtons]="[{label: fraction.ARF, value: 'BLUFOR'},
+                      {label: fraction.SWORD, value: 'OPFOR'}]"
     [addButton]="{svgIcon: 'add', tooltip: 'ranks.list.button.add'}"
     (executeSearch)="filterRanks($event)"
     (openAddFrom)="openNewRankForm()">
diff --git a/static/src/app/manage/squads/edit-squad/edit-squad.component.html b/static/src/app/manage/squads/edit-squad/edit-squad.component.html
index c21d840..4c5347b 100644
--- a/static/src/app/manage/squads/edit-squad/edit-squad.component.html
+++ b/static/src/app/manage/squads/edit-squad/edit-squad.component.html
@@ -17,8 +17,8 @@
     <select id="fraction" name="fraction" class="form-control btn dropdown-toggle"
             required
             [(ngModel)]="squad.fraction">
-      <option value="OPFOR">{{fraction.OPFOR}}</option>
-      <option value="BLUFOR">{{fraction.BLUFOR}}</option>
+      <option value="OPFOR">{{fraction.SWORD}}</option>
+      <option value="BLUFOR">{{fraction.ARF}}</option>
     </select>
     <show-error displayName="{{'squad.submit.field.fraction' | translate}}" controlPath="fraction"></show-error>
   </div>
diff --git a/static/src/app/manage/squads/squad-list/squad-item.component.html b/static/src/app/manage/squads/squad-list/squad-item.component.html
index a32bafd..af56fda 100644
--- a/static/src/app/manage/squads/squad-list/squad-item.component.html
+++ b/static/src/app/manage/squads/squad-list/squad-item.component.html
@@ -6,8 +6,8 @@
         <a>{{squad.name}}</a>
       </span>
       <br>
-      <small *ngIf="squad.fraction == 'OPFOR'">{{fraction.OPFOR}}</small>
-      <small *ngIf="squad.fraction == 'BLUFOR'">{{fraction.BLUFOR}}</small>
+      <small *ngIf="squad.fraction == 'OPFOR'">{{fraction.ARF}}</small>
+      <small *ngIf="squad.fraction == 'BLUFOR'">{{fraction.SWORD}}</small>
     </div>
 
     <div class="col-xs-4">
diff --git a/static/src/app/manage/squads/squad-list/squad-list.component.html b/static/src/app/manage/squads/squad-list/squad-list.component.html
index 79741c4..01e3611 100644
--- a/static/src/app/manage/squads/squad-list/squad-list.component.html
+++ b/static/src/app/manage/squads/squad-list/squad-list.component.html
@@ -1,7 +1,7 @@
 <div class="select-list">
   <cc-list-filter
-    [filterButtons]="[{label: fraction.BLUFOR, value: 'BLUFOR'},
-                      {label: fraction.OPFOR, value: 'OPFOR'}]"
+    [filterButtons]="[{label: fraction.ARF, value: 'BLUFOR'},
+                      {label: fraction.SWORD, value: 'OPFOR'}]"
     [addButton]="{svgIcon: 'add', tooltip: 'squad.list.tooltip.new'}"
     (executeSearch)="filterSquads($event)"
     (openAddFrom)="openNewSquadForm()">
diff --git a/static/src/app/manage/users/award-user/award-user.component.html b/static/src/app/manage/users/award-user/award-user.component.html
index 6bde03a..1decbb5 100644
--- a/static/src/app/manage/users/award-user/award-user.component.html
+++ b/static/src/app/manage/users/award-user/award-user.component.html
@@ -13,7 +13,8 @@
             style="min-width: 200px;">
       <option [value]="0">{{'users.award.field.decoration.placeholder' | translate}}</option>
       <option *ngFor="let deco of decorations" [value]="deco._id">
-        {{deco.fraction == 'BLUFOR'? fraction.BLUFOR : deco.fraction == 'OPFOR'? fraction.OPFOR : 'Global'}}:
+        {{deco.fraction == 'BLUFOR' ? fraction.BLUFOR : deco.fraction == 'OPFOR' ? fraction.OPFOR : deco.fraction ==
+      'ARF' ? fraction.ARF : deco.fraction == 'SWORD' ? fraction.SWORD : 'Global'}}:
         {{deco.name}}
       </option>
     </select>
@@ -93,8 +94,8 @@
         </td>
         <td class="text-center">
           {{award.confirmed === 0 ?
-          awardStatus['users.award.table.status.in.progress'] : (award.confirmed === 1 ?
-          awardStatus['users.award.table.status.approved']: awardStatus['users.award.table.status.rejected'])}}
+            awardStatus['users.award.table.status.in.progress'] : (award.confirmed === 1 ?
+                awardStatus['users.award.table.status.approved'] : awardStatus['users.award.table.status.rejected'])}}
         </td>
         <td class="text-center">
           <label>
diff --git a/static/src/app/manage/users/edit-user/edit-user.component.html b/static/src/app/manage/users/edit-user/edit-user.component.html
index 9b8bd60..28cec9a 100644
--- a/static/src/app/manage/users/edit-user/edit-user.component.html
+++ b/static/src/app/manage/users/edit-user/edit-user.component.html
@@ -23,7 +23,7 @@
             (change)="toggleRanks()">
       <option [value]="0">{{'user.submit.field.squad.not.assigned' | translate}}</option>
       <option *ngFor="let squad of squads" [ngValue]="squad">
-        {{squad.fraction == 'BLUFOR'? fraction.BLUFOR : fraction.OPFOR}}: {{squad.name}}
+        {{squad.fraction == 'BLUFOR'? fraction.ARF : fraction.SWORD}}: {{squad.name}}
       </option>
     </select>
     <show-error displayName="{{'user.submit.field.squad' | translate}}" controlPath="squad"></show-error>
diff --git a/static/src/app/manage/users/user-list/user-item.component.html b/static/src/app/manage/users/user-list/user-item.component.html
index a74a2d1..18edfde 100644
--- a/static/src/app/manage/users/user-list/user-item.component.html
+++ b/static/src/app/manage/users/user-list/user-item.component.html
@@ -6,8 +6,8 @@
         <a>{{user.username}}</a>
       </span>
       <br>
-      <small *ngIf="user.squadId && user.squadId.fraction == 'OPFOR'">{{fraction.OPFOR}} - {{user.squadId.name}}</small>
-      <small *ngIf="user.squadId && user.squadId.fraction == 'BLUFOR'">{{fraction.BLUFOR}} - {{user.squadId.name}}
+      <small *ngIf="user.squadId && user.squadId.fraction == 'OPFOR'">{{fraction.SWORD}} - {{user.squadId.name}}</small>
+      <small *ngIf="user.squadId && user.squadId.fraction == 'BLUFOR'">{{fraction.ARF}} - {{user.squadId.name}}
       </small>
       <small *ngIf="!user.squadId">{{'users.list.item.label.no.squad' | translate}}</small>
     </div>
diff --git a/static/src/app/manage/users/user-list/user-list.component.html b/static/src/app/manage/users/user-list/user-list.component.html
index 2463e0e..d6eefcd 100644
--- a/static/src/app/manage/users/user-list/user-list.component.html
+++ b/static/src/app/manage/users/user-list/user-list.component.html
@@ -1,7 +1,7 @@
 <div class="select-list">
   <cc-list-filter
-    [filterButtons]="[{label: fraction.BLUFOR, value: 'BLUFOR'},
-                      {label: fraction.OPFOR, value: 'OPFOR'},
+    [filterButtons]="[{label: fraction.ARF, value: 'BLUFOR'},
+                      {label: fraction.SWORD, value: 'OPFOR'},
                       {label: 'users.list.filter.no.squad', value: 'UNASSIGNED'}]"
     [addButton]="{svgIcon: 'add-user', tooltip: 'users.list.tooltip.new'}"
     (executeSearch)="filterUsers(undefined, $event)"
diff --git a/static/src/app/pub/decoration-overview/decoration-overview.component.html b/static/src/app/pub/decoration-overview/decoration-overview.component.html
index bef8fb9..1e89b2d 100644
--- a/static/src/app/pub/decoration-overview/decoration-overview.component.html
+++ b/static/src/app/pub/decoration-overview/decoration-overview.component.html
@@ -2,6 +2,8 @@
   <h1>{{'public.decorations.headline' | translate}}</h1>
 
   <div class="fraction-side-bar">
+    <div [ngClass]="{active: active === 'ARF'}" (click)="switchFraction('ARF')">{{fraction.ARF}}</div>
+    <div [ngClass]="{active: active === 'SWORD'}" (click)="switchFraction('SWORD')">{{fraction.SWORD}}</div>
     <div [ngClass]="{active: active === 'BLUFOR'}" (click)="switchFraction('BLUFOR')">{{fraction.BLUFOR}}</div>
     <div [ngClass]="{active: active === 'OPFOR'}" (click)="switchFraction('OPFOR')">{{fraction.OPFOR}}</div>
     <div [ngClass]="{active: active === 'GLOBAL'}" (click)="switchFraction('GLOBAL')">GLOBAL</div>
diff --git a/static/src/app/pub/decoration-overview/decoration-overview.component.ts b/static/src/app/pub/decoration-overview/decoration-overview.component.ts
index 1a9f236..7e74969 100644
--- a/static/src/app/pub/decoration-overview/decoration-overview.component.ts
+++ b/static/src/app/pub/decoration-overview/decoration-overview.component.ts
@@ -45,10 +45,11 @@ export class DecorationOverviewComponent implements OnInit, OnDestroy {
           }
 
           const fract = queryParams.fraction;
-          if (fract && (fract === 'BLUFOR' || fract === 'OPFOR' || fract === 'GLOBAL')) {
+          if (fract && (fract === 'ARF' || fract === 'SWORD' ||
+            fract === 'BLUFOR' || fract === 'OPFOR' || fract === 'GLOBAL')) {
             this.switchFraction(queryParams.fraction);
           } else {
-            this.switchFraction('BLUFOR');
+            this.switchFraction('ARF');
           }
         });
   };
diff --git a/static/src/app/pub/decoration-overview/decoration-panel/decoration-panel.component.html b/static/src/app/pub/decoration-overview/decoration-panel/decoration-panel.component.html
index 4886e5d..401eaf1 100644
--- a/static/src/app/pub/decoration-overview/decoration-panel/decoration-panel.component.html
+++ b/static/src/app/pub/decoration-overview/decoration-panel/decoration-panel.component.html
@@ -5,8 +5,7 @@
          [class]="decoration.isMedal ? 'img-medal' : 'img-ribbon'">
   </div>
   <mat-card-content>
-    <div [style.background]="decoration.fraction === 'BLUFOR' ?
-    fraction.COLOR_BLUFOR : decoration.fraction === 'OPFOR' ? fraction.COLOR_OPFOR : '#666666'">
+    <div [style.background]="getColor(decoration.fraction)">
       {{decoration.name}}
     </div>
     <div class="decoration-description">
diff --git a/static/src/app/pub/decoration-overview/decoration-panel/decoration-panel.component.ts b/static/src/app/pub/decoration-overview/decoration-panel/decoration-panel.component.ts
index 8d5d0eb..76740f6 100644
--- a/static/src/app/pub/decoration-overview/decoration-panel/decoration-panel.component.ts
+++ b/static/src/app/pub/decoration-overview/decoration-panel/decoration-panel.component.ts
@@ -17,6 +17,21 @@ export class DecorationPanelComponent {
 
   readonly fraction = Fraction;
 
+  private getColor(fractionKey) {
+    switch (fractionKey) {
+      case 'ARF':
+        return this.fraction.COLOR_ARF;
+      case 'SWORD':
+        return this.fraction.COLOR_SWORD;
+      case 'BLUFOR':
+        return this.fraction.COLOR_BLUFOR;
+      case 'OPFOR':
+        return this.fraction.COLOR_OPFOR;
+      default:
+        return this.fraction.COLOR_NEUTRAL;
+    }
+  }
+
   selectDecoration() {
     this.select.emit(this.decoration);
   }
diff --git a/static/src/app/pub/rank-overview/rank-overview.component.html b/static/src/app/pub/rank-overview/rank-overview.component.html
index 1e52cd1..be70e25 100644
--- a/static/src/app/pub/rank-overview/rank-overview.component.html
+++ b/static/src/app/pub/rank-overview/rank-overview.component.html
@@ -2,7 +2,7 @@
   <h1>{{'public.ranks.headline' | translate}}</h1>
 
   <div class="column-container pull-left">
-    <h3 [style.color]="fraction.COLOR_BLUFOR">{{fraction.BLUFOR}}</h3>
+    <h3 [style.color]="fraction.COLOR_ARF">{{fraction.ARF}}</h3>
 
     <table mat-table [dataSource]="ranksBlufor" class="mat-elevation-z8">
 
@@ -19,7 +19,7 @@
   </div>
 
   <div class="column-container pull-right">
-    <h3 [style.color]="fraction.COLOR_OPFOR">{{fraction.OPFOR}}</h3>
+    <h3 [style.color]="fraction.COLOR_SWORD">{{fraction.SWORD}}</h3>
 
     <table mat-table [dataSource]="ranksOpfor" class="pull-right mat-elevation-z8">
 
diff --git a/static/src/app/pub/rank-overview/rank-panel/rank-panel.component.ts b/static/src/app/pub/rank-overview/rank-panel/rank-panel.component.ts
index 2f4ed2e..699e9df 100644
--- a/static/src/app/pub/rank-overview/rank-panel/rank-panel.component.ts
+++ b/static/src/app/pub/rank-overview/rank-panel/rank-panel.component.ts
@@ -13,8 +13,6 @@ export class RankPanelComponent {
 
   @Output() select = new EventEmitter();
 
-  readonly fraction = Fraction;
-
   selectRank() {
     this.select.emit(this.rank);
   }
diff --git a/static/src/app/pub/user-list-sheet/user-list-sheet.component.html b/static/src/app/pub/user-list-sheet/user-list-sheet.component.html
index ba374aa..810eb0a 100644
--- a/static/src/app/pub/user-list-sheet/user-list-sheet.component.html
+++ b/static/src/app/pub/user-list-sheet/user-list-sheet.component.html
@@ -24,8 +24,8 @@
       <span mat-line>
         {{user.username}}
       </span>
-    <span mat-line [style.color]="user.squadId.fraction === 'BLUFOR' ? fraction.COLOR_BLUFOR :fraction.COLOR_OPFOR">
-        {{user.squadId.fraction === 'BLUFOR' ? fraction.BLUFOR : fraction.OPFOR}} - {{user.squadId.name}}
+    <span mat-line [style.color]="user.squadId.fraction === 'BLUFOR' ? fraction.COLOR_ARF :fraction.COLOR_SWORD">
+        {{user.squadId.fraction === 'BLUFOR' ? fraction.ARF : fraction.SWORD}} - {{user.squadId.name}}
       </span>
   </a>
 </mat-nav-list>
diff --git a/static/src/app/utils/fraction.enum.ts b/static/src/app/utils/fraction.enum.ts
index 9b1ff6e..b09a9ed 100644
--- a/static/src/app/utils/fraction.enum.ts
+++ b/static/src/app/utils/fraction.enum.ts
@@ -1,4 +1,8 @@
 export enum Fraction {
+  ARF = 'ARF',
+  COLOR_ARF = '#668866',
+  SWORD = 'SWORD',
+  COLOR_SWORD = '#9499a1',
   BLUFOR = 'NATO',
   OPFOR = 'CSAT',
   COLOR_BLUFOR = '#3c5fa1',
@@ -8,5 +12,6 @@ export enum Fraction {
   COLOR_OPFOR = '#a90100',
   COLOR_OPFOR_DARK = '#890F0F',
   COLOR_OPFOR_LIGHT = '#fb5555',
-  COLOR_OPFOR_GREY = '#955c5f'
+  COLOR_OPFOR_GREY = '#955c5f',
+  COLOR_NEUTRAL = "#666666",
 }