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

Fix invalid graph errors + no data errors

Browse source
This commit is contained in:
Ben Goldsworthy 2020-11-29 16:29:06 +00:00
parent 5911c4d8ee
commit 2aa42fa291
5 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@
</widget-graph>
</div><!--/.col-->
</div><!--/.row-->
<div class=row>
<div *ngIf="showEssentialBarChart" class=row>
<div class="col-xl-6">
<panel-pie></panel-pie><!--All Purchases -->
<!-- <div class="demo-container" ng-app="stacked-bar" ng-controller="stacked-bar">
@ -40,7 +40,7 @@
</div> -->
<!-- </body> -->
<!-- </div> --><!--/.col-->
<div *ngIf="showEssentialBarChart" class="col-xl-6">
<div class="col-xl-6">
<div class="card">
<div class="card-block">
<div class="row">
@ -82,15 +82,15 @@
</div>
</div>
</div><!--/.col-->
<div class="col-xl-6">
<div *ngIf="showTotalCategoryList" class="col-xl-6">
<div class="card">
<div class="card-block">
<div class="row">
<div lass="row">
<div class="col-12">
<h4 class="card-title float-left mb-0"> Global Puchases by Category</h4>
</div>
<div class="col-12">
<div *ngIf="showTotalCategoryList" class="chart-wrapper">
<div class="chart-wrapper">
<ul class="icons-list">
<!-- New loop -->
<li *ngFor="let category of totalCategoryList | slice:0:totalCategoryLimit; let i=index">

30
src/app/dashboard/dashboard-customer.component.ts
View file

@ -9,7 +9,7 @@ import { CustBarSnippetComponent } from '../snippets/cust-snippet-bar.component'
import { PiePanel } from '../panels/pie-panel.component';
import { DataType } from '../shared/data-types.enum';
import * as moment from 'moment';
import { MoreStuffComponent } from '../dashboard/more-graphs-and-tables.component';
//import { MoreStuffComponent } from '../dashboard/more-graphs-and-tables.component';
// import { StackedBarChartComponent } from '../panels/stacked-bar.component';
interface SuppliersComponent {
@ -186,20 +186,22 @@ export class DashboardCustomerComponent implements OnInit {
this.setDate();
this.api.customerStats().subscribe(
result => {
this.setWeekPurchaseList(result.weeks);
this.setWeekData(result);
this.setChartData(result.data.cat_total);
this.totalCategoryList = result.data.cat_list;
if (this.totalCategoryList) {
this.showTotalCategoryList = true;
if (result.data.cat_list.length > 0) {
this.setWeekPurchaseList(result.weeks);
this.setWeekData(result);
this.setChartData(result.data.cat_total);
this.totalCategoryList = result.data.cat_list;
if (this.totalCategoryList) {
this.showTotalCategoryList = true;
}
this.purchaseEssential = result.data.essentials.purchase_no_essential_total;
this.purchaseNotEssential = result.data.essentials.purchase_no_total - this.purchaseEssential;
this.barChartDataEssential = [
{data: [this.purchaseEssential], label: 'Essential', stack: '1'},
{data: [this.purchaseNotEssential], label: 'Non-Essential', stack: '1'},
];
this.showEssentialBarChart = true;
}
this.purchaseEssential = result.data.essentials.purchase_no_essential_total;
this.purchaseNotEssential = result.data.essentials.purchase_no_total - this.purchaseEssential;
this.barChartDataEssential = [
{data: [this.purchaseEssential], label: 'Essential', stack: '1'},
{data: [this.purchaseNotEssential], label: 'Non-Essential', stack: '1'},
];
this.showEssentialBarChart = true;
},
error => {
console.log('Retrieval Error');

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

@ -13,7 +13,7 @@
</div><!--/.row-->
<panel-graph></panel-graph>
<div class=row>
<div class="col-xl-6">
<div *ngIf="showEssentialBarChart" class="col-xl-6">
<div class="card">
<div class="card-block">
<div class="row">
@ -21,7 +21,7 @@
<h4 class="card-title mb-0">Number of Essential Purchases</h4>
</div>
</div>
<div *ngIf="showEssentialBarChart" class="chart-wrapper">
<div class="chart-wrapper">
<canvas baseChart class="chart"
[datasets]="barChartDataEssential"
[labels]="barChartLabelsEssential"
@ -33,7 +33,7 @@
</div>
</div>
</div><!--/.col-->
<div class="col-xl-6">
<div *ngIf="showEssentialBarChart" class="col-xl-6">
<div class="card">
<div class="card-block">
<div class="row">
@ -80,7 +80,7 @@
<div class="col-xl-6">
<org-pie-panel></org-pie-panel>
</div>
<div class="col-xl-6">
<div *ngIf="showTotalCategoryList" class="col-xl-6">
<div class="card">
<div class="card-block">
<div class="row">
@ -88,7 +88,7 @@
<h4 class="card-title float-left mb-0"> Global Puchases by Category</h4>
</div>
<div class="col-12">
<div *ngIf="showTotalCategoryList" class="chart-wrapper">
<div class="chart-wrapper">
<ul class="icons-list">
<!-- New loop -->
<li *ngFor="let category of totalCategoryList | slice:0:totalCategoryLimit; let i=index">

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

@ -44,6 +44,7 @@ export class DashboardComponent {
title: 'Sales Last 30 Days',
dataType: DataType.currency,
},
/* Not implemented on server
{
type: 'graph',
name: 'sales_last_quart',
@ -51,6 +52,7 @@ export class DashboardComponent {
title: 'Sales Last Quart',
dataType: DataType.currency,
},
*/
{
type: 'graph',
name: 'purchases_last_7_days',
@ -63,12 +65,14 @@ export class DashboardComponent {
title: 'Purchases Last 30 Days',
dataType: DataType.currency,
},
/* Not implemented on server
{
type: 'graph',
name: 'purchases_last_quart;',
title: 'Purchases Last Quart',
dataType: DataType.currency,
},
*/
];
disableCategoryButton: boolean = false;
@ -286,7 +290,6 @@ export class DashboardComponent {
{data: [this.purchaseNotEssential], label: 'Non-Essential', stack: '1'},
];
this.showEssentialBarChart = true;
console.log(this.barChartDataEssential);
}
private setChartDataCat(dataCat: any) {

6
src/app/widgets/graph-widget.component.ts
View file

@ -109,8 +109,10 @@ export class GraphWidget implements OnInit {
if ( !( this.dataType in DataType ) ) {
console.warn('Unknown DataType for graph \'' + this.graphName + '\' - defaulting to number');
}
this.graphService.getGraph(this.graphName)
.subscribe( result => this.setData(result.graph) );
if (localStorage.getItem('usertype') === 'organisation') {
this.graphService.getGraph(this.graphName)
.subscribe( result => this.setData(result.graph) );
}
}
private setData(data: any) {