From b80a3db4c29ef152d8a360248b5148c62b10cabd Mon Sep 17 00:00:00 2001
From: Gaurav Saini <gauravsaini03@gmail.com>
Date: Sat, 16 Aug 2014 12:25:31 +0530
Subject: [PATCH] Added filter and number-format directive

---
 app/views/loans/addloancharge.html            |  2 +-
 app/views/loans/loanaccountactions.html       |  2 +-
 app/views/loans/newloanaccount.html           |  6 +-
 app/views/loans/viewloanaccountdetails.html   | 80 +++++++++----------
 app/views/products/createcharge.html          |  2 +-
 app/views/products/editcharge.html            |  2 +-
 .../new_saving_account_application.html       | 10 +--
 7 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/app/views/loans/addloancharge.html b/app/views/loans/addloancharge.html
index ff57bc61..7473eb75 100644
--- a/app/views/loans/addloancharge.html
+++ b/app/views/loans/addloancharge.html
@@ -29,7 +29,7 @@
 
                     <div class="col-sm-3">
                         <input id="amount" type="text" class="form-control" name="amount" ng-model="formData.amount" required
-                               ng-late-Validate>
+                               number-format ng-late-Validate>
                     </div>
                     <div class="col-sm-3">
 						<span ng-show="loanchargeform.amount.$invalid">
diff --git a/app/views/loans/loanaccountactions.html b/app/views/loans/loanaccountactions.html
index 9531ea13..5714ee9b 100644
--- a/app/views/loans/loanaccountactions.html
+++ b/app/views/loans/loanaccountactions.html
@@ -26,7 +26,7 @@
 
                 <div class="col-sm-3">
                     <input id="transactionAmount" type="text" name="amount" ng-model="formData.transactionAmount" class="form-control"
-                           required late-Validate>
+                           number-format required late-Validate>
                 </div>
                 <div class="col-sm-3">
                     <form-validate valattributeform="loanactionform" valattribute="amount"/>
diff --git a/app/views/loans/newloanaccount.html b/app/views/loans/newloanaccount.html
index 8d82797c..018efcba 100644
--- a/app/views/loans/newloanaccount.html
+++ b/app/views/loans/newloanaccount.html
@@ -103,7 +103,7 @@
                         class="required">*</span>:</label></td>
                 <td class="width31 paddedbottom10">
                     <input type="text" class="form-control" id="principal" name="principal" ng-model="formData.principal"
-                           required late-Validate/>&nbsp;{{loanaccountinfo.currency.displaySymbol}}
+                           number-format required late-Validate/>&nbsp;{{loanaccountinfo.currency.displaySymbol}}
                     <form-validate valattributeform="newloanaccountform" valattribute="principal"/>
                 </td>
                 <td class="width14"><label>{{ 'label.input.loanterm' | translate }}&nbsp;<span class="required">*</span>:</label>
@@ -343,7 +343,7 @@
                     <td>{{charge.name}},{{charge.currency.displaySymbol}}</td>
                     <td>{{charge.chargeCalculationType.value}}</td>
                     <td><input id="{{charges[$index].amount}}" class="form-control" type="text" ng-model="charge.amount"
-                               placeholder="{{'label.input.amount' | translate}}"></td>
+                               placeholder="{{'label.input.amount' | translate}}" number-format></td>
                     <td>{{charge.chargeTimeType.value}}</td>
                     <td>
                         <input id="charges[{{$index}}].duedate" type="text" datepicker-pop="dd MMMM yyyy" class="form-control"
@@ -377,7 +377,7 @@
                         value="{{collateralTemplate.id}}" class="form-control width170px">
                 </select>&nbsp;&nbsp;
                 <input class="form-control" type="text" ng-model="collateralFormData.collateralValueTemplate"
-                       placeholder="{{'label.input.value' | translate}}">&nbsp;&nbsp;
+                       placeholder="{{'label.input.value' | translate}}" number-format>&nbsp;&nbsp;
                 <input type="text" ng-model="collateralFormData.collateralDescriptionTemplate"
                        placeholder="{{'label.input.description' | translate}}" class="form-control">
                 <a ng-click="addCollateral()">&nbsp;<i class="icon-plus icon-white"></i></a>
diff --git a/app/views/loans/viewloanaccountdetails.html b/app/views/loans/viewloanaccountdetails.html
index 9970edce..480cd97c 100644
--- a/app/views/loans/viewloanaccountdetails.html
+++ b/app/views/loans/viewloanaccountdetails.html
@@ -125,11 +125,11 @@
             </tr>
             <tr>
                 <th class="table-bold-loan">{{'label.heading.approvedamount' | translate}}</th>
-                <td><span class="padded-td">{{loandetails.approvedPrincipal}}</span></td>
+                <td><span class="padded-td">{{loandetails.approvedPrincipal | number}}</span></td>
             </tr>
             <tr>
                 <th class="table-bold-loan">{{'label.heading.disburseamount' | translate}}</th>
-                <td><span class="padded-td">{{loandetails.principal}}</span></td>
+                <td><span class="padded-td">{{loandetails.principal | number}}</span></td>
             </tr>
             <tr>
                 <th class="table-bold-loan">{{'label.heading.arrearsby' | translate}}</th>
@@ -355,51 +355,51 @@
         <tbody>
         <tr>
             <th>{{'label.heading.principal' | translate}}</th>
-            <td>{{loandetails.summary.principalDisbursed}}</td>
-            <td>{{loandetails.summary.principalPaid}}</td>
+            <td>{{loandetails.summary.principalDisbursed | number}}</td>
+            <td>{{loandetails.summary.principalPaid | number}}</td>
             <td>&nbsp;</td>
-            <td>{{loandetails.summary.principalWrittenOff}}</td>
-            <td>{{loandetails.summary.principalOutstanding}}</td>
-            <td>{{loandetails.summary.principalOverdue}}</td>
+            <td>{{loandetails.summary.principalWrittenOff | number}}</td>
+            <td>{{loandetails.summary.principalOutstanding | number}}</td>
+            <td>{{loandetails.summary.principalOverdue | number}}</td>
         </tr>
         <tr>
             <th>{{'label.heading.interest' | translate}}</th>
-            <td>{{loandetails.summary.interestCharged}}</td>
-            <td>{{loandetails.summary.interestPaid}}</td>
-            <td>{{loandetails.summary.interestWaived}}</td>
-            <td>{{loandetails.summary.interestWrittenOff}}</td>
-            <td>{{loandetails.summary.interestOutstanding}}</td>
-            <td>{{loandetails.summary.interestOverdue}}</td>
+            <td>{{loandetails.summary.interestCharged | number}}</td>
+            <td>{{loandetails.summary.interestPaid | number}}</td>
+            <td>{{loandetails.summary.interestWaived | number}}</td>
+            <td>{{loandetails.summary.interestWrittenOff | number}}</td>
+            <td>{{loandetails.summary.interestOutstanding | number}}</td>
+            <td>{{loandetails.summary.interestOverdue | number}}</td>
         </tr>
         <tr>
             <th>{{'label.heading.fees' | translate}}</th>
-            <td>{{loandetails.summary.feeChargesCharged}}</td>
-            <td>{{loandetails.summary.feeChargesPaid}}</td>
-            <td>{{loandetails.summary.feeChargesWaived}}</td>
-            <td>{{loandetails.summary.feeChargesWrittenOff}}</td>
-            <td>{{loandetails.summary.feeChargesOutstanding}}</td>
-            <td>{{loandetails.summary.feeChargesOverdue}}</td>
+            <td>{{loandetails.summary.feeChargesCharged | number}}</td>
+            <td>{{loandetails.summary.feeChargesPaid | number}}</td>
+            <td>{{loandetails.summary.feeChargesWaived | number}}</td>
+            <td>{{loandetails.summary.feeChargesWrittenOff | number}}</td>
+            <td>{{loandetails.summary.feeChargesOutstanding | number}}</td>
+            <td>{{loandetails.summary.feeChargesOverdue | number}}</td>
         </tr>
 
         <tr>
             <th>{{'label.heading.penalties' | translate}}</th>
-            <td>{{loandetails.summary.penaltyChargesCharged}}</td>
-            <td>{{loandetails.summary.penaltyChargesPaid}}</td>
-            <td>{{loandetails.summary.penaltyChargesWaived}}</td>
-            <td>{{loandetails.summary.penaltyChargesWrittenOff}}</td>
-            <td>{{loandetails.summary.penaltyChargesOutstanding}}</td>
-            <td>{{loandetails.summary.penaltyChargesOverdue}}</td>
+            <td>{{loandetails.summary.penaltyChargesCharged | number}}</td>
+            <td>{{loandetails.summary.penaltyChargesPaid | number}}</td>
+            <td>{{loandetails.summary.penaltyChargesWaived | number}}</td>
+            <td>{{loandetails.summary.penaltyChargesWrittenOff | number}}</td>
+            <td>{{loandetails.summary.penaltyChargesOutstanding | number}}</td>
+            <td>{{loandetails.summary.penaltyChargesOverdue | number}}</td>
         </tr>
         </tbody>
         <tfoot>
         <tr>
             <th>{{'label.heading.total' | translate}}</th>
-            <th>{{loandetails.summary.totalExpectedRepayment}}</th>
-            <th>{{loandetails.summary.totalRepayment}}</th>
-            <th>{{loandetails.summary.totalWaived}}</th>
-            <th>{{loandetails.summary.totalWrittenOff}}</th>
-            <th>{{loandetails.summary.totalOutstanding}}</th>
-            <th>{{loandetails.summary.totalOverdue}}</th>
+            <th>{{loandetails.summary.totalExpectedRepayment | number}}</th>
+            <th>{{loandetails.summary.totalRepayment | number}}</th>
+            <th>{{loandetails.summary.totalWaived | number}}</th>
+            <th>{{loandetails.summary.totalWrittenOff | number}}</th>
+            <th>{{loandetails.summary.totalOutstanding | number}}</th>
+            <th>{{loandetails.summary.totalOverdue | number}}</th>
         </tr>
         </tfoot>
     </table>
@@ -531,19 +531,19 @@
                 {{transaction.type.value}}
             </td>
             <td class="pointer" data-ng-click="routeTo(loandetails.id,transaction.id,transaction.type.id)">
-                {{transaction.amount}}
+                {{transaction.amount | number}}
             </td>
             <td class="pointer" data-ng-click="routeTo(loandetails.id,transaction.id,transaction.type.id)">
-                {{transaction.principalPortion}}
+                {{transaction.principalPortion | number}}
             </td>
             <td class="pointer" data-ng-click="routeTo(loandetails.id,transaction.id,transaction.type.id)">
-                {{transaction.interestPortion}}
+                {{transaction.interestPortion | number}}
             </td>
             <td class="pointer" data-ng-click="routeTo(loandetails.id,transaction.id,transaction.type.id)">
-                {{transaction.feeChargesPortion}}
+                {{transaction.feeChargesPortion | number}}
             </td>
             <td class="pointer" data-ng-click="routeTo(loandetails.id,transaction.id,transaction.type.id)">
-                {{transaction.penaltyChargesPortion}}
+                {{transaction.penaltyChargesPortion | number}}
             </td>
         </tr>
         </tbody>
@@ -560,7 +560,7 @@
         <tbody>
         <tr ng-repeat="collateral in loandetails.collateral" class="pointer-main">
             <td class="pointer" data-ng-click="viewLoanCollateral(collateral.id)">{{collateral.type.name}}</td>
-            <td class="pointer" data-ng-click="viewLoanCollateral(collateral.id)">{{collateral.value}}</td>
+            <td class="pointer" data-ng-click="viewLoanCollateral(collateral.id)">{{collateral.value | number}}</td>
             <td class="pointer" data-ng-click="viewLoanCollateral(collateral.id)">{{collateral.description}}</td>
         </tr>
         </tbody>
@@ -596,8 +596,8 @@
         <tr ng-repeat="disbursementDetail in loandetails.disbursementDetails">
             <td>{{disbursementDetail.expectedDisbursementDate | DateFormat}}</td>
             <td>{{disbursementDetail.actualDisbursementDate | DateFormat}}</td>
-            <td>{{disbursementDetail.approvedPrincipal}}</td>
-            <td>{{disbursementDetail.principal}}</td>
+            <td>{{disbursementDetail.approvedPrincipal | number}}</td>
+            <td>{{disbursementDetail.principal | number}}</td>
             <td>
                 <div ng-show="disbursementDetail.actualDisbursementDate != null"><i class="icon-check icon-white"></i>
                 </div>
@@ -639,7 +639,7 @@
         <tr ng-repeat="charge in loandetails.overdueCharges">
             <td>{{charge.name}},{{charge.currency.displaySymbol}}</td>
             <td>{{charge.chargeCalculationType.value}}</td>
-            <td>{{charge.amount}}</td>
+            <td>{{charge.amount | number}}</td>
             <td>{{charge.chargeTimeType.value}}</td>
         </tr>
     </table>
diff --git a/app/views/products/createcharge.html b/app/views/products/createcharge.html
index a594321e..21ff7888 100644
--- a/app/views/products/createcharge.html
+++ b/app/views/products/createcharge.html
@@ -162,7 +162,7 @@
                             class="required">*</span></label>
 
                     <div class="col-sm-3">
-                        <input id="amount" name="amount" type="text" ng-model="formData.amount" class="form-control" required late-Validate/>
+                        <input id="amount" name="amount" type="text" ng-model="formData.amount" class="form-control" number-format required late-Validate/>
                     </div>
                     <div class="col-sm-3">
                         <form-validate valattributeform="createchargeform" valattribute="amount"/>
diff --git a/app/views/products/editcharge.html b/app/views/products/editcharge.html
index 9c16b0d0..ce8eb4c0 100644
--- a/app/views/products/editcharge.html
+++ b/app/views/products/editcharge.html
@@ -131,7 +131,7 @@
                         class="required">*</span></label>
 
                 <div class="col-sm-3">
-                    <input name="amount" type="text" id="amount" ng-model="formData.amount" class="form-control" required late-Validate/>
+                    <input name="amount" type="text" id="amount" ng-model="formData.amount" class="form-control" number-format required late-Validate/>
                     <form-validate valattributeform="editchargeform" valattribute="amount"/>
                 </div>
             </div>
diff --git a/app/views/savings/new_saving_account_application.html b/app/views/savings/new_saving_account_application.html
index 03fc5f53..3a17d0d6 100755
--- a/app/views/savings/new_saving_account_application.html
+++ b/app/views/savings/new_saving_account_application.html
@@ -73,7 +73,7 @@
                 <input id="nominalAnnualInterestRate" type="text"
                        name="nominalannualinterestrate"
                        ng-model="formData.nominalAnnualInterestRate" class="form-control"
-                       required late-Validate/>
+                       number-format required late-Validate/>
                 <form-validate valattributeform="newsavingccountform"
                                valattribute="nominalannualinterestrate"/>
             </td>
@@ -132,7 +132,7 @@
             </td>
             <td class="width36 paddedbottom10">
                 <input id="minRequiredOpeningBalance" type="text"
-                       ng-model="formData.minRequiredOpeningBalance" class="form-control">
+                       ng-model="formData.minRequiredOpeningBalance" class="form-control" number-format>
             </td>
             <td class="width14">
                 <label class="control-label">{{ 'label.input.lockinPeriodFrequency' | translate }}</label>
@@ -181,7 +181,7 @@
                     }}&nbsp;</label></td>
             <td class="width36 paddedbottom10" ng-hide="formData.allowOverdraft">
                 <input id="minRequiredBalance" type="text" class="form-control"
-                       ng-model="formData.minRequiredBalance">
+                       ng-model="formData.minRequiredBalance" number-format>
             </td>
         </tr>
         <tr ng-show="data.minBalanceForInterestCalculation">
@@ -223,8 +223,8 @@
             <td>{{charge.name}},{{charge.currency.displaySymbol}}</td>
             <td>{{charge.chargeCalculationType.value}}</td>
             <td><input id="charges[{{$index}}].amount" class="input-sm form-control" type="text"
-                       ng-model="charge.amount"
-                       placeholder="{{'label.placeholder.amount' | translate}}"/></td>
+                       ng-model="charge.amount" number-format 
+                       placeholder="{{'label.input.amount' | translate}}"/></td>
             <td>{{charge.chargeTimeType.value}}</td>
             <td ng-switch on="charge.chargeTimeType.value">
                 <input id="charges[{{$index}}].feeOnMonthDay" class="input-medium form-control" readonly