From 3b2009186a395d59dd481ab869551d2f2c3f0ffa Mon Sep 17 00:00:00 2001
From: piratefinn <toyou1995@gmail.com>
Date: Mon, 26 Mar 2018 14:47:20 +0100
Subject: [PATCH] changed category view method

---
 src/app/dashboard/category-month.component.html |  8 ++++----
 src/app/dashboard/category-month.component.ts   | 11 -----------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/app/dashboard/category-month.component.html b/src/app/dashboard/category-month.component.html
index db24b1f..f7501d9 100644
--- a/src/app/dashboard/category-month.component.html
+++ b/src/app/dashboard/category-month.component.html
@@ -22,7 +22,7 @@
                 </div>
               </li>
               <li *ngFor="let categoryEntry of weekList1 | slice:0:categoryLimit1; let i=index;">
-                <span class="title">{{ categoryList[categoryEntry.category] || 'Uncategorised' }}</span>
+                <span class="title">{{ categoryEntry.category || 'Uncategorised' }}</span>
                 <span class="value">{{ ( categoryEntry.value || 0 ) | currency:'GBP':'symbol':'1.2-2' }} <span class="text-muted small">
                   ({{ (categoryEntry.value || 0 ) / weekListValueSum1 | percent:'1.0-0' }})</span></span>
                 <div class="bars">
@@ -64,7 +64,7 @@
                 </div>
               </li>
               <li *ngFor="let categoryEntry of weekList2 | slice:0:categoryLimit2; let i=index;">
-                <span class="title">{{ categoryList[categoryEntry.category] || 'Uncategorised' }}</span>
+                <span class="title">{{ categoryEntry.category || 'Uncategorised' }}</span>
                 <span class="value">{{ ( categoryEntry.value || 0 ) | currency:'GBP':'symbol':'1.2-2' }} <span class="text-muted small">
                   ({{ (categoryEntry.value || 0 ) / weekListValueSum2 | percent:'1.0-0' }})</span></span>
                 <div class="bars">
@@ -106,7 +106,7 @@
                 </div>
               </li>
               <li *ngFor="let categoryEntry of weekList3 | slice:0:categoryLimit3; let i=index;">
-                <span class="title">{{ categoryList[categoryEntry.category] || 'Uncategorised' }}</span>
+                <span class="title">{{ categoryEntry.category || 'Uncategorised' }}</span>
                 <span class="value">{{ ( categoryEntry.value || 0 ) | currency:'GBP':'symbol':'1.2-2' }} <span class="text-muted small">
                   ({{ (categoryEntry.value || 0 ) / weekListValueSum3 | percent:'1.0-0' }})</span></span>
                 <div class="bars">
@@ -148,7 +148,7 @@
                 </div>
               </li>
               <li *ngFor="let categoryEntry of weekList4 | slice:0:categoryLimit4; let i=index;">
-                <span class="title">{{ categoryList[categoryEntry.category] || 'Uncategorised' }}</span>
+                <span class="title">{{ categoryEntry.category || 'Uncategorised' }}</span>
                 <span class="value">{{ ( categoryEntry.value || 0 ) | currency:'GBP':'symbol':'1.2-2' }} <span class="text-muted small">
                   ({{ (categoryEntry.value || 0 ) / weekListValueSum4 | percent:'1.0-0' }})</span></span>
                 <div class="bars">
diff --git a/src/app/dashboard/category-month.component.ts b/src/app/dashboard/category-month.component.ts
index 140e8e3..c5cd3d1 100644
--- a/src/app/dashboard/category-month.component.ts
+++ b/src/app/dashboard/category-month.component.ts
@@ -31,7 +31,6 @@ export class CategoryMonthComponent implements OnInit {
   weekEssential3: number = 0;
   weekEssential4: number = 0;
 
-  categoryList: any;
   dayList: any[] = [];
   valueList: number[] = [];
   myWeek1: any;
@@ -47,16 +46,6 @@ export class CategoryMonthComponent implements OnInit {
   private api: ApiService,
   ) {
     this.setDate();
-    this.api.categoryList().subscribe(
-      result => {
-        this.categoryList = result.categories;
-        console.log('Category List received');
-      },
-      error => {
-        console.log('Retrieval Error');
-        console.log( error._body );
-      }
-    );
     this.api.categoryTransactionList().subscribe(
       result => {
         this.setData(result);