Compare commits
No commits in common. "d3779de03fbe6ea1ed49fca61edd37a427ab0913" and "eaff8b4ea956941084ab72f715d0d89f7a16d984" have entirely different histories.
d3779de03f
...
eaff8b4ea9
|
@ -19,6 +19,7 @@ List all promotion requests
|
||||||
+ `OPFOR`
|
+ `OPFOR`
|
||||||
+ `GLOBAL`
|
+ `GLOBAL`
|
||||||
|
|
||||||
|
|
||||||
+ Response 200
|
+ Response 200
|
||||||
|
|
||||||
+ Attributes (array[Promotion])
|
+ Attributes (array[Promotion])
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
### GET Ranks [GET /ranks{?q,fractFilter}]
|
|
||||||
|
|
||||||
List all ranks
|
|
||||||
|
|
||||||
+ Parameters
|
|
||||||
+ q: `Gefr` (string, optional) - filter string which filters for partial username
|
|
||||||
|
|
||||||
+ fractFilter (enum[string], optional)
|
|
||||||
Field to filter by fraction
|
|
||||||
|
|
||||||
+ Members
|
|
||||||
+ `BLUFOR`
|
|
||||||
+ `OPFOR`
|
|
||||||
+ `GLOBAL`
|
|
||||||
|
|
||||||
+ Response 200
|
|
||||||
|
|
||||||
+ Attributes (array[Rank])
|
|
|
@ -1,16 +0,0 @@
|
||||||
# Rank (object)
|
|
||||||
|
|
||||||
A rank that can be applied to army members by level/fraction
|
|
||||||
|
|
||||||
## Properties
|
|
||||||
+ _id: `591469c9ef4a6810623ed4ea` (string, required) - the unique id of the rank
|
|
||||||
+ name: `Gefreiter` - display name of the rank
|
|
||||||
+ fraction: `BLUFOR` - enum expressing the fraction in which the decoration is given
|
|
||||||
+ Members
|
|
||||||
+ `BLUFOR`
|
|
||||||
+ `OPFOR`
|
|
||||||
+ `GLOBAL`
|
|
||||||
+ level: 1 - rank level
|
|
||||||
+ updatedAt: `2017-09-20T20:25:29.995Z` (string, required) - the version timestamp
|
|
||||||
+ timestamp: `2017-05-11T13:40:25.051Z` - the creation timestamp
|
|
||||||
+ __v: 1 - version number
|
|
|
@ -12,8 +12,6 @@
|
||||||
|
|
||||||
:[Gists](_promotion.apib)
|
:[Gists](_promotion.apib)
|
||||||
|
|
||||||
:[Gists](_rank.apib)
|
|
||||||
|
|
||||||
:[Gists](_squad.apib)
|
:[Gists](_squad.apib)
|
||||||
|
|
||||||
:[Gists](_user.apib)
|
:[Gists](_user.apib)
|
||||||
|
|
|
@ -42,8 +42,6 @@ FORMAT: 1A
|
||||||
|
|
||||||
# Group Ranks
|
# Group Ranks
|
||||||
|
|
||||||
:[Gists](army-management/ranks.apib)
|
|
||||||
|
|
||||||
# Group Requests
|
# Group Requests
|
||||||
|
|
||||||
:[Gists](army-management/promotions.apib)
|
:[Gists](army-management/promotions.apib)
|
||||||
|
|
|
@ -4,7 +4,7 @@ import {LoginService} from './services/app-user-service/login-service';
|
||||||
import {PromotionService} from './services/army-management/promotion.service';
|
import {PromotionService} from './services/army-management/promotion.service';
|
||||||
import {AwardingService} from './services/army-management/awarding.service';
|
import {AwardingService} from './services/army-management/awarding.service';
|
||||||
import {RouteConfig} from './app.config';
|
import {RouteConfig} from './app.config';
|
||||||
import {DOCUMENT} from '@angular/common';
|
import {DOCUMENT} from "@angular/common";
|
||||||
|
|
||||||
declare function require(url: string);
|
declare function require(url: string);
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ export class AppComponent implements OnInit {
|
||||||
|
|
||||||
scrollBtnVisibleVal = 100;
|
scrollBtnVisibleVal = 100;
|
||||||
|
|
||||||
version = 'v'.concat(require('./../../../package.json').version);
|
version = 'v' + require('./../../../package.json').version;
|
||||||
|
|
||||||
constructor(public loginService: LoginService,
|
constructor(public loginService: LoginService,
|
||||||
private promotionService: PromotionService,
|
private promotionService: PromotionService,
|
||||||
|
@ -38,13 +38,13 @@ export class AppComponent implements OnInit {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
// scroll to top on route from army overview to user detail and back
|
// scroll to top on route from army overview to user detail and back
|
||||||
if (router.url.includes('overview')) {
|
if (router.url.includes('overview')) {
|
||||||
this.scrollToTop();
|
this.scrollToTop()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@HostListener('window:scroll', [])
|
@HostListener("window:scroll", [])
|
||||||
onWindowScroll() {
|
onWindowScroll() {
|
||||||
this.scrollTopVisible = document.body.scrollTop > this.scrollBtnVisibleVal
|
this.scrollTopVisible = document.body.scrollTop > this.scrollBtnVisibleVal
|
||||||
|| document.documentElement.scrollTop > this.scrollBtnVisibleVal;
|
|| document.documentElement.scrollTop > this.scrollBtnVisibleVal;
|
||||||
|
|
Loading…
Reference in New Issue