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

Added category all time purchase list

Browse source
This commit is contained in:
piratefinn 2018-05-22 12:28:09 +01:00
parent ca95f8d10d
commit adc0a1a7db
2 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -140,7 +140,36 @@
<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 float-left mb-0">Purchases by Sector</h4> <h4 class="card-title float-left mb-0">All Purchases by Category</h4>
</div><!--/.col-->
</div><!--/.row-->
<div class="chart-wrapper">
<ul class="icons-list">
<!-- New loop -->
<li *ngFor="let category of totalCategoryList | slice:0:totalCategoryLimit; let i=index">
<i [ngClass]="[sectorIcons [category.name] || 'icon-question', sectorClasses [category.name] || 'bg-info']"></i>
<div class="desc">
<div class="title">{{ category.category || 'N/A' }}</div>
</div>
<div class="value">
<div class="small text-muted">Bought</div>
<strong>{{ category.value || 'N/A' }}</strong>
</div>
</li>
<li *ngIf="totalCategoryList.length > totalCategoryLimit && disableCategoryButton == false" class="divider text-center">
<button type="button" class="btn btn-sm btn-link text-muted" (click)="categoryLoadMore()"><i class="icon-options"></i></button>
</li>
</ul>
</div>
</div>
</div>
</div><!--/.col-->
<div class="col-xl-6">
<div class="card">
<div class="card-block">
<div class="row">
<div class="col-12">
<h4 class="card-title float-left mb-0">All Purchases by Sector</h4>
</div><!--/.col--> </div><!--/.col-->
</div><!--/.row--> </div><!--/.row-->
<div class="chart-wrapper"> <div class="chart-wrapper">
@ -157,7 +186,7 @@
</div> </div>
</li> </li>
<li *ngIf="sectorLetters.length > sectorLimit && disableSectorButton == false" class="divider text-center"> <li *ngIf="sectorLetters.length > sectorLimit && disableSectorButton == false" class="divider text-center">
<button type="button" class="btn btn-sm btn-link text-muted" (click)="loadMore()"><i class="icon-options"></i></button> <button type="button" class="btn btn-sm btn-link text-muted" (click)="sectorLoadMore()"><i class="icon-options"></i></button>
</li> </li>
</ul> </ul>
</div> </div>

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

@ -24,6 +24,7 @@ export class DashboardCustomerComponent implements OnInit {
maxPurchase: number = 0; maxPurchase: number = 0;
disableSectorButton: boolean = false; disableSectorButton: boolean = false;
disableCategoryButton: boolean = false;
public chartType = 'doughnut'; public chartType = 'doughnut';
public chartLegend = true; public chartLegend = true;
@ -175,7 +176,8 @@ export class DashboardCustomerComponent implements OnInit {
sectorLetters: string[] = []; sectorLetters: string[] = [];
sectorPurchases: number[] = []; sectorPurchases: number[] = [];
sectorLimit: number = 10; sectorLimit: number = 10;
totalCategoryLimit: number = 10;
totalCategoryList: any;
sectorList: any; sectorList: any;
// Graph widgets // Graph widgets
@ -219,6 +221,8 @@ export class DashboardCustomerComponent implements OnInit {
this.setSectorList(result.sectors); this.setSectorList(result.sectors);
this.setWeekData(result); this.setWeekData(result);
this.setChartData(result.data.cat_total); this.setChartData(result.data.cat_total);
this.totalCategoryList = result.data.cat_list;
console.log(this.totalCategoryList);
this.purchaseEssential = result.data.essentials.purchase_no_essential_total; this.purchaseEssential = result.data.essentials.purchase_no_essential_total;
this.purchaseNotEssential = result.data.essentials.purchase_no_total - this.purchaseEssential; this.purchaseNotEssential = result.data.essentials.purchase_no_total - this.purchaseEssential;
this.barChartDataEssential = [ this.barChartDataEssential = [
@ -278,11 +282,16 @@ export class DashboardCustomerComponent implements OnInit {
this.sectorPurchases = Object.keys(data.purchases).map(key => data.purchases[key]); this.sectorPurchases = Object.keys(data.purchases).map(key => data.purchases[key]);
} }
private loadMore () { private sectorLoadMore () {
this.disableSectorButton = true; this.disableSectorButton = true;
this.sectorLimit = 22; this.sectorLimit = 22;
} }
private categoryLoadMore () {
this.disableCategoryButton = true;
this.totalCategoryLimit = 30;
}
public convertHex(hex: string, opacity: number) { public convertHex(hex: string, opacity: number) {
hex = hex.replace('#', ''); hex = hex.replace('#', '');
const r = parseInt(hex.substring(0, 2), 16); const r = parseInt(hex.substring(0, 2), 16);