-
Purchases 3 weeks ago
+ Purchases 3 Weeks Ago
@@ -106,11 +106,11 @@
{{ categoryNameList[categoryEntry.category] || 'Uncategorised' }}
{{ ( categoryEntry.value || 0 ) | currency:'GBP':'symbol':'1.2-2' }}
- ({{ (categoryEntry.value || 0 ) / weekListValueMax4 | percent:'1.0-0' }})
+ ({{ (categoryEntry.value || 0 ) / weekListValueSum4 | percent:'1.0-0' }})
+ [style.width]="(categoryEntry.value || 0 ) / weekListValueSum4 | percent:'1.0-0'" aria-valuemin="0" aria-valuemax="100">
diff --git a/src/app/dashboard/category-month.component.ts b/src/app/dashboard/category-month.component.ts
index 6569a26..e8353cf 100644
--- a/src/app/dashboard/category-month.component.ts
+++ b/src/app/dashboard/category-month.component.ts
@@ -22,10 +22,10 @@ export class CategoryMonthComponent implements OnInit {
weekList2 = [];
weekList3 = [];
weekList4 = [];
- weekListValueMax1: number = 0;
- weekListValueMax2: number = 0;
- weekListValueMax3: number = 0;
- weekListValueMax4: number = 0;
+ weekListValueSum1: number = 0;
+ weekListValueSum2: number = 0;
+ weekListValueSum3: number = 0;
+ weekListValueSum4: number = 0;
categoryList: number[] = [];
dayList: any[] = [];
@@ -97,16 +97,16 @@ export class CategoryMonthComponent implements OnInit {
data3: any,
data4: any) {
if (data1) {
- this.weekListValueMax1 = Math.max.apply(Math,data1.map(function(o){return o.value;}));
+ this.weekListValueSum1 = data1.reduce(function (s, a) {return s + a.value;}, 0);
}
if (data2) {
- this.weekListValueMax2 = Math.max.apply(Math,data2.map(function(o){return o.value;}));
+ this.weekListValueSum2 = data2.reduce(function (s, a) {return s + a.value;}, 0);
}
if (data3) {
- this.weekListValueMax3 = Math.max.apply(Math,data3.map(function(o){return o.value;}));
+ this.weekListValueSum3 = data3.reduce(function (s, a) {return s + a.value;}, 0);
}
if (data4) {
- this.weekListValueMax4 = Math.max.apply(Math,data4.map(function(o){return o.value;}));
+ this.weekListValueSum4 = data4.reduce(function (s, a) {return s + a.value;}, 0);
}
}