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

SES-145 Tables in GM screen are now connected to backend #67

Merged
s426128 merged 2 commits from SES-145 into dev 2021-01-12 15:55:46 +01:00
Conversation 0 Commits 2 Files Changed 12 +30 -22
3 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 11b117d85c - Show all commits

50
SessionCompanion/SessionCompanion/ClientApp/src/app/components/abilities/abilities.component.ts
View File

@ -1,38 +1,48 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {CharacterStatsViewModel} from "../../../types/viewmodels/character-viewmodels/CharacterStatsViewModel"; import { CharacterStatsViewModel } from '../../../types/viewmodels/character-viewmodels/CharacterStatsViewModel';
import {Store} from "@ngrx/store"; import { Store } from '@ngrx/store';
import {AppState} from "../../store/models/app-state.model"; import { AppState } from '../../store/models/app-state.model';
import {CharacterService} from "../../../services/character.service"; import { CharacterService } from '../../../services/character.service';
import {first} from "rxjs/operators"; import { first } from 'rxjs/operators';
import {ErrorResponse} from "../../../types/ErrorResponse"; import { ErrorResponse } from '../../../types/ErrorResponse';
import {HttpErrorResponse} from "@angular/common/http"; import { HttpErrorResponse } from '@angular/common/http';
@Component({ @Component({
selector: 'app-abilities', selector: 'app-abilities',
templateUrl: './abilities.component.html', templateUrl: './abilities.component.html',
styleUrls: ['./abilities.component.css'] styleUrls: ['./abilities.component.css'],
}) })
export class AbilitiesComponent implements OnInit { export class AbilitiesComponent implements OnInit {
characterStats: CharacterStatsViewModel[]; characterStats: CharacterStatsViewModel[];
constructor(private store: Store<AppState>, private characterService: CharacterService) {} constructor(
private store: Store<AppState>,
private characterService: CharacterService
) {}
ngOnInit() { ngOnInit() {
this.getCharacterStats(); this.getCharacterStats();
} }
getCharacterStats() { getCharacterStats() {
this.store.select( s => s.playerStore.characterId).pipe(first()).subscribe((characterId) => { this.store
this.characterService.getCharacterStats(characterId).pipe(first()).subscribe((characterStats) => { .select((s) => s.playerStore.characterId)
console.log(characterStats) .pipe(first())
this.characterStats = characterStats; .subscribe((characterId) => {
}, (error: ErrorResponse | HttpErrorResponse) => { this.characterService
if (error instanceof HttpErrorResponse) { .getCharacterStats(characterId)
error = error.error as ErrorResponse; .pipe(first())
} .subscribe(
console.error(error.message); (characterStats) => {
this.characterStats = characterStats;
},
(error: ErrorResponse | HttpErrorResponse) => {
if (error instanceof HttpErrorResponse) {
error = error.error as ErrorResponse;
}
console.error(error.message);
}
);
}); });
})
} }
} }

1
SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-armors-table/game-master-armors-table.component.ts
View File

@ -32,7 +32,6 @@ export class GameMasterArmorsTableComponent implements OnInit {
.pipe(first()) .pipe(first())
.subscribe( .subscribe(
(result) => { (result) => {
console.log(result);
this.dataSource = new MatTableDataSource(result); this.dataSource = new MatTableDataSource(result);
s426128 commented 2021-01-12 15:26:37 +01:00
Review
Copy Link

możesz usunąć console.log

możesz usunąć console.log
this.dataSource.paginator = this.paginator; this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort; this.dataSource.sort = this.sort;

1
SessionCompanion/SessionCompanion/ClientApp/src/app/components/game-master-weapons-table/game-master-weapons-table.component.ts
View File

@ -32,7 +32,6 @@ export class GameMasterWeaponsTableComponent implements OnInit {
.pipe(first()) .pipe(first())
.subscribe( .subscribe(
(result) => { (result) => {
console.log(result);
this.dataSource = new MatTableDataSource(result); this.dataSource = new MatTableDataSource(result);
s426128 commented 2021-01-12 15:26:16 +01:00
Review
Copy Link

możesz usunąć console.log

możesz usunąć console.log
this.dataSource.paginator = this.paginator; this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort; this.dataSource.sort = this.sort;