@@ -96,7 +96,15 @@
{{award.date | date: 'dd.MM.yyyy'}}
- {{award.confirmed === 0? 'In Bearbeitung' : (award.confirmed === 1? 'Genehmigt' : 'Abgelehnt')}}
+
+ {{'request.award.table.status.progressing' | translate}}
+
+
+ {{'request.award.table.status.accepted' | translate}}
+
+
+ {{'request.award.table.status.rejected' | translate}}
+
|
{{award.rejectReason ? award.rejectReason : ''}}
diff --git a/static/src/app/request/award/req-award.component.ts b/static/src/app/request/award/req-award.component.ts
index d0de1fb..380e8aa 100644
--- a/static/src/app/request/award/req-award.component.ts
+++ b/static/src/app/request/award/req-award.component.ts
@@ -82,10 +82,10 @@ export class RequestAwardComponent implements OnInit {
addAwarding(previewImage, descriptionField) {
if (this.decoration._id && this.reason.length > 0) {
const award: Award = {
- 'userId': this.user._id,
- 'decorationId': this.decoration._id,
- 'reason': this.reason,
- 'date': Date.now()
+ userId: this.user._id,
+ decorationId: this.decoration._id,
+ reason: this.reason,
+ date: Date.now()
};
this.awardingService.requestAwarding(award).subscribe(() => {
this.awardingService.getUserAwardings(this.user._id)
diff --git a/static/src/app/request/confirm-award/confirm-award.component.html b/static/src/app/request/confirm-award/confirm-award.component.html
index 8725080..ba2eac2 100644
--- a/static/src/app/request/confirm-award/confirm-award.component.html
+++ b/static/src/app/request/confirm-award/confirm-award.component.html
@@ -1,18 +1,18 @@
diff --git a/static/src/app/request/confirm-promotion/confirm-promotion.component.html b/static/src/app/request/confirm-promotion/confirm-promotion.component.html
index 6de86fe..40c449d 100644
--- a/static/src/app/request/confirm-promotion/confirm-promotion.component.html
+++ b/static/src/app/request/confirm-promotion/confirm-promotion.component.html
@@ -1,18 +1,18 @@
|