fixes for army-update 500 error
This commit is contained in:
parent
bff4c02f97
commit
9b20145e77
10
build.sh
Executable file
10
build.sh
Executable 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
|
@ -35,14 +35,14 @@ public class Army implements Serializable {
|
|||||||
@Column(name = "army_power_level")
|
@Column(name = "army_power_level")
|
||||||
private Long armyPowerLevel;
|
private Long armyPowerLevel;
|
||||||
|
|
||||||
@Column(name = "army_race")
|
// @Column(name = "army_race")
|
||||||
private String armyRace;
|
// private String armyRace;
|
||||||
|
|
||||||
@Column(name = "army_points")
|
@Column(name = "army_points")
|
||||||
private Long armyPoints;
|
private Long armyPoints;
|
||||||
|
|
||||||
@Column(name = "codex_specific_points")
|
// @Column(name = "codex_specific_points")
|
||||||
private Long codexSpecificPoints;
|
// private Long codexSpecificPoints;
|
||||||
|
|
||||||
@Column(name = "army_points_or_pl")
|
@Column(name = "army_points_or_pl")
|
||||||
private Boolean armyPointsOrPL;
|
private Boolean armyPointsOrPL;
|
||||||
@ -230,21 +230,21 @@ public class Army implements Serializable {
|
|||||||
this.battlesWon = battlesWon;
|
this.battlesWon = battlesWon;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getCodexSpecificPoints() {
|
// public Long getCodexSpecificPoints() {
|
||||||
return codexSpecificPoints;
|
// return codexSpecificPoints;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
public void setCodexSpecificPoints(Long codexSpecificPoints) {
|
// public void setCodexSpecificPoints(Long codexSpecificPoints) {
|
||||||
this.codexSpecificPoints = codexSpecificPoints;
|
// this.codexSpecificPoints = codexSpecificPoints;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
public String getArmyRace() {
|
// public String getArmyRace() {
|
||||||
return armyRace;
|
// return armyRace;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
public void setArmyRace(String armyRace) {
|
// public void setArmyRace(String armyRace) {
|
||||||
this.armyRace = armyRace;
|
// this.armyRace = armyRace;
|
||||||
}
|
// }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals(Object o) {
|
public boolean equals(Object o) {
|
||||||
@ -270,12 +270,12 @@ public class Army implements Serializable {
|
|||||||
", armyDescription='" + getArmyDescription() + "'" +
|
", armyDescription='" + getArmyDescription() + "'" +
|
||||||
", armyName='" + getArmyName() + "'" +
|
", armyName='" + getArmyName() + "'" +
|
||||||
", armyFaction='" + getArmyFaction() + "'" +
|
", armyFaction='" + getArmyFaction() + "'" +
|
||||||
", armyRace='" + getArmyRace() + "'" +
|
// ", armyRace='" + getArmyRace() + "'" +
|
||||||
", armyPowerLevel=" + getArmyPowerLevel() +
|
", armyPowerLevel=" + getArmyPowerLevel() +
|
||||||
", armyPoints=" + getArmyPoints() +
|
", armyPoints=" + getArmyPoints() +
|
||||||
", armyPointsOrPL='" + isArmyPointsOrPL() + "'" +
|
", armyPointsOrPL='" + isArmyPointsOrPL() + "'" +
|
||||||
", requisition=" + getRequisition() +
|
", requisition=" + getRequisition() +
|
||||||
", armyCodexSpecificPoints=" + getCodexSpecificPoints() +
|
// ", armyCodexSpecificPoints=" + getCodexSpecificPoints() +
|
||||||
", battleTally=" + getBattleTally() +
|
", battleTally=" + getBattleTally() +
|
||||||
", battlesWon=" + getBattlesWon() +
|
", battlesWon=" + getBattlesWon() +
|
||||||
"}";
|
"}";
|
||||||
|
@ -29,7 +29,7 @@ export class ArmyUpdateComponent implements OnInit {
|
|||||||
armyPoints: [],
|
armyPoints: [],
|
||||||
armyPointsOrPL: [],
|
armyPointsOrPL: [],
|
||||||
requisition: [],
|
requisition: [],
|
||||||
armyCodexSpecificPoints: [],
|
// armyCodexSpecificPoints: [],
|
||||||
battleTally: [],
|
battleTally: [],
|
||||||
battlesWon: [],
|
battlesWon: [],
|
||||||
ownerId: [null, Validators.required],
|
ownerId: [null, Validators.required],
|
||||||
@ -62,7 +62,7 @@ export class ArmyUpdateComponent implements OnInit {
|
|||||||
armyPoints: army.armyPoints,
|
armyPoints: army.armyPoints,
|
||||||
armyPointsOrPL: army.armyPointsOrPL,
|
armyPointsOrPL: army.armyPointsOrPL,
|
||||||
requisition: army.requisition,
|
requisition: army.requisition,
|
||||||
armyCodexSpecificPoints: army.armyCodexSpecificPoints,
|
// armyCodexSpecificPoints: army.armyCodexSpecificPoints,
|
||||||
battleTally: army.battleTally,
|
battleTally: army.battleTally,
|
||||||
battlesWon: army.battlesWon,
|
battlesWon: army.battlesWon,
|
||||||
ownerId: army.ownerId,
|
ownerId: army.ownerId,
|
||||||
@ -106,12 +106,12 @@ export class ArmyUpdateComponent implements OnInit {
|
|||||||
armyDescription: this.editForm.get(['armyDescription'])!.value,
|
armyDescription: this.editForm.get(['armyDescription'])!.value,
|
||||||
armyName: this.editForm.get(['armyName'])!.value,
|
armyName: this.editForm.get(['armyName'])!.value,
|
||||||
armyFaction: this.editForm.get(['armyFaction'])!.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,
|
armyPowerLevel: this.editForm.get(['armyPowerLevel'])!.value,
|
||||||
armyPoints: this.editForm.get(['armyPoints'])!.value,
|
armyPoints: this.editForm.get(['armyPoints'])!.value,
|
||||||
armyPointsOrPL: this.editForm.get(['armyPointsOrPL'])!.value,
|
armyPointsOrPL: this.editForm.get(['armyPointsOrPL'])!.value,
|
||||||
requisition: this.editForm.get(['requisition'])!.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,
|
battleTally: this.editForm.get(['battleTally'])!.value,
|
||||||
battlesWon: this.editForm.get(['battlesWon'])!.value,
|
battlesWon: this.editForm.get(['battlesWon'])!.value,
|
||||||
ownerId: this.editForm.get(['ownerId'])!.value,
|
ownerId: this.editForm.get(['ownerId'])!.value,
|
||||||
|
@ -5,12 +5,12 @@ export interface IArmy {
|
|||||||
armyDescription?: any;
|
armyDescription?: any;
|
||||||
armyName?: string;
|
armyName?: string;
|
||||||
armyFaction?: string;
|
armyFaction?: string;
|
||||||
armyRace?: string;
|
// armyRace?: string;
|
||||||
armyPowerLevel?: number;
|
armyPowerLevel?: number;
|
||||||
armyPoints?: number;
|
armyPoints?: number;
|
||||||
armyPointsOrPL?: boolean;
|
armyPointsOrPL?: boolean;
|
||||||
requisition?: number;
|
requisition?: number;
|
||||||
armyCodexSpecificPoints?: number;
|
// armyCodexSpecificPoints?: number;
|
||||||
battleTally?: number;
|
battleTally?: number;
|
||||||
battlesWon?: number;
|
battlesWon?: number;
|
||||||
ownerLogin?: string;
|
ownerLogin?: string;
|
||||||
@ -24,14 +24,14 @@ export class Army implements IArmy {
|
|||||||
public armyDescription?: any,
|
public armyDescription?: any,
|
||||||
public armyName?: string,
|
public armyName?: string,
|
||||||
public armyFaction?: string,
|
public armyFaction?: string,
|
||||||
public armyRace?: string,
|
// public armyRace?: string,
|
||||||
public armyPowerLevel?: number,
|
public armyPowerLevel?: number,
|
||||||
public armyPoints?: number,
|
public armyPoints?: number,
|
||||||
public armyPointsOrPL?: boolean,
|
public armyPointsOrPL?: boolean,
|
||||||
public ownerId?: number,
|
public ownerId?: number,
|
||||||
public ownerLogin?: string,
|
public ownerLogin?: string,
|
||||||
public requisition?: number,
|
public requisition?: number,
|
||||||
public armyCodexSpecificPoints?: number,
|
// public armyCodexSpecificPoints?: number,
|
||||||
public battleTally?: number,
|
public battleTally?: number,
|
||||||
public battlesWon?: number,
|
public battlesWon?: number,
|
||||||
public units?: IUnitArmy[]
|
public units?: IUnitArmy[]
|
||||||
|
Loading…
Reference in New Issue
Block a user