From c691658ed8d2dfc06e9aa913a9ee77ae724598cd Mon Sep 17 00:00:00 2001
From: Jose Alberto Hernandez <alberto@black-box.lan>
Date: Mon, 11 Mar 2024 18:10:35 -0600
Subject: [PATCH] Fix to mark with strike the reversed FD Account transactions

---
 .../view-account-transfer.component.html      |   6 +
 .../view-account-transfer.component.ts        |   4 +
 .../transactions-tab.component.html           |  12 +-
 src/app/keyboards-shortcut-config.ts          | 148 +++++++++---------
 4 files changed, 90 insertions(+), 80 deletions(-)

diff --git a/src/app/account-transfers/view-account-transfer/view-account-transfer.component.html b/src/app/account-transfers/view-account-transfer/view-account-transfer.component.html
index 8d2866294..a0206b4e0 100644
--- a/src/app/account-transfers/view-account-transfer/view-account-transfer.component.html
+++ b/src/app/account-transfers/view-account-transfer/view-account-transfer.component.html
@@ -1,10 +1,16 @@
 <div class="container">
+  <span *ngIf="!viewAccountTransferData.reversed">
+    <button mat-raised-button color="warn" *mifosxHasPermission="'ADJUST_ACCOUNTTRANSFER'" >
+      <fa-icon icon="undo" class="m-r-10"></fa-icon>{{ 'labels.buttons.Undo' | translate}}
+    </button>
+  </span>
 
   <mat-card>
 
     <mat-card-content>
 
       <div fxLayout="row wrap" fxLayout.lt-md="column">
+        <div fxFlex="100%" [ngClass]="transactionColor()"></div>
 
         <h3 class="mat-h3" fxFlexFill>{{"labels.heading.Transaction Details" | translate}}</h3>
 
diff --git a/src/app/account-transfers/view-account-transfer/view-account-transfer.component.ts b/src/app/account-transfers/view-account-transfer/view-account-transfer.component.ts
index 7dd6dab95..5f2a037e4 100644
--- a/src/app/account-transfers/view-account-transfer/view-account-transfer.component.ts
+++ b/src/app/account-transfers/view-account-transfer/view-account-transfer.component.ts
@@ -35,4 +35,8 @@ export class ViewAccountTransferComponent {
     this.location.back();
   }
 
+  transactionColor(): string {
+    return this.viewAccountTransferData.reversed ? 'undo' : 'active';
+  }
+
 }
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html
index c823abfd3..1ad6e5b08 100644
--- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html
+++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html
@@ -20,32 +20,32 @@
 
       <ng-container matColumnDef="id">
         <th mat-header-cell *matHeaderCellDef> {{"labels.inputs.ID" | translate }} </th>
-        <td mat-cell *matCellDef="let transaction"> {{ transaction.id }} </td>
+        <td mat-cell *matCellDef="let transaction" [ngClass]="{'strike': transaction.reversed}"> {{ transaction.id }} </td>
       </ng-container>
 
       <ng-container matColumnDef="transactionDate">
         <th mat-header-cell *matHeaderCellDef> {{"labels.inputs.Transaction Date" | translate }} </th>
-        <td mat-cell *matCellDef="let transaction"> {{ transaction.date  | dateFormat }} </td>
+        <td mat-cell *matCellDef="let transaction" [ngClass]="{'strike': transaction.reversed}"> {{ transaction.date  | dateFormat }} </td>
       </ng-container>
 
       <ng-container matColumnDef="transactionType">
         <th mat-header-cell *matHeaderCellDef> {{"labels.inputs.Transaction Type" | translate }} </th>
-        <td mat-cell *matCellDef="let transaction"> {{ transaction.transactionType.value  }} </td>
+        <td mat-cell *matCellDef="let transaction" [ngClass]="{'strike': transaction.reversed}"> {{ transaction.transactionType.value  }} </td>
       </ng-container>
 
       <ng-container matColumnDef="debit">
         <th mat-header-cell *matHeaderCellDef> {{"labels.inputs.Debit" | translate }} </th>
