From 63c034e10e6ffc4e7b641fdc531a4362632a5eb8 Mon Sep 17 00:00:00 2001 From: rrpawar96 Date: Fri, 24 Jun 2022 17:55:42 +0530 Subject: [PATCH] FINERACT-1430:ClientSocialStatus --- app/global-translations/locale-en.json | 2 ++ .../controllers/client/CreateClientController.js | 1 + .../controllers/client/EditClientController.js | 6 ++++++ app/views/clients/createclient.html | 12 ++++++++++++ app/views/clients/editclient.html | 10 ++++++++++ app/views/clients/viewclient.html | 5 +++++ 6 files changed, 36 insertions(+) diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json index c400d5d2..afc9d686 100644 --- a/app/global-translations/locale-en.json +++ b/app/global-translations/locale-en.json @@ -271,6 +271,7 @@ "label.input.savingsaccount": "Default Savings Account", "label.input.no.decimalplaces": "Zero decimal places", "label.input.gender": "Gender", + "label.input.socialStatus": "Social Status", "label.input.dateofbirth": "Date of Birth", "label.input.sqlSearch": "SQL Search", "label.input.transfertype": "Transfer Type", @@ -853,6 +854,7 @@ "label.menu.selectstaff": "Select Staff", "label.menu.selectgroup": "Select Group", "label.menu.gender": "Select Gender", + "label.menu.socialStatus": "Select Social Status", "#Anchors": "..", "label.anchor.groups": "Groups", "label.anchor.viewgroup": "View Group", diff --git a/app/scripts/controllers/client/CreateClientController.js b/app/scripts/controllers/client/CreateClientController.js index b44b01da..0b6b9980 100755 --- a/app/scripts/controllers/client/CreateClientController.js +++ b/app/scripts/controllers/client/CreateClientController.js @@ -99,6 +99,7 @@ scope.enableAddress=data.isAddressEnabled; + scope.socialStatusOptions=data.socialStatusOptions; if (scope.enableAddress === true) { scope.addressTypes = data.address[0].addressTypeIdOptions; diff --git a/app/scripts/controllers/client/EditClientController.js b/app/scripts/controllers/client/EditClientController.js index 1f148d91..4b0619cc 100755 --- a/app/scripts/controllers/client/EditClientController.js +++ b/app/scripts/controllers/client/EditClientController.js @@ -15,6 +15,7 @@ scope.staffs = data.staffOptions; scope.savingproducts = data.savingProductOptions; scope.genderOptions = data.genderOptions; + scope.socialStatusOptions = data.socialStatusOptions; scope.clienttypeOptions = data.clientTypeOptions; scope.clientClassificationOptions = data.clientClassificationOptions; scope.clientNonPersonConstitutionOptions = data.clientNonPersonConstitutionOptions; @@ -33,6 +34,7 @@ mobileNo: data.mobileNo, savingsProductId: data.savingsProductId, genderId: data.gender.id, + socialStatus: data.socialStatus.id, fullname: data.fullname, clientNonPersonDetails : { incorpNumber: data.clientNonPersonDetails.incorpNumber, @@ -44,6 +46,10 @@ scope.formData.genderId = data.gender.id; } + if(data.socialStatus){ + scope.formData.socialStatus = data.socialStatus.id; + } + if(data.clientType){ scope.formData.clientTypeId = data.clientType.id; } diff --git a/app/views/clients/createclient.html b/app/views/clients/createclient.html index 4d61a4c4..d5b85ffb 100755 --- a/app/views/clients/createclient.html +++ b/app/views/clients/createclient.html @@ -256,7 +256,19 @@ + +
+ +
+
+ +
+
diff --git a/app/views/clients/editclient.html b/app/views/clients/editclient.html index 8269fde3..98b0fe35 100755 --- a/app/views/clients/editclient.html +++ b/app/views/clients/editclient.html @@ -123,6 +123,16 @@
+ + + + +
+ +
diff --git a/app/views/clients/viewclient.html b/app/views/clients/viewclient.html index c20faef2..cafde30a 100755 --- a/app/views/clients/viewclient.html +++ b/app/views/clients/viewclient.html @@ -777,6 +777,11 @@ {{client.gender.name}} + + {{ 'label.input.socialStatus' | translate }} + {{client.socialStatus.name}} + + {{ 'label.input.clienttype' | translate }} {{client.clientType.name}}