nerdfortress/crusade-tracker
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes for army-update 500 error

Browse Source
This commit is contained in:
vesem 2021-08-17 07:32:53 -04:00
parent bff4c02f97
commit 9b20145e77
4 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.sh Executable file
View File

@ -0,0 +1,10 @@
#!/bin/bash
./mvnw -ntp clean -P-webpack
./mvnw -ntp checkstyle:check
./mvnw -ntp com.github.eirslett:frontend-maven-plugin:install-node-and-npm -DnodeVersion=v12.16.1 -DnpmVersion=6.14.5
./mvnw -ntp com.github.eirslett:frontend-maven-plugin:npm
./mvnw test
./mvnw -ntp verify -P-webpack -Pprod -DskipTests
docker-compose build
#docker login -u \$doApi -p \$doApi registry.digitalocean.com
docker push registry.digitalocean.com/nerdfortress/crusadetracker

42
src/main/java/com/warhammer/domain/Army.java
View File

@ -35,14 +35,14 @@ public class Army implements Serializable {
@Column(name = "army_power_level")
private Long armyPowerLevel;
@Column(name = "army_race")
private String armyRace;
// @Column(name = "army_race")
// private String armyRace;
@Column(name = "army_points")
private Long armyPoints;
@Column(name = "codex_specific_points")
private Long codexSpecificPoints;
// @Column(name = "codex_specific_points")
// private Long codexSpecificPoints;
@Column(name = "army_points_or_pl")
private Boolean armyPointsOrPL;
@ -230,21 +230,21 @@ 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;
}
// 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) {
@ -270,12 +270,12 @@ public class Army implements Serializable {
", armyDescription='" + getArmyDescription() + "'" +
", armyName='" + getArmyName() + "'" +
", armyFaction='" + getArmyFaction() + "'" +
", armyRace='" + getArmyRace() + "'" +
// ", armyRace='" + getArmyRace() + "'" +
", armyPowerLevel=" + getArmyPowerLevel() +
", armyPoints=" + getArmyPoints() +
", armyPointsOrPL='" + isArmyPointsOrPL() + "'" +
", requisition=" + getRequisition() +
", armyCodexSpecificPoints=" + getCodexSpecificPoints() +
// ", armyCodexSpecificPoints=" + getCodexSpecificPoints() +
", battleTally=" + getBattleTally() +
", battlesWon=" + getBattlesWon() +
"}";

8
src/main/webapp/app/entities/army/army-update.component.ts
View File

@ -29,7 +29,7 @@ export class ArmyUpdateComponent implements OnInit {
armyPoints: [],
armyPointsOrPL: [],
requisition: [],
armyCodexSpecificPoints: [],
// armyCodexSpecificPoints: [],
battleTally: [],
battlesWon: [],
ownerId: [null, Validators.required],
@ -62,7 +62,7 @@ export class ArmyUpdateComponent implements OnInit {
armyPoints: army.armyPoints,
armyPointsOrPL: army.armyPointsOrPL,
requisition: army.requisition,
armyCodexSpecificPoints: army.armyCodexSpecificPoints,
// armyCodexSpecificPoints: army.armyCodexSpecificPoints,
battleTally: army.battleTally,
battlesWon: army.battlesWon,
ownerId: army.ownerId,
@ -106,12 +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,
// 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,
// armyCodexSpecificPoints: this.editForm.get(['armyCodexSpecificPoints'])!.value,
battleTally: this.editForm.get(['battleTally'])!.value,
battlesWon: this.editForm.get(['battlesWon'])!.value,
ownerId: this.editForm.get(['ownerId'])!.value,

8
src/main/webapp/app/shared/model/army.model.ts
View File

@ -5,12 +5,12 @@ export interface IArmy {
armyDescription?: any;
armyName?: string;
armyFaction?: string;
armyRace?: string;
// armyRace?: string;
armyPowerLevel?: number;
armyPoints?: number;
armyPointsOrPL?: boolean;
requisition?: number;
armyCodexSpecificPoints?: number;
// armyCodexSpecificPoints?: number;
battleTally?: number;
battlesWon?: number;
ownerLogin?: string;
@ -24,14 +24,14 @@ export class Army implements IArmy {
public armyDescription?: any,
public armyName?: string,
public armyFaction?: string,
public armyRace?: 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 armyCodexSpecificPoints?: number,
public battleTally?: number,
public battlesWon?: number,
public units?: IUnitArmy[]