FINERACT-1375:ClientEntityPersonDataTable (#3444)

Merging as we got approval from @luckyman20
This commit is contained in:
Rahul Pawar 2021-12-28 18:31:42 +05:30 committed by GitHub
parent 39d1897e23
commit 56f5686379
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 14 deletions

View File

@ -2797,6 +2797,8 @@
"label.loan": "Loan",
"label.savingsaccount": "Savings account",
"label.client": "Client",
"label.cliententity": "Client_Entity",
"label.clientperson": "Client_Person",
"label.group": "Group",
"label.center": "Center",
"label.office": "Office",

View File

@ -16,6 +16,7 @@
scope.showRecurring = false;
scope.updateDefaultSavings = false;
scope.charges = [];
scope.legalform = 'm_client';
// address
@ -269,7 +270,23 @@
resourceFactory.runReportsResource.get({reportSource: 'ClientSummary', genericResultSet: 'false', R_clientId: routeParams.id}, function (data) {
scope.client.ClientSummary = data[0];
});
if(data.legalForm.value != null){
if (data.legalForm.value === 'PERSON') {
scope.legalform = 'm_client_person'
} else if (data.legalForm.value === 'ENTITY') {
scope.legalform = 'm_client_entity'
}
resourceFactory.DataTablesResource.getAllDataTables({apptable: scope.legalform}, function (data) {
scope.clientdatatables = data;
});
}
});
resourceFactory.DataTablesResource.getAllDataTables({apptable: 'm_client'}, function (data) {
scope.clientdatatables = data;
});
scope.deleteClient = function () {
$uibModal.open({
templateUrl: 'deleteClient.html',
@ -664,10 +681,6 @@
});
};
resourceFactory.DataTablesResource.getAllDataTables({apptable: 'm_client'}, function (data) {
scope.clientdatatables = data;
});
scope.dataTableChange = function (clientdatatable) {
resourceFactory.DataTablesResource.getTableDetails({datatablename: clientdatatable.registeredTableName,
entityId: routeParams.id, genericResultSet: 'true'}, function (data) {

View File

@ -37,7 +37,7 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">{{'label.input.legalForm' | translate}}</label>
<label class="control-label col-sm-2">{{'label.input.legalForm' | translate}}<span class="required">*</span></label>
<div class="col-sm-3">
<select id="legalFormId" ng-model="formData.legalFormId" class="form-control"
ng-options="legalForm.id as legalForm.value for legalForm in clientLegalFormOptions"
@ -700,4 +700,4 @@
</div>
</wz-step>
</wizard>
</div>
</div>

View File

@ -30,13 +30,14 @@
<div class="col-sm-3">
<select id="apptableName" ng-model="formData.apptableName" name="apptable" class="form-control" required>
<option class="displaynone" value="">{{'label.selectone' | translate}}</option>
<option value="m_client">{{'label.client' | translate}}</option>
<option value="m_group">{{'label.group' | translate}}</option>
<option value="m_center">{{'label.center' | translate}}</option>
<option value="m_loan">{{'label.loan' | translate}}</option>
<option value="m_office">{{'label.office' | translate}}</option>
<option value="m_savings_account">{{'label.savingsaccount' | translate}}</option>
<option class="displaynone" value="">{{'label.selectone' | translate}}</option>
<option value="m_client_entity">{{'label.cliententity' | translate}}</option>
<option value="m_client_person">{{'label.clientperson' | translate}}</option>
<option value="m_group">{{'label.group' | translate}}</option>
<option value="m_center">{{'label.center' | translate}}</option>
<option value="m_loan">{{'label.loan' | translate}}</option>
<option value="m_office">{{'label.office' | translate}}</option>
<option value="m_savings_account">{{'label.savingsaccount' | translate}}</option>
</select>
</div>
<div class="col-sm-3">

View File

@ -28,7 +28,8 @@
<div class="col-sm-3">
<select id="apptableName" ng-model="formData.apptableName" class="form-control" required="required">
<option class="width100" value="">{{'label.selectone' | translate}}</option>
<option value="m_client">{{'label.client' | translate}}</option>
<option value="m_client_entity">{{'label.cliententity' | translate}}</option>
<option value="m_client_person">{{'label.clientperson' | translate}}</option>
<option value="m_group">{{'label.group' | translate}}</option>
<option value="m_center">{{'label.center' | translate}}</option>
<option value="m_loan">{{'label.loan' | translate}}</option>