Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FINERACT-1430:ClientSocialStatus #3484

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/global-translations/locale-en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions app/scripts/controllers/client/CreateClientController.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@


scope.enableAddress=data.isAddressEnabled;
scope.socialStatusOptions=data.socialStatusOptions;

if (scope.enableAddress === true) {
scope.addressTypes = data.address[0].addressTypeIdOptions;
Expand Down
6 changes: 6 additions & 0 deletions app/scripts/controllers/client/EditClientController.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand All @@ -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;
}
Expand Down
12 changes: 12 additions & 0 deletions app/views/clients/createclient.html
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,19 @@
<input type="text" id="externalId" name="externalId" ng-model="formData.externalId"
class="form-control" />
</div>

<div class="control-label col-sm-2">
<label>{{ 'label.input.socialStatus' | translate }}</label>
</div>
<div class="col-sm-3">
<select id="socialStatus" ng-model="formData.socialStatus"
class="form-control"
ng-options="socialStatusOption.id as socialStatusOption.name for socialStatusOption in socialStatusOptions"
value="{{socialStatusOption.id}}"> <option value="">--{{'label.menu.socialStatus' | translate}}--</option>
</select>
</div>
</div>

<div class="form-group" has-permission="ACTIVATE_CLIENT">
<label class="control-label col-sm-2">{{'label.input.active' | translate}}</label>
<div class="col-sm-3">
Expand Down
10 changes: 10 additions & 0 deletions app/views/clients/editclient.html
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,16 @@
<div class="col-sm-3">
<input id="externalId" type="text" ng-model="formData.externalId" class="form-control">
</div>


<label class="control-label col-sm-2">{{'label.input.socialStatus' | translate}}</label>

<div class="col-sm-3">
<select id="socialStatusId" ng-model="formData.socialStatus" class="form-control"
ng-options="socialStatus.id as socialStatus.name for socialStatus in socialStatusOptions" value="{{socialStatus.id}}">
<option value="">--{{'label.menu.socialStatus' | translate}}--</option>
</select>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="mobileNo">{{'label.input.mobilenumber' | translate}}</label>
Expand Down
5 changes: 5 additions & 0 deletions app/views/clients/viewclient.html
Original file line number Diff line number Diff line change
Expand Up @@ -777,6 +777,11 @@ <h4><strong>{{client.displayName}}</strong></h4>
<td><span class="padded-td">{{client.gender.name}}</span>
</td>
</tr>
<tr data-ng-show="client.socialStatus.name">
<th class="table-bold">{{ 'label.input.socialStatus' | translate }}</th>
<td><span class="padded-td">{{client.socialStatus.name}}</span>
</td>
</tr>
<tr data-ng-show="client.clientType.name">
<th class="table-bold">{{ 'label.input.clienttype' | translate }}</th>
<td><span class="padded-td">{{client.clientType.name}}</span>
Expand Down