Merge branch 'finn/fixes' into development
This commit is contained in:
commit
77972adcbf
3 changed files with 31 additions and 23 deletions
|
@ -1,4 +1,5 @@
|
||||||
#! /bin/bash
|
#! /bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
VERSION=`git describe --tags`
|
VERSION=`git describe --tags`
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,8 @@
|
||||||
<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">
|
||||||
|
@ -33,10 +33,10 @@
|
||||||
(chartClick)="chartClicked($event)"></canvas>
|
(chartClick)="chartClicked($event)"></canvas>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</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">
|
||||||
|
|
|
@ -52,4 +52,11 @@ export class PiePanel implements OnInit {
|
||||||
return rgba;
|
return rgba;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// events
|
||||||
|
public chartClicked(e: any): void {
|
||||||
|
}
|
||||||
|
|
||||||
|
public chartHovered(e: any): void {
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue