diff --git a/global-translations/locale-en.json b/global-translations/locale-en.json index 1be8373a..a7243c2e 100644 --- a/global-translations/locale-en.json +++ b/global-translations/locale-en.json @@ -71,6 +71,11 @@ "#view client":"", "label.accountno":"Account No:", + "label.numofloancycle":"Loan Cycle #:", + "label.lastloanamount":"Amount of last Loan:", + "label.numofactiveloans":"# of active Loans:", + "label.totalsavings":"Total Savings:", + "label.numofactivesavings":"# of active Savings:", "label.activationdate":"Activation Date:", "label.officename":"Office Name:", "label.memberof":"Member Of:", diff --git a/html/clients/viewclient.html b/html/clients/viewclient.html index 15e392f8..9abb2c84 100644 --- a/html/clients/viewclient.html +++ b/html/clients/viewclient.html @@ -17,13 +17,43 @@
Avatar
-
- {{ 'label.accountno' | translate }}  {{client.accountNo}}
- {{ 'label.activationdate' | translate }}  {{client.activationDate}}
- {{ 'label.officename' | translate }}  {{client.officeName}}
- {{ 'label.memberof' | translate }}  {{group.name}} 
- {{ 'label.loanofficer' | translate }}  {{client.staffName}}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ 'label.accountno' | translate }}{{client.accountNo}}  {{ 'label.numofloancycle' | translate }}{{client.ClientSummary.loanCycle}}
{{ 'label.activationdate' | translate }}{{client.activationDate}}{{ 'label.lastloanamount' | translate }}{{client.ClientSummary.lastLoanAmount}}
{{ 'label.officename' | translate }}{{client.officeName}}{{ 'label.numofactiveloans' | translate }}{{client.ClientSummary.activeLoans}}
{{ 'label.memberof' | translate }} {{group.name}} {{ 'label.totalsavings' | translate }}{{client.ClientSummary.totalSavings}}
{{ 'label.loanofficer' | translate }}{{client.staffName}}{{ 'label.numofactivesavings' | translate }}{{client.ClientSummary.activeSavings}}
+
+

@@ -101,6 +131,7 @@ +

@@ -132,7 +163,8 @@
- +
+
diff --git a/js/controllers/ViewClientController.js b/js/controllers/ViewClientController.js index 0684690a..b7340bd9 100644 --- a/js/controllers/ViewClientController.js +++ b/js/controllers/ViewClientController.js @@ -6,6 +6,10 @@ resourceFactory.clientResource.get({clientId: routeParams.id} , function(data) { scope.client = data; + resourceFactory.runReportsResource.get({reportSource: 'ClientSummary',genericResultSet: 'false',R_clientId: routeParams.id} , function(data) { + scope.client.ClientSummary = data[0]; + console.log(scope.client.ClientSummary); + }); }); resourceFactory.clientAccountResource.get({clientId: routeParams.id} , function(data) { scope.clientAccounts = data; diff --git a/js/services/ResourceFactoryProvider.js b/js/services/ResourceFactoryProvider.js index ca0e68b2..1fca46b2 100644 --- a/js/services/ResourceFactoryProvider.js +++ b/js/services/ResourceFactoryProvider.js @@ -34,6 +34,9 @@ clientTemplateResource: defineResource(apiVer + "/clients/template", {}, { get: {method: 'GET', params: {}} }), + runReportsResource: defineResource(apiVer + "/runreports/:reportSource", {reportSource : '@reportSource'}, { + get: {method: 'GET', params: {}, isArray:true} + }), DataTablesResource: defineResource(apiVer + "/datatables/:datatablename/:clientId", {datatablename:'@datatablename',clientId:'@clientId'}, { getAllDataTables: {method: 'GET', params: {}, isArray:true}, getTableDetails: {method: 'GET', params: {}}