diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts
index 8ecad53..ee10b2b 100644
--- a/src/app/dashboard/dashboard.component.ts
+++ b/src/app/dashboard/dashboard.component.ts
@@ -46,9 +46,9 @@ export class DashboardComponent {
},
{
type: 'graph',
- name: 'sales_last_365_days',
+ name: 'sales_all',
icon: 'icon-diamond',
- title: 'Sales Last Year',
+ title: 'All Sales',
dataType: DataType.currency,
},
{
@@ -65,8 +65,8 @@ export class DashboardComponent {
},
{
type: 'graph',
- name: 'purchases_last_365_days;',
- title: 'Purchases Last Year',
+ name: 'purchases_all;',
+ title: 'All Purchases',
dataType: DataType.currency,
},
];
@@ -76,7 +76,7 @@ export class DashboardComponent {
public bootstrapColours: string[] = ['bg-primary', 'bg-secondary', 'bg-success',
'bg-danger', 'bg-warning', 'bg-info'];
- public chartType = 'doughnut';
+ public chartType = 'pie';
public chartLegend = true;
public doughnutChartDataCategory: any[] = [];
public doughnutChartLabelsCategory: string[] = [];
@@ -118,6 +118,21 @@ export class DashboardComponent {
}
};
public barChartTypeEssential:string = 'horizontalBar';
+ public barChartColoursCategory: any[] = [
+ {
+ backgroundColor:[
+ 'red',
+ 'green',
+ 'blue',
+ 'purple',
+ 'yellow',
+ 'brown',
+ 'magenta',
+ 'cyan',
+ 'orange',
+ 'pink'
+ ]
+ }];
public barChartOptionsCategory:any = {
scaleShowVerticalLines: false,
diff --git a/src/app/dashboard/more-graphs-and-tables.component.html b/src/app/dashboard/more-graphs-and-tables.component.html
index d4e5e2d..4181e96 100644
--- a/src/app/dashboard/more-graphs-and-tables.component.html
+++ b/src/app/dashboard/more-graphs-and-tables.component.html
@@ -3,7 +3,7 @@
-
Spend by Company Type
+ Spend amount and number of purchases by supplier name
diff --git a/src/app/dashboard/more-graphs-and-tables.component.ts b/src/app/dashboard/more-graphs-and-tables.component.ts
index 92c0c30..10785c5 100644
--- a/src/app/dashboard/more-graphs-and-tables.component.ts
+++ b/src/app/dashboard/more-graphs-and-tables.component.ts
@@ -85,9 +85,18 @@ export class MoreStuffComponent implements OnInit {
type: 'time',
time: {
unit: 'month'
+ },
+ scaleLabel:{
+ display:true,
+ labelString:'Date'
}
}],
- yAxes: []
+ yAxes: [{
+ scaleLabel: {
+ display:true,
+ labelString:'Number of purchases'
+ }
+ }]
},
tooltips: {
callbacks: {
@@ -133,7 +142,7 @@ export class MoreStuffComponent implements OnInit {
public yearSpendChartData: any[] = [
{
data: [],
- label: ["Value"],
+ label: ["Value £"],
fill: false,
borderColor: 'red',
hoverBackgroundColor: '#ffa1b5',
@@ -157,6 +166,10 @@ export class MoreStuffComponent implements OnInit {
type: 'time',
time: {
unit: 'month'
+ },
+ scaleLabel: {
+ display:true,
+ labelString: 'Date'
}
}],
yAxes: [
@@ -238,8 +251,18 @@ export class MoreStuffComponent implements OnInit {
//maintainAspectRatio: false,
responsive: true,
scales: {
- xAxes: [],
- yAxes: []
+ xAxes: [{
+ scaleLabel: {
+ display:true,
+ labelString: 'Spend amount £'
+ }
+ }],
+ yAxes: [{
+ scaleLabel: {
+ display:true,
+ labelString: 'Supplier Names'
+ }
+ }]
},
};
public supplierMonthChartLabels: string[] = [];
diff --git a/src/app/panels/pie-panel.component.html b/src/app/panels/pie-panel.component.html
index 0ddfafb..da2417e 100644
--- a/src/app/panels/pie-panel.component.html
+++ b/src/app/panels/pie-panel.component.html
@@ -9,6 +9,7 @@