From 026a3611a66387e837b3b41285f58cc73ba5c776 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Sun, 17 Jun 2018 10:47:02 +0200 Subject: [PATCH 01/14] Fix CSV export headline (CC-32) --- package.json | 2 +- static/src/app/statistic/war/scoreboard/scoreboard.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9a46c82..23e7421 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opt-cc", - "version": "1.7.6", + "version": "1.7.7", "author": "Florian Hartwich ", "private": true, "scripts": { diff --git a/static/src/app/statistic/war/scoreboard/scoreboard.component.ts b/static/src/app/statistic/war/scoreboard/scoreboard.component.ts index ac2b5b3..aa05ffd 100644 --- a/static/src/app/statistic/war/scoreboard/scoreboard.component.ts +++ b/static/src/app/statistic/war/scoreboard/scoreboard.component.ts @@ -71,7 +71,7 @@ export class ScoreboardComponent implements OnChanges { exportCSV() { let csvOut = ''; for (let i = 0; i < this.tableHead.length; i++) { - csvOut += this.tableHead[i]; + csvOut += this.tableHead[i].head; if (i !== this.tableHead.length - 1) { csvOut += ','; } From 07a6822920418a92c34e4bfb1cd8d45cff1ce260 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Sun, 17 Jun 2018 11:52:43 +0200 Subject: [PATCH 02/14] Save vehicles and magazine on kill log (CC-36) --- api/apib/data_structures/_log.apib | 5 ++ api/models/logs/kill.js | 9 +++ api/models/logs/vehicle.js | 6 ++ api/tools/log-parse-tool.js | 89 ++++++++++++++++++------------ 4 files changed, 74 insertions(+), 35 deletions(-) diff --git a/api/apib/data_structures/_log.apib b/api/apib/data_structures/_log.apib index 7b44d5d..535e4e4 100644 --- a/api/apib/data_structures/_log.apib +++ b/api/apib/data_structures/_log.apib @@ -43,6 +43,9 @@ + `BLUFOR` + `OPFOR` + `NONE` ++ shooterVehicle: `FV-720 Mora` (string, optional) - vehicle in whiock the shooting player sat ++ targetVehicle: `Ifrit-GMG` (string, optional) - vehicle in which the target player sat ++ magazine: `30 mm APFSDS` (string, optional) - magazine name used to execute the kill #LogRespawn (Log) ## Properties @@ -84,3 +87,5 @@ + `HEAVY` + `AIR` + `UNKNOWN` ++ shooterVehicle: `FV-720 Mora` (string, optional) - vehicle in whiock the shooting player sat ++ magazine: `30 mm APFSDS` (string, optional) - magazine name used to execute the kill diff --git a/api/models/logs/kill.js b/api/models/logs/kill.js index 29e76a3..e695b24 100644 --- a/api/models/logs/kill.js +++ b/api/models/logs/kill.js @@ -24,6 +24,15 @@ const LogKillSchema = new Schema({ type: Boolean, required: true, }, + magazine: { + type: String, + }, + shooterVehicle: { + type: String, + }, + targetVehicle: { + type: String, + }, fraction: { type: String, enum: ['BLUFOR', 'OPFOR', 'NONE'], diff --git a/api/models/logs/vehicle.js b/api/models/logs/vehicle.js index e360e00..e2e5307 100644 --- a/api/models/logs/vehicle.js +++ b/api/models/logs/vehicle.js @@ -33,6 +33,12 @@ const LogVehicleKillSchema = new Schema({ enum: ['LIGHT', 'HEAVY', 'AIR', 'UNKNOWN'], required: true, }, + magazine: { + type: String, + }, + shooterVehicle: { + type: String, + }, }, { collection: 'logVehicle', }); diff --git a/api/tools/log-parse-tool.js b/api/tools/log-parse-tool.js index 3d9f73b..44de371 100644 --- a/api/tools/log-parse-tool.js +++ b/api/tools/log-parse-tool.js @@ -17,9 +17,9 @@ const vehicleNameEndRegex = /\s\(\w+:/; const sideRegex = /(side:\s(.*?)\))/; -// const magazineRegex = /(magazine:\s(.*?)\))/; +const magazineRegex = /(magazine:\s(.*?)\))/; -// const vehicleRegex = /(vehicle:\s(.*?)\))/; +const vehicleRegex = /(vehicle:\s(.*?)\))/; const categoryRegex = /(category:\s(.*?)\))/; @@ -51,7 +51,7 @@ const parseWarLog = (lineArray, war) => { ]; const addPlayerIfNotExists = (inputPlayer, steamUUID) => { - const player = getPlayerAndFractionFromString(inputPlayer); + const player = getPlayerInfoFromString(inputPlayer); if (player && player.name && player.fraction && !playerArrayContains(stats.players, player)) { player['warId'] = war._id; player['steamUUID'] = steamUUID; @@ -74,7 +74,7 @@ const parseWarLog = (lineArray, war) => { stats.clean.push(line); const shooterString = line.substring(line.lastIndexOf(' von: ') + 6, line.search(/$/) - 1); - const shooter = getPlayerAndFractionFromString(shooterString); + const shooter = getPlayerInfoFromString(shooterString); if (line.includes('Fahrzeug:')) { const targetString = line.substring(line.lastIndexOf(' --- Fahrzeug: ') + 15, line.lastIndexOf(' von:')); @@ -93,19 +93,36 @@ const parseWarLog = (lineArray, war) => { } else { vehicleKill.shooter = shooter ? shooter.name : null; } + if (shooter.magazine) { + vehicleKill.magazine = shooter.magazine; + } + if (shooter.vehicle) { + vehicleKill.shooterVehicle = shooter.vehicle; + } + stats.vehicles.push(vehicleKill); } } else { const targetString = line.substring(line.lastIndexOf(' --- Einheit: ') + 14, line.lastIndexOf(' von:')); - const target = getPlayerAndFractionFromString(targetString); - stats.kills.push({ + const target = getPlayerInfoFromString(targetString); + const kill = { war: war._id, time: getFullTimeDate(war.date, line.split(WHITESPACE)[5]), shooter: shooter ? shooter.name : null, target: target ? target.name : null, friendlyFire: shooter ? target.fraction === shooter.fraction : false, fraction: shooter ? shooter.fraction : 'NONE', - }); + }; + if (shooter.magazine) { + kill.magazine = shooter.magazine; + } + if (shooter.vehicle) { + kill.shooterVehicle = shooter.vehicle; + } + if (target.vehicle) { + kill.targetVehicle = target.vehicle; + } + stats.kills.push(kill); } } else if (line.includes('(Budget)')) { /** @@ -173,9 +190,9 @@ const parseWarLog = (lineArray, war) => { const stabilized = !!line.includes('stabilisiert."'); const medicName = line.substring(line.lastIndexOf('wurde von ') + 10, line.lastIndexOf(stabilized ? ' stabilisiert' : ' wiederbelebt')); - const medic = getPlayerAndFractionFromString(medicName); + const medic = getPlayerInfoFromString(medicName); const patientName = line.substring(line.lastIndexOf('--- ') + 4, line.lastIndexOf(' wurde von')); - const patient = getPlayerAndFractionFromString(patientName); + const patient = getPlayerInfoFromString(patientName); stats.revive.push({ war: war._id, @@ -191,9 +208,9 @@ const parseWarLog = (lineArray, war) => { */ stats.clean.push(line); const driverString = line.substring(line.lastIndexOf('wurde von ') + 10, line.lastIndexOf(' eingeflogen')); - const driver = getPlayerAndFractionFromString(driverString); + const driver = getPlayerInfoFromString(driverString); const passengerString = line.substring(line.lastIndexOf('--- ') + 3, line.lastIndexOf(' wurde von')); - const passenger = getPlayerAndFractionFromString(passengerString); + const passenger = getPlayerInfoFromString(passengerString); const distance = parseInt(line.substring(line.lastIndexOf('eingeflogen (') + 13, line.lastIndexOf('m)') - 1)); stats.transport.push({ @@ -285,15 +302,20 @@ const getBudgetEntry = (budg, warId, warDate) => { }; }; -const getPlayerAndFractionFromString = (inputString) => { +const getPlayerInfoFromString = (inputString) => { + const resPlayer = {}; const playerNameRegexMatch = playerNameRegex.exec(inputString); const sideMatch = sideRegex.exec(inputString); // SINGLE PLAYER NAME let name; if (playerNameRegexMatch && playerNameRegexMatch.length >= 2) { - // NAME name = playerNameRegexMatch[2].trim(); + // do not return player for 'Error: No unit' + if (!name && name === 'Error: No unit') { + return; + } + resPlayer.name = name; } // ADDITIONAL PLAYER NAMES let additionalPlayerMatch; @@ -317,34 +339,31 @@ const getPlayerAndFractionFromString = (inputString) => { } } - // const magazineMatch = magazineRegex.exec(inputString); - // const vehicleMatch = vehicleRegex.exec(inputString); + if (side && side !== 'ENEMY') { + resPlayer.fraction = side === 'WEST' ? 'BLUFOR' : 'OPFOR'; + } - // if (magazineMatch && magazineMatch.length >= 3) { // MAGAZINE - // console.log(magazineMatch[2]) - // } + const magazineMatch = magazineRegex.exec(inputString); + if (magazineMatch && magazineMatch.length >= 3) { + let magazine = magazineMatch[2]; + if (new RegExp('\\(.*$').test(magazine)) { + magazine = magazine.concat(')'); + } + resPlayer.magazine = magazine; + } - // if (vehicleMatch && vehicleMatch.length >= 3 && vehicleMatch[2]) { - // let vehicle = vehicleMatch[2]; - // if (new RegExp("\\(.*$").test(vehicle)) { - // vehicle = vehicle.concat(")"); - // } // VEHICLE - // console.log(vehicle) - // } - - let fraction; - if (side) { - fraction = side !== 'ENEMY' ? side === 'WEST' ? - 'BLUFOR' : 'OPFOR' : - undefined; + const vehicleMatch = vehicleRegex.exec(inputString); + if (vehicleMatch && vehicleMatch.length >= 3 && vehicleMatch[2]) { + let vehicle = vehicleMatch[2]; + if (new RegExp('\\(.*$').test(vehicle)) { + vehicle = vehicle.concat(')'); + } + resPlayer.vehicle = vehicle; } - // do not return player for 'Error: No unit' - if (name && name !== 'Error: No unit') { - return {name: name, fraction: fraction}; - } + return resPlayer; }; const getVehicleAndFractionFromString = (nameClassFractionString) => { From a29a39d8e0e05dc87a9940f4c3652d246144524e Mon Sep 17 00:00:00 2001 From: HardiReady Date: Sun, 17 Jun 2018 12:46:58 +0200 Subject: [PATCH 03/14] add possibility to delete multiple player awardings at once (CC-23) --- .../award-user/award-user.component.html | 13 +++++++-- .../users/award-user/award-user.component.ts | 29 ++++++++++++------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/static/src/app/users/award-user/award-user.component.html b/static/src/app/users/award-user/award-user.component.html index 9ff5fdc..12633ab 100644 --- a/static/src/app/users/award-user/award-user.component.html +++ b/static/src/app/users/award-user/award-user.component.html @@ -73,7 +73,9 @@ Begründung Datum Status - + + Löschen + @@ -94,10 +96,15 @@ {{award.date | date: 'dd.MM.yyyy'}} - {{award.confirmed === 0? 'In Bearbeitung' : (award.confirmed === 1? 'Genehmigt' : 'Abgelehnt')}} + {{award.confirmed === 0 ? 'In Bearbeitung' : (award.confirmed === 1 ? 'Genehmigt' : 'Abgelehnt')}} - + diff --git a/static/src/app/users/award-user/award-user.component.ts b/static/src/app/users/award-user/award-user.component.ts index e826195..14f230d 100644 --- a/static/src/app/users/award-user/award-user.component.ts +++ b/static/src/app/users/award-user/award-user.component.ts @@ -93,17 +93,24 @@ export class AwardUserComponent implements OnInit { } } - deleteAwarding(awardingId) { - this.awardingService.deleteAwarding(awardingId).subscribe((res) => { - this.awardingService.getUserAwardings(this.userId) - .subscribe((awards) => { - this.awards = awards; - this.showSuccessLabel = true; - setTimeout(() => { - this.showSuccessLabel = false; - }, 2000); - }); - }); + deleteAwarding() { + const checkedAwardings = this.awards.filter(award => award['checked'] == true); + + if (checkedAwardings.length > 0) { + checkedAwardings.forEach(awarding => { + this.awardingService.deleteAwarding(awarding._id).subscribe((res) => { + this.awardingService.getUserAwardings(this.userId) + .subscribe((awards) => { + this.awards = awards; + }); + }); + }); + + this.showSuccessLabel = true; + setTimeout(() => { + this.showSuccessLabel = false; + }, 4000); + } } cancel() { From 162453c894ef86d793662b31b077048f417f925c Mon Sep 17 00:00:00 2001 From: HardiReady Date: Sun, 17 Jun 2018 12:48:08 +0200 Subject: [PATCH 04/14] Fix lint --- static/src/app/users/award-user/award-user.component.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/static/src/app/users/award-user/award-user.component.ts b/static/src/app/users/award-user/award-user.component.ts index 14f230d..37fe524 100644 --- a/static/src/app/users/award-user/award-user.component.ts +++ b/static/src/app/users/award-user/award-user.component.ts @@ -94,7 +94,7 @@ export class AwardUserComponent implements OnInit { } deleteAwarding() { - const checkedAwardings = this.awards.filter(award => award['checked'] == true); + const checkedAwardings = this.awards.filter(award => award['checked'] === true); if (checkedAwardings.length > 0) { checkedAwardings.forEach(awarding => { @@ -117,5 +117,4 @@ export class AwardUserComponent implements OnInit { this.router.navigate(['../..'], {relativeTo: this.route}); return false; } - } From d1f53f78c93c261a7daf107254936dc4bc9e815d Mon Sep 17 00:00:00 2001 From: HardiReady Date: Sun, 17 Jun 2018 16:03:25 +0200 Subject: [PATCH 05/14] clean up code --- .../users/award-user/award-user.component.ts | 9 ++++--- .../users/edit-user/edit-user.component.ts | 24 +++++++++++-------- .../users/user-list/user-item.component.ts | 1 - .../users/user-list/user-list.component.ts | 2 -- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/static/src/app/users/award-user/award-user.component.ts b/static/src/app/users/award-user/award-user.component.ts index 37fe524..2429a42 100644 --- a/static/src/app/users/award-user/award-user.component.ts +++ b/static/src/app/users/award-user/award-user.component.ts @@ -51,7 +51,6 @@ export class AwardUserComponent implements OnInit { .subscribe(id => this.userId = id); } - toggleDecoPreview(descriptionField, decorationId, image) { if (decorationId !== '0') { this.decoPreviewDisplay = 'flex'; // visible & keep same height for all children @@ -72,10 +71,10 @@ export class AwardUserComponent implements OnInit { const reason = reasonField.value; if (decorationId && reason.length > 0) { const award = { - 'userId': this.userId, - 'decorationId': decorationId, - 'reason': reason, - 'date': Date.now() + userId: this.userId, + decorationId: decorationId, + reason: reason, + date: Date.now() }; this.awardingService.addAwarding(award).subscribe(() => { this.awardingService.getUserAwardings(this.userId) diff --git a/static/src/app/users/edit-user/edit-user.component.ts b/static/src/app/users/edit-user/edit-user.component.ts index 733c5b9..1cad7ae 100644 --- a/static/src/app/users/edit-user/edit-user.component.ts +++ b/static/src/app/users/edit-user/edit-user.component.ts @@ -53,10 +53,12 @@ export class EditUserComponent implements OnInit { user.squadId = '0'; this.ranksDisplay = 'none'; } else { - this.rankService.findRanks('', user.squadId.fraction).subscribe(ranks => { - this.ranks = ranks; - this.ranksDisplay = 'block'; - }); + this.rankService + .findRanks('', user.squadId.fraction) + .subscribe(ranks => { + this.ranks = ranks; + this.ranksDisplay = 'block'; + }); } this.user = user; }); @@ -68,12 +70,14 @@ export class EditUserComponent implements OnInit { toggleRanks() { if (this.user.squadId !== '0') { - this.rankService.findRanks('', this.user.squadId.fraction).subscribe( - ranks => { - this.ranks = ranks; - this.ranksDisplay = 'block'; - } - ); + this.rankService + .findRanks('', this.user.squadId.fraction) + .subscribe( + ranks => { + this.ranks = ranks; + this.ranksDisplay = 'block'; + } + ); } else { this.ranksDisplay = 'none'; } diff --git a/static/src/app/users/user-list/user-item.component.ts b/static/src/app/users/user-list/user-item.component.ts index 122afa7..9da5bb6 100644 --- a/static/src/app/users/user-list/user-item.component.ts +++ b/static/src/app/users/user-list/user-item.component.ts @@ -34,6 +34,5 @@ export class UserItemComponent { delete() { this.userDelete.emit(this.user); } - } 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 3f4aec7..a4be69f 100644 --- a/static/src/app/users/user-list/user-list.component.ts +++ b/static/src/app/users/user-list/user-list.component.ts @@ -41,7 +41,6 @@ export class UserListComponent implements OnInit { } ngOnInit() { - this.users$ = this.userService.users$; const paramsStream = this.route.queryParams @@ -106,5 +105,4 @@ export class UserListComponent implements OnInit { this.location.replaceState(absoluteUrl, queryPart); } - } From 2a698092e161559ccb1fef7597ce38c7c610e3bd Mon Sep 17 00:00:00 2001 From: HardiReady Date: Sun, 17 Jun 2018 16:44:31 +0200 Subject: [PATCH 06/14] Add SQL Dashboard (lazy implementation) (CC-24) --- static/src/app/app.component.html | 3 + static/src/app/app.config.ts | 4 +- static/src/app/models/model-interfaces.ts | 1 + static/src/app/request/request.module.ts | 3 +- static/src/app/request/request.routing.ts | 8 +- .../sql-dashboard/sql-dashboard.component.css | 33 ++++++++ .../sql-dashboard.component.html | 80 +++++++++++++++++++ .../sql-dashboard/sql-dashboard.component.ts | 60 ++++++++++++++ 8 files changed, 188 insertions(+), 4 deletions(-) create mode 100644 static/src/app/request/sql-dashboard/sql-dashboard.component.css create mode 100644 static/src/app/request/sql-dashboard/sql-dashboard.component.html create mode 100644 static/src/app/request/sql-dashboard/sql-dashboard.component.ts diff --git a/static/src/app/app.component.html b/static/src/app/app.component.html index 5a5f99c..732a112 100644 --- a/static/src/app/app.component.html +++ b/static/src/app/app.component.html @@ -48,6 +48,9 @@
    +
  • + Offene Anträge +
  • Beförderung
    • diff --git a/static/src/app/app.config.ts b/static/src/app/app.config.ts index 69ed7f8..92c7240 100644 --- a/static/src/app/app.config.ts +++ b/static/src/app/app.config.ts @@ -17,7 +17,6 @@ export class AppConfig { public readonly apiSquadPath = this.apiUrl + '/squads/'; public readonly apiUserPath = this.apiUrl + '/users/'; public readonly apiWarPath = this.apiUrl + '/wars'; - } export const RouteConfig = { @@ -34,5 +33,6 @@ export const RouteConfig = { requestAwardPath: 'award', requestPromotionPath: 'promotion', confirmAwardPath: 'confirm-award', - confirmPromotionPath: 'confirm-promotion' + confirmPromotionPath: 'confirm-promotion', + sqlDashboardPath: 'sql-dashboard', }; diff --git a/static/src/app/models/model-interfaces.ts b/static/src/app/models/model-interfaces.ts index bc7a72b..97232d0 100644 --- a/static/src/app/models/model-interfaces.ts +++ b/static/src/app/models/model-interfaces.ts @@ -94,6 +94,7 @@ export interface Promotion { oldRankLvl: number; newRankLvl: number; rejectReason?: string; + confirmed?: number; } export interface Decoration { diff --git a/static/src/app/request/request.module.ts b/static/src/app/request/request.module.ts index 1173550..0e2c910 100644 --- a/static/src/app/request/request.module.ts +++ b/static/src/app/request/request.module.ts @@ -8,10 +8,11 @@ import {ConfirmAwardComponent} from './confirm-award/confirm-award.component'; import {ConfirmPromotionComponent} from './confirm-promotion/confirm-promotion.component'; import {RequestAwardComponent} from './award/req-award.component'; import {RequestPromotionComponent} from './promotion/req-promotion.component'; +import {SqlDashboardComponent} from "./sql-dashboard/sql-dashboard.component"; @NgModule({ declarations: [RequestComponent, RequestPromotionComponent, RequestAwardComponent, ConfirmPromotionComponent, - ConfirmAwardComponent, FilterRankPipe], + ConfirmAwardComponent, SqlDashboardComponent, FilterRankPipe], imports: [CommonModule, SharedModule, requestRouterModule] }) export class RequestModule { diff --git a/static/src/app/request/request.routing.ts b/static/src/app/request/request.routing.ts index 28ce09b..172bfa3 100644 --- a/static/src/app/request/request.routing.ts +++ b/static/src/app/request/request.routing.ts @@ -8,6 +8,7 @@ import {RequestPromotionComponent} from './promotion/req-promotion.component'; import {RequestComponent} from './request.component'; import {RouteConfig} from '../app.config'; import {LoginGuardHL, LoginGuardSQL} from '../login'; +import {SqlDashboardComponent} from './sql-dashboard/sql-dashboard.component'; export const requestRoutes: Routes = [{ @@ -23,6 +24,11 @@ export const requestRoutes: Routes = [{ component: RequestPromotionComponent, canActivate: [LoginGuardSQL] }, + { + path: RouteConfig.sqlDashboardPath, + component: SqlDashboardComponent, + canActivate: [LoginGuardSQL] + }, { path: RouteConfig.confirmAwardPath, component: ConfirmAwardComponent, @@ -32,7 +38,7 @@ export const requestRoutes: Routes = [{ path: RouteConfig.confirmPromotionPath, component: ConfirmPromotionComponent, canActivate: [LoginGuardHL] - } + }, ]; export const requestRouterModule: ModuleWithProviders = RouterModule.forChild(requestRoutes); diff --git a/static/src/app/request/sql-dashboard/sql-dashboard.component.css b/static/src/app/request/sql-dashboard/sql-dashboard.component.css new file mode 100644 index 0000000..e799ab8 --- /dev/null +++ b/static/src/app/request/sql-dashboard/sql-dashboard.component.css @@ -0,0 +1,33 @@ +.overview { + margin-left: 25px !important; +} + +.decoration-preview { + padding: 5px; +} + +.trash { + cursor: pointer; +} + +.table { + overflow-wrap: break-word; + table-layout: fixed; +} + +.table-container { + margin-top: 40px; + overflow-x: auto; + width: 90%; + min-width: 800px; + padding: 5px; +} + +.form-group { + width: 25%; + min-width: 300px; +} + +h3 { + margin: 80px 0 20px -20px; +} diff --git a/static/src/app/request/sql-dashboard/sql-dashboard.component.html b/static/src/app/request/sql-dashboard/sql-dashboard.component.html new file mode 100644 index 0000000..93b3ed5 --- /dev/null +++ b/static/src/app/request/sql-dashboard/sql-dashboard.component.html @@ -0,0 +1,80 @@ +
    +

    SQL Dashboard

    + +
    + + + + + + + + + + + + + + + + + + + + +
    TeilnehmerAlter RangNeuer RangAntragstellerDatum
    + {{promotion.userId.username}} + + {{rank.name}} + + {{rank.name}} + + {{promotion.proposer.username}} + + {{promotion.timestamp | date: 'dd.MM.yyyy'}} +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + +
    TeilnehmerBildBezeichnungBegründungAntragstellerDatum
    + {{award.userId.username}} + + + + + + {{award.decorationId.name}} + + {{award.reason}} + + {{award.proposer?.username}} + + {{award.date | date: 'dd.MM.yyyy'}} +
    +
    + + +
    diff --git a/static/src/app/request/sql-dashboard/sql-dashboard.component.ts b/static/src/app/request/sql-dashboard/sql-dashboard.component.ts new file mode 100644 index 0000000..7a8a0f2 --- /dev/null +++ b/static/src/app/request/sql-dashboard/sql-dashboard.component.ts @@ -0,0 +1,60 @@ +import {Component, OnInit, ViewChild} from '@angular/core'; +import {ActivatedRoute, Router} from '@angular/router'; +import {Promotion, Rank} from '../../models/model-interfaces'; +import {NgForm} from '@angular/forms'; +import {UserService} from '../../services/army-management/user.service'; +import {RankService} from '../../services/army-management/rank.service'; +import {PromotionService} from '../../services/army-management/promotion.service'; +import {LoginService} from '../../services/app-user-service/login-service'; +import {AwardingService} from "../../services/army-management/awarding.service"; + + +@Component({ + templateUrl: './sql-dashboard.component.html', + styleUrls: ['./sql-dashboard.component.css', '../../style/overview.css'], +}) +export class SqlDashboardComponent implements OnInit { + + @ViewChild(NgForm) form: NgForm; + + ranks: Rank[]; + + promotions: Promotion[] = []; + + awards = []; + + constructor(private router: Router, + private route: ActivatedRoute, + private rankService: RankService, + private userService: UserService, + private promotionService: PromotionService, + private awardingService: AwardingService, + private loginService: LoginService) { + } + + ngOnInit() { + const currentUser = this.loginService.getCurrentUser(); + + this.promotionService.getSquadPromotions(currentUser.squad._id).subscribe(promotions => { + this.promotions = promotions.filter(promotion => promotion.confirmed === 0); + }); + + this.userService.findUsers('', undefined, currentUser.squad._id).subscribe(users => { + users.forEach(user => { + this.awardingService.getUserAwardings(user._id).subscribe(awardings => { + const unprocessedUserAwardings = awardings.filter(award => award.confirmed === 0); + this.awards = this.awards.concat(unprocessedUserAwardings); + }); + }); + }); + + this.rankService.findRanks('', currentUser.squad.fraction).subscribe(ranks => { + this.ranks = ranks; + }); + } + + cancel() { + this.router.navigate(['..'], {relativeTo: this.route}); + return false; + } +} From 1bf7d176154afa1c15b343fdfc307964f53ff0d8 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Sun, 17 Jun 2018 16:45:44 +0200 Subject: [PATCH 07/14] Fix lint --- static/src/app/request/request.module.ts | 2 +- static/src/app/request/sql-dashboard/sql-dashboard.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/static/src/app/request/request.module.ts b/static/src/app/request/request.module.ts index 0e2c910..593d2f4 100644 --- a/static/src/app/request/request.module.ts +++ b/static/src/app/request/request.module.ts @@ -8,7 +8,7 @@ import {ConfirmAwardComponent} from './confirm-award/confirm-award.component'; import {ConfirmPromotionComponent} from './confirm-promotion/confirm-promotion.component'; import {RequestAwardComponent} from './award/req-award.component'; import {RequestPromotionComponent} from './promotion/req-promotion.component'; -import {SqlDashboardComponent} from "./sql-dashboard/sql-dashboard.component"; +import {SqlDashboardComponent} from './sql-dashboard/sql-dashboard.component'; @NgModule({ declarations: [RequestComponent, RequestPromotionComponent, RequestAwardComponent, ConfirmPromotionComponent, diff --git a/static/src/app/request/sql-dashboard/sql-dashboard.component.ts b/static/src/app/request/sql-dashboard/sql-dashboard.component.ts index 7a8a0f2..69ee83c 100644 --- a/static/src/app/request/sql-dashboard/sql-dashboard.component.ts +++ b/static/src/app/request/sql-dashboard/sql-dashboard.component.ts @@ -6,7 +6,7 @@ import {UserService} from '../../services/army-management/user.service'; import {RankService} from '../../services/army-management/rank.service'; import {PromotionService} from '../../services/army-management/promotion.service'; import {LoginService} from '../../services/app-user-service/login-service'; -import {AwardingService} from "../../services/army-management/awarding.service"; +import {AwardingService} from '../../services/army-management/awarding.service'; @Component({ From 43a3f219b3d7b8b9995d4cefa7be206939f2da7e Mon Sep 17 00:00:00 2001 From: HardiReady Date: Mon, 18 Jun 2018 20:33:11 +0200 Subject: [PATCH 08/14] Add endpoint for unprocessed awarding by squad --- api/routes/awardings.js | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/api/routes/awardings.js b/api/routes/awardings.js index e256bf9..4364c47 100644 --- a/api/routes/awardings.js +++ b/api/routes/awardings.js @@ -3,6 +3,8 @@ // modules const express = require('express'); +const mongoose = require('mongoose'); + // HTTP status codes by name const codes = require('./http-codes'); @@ -10,9 +12,11 @@ const routerHandling = require('../middleware/router-handling'); const apiAuthenticationMiddleware = require('../middleware/auth-middleware'); const checkHl = require('../middleware/permission-check').checkHl; +const checkSql = require('../middleware/permission-check').checkSql; // Mongoose Model using mongoDB const AwardingModel = require('../models/awarding'); +const UserModel = require('../models/user'); // result set for proposer(appUser) population const resultSet = { @@ -77,8 +81,23 @@ awarding.route('/') .all(routerHandling.httpMethodNotAllowed); -awarding.route('/:id') +awarding.route('/unprocessed/:squadId') + .get(apiAuthenticationMiddleware, checkSql, (req, res, next) => { + console.log(req.params.squadId) + const filter = {squadId: req.params.squadId}; + UserModel.find(filter, (err, users) => { + if (!users || users.length === 0) { + return next(); + } + const squadUserIds = users.map(user => mongoose.Types.ObjectId(user._id)); + AwardingModel.find({userId: {$in: squadUserIds}, confirmed: 0}, (err, awards) => { + res.locals.items = awards; + next(); + }); + }) + }); +awarding.route('/:id') .patch(apiAuthenticationMiddleware, checkHl, (req, res, next) => { if (!req.body || (req.body._id && req.body._id !== req.params.id)) { // little bit different as in PUT. :id does not need to be in data, but if the _id and url id must match From 0af2ebc1e75b1b448a613277908c77f64f8eed20 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Mon, 18 Jun 2018 20:44:18 +0200 Subject: [PATCH 09/14] Use new endpoint for sql dashboard --- api/routes/awardings.js | 3 ++- static/src/app/app.config.ts | 1 + .../sql-dashboard/sql-dashboard.component.css | 9 -------- .../sql-dashboard.component.html | 6 ++--- .../sql-dashboard/sql-dashboard.component.ts | 22 +++++-------------- .../army-management/awarding.service.ts | 5 +++++ 6 files changed, 16 insertions(+), 30 deletions(-) diff --git a/api/routes/awardings.js b/api/routes/awardings.js index 4364c47..8ce0fc7 100644 --- a/api/routes/awardings.js +++ b/api/routes/awardings.js @@ -90,7 +90,8 @@ awarding.route('/unprocessed/:squadId') return next(); } const squadUserIds = users.map(user => mongoose.Types.ObjectId(user._id)); - AwardingModel.find({userId: {$in: squadUserIds}, confirmed: 0}, (err, awards) => { + AwardingModel.find({userId: {$in: squadUserIds}, confirmed: 0}).populate('decorationId').populate('proposer', resultSet).populate('userId') + .exec((err, awards) => { res.locals.items = awards; next(); }); diff --git a/static/src/app/app.config.ts b/static/src/app/app.config.ts index 92c7240..caf5810 100644 --- a/static/src/app/app.config.ts +++ b/static/src/app/app.config.ts @@ -5,6 +5,7 @@ export class AppConfig { public readonly apiAppUserPath = this.apiUrl + '/account/'; public readonly apiAuthenticationPath = this.apiUrl + '/authenticate'; public readonly apiAwardPath = this.apiUrl + '/awardings'; + public readonly apiAwardSquadPath = this.apiUrl + '/awardings/unprocessed'; public readonly apiCampaignPath = this.apiUrl + '/campaigns'; public readonly apiDecorationPath = this.apiUrl + '/decorations/'; public readonly apiLogsPath = this.apiUrl + '/logs'; diff --git a/static/src/app/request/sql-dashboard/sql-dashboard.component.css b/static/src/app/request/sql-dashboard/sql-dashboard.component.css index e799ab8..45d7a13 100644 --- a/static/src/app/request/sql-dashboard/sql-dashboard.component.css +++ b/static/src/app/request/sql-dashboard/sql-dashboard.component.css @@ -6,10 +6,6 @@ padding: 5px; } -.trash { - cursor: pointer; -} - .table { overflow-wrap: break-word; table-layout: fixed; @@ -23,11 +19,6 @@ padding: 5px; } -.form-group { - width: 25%; - min-width: 300px; -} - h3 { margin: 80px 0 20px -20px; } diff --git a/static/src/app/request/sql-dashboard/sql-dashboard.component.html b/static/src/app/request/sql-dashboard/sql-dashboard.component.html index 93b3ed5..efe1c07 100644 --- a/static/src/app/request/sql-dashboard/sql-dashboard.component.html +++ b/static/src/app/request/sql-dashboard/sql-dashboard.component.html @@ -1,4 +1,4 @@ -
    +

    SQL Dashboard

    @@ -75,6 +75,4 @@
    - - - +
    diff --git a/static/src/app/request/sql-dashboard/sql-dashboard.component.ts b/static/src/app/request/sql-dashboard/sql-dashboard.component.ts index 69ee83c..39d21e4 100644 --- a/static/src/app/request/sql-dashboard/sql-dashboard.component.ts +++ b/static/src/app/request/sql-dashboard/sql-dashboard.component.ts @@ -1,8 +1,6 @@ -import {Component, OnInit, ViewChild} from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; -import {Promotion, Rank} from '../../models/model-interfaces'; -import {NgForm} from '@angular/forms'; -import {UserService} from '../../services/army-management/user.service'; +import {Award, Promotion, Rank} from '../../models/model-interfaces'; import {RankService} from '../../services/army-management/rank.service'; import {PromotionService} from '../../services/army-management/promotion.service'; import {LoginService} from '../../services/app-user-service/login-service'; @@ -15,18 +13,15 @@ import {AwardingService} from '../../services/army-management/awarding.service'; }) export class SqlDashboardComponent implements OnInit { - @ViewChild(NgForm) form: NgForm; - ranks: Rank[]; - promotions: Promotion[] = []; + promotions: Promotion[]; - awards = []; + awards: Award[]; constructor(private router: Router, private route: ActivatedRoute, private rankService: RankService, - private userService: UserService, private promotionService: PromotionService, private awardingService: AwardingService, private loginService: LoginService) { @@ -39,13 +34,8 @@ export class SqlDashboardComponent implements OnInit { this.promotions = promotions.filter(promotion => promotion.confirmed === 0); }); - this.userService.findUsers('', undefined, currentUser.squad._id).subscribe(users => { - users.forEach(user => { - this.awardingService.getUserAwardings(user._id).subscribe(awardings => { - const unprocessedUserAwardings = awardings.filter(award => award.confirmed === 0); - this.awards = this.awards.concat(unprocessedUserAwardings); - }); - }); + this.awardingService.getUnprocessedSquadAwards(currentUser.squad._id).subscribe(awards => { + this.awards = awards; }); this.rankService.findRanks('', currentUser.squad.fraction).subscribe(ranks => { diff --git a/static/src/app/services/army-management/awarding.service.ts b/static/src/app/services/army-management/awarding.service.ts index 316f141..2fc3778 100644 --- a/static/src/app/services/army-management/awarding.service.ts +++ b/static/src/app/services/army-management/awarding.service.ts @@ -25,6 +25,11 @@ export class AwardingService { }); } + getUnprocessedSquadAwards(squadId?: string) { + return this.http.get(this.config.apiAwardSquadPath.concat('/').concat(squadId)) + .map(res => res.json()); + } + /** * get awards array with populated decorations */ From a6b6677eb785547830c12b5d50937dcd8b15c474 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Mon, 18 Jun 2018 20:54:43 +0200 Subject: [PATCH 10/14] Move login btn to right and center login form --- static/src/app/app.component.html | 6 +++--- static/src/app/login/login.component.html | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/static/src/app/app.component.html b/static/src/app/app.component.html index 732a112..e7c5c94 100644 --- a/static/src/app/app.component.html +++ b/static/src/app/app.component.html @@ -19,9 +19,6 @@
  • Zum Forum
    • -
  • - Login -
  • Armeeübersicht
    • @@ -87,6 +84,9 @@
  • Abmelden
    • +
  • + Login +
diff --git a/static/src/app/login/login.component.html b/static/src/app/login/login.component.html index b66611c..92de22e 100644 --- a/static/src/app/login/login.component.html +++ b/static/src/app/login/login.component.html @@ -1,6 +1,6 @@