Enter the postcode where the organisation is located at.
diff --git a/src/app/dashboard/add-data.component.ts b/src/app/dashboard/add-data.component.ts
index 99a1df4..34b0ca3 100644
--- a/src/app/dashboard/add-data.component.ts
+++ b/src/app/dashboard/add-data.component.ts
@@ -30,8 +30,6 @@ export class AddDataComponent implements OnInit {
organisationTown: string;
organisationPostcode: string;
amount: number;
- // Assumes Groceries is 1st category
- categoryId: number = 1;
essentialPurchase = false;
recurringPurchase = false;
recurringType: string;
@@ -42,10 +40,11 @@ export class AddDataComponent implements OnInit {
transactionFormInvalid = true;
myDate: any;
minDate: any;
- leftCategoryIdList: number[] = [];
- rightCategoryIdList: number[] = [];
- leftCategoryNameList: number[] = [];
- rightCategoryNameList: number[] = [];
+ categoryList: any;
+ categoryIdList: any;
+ leftCategoryList: number[] = [];
+ rightCategoryList: string[] = [];
+ categoryId: number;
constructor(
private formBuilder: FormBuilder,
@@ -75,7 +74,9 @@ export class AddDataComponent implements OnInit {
// this.myDate = new Date().toISOString().slice(0, 16);
this.api.categoryList().subscribe(
result => {
- this.setCategoryList(result.categories);
+ this.categoryList = result.categories;
+ this.categoryIdList = Object.keys(this.categoryList);
+ this.setCategoryList(this.categoryIdList);
},
error => {
console.log('Retrieval Error');
@@ -90,13 +91,9 @@ export class AddDataComponent implements OnInit {
}
private setCategoryList(data: any) {
- let categoryIdList = Object.keys(data.ids).map(key => data.ids[key]);
- let categoryNameList = Object.keys(data.names).map(key => data.names[key]);
- let halfLength = Math.floor(categoryIdList.length / 2);
- this.leftCategoryIdList = categoryIdList.splice(0, halfLength);
- this.leftCategoryNameList = categoryNameList.splice(0, halfLength);
- this.rightCategoryIdList = categoryIdList;
- this.rightCategoryNameList = categoryNameList;
+ let halfLength = Math.floor(data.length / 2);
+ this.leftCategoryList = data.splice(0, halfLength);
+ this.rightCategoryList = data;
}
getMinDate() {
@@ -177,14 +174,15 @@ export class AddDataComponent implements OnInit {
}
transactionFormValidate() {
- if (this.submitOrg.name.length === 0 ||
- this.submitOrg.town.length === 0 ||
- this.amount === 0 ||
- this.recurringPurchase &&
- !this.recurringType) {
- this.transactionFormInvalid = true;
- } else {
+ if (this.submitOrg.name.length &&
+ this.amount &&
+ (this.recurringPurchase &&
+ this.recurringType ||
+ !this.recurringPurchase &&
+ !this.recurringType)) {
this.transactionFormInvalid = false;
+ } else {
+ this.transactionFormInvalid = true;
}
}
@@ -238,31 +236,22 @@ export class AddDataComponent implements OnInit {
.subscribe(
result => {
if ( result.success === true ) {
- console.log('Successful Upload');
- console.log(result);
this.transactionFormStatus = 'success';
- console.log(this.transactionFormStatus);
this.resetForm();
} else {
- console.log('Upload Error');
this.transactionFormStatusError = JSON.stringify(result.status) + 'Error, ' + JSON.stringify(result.message);
this.transactionFormStatus = 'send_failed';
- console.log(this.transactionFormStatus);
}
},
error => {
- console.log('Upload Error');
console.log(error);
try {
console.log(error.error);
- const jsonError = error.json();
- console.log('boop');
- this.transactionFormStatusError = '"' + jsonError.error + '" Error, ' + jsonError.message;
+ this.transactionFormStatusError = '"' + error.error.error + '" Error, ' + error.error.message;
} catch (e) {
this.transactionFormStatusError = 'There was a server error, please try again later.';
}
this.transactionFormStatus = 'send_failed';
- console.log(this.transactionFormStatus);
}
);
}
@@ -290,14 +279,11 @@ export class AddDataComponent implements OnInit {
.orgPayroll(this.payrollForm.value)
.subscribe(
result => {
- console.log('data submitted!');
this.payrollFormStatus = 'success';
- console.log(this.payrollFormStatus);
},
error => {
console.log( error._body );
this.payrollFormStatus = 'send_failed';
- console.log(this.payrollFormStatus);
}
);
}
@@ -309,14 +295,10 @@ export class AddDataComponent implements OnInit {
.orgSupplier(this.singleSupplierForm.value)
.subscribe(
result => {
- console.log('data submitted!');
this.singleSupplierFormStatus = 'success';
- console.log(this.singleSupplierFormStatus);
},
error => {
- console.log( error._body );
this.singleSupplierFormStatus = 'send_failed';
- console.log(this.singleSupplierFormStatus);
}
);
}
@@ -328,14 +310,10 @@ export class AddDataComponent implements OnInit {
.orgEmployee(this.employeeForm.value)
.subscribe(
result => {
- console.log('data submitted!');
this.employeeFormStatus = 'success';
- console.log(this.employeeFormStatus);
},
error => {
- console.log( error._body );
this.employeeFormStatus = 'send_failed';
- console.log(this.employeeFormStatus);
}
);
}
diff --git a/src/app/dashboard/category-month.component.html b/src/app/dashboard/category-month.component.html
index 7bb83db..db24b1f 100644
--- a/src/app/dashboard/category-month.component.html
+++ b/src/app/dashboard/category-month.component.html
@@ -12,8 +12,8 @@
-
Essential Purchases
- {{ ( weekEssential1.value || 0 ) | currency:'GBP':'symbol':'1.2-2' }}
- ({{ (weekEssential1.value || 0 ) / weekListValueSum1 | percent:'1.0-0' }})
+ {{ ( weekEssential1 ? weekEssential1.value : 0 ) | currency:'GBP':'symbol':'1.2-2' }}
+ ({{ ( weekEssential1 ? weekEssential1.value : 0 ) / weekListValueSum1 | percent:'1.0-0' }})
-
- {{ categoryNameList[categoryEntry.category - 1] || 'Uncategorised' }}
+ {{ categoryList[categoryEntry.category] || 'Uncategorised' }}
{{ ( categoryEntry.value || 0 ) | currency:'GBP':'symbol':'1.2-2' }}
({{ (categoryEntry.value || 0 ) / weekListValueSum1 | percent:'1.0-0' }})
@@ -54,8 +54,8 @@
-
Essential Purchases
- {{ ( weekEssential2.value || 0 ) | currency:'GBP':'symbol':'1.2-2' }}
- ({{ (weekEssential2.value || 0 ) / weekListValueSum2 | percent:'1.0-0' }})
+ {{ ( weekEssential2 ? weekEssential2.value : 0 ) | currency:'GBP':'symbol':'1.2-2' }}
+ ({{ ( weekEssential2 ? weekEssential2.value : 0 ) / weekListValueSum2 | percent:'1.0-0' }})
-
- {{ categoryNameList[categoryEntry.category - 1] || 'Uncategorised' }}
+ {{ categoryList[categoryEntry.category] || 'Uncategorised' }}
{{ ( categoryEntry.value || 0 ) | currency:'GBP':'symbol':'1.2-2' }}
({{ (categoryEntry.value || 0 ) / weekListValueSum2 | percent:'1.0-0' }})
@@ -96,8 +96,8 @@
-
Essential Purchases
- {{ ( weekEssential1.value || 0 ) | currency:'GBP':'symbol':'1.2-2' }}
- ({{ (weekEssential3.value || 0 ) / weekListValueSum3 | percent:'1.0-0' }})
+ {{ ( weekEssential3 ? weekEssential3.value : 0 ) | currency:'GBP':'symbol':'1.2-2' }}
+ ({{ ( weekEssential3 ? weekEssential3.value : 0 ) / weekListValueSum3 | percent:'1.0-0' }})
-
- {{ categoryNameList[categoryEntry.category - 1] || 'Uncategorised' }}
+ {{ categoryList[categoryEntry.category] || 'Uncategorised' }}
{{ ( categoryEntry.value || 0 ) | currency:'GBP':'symbol':'1.2-2' }}
({{ (categoryEntry.value || 0 ) / weekListValueSum3 | percent:'1.0-0' }})
@@ -138,8 +138,8 @@
-
Essential Purchases
- {{ ( weekEssential4.value || 0 ) | currency:'GBP':'symbol':'1.2-2' }}
- ({{ (weekEssential4.value || 0 ) / weekListValueSum4 | percent:'1.0-0' }})
+ {{ ( weekEssential4 ? weekEssential4.value : 0 ) | currency:'GBP':'symbol':'1.2-2' }}
+ ({{ ( weekEssential4 ? weekEssential4.value : 0 ) / weekListValueSum4 | percent:'1.0-0' }})
-
- {{ categoryNameList[categoryEntry.category - 1] || 'Uncategorised' }}
+ {{ categoryList[categoryEntry.category] || 'Uncategorised' }}
{{ ( categoryEntry.value || 0 ) | currency:'GBP':'symbol':'1.2-2' }}
({{ (categoryEntry.value || 0 ) / weekListValueSum4 | percent:'1.0-0' }})
diff --git a/src/app/dashboard/category-month.component.ts b/src/app/dashboard/category-month.component.ts
index 809e71f..140e8e3 100644
--- a/src/app/dashboard/category-month.component.ts
+++ b/src/app/dashboard/category-month.component.ts
@@ -31,15 +31,13 @@ export class CategoryMonthComponent implements OnInit {
weekEssential3: number = 0;
weekEssential4: number = 0;
- categoryList: number[] = [];
+ categoryList: any;
dayList: any[] = [];
valueList: number[] = [];
myWeek1: any;
myWeek2: any;
myWeek3: any;
myWeek4: any;
- categoryIdList: number[] = [];
- categoryNameList: string[] = [];
categoryLimit1: number = 6;
categoryLimit2: number = 6;
categoryLimit3: number = 6;
@@ -51,7 +49,8 @@ export class CategoryMonthComponent implements OnInit {
this.setDate();
this.api.categoryList().subscribe(
result => {
- this.setCategoryList(result.categories);
+ this.categoryList = result.categories;
+ console.log('Category List received');
},
error => {
console.log('Retrieval Error');
@@ -72,11 +71,6 @@ export class CategoryMonthComponent implements OnInit {
ngOnInit(): void {
}
- 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]);
- }
-
private setDate () {
this.myWeek1 = moment().startOf('isoWeek').format('YYYY-MM-DD');
this.myWeek2 = moment(this.myWeek1).subtract(1, 'weeks').format('YYYY-MM-DD');
diff --git a/src/app/dashboard/dashboard.module.ts b/src/app/dashboard/dashboard.module.ts
index 2e47f80..21573f4 100644
--- a/src/app/dashboard/dashboard.module.ts
+++ b/src/app/dashboard/dashboard.module.ts
@@ -31,6 +31,8 @@ import { PiePanel } from '../panels/pie-panel.component';
import { DashboardRoutingModule } from './dashboard.routing';
import { OrgResultComponent } from '../shared/org-result.component';
import { OrgTableComponent } from '../shared/org-table.component';
+import { RecurResultComponent } from '../shared/recur-result.component';
+import { RecurTableComponent } from '../shared/recur-table.component';
import { TransactionResultComponent } from '../shared/transaction-result.component';
import { PayrollResultComponent } from '../shared/payroll-result.component';
import { LeaderboardResultComponent } from '../shared/leaderboard-result.component';
@@ -61,6 +63,8 @@ import { environment } from '../../environments/environment';
AddDataComponent,
OrgResultComponent,
OrgTableComponent,
+ RecurResultComponent,
+ RecurTableComponent,
TransactionLogComponent,
CategoryMonthComponent,
TransactionResultComponent,
diff --git a/src/app/dashboard/feedback.component.ts b/src/app/dashboard/feedback.component.ts
index 5228a3c..0603fbc 100644
--- a/src/app/dashboard/feedback.component.ts
+++ b/src/app/dashboard/feedback.component.ts
@@ -55,9 +55,7 @@ export class FeedbackComponent implements OnInit {
result => {
if ( result.success === true ) {
console.log('Successful Upload');
- console.log(result);
this.feedbackFormStatus = 'success';
- console.log(this.feedbackFormStatus);
this.feedbackForm.patchValue({
feedbacktext: '',
});
@@ -65,22 +63,16 @@ export class FeedbackComponent implements OnInit {
console.log('Upload Error');
this.feedbackFormStatusError = JSON.stringify(result.status) + 'Error, ' + JSON.stringify(result.message);
this.feedbackFormStatus = 'send_failed';
- console.log(this.feedbackFormStatus);
}
},
error => {
console.log('Upload Error');
- console.log(error);
try {
- console.log(error.error);
- const jsonError = error.json();
- console.log('boop');
- this.feedbackFormStatusError = '"' + jsonError.error + '" Error, ' + jsonError.message;
+ this.feedbackFormStatusError = '"' + error.error.error + '" Error, ' + error.error.message;
} catch (e) {
this.feedbackFormStatusError = 'There was a server error, please try again later.';
}
this.feedbackFormStatus = 'send_failed';
- console.log(this.feedbackFormStatus);
}
);
}
diff --git a/src/app/dashboard/trail-map.component.ts b/src/app/dashboard/trail-map.component.ts
index 3f15c06..6390d27 100644
--- a/src/app/dashboard/trail-map.component.ts
+++ b/src/app/dashboard/trail-map.component.ts
@@ -51,7 +51,6 @@ export class TrailMapComponent implements OnInit, AfterViewInit {
}
public onMarkerClick(clickedMarker, template: TemplateRef
) {
- console.log(clickedMarker);
this.clickedMarker = clickedMarker;
this.assocLogo = 'assets/img/association/' + this.assocMap + '-logo.png';
this.openModal(template);
diff --git a/src/app/dashboard/transaction-log.component.html b/src/app/dashboard/transaction-log.component.html
index b4f1e30..424897e 100644
--- a/src/app/dashboard/transaction-log.component.html
+++ b/src/app/dashboard/transaction-log.component.html
@@ -44,6 +44,102 @@
No Transactions available.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{transactionFormStatusSuccess}}
+
+
+ {{transactionFormStatusError}}
+
+
+
+
+
+
+ No Recurring Transactions.
+
+
{{recur.seller}} |
+{{categories[recur.category] || 'Uncategorised'}} |
+{{recur.essential == 1 ? 'true' : 'false'}} |
+{{recur.display_time}} |
+{{recur.recurring_period}} |
+{{recur.value}} |
diff --git a/src/app/shared/recur-result.component.ts b/src/app/shared/recur-result.component.ts
new file mode 100644
index 0000000..3532464
--- /dev/null
+++ b/src/app/shared/recur-result.component.ts
@@ -0,0 +1,40 @@
+import { Component, Input, Output, EventEmitter } from '@angular/core';
+import * as moment from 'moment';
+
+interface RecurData {
+ category: number;
+ essential: number;
+ id: number;
+ last_updated: string;
+ recurring_period: string;
+ seller: string;
+ start_time: string;
+ value: number;
+ display_time: any;
+}
+
+@Component({
+ // tslint:disable-next-line
+ selector: '[recur-result]',
+ templateUrl: 'recur-result.component.html',
+})
+export class RecurResultComponent {
+ @Input() public recur: RecurData;
+ @Output() public onClick = new EventEmitter();
+ @Input() public categories: any;
+ public updatedDate: string;
+
+ ngOnInit(): void {
+ if (this.recur.last_updated) {
+ this.recur.display_time = moment(this.recur.last_updated).format('llll');
+ } else {
+ this.recur.display_time = moment(this.recur.start_time).format('llll');
+ }
+ }
+
+ public recurClick(): void {
+ this.onClick.emit(
+ this.recur
+ );
+ }
+}
diff --git a/src/app/shared/recur-table.component.html b/src/app/shared/recur-table.component.html
new file mode 100644
index 0000000..a6ec55d
--- /dev/null
+++ b/src/app/shared/recur-table.component.html
@@ -0,0 +1,17 @@
+
diff --git a/src/app/shared/recur-table.component.ts b/src/app/shared/recur-table.component.ts
new file mode 100644
index 0000000..c2f6ef0
--- /dev/null
+++ b/src/app/shared/recur-table.component.ts
@@ -0,0 +1,30 @@
+import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { RecurResultComponent } from '../shared/recur-result.component';
+
+interface RecurData {
+ category: string;
+ essential: number;
+ id: number;
+ last_updated: string;
+ recurring_period: string;
+ seller: string;
+ start_time: string;
+ value: number;
+ display_time: any;
+}
+
+@Component({
+ // tslint:disable-next-line
+ selector: 'recur-table',
+ templateUrl: 'recur-table.component.html',
+})
+export class RecurTableComponent {
+ @Input() public recurList: Array;
+ @Output() public onClick = new EventEmitter();
+ @Input() public categories: any;
+
+
+ public recurClick(event: any): void {
+ this.onClick.emit( event );
+ }
+}