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

Merge branch 'finn/fixes' into development

Browse source
This commit is contained in:
piratefinn 2018-04-17 14:19:07 +01:00
commit 77972adcbf
3 changed files with 31 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/build-releases
View file

@ -1,4 +1,5 @@
#! /bin/bash #! /bin/bash
set -e
VERSION=`git describe --tags` VERSION=`git describe --tags`

46
src/app/dashboard/dashboard-customer.component.html
View file

@ -14,29 +14,29 @@
<div class="col-xl-4 col-md-6"> <div class="col-xl-4 col-md-6">
<panel-pie></panel-pie> <panel-pie></panel-pie>
</div><!--/.col--> </div><!--/.col-->
<div class="col-xl-4 col-md-6"> <div *ngIf="showCategoryDoughnutChart" class="col-xl-4 col-md-6">
<div *ngIf="showCategoryDoughnutChart" class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<h4 class="card-title mb-0">Weekly Spending by Category</h4> <h4 class="card-title mb-0">Weekly Spending by Category</h4>
</div>
</div>
<div class="chart-wrapper">
<canvas baseChart class="chart"
[datasets]="doughnutChartDataCategory"
[labels]="doughnutChartLabelsCategory"
[options]="doughtnutChartOptionsCategory"
[legend]="chartLegend"
[chartType]="chartType"
(chartHover)="chartHovered($event)"
(chartClick)="chartClicked($event)"></canvas>
</div>
</div>
</div> </div>
</div>
<div class="chart-wrapper">
<canvas baseChart class="chart"
[datasets]="doughnutChartDataCategory"
[labels]="doughnutChartLabelsCategory"
[options]="doughtnutChartOptionsCategory"
[legend]="chartLegend"
[chartType]="chartType"
(chartHover)="chartHovered($event)"
(chartClick)="chartClicked($event)"></canvas>
</div>
</div>
</div>
</div><!--/.col--> </div><!--/.col-->
<div class="col-xl-4 col-md-6"> <div *ngIf="showEssentialBarChart" class="col-xl-4 col-md-6">
<div *ngIf="showEssentialBarChart" class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
@ -55,8 +55,8 @@
</div> </div>
</div> </div>
</div><!--/.col--> </div><!--/.col-->
<div class="col-xl-4 col-md-6"> <div *ngIf="showCategoryBarChart" class="col-xl-4 col-md-6">
<div *ngIf="showCategoryBarChart" class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">

7
src/app/panels/pie-panel.component.ts
View file

@ -52,4 +52,11 @@ export class PiePanel implements OnInit {
return rgba; return rgba;
} }
// events
public chartClicked(e: any): void {
}
public chartHovered(e: any): void {
}
} }