From 845593b2ecc60852bb164e9670f62acf0a2372d8 Mon Sep 17 00:00:00 2001 From: hardi Date: Sun, 3 Mar 2019 18:09:20 +0100 Subject: [PATCH] Release v1.9.4 (#59) --- package.json | 2 +- static/src/app/app.module.ts | 3 +- .../army-member/army-member.component.html | 63 +++++----- .../army-member/army-member.component.scss | 40 +++--- .../army/army-member/army-member.component.ts | 27 ++-- static/src/app/login/login.component.html | 12 +- static/src/app/login/login.component.scss | 64 ++++------ static/src/app/login/signup.component.html | 23 ++-- static/src/app/models/model-interfaces.ts | 2 +- .../request/award/req-award.component.html | 119 +++++++++--------- .../request/award/req-award.component.scss | 27 ++-- .../confirm-award.component.html | 4 +- .../confirm-award.component.scss | 18 +-- .../confirm-award/confirm-award.component.ts | 2 +- .../confirm-promotion.component.html | 6 +- .../confirm-promotion.component.scss | 18 +-- .../confirm-promotion.component.ts | 2 +- .../promotion/req-promotion.component.html | 104 +++++++-------- .../promotion/req-promotion.component.scss | 26 ++-- .../sql-dashboard.component.html | 14 +-- .../sql-dashboard.component.scss | 13 +- .../campaign-navigation.component.html | 32 +++-- .../campaign-navigation.component.scss | 75 +++++------ .../overview/campaign-overview.component.scss | 1 + static/src/app/statistic/stats.component.scss | 2 +- .../fraction-stats.component.html | 3 +- .../fraction-stats.component.scss | 28 ++++- .../war/scoreboard/scoreboard.component.html | 81 ++++++------ .../war/scoreboard/scoreboard.component.scss | 38 +++--- .../war/war-header/war-header.component.html | 13 +- .../war/war-header/war-header.component.scss | 66 +++++++++- .../war/war-list/war-list.component.scss | 5 + static/src/app/style/overview.scss | 10 +- 33 files changed, 491 insertions(+), 452 deletions(-) diff --git a/package.json b/package.json index 0fa12db..daa0228 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opt-cc", - "version": "1.9.3", + "version": "1.9.4", "author": "Florian Hartwich ", "private": true, "scripts": { 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..d158fdd 100644 --- a/static/src/app/army/army-member/army-member.component.scss +++ b/static/src/app/army/army-member/army-member.component.scss @@ -2,7 +2,7 @@ .army-member-view { width: 90%; - height: 100vh; + min-height: 100vh; padding: 5px; margin: auto; } @@ -18,15 +18,11 @@ padding-left: 5px; } -.table { - overflow-wrap: break-word; - 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,14 +30,26 @@ color: white; } -tbody { - background: rgba(255, 255, 255, 0.88); +mat-table.mat-table { + background: rgba(255, 255, 255, 0.70); + + .mat-column-award-graphics { + flex: 0 0 15%; + } + + .mat-column-title { + flex: 0 0 25%; + } + + .mat-column-reason { + flex: 0 0 52%; + } + + .mat-column-date { + flex: 0 0 8%; + } } -.cell-outline { - outline: 1px solid #D4D4D4; -} - -tr.cell-outline:hover { - background-color: #ffffff; +mat-row.mat-row { + @extend mat-table.mat-table; } 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/login/login.component.html b/static/src/app/login/login.component.html index 76e4fac..f605685 100644 --- a/static/src/app/login/login.component.html +++ b/static/src/app/login/login.component.html @@ -1,6 +1,6 @@ diff --git a/static/src/app/login/login.component.scss b/static/src/app/login/login.component.scss index 479de01..39fb8fe 100644 --- a/static/src/app/login/login.component.scss +++ b/static/src/app/login/login.component.scss @@ -2,53 +2,31 @@ width: 100%; padding: 15px; margin: 0 auto; -} -.form-signin > .row { - max-width: 400px; - margin: auto; -} + & > .row { + max-width: 400px; + margin: auto; -.form-signin-heading { - text-align: center; -} + & > h2 { + text-align: center + } -.form-signin .form-signin-heading, .form-signin .checkbox, #inputEmail { - margin-bottom: 10px; -} + input.form-control { + margin-bottom: 10px; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + font-size: 16px; + height: auto; + padding: 10px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } -.form-signin .checkbox { - font-weight: normal; -} - -.form-signin .form-control { - position: relative; - font-size: 16px; - height: auto; - padding: 10px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.form-signin .form-control:focus { - z-index: 2; -} - -.form-signin input[type="text"] { - margin-bottom: 5px; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; -} - -.form-signin input[type="password"] { - margin-bottom: 10px; - border-top-left-radius: 0; - border-top-right-radius: 0; -} - -button { - width: 100%; + button { + width: 100%; + } + } } /* Loading Animation */ diff --git a/static/src/app/login/signup.component.html b/static/src/app/login/signup.component.html index af110ce..151a310 100644 --- a/static/src/app/login/signup.component.html +++ b/static/src/app/login/signup.component.html @@ -1,26 +1,27 @@