From f6dd18bfc80fe412f5a4dbb17e7369a445b0367d Mon Sep 17 00:00:00 2001
From: piratefinn <toyou1995@gmail.com>
Date: Wed, 28 Feb 2018 12:02:01 +0000
Subject: [PATCH 1/3] added initial essential branch checkbox

---
 src/app/dashboard/add-data.component.html | 9 +++++++++
 src/app/dashboard/add-data.component.ts   | 6 ++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/app/dashboard/add-data.component.html b/src/app/dashboard/add-data.component.html
index c413237..2f079f5 100644
--- a/src/app/dashboard/add-data.component.html
+++ b/src/app/dashboard/add-data.component.html
@@ -24,6 +24,15 @@
               <span class="help-block">Enter the amount spent, such as 5.35 for £5.35.</span>
             </div>
           </div>
+          <div class="form-group row">
+            <label class="col-md-3 form-control-label" for="text-input"><strong>Essential Purchase</strong></label>
+            <div class="col-md-9">
+              <div class="input-group">
+                <input type="checkbox" class="form-control" [(ngModel)]="essentialPurchase" (ngModelChange)="transactionFormValidate()">
+              </div>
+              <span class="help-block">Choose if the purchase is deemed essential for budgeting purposes.</span>
+            </div>
+          </div>
           <div class="form-group row">
             <label class="col-md-3 form-control-label" for="text-input">Budget Type</label>
             <div class="col-md-9">
diff --git a/src/app/dashboard/add-data.component.ts b/src/app/dashboard/add-data.component.ts
index 48622bf..1f0f569 100644
--- a/src/app/dashboard/add-data.component.ts
+++ b/src/app/dashboard/add-data.component.ts
@@ -32,6 +32,7 @@ export class AddDataComponent implements OnInit {
   amount: number;
   // Assumes Groceries is 1st category
   categoryId: number = 1;
+  essentialPurchase: any;
   transactionAdditionType = 1;
   storeList = [];
   showAddStore = false;
@@ -196,6 +197,7 @@ export class AddDataComponent implements OnInit {
           purchase_time     : purchaseTime,
           organisation_id   : this.organisationId,
           category          : this.categoryId,
+          essential         : this.essentialPurchase,
         };
         break;
       case 2:
@@ -204,7 +206,7 @@ export class AddDataComponent implements OnInit {
           transaction_value : this.amount,
           purchase_time     : purchaseTime,
           organisation_id   : this.organisationId,
-          category          : this.categoryId,
+          essential         : this.essentialPurchase,
         };
         break;
       case 3:
@@ -216,7 +218,7 @@ export class AddDataComponent implements OnInit {
           street_name       : this.submitOrg.street_name,
           town              : this.submitOrg.town,
           postcode          : this.submitOrg.postcode,
-          category          : this.categoryId,
+          essential         : this.essentialPurchase,
         };
         break;
     }

From 5762b35fbe86a5c83759ca71edd8dbd793fbb80b Mon Sep 17 00:00:00 2001
From: piratefinn <toyou1995@gmail.com>
Date: Thu, 1 Mar 2018 17:07:25 +0000
Subject: [PATCH 2/3] removed unnecessary console logs and cleaned essential
 input

---
 src/app/dashboard/add-data.component.html | 6 +++---
 src/app/dashboard/add-data.component.ts   | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/app/dashboard/add-data.component.html b/src/app/dashboard/add-data.component.html
index 2f079f5..dea50d2 100644
--- a/src/app/dashboard/add-data.component.html
+++ b/src/app/dashboard/add-data.component.html
@@ -25,12 +25,12 @@
             </div>
           </div>
           <div class="form-group row">
-            <label class="col-md-3 form-control-label" for="text-input"><strong>Essential Purchase</strong></label>
+            <label class="col-md-3 form-control-label" for="text-input">Essential Purchase</label>
             <div class="col-md-9">
               <div class="input-group">
-                <input type="checkbox" class="form-control" [(ngModel)]="essentialPurchase" (ngModelChange)="transactionFormValidate()">
+                <input type="checkbox" class="mr-auto" [(ngModel)]="essentialPurchase" (ngModelChange)="transactionFormValidate()">
               </div>
