diff --git a/src/app/dashboard/add-data.component.ts b/src/app/dashboard/add-data.component.ts
index ffa4ef8..6d64ca8 100644
--- a/src/app/dashboard/add-data.component.ts
+++ b/src/app/dashboard/add-data.component.ts
@@ -30,6 +30,8 @@ export class AddDataComponent implements OnInit {
organisationTown: string;
organisationPostcode: string;
amount: number;
+ // Assumes Groceries is 1st category
+ categoryId: number = 1;
transactionAdditionType = 1;
storeList = [];
showAddStore = false;
@@ -37,6 +39,8 @@ export class AddDataComponent implements OnInit {
transactionFormInvalid = true;
myDate: any;
minDate: any;
+ categoryIdList: number[] = [];
+ categoryNameList: string[] = [];
constructor(
private formBuilder: FormBuilder,
@@ -64,6 +68,15 @@ export class AddDataComponent implements OnInit {
});
this.myDate = moment().format('YYYY-MM-DD[T]HH:mm');
// this.myDate = new Date().toISOString().slice(0, 16);
+ this.api.categoryList().subscribe(
+ result => {
+ this.setCategoryList(result.categories);
+ },
+ error => {
+ console.log('Retrieval Error');
+ console.log( error._body );
+ }
+ );
}
ngOnInit(): void {
@@ -71,6 +84,11 @@ export class AddDataComponent implements OnInit {
this.accountType = localStorage.getItem('usertype');
}
+ private setCategoryList(data: any) {
+ this.categoryIdList = Object.keys(data.ids).map(key => data.ids[key]);
+ this.categoryNameList = Object.keys(data.names).map(key => data.names[key]);
+ }
+
getMinDate() {
// gets the April 1st date of the current year
const aprilDate = moment().month(3).date(1);
@@ -170,6 +188,7 @@ export class AddDataComponent implements OnInit {
transaction_value : this.amount,
purchase_time : purchaseTime,
organisation_id : this.organisationId,
+ category : this.categoryId,
};
break;
case 2:
@@ -178,6 +197,7 @@ export class AddDataComponent implements OnInit {
transaction_value : this.amount,
purchase_time : purchaseTime,
organisation_id : this.organisationId,
+ category : this.categoryId,
};
break;
case 3:
@@ -189,6 +209,7 @@ export class AddDataComponent implements OnInit {
street_name : this.submitOrg.street_name,
town : this.submitOrg.town,
postcode : this.submitOrg.postcode,
+ category : this.categoryId,
};
break;
}
diff --git a/src/app/panels/pie-panel.component.html b/src/app/panels/pie-panel.component.html
index 7e2dd4a..5a6376b 100644
--- a/src/app/panels/pie-panel.component.html
+++ b/src/app/panels/pie-panel.component.html
@@ -4,15 +4,6 @@
All Purchases
-