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

properly viewing category list

Browse source
This commit is contained in:
piratefinn 2018-01-24 12:38:58 +00:00
parent b33000edc5
commit 2976166371
2 changed files with 94 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/app/dashboard/category-month.component.html
View file

@ -1,6 +1,6 @@
<div class="animated fadeIn"> <div class="animated fadeIn">
<div class=row> <div class=row>
<div class="col-xl-3 col-md-6"> <div class="col-md-6">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<div class="row"> <div class="row">
@ -10,10 +10,10 @@
</div><!--/.row--> </div><!--/.row-->
<div class="chart-wrapper"> <div class="chart-wrapper">
<ul class="horizontal-bars type-2"> <ul class="horizontal-bars type-2">
<li> <li *ngFor="let categoryEntry of weekList1 | slice:0:categoryLimit1; let i=index;">
<span class="title">Placeholder Category</span> <span class="title">{{ categoryNameList[categoryEntry.category] || 'Uncategorised' }}</span>
<span class="value">{{ (weekPurchaseList.first || 0 ) }} <span class="text-muted small"> <span class="value">{{ ( categoryEntry.value || 0 ) }} <span class="text-muted small">
({{ (weekPurchaseList.first || 0 ) / weekPurchaseList.max | percent:'1.0-0' }})</span></span> 0</span></span>
<div class="bars"> <div class="bars">
<div class="progress" style="height: 6px;"> <div class="progress" style="height: 6px;">
<div class="progress-bar bg-success" role="progressbar" <div class="progress-bar bg-success" role="progressbar"
@ -21,15 +21,17 @@
</div> </div>
</div> </div>
</li> </li>
<li *ngIf="categoryList.length > 10 && disableCategoryButtonFirst == false" class="divider text-center"> <div *ngIf="weekList1 !== undefined">
<button type="button" class="btn btn-sm btn-link text-muted" (click)="loadMore()"><i class="icon-options"></i></button> <li *ngIf="weekList1.length > 6 && disableCategoryButton1 == false" class="divider text-center">
</li> <button type="button" class="btn btn-sm btn-link text-muted" (click)="loadMore1()"><i class="icon-options"></i></button>
</li>
</div>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</div><!--/.col--> </div><!--/.col-->
<div class="col-xl-3 col-md-6"> <div class="col-md-6">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<div class="row"> <div class="row">
@ -39,9 +41,9 @@
</div><!--/.row--> </div><!--/.row-->
<div class="chart-wrapper"> <div class="chart-wrapper">
<ul class="horizontal-bars type-2"> <ul class="horizontal-bars type-2">
<li> <li *ngFor="let categoryEntry of weekList2 | slice:0:categoryLimit2; let i=index;">
<span class="title">Placeholder Category</span> <span class="title">{{ categoryNameList[categoryEntry.category] || 'Uncategorised' }}</span>
<span class="value">{{ (weekPurchaseList.first || 0 ) }} <span class="text-muted small"> <span class="value">{{ ( categoryEntry.value || 0 ) }} <span class="text-muted small">
({{ (weekPurchaseList.first || 0 ) / weekPurchaseList.max | percent:'1.0-0' }})</span></span> ({{ (weekPurchaseList.first || 0 ) / weekPurchaseList.max | percent:'1.0-0' }})</span></span>
<div class="bars"> <div class="bars">
<div class="progress" style="height: 6px;"> <div class="progress" style="height: 6px;">
@ -50,15 +52,17 @@
</div> </div>
</div> </div>
</li> </li>
<li *ngIf="categoryList.length > 10 && disableCategoryButtonFirst == false" class="divider text-center"> <div *ngIf="!weekList2 == null">
<button type="button" class="btn btn-sm btn-link text-muted" (click)="loadMore()"><i class="icon-options"></i></button> <li *ngIf="weekList2.length > 6 && disableCategoryButtonFirst == false" class="divider text-center">
</li> <button type="button" class="btn btn-sm btn-link text-muted" (click)="loadMore2()"><i class="icon-options"></i></button>
</li>
</div>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</div><!--/.col--> </div><!--/.col-->
<div class="col-xl-3 col-md-6"> <div class="col-md-6">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<div class="row"> <div class="row">
@ -68,9 +72,9 @@
</div><!--/.row--> </div><!--/.row-->
<div class="chart-wrapper"> <div class="chart-wrapper">
<ul class="horizontal-bars type-2"> <ul class="horizontal-bars type-2">
<li> <li *ngFor="let categoryEntry of weekList3 | slice:0:categoryLimit3; let i=index;">
<span class="title">Placeholder Category</span> <span class="title">{{ categoryNameList[categoryEntry.category] || 'Uncategorised' }}</span>
<span class="value">{{ (weekPurchaseList.first || 0 ) }} <span class="text-muted small"> <span class="value">{{ ( categoryEntry.value || 0 ) }} <span class="text-muted small">
({{ (weekPurchaseList.first || 0 ) / weekPurchaseList.max | percent:'1.0-0' }})</span></span> ({{ (weekPurchaseList.first || 0 ) / weekPurchaseList.max | percent:'1.0-0' }})</span></span>
<div class="bars"> <div class="bars">
<div class="progress" style="height: 6px;"> <div class="progress" style="height: 6px;">
@ -79,15 +83,17 @@
</div> </div>
</div> </div>
</li> </li>
<li *ngIf="categoryList.length > 10 && disableCategoryButtonFirst == false" class="divider text-center"> <div *ngIf="weekList3 !== undefined">
<button type="button" class="btn btn-sm btn-link text-muted" (click)="loadMore()"><i class="icon-options"></i></button> <li *ngIf="weekList3.length > 6 && disableCategoryButtonFirst == false" class="divider text-center">
</li> <button type="button" class="btn btn-sm btn-link text-muted" (click)="loadMore3()"><i class="icon-options"></i></button>
</li>
</div>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</div><!--/.col--> </div><!--/.col-->
<div class="col-xl-3 col-md-6"> <div class="col-md-6">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<div class="row"> <div class="row">
@ -97,9 +103,9 @@
</div><!--/.row--> </div><!--/.row-->
<div class="chart-wrapper"> <div class="chart-wrapper">
<ul class="horizontal-bars type-2"> <ul class="horizontal-bars type-2">
<li> <li *ngFor="let categoryEntry of weekList4 | slice:0:categoryLimit4; let i=index;">
<span class="title">Placeholder Category</span> <span class="title">{{ categoryNameList[categoryEntry.category] || 'Uncategorised' }}</span>
<span class="value">{{ (weekPurchaseList.first || 0 ) }} <span class="text-muted small"> <span class="value">{{ ( categoryEntry.value || 0 ) }} <span class="text-muted small">
({{ (weekPurchaseList.first || 0 ) / weekPurchaseList.max | percent:'1.0-0' }})</span></span> ({{ (weekPurchaseList.first || 0 ) / weekPurchaseList.max | percent:'1.0-0' }})</span></span>
<div class="bars"> <div class="bars">
<div class="progress" style="height: 6px;"> <div class="progress" style="height: 6px;">
@ -108,9 +114,11 @@
</div> </div>
</div> </div>
</li> </li>
<li *ngIf="categoryList.length > 10 && disableCategoryButtonFirst == false" class="divider text-center"> <div *ngIf="!weekList4 == null">
<button type="button" class="btn btn-sm btn-link text-muted" (click)="loadMore()"><i class="icon-options"></i></button> <li *ngIf="weekList4.length > 6 && disableCategoryButtonFirst == false" class="divider text-center">
</li> <button type="button" class="btn btn-sm btn-link text-muted" (click)="loadMore4()"><i class="icon-options"></i></button>
</li>
</div>
</ul> </ul>
</div> </div>
</div> </div>

