From 965068f544058323672b91e56f5e6870d99dd4ee Mon Sep 17 00:00:00 2001 From: Florian Hartwich Date: Sat, 29 Jul 2017 11:23:37 +0200 Subject: [PATCH] Fix type compilation errors --- static/src/app/models/model-interfaces.ts | 4 ++-- static/src/app/request/award/req-award.component.ts | 2 +- static/src/app/users/edit-user/edit-user.component.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/static/src/app/models/model-interfaces.ts b/static/src/app/models/model-interfaces.ts index 5b0a706..a3d5dd2 100644 --- a/static/src/app/models/model-interfaces.ts +++ b/static/src/app/models/model-interfaces.ts @@ -11,7 +11,7 @@ export interface User { _id?: string; boardUserId?: number; username?: string; - squad?: Squad; + squad?: any; //Squad or string rank?: Rank; awards?: Award[]; } @@ -54,7 +54,7 @@ export interface Rank { export interface Award { _id?: string, userId: string, - decorationId?: Decoration; + decorationId?: any; //Decoration or string reason?: string; proposer?: AppUser; date?: number; // since Date.now() returns a number diff --git a/static/src/app/request/award/req-award.component.ts b/static/src/app/request/award/req-award.component.ts index 3d213fe..6935187 100644 --- a/static/src/app/request/award/req-award.component.ts +++ b/static/src/app/request/award/req-award.component.ts @@ -79,7 +79,7 @@ export class RequestAwardComponent { addAwarding(previewImage, descriptionField) { if (this.decoration._id && this.reason.length > 0) { - const award = { + const award : Award = { "userId": this.user._id, "decorationId": this.decoration._id, "reason": this.reason, diff --git a/static/src/app/users/edit-user/edit-user.component.html b/static/src/app/users/edit-user/edit-user.component.html index 5e18fee..07c609b 100644 --- a/static/src/app/users/edit-user/edit-user.component.html +++ b/static/src/app/users/edit-user/edit-user.component.html @@ -4,7 +4,7 @@
-