From 40eef44666474f0848a7b7528b216e7b3c3ac77b Mon Sep 17 00:00:00 2001
From: piratefinn <toyou1995@gmail.com>
Date: Tue, 20 Mar 2018 17:41:03 +0000
Subject: [PATCH] fixed recurring transaction editing

---
 src/app/dashboard/transaction-log.component.html | 2 +-
 src/app/dashboard/transaction-log.component.ts   | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/app/dashboard/transaction-log.component.html b/src/app/dashboard/transaction-log.component.html
index 09ced33..424897e 100644
--- a/src/app/dashboard/transaction-log.component.html
+++ b/src/app/dashboard/transaction-log.component.html
@@ -104,7 +104,7 @@
                 <label class="col-md-3 form-control-label" for="text-input">Budget Type</label>
                 <div class="col-md-9">
                     <div class="input-group">
-                    <select type="text" class="form-control" [compareWith]="byId" [(ngModel)]="clickedRecur.category">
+                    <select type="text" class="form-control" [(ngModel)]="clickedRecur.category">
                       <option value="0">Uncategorised</option>
                       <option *ngFor="let category of categoryIdList" [ngValue]="category">
                         {{ categoryList[category] }}
diff --git a/src/app/dashboard/transaction-log.component.ts b/src/app/dashboard/transaction-log.component.ts
index 580a4a9..2652664 100644
--- a/src/app/dashboard/transaction-log.component.ts
+++ b/src/app/dashboard/transaction-log.component.ts
@@ -58,10 +58,6 @@ export class TransactionLogComponent implements OnInit {
     this.loadTransactions(1);
   }
 
-  byId(c1: ItemModel, c2: ItemModel) {
-    return c1 && c2 ? c1.id === c2.id : c1 === c2;
-  }
-
   loadTransactions(logPage: number) {
     this.api.transList(logPage).subscribe(
       result => {
@@ -104,7 +100,7 @@ export class TransactionLogComponent implements OnInit {
     let updatedTimeSubmit = moment(this.updatedTime, 'YYYY-MM-DD[T]HH:mm').local().format('YYYY-MM-DD[T]HH:mm:ss.SSSZ');
     this.clickedRecur.display_time = moment(this.updatedTime).format('llll');
     let myParams = {
-      category: 111,
+      category: (this.clickedRecur.category == 0 ? undefined : this.clickedRecur.category),
       essential: this.clickedRecur.essential,
       id: this.clickedRecur.id,
       apply_time: updatedTimeSubmit,
@@ -118,7 +114,7 @@ export class TransactionLogComponent implements OnInit {
       result => {
         if ( result.success === true ) {
           this.transactionFormStatus = 'success';
-          this.resetForm();
+          this.transactionFormStatusSuccess = 'Edit Succeeded.';
         } else {
           this.transactionFormStatusError = JSON.stringify(result.status) + 'Error, ' + JSON.stringify(result.message);
           this.transactionFormStatus = 'send_failed';