-
-
+
+
+
+
-
+ ;
-
-
constructor(private http: HttpClient,
private config: AppConfig) {
}
diff --git a/static/src/app/services/promotion-service/promotion.service.ts b/static/src/app/services/promotion-service/promotion.service.ts
new file mode 100644
index 0000000..195cf50
--- /dev/null
+++ b/static/src/app/services/promotion-service/promotion.service.ts
@@ -0,0 +1,27 @@
+import {Injectable} from "@angular/core";
+import {AppConfig} from "../../app.config";
+import {HttpClient} from "../http-client";
+import {Promotion} from "../../models/model-interfaces";
+
+@Injectable()
+export class PromotionService {
+
+ constructor(private http: HttpClient,
+ private config: AppConfig) {
+ }
+
+ getSquadPromotions(squadId: string) {
+ return this.http.get(this.config.apiUrl + this.config.apiPromotionPath + '?squadId=' + squadId)
+ .map(res => res.json())
+ }
+
+ requestPromotion(promotion: Promotion) {
+ return this.http.post(this.config.apiUrl + this.config.apiPromotionPath, promotion)
+ }
+
+ deletePromotion(promotionId) {
+ return this.http.delete(this.config.apiUrl + this.config.apiPromotionPath + promotionId)
+ }
+
+}
+
+ ![]()
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Erfolgreich gespeichert
-
-
-
-
-
-
+
+ | Bild | -Bezeichnung | -Begründung | -Antragsteller | -Datum | -Status | -|
|---|---|---|---|---|---|---|
- 
- |
-
-
- |
- - {{award.decorationId.name}} - | -- {{award.reason}} - | -- {{award.proposer?.username}} - | -- {{award.date | date: 'dd.MM.yyyy'}} - | -- {{award.confirmed? 'Bestätigt' : 'In Bearbeitung'}} - | -
+
+
+
+
+
+
+
+
+
+
+ Erfolgreich gespeichert
+
+
+
+
+
+
+
+
diff --git a/static/src/app/request/award/req-award.component.ts b/static/src/app/request/award/req-award.component.ts
index 1446d44..3d213fe 100644
--- a/static/src/app/request/award/req-award.component.ts
+++ b/static/src/app/request/award/req-award.component.ts
@@ -21,6 +21,10 @@ export class RequestAwardComponent {
user: User = {};
+ decoration: Decoration = null;
+
+ reason: string = '';
+
decorations: Decoration[];
awards: Award[];
@@ -39,12 +43,16 @@ export class RequestAwardComponent {
ngOnInit() {
let currentUser = JSON.parse(localStorage.getItem('currentUser'));
// show only current users squad members
- this.userService.findUsers('', undefined, currentUser.squad).subscribe(users => {
+ this.userService.findUsers('', undefined, currentUser.squad._id).subscribe(users => {
this.users = users;
});
}
- toggleUser() {
+ toggleUser(previewImage, decoDescription) {
+ this.decoration = null;
+ if (previewImage && decoDescription) {
+ previewImage.src = decoDescription.innerHTML = '';
+ }
this.decorationService.findDecorations('', this.user.squad.fraction).subscribe(decorations => {
this.decorations = decorations;
});
@@ -57,36 +65,33 @@ export class RequestAwardComponent {
}
- toggleDecoPreview(descriptionField, decorationId, image) {
+ toggleDecoPreview(descriptionField, image) {
this.decoPreviewDisplay = 'flex'; // visible & keep same height for all children
const description = this.decorations.find(
- decoration => decoration._id === decorationId
+ decoration => decoration._id === this.decoration._id
).description;
- image.src = 'resource/decoration/' + decorationId + '.png';
+ image.src = 'resource/decoration/' + this.decoration._id + '.png';
descriptionField.innerHTML = description;
}
- addAwarding(decorationField, reasonField, previewImage, descriptionField) {
- const decorationId = decorationField.value;
- const reason = reasonField.value;
- if (decorationId && reason.length > 0) {
+ addAwarding(previewImage, descriptionField) {
+ if (this.decoration._id && this.reason.length > 0) {
const award = {
"userId": this.user._id,
- "decorationId": decorationId,
- "reason": reason,
+ "decorationId": this.decoration._id,
+ "reason": this.reason,
"date": Date.now()
};
this.awardingService.requestAwarding(award).subscribe(() => {
this.awardingService.getUserAwardings(this.user._id)
.subscribe(awards => {
this.awards = awards;
- console.log(awards[0])
+ this.decoration = null;
+ this.reason = previewImage.src = descriptionField.innerHTML = '';
this.decoPreviewDisplay = 'none';
- decorationField.value = undefined;
- reasonField.value = previewImage.src = descriptionField.innerHTML = '';
this.showSuccessLabel = true;
setTimeout(() => {
this.showSuccessLabel = false;
diff --git a/static/src/app/request/promotion/req-promotion.component.css b/static/src/app/request/promotion/req-promotion.component.css
new file mode 100644
index 0000000..d9356a4
--- /dev/null
+++ b/static/src/app/request/promotion/req-promotion.component.css
@@ -0,0 +1,43 @@
+.decoration-preview {
+ padding: 5px;
+}
+
+.trash {
+ cursor: pointer;
+}
+
+.table {
+ overflow-wrap: break-word;
+ table-layout: fixed;
+}
+
+.table-container {
+ margin-top: 40px;
+ overflow-x: auto;
+ width: 65%;
+}
+
+/* enable scrolling for long list of awardings */
+.overview {
+ position: fixed;
+ overflow-y: scroll;
+ overflow-x: hidden;
+ width: 100%;
+ border-left: thin solid lightgrey;
+ padding: 20px 0 0 50px;
+ margin-left: 10px;
+ height: 100vh;
+ bottom: 10px;
+}
+
+.form-group {
+ width: 25%;
+}
+
+h3 {
+ margin: 80px 0 20px -20px;
+}
+
+label {
+ display: block;
+}
diff --git a/static/src/app/request/promotion/req-promotion.component.html b/static/src/app/request/promotion/req-promotion.component.html
new file mode 100644
index 0000000..fddaa11
--- /dev/null
+++ b/static/src/app/request/promotion/req-promotion.component.html
@@ -0,0 +1,105 @@
+
diff --git a/static/src/app/request/promotion/req-promotion.component.ts b/static/src/app/request/promotion/req-promotion.component.ts
new file mode 100644
index 0000000..528a1aa
--- /dev/null
+++ b/static/src/app/request/promotion/req-promotion.component.ts
@@ -0,0 +1,96 @@
+import {Component, ViewChild} from "@angular/core";
+import {ActivatedRoute, Router} from "@angular/router";
+import {Rank, User} from "../../models/model-interfaces";
+import {NgForm} from "@angular/forms";
+import {UserService} from "../../services/user-service/user.service";
+import {RankService} from "../../services/rank-service/rank.service";
+import {PromotionService} from "../../services/promotion-service/promotion.service";
+
+
+@Component({
+ templateUrl: './req-promotion.component.html',
+ styleUrls: ['./req-promotion.component.css'],
+})
+export class RequestPromotionComponent {
+
+ @ViewChild(NgForm) form: NgForm;
+
+ showForm = false;
+
+ showSuccessLabel = false;
+
+ user: User = {};
+
+ newLevel: number;
+
+ ranks: Rank[];
+
+ users: User[];
+
+ uncheckedPromotions = [];
+
+ constructor(private router: Router,
+ private route: ActivatedRoute,
+ private userService: UserService,
+ private rankService: RankService,
+ private promotionService: PromotionService) {
+ }
+
+ ngOnInit() {
+ let currentUser = JSON.parse(localStorage.getItem('currentUser'));
+ // show only current users squad members
+ this.userService.findUsers('', undefined, currentUser.squad._id).subscribe(users => {
+ this.users = users;
+ });
+ this.rankService.findRanks('', currentUser.squad.fraction).subscribe(ranks => {
+ this.ranks = ranks;
+ });
+ this.promotionService.getSquadPromotions(currentUser.squad._id).subscribe(promotions => {
+ this.uncheckedPromotions = promotions;
+ })
+
+ }
+
+ toggleUser() {
+ this.showForm = true;
+ this.newLevel = this.user.rank.level;
+ }
+
+
+ addPromotion() {
+ const promotion = {
+ "userId": this.user._id,
+ "oldRankLvl": this.user.rank.level,
+ "newRankLvl": this.newLevel,
+ };
+
+ this.promotionService.requestPromotion(promotion).subscribe();
+ this.showSuccessLabel = true;
+ setTimeout(() => {
+ this.showSuccessLabel = false;
+ }, 2000);
+ this.showForm = false;
+ this.user = {};
+
+ let currentUser = JSON.parse(localStorage.getItem('currentUser'));
+ this.promotionService.getSquadPromotions(currentUser.squad._id).subscribe(promotions => {
+ this.uncheckedPromotions = promotions;
+ })
+
+ }
+
+ cancel() {
+ this.router.navigate(['..'], {relativeTo: this.route});
+ return false;
+ }
+
+ /**
+ * compare ngValue with ngModel to assign selected element
+ */
+ equals(o1: User, o2: User) {
+ if (o1 && o2) {
+ return o1._id === o2._id;
+ }
+ }
+
+}
diff --git a/static/src/app/services/awarding-service/awarding.service.ts b/static/src/app/services/awarding-service/awarding.service.ts
index 60c1444..ece287e 100644
--- a/static/src/app/services/awarding-service/awarding.service.ts
+++ b/static/src/app/services/awarding-service/awarding.service.ts
@@ -8,9 +8,6 @@ import {HttpClient} from "../http-client";
@Injectable()
export class AwardingService {
- users$: Observable| Bild | +Bezeichnung | +Begründung | +Antragsteller | +Datum | +Status | +|
|---|---|---|---|---|---|---|
|
+
+ |
+
+
+ |
+ + {{award.decorationId.name}} + | ++ {{award.reason}} + | ++ {{award.proposer?.username}} + | ++ {{award.date | date: 'dd.MM.yyyy'}} + | ++ {{award.confirmed? 'Bestätigt' : 'In Bearbeitung'}} + | +