diff options
Diffstat (limited to 'ufund-ui')
| -rw-r--r-- | ufund-ui/src/app/components/cupboard/cupboard.component.ts | 8 | ||||
| -rw-r--r-- | ufund-ui/src/app/components/need-list/need-list.component.ts | 9 | ||||
| -rw-r--r-- | ufund-ui/src/app/models/Need.ts | 4 | 
3 files changed, 12 insertions, 9 deletions
diff --git a/ufund-ui/src/app/components/cupboard/cupboard.component.ts b/ufund-ui/src/app/components/cupboard/cupboard.component.ts index 2230cd3..a4706b3 100644 --- a/ufund-ui/src/app/components/cupboard/cupboard.component.ts +++ b/ufund-ui/src/app/components/cupboard/cupboard.component.ts @@ -1,6 +1,6 @@  import {Component, OnInit, ViewChild} from '@angular/core';  import { CupboardService } from '../../services/cupboard.service'; -import { Need, GoalType } from '../../models/Need'; +import { Need } from '../../models/Need';  import { userType } from '../../models/User';  import { catchError, of } from 'rxjs';  import { NeedListComponent } from '../need-list/need-list.component'; @@ -90,7 +90,7 @@ export class CupboardComponent implements OnInit {              id: 0,              maxGoal: form.maxGoal,              type: form.type, -            urgent: form.urgent ? true : false, +            urgent: !!form.urgent,              filterAttributes: [],              current: 0,              description: form.description @@ -120,8 +120,4 @@ export class CupboardComponent implements OnInit {              );      } - -    destroy() { - -    }  } diff --git a/ufund-ui/src/app/components/need-list/need-list.component.ts b/ufund-ui/src/app/components/need-list/need-list.component.ts index 06a612e..2ec850e 100644 --- a/ufund-ui/src/app/components/need-list/need-list.component.ts +++ b/ufund-ui/src/app/components/need-list/need-list.component.ts @@ -1,5 +1,5 @@  import {Component, EventEmitter, Output} from '@angular/core'; -import {Need} from '../../models/Need'; +import {GoalType, Need} from '../../models/Need';  import {CupboardService} from '../../services/cupboard.service';  import {UsersService} from '../../services/users.service';  import {userType} from '../../models/User'; @@ -72,6 +72,10 @@ export class NeedListComponent {    itemsPerPage: number = 5;    totalPages: number = Math.ceil(this.needs.length / this.itemsPerPage); +  getPrefix(need: Need) { +      return (need.type === GoalType.MONETARY) ? "$" : ""; +  } +    decrementPage() {      this.currentPage--;      this.updateVisibleNeeds(); @@ -229,6 +233,7 @@ export class NeedListComponent {      if (currentUser) {        if (!currentUser.basket.includes(need.id)) {          currentUser.basket.push(need.id); +        this.toastService.sendToast(ToastType.INFO, "Need added to your basket!")          this.usersService.updateUser(currentUser)              .pipe(catchError((err, _) =>  {                  console.error(err); @@ -278,5 +283,7 @@ export class NeedListComponent {          button.style.visibility = 'hidden';        }    } + +    protected readonly GoalType = GoalType;  } diff --git a/ufund-ui/src/app/models/Need.ts b/ufund-ui/src/app/models/Need.ts index 6cf7e76..588e745 100644 --- a/ufund-ui/src/app/models/Need.ts +++ b/ufund-ui/src/app/models/Need.ts @@ -12,6 +12,6 @@ export interface Need {  }  export enum GoalType { -    MONETARY, -    PHYSICAL +    MONETARY = 'MONETARY', +    PHYSICAL = 'PHYSICAL'  }  | 
