parent
305566c911
commit
89d31fe150
@ -36,7 +36,7 @@ export class AllowancePage implements ViewWillEnter {
|
|||||||
allowance[0].name = 'Main Allowance';
|
allowance[0].name = 'Main Allowance';
|
||||||
this.allowance$.next(allowance);
|
this.allowance$.next(allowance);
|
||||||
})
|
})
|
||||||
}, 20);
|
}, 50);
|
||||||
}
|
}
|
||||||
|
|
||||||
canFinishGoal(allowance: Allowance): boolean {
|
canFinishGoal(allowance: Allowance): boolean {
|
||||||
@ -57,6 +57,9 @@ export class AllowancePage implements ViewWillEnter {
|
|||||||
for (let allowance of allowanceList) {
|
for (let allowance of allowanceList) {
|
||||||
allowanceTotal += allowance.progress;
|
allowanceTotal += allowance.progress;
|
||||||
}
|
}
|
||||||
|
if (allowanceTotal === 0) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
return goal.progress / allowanceTotal * 100;
|
return goal.progress / allowanceTotal * 100;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ export class TasksPage implements ViewWillEnter {
|
|||||||
this.taskService.getTaskList().subscribe(tasks => {
|
this.taskService.getTaskList().subscribe(tasks => {
|
||||||
this.tasks$.next(tasks);
|
this.tasks$.next(tasks);
|
||||||
});
|
});
|
||||||
}, 10);
|
}, 50);
|
||||||
}
|
}
|
||||||
|
|
||||||
createTask() {
|
createTask() {
|
||||||
|
@ -7,7 +7,7 @@ import { Allowance } from '../models/allowance';
|
|||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
export class AllowanceService {
|
export class AllowanceService {
|
||||||
private url = 'http://localhost:8080/api';
|
private url = 'https://allowanceplanner.seeseepuff.be/api';
|
||||||
|
|
||||||
constructor(private http: HttpClient) {}
|
constructor(private http: HttpClient) {}
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ import { History } from '../models/history';
|
|||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
export class HistoryService {
|
export class HistoryService {
|
||||||
private url = 'http://localhost:8080/api';
|
private url = 'https://allowanceplanner.seeseepuff.be/api';
|
||||||
|
|
||||||
constructor(private http: HttpClient) {}
|
constructor(private http: HttpClient) {}
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ import { Task } from '../models/task';
|
|||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
export class TaskService {
|
export class TaskService {
|
||||||
private url = 'http://localhost:8080/api';
|
private url = 'https://allowanceplanner.seeseepuff.be/api';
|
||||||
|
|
||||||
constructor(private http: HttpClient) {}
|
constructor(private http: HttpClient) {}
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ import { User } from '../models/user';
|
|||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class UserService {
|
export class UserService {
|
||||||
private url = 'http://localhost:8080/api';
|
private url = 'https://allowanceplanner.seeseepuff.be/api';
|
||||||
constructor(private http: HttpClient) {}
|
constructor(private http: HttpClient) {}
|
||||||
|
|
||||||
getUserList(): Observable<Array<User>> {
|
getUserList(): Observable<Array<User>> {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user