-        <td mat-cell *matCellDef="let transaction"> {{ isDebit(transaction.transactionType) ? transaction.amount : 'N/A'}} </td>
+        <td mat-cell *matCellDef="let transaction" [ngClass]="{'strike': transaction.reversed}"> {{ isDebit(transaction.transactionType) ? transaction.amount : 'N/A'}} </td>
       </ng-container>
 
       <ng-container matColumnDef="credit">
         <th mat-header-cell *matHeaderCellDef> {{"labels.inputs.Credit" | translate }} </th>
-        <td mat-cell *matCellDef="let transaction"> {{ !isDebit(transaction.transactionType) ? transaction.amount : 'N/A' }} </td>
+        <td mat-cell *matCellDef="let transaction" [ngClass]="{'strike': transaction.reversed}"> {{ !isDebit(transaction.transactionType) ? transaction.amount : 'N/A' }} </td>
       </ng-container>
 
       <ng-container matColumnDef="balance">
         <th mat-header-cell *matHeaderCellDef> {{"labels.inputs.Balance" | translate }} </th>
-        <td mat-cell *matCellDef="let transaction"> {{ transaction.runningBalance }} </td>
+        <td mat-cell *matCellDef="let transaction" [ngClass]="{'strike': transaction.reversed}"> {{ transaction.runningBalance }} </td>
       </ng-container>
 
       <ng-container matColumnDef="actions">
