From 884446e0314b4cdb6c2b70b29e3391f4fb0b57af Mon Sep 17 00:00:00 2001 From: vesem Date: Tue, 10 Aug 2021 17:33:43 -0400 Subject: [PATCH] local commit --- src/main/java/com/warhammer/domain/Army.java | 29 +++++++++-- .../java/com/warhammer/enums/ArmyRaces.java | 52 +++++++++++++++++++ .../com/warhammer/web/rest/ArmyResource.java | 5 +- .../20210808083300_add_codex_points.xml | 22 ++++++++ .../20210808130500_add_army_race.xml | 22 ++++++++ .../resources/config/liquibase/master.xml | 2 + .../entities/army/army-update.component.ts | 4 ++ .../app/entities/force/force.component.html | 2 +- .../app/entities/force/force.component.ts | 19 ++++++- .../webapp/app/shared/model/army.model.ts | 4 ++ 10 files changed, 151 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/warhammer/enums/ArmyRaces.java create mode 100644 src/main/resources/config/liquibase/changelog/20210808083300_add_codex_points.xml create mode 100644 src/main/resources/config/liquibase/changelog/20210808130500_add_army_race.xml diff --git a/src/main/java/com/warhammer/domain/Army.java b/src/main/java/com/warhammer/domain/Army.java index beab4258..6b07ae1a 100644 --- a/src/main/java/com/warhammer/domain/Army.java +++ b/src/main/java/com/warhammer/domain/Army.java @@ -1,12 +1,9 @@ package com.warhammer.domain; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; import javax.persistence.*; -import javax.validation.constraints.*; - +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.HashSet; import java.util.Set; @@ -38,9 +35,15 @@ public class Army implements Serializable { @Column(name = "army_power_level") private Long armyPowerLevel; + @Column(name = "army_race") + private String armyRace; + @Column(name = "army_points") private Long armyPoints; + @Column(name = "codex_specific_points") + private Long codexSpecificPoints; + @Column(name = "army_points_or_pl") private Boolean armyPointsOrPL; @@ -227,6 +230,22 @@ public class Army implements Serializable { this.battlesWon = battlesWon; } + public Long getCodexSpecificPoints() { + return codexSpecificPoints; + } + + public void setCodexSpecificPoints(Long codexSpecificPoints) { + this.codexSpecificPoints = codexSpecificPoints; + } + + public String getArmyRace() { + return armyRace; + } + + public void setArmyRace(String armyRace) { + this.armyRace = armyRace; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -251,10 +270,12 @@ public class Army implements Serializable { ", armyDescription='" + getArmyDescription() + "'" + ", armyName='" + getArmyName() + "'" + ", armyFaction='" + getArmyFaction() + "'" + + ", armyRace='" + getArmyRace() + "'" + ", armyPowerLevel=" + getArmyPowerLevel() + ", armyPoints=" + getArmyPoints() + ", armyPointsOrPL='" + isArmyPointsOrPL() + "'" + ", requisition=" + getRequisition() + + ", armyCodexSpecificPoints=" + getCodexSpecificPoints() + ", battleTally=" + getBattleTally() + ", battlesWon=" + getBattlesWon() + "}"; diff --git a/src/main/java/com/warhammer/enums/ArmyRaces.java b/src/main/java/com/warhammer/enums/ArmyRaces.java new file mode 100644 index 00000000..870fda41 --- /dev/null +++ b/src/main/java/com/warhammer/enums/ArmyRaces.java @@ -0,0 +1,52 @@ +package com.warhammer.enums; + +import java.util.Arrays; +import java.util.List; + +public enum ArmyRaces { + ADEPTUS_ASTARTES("Space Marines", Arrays.asList("".split(","))), + GREY_KNIGHTS("Grey Knights", Arrays.asList("True Name Points".split(","))), + ADEPTAS_SORORITAS("Sisters of Battle", Arrays.asList("Saint Points, Martyr Points".split(","))), + ADEPTUS_CUSTODES("Custodians", Arrays.asList("".split(","))), + ADEPTUS_MECHANICUS("AdMech", Arrays.asList("Archeotech Parts".split(","))), + ASTRA_MILITARUM("Imperial Guard", Arrays.asList("".split(","))), + IMPERIAL_KNIGHTS("Imperial Knights", Arrays.asList("".split(","))), + CHAOS_DAEMONS("Daemons", Arrays.asList("".split(","))), + CHAOS_KNIGHTS("Chaos Knights", Arrays.asList("".split(","))), + CHAOS_SPACE_MARINES("Chaos Space Marines", Arrays.asList("".split(","))), + DEATH_GUARD("Death Guard", Arrays.asList("Virulence Points".split(","))), + THOUSAND_SONS("Thousand Sons", Arrays.asList("".split(","))), + CRAFTWORLDS("Eldaar", Arrays.asList("".split(","))), + DRUKHARI("Dark Eldaar", Arrays.asList("".split(","))), + YNNARI("Ynnari", Arrays.asList("".split(","))), + HARLEQUINS("Harlequins", Arrays.asList("".split(","))), + GENESTEALERS("Genestealers", Arrays.asList("".split(","))), + NECRONS("Necons", Arrays.asList("".split(","))), + ORKS("Orks", Arrays.asList("".split(","))), + TAU("Tau", Arrays.asList("".split(","))), + TYRANIDS("Tyranids", Arrays.asList("".split(","))); + + private String armyCommonName; + private List armyCodexSpecificPointName; + + ArmyRaces(String armyCommonName, List armyCodexSpecificPointName) { + this.armyCommonName = armyCommonName; + this.armyCodexSpecificPointName = armyCodexSpecificPointName; + } + + public String getArmyCommonName() { + return armyCommonName; + } + + public List getArmyCodexSpecificPointName() { + return armyCodexSpecificPointName; + } + + @Override + public String toString() { + return "ArmyRaces{" + + "armyCommonName='" + armyCommonName + '\'' + + ", armyCodexSpecificPointName=" + armyCodexSpecificPointName + + '}'; + } +} diff --git a/src/main/java/com/warhammer/web/rest/ArmyResource.java b/src/main/java/com/warhammer/web/rest/ArmyResource.java index 73747328..df8972b1 100644 --- a/src/main/java/com/warhammer/web/rest/ArmyResource.java +++ b/src/main/java/com/warhammer/web/rest/ArmyResource.java @@ -3,19 +3,16 @@ package com.warhammer.web.rest; import com.warhammer.domain.UnitArmy; import com.warhammer.security.SecurityUtils; import com.warhammer.service.ArmyService; -import com.warhammer.web.rest.errors.BadRequestAlertException; import com.warhammer.service.dto.ArmyDTO; - +import com.warhammer.web.rest.errors.BadRequestAlertException; import io.github.jhipster.web.util.HeaderUtil; import io.github.jhipster.web.util.ResponseUtil; -import org.checkerframework.checker.nullness.Opt; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import javax.swing.text.html.Option; import javax.validation.Valid; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/main/resources/config/liquibase/changelog/20210808083300_add_codex_points.xml b/src/main/resources/config/liquibase/changelog/20210808083300_add_codex_points.xml new file mode 100644 index 00000000..b09e2c1f --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20210808083300_add_codex_points.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/changelog/20210808130500_add_army_race.xml b/src/main/resources/config/liquibase/changelog/20210808130500_add_army_race.xml new file mode 100644 index 00000000..6e65aaa1 --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20210808130500_add_army_race.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index b21ffdc8..2534f1e9 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -21,6 +21,8 @@ + + diff --git a/src/main/webapp/app/entities/army/army-update.component.ts b/src/main/webapp/app/entities/army/army-update.component.ts index 0e286b2c..675d54f0 100644 --- a/src/main/webapp/app/entities/army/army-update.component.ts +++ b/src/main/webapp/app/entities/army/army-update.component.ts @@ -29,6 +29,7 @@ export class ArmyUpdateComponent implements OnInit { armyPoints: [], armyPointsOrPL: [], requisition: [], + armyCodexSpecificPoints: [], battleTally: [], battlesWon: [], ownerId: [null, Validators.required], @@ -61,6 +62,7 @@ export class ArmyUpdateComponent implements OnInit { armyPoints: army.armyPoints, armyPointsOrPL: army.armyPointsOrPL, requisition: army.requisition, + armyCodexSpecificPoints: army.armyCodexSpecificPoints, battleTally: army.battleTally, battlesWon: army.battlesWon, ownerId: army.ownerId, @@ -104,10 +106,12 @@ export class ArmyUpdateComponent implements OnInit { armyDescription: this.editForm.get(['armyDescription'])!.value, armyName: this.editForm.get(['armyName'])!.value, armyFaction: this.editForm.get(['armyFaction'])!.value, + armyRace: this.editForm.get(['armyRace'])!.value, armyPowerLevel: this.editForm.get(['armyPowerLevel'])!.value, armyPoints: this.editForm.get(['armyPoints'])!.value, armyPointsOrPL: this.editForm.get(['armyPointsOrPL'])!.value, requisition: this.editForm.get(['requisition'])!.value, + armyCodexSpecificPoints: this.editForm.get(['armyCodexSpecificPoints'])!.value, battleTally: this.editForm.get(['battleTally'])!.value, battlesWon: this.editForm.get(['battlesWon'])!.value, ownerId: this.editForm.get(['ownerId'])!.value, diff --git a/src/main/webapp/app/entities/force/force.component.html b/src/main/webapp/app/entities/force/force.component.html index ead69c6f..5bbb3b5d 100644 --- a/src/main/webapp/app/entities/force/force.component.html +++ b/src/main/webapp/app/entities/force/force.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/main/webapp/app/entities/force/force.component.ts b/src/main/webapp/app/entities/force/force.component.ts index 876082c1..313b54a7 100644 --- a/src/main/webapp/app/entities/force/force.component.ts +++ b/src/main/webapp/app/entities/force/force.component.ts @@ -16,10 +16,12 @@ export class ForceComponent implements OnInit { public forceList: number[]; Iunits?: IUnitArmy[]; units?: UnitArmy[] | null; + localUnits: IUnitArmy[] | []; constructor(protected dataUtils: JhiDataUtils, protected activatedRoute: ActivatedRoute, protected unitArmyService: UnitArmyService) { const localStorageList = localStorage.getItem('forceAddedListStored'); this.forceList = localStorageList ? JSON.parse(localStorageList) : []; + this.localUnits = []; } ngOnInit(): void { @@ -28,7 +30,22 @@ export class ForceComponent implements OnInit { loadAll(): void { for (let lookupUnitId of this.forceList) { - this.unitArmyService.query(lookupUnitId).subscribe((res: HttpResponse) => (this.units = res.body)); + // @ts-ignore + this.unitArmyService.find(lookupUnitId).subscribe((res: HttpResponse) => (this.localUnits?.push(res.body))); + // this.unitArmyService.query(lookupUnitId).subscribe((res: HttpResponse) => (this.units = res.body)); + // console.log(this.units.)) + // console.log(lookupUnitId) + // console.log(this.units) + // this.unitArmyService.query(lookupUnitId).subscribe((res: HttpResponse) => (console.log(res.body))); + //this.units is full list of units + // @ts-ignore + // for (const _unit of this.units) { + // console.log(_unit.id) + // console.log(lookupUnitId) + // if (_unit.id === lookupUnitId) { + // this.localUnits.push(_unit); + // } + // } lookupUnitId = 1; } } diff --git a/src/main/webapp/app/shared/model/army.model.ts b/src/main/webapp/app/shared/model/army.model.ts index d074bf16..1f1c4bf2 100644 --- a/src/main/webapp/app/shared/model/army.model.ts +++ b/src/main/webapp/app/shared/model/army.model.ts @@ -5,10 +5,12 @@ export interface IArmy { armyDescription?: any; armyName?: string; armyFaction?: string; + armyRace?: string; armyPowerLevel?: number; armyPoints?: number; armyPointsOrPL?: boolean; requisition?: number; + armyCodexSpecificPoints?: number; battleTally?: number; battlesWon?: number; ownerLogin?: string; @@ -22,12 +24,14 @@ export class Army implements IArmy { public armyDescription?: any, public armyName?: string, public armyFaction?: string, + public armyRace?: string, public armyPowerLevel?: number, public armyPoints?: number, public armyPointsOrPL?: boolean, public ownerId?: number, public ownerLogin?: string, public requisition?: number, + public armyCodexSpecificPoints?: number, public battleTally?: number, public battlesWon?: number, public units?: IUnitArmy[]