s426135/session-companion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SES-159 #78

Merged
s426128 merged 4 commits from SES-159 into dev 2021-01-20 17:53:56 +01:00
Conversation 0 Commits 4 Files Changed 12 +9 -2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b2436c7dc9 - Show all commits

11
SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-turntracker/game-master-turntracker.component.ts
View File

@ -25,7 +25,11 @@ export class GameMasterTurntrackerComponent implements OnInit, OnDestroy {
monsterId: number; monsterId: number;
}[] = []; }[] = [];
characterList: { name: string; characterId: number }[] = []; characterList: {
name: string;
characterId: number;
monsterId: number;
}[] = [];
drop(event: CdkDragDrop<any[]>) { drop(event: CdkDragDrop<any[]>) {
if (event.previousContainer === event.container) { if (event.previousContainer === event.container) {
@ -52,7 +56,9 @@ export class GameMasterTurntrackerComponent implements OnInit, OnDestroy {
.select((s) => s.gameMasterStore.turnTrackerList) .select((s) => s.gameMasterStore.turnTrackerList)
.pipe(first()) .pipe(first())
.subscribe((result) => { .subscribe((result) => {
this.turnTrackerList = result; if (result.length > 0) {
this.turnTrackerList = result;
}
this.GetLoggedCharacters(); this.GetLoggedCharacters();
}); });
} }
@ -72,6 +78,7 @@ export class GameMasterTurntrackerComponent implements OnInit, OnDestroy {
.map((e) => ({ .map((e) => ({
name: e.name, name: e.name,
characterId: e.id, characterId: e.id,
monsterId: null,
})); }));
}); });
} }