diff --git a/static/src/app/app.module.ts b/static/src/app/app.module.ts
index ac162dc..5c51b0b 100644
--- a/static/src/app/app.module.ts
+++ b/static/src/app/app.module.ts
@@ -22,7 +22,7 @@ import {HttpClientModule} from '@angular/common/http';
import {SpinnerService} from './services/user-interface/spinner/spinner.service';
import {SettingsService} from './services/settings.service';
import {HttpGateway} from './services/http-gateway';
-import {MatListModule, MatMenuModule, MatSidenavModule, MatToolbarModule} from '@angular/material';
+import {MatListModule, MatMenuModule, MatSidenavModule, MatTableModule, MatToolbarModule} from '@angular/material';
import {FlexLayoutModule} from '@angular/flex-layout';
@NgModule({
@@ -38,6 +38,7 @@ import {FlexLayoutModule} from '@angular/flex-layout';
MatToolbarModule,
MatListModule,
MatMenuModule,
+ MatTableModule,
FlexLayoutModule,
],
diff --git a/static/src/app/army/army-member/army-member.component.html b/static/src/app/army/army-member/army-member.component.html
index 1912f18..a80a670 100644
--- a/static/src/app/army/army-member/army-member.component.html
+++ b/static/src/app/army/army-member/army-member.component.html
@@ -25,40 +25,35 @@
-
-
-
-
-
- |
- {{'public.army.member.awards.title' | translate}} |
- {{'public.army.member.awards.reason' | translate}} |
-
- {{'public.army.member.awards.date' | translate}}
- |
-
-
-
-
-
-
- |
-
-
- |
-
- {{award.decorationId.name}}
- |
-
- {{award.reason}}
- |
-
- {{award.date | date: 'dd.MM.yyyy'}}
- |
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{'public.army.member.awards.title' | translate}}
+ {{element.decorationId.name}}
+
+
+
+ {{'public.army.member.awards.reason' | translate}}
+ {{element.reason}}
+
+
+
+ {{'public.army.member.awards.date' | translate}}
+
+ {{element.date | date: 'dd.MM.yyyy'}}
+
+
+
+
+
+
diff --git a/static/src/app/army/army-member/army-member.component.scss b/static/src/app/army/army-member/army-member.component.scss
index 994c654..bbba143 100644
--- a/static/src/app/army/army-member/army-member.component.scss
+++ b/static/src/app/army/army-member/army-member.component.scss
@@ -23,10 +23,11 @@
table-layout: fixed;
}
-.table-container {
- margin-top: 10px;
+div.table-container {
+ margin-top:20px;
padding: 5px;
overflow-x: auto;
+ min-width: 500px;
}
.table-head {
@@ -34,8 +35,12 @@
color: white;
}
-tbody {
- background: rgba(255, 255, 255, 0.88);
+mat-table.mat-table {
+ background: rgba(255, 255, 255, 0.70);
+}
+
+mat-row.mat-row {
+ @extend mat-table.mat-table;
}
.cell-outline {
diff --git a/static/src/app/army/army-member/army-member.component.ts b/static/src/app/army/army-member/army-member.component.ts
index 4874bb3..859248a 100644
--- a/static/src/app/army/army-member/army-member.component.ts
+++ b/static/src/app/army/army-member/army-member.component.ts
@@ -2,7 +2,6 @@ import {Component, OnInit} from '@angular/core';
import {Award, User} from '../../models/model-interfaces';
import {ActivatedRoute, Router} from '@angular/router';
import {UserService} from '../../services/army-management/user.service';
-import {Subscription} from 'rxjs/Subscription';
import {AwardingService} from '../../services/army-management/awarding.service';
import {Fraction} from '../../utils/fraction.enum';
import {Location} from '@angular/common';
@@ -14,8 +13,6 @@ import {Location} from '@angular/common';
})
export class ArmyMemberComponent implements OnInit {
- subscription: Subscription;
-
user: User = {};
awards: Award[] = [];
@@ -26,6 +23,8 @@ export class ArmyMemberComponent implements OnInit {
readonly fraction = Fraction;
+ readonly displayedColumns = ['award-graphics', 'title', 'reason', 'date'];
+
constructor(private router: Router,
private route: ActivatedRoute,
private userService: UserService,
@@ -34,17 +33,17 @@ export class ArmyMemberComponent implements OnInit {
}
ngOnInit() {
- this.subscription = this.route.params
- .map(params => params['id'])
- .filter(id => id !== undefined)
- .flatMap(id => this.userService.getUser(id))
- .subscribe(user => {
- this.user = user;
- this.signatureUrl = window.location.origin + '/resource/signature/' + user._id + '.png';
- this.awardingService.getUserAwardings(user._id).subscribe((awards => {
- this.awards = awards;
- }));
- });
+ this.route.params
+ .map(params => params['id'])
+ .filter(id => id !== undefined)
+ .flatMap(id => this.userService.getUser(id))
+ .subscribe(user => {
+ this.user = user;
+ this.signatureUrl = window.location.origin + '/resource/signature/' + user._id + '.png';
+ this.awardingService.getUserAwardings(user._id).subscribe((awards => {
+ this.awards = awards;
+ }));
+ });
};
backToOverview() {
diff --git a/static/src/app/statistic/war/scoreboard/scoreboard.component.html b/static/src/app/statistic/war/scoreboard/scoreboard.component.html
index b8bb8db..85374b2 100644
--- a/static/src/app/statistic/war/scoreboard/scoreboard.component.html
+++ b/static/src/app/statistic/war/scoreboard/scoreboard.component.html
@@ -1,48 +1,45 @@
-
+
-
+
+ {{tableHead[0].head | translate}}
+
+ {{element.name}}
+
+
-
- {{tableHead[0].head | translate}}
-
- {{element.name}}
-
-
+
+ {{tableHead[1].head | translate}}
+ {{element.fraction ===
+ 'BLUFOR' ? fraction.BLUFOR : fraction.OPFOR}}
+
-
- {{tableHead[1].head | translate}}
- {{element.fraction ===
- 'BLUFOR' ? fraction.BLUFOR : fraction.OPFOR}}
-
+
+
+
+
+
+ {{element[column.prop]}}
+
-
-
-
-
-
- {{element[column.prop]}}
-
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
diff --git a/static/src/app/statistic/war/scoreboard/scoreboard.component.scss b/static/src/app/statistic/war/scoreboard/scoreboard.component.scss
index 065f9a7..7aafc92 100644
--- a/static/src/app/statistic/war/scoreboard/scoreboard.component.scss
+++ b/static/src/app/statistic/war/scoreboard/scoreboard.component.scss
@@ -1,24 +1,12 @@
@import url('../../../style/list-entry.scss');
@import url('../../../style/hide-scrollbar.scss');
-.scoreboard-table {
+mat-table.mat-table {
width: 1058px;
- margin: auto;
- height: 68vh;
overflow-x: hidden;
overflow-y: auto;
- box-shadow: 0 5px 5px -3px rgba(0, 0, 0, .2), 0 8px 10px 1px rgba(0, 0, 0, .14), 0 3px 14px 2px rgba(0, 0, 0, .12);
- border-bottom: 1px solid #dadada;
-}
-
-.mat-header-row {
- width: 1058px;
- position: absolute;
- z-index: 100;
-}
-
-.mat-table > mat-row:first-of-type {
- padding-top: 56px;
+ margin: auto;
+ height: 70vh;
}
.mat-column-name {
@@ -50,7 +38,27 @@
white-space: pre-wrap;
}
- .mat-header-row, .scoreboard-table {
+ .mat-header-row, mat-table.mat-table {
width: 768px;
}
}
+
+
+@media all and (max-width: 599px) {
+ .mat-column-name {
+ flex: 0 0 130px;
+ padding-left: 1vw;
+ word-wrap: break-word;
+ white-space: pre-wrap;
+ }
+
+ .mat-header-row {
+ width: 755px;
+ }
+
+ mat-table.mat-table {
+ width: 100%;
+ overflow-x: auto;
+ display: grid;
+ }
+}
diff --git a/static/src/app/statistic/war/war-header/war-header.component.html b/static/src/app/statistic/war/war-header/war-header.component.html
index d3f88b0..b9525ae 100644
--- a/static/src/app/statistic/war/war-header/war-header.component.html
+++ b/static/src/app/statistic/war/war-header/war-header.component.html
@@ -1,6 +1,6 @@