grouped clients by office name

This commit is contained in:
Safiyu 2013-11-12 11:09:14 +05:30
parent 6edadded51
commit 95206adb3e
3 changed files with 31 additions and 20 deletions

View File

@ -1189,5 +1189,6 @@
"error.msg.client.close.loan.non-closed":"Client cannot be closed because of non-closed loans.",
"error.msg.client.close.non-closed.savings.account":"Client cannot be closed because of non-closed savings.",
"error.msg.client.close.date.cannot.before.client.actvation.date":"The Client closing date cannot be before the client activation date.",
"error.msg.client.close.is.under.transfer":"Client under Transfer cannot be closed"
"error.msg.client.close.is.under.transfer":"Client under Transfer cannot be closed",
"table.staffname":"Staff Name"
}

View File

@ -1,7 +1,6 @@
(function(module) {
mifosX.controllers = _.extend(module, {
TaskController: function(scope, resourceFactory, route, dateFilter,$modal,location) {
scope.act = false;
scope.clients = [];
scope.loans = [];
scope.offices = [];
@ -233,7 +232,7 @@
resourceFactory.clientResource.getAllClients(function(data) {
scope.clients = data.pageItems;
scope.groupedClients = _.groupBy(data.pageItems, "officeName");
});
scope.search = function(){

View File

@ -29,23 +29,34 @@
<button class="btn btn-primary" ng-click="approve(date.actDate)">{{'label.confirm' | translate}}</button>
</div>
</script>
<table class="table condensed-table">
<thead>
<tr class="graybg">
<th></th>
<th>{{'table.heading.name' | translate}}</th>
<th>{{'label.group.accounts' | translate}}</th>
<th>{{'table.heading.officename' | translate}}</th>
</tr>
</thead>
<tbody>
<tr class="pointer-main" ng-repeat="client in clients | filter : {active: 'false'} | filter:filterText">
<td><input type="checkbox" data-ng-model="approveData[client.id]"/></td>
<td class="pointer" data-ng-click="routeToClient(client.id)">{{client.displayName}}</td>
<td class="pointer" data-ng-click="routeToClient(client.id)">{{client.accountNo}}</td>
<td class="pointer" data-ng-click="routeToClient(client.id)">{{client.officeName}}</td>
</tr>
</tbody>
<table class="table condensed-table" ng-repeat="(officeName,values) in groupedClients">
<tr>
<td>
<strong>{{officeName}}</strong>
</td>
</tr>
<tr>
<td>
<table class="table condensed-table">
<thead>
<tr class="graybg">
<th></th>
<th>{{'table.heading.name' | translate}}</th>
<th>{{'label.group.accounts' | translate}}</th>
<th>{{'table.staffname' | translate}}</th>
</tr>
</thead>
<tbody>
<tr class="pointer-main" data-ng-repeat="client in values | filter : {active: 'false'} | filter:filterText">
<td><input type="checkbox" data-ng-model="approveData[client.id]"/></td>
<td class="pointer" data-ng-click="routeToClient(client.id)">{{client.displayName}}</td>
<td class="pointer" data-ng-click="routeToClient(client.id)">{{client.accountNo}}</td>
<td class="pointer" data-ng-click="routeToClient(client.id)">{{client.staffName}}</td>
</tr>
</tbody>
</table>
</td>
</tr>
</table>
</tab>
<tab heading="{{'label.loanapproval' | translate}}">