67
src/app/dashboard/category-month.component.ts
View file

@ -9,25 +9,47 @@ import 'rxjs/add/operator/map';
}) })
export class CategoryMonthComponent implements OnInit { export class CategoryMonthComponent implements OnInit {
disableCategoryButtonFirst: boolean = false; disableCategoryButton1: boolean = false;
disableCategoryButton2: boolean = false;
disableCategoryButton3: boolean = false;
disableCategoryButton4: boolean = false;
weekPurchaseList = { weekPurchaseList = {
first: 0, first: 0,
}; };
weekList1 = {};
weekList2 = {};
weekList3 = {};
weekList4 = {};
categoryList: number[] = []; categoryList: number[] = [];
dayList: any[] = []; dayList: any[] = [];
valueList: number[] = []; valueList: number[] = [];
categoryLimitFirst: number = 10;
myWeek1: any; myWeek1: any;
myWeek2: any; myWeek2: any;
myWeek3: any; myWeek3: any;
myWeek4: any; myWeek4: any;
categoryIdList: number[] = [];
categoryNameList: string[] = [];
categoryLimit1: number = 6;
categoryLimit2: number = 6;
categoryLimit3: number = 6;
categoryLimit4: number = 6;
constructor( constructor(
private api: ApiService, private api: ApiService,
) { ) {
this.setDate(); this.setDate();
this.api.categoryList().subscribe(
result => {
this.setCategoryList(result.categories);
},
error => {
console.log('Retrieval Error');
console.log( error._body );
}
);
this.api.categoryTransactionList().subscribe( this.api.categoryTransactionList().subscribe(
result => { result => {
console.log(result); console.log(result);
@ -40,13 +62,16 @@ export class CategoryMonthComponent implements OnInit {
); );
} }
private loadMore () { ngOnInit(): void {
this.disableCategoryButtonFirst = true; }
this.categoryLimitFirst = 100;
private setCategoryList(data: any) {
this.categoryIdList = Object.keys(data.ids).map(key => data.ids[key]);
this.categoryNameList = Object.keys(data.names).map(key => data.names[key]);
} }
private setDate () { private setDate () {
this.myWeek1 = moment().format('YYYY-MM-DD'); this.myWeek1 = moment().startOf('isoWeek').format('YYYY-MM-DD');
this.myWeek2 = moment(this.myWeek1).subtract(1, 'weeks').format('YYYY-MM-DD'); this.myWeek2 = moment(this.myWeek1).subtract(1, 'weeks').format('YYYY-MM-DD');
this.myWeek3 = moment(this.myWeek2).subtract(1, 'weeks').format('YYYY-MM-DD'); this.myWeek3 = moment(this.myWeek2).subtract(1, 'weeks').format('YYYY-MM-DD');
this.myWeek4 = moment(this.myWeek3).subtract(1, 'weeks').format('YYYY-MM-DD'); this.myWeek4 = moment(this.myWeek3).subtract(1, 'weeks').format('YYYY-MM-DD');
@ -57,11 +82,33 @@ export class CategoryMonthComponent implements OnInit {
} }
private setData (data: any) { private setData (data: any) {
// this.categoryList = Object.keys(data.data.category).map(key => data.data.category[key]); function prop<T, K extends keyof T>(obj: T, key: K) {
// this.dayList = Object.keys(data.data.days).map(key => data.data.days[key]); return obj[key];
// this.valueList = Object.keys(data.data.value).map(key => data.data.value[key]); }
this.weekList1 = prop(data.data, this.myWeek1);
this.weekList2 = prop(data.data, this.myWeek2);
this.weekList3 = prop(data.data, this.myWeek3);
this.weekList4 = prop(data.data, this.myWeek4);
console.log(this.weekList1);
console.log(this.weekList2);
console.log(this.weekList3);
console.log(this.weekList4);
} }
ngOnInit(): void { private loadMore1 () {
this.disableCategoryButton1 = true;
this.categoryLimit1 = 20;
}
private loadMore2 () {
this.disableCategoryButton2 = true;
this.categoryLimit2 = 20;
}
private loadMore3 () {
this.disableCategoryButton3 = true;
this.categoryLimit3 = 20;
}
private loadMore4 () {
this.disableCategoryButton4 = true;
this.categoryLimit4 = 20;
} }
} }