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

Changes to top bar

Browse source
This commit is contained in:
Unknown 2017-05-12 17:07:18 +01:00
parent 617fa716a7
commit bf1638e2e1
6 changed files with 35 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/app/widgets/widgets.component.html
View file

@ -115,7 +115,7 @@
<div class="card">
<div class="card-header card-header-inverse card-header-primary">
<div class="font-weight-bold">
<span>SALE</span>
<span>Money spent this week</span>
<span class="float-right">$1.890,65</span>
</div>
<div>
@ -155,7 +155,7 @@
<div class="card">
<div class="card-header card-header-inverse card-header-danger">
<div class="font-weight-bold">
<span>SALE</span>
<span>Money spent last week</span>
<span class="float-right">$1.890,65</span>
</div>
<div>
@ -168,23 +168,23 @@
</div>
<div class="chart-wrapper" style="height:38px;">
<canvas baseChart class="chart"
[datasets]="lineChart4Data"
[labels]="lineChart4Labels"
[options]="lineChart4Options"
[datasets]="lineChart5Data"
[labels]="lineChart5Labels"
[options]="lineChart5Options"
[colors]="lineChart4Colours"
[legend]="lineChart4Legend"
[chartType]="lineChart4Type"
[legend]="lineChart5Legend"
[chartType]="lineChart5Type"
(chartHover)="chartHovered($event)"
(chartClick)="chartClicked($event)"></canvas>
</div>
<div class="chart-wrapper" style="height:38px;">
<canvas baseChart class="chart"
[datasets]="barChart2Data"
[labels]="barChart2Labels"
[options]="barChart2Options"
[datasets]="barChart3Data"
[labels]="barChart3Labels"
[options]="barChart3Options"
[colors]="barChart2Colours"
[legend]="barChart2Legend"
[chartType]="barChart2Type"
[legend]="barChart3Legend"
[chartType]="barChart3Type"
(chartHover)="chartHovered($event)"
(chartClick)="chartClicked($event)"></canvas>
</div>

10
src/app/widgets/widgets.component.ts
View file

@ -36,7 +36,7 @@ export class WidgetsComponent {
// lineChart1
public lineChart1Data: Array<any> = [
{
data: [65, 59, 84, 84, 51, 55, 40],
data: [80, 59, 84, 84, 51, 55, 40],
label: 'Series A'
}
];
@ -220,11 +220,11 @@ export class WidgetsComponent {
// lineChart4
public lineChart4Data: Array<any> = [
{
data: [4, 18, 9, 17, 34, 22, 11, 3, 15, 12, 18, 9],
data: [4, 18, 9, 17, 80, 22, 11],
label: 'Series A'
}
];
public lineChart4Labels: Array<any> = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
public lineChart4Labels: Array<any> = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'];
public lineChart4Options: any = {
maintainAspectRatio: false,
scales: {
@ -259,7 +259,7 @@ export class WidgetsComponent {
label: 'Series A'
}
];
public barChart2Labels: Array<any> = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
public barChart2Labels: Array<any> = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'];
public barChart2Options: any = {
maintainAspectRatio: false,
scales: {
@ -338,7 +338,7 @@ export class WidgetsComponent {
// lineChart5
public lineChart5Data: Array<any> = [
{
data: [65, 59, 84, 84, 51, 55, 40],
data: [4, 18, 9, 17, 34, 22, 11, 3, 15, 12, 18, 9],
label: 'Series A'
}
];