diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json index 4285ee58..d5319f65 100644 --- a/app/global-translations/locale-en.json +++ b/app/global-translations/locale-en.json @@ -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" } diff --git a/app/scripts/controllers/main/TaskController.js b/app/scripts/controllers/main/TaskController.js index c9c8ce9f..94baa887 100644 --- a/app/scripts/controllers/main/TaskController.js +++ b/app/scripts/controllers/main/TaskController.js @@ -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(){ diff --git a/app/views/tasks.html b/app/views/tasks.html index 4c1664f0..7c1a110d 100644 --- a/app/views/tasks.html +++ b/app/views/tasks.html @@ -29,23 +29,34 @@ - - - - - - - - - - - - - - - - - +
{{'table.heading.name' | translate}}{{'label.group.accounts' | translate}}{{'table.heading.officename' | translate}}
{{client.displayName}}{{client.accountNo}}{{client.officeName}}
+ + + + + +
+ {{officeName}} +
+ + + + + + + + + + + + + + + + + +
{{'table.heading.name' | translate}}{{'label.group.accounts' | translate}}{{'table.staffname' | translate}}
{{client.displayName}}{{client.accountNo}}{{client.staffName}}
+