artin/community-app
1
0
Fork 0
mirror of https://github.com/openMF/community-app.git synced 2026-02-06 18:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1960 from Ippezrobert/FINERACT-412-

Browse Source 
FINERACT-412 - Add Share account in Global Search
This commit is contained in:
Shaik Nazeer Hussain 2017-03-07 16:21:33 +05:30 committed by GitHub
commit 18a7ddcdd3
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/global-translations/locale-en.json
View File

@ -561,6 +561,7 @@
"label.search.scope.clients.and.clientIdentifiers": "Clients",
"label.search.scope.groups.and.centers":"Groups",
"label.search.scope.savings":"Savings",
"label.search.scope.shares":"Shares",
"#Buttons": "..",

5
app/scripts/controllers/main/MainController.js
View File

@ -159,7 +159,7 @@
});
var setSearchScopes = function () {
var all = {name: "label.search.scope.all", value: "clients,clientIdentifiers,groups,savings,loans"};
var all = {name: "label.search.scope.all", value: "clients,clientIdentifiers,groups,savings,shares,loans"};
var clients = {
name: "label.search.scope.clients.and.clientIdentifiers",
value: "clients,clientIdentifiers"
@ -169,8 +169,9 @@
value: "groups"
};
var savings = {name: "label.input.adhoc.search.loans", value: "loans"};
var shares = {name: "label.search.scope.shares", value: "shares"};
var loans = {name: "label.search.scope.savings", value: "savings"};
scope.searchScopes = [all,clients,groups,loans,savings];
scope.searchScopes = [all,clients,groups,loans,savings,shares];
scope.currentScope = all;
}

26
app/views/search/glresults.html
View File

@ -6,7 +6,7 @@
<div class="span5">
<div ng-repeat="result in searchResults">
<div class="blockquoteresult" ng-class="{grbgcolor: result.entityId == selected}">
<span ng-show="result.entityType == 'LOAN' || result.entityType == 'SAVING'">
<span ng-show="result.entityType == 'LOAN' || result.entityType == 'SAVING' || result.entityType == 'SHARE'">
<a href="#/view{{result.entityType | lowercase}}account/{{result.entityId}}">{{result.entityName}}</a>&nbsp;|&nbsp;#{{result.entityAccountNo}}</a>
</span>
<span ng-show="result.entityType == 'CLIENT'">
@ -40,7 +40,7 @@
<span data-ng-show="result.entityType == 'CLIENTIDENTIFIER'"><strong>{{'label.heading.entity' |
translate}}</strong>:{{'label.heading.clientid' | translate}}&nbsp;|&nbsp;<strong>{{
'label.heading.client' | translate }}</strong>:{{result.parentName}}</span>
<span data-ng-show="result.entityType == 'LOAN' || result.entityType == 'SAVING'"><strong>{{'label.heading.entity' | translate}}</strong>:{{result.entityType}}&nbsp;|&nbsp;<strong>{{
<span data-ng-show="result.entityType == 'LOAN' || result.entityType == 'SAVING' || result.entityType == 'SHARE'"><strong>{{'label.heading.entity' | translate}}</strong>:{{result.entityType}}&nbsp;|&nbsp;<strong>{{
'label.heading.' + result.parentType | translate }}</strong>:{{result.parentName}}</span>
<span><br/></span>
</div>
@ -48,7 +48,6 @@
</div>
<h3 data-ng-show="flag" style="position: absolute;top: 40%;left: 30%;"><strong>{{ 'label.nodatafound' | translate
}}</strong></h3>
<div class="span7">
<div ng-show="client">
<br/>
@ -107,6 +106,27 @@
<td>
<i class="icon-stop {{savingaccount.status.code | StatusLookup}}"></i>
</td>
</tr>
<tr>
<td colspan="5">&nbsp;</td>
</tr>
<tr class="graybg">
<th>{{'label.heading.shareaccount'| translate}}</th>
<th></th>
<th>{{'label.heading.approvedshares'| translate}}</th>
<th>{{'label.heading.status'| translate}}</th>
<th></th>
</tr>
<tr ng-repeat="shareaccount in clientAccounts.shareAccounts">
<td>
{{shareaccount.productName}}
</td>
<td>{{shareaccount.accountNo}}</td>
<td>{{shareaccount.totalApprovedShares|number}}</td>
<td>{{shareaccount.status.value}}</td>
<td>
<i class="icon-stop {{shareaccount.status.code | StatusLookup}}"></i>
</td>
</tr>
</table>
</div>