Merge pull request #4 from pnagurny/feature/delete-rec

Delete reconciliation

src/app/app.component.html

@@ -71,7 +71,7 @@
   </div>
 </div>
 <div class="footer">
-  <p>Copyright &copy; 2018 Open Accounting, LLC<br>
+  <p>Copyright &copy; 2019 Open Accounting, LLC<br>
   <a href="/tou">Terms of Use</a> | <a href="/privacy-policy">Privacy Policy</a></p>
 </div>
 

src/app/reconcile/reconcile-modal.ts

@@ -220,7 +220,7 @@ export class ReconcileModal {
       this.sessionService.setLoading(false);
     }, () => {
       this.sessionService.setLoading(false);
-      this.activeModal.close();
+      this.activeModal.close(txs);
     });
   }
 }

src/app/reconcile/reconcile.html

@@ -52,11 +52,27 @@
 <div class="section">
   <h2>Past Reconciliations</h2>
 
-  <div *ngFor="let rec of pastReconciliations">
+  <div *ngFor="let rec of pastReconciliations; index as i">
     Period: {{rec.startDate | date:"M/d/y"}} - {{rec.endDate | date:"M/d/y"}}<br>
     Beginning Balance: {{rec.startBalance | currencyFormat:account.precision:account.currency}}<br>
     Ending Balance: {{rec.endBalance | currencyFormat:account.precision:account.currency}}<br>
+    <a *ngIf="i === 0" [routerLink]="" (click)="delete()">Delete</a>
     <br>
   </div>
 </div>
 
+<ng-template #confirmDeleteModal let-c="close" let-d="dismiss">
+  <div class="modal-header">
+    <h4 class="modal-title">Confirm delete</h4>
+    <button type="button" class="close" aria-label="Close" (click)="d()">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <p>Are you sure you want to delete this reconciliation?</p>
+  </div>
+  <div class="modal-footer">
+    <button type="button" class="btn btn-secondary" (click)="d()">Cancel</button>
+    <button type="button" class="btn btn-primary" (click)="c()">Delete</button>
+  </div>
+</ng-template>

src/app/reconcile/reconcile.ts

@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, ViewChild, ElementRef } from '@angular/core';
 import { Logger } from '../core/logger';
 import { Router } from '@angular/router';
 import { 
@@ -19,6 +19,10 @@ import { Util } from '../shared/util';
 import { NgbModal, ModalDismissReasons } from '@ng-bootstrap/ng-bootstrap';
 import { ReconcileModal } from './reconcile-modal';
 import { Reconciliation } from './reconciliation';
+import { SessionService } from '../core/session.service';
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/from';
+import 'rxjs/add/operator/mergeMap';
 
 @Component({
   selector: 'app-reconcile',
@@ -34,6 +38,7 @@ export class ReconcilePage {
   public unreconciledTxs: Transaction[];
   public error: AppError;
   private accountTree: AccountTree;
+  @ViewChild('confirmDeleteModal') confirmDeleteModal: ElementRef;
 
   constructor(
     private router: Router,
@@ -42,7 +47,8 @@ export class ReconcilePage {
     private orgService: OrgService,
     private txService: TransactionService,
     private fb: FormBuilder,
-    private modalService: NgbModal) {
+    private modalService: NgbModal,
+    private sessionService: SessionService) {
 
     let org = this.orgService.getCurrentOrg();
     this.accountForm = fb.group({
@@ -90,8 +96,10 @@ export class ReconcilePage {
 
     modal.componentInstance.setData(this.account, rec, this.unreconciledTxs);
 
-    modal.result.then((result) => {
+    modal.result.then((txs) => {
       this.log.debug('reconcile modal save');
+      rec.txs = txs;
+
       this.pastReconciliations.unshift(rec);
 
       this.newReconcile.patchValue(
@@ -170,6 +178,8 @@ export class ReconcilePage {
 
           let r = reconcileMap[endDate.getTime()];
 
+          r.txs.push(tx);
+
           if(this.account.debitBalance) {
             r.net += split.amount;
           } else {
@@ -223,4 +233,61 @@ export class ReconcilePage {
     });
   }
 
+  delete() {
+    this.modalService.open(this.confirmDeleteModal).result.then((result) => {
+      this.sessionService.setLoading(true);
+
+      let rec = this.pastReconciliations[0];
+  
+      Observable.from(rec.txs).mergeMap(tx => {
+        let oldId = tx.id;
+        tx.id = Util.newGuid();
+
+        let data = tx.getData();
+
+        let newSplits = {};
+
+        for(let splitId in data.reconciledSplits) {
+          if(tx.splits[splitId].accountId !== this.account.id) {
+            newSplits[splitId] = tx.splits[splitId];
+          }
+        }
+
+        data.reconciledSplits = newSplits;
+
+        tx.setData(data);
+  
+        return this.txService.putTransaction(oldId, tx);
+      }, 8).subscribe(tx => {
+        this.log.debug('Saved tx ' + tx.id);
+      }, err => {
+        this.error = err;
+        this.sessionService.setLoading(false);
+      }, () => {
+        this.pastReconciliations.shift();
+        let lastRec = this.pastReconciliations[0];
+
+        if(lastRec) {
+          this.newReconcile.patchValue(
+            {
+              startDate: Util.getLocalDateString(lastRec.endDate),
+              startBalance: lastRec.endBalance / Math.pow(10, this.account.precision)
+            }
+          );
+        } else {
+          this.newReconcile.patchValue(
+            {
+              startDate: null,
+              startBalance: 0
+            }
+          );
+        }
+
+        this.sessionService.setLoading(false);
+      });
+    }, (reason) => {
+      this.log.debug('cancel delete');
+    });
+  }
+
 }

src/app/reconcile/reconciliation.ts

@@ -1,7 +1,10 @@
+import { Transaction } from '../shared/transaction';
+
 export class Reconciliation {
   startDate: Date;
   startBalance: number;
   endDate: Date;
   endBalance: number;
   net: number;
+  txs: Transaction[] = [];
 }