diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html index 1e97ae8..d112087 100644 --- a/src/app/dashboard/dashboard.component.html +++ b/src/app/dashboard/dashboard.component.html @@ -22,7 +22,7 @@
-
+
@@ -51,7 +51,7 @@
-
+
-
+
@@ -102,7 +102,7 @@
-
+
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts index 2b0533c..e6d6c78 100644 --- a/src/app/dashboard/dashboard.component.ts +++ b/src/app/dashboard/dashboard.component.ts @@ -16,6 +16,7 @@ export class DashboardComponent implements OnInit { pointsTotal: any; averageTransactionToday: any; shuffledArray: any; + showGraph; constructor( private http: Http, @@ -26,15 +27,21 @@ export class DashboardComponent implements OnInit { .subscribe( result => { console.log(result); + // Return what graphs to show + this.showGraph = result.graphstoshow; + // Chart 1 this.customersThisWeek = result.customersthisweek; this.lineChart1Data[0].data = this.customersThisWeek.customerno; this.lineChart1Labels = this.customersThisWeek.day; + // Chart 2 this.customersLastWeek = result.customerslastweek; this.lineChart2Data[0].data = this.customersLastWeek.customerno; this.lineChart2Labels = this.customersLastWeek.day; + // Chart 3 this.pointsThisWeek = result.pointsthisweek; this.lineChart3Data[0].data = this.pointsThisWeek.points; this.lineChart3Labels = this.pointsThisWeek.day; + // Chart 4 this.pointsLastWeek = result.pointslastweek; this.barChart1Data[0].data = this.pointsLastWeek.points; this.barChart1Labels = this.pointsLastWeek.day; diff --git a/src/app/providers/api-service.ts b/src/app/providers/api-service.ts index 4f7b406..0bab2cd 100644 --- a/src/app/providers/api-service.ts +++ b/src/app/providers/api-service.ts @@ -93,15 +93,24 @@ export class ApiService { "moneyspentthismonth" : 156.02, "pointstotal" : 506, "averagetransactiontoday" : 3.69 - } + } ) } // Fake chart data to mimic - + public graph_data(data) { return Observable.of( { + // graphstoshow is on server and changes every hour, listing what graphs to display + "graphstoshow" : + { + customersthisweekgraph : true, + customerslastweekgraph : false, + pointsthisweekgraph : true, + pointslastweekgraph : false, + + }, "customersthisweek" : { day : ['Monday', 'tuesday','wednesday','thursday','friday','saturday','sunday'],