From a7f9821a389e7ba747d6dab2249d645fd85be066 Mon Sep 17 00:00:00 2001 From: Florian Hartwich Date: Sun, 8 Oct 2017 18:13:20 +0200 Subject: [PATCH] Replace fraction filter radio buttons with ngx-bootstrap radio --- .../decoration-list.component.html | 38 ++++--------------- .../decoration-list.component.ts | 8 ++-- .../src/app/decorations/decoration.module.ts | 3 +- .../edit-decoration.component.html | 2 +- .../ranks/rank-list/rank-list.component.html | 32 ++++------------ .../ranks/rank-list/rank-list.component.ts | 8 ++-- static/src/app/ranks/ranks.module.ts | 3 +- .../squad-list/squad-list.component.css | 5 --- .../squad-list/squad-list.component.html | 32 ++++------------ .../squads/squad-list/squad-list.component.ts | 8 ++-- static/src/app/squads/squads.module.ts | 3 +- .../users/user-list/user-list.component.html | 38 ++++--------------- .../users/user-list/user-list.component.ts | 8 ++-- static/src/app/users/users.module.ts | 7 ++-- static/src/app/users/users.routing.ts | 2 +- 15 files changed, 59 insertions(+), 138 deletions(-) diff --git a/static/src/app/decorations/decoration-list/decoration-list.component.html b/static/src/app/decorations/decoration-list/decoration-list.component.html index f06c42b..87f24a8 100644 --- a/static/src/app/decorations/decoration-list/decoration-list.component.html +++ b/static/src/app/decorations/decoration-list/decoration-list.component.html @@ -1,43 +1,21 @@
- - - -
- - - Auszeichnung hinzufügen - +
+ + + +
+ +
diff --git a/static/src/app/decorations/decoration-list/decoration-list.component.ts b/static/src/app/decorations/decoration-list/decoration-list.component.ts index fbb9999..0578845 100644 --- a/static/src/app/decorations/decoration-list/decoration-list.component.ts +++ b/static/src/app/decorations/decoration-list/decoration-list.component.ts @@ -20,7 +20,7 @@ export class DecorationListComponent implements OnInit { searchTerm = new FormControl(); - fractionRadioSelect: string; + public radioModel: string; constructor(private decorationService: DecorationService, private router: Router, @@ -42,7 +42,7 @@ export class DecorationListComponent implements OnInit { Observable.merge(paramsStream, searchTermStream) .distinctUntilChanged() - .switchMap(query => this.decorationService.findDecorations(query, this.fractionRadioSelect)) + .switchMap(query => this.decorationService.findDecorations(query, this.radioModel)) .subscribe(); } @@ -69,8 +69,8 @@ export class DecorationListComponent implements OnInit { } } - filterDecorations(query, fractionFilter) { - this.decorations$ = this.decorationService.findDecorations(query, fractionFilter); + filterDecorations() { + this.decorations$ = this.decorationService.findDecorations(this.searchTerm.value, this.radioModel); } adjustBrowserUrl(queryString = '') { diff --git a/static/src/app/decorations/decoration.module.ts b/static/src/app/decorations/decoration.module.ts index 249a929..2e5b5f4 100644 --- a/static/src/app/decorations/decoration.module.ts +++ b/static/src/app/decorations/decoration.module.ts @@ -4,10 +4,11 @@ import {CommonModule} from "@angular/common"; import {DecorationStore} from "../services/stores/decoration.store"; import {DecorationService} from "../services/decoration-service/decoration.service"; import {NgModule} from "@angular/core"; +import {ButtonsModule} from "ngx-bootstrap"; @NgModule({ declarations: decorationsRoutingComponents, - imports: [CommonModule, SharedModule, decorationRoutesModule], + imports: [CommonModule, SharedModule, ButtonsModule.forRoot(), decorationRoutesModule], providers: [DecorationStore, DecorationService] }) export class DecorationsModule { diff --git a/static/src/app/decorations/edit-decoration/edit-decoration.component.html b/static/src/app/decorations/edit-decoration/edit-decoration.component.html index d148c9a..12e84e8 100644 --- a/static/src/app/decorations/edit-decoration/edit-decoration.component.html +++ b/static/src/app/decorations/edit-decoration/edit-decoration.component.html @@ -1,6 +1,6 @@

Auszeichnung editieren

-

Neuen Auszeichnung hinzufügen

+

Neue Auszeichnung hinzufügen

diff --git a/static/src/app/ranks/rank-list/rank-list.component.html b/static/src/app/ranks/rank-list/rank-list.component.html index 3d46d08..a6bce4c 100644 --- a/static/src/app/ranks/rank-list/rank-list.component.html +++ b/static/src/app/ranks/rank-list/rank-list.component.html @@ -1,38 +1,20 @@
- - - - - - - Rang hinzufügen - +
+ + +
+ +
diff --git a/static/src/app/ranks/rank-list/rank-list.component.ts b/static/src/app/ranks/rank-list/rank-list.component.ts index 74a06ab..8d2a299 100644 --- a/static/src/app/ranks/rank-list/rank-list.component.ts +++ b/static/src/app/ranks/rank-list/rank-list.component.ts @@ -20,7 +20,7 @@ export class RankListComponent implements OnInit { searchTerm = new FormControl(); - fractionRadioSelect: string; + public radioModel: string; constructor(private rankService: RankService, private router: Router, @@ -42,7 +42,7 @@ export class RankListComponent implements OnInit { Observable.merge(paramsStream, searchTermStream) .distinctUntilChanged() - .switchMap(query => this.rankService.findRanks(query, this.fractionRadioSelect)) + .switchMap(query => this.rankService.findRanks(query, this.radioModel)) .subscribe(); } @@ -57,8 +57,8 @@ export class RankListComponent implements OnInit { this.router.navigate([{outlets: {'right': ['edit', rankId]}}], {relativeTo: this.route}); } - filterRanks(query, fractionFilter) { - this.ranks$ = this.rankService.findRanks(query, fractionFilter); + filterRanks() { + this.ranks$ = this.rankService.findRanks(this.searchTerm.value, this.radioModel); } deleteRank(rank) { diff --git a/static/src/app/ranks/ranks.module.ts b/static/src/app/ranks/ranks.module.ts index d13be6f..5b34d04 100644 --- a/static/src/app/ranks/ranks.module.ts +++ b/static/src/app/ranks/ranks.module.ts @@ -4,10 +4,11 @@ import {SharedModule} from "../shared.module"; import {CommonModule} from "@angular/common"; import {RankService} from "../services/rank-service/rank.service"; import {RankStore} from "../services/stores/rank.store"; +import {ButtonsModule} from "ngx-bootstrap"; @NgModule({ declarations: ranksRoutingComponents, - imports: [CommonModule, SharedModule, rankRouterModule], + imports: [CommonModule, SharedModule, ButtonsModule.forRoot(), rankRouterModule], providers: [RankStore, RankService] }) export class RanksModule { diff --git a/static/src/app/squads/squad-list/squad-list.component.css b/static/src/app/squads/squad-list/squad-list.component.css index dcc99a1..2a43205 100644 --- a/static/src/app/squads/squad-list/squad-list.component.css +++ b/static/src/app/squads/squad-list/squad-list.component.css @@ -1,8 +1,3 @@ .search-bar { - padding-top: 20px; padding-bottom: 20px; } - -.squad-list { - width: 100%; -} diff --git a/static/src/app/squads/squad-list/squad-list.component.html b/static/src/app/squads/squad-list/squad-list.component.html index 470ce78..a965dd7 100644 --- a/static/src/app/squads/squad-list/squad-list.component.html +++ b/static/src/app/squads/squad-list/squad-list.component.html @@ -1,36 +1,20 @@
- - - - - Squad hinzufügen - +
+ + +
+ +
-
+
diff --git a/static/src/app/squads/squad-list/squad-list.component.ts b/static/src/app/squads/squad-list/squad-list.component.ts index 9ab1c20..12fd6ec 100644 --- a/static/src/app/squads/squad-list/squad-list.component.ts +++ b/static/src/app/squads/squad-list/squad-list.component.ts @@ -20,7 +20,7 @@ export class SquadListComponent implements OnInit { searchTerm = new FormControl(); - fractionRadioSelect: string; + public radioModel: string; constructor(private squadService: SquadService, private router: Router, @@ -42,7 +42,7 @@ export class SquadListComponent implements OnInit { Observable.merge(paramsStream, searchTermStream) .distinctUntilChanged() - .switchMap(query => this.squadService.findSquads(query, this.fractionRadioSelect)) + .switchMap(query => this.squadService.findSquads(query, this.radioModel)) .subscribe(); } @@ -66,8 +66,8 @@ export class SquadListComponent implements OnInit { } } - filterSquads(query = '', fractionFilter) { - this.squads$ = this.squadService.findSquads(query, fractionFilter); + filterSquads() { + this.squads$ = this.squadService.findSquads(this.searchTerm.value, this.radioModel); } adjustBrowserUrl(queryString = '') { diff --git a/static/src/app/squads/squads.module.ts b/static/src/app/squads/squads.module.ts index dff17fa..41c63b7 100644 --- a/static/src/app/squads/squads.module.ts +++ b/static/src/app/squads/squads.module.ts @@ -4,10 +4,11 @@ import {SharedModule} from "../shared.module"; import {squadRouterModule, squadsRoutingComponents} from "./squads.routing"; import {SquadStore} from "../services/stores/squad.store"; import {SquadService} from "../services/squad-service/squad.service"; +import {ButtonsModule} from "ngx-bootstrap"; @NgModule({ declarations: squadsRoutingComponents, - imports: [CommonModule, SharedModule, squadRouterModule], + imports: [CommonModule, SharedModule, ButtonsModule.forRoot(), squadRouterModule], providers: [SquadStore, SquadService] }) export class SquadsModule { diff --git a/static/src/app/users/user-list/user-list.component.html b/static/src/app/users/user-list/user-list.component.html index 043bff7..89fd620 100644 --- a/static/src/app/users/user-list/user-list.component.html +++ b/static/src/app/users/user-list/user-list.component.html @@ -1,43 +1,21 @@
- - - -
- - - Teilnehmer hinzufügen - +
+ + + +
+ +
diff --git a/static/src/app/users/user-list/user-list.component.ts b/static/src/app/users/user-list/user-list.component.ts index 0140cba..00830f9 100644 --- a/static/src/app/users/user-list/user-list.component.ts +++ b/static/src/app/users/user-list/user-list.component.ts @@ -20,7 +20,7 @@ export class UserListComponent implements OnInit { searchTerm = new FormControl(); - fractionRadioSelect: string; + public radioModel: string; constructor(private userService: UserService, private router: Router, @@ -42,7 +42,7 @@ export class UserListComponent implements OnInit { Observable.merge(paramsStream, searchTermStream) .distinctUntilChanged() - .switchMap(query => this.userService.findUsers(query, this.fractionRadioSelect)) + .switchMap(query => this.userService.findUsers(query, this.radioModel)) .subscribe(); } @@ -70,8 +70,8 @@ export class UserListComponent implements OnInit { } } - filterUser(query, fractionFilter) { - this.users$ = this.userService.findUsers(query, fractionFilter); + filterUsers() { + this.users$ = this.userService.findUsers(this.searchTerm.value, this.radioModel); } adjustBrowserUrl(queryString = '') { diff --git a/static/src/app/users/users.module.ts b/static/src/app/users/users.module.ts index 1958043..dbce84f 100644 --- a/static/src/app/users/users.module.ts +++ b/static/src/app/users/users.module.ts @@ -1,12 +1,13 @@ import {NgModule} from '@angular/core'; -import {routes, usersRoutingComponents} from './users.routing'; +import {usersRouterModule, usersRoutingComponents} from './users.routing'; import {CommonModule} from "@angular/common"; import {SharedModule} from "../shared.module"; +import {ButtonsModule} from "ngx-bootstrap"; @NgModule({ declarations: usersRoutingComponents, - imports: [CommonModule, SharedModule, routes], + imports: [CommonModule, SharedModule, ButtonsModule.forRoot(), usersRouterModule], }) export class UsersModule { - static routes = routes; + static routes = usersRouterModule; } diff --git a/static/src/app/users/users.routing.ts b/static/src/app/users/users.routing.ts index 32b8b2a..d63efcb 100644 --- a/static/src/app/users/users.routing.ts +++ b/static/src/app/users/users.routing.ts @@ -32,6 +32,6 @@ export const usersRoutes: Routes = [{ } ]; -export const routes: ModuleWithProviders = RouterModule.forChild(usersRoutes); +export const usersRouterModule: ModuleWithProviders = RouterModule.forChild(usersRoutes); export const usersRoutingComponents = [UserItemComponent, UsersComponent, UserListComponent, EditUserComponent, AwardUserComponent];