-              <span class="help-block">Choose if the purchase is deemed essential for budgeting purposes.</span>
+              <span class="help-block">Tick if the purchase is deemed an essential purchase for budgeting purposes.</span>
             </div>
           </div>
           <div class="form-group row">
diff --git a/src/app/dashboard/add-data.component.ts b/src/app/dashboard/add-data.component.ts
index 1f0f569..94a0274 100644
--- a/src/app/dashboard/add-data.component.ts
+++ b/src/app/dashboard/add-data.component.ts
@@ -32,7 +32,7 @@ export class AddDataComponent implements OnInit {
   amount: number;
   // Assumes Groceries is 1st category
   categoryId: number = 1;
-  essentialPurchase: any;
+  essentialPurchase = false;
   transactionAdditionType = 1;
   storeList = [];
   showAddStore = false;
@@ -89,12 +89,9 @@ export class AddDataComponent implements OnInit {
   private setCategoryList(data: any) {
     let categoryIdList = Object.keys(data.ids).map(key => data.ids[key]);
     this.categoryNameList = Object.keys(data.names).map(key => data.names[key]);
-    console.log(categoryIdList);
     let halfLength = Math.floor(categoryIdList.length / 2);
     this.leftCategoryIdList = categoryIdList.splice(0, halfLength);
-    console.log(this.leftCategoryIdList);
     this.rightCategoryIdList = categoryIdList;
-    console.log(this.rightCategoryIdList);
   }
 
   getMinDate() {

From 8b7b5e50be8bb797efe5364bf62bb7a8c8a117b6 Mon Sep 17 00:00:00 2001
From: piratefinn <toyou1995@gmail.com>
Date: Fri, 2 Mar 2018 16:31:14 +0000
Subject: [PATCH 3/3] fixed display with essential and categories

---
 .../dashboard/category-month.component.html   | 52 +++++++++++++++++--
 src/app/dashboard/category-month.component.ts | 17 ++++--
 2 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/src/app/dashboard/category-month.component.html b/src/app/dashboard/category-month.component.html
index 0a7c91f..42a3d7a 100644
--- a/src/app/dashboard/category-month.component.html
+++ b/src/app/dashboard/category-month.component.html
@@ -10,8 +10,19 @@
           </div><!--/.row-->
           <div class="chart-wrapper">
             <ul class="horizontal-bars type-2">
+              <li *ngIf="weekList1 !== undefined">
+                <span class="title">Essential Purchases</span>
+                <span class="value">{{ ( weekEssential1.value || 0 ) | currency:'GBP':'symbol':'1.2-2' }} <span class="text-muted small">
+                  ({{ (weekEssential1.value || 0 ) / weekListValueSum1 | percent:'1.0-0' }})</span></span>
+                <div class="bars">
+                  <div class="progress" style="height: 6px;">
+                    <div class="progress-bar bg-success" role="progressbar"
+                    [style.width]="(weekEssential1.value || 0 ) / weekListValueSum1 | percent:'1.0-0'" aria-valuemin="0" aria-valuemax="100"></div>
+                  </div>
+                </div>
+              </li>
               <li *ngFor="let categoryEntry of weekList1 | slice:0:categoryLimit1; let i=index;">
-                <span class="title">{{ categoryNameList[categoryEntry.category] || 'Uncategorised' }}</span>
+                <span class="title">{{ categoryNameList[categoryEntry.category - 1] || '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">
@@ -41,8 +52,19 @@
           </div><!--/.row-->
           <div class="chart-wrapper">
             <ul class="horizontal-bars type-2">
+              <li *ngIf="weekList2 !== undefined">
+                <span class="title">Essential Purchases</span>
+                <span class="value">{{ ( weekEssential2.value || 0 ) | currency:'GBP':'symbol':'1.2-2' }} <span class="text-muted small">
+                  ({{ (weekEssential2.value || 0 ) / weekListValueSum2 | percent:'1.0-0' }})</span></span>
+                <div class="bars">
+                  <div class="progress" style="height: 6px;">
+                    <div class="progress-bar bg-success" role="progressbar"
+                    [style.width]="(weekEssential2.value || 0 ) / weekListValueSum2 | percent:'1.0-0'" aria-valuemin="0" aria-valuemax="100"></div>
+                  </div>
+                </div>
+              </li>
               <li *ngFor="let categoryEntry of weekList2 | slice:0:categoryLimit2; let i=index;">
-                <span class="title">{{ categoryNameList[categoryEntry.category] || 'Uncategorised' }}</span>
+                <span class="title">{{ categoryNameList[categoryEntry.category - 1] || '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">
@@ -72,8 +94,19 @@
           </div><!--/.row-->
           <div class="chart-wrapper">
             <ul class="horizontal-bars type-2">
+              <li *ngIf="weekList3 !== undefined">
+                <span class="title">Essential Purchases</span>
+                <span class="value">{{ ( weekEssential1.value || 0 ) | currency:'GBP':'symbol':'1.2-2' }} <span class="text-muted small">
+                  ({{ (weekEssential3.value || 0 ) / weekListValueSum3 | percent:'1.0-0' }})</span></span>
+                <div class="bars">
+                  <div class="progress" style="height: 6px;">
+                    <div class="progress-bar bg-success" role="progressbar"
+                    [style.width]="(weekEssential3.value || 0 ) / weekListValueSum3 | percent:'1.0-0'" aria-valuemin="0" aria-valuemax="100"></div>
+                  </div>
+                </div>
+              </li>
               <li *ngFor="let categoryEntry of weekList3 | slice:0:categoryLimit3; let i=index;">
-                <span class="title">{{ categoryNameList[categoryEntry.category] || 'Uncategorised' }}</span>
+                <span class="title">{{ categoryNameList[categoryEntry.category - 1] || '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">
@@ -103,8 +136,19 @@
           </div><!--/.row-->
           <div class="chart-wrapper">
             <ul class="horizontal-bars type-2">
+              <li *ngIf="weekList4 !== undefined">
+                <span class="title">Essential Purchases</span>
+                <span class="value">{{ ( weekEssential4.value || 0 ) | currency:'GBP':'symbol':'1.2-2' }} <span class="text-muted small">
+                  ({{ (weekEssential4.value || 0 ) / weekListValueSum4 | percent:'1.0-0' }})</span></span>
+                <div class="bars">
+                  <div class="progress" style="height: 6px;">
+                    <div class="progress-bar bg-success" role="progressbar"
+                    [style.width]="(weekEssential4.value || 0 ) / weekListValueSum4 | percent:'1.0-0'" aria-valuemin="0" aria-valuemax="100"></div>
+                  </div>
+                </div>
+              </li>
               <li *ngFor="let categoryEntry of weekList4 | slice:0:categoryLimit4; let i=index;">
-                <span class="title">{{ categoryNameList[categoryEntry.category] || 'Uncategorised' }}</span>
+                <span class="title">{{ categoryNameList[categoryEntry.category - 1] || '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 1356a3f..4c9fbc4 100644
--- a/src/app/dashboard/category-month.component.ts
+++ b/src/app/dashboard/category-month.component.ts
@@ -26,6 +26,10 @@ export class CategoryMonthComponent implements OnInit {
   weekListValueSum2: number = 0;
   weekListValueSum3: number = 0;
   weekListValueSum4: number = 0;
+  weekEssential1: number = 0;
+  weekEssential2: number = 0;
+  weekEssential3: number = 0;
+  weekEssential4: number = 0;
 
   categoryList: number[] = [];
   dayList: any[] = [];
@@ -84,11 +88,16 @@ export class CategoryMonthComponent implements OnInit {
     function prop<T, K extends keyof T>(obj: T, key: K) {
       return obj[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);
+    this.weekList1 = prop(data.data.categories, this.myWeek1);
+    this.weekList2 = prop(data.data.categories, this.myWeek2);
+    this.weekList3 = prop(data.data.categories, this.myWeek3);
+    this.weekList4 = prop(data.data.categories, this.myWeek4);
     this.getMaxValue(this.weekList1, this.weekList2, this.weekList3, this.weekList4);
+    this.weekEssential1 = prop(data.data.essentials, this.myWeek1);
+    console.log(this.weekEssential1);
+    this.weekEssential2 = prop(data.data.essentials, this.myWeek2);
+    this.weekEssential3 = prop(data.data.essentials, this.myWeek3);
+    this.weekEssential4 = prop(data.data.essentials, this.myWeek4);
   }
 
   private getMaxValue (data1: any,