From 1cbfb334de6bbd66d20211c7b189231a15a070a4 Mon Sep 17 00:00:00 2001
From: piratefinn <toyou1995@gmail.com>
Date: Mon, 5 Mar 2018 13:42:28 +0000
Subject: [PATCH] amended if code and validation

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

diff --git a/src/app/dashboard/add-data.component.html b/src/app/dashboard/add-data.component.html
index 46396fb..01789d7 100644
--- a/src/app/dashboard/add-data.component.html
+++ b/src/app/dashboard/add-data.component.html
@@ -48,29 +48,29 @@
               <div class="row">
                 <div class="col-md-6">
                   <div>
-                    <input value="daily" type="radio" name="daily" [(ngModel)]="recurringType">
+                    <input value="daily" type="radio" name="daily" [(ngModel)]="recurringType" (ngModelChange)="transactionFormValidate()">
                     <label>Daily</label>
                   </div>
                   <div>
-                    <input value="weekly" type="radio" name="weekly" [(ngModel)]="recurringType">
+                    <input value="weekly" type="radio" name="weekly" [(ngModel)]="recurringType" (ngModelChange)="transactionFormValidate()">
                     <label>Weekly</label>
                   </div>
                   <div>
-                    <input value="fortnightly" type="radio" name="fortnightly" [(ngModel)]="recurringType">
+                    <input value="fortnightly" type="radio" name="fortnightly" [(ngModel)]="recurringType" (ngModelChange)="transactionFormValidate()">
                     <label>Fortnightly</label>
                   </div>
                 </div>
                 <div class="col-md-6">
                 <div>
-                    <input value="monthly" type="radio" name="monthly" [(ngModel)]="recurringType">
+                    <input value="monthly" type="radio" name="monthly" [(ngModel)]="recurringType" (ngModelChange)="transactionFormValidate()">
                     <label>Monthly</label>
                   </div>
                   <div>
-                    <input value="monthly" type="radio" name="monthly" [(ngModel)]="recurringType">
+                    <input value="monthly" type="radio" name="monthly" [(ngModel)]="recurringType" (ngModelChange)="transactionFormValidate()">
                     <label>Monthly</label>
                   </div>
                   <div>
-                    <input value="quarterly" type="radio" name="quarterly" [(ngModel)]="recurringType">
+                    <input value="quarterly" type="radio" name="quarterly" [(ngModel)]="recurringType" (ngModelChange)="transactionFormValidate()">
                     <label>Quarterly</label>
                   </div>
                 </div>
diff --git a/src/app/dashboard/add-data.component.ts b/src/app/dashboard/add-data.component.ts
index caf91e7..0bedfb4 100644
--- a/src/app/dashboard/add-data.component.ts
+++ b/src/app/dashboard/add-data.component.ts
@@ -178,7 +178,7 @@ export class AddDataComponent implements OnInit {
         this.submitOrg.town.length === 0 ||
         this.amount === 0 ||
         this.recurringPurchase &&
-        this.recurringType === 0) {
+        !this.recurringType) {
           this.transactionFormInvalid = true;
         } else {
           this.transactionFormInvalid = false;