diff --git a/src/app/keyboards-shortcut-config.ts b/src/app/keyboards-shortcut-config.ts
index 0a53b5006..a7ec6ce5c 100644
--- a/src/app/keyboards-shortcut-config.ts
+++ b/src/app/keyboards-shortcut-config.ts
@@ -17,170 +17,170 @@ export class KeyboardShortcutsConfiguration {
 
     makeCombination() {
         this.buttonsArray = [
-            // Navigation Page - Shift + N
+            // Navigation Page - ctrl + n
             {
                 title: 'Navigation Page',
-                ctrlKey: false,
-                shiftKey: true,
+                ctrlKey: true,
+                shiftKey: false,
                 altKey: false,
-                key: 'N',
+                key: 'n',
                 route: 'navigation'
             },
-            // Run Report - Shift + T
+            // Run Report - ctrl + t
             {
                 title: 'Run Report',
-                ctrlKey: false,
-                shiftKey: true,
+                ctrlKey: true,
+                shiftKey: false,
                 altKey: false,
-                key: 'T',
+                key: 't',
                 route: '',
                 id: 'runReport'
             },
-            // Checker Inbox & Pending Tasks - Shift + I
+            // Checker Inbox & Pending Tasks - ctrl + i
             {
-                title: 'Checker Inbox & Pending Tasks',
-                ctrlKey: false,
-                shiftKey: true,
-                altKey: false,
-                key: 'I',
-                route: 'checker-inbox-and-tasks/checker-inbox'
+              title: 'Checker Inbox & Pending Tasks',
+              ctrlKey: true,
+              shiftKey: false,
+              altKey: false,
+              key: 'i',
+              route: 'checker-inbox-and-tasks/checker-inbox'
             },
-            // Collection Sheet- Ctrl + Alt + O
+            // Collection Sheet- ctrl + alt + o
             // {
-            //     title: 'Collection Sheet',
-            //     ctrlKey: true,
-            //     shiftKey: false,
-            //     altKey: true,
-            //     key: 'o',
-            //     route: ''
+            // title: 'Collection Sheet',
+            // ctrlKey: true,
+            // shiftKey: false,
+            // altKey: true,
+            // key: 'o',
+            // route: ''
             // },
-            // Create Client - Shift + C
+            // Create Client - ctrl + c
             {
                 title: 'Create Client',
-                ctrlKey: false,
-                shiftKey: true,
+                ctrlKey: true,
+                shiftKey: false,
                 altKey: false,
-                key: 'C',
+                key: 'c',
                 route: 'clients/create'
             },
-            // Create Group - Shift + G
+            // Create Group - ctrl + g
             {
                 title: 'Create Group',
-                ctrlKey: false,
-                shiftKey: true,
+                ctrlKey: true,
+                shiftKey: false,
                 altKey: false,
-                key: 'G',
+                key: 'g',
                 route: 'groups/create'
             },
-            // Create Center - Shift + Q
+            // Create Center - ctrl + q
             {
                 title: 'Create Center',
-                ctrlKey: false,
-                shiftKey: true,
+                ctrlKey: true,
+                shiftKey: false,
                 altKey: false,
-                key: 'Q',
+                key: 'q',
                 route: 'centers/create'
             },
-            // Frequent Posting - Shift + F
+            // Frequent Posting - ctrl + f
             {
                 title: 'Frequent Posting',
-                ctrlKey: false,
-                shiftKey: true,
+                ctrlKey: true,
+                shiftKey: false,
                 altKey: false,
-                key: 'F',
+                key: 'f',
                 route: 'accounting/journal-entries/frequent-postings'
             },
-            // Closure Entries - Shift + E
+            // Closure Entries - ctrl + e
             {
                 title: 'Closure Entries',
-                ctrlKey: false,
-                shiftKey: true,
+                ctrlKey: true,
+                shiftKey: false,
                 altKey: false,
-                key: 'E',
+                key: 'e',
                 route: 'accounting/closing-entries'
             },
-            // Journal Entry - Shift + J
+            // Journal Entry - ctrl + j
             {
                 title: 'Journal Entry',
-                ctrlKey: false,
-                shiftKey: true,
+                ctrlKey: true,
+                shiftKey: false,
                 altKey: false,
-                key: 'J',
+                key: 'j',
                 route: 'accounting/journal-entries/create'
             },
-            // Reports - Shift + R
+            // Reports - ctrl + r
             {
                 title: 'Reports',
-                ctrlKey: false,
-                shiftKey: true,
+                ctrlKey: true,
+                shiftKey: false,
                 altKey: false,
-                key: 'R',
+                key: 'r',
                 route: 'reports'
             },
-            // Accounting - Shift + A
+            // Accounting - ctrl + a
             {
                 title: 'Accounting',
-                ctrlKey: false,
-                shiftKey: true,
+                ctrlKey: true,
+                shiftKey: false,
                 altKey: false,
-                key: 'A',
+                key: 'a',
                 route: 'accounting'
             },
-            // Save/Submit Forms - Shift + S
+            // Save/Submit Forms - ctrl + s
             {
                 title: 'Save/Submit Forms',
-                ctrlKey: false,
-                shiftKey: true,
+                ctrlKey: true,
+                shiftKey: false,
                 altKey: false,
-                key: 'S',
+                key: 's',
                 route: '',
                 id: 'submit'
             },
-            // Cancel - Shift + X
+            // Cancel - ctrl + x
             {
                 title: 'Cancel',
-                ctrlKey: false,
-                shiftKey: true,
+                ctrlKey: true,
+                shiftKey: false,
                 altKey: false,
-                key: 'X',
+                key: 'x',
                 route: '',
                 id: 'cancel'
             },
-            // Help - Shift + H
+            // Help - ctrl + h
             {
                 title: 'Help',
-                ctrlKey: false,
-                shiftKey: true,
+                ctrlKey: true,
+                shiftKey: false,
                 altKey: false,
-                key: 'H',
+                key: 'h',
                 route: '',
                 id: 'help'
             },
-            // Pagination: Next - Ctrl + n
+            // Pagination: Next - ctrl + n
             // {
             //     title: 'Pagination: Next'
             //     ctrlKey: true,
             //     shiftKey: false,
             //     altKey: true,
-            //     key: 'n',
+            //     key: 'n,
             //     route: ''
             // },
-            // Pagination: Previous - Ctrl + p
+            // Pagination: Previous - ctrl + p
             // {
             //     title: 'Pagination: Previous'
             //     ctrlKey: true,
             //     shiftKey: false,
             //     altKey: true,
-            //     key: 'p',
+            //     key: 'p,
             //     route: ''
             // },
-            // Logout - Shift + L
+            // Logout - ctrl + l
             {
                 title: 'Logout',
-                ctrlKey: false,
-                shiftKey: true,
+                ctrlKey: true,
+                shiftKey: false,
                 altKey: false,
-                key: 'L',
+                key: 'l',
                 route: '',
                 id: 'logout'
             }