Fix type compilation errors
							parent
							
								
									48728321d9
								
							
						
					
					
						commit
						965068f544
					
				| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,7 +4,7 @@
 | 
			
		|||
 | 
			
		||||
  <div class="form-group">
 | 
			
		||||
    <label for="title">Name</label>
 | 
			
		||||
    <input type="text" class="form-control"
 | 
			
		||||
    <input class="form-control"
 | 
			
		||||
           [(ngModel)]="user.username"
 | 
			
		||||
           name="title"
 | 
			
		||||
           id="title"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue