From 09aae099df2dca8526eeef6f04f355431724594c Mon Sep 17 00:00:00 2001
From: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Sun, 6 Sep 2015 00:06:06 +0530
Subject: [PATCH] client-fees UI fixes

---
 app/global-translations/locale-en.json        |  1 +
 .../client/ViewClientController.js            |  2 +-
 app/views/clients/addnewclientcharge.html     |  1 +
 app/views/clients/clientchargeoverview.html   |  6 ++-
 app/views/clients/payclientcharge.html        | 44 +++++++++++--------
 app/views/clients/viewclient.html             |  2 +-
 app/views/clients/viewclientcharge.html       |  5 ++-
 app/views/products/createcharge.html          |  2 +-
 app/views/products/editcharge.html            |  2 +-
 app/views/products/viewcharge.html            |  2 +-
 .../edit_saving_account_application.html      |  2 +-
 11 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json
index d7b2c454..e032b850 100755
--- a/app/global-translations/locale-en.json
+++ b/app/global-translations/locale-en.json
@@ -2724,6 +2724,7 @@
     "label.input.incomefrominterest": "Income from interest",
     "label.input.interest.on.overdrafts": "Overdraft Interest Income",
     "label.input.incomefromfees": "Income from fees",
+    "label.input.incomefromcharges" : "Income from charge",
     "label.input.recoverypayments": "Income from Recovery Repayments",
     "label.input.incomefrompenalties": "Income from penalties",
     "label.input.loseswrittenoff": "Losses written off",
diff --git a/app/scripts/controllers/client/ViewClientController.js b/app/scripts/controllers/client/ViewClientController.js
index 4b0c2675..ea070d7b 100644
--- a/app/scripts/controllers/client/ViewClientController.js
+++ b/app/scripts/controllers/client/ViewClientController.js
@@ -514,7 +514,7 @@
 
             scope.waiveCharge = function(chargeId){
                 resourceFactory.clientChargesResource.waive({clientId: routeParams.id, resourceType:chargeId}, function (data) {
-                    location.path('/viewclient/'+ scope.client.id);
+                    route.reload();
                 });
             }
 
diff --git a/app/views/clients/addnewclientcharge.html b/app/views/clients/addnewclientcharge.html
index c393ce71..7aeaa4a0 100644
--- a/app/views/clients/addnewclientcharge.html
+++ b/app/views/clients/addnewclientcharge.html
@@ -1,5 +1,6 @@
 <div class="paddedbottom10">
     <ul class="breadcrumb">
+        <li><a ng-href="#/viewclient/{{clientId}}">{{'label.anchor.viewclient' | translate}}</a></li>
         <li class="active">{{ 'label.anchor.addclientcharge' | translate }}</li>
     </ul>
 </div>
diff --git a/app/views/clients/clientchargeoverview.html b/app/views/clients/clientchargeoverview.html
index 60c0f2fe..b2aea90f 100644
--- a/app/views/clients/clientchargeoverview.html
+++ b/app/views/clients/clientchargeoverview.html
@@ -1,7 +1,7 @@
 <div ng-controller="ClientChargesOverviewController">
     <div>
         <ul class="breadcrumb">
-            <li><a ng-href="#/viewclient/{{clientId}}">{{'label.anchor.clients' | translate}}</a></li>
+            <li><a ng-href="#/viewclient/{{clientId}}">{{'label.anchor.viewclient' | translate}}</a></li>
             <li class="active">{{label.heading.charges | translate}}</li>
         </ul>
     </div>
@@ -19,7 +19,9 @@
             </tr>
             <tr class="pointer-main" dir-paginate="charge in charges | itemsPerPage: chargesPerPage"
                 total-items="totalCharges" pagination-id="chargesPage">
-                <td class="pointer" data-ng-click="routeToCharge(charge.id)">{{charge.name}}</td>
+                <td class="pointer" data-ng-click="routeToCharge(charge.id)"><i
+                        class="icon-stop  {{ (!(charge.isWaived || charge.isPaid)) |StatusLookup}}"></i>&nbsp;{{charge.name}}
+                </td>
                 <td class="pointer" data-ng-click="routeToCharge(charge.id)">{{charge.dueDate|DateFormat}}</td>
                 <td class="pointer" data-ng-click="routeToCharge(charge.id)">{{charge.amount | number}}</td>
                 <td class="pointer" data-ng-click="routeToCharge(charge.id)">{{charge.amountPaid | number}}</td>
diff --git a/app/views/clients/payclientcharge.html b/app/views/clients/payclientcharge.html
index 8a8d1eb5..f1adfe17 100644
--- a/app/views/clients/payclientcharge.html
+++ b/app/views/clients/payclientcharge.html
@@ -1,19 +1,22 @@
-<div class="paddedbottom10">
-    <ul class="breadcrumb">
-        <li class="active">{{ 'label.anchor.addclientcharge' | translate }}</li>
-    </ul>
-</div>
-<form name="payclientchargeform" novalidate="" class="form-horizontal" ng-controller="PayClientChargeController"
-      rc-submit="submit()">
-    <api-validate></api-validate>
-    <fieldset>
+<div ng-controller="PayClientChargeController">
+    <div class="paddedbottom10">
+        <ul class="breadcrumb">
+            <li><a ng-href="#/viewclient/{{clientId}}">{{'label.anchor.viewclient' | translate}}</a></li>
+            <li class="active">{{ 'label.anchor.addclientcharge' | translate }}</li>
+        </ul>
+    </div>
+    <form name="payclientchargeform" novalidate="" class="form-horizontal"
+          rc-submit="submit()">
+        <api-validate></api-validate>
+        <fieldset>
 
             <div class="form-group">
                 <label class="control-label col-sm-2">{{ 'label.input.amount' | translate }}<span
                         class="required">*</span></label>
 
                 <div class="col-sm-3">
-                    <input id="amount" type="text" name="amount" ng-model="formData.amount" class="form-control" required ng-late-Validate/>
+                    <input id="amount" type="text" name="amount" ng-model="formData.amount" class="form-control"
+                           required ng-late-Validate/>
                     <form-validate valattributeform="payclientchargeform" valattribute="amount"/>
                 </div>
             </div>
@@ -23,17 +26,20 @@
                         class="required">*</span></label>
 
                 <div class="col-sm-3">
-                    <input  sort type="text" datepicker-pop={{df}}
+                    <input sort type="text" datepicker-pop={{df}}
                            ng-model="paymentDate" is-open="opened" class="form-control"/>
                 </div>
             </div>
 
-        </div>
 
-        <div class="col-md-offset-3">
-            <a id="cancel" href="#/viewclient/{{cancelRoute}}" class="btn btn-default">{{'label.button.cancel' |
-                translate}}</a>
-            <button id="save" type="submit" class="btn btn-primary" has-permission='PAY_CLIENTCHARGE'>{{'label.button.save' | translate}}</button>
-        </div>
-    </fieldset>
-</form>
+            <div class="col-md-offset-3">
+                <a id="cancel" href="#/viewclient/{{cancelRoute}}" class="btn btn-default">{{'label.button.cancel' |
+                    translate}}</a>
+                <button id="save" type="submit" class="btn btn-primary" has-permission='PAY_CLIENTCHARGE'>
+                    {{'label.button.save' |
+                    translate}}
+                </button>
+            </div>
+        </fieldset>
+    </form>
+</div>
\ No newline at end of file
diff --git a/app/views/clients/viewclient.html b/app/views/clients/viewclient.html
index b6633e57..9f01415d 100755
--- a/app/views/clients/viewclient.html
+++ b/app/views/clients/viewclient.html
@@ -236,7 +236,7 @@
 									</tr>
 									<tr class="pointer-main" ng-repeat="charge in charges">
 										<td class="pointer" data-ng-click="routeToCharge(charge.id)">
-                                            <i class="icon-circle  {{charge.isWaived || charge.isPaid|StatusLookup}}" ></i>&nbsp;{{charge.name}}
+                                            <i class="icon-stop  {{ (!(charge.isWaived || charge.isPaid)) |StatusLookup}}" ></i>&nbsp;{{charge.name}}
                                             </td>
 										<td class="pointer" data-ng-click="routeToCharge(charge.id)">{{charge.dueDate|DateFormat}}</td>
 										<td class="pointer" data-ng-click="routeToCharge(charge.id)">{{charge.amount | number}}</td>
diff --git a/app/views/clients/viewclientcharge.html b/app/views/clients/viewclientcharge.html
index 4bf9119b..d818abca 100644
--- a/app/views/clients/viewclientcharge.html
+++ b/app/views/clients/viewclientcharge.html
@@ -1,11 +1,12 @@
 <div ng-controller="ViewClientChargeController">
     <div class="paddedbottom10">
         <ul class="breadcrumb">
