diff --git a/static/src/app/models/model-interfaces.ts b/static/src/app/models/model-interfaces.ts index 45e3146..3aadd33 100644 --- a/static/src/app/models/model-interfaces.ts +++ b/static/src/app/models/model-interfaces.ts @@ -60,8 +60,8 @@ export interface War { endDate?: string; ptBlufor?: number; ptOpfor?: number; - fractionMappingBlufor?: Fraction.SWORD | Fraction.ARF | "BLUFOR" | "OPFOR"; - fractionMappingOpfor?: Fraction.SWORD | Fraction.ARF | "BLUFOR" | "OPFOR"; + fractionMappingBlufor?: Fraction.SWORD | Fraction.ARF | 'BLUFOR' | 'OPFOR'; + fractionMappingOpfor?: Fraction.SWORD | Fraction.ARF | 'BLUFOR' | 'OPFOR'; playersBlufor?: number; playersOpfor?: number; budgetBlufor?: number; diff --git a/static/src/app/statistic/war/fraction-stats/fraction-stats.component.ts b/static/src/app/statistic/war/fraction-stats/fraction-stats.component.ts index 4b203b9..493ef30 100644 --- a/static/src/app/statistic/war/fraction-stats/fraction-stats.component.ts +++ b/static/src/app/statistic/war/fraction-stats/fraction-stats.component.ts @@ -75,18 +75,18 @@ export class FractionStatsComponent implements OnInit, OnChanges { ngOnChanges(changes: SimpleChanges) { if (changes.war || changes.logData) { - this.fractionNameBlufor = FractionHelpers.getFractionName(this.war, "BLUFOR"); - this.fractionNameOpfor = FractionHelpers.getFractionName(this.war, "OPFOR"); + this.fractionNameBlufor = FractionHelpers.getFractionName(this.war, 'BLUFOR'); + this.fractionNameOpfor = FractionHelpers.getFractionName(this.war, 'OPFOR'); this.colorScheme = { domain: [ - FractionHelpers.getFractionColor(this.war, "BLUFOR"), - FractionHelpers.getFractionColor(this.war, "OPFOR"), - FractionHelpers.getFractionColor(this.war, "BLUFOR", 'LIGHT'), - FractionHelpers.getFractionColor(this.war, "OPFOR", 'LIGHT'), - FractionHelpers.getFractionColor(this.war, "BLUFOR", 'DARK'), - FractionHelpers.getFractionColor(this.war, "OPFOR", 'DARK'), - FractionHelpers.getFractionColor(this.war, "BLUFOR", 'GREY'), - FractionHelpers.getFractionColor(this.war, "OPFOR", 'GREY'), + FractionHelpers.getFractionColor(this.war, 'BLUFOR'), + FractionHelpers.getFractionColor(this.war, 'OPFOR'), + FractionHelpers.getFractionColor(this.war, 'BLUFOR', 'LIGHT'), + FractionHelpers.getFractionColor(this.war, 'OPFOR', 'LIGHT'), + FractionHelpers.getFractionColor(this.war, 'BLUFOR', 'DARK'), + FractionHelpers.getFractionColor(this.war, 'OPFOR', 'DARK'), + FractionHelpers.getFractionColor(this.war, 'BLUFOR', 'GREY'), + FractionHelpers.getFractionColor(this.war, 'OPFOR', 'GREY'), ] }; diff --git a/static/src/app/utils/global.helpers.ts b/static/src/app/utils/global.helpers.ts index 2c470d6..9f8c8cf 100644 --- a/static/src/app/utils/global.helpers.ts +++ b/static/src/app/utils/global.helpers.ts @@ -26,7 +26,7 @@ export const FractionHelpers = { default: return Fraction.COLOR_ARF; } - case "BLUFOR": + case 'BLUFOR': switch (style) { case 'LIGHT': return Fraction.COLOR_BLUFOR_LIGHT; @@ -37,7 +37,7 @@ export const FractionHelpers = { default: return Fraction.COLOR_BLUFOR; } - case "OPFOR": + case 'OPFOR': switch (style) { case 'LIGHT': return Fraction.COLOR_OPFOR_LIGHT; @@ -66,9 +66,9 @@ export const FractionHelpers = { switch (fraction === 'BLUFOR' ? war.fractionMappingBlufor : war.fractionMappingOpfor) { case Fraction.ARF: return Fraction.COLOR_ARF; - case "BLUFOR": + case 'BLUFOR': return Fraction.COLOR_BLUFOR; - case "OPFOR": + case 'OPFOR': return Fraction.COLOR_OPFOR; case Fraction.SWORD: return Fraction.COLOR_SWORD; @@ -79,9 +79,9 @@ export const FractionHelpers = { switch (fraction === 'BLUFOR' ? war.fractionMappingBlufor : war.fractionMappingOpfor) { case Fraction.ARF: return Fraction.ARF; - case "BLUFOR": + case 'BLUFOR': return Fraction.BLUFOR; - case "OPFOR": + case 'OPFOR': return Fraction.OPFOR; case Fraction.SWORD: return Fraction.SWORD;