diff --git a/src/app/_guards/auth.guard.ts b/src/app/_guards/auth.guard.ts index d267cf4..6b8cd27 100644 --- a/src/app/_guards/auth.guard.ts +++ b/src/app/_guards/auth.guard.ts @@ -8,13 +8,11 @@ export class AuthGuard implements CanActivate { canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) { if (localStorage.getItem('sessionKey')) { - console.log('session key found'); // logged in so return true return true; } // not logged in so redirect to login page with the return url - console.log('no session key found'); this.router.navigate(['/login'], { queryParams: { returnUrl: state.url }}); return false; } diff --git a/src/app/_guards/customer.guard.ts b/src/app/_guards/customer.guard.ts index 93687c1..1e34c5f 100644 --- a/src/app/_guards/customer.guard.ts +++ b/src/app/_guards/customer.guard.ts @@ -8,11 +8,9 @@ export class CustomerGuard implements CanActivate { canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) { if (localStorage.getItem('usertype') === 'customer') { - console.log('Customer logged in'); // customer logged in so return true return true; } else if (localStorage.getItem('usertype') === 'organisation') { - console.log('not an customer'); this.router.navigate(['/dashboard']); return false; } diff --git a/src/app/_guards/org.guard.ts b/src/app/_guards/org.guard.ts index 0205b47..9954c93 100644 --- a/src/app/_guards/org.guard.ts +++ b/src/app/_guards/org.guard.ts @@ -8,11 +8,9 @@ export class OrgGuard implements CanActivate { canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) { if (localStorage.getItem('usertype') === 'organisation') { - console.log('Organisation logged in'); // org logged in so return true return true; } else if (localStorage.getItem('usertype') === 'customer') { - console.log('not an organisation'); this.router.navigate(['/dashboard-customer']); return false; } diff --git a/src/app/dashboard/add-data.component.ts b/src/app/dashboard/add-data.component.ts index 0247b23..e0ad411 100644 --- a/src/app/dashboard/add-data.component.ts +++ b/src/app/dashboard/add-data.component.ts @@ -174,6 +174,7 @@ export class AddDataComponent implements OnInit { } transactionFormValidate() { + this.transactionFormStatus = null; if (this.submitOrg.name.length && this.amount && (this.recurringPurchase && diff --git a/src/app/dashboard/dashboard-customer.component.html b/src/app/dashboard/dashboard-customer.component.html index b0c8895..f2067cc 100644 --- a/src/app/dashboard/dashboard-customer.component.html +++ b/src/app/dashboard/dashboard-customer.component.html @@ -11,10 +11,10 @@
-
+
-
+
@@ -26,7 +26,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
@@ -76,7 +76,7 @@
-
+
@@ -135,29 +135,29 @@
-
+
-

Purchases by Sector

+

All Purchases by Category

    -
  • - +
  • +
    -
    {{ sectorNames [sector] || 'N/A' }}
    +
    {{ category.category || 'N/A' }}
    Bought
    - {{ sectorPurchases[i] || 'N/A' }} + {{ category.value || 'N/A' }}
    • -
  • - +
  • +
diff --git a/src/app/dashboard/dashboard-customer.component.ts b/src/app/dashboard/dashboard-customer.component.ts index 427c47e..c7b613c 100644 --- a/src/app/dashboard/dashboard-customer.component.ts +++ b/src/app/dashboard/dashboard-customer.component.ts @@ -23,14 +23,14 @@ export class DashboardCustomerComponent implements OnInit { username: any; maxPurchase: number = 0; - disableSectorButton: boolean = false; + disableCategoryButton: boolean = false; public chartType = 'doughnut'; public chartLegend = true; public doughnutChartDataCategory: any[] = []; public doughnutChartLabelsCategory: string[] = []; - public doughtnutChartOptionsCategory:any = { + public doughnutChartOptionsCategory:any = { tooltips: { callbacks: { label: (tooltip, data) => { @@ -100,83 +100,9 @@ export class DashboardCustomerComponent implements OnInit { count: 0, }; - sectorNames = { - A: 'Agriculture, Forestry & Fishing', - B: 'Mining & Quarrying', - C: 'Manufacturing', - D: 'Electricity, Gas, Steam & Air Conditioning', - E: 'Water & Waste Management', - F: 'Construction', - G: 'Wholesale & Retail Trade', - H: 'Transportation & Storage', - I: 'Accomodation & Food Services', - J: 'Information & Communication', - K: 'Financial & Insurance Activities', - L: 'Real Estate', - M: 'Professional, Scientfic & Technical', - N: 'Administrative & Support Services', - O: 'Public Administration, Defence & Social Security', - P: 'Education', - Q: 'Human Health & Social Work', - R: 'Arts, Entertainment & Recreation', - S: 'Other Service Activities', - T: 'Household Domestic Business', - U: 'Extraterritorial Organisations and Bodies' - } - - sectorIcons = { - A: 'icon-drop', - B: 'icon-diamond', - C: 'icon-settings', - D: 'icon-energy', - E: 'icon-trash', - F: 'icon-wrench', - G: 'icon-tag', - H: 'icon-speedometer', - I: 'icon-cup', - J: 'icon-feed', - K: 'icon-credit-card', - L: 'icon-graph', - M: 'icon-chemistry', - N: 'icon-drawer', - O: 'icon-pie-chart', - P: 'icon-graduation', - Q: 'icon-support', - R: 'icon-film', - S: 'icon-calendar', - T: 'icon-home', - U: 'icon-globe', - } - - sectorClasses = { - A: 'bg-primary', - B: 'bg-success', - C: 'bg-danger', - D: 'bg-warning', - E: 'bg-info', - F: 'bg-primary', - G: 'bg-success', - H: 'bg-danger', - I: 'bg-warning', - J: 'bg-info', - K: 'bg-primary', - L: 'bg-success', - M: 'bg-danger', - N: 'bg-warning', - O: 'bg-info', - P: 'bg-primary', - Q: 'bg-success', - R: 'bg-danger', - S: 'bg-warning', - T: 'bg-info', - U: 'bg-primary', - } - - sectorLetters: string[] = []; - sectorPurchases: number[] = []; - sectorLimit: number = 10; - - sectorList: any; + showTotalCategoryList: boolean = false; + totalCategoryLimit: number = 10; + totalCategoryList: any[]=[]; // Graph widgets public widgetList = [ @@ -216,9 +142,10 @@ export class DashboardCustomerComponent implements OnInit { this.api.customerStats().subscribe( result => { this.setWeekPurchaseList(result.weeks); - this.setSectorList(result.sectors); this.setWeekData(result); this.setChartData(result.data.cat_total); + this.totalCategoryList = result.data.cat_list; + this.showTotalCategoryList = true; this.purchaseEssential = result.data.essentials.purchase_no_essential_total; this.purchaseNotEssential = result.data.essentials.purchase_no_total - this.purchaseEssential; this.barChartDataEssential = [ @@ -273,14 +200,9 @@ export class DashboardCustomerComponent implements OnInit { }; } - public setSectorList (data: any) { - this.sectorLetters = Object.keys(data.sectors).map(key => data.sectors[key]); - this.sectorPurchases = Object.keys(data.purchases).map(key => data.purchases[key]); - } - - private loadMore () { - this.disableSectorButton = true; - this.sectorLimit = 22; + private categoryLoadMore () { + this.disableCategoryButton = true; + this.totalCategoryLimit = 30; } public convertHex(hex: string, opacity: number) { diff --git a/src/app/providers/api-service.ts b/src/app/providers/api-service.ts index 46a859e..819f63f 100644 --- a/src/app/providers/api-service.ts +++ b/src/app/providers/api-service.ts @@ -30,18 +30,15 @@ export class ApiService { // Login API public getSessionKey() { - console.log('get key'); return this.sessionKey; } public setSessionKey(key) { - console.log('set key'); this.sessionKey = key; localStorage.setItem('sessionKey', this.sessionKey); } public removeSessionKey() { - console.log('remove key'); this.sessionKey = null; localStorage.removeItem('sessionKey'); } @@ -74,7 +71,6 @@ export class ApiService { } public logout() { - console.log(this.sessionKey); const key = this.sessionKey; return this.http .post( @@ -97,7 +93,6 @@ export class ApiService { data.package_name = 'Foodloop Web'; data.version_code = 'dev'; data.version_number = 'dev'; - console.log(data); return this.http.post( this.apiUrl + '/feedback', data @@ -231,7 +226,6 @@ export class ApiService { public setUserInfo( email: string, display_name: string) { - console.log('set UserInfo'); localStorage.setItem('email', email); localStorage.setItem('displayname', display_name); } @@ -239,7 +233,6 @@ export class ApiService { // Sets usertype public setUserType(user_type: string) { - console.log('set UserType'); localStorage.setItem('usertype', user_type); } @@ -264,33 +257,27 @@ export class ApiService { // Deletes account details on logout public removeUserInfo() { - console.log('remove UserInfo'); localStorage.removeItem('email'); localStorage.removeItem('displayname'); } public getFullName() { - console.log('get Full Name'); localStorage.getItem('fullname'); } public getDisplayName() { - console.log('get Display Name'); localStorage.getItem('displayname'); } public getPostcode() { - console.log('get Postcode'); localStorage.getItem('postcode'); } public getYearOfBirth() { - console.log('get Year of Birth'); localStorage.getItem('yearofbirth'); } public getEmail() { - console.log('get email'); localStorage.getItem('email'); }