+            <li><a ng-href="#/viewclient/{{clientId}}">{{'label.anchor.viewclient' | translate}}</a></li>
             <li class="active">{{ 'label.anchor.viewcharge' | translate }}</li>
         </ul>
     </div>
     <div class="well">
-        <h3 class="bolder">{{charge.name}}
+        <h3 class="bolder"><i class="icon-stop  {{ (!(charge.isWaived || charge.isPaid)) |StatusLookup}}"></i>&nbsp;&nbsp;{{charge.name}}
             <div class="btn-group pull-right">
                 <a tooltip="{{'label.button.paycharge' | translate}}" ng-show="!charge.isPaid && !charge.isWaived"
                    has-permission='PAY_CLIENTCHARGE' ng-href="#/viewclient/{{clientId}}/paycharge/{{charge.id}}"
@@ -65,7 +66,7 @@
             </div>
         </div>
         <div class="row">
-            <h3>Transactions</h3>
+            <h3>{{ 'label.heading.transactions' | translate}}</h3>
             <table id="transactionsTable" data-ng-show="charge.clientTransactionDatas.length > 0"
                    class="table table-condensed">
                 <tr class="graybg">
diff --git a/app/views/products/createcharge.html b/app/views/products/createcharge.html
index 6ea43725..6dff10f1 100644
--- a/app/views/products/createcharge.html
+++ b/app/views/products/createcharge.html
@@ -188,7 +188,7 @@
                     </div>
                 </div>
                 <div class="form-group" ng-show="showGLAccount">
-                    <label class="control-label col-sm-2">{{ 'label.input.incomefromfees' | translate }}</label>
+                    <label class="control-label col-sm-2">{{ 'label.input.incomefromcharges' | translate }}</label>
                     <div class="col-sm-3">
                         <select id="incomeOrLiabilityAccountId" ng-model="formData.incomeAccountId"
                                 chosen="incomeAndLiabilityAccountOptions"
diff --git a/app/views/products/editcharge.html b/app/views/products/editcharge.html
index ef5f84ab..db4652b7 100644
--- a/app/views/products/editcharge.html
+++ b/app/views/products/editcharge.html
@@ -154,7 +154,7 @@
                 </div>
             </div>
             <div class="form-group" ng-show="showGLAccount">
-                <label class="control-label col-sm-2">{{ 'label.input.incomefromfees' | translate }}</label>
+                <label class="control-label col-sm-2">{{ 'label.input.incomefromcharges' | translate }}</label>
                 <div class="col-sm-3">
                     <select id="incomeOrLiabilityAccountId" ng-model="formData.incomeAccountId"
                             chosen="incomeAndLiabilityAccountOptions"
diff --git a/app/views/products/viewcharge.html b/app/views/products/viewcharge.html
index 5d02ad31..d1b2d208 100644
--- a/app/views/products/viewcharge.html
+++ b/app/views/products/viewcharge.html
@@ -73,7 +73,7 @@
 	                    <td>{{charge.feeInterval}}</td>
 	                </tr>
 					<tr ng-show="charge.incomeOrLiabilityAccount">
-						<td>{{'label.heading.incomefromfees' | translate}}</td>
+						<td>{{'label.input.incomefromcharges' | translate}}</td>
 						<td>{{charge.incomeOrLiabilityAccount.name}} ({{charge.incomeOrLiabilityAccount.glCode}})</td>
 					</tr>
 	            </table>
diff --git a/app/views/savings/edit_saving_account_application.html b/app/views/savings/edit_saving_account_application.html
index ca8b202a..124b0995 100755
--- a/app/views/savings/edit_saving_account_application.html
+++ b/app/views/savings/edit_saving_account_application.html
@@ -27,7 +27,7 @@
         </td>
         <td class="width36 paddedbottom10">
             <input ng-show="formData.productId" id="submittedOnDate" sort type="text" datepicker-pop="dd MMMM yyyy"
-                   ng-model="date.submittedOnDate" is-open="opened" min="minDate" max="restrictDate"
+                   ng-model="formData.submittedOnDate" is-open="opened" min="minDate" max="restrictDate"
                    class="form-control"/>
         </td>
     </tr>