From e8af78c18f5f5c8fdcac65a4bdacbe6fa5cc9d1d Mon Sep 17 00:00:00 2001
From: Madhukar <madhukar@confluxtechnologies.com>
Date: Wed, 18 Jun 2014 21:06:20 +0530
Subject: [PATCH] MIFOSX-1348 sorting for RD transactions

---
 ...ecurringDepositAccountDetailsController.js | 14 +++++++++++++
 .../recurring/viewaccountdetails.html         | 14 ++++++-------
 app/views/loans/viewloanaccountdetails.html   | 20 +++++++++----------
 .../savings/view_saving_account_details.html  | 12 +++++------
 4 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/app/scripts/controllers/deposits/recurring/ViewRecurringDepositAccountDetailsController.js b/app/scripts/controllers/deposits/recurring/ViewRecurringDepositAccountDetailsController.js
index 0eb6747b..e48affc8 100755
--- a/app/scripts/controllers/deposits/recurring/ViewRecurringDepositAccountDetailsController.js
+++ b/app/scripts/controllers/deposits/recurring/ViewRecurringDepositAccountDetailsController.js
@@ -286,6 +286,20 @@
                 };
             };
 
+            scope.transactionSort = {
+                column: 'date',
+                descending: true
+            };
+            scope.changeTransactionSort = function(column) {
+                var sort = scope.transactionSort;
+                if (sort.column == column) {
+                    sort.descending = !sort.descending;
+                } else {
+                    sort.column = column;
+                    sort.descending = true;
+                }
+            };
+
         }
     });
     mifosX.ng.application.controller('ViewRecurringDepositAccountDetailsController', ['$scope', '$routeParams', 'ResourceFactory', '$location', '$route', 'dateFilter','$modal', mifosX.controllers.ViewRecurringDepositAccountDetailsController]).run(function ($log) {
diff --git a/app/views/deposits/recurring/viewaccountdetails.html b/app/views/deposits/recurring/viewaccountdetails.html
index 9fad1419..191db088 100755
--- a/app/views/deposits/recurring/viewaccountdetails.html
+++ b/app/views/deposits/recurring/viewaccountdetails.html
@@ -204,17 +204,17 @@
         <colgroup span="4"></colgroup>
         <thead>
         <tr>
-            <th>{{'label.heading.id' | translate}}</th>
-            <th>{{'label.heading.transactiondate' | translate}}</th>
-            <th>{{'label.heading.transactiontype' | translate}}</th>
-            <th>{{'label.heading.debit' | translate}}</th>
-            <th>{{'label.heading.credit' | translate}}</th>
-            <th>{{'label.heading.balance' | translate}}</th>
+            <th class="pointer" ng-click="changeTransactionSort('id')">{{'label.heading.id' | translate}}</th>
+            <th class="pointer" ng-click="changeTransactionSort('date')">{{'label.heading.transactiondate' | translate}}</th>
+            <th class="pointer" ng-click="changeTransactionSort('transactionType.value')">{{'label.heading.transactiontype' | translate}}</th>
+            <th class="pointer" ng-click="changeTransactionSort('amount')">{{'label.heading.debit' | translate}}</th>
+            <th class="pointer" ng-click="changeTransactionSort('amount')">{{'label.heading.credit' | translate}}</th>
+            <th class="pointer" ng-click="changeTransactionSort('runningBalance')">{{'label.heading.balance' | translate}}</th>
         </tr>
         </thead>
         <tbody>
         <tr class="pointer-main" ng-class="{strikeoff : transaction.reversed==true}"
-            ng-repeat="transaction in savingaccountdetails.transactions">
+            ng-repeat="transaction in savingaccountdetails.transactions | orderBy:transactionSort.column:transactionSort.descending ">
             <td class="pointer"
                 data-ng-click="routeTo(transaction.accountId,transaction.id,transaction.transfer,transaction.transfer.id)">
                 {{transaction.id}}
diff --git a/app/views/loans/viewloanaccountdetails.html b/app/views/loans/viewloanaccountdetails.html
index 0332e739..1bb38263 100644
--- a/app/views/loans/viewloanaccountdetails.html
+++ b/app/views/loans/viewloanaccountdetails.html
@@ -479,12 +479,12 @@
         <colgroup span="4"></colgroup>
         <thead>
         <tr class="graybg">
-            <th ng-click="changeTransactionSort('id')">{{'label.heading.id' | translate}}</th>
-            <th ng-click="changeTransactionSort('officeName')">{{'label.heading.office' | translate}}</th>
-            <th ng-click="changeTransactionSort('date')">{{'label.heading.transactiondate' | translate}}</th>
-            <th ng-click="changeTransactionSort('type.value')">{{'label.heading.transactiontype' | translate}}</th>
-            <th ng-click="changeTransactionSort('amount')">{{'label.heading.amount' | translate}}</th>
-            <th colspan="5" scope="colgroup">{{'label.heading.breakdown' | translate}}</th>
+            <th class="pointer" ng-click="changeTransactionSort('id')">{{'label.heading.id' | translate}}</th>
+            <th class="pointer" ng-click="changeTransactionSort('officeName')">{{'label.heading.office' | translate}}</th>
+            <th class="pointer" ng-click="changeTransactionSort('date')">{{'label.heading.transactiondate' | translate}}</th>
+            <th class="pointer" ng-click="changeTransactionSort('type.value')">{{'label.heading.transactiontype' | translate}}</th>
+            <th class="pointer" ng-click="changeTransactionSort('amount')">{{'label.heading.amount' | translate}}</th>
+            <th class="pointer" colspan="5" scope="colgroup">{{'label.heading.breakdown' | translate}}</th>
         </tr>
         <tr>
             <th scope="col">&nbsp;</th>
@@ -492,10 +492,10 @@
             <th scope="col">&nbsp;</th>
             <th scope="col">&nbsp;</th>
             <th scope="col">&nbsp;</th>
-            <th scope="col" ng-click="changeTransactionSort('principalPortion')">{{'label.heading.principal' | translate}}</th>
-            <th scope="col" ng-click="changeTransactionSort('interestPortion')">{{'label.heading.interest' | translate}}</th>
-            <th scope="col" ng-click="changeTransactionSort('feeChargesPortion')">{{'label.heading.fees' | translate}}</th>
-            <th scope="col" ng-click="changeTransactionSort('penaltyChargesPortion')">{{'label.heading.penalities' | translate}}</th>
+            <th class="pointer" scope="col" ng-click="changeTransactionSort('principalPortion')">{{'label.heading.principal' | translate}}</th>
+            <th class="pointer" scope="col" ng-click="changeTransactionSort('interestPortion')">{{'label.heading.interest' | translate}}</th>
+            <th class="pointer" scope="col" ng-click="changeTransactionSort('feeChargesPortion')">{{'label.heading.fees' | translate}}</th>
+            <th class="pointer" scope="col" ng-click="changeTransactionSort('penaltyChargesPortion')">{{'label.heading.penalities' | translate}}</th>
         </tr>
         </thead>
         <tbody>
diff --git a/app/views/savings/view_saving_account_details.html b/app/views/savings/view_saving_account_details.html
index 36eea4a4..61d5d0ba 100644
--- a/app/views/savings/view_saving_account_details.html
+++ b/app/views/savings/view_saving_account_details.html
@@ -211,12 +211,12 @@
                         <colgroup span="4"></colgroup>
                         <thead>
                         <tr>
-                            <th ng-click="changeTransactionSort('id')">{{'label.heading.id' | translate}}</th>
-                            <th ng-click="changeTransactionSort('date')">{{'label.heading.transactiondate' | translate}}</th>
-                            <th ng-click="changeTransactionSort('transactionType.value')">{{'label.heading.transactiontype' | translate}}</th>
-                            <th ng-click="changeTransactionSort('amount')">{{'label.heading.debit' | translate}}</th>
-                            <th ng-click="changeTransactionSort('amount')">{{'label.heading.credit' | translate}}</th>
-                            <th ng-click="changeTransactionSort('runningBalance')">{{'label.heading.balance' | translate}}</th>
+                            <th class="pointer" ng-click="changeTransactionSort('id')">{{'label.heading.id' | translate}}</th>
+                            <th class="pointer" ng-click="changeTransactionSort('date')">{{'label.heading.transactiondate' | translate}}</th>
+                            <th class="pointer" ng-click="changeTransactionSort('transactionType.value')">{{'label.heading.transactiontype' | translate}}</th>
+                            <th class="pointer" ng-click="changeTransactionSort('amount')">{{'label.heading.debit' | translate}}</th>
+                            <th class="pointer" ng-click="changeTransactionSort('amount')">{{'label.heading.credit' | translate}}</th>
+                            <th class="pointer" ng-click="changeTransactionSort('runningBalance')">{{'label.heading.balance' | translate}}</th>
                         </tr>
                         </thead>
                         <tbody>