hardi
/
opt-cc
1
0
Fork 0
Code Pull Requests Releases 47 Activity

Dismiss bottom sheet on navigate (CC-56)

pull/45/head
HardiReady 2018-10-01 07:53:38 +02:00
parent d4667a0736
commit 6ab20db473
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "opt-cc", "name": "opt-cc",
"version": "1.8.1", "version": "1.8.2",
"author": "Florian Hartwich <hardi@noarch.de>", "author": "Florian Hartwich <hardi@noarch.de>",
"private": true, "private": true,
"scripts": { "scripts": {

8
static/src/app/pub/decoration-overview/decoration-overview.component.ts
View File

@ -1,4 +1,4 @@
import {Component, OnInit} from '@angular/core'; import {Component, OnDestroy, OnInit} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router'; import {ActivatedRoute, Router} from '@angular/router';
import {Fraction} from '../../utils/fraction.enum'; import {Fraction} from '../../utils/fraction.enum';
@ -14,7 +14,7 @@ import {Location} from '@angular/common';
templateUrl: './decoration-overview.component.html', templateUrl: './decoration-overview.component.html',
styleUrls: ['./decoration-overview.component.css'] styleUrls: ['./decoration-overview.component.css']
}) })
export class DecorationOverviewComponent implements OnInit { export class DecorationOverviewComponent implements OnInit, OnDestroy {
decorations: Decoration[]; decorations: Decoration[];
@ -54,6 +54,10 @@ export class DecorationOverviewComponent implements OnInit {
}); });
}; };
ngOnDestroy() {
this.bottomSheet.dismiss();
}
switchFraction(value: any) { switchFraction(value: any) {
this.medals = this.decorations.filter(d => d.fraction === value && d.isMedal); this.medals = this.decorations.filter(d => d.fraction === value && d.isMedal);
this.ribbons = this.decorations.filter(d => d.fraction === value && !d.isMedal); this.ribbons = this.decorations.filter(d => d.fraction === value && !d.isMedal);

8
static/src/app/pub/rank-overview/rank-overview.component.ts
View File

@ -1,4 +1,4 @@
import {Component, OnInit} from '@angular/core'; import {Component, OnDestroy, OnInit} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router'; import {ActivatedRoute, Router} from '@angular/router';
import {Fraction} from '../../utils/fraction.enum'; import {Fraction} from '../../utils/fraction.enum';
import {Rank} from '../../models/model-interfaces'; import {Rank} from '../../models/model-interfaces';
@ -12,7 +12,7 @@ import {UserListSheetComponent} from '../user-list-sheet/user-list-sheet.compone
templateUrl: './rank-overview.component.html', templateUrl: './rank-overview.component.html',
styleUrls: ['./rank-overview.component.css'] styleUrls: ['./rank-overview.component.css']
}) })
export class RankOverviewComponent implements OnInit { export class RankOverviewComponent implements OnInit, OnDestroy {
ranksOpfor: Rank[]; ranksOpfor: Rank[];
@ -37,6 +37,10 @@ export class RankOverviewComponent implements OnInit {
}); });
}; };
ngOnDestroy() {
this.bottomSheet.dismiss();
}
selectRow(rank: Rank) { selectRow(rank: Rank) {
this.bottomSheet.open(UserListSheetComponent, {data: {rank: rank}}); this.bottomSheet.open(UserListSheetComponent, {data: {rank: rank}});
} }