Pear-Trading/FoodLoop-Web
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'hidedashbox' into finn/CoreUI

Browse source
This commit is contained in:
piratefinn 2017-07-05 10:07:06 +01:00
commit 2e1439f435
3 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/app/dashboard/dashboard.component.html
View file

@ -22,7 +22,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-6 col-lg-3"> <div *ngIf="showGraph.customersthisweekgraph" class="col-sm-6 col-lg-3">
<div class="card card-inverse card-primary"> <div class="card card-inverse card-primary">
<div class="card-block pb-0"> <div class="card-block pb-0">
<div class="btn-group float-right" dropdown> <div class="btn-group float-right" dropdown>
@ -51,7 +51,7 @@
</div> </div>
</div> </div>
</div><!--/.col--> </div><!--/.col-->
<div class="col-sm-6 col-lg-3"> <div *ngIf="showGraph.customerslastweekgraph" class="col-sm-6 col-lg-3">
<div class="card card-inverse card-info"> <div class="card card-inverse card-info">
<div class="card-block pb-0"> <div class="card-block pb-0">
<button type="button" class="btn btn-transparent p-0 float-right"> <button type="button" class="btn btn-transparent p-0 float-right">
@ -73,7 +73,7 @@
</div> </div>
</div> </div>
</div><!--/.col--> </div><!--/.col-->
<div class="col-sm-6 col-lg-3"> <div *ngIf="showGraph.pointsthisweekgraph" class="col-sm-6 col-lg-3">
<div class="card card-inverse card-warning"> <div class="card card-inverse card-warning">
<div class="card-block pb-0"> <div class="card-block pb-0">
<div class="btn-group float-right"> <div class="btn-group float-right">
@ -102,7 +102,7 @@
</div> </div>
</div> </div>
</div><!--/.col--> </div><!--/.col-->
<div class="col-sm-6 col-lg-3"> <div *ngIf="showGraph.pointslastweekgraph" class="col-sm-6 col-lg-3">
<div class="card card-inverse card-danger"> <div class="card card-inverse card-danger">
<div class="card-block pb-0"> <div class="card-block pb-0">
<div class="btn-group float-right" dropdown> <div class="btn-group float-right" dropdown>

7
src/app/dashboard/dashboard.component.ts
View file

@ -16,6 +16,7 @@ export class DashboardComponent implements OnInit {
pointsTotal: any; pointsTotal: any;
averageTransactionToday: any; averageTransactionToday: any;
shuffledArray: any; shuffledArray: any;
showGraph;
constructor( constructor(
private http: Http, private http: Http,
@ -26,15 +27,21 @@ export class DashboardComponent implements OnInit {
.subscribe( .subscribe(
result => { result => {
console.log(result); console.log(result);
// Return what graphs to show
this.showGraph = result.graphstoshow;
// Chart 1
this.customersThisWeek = result.customersthisweek; this.customersThisWeek = result.customersthisweek;
this.lineChart1Data[0].data = this.customersThisWeek.customerno; this.lineChart1Data[0].data = this.customersThisWeek.customerno;
this.lineChart1Labels = this.customersThisWeek.day; this.lineChart1Labels = this.customersThisWeek.day;
// Chart 2
this.customersLastWeek = result.customerslastweek; this.customersLastWeek = result.customerslastweek;
this.lineChart2Data[0].data = this.customersLastWeek.customerno; this.lineChart2Data[0].data = this.customersLastWeek.customerno;
this.lineChart2Labels = this.customersLastWeek.day; this.lineChart2Labels = this.customersLastWeek.day;
// Chart 3
this.pointsThisWeek = result.pointsthisweek; this.pointsThisWeek = result.pointsthisweek;
this.lineChart3Data[0].data = this.pointsThisWeek.points; this.lineChart3Data[0].data = this.pointsThisWeek.points;
this.lineChart3Labels = this.pointsThisWeek.day; this.lineChart3Labels = this.pointsThisWeek.day;
// Chart 4
this.pointsLastWeek = result.pointslastweek; this.pointsLastWeek = result.pointslastweek;
this.barChart1Data[0].data = this.pointsLastWeek.points; this.barChart1Data[0].data = this.pointsLastWeek.points;
this.barChart1Labels = this.pointsLastWeek.day; this.barChart1Labels = this.pointsLastWeek.day;

13
src/app/providers/api-service.ts
View file

@ -93,15 +93,24 @@ export class ApiService {
"moneyspentthismonth" : 156.02, "moneyspentthismonth" : 156.02,
"pointstotal" : 506, "pointstotal" : 506,
"averagetransactiontoday" : 3.69 "averagetransactiontoday" : 3.69
} }
) )
} }
// Fake chart data to mimic // Fake chart data to mimic
public graph_data(data) { public graph_data(data) {
return Observable.of( 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" : "customersthisweek" :
{ {
day : ['Monday', 'tuesday','wednesday','thursday','friday','saturday','sunday'], day : ['Monday', 'tuesday','wednesday','thursday','friday','saturday','sunday'],