diff --git a/src/app/organization/loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component.html b/src/app/organization/loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component.html index e125620e7..f2a38a0c1 100644 --- a/src/app/organization/loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component.html +++ b/src/app/organization/loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component.html @@ -12,15 +12,16 @@
-
-

{{ provisioningData.criteriaName }}

- - -
- {{ 'labels.inputs.Loan Product' | translate }}: - {{ loanProducts }} -
+
+

+ {{ provisioningData.criteriaName }} +

+ + {{ 'labels.inputs.Loan Product' | translate }}: + {{ loanProducts }} +
+
diff --git a/src/app/organization/loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component.scss b/src/app/organization/loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component.scss index edd322222..9b6a49f87 100644 --- a/src/app/organization/loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component.scss +++ b/src/app/organization/loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component.scss @@ -1,3 +1,15 @@ +.criteria-title { + margin-bottom: 0; + display: inline; + vertical-align: middle; +} + +.loan-product-label { + margin-left: 24px; + font-size: 1.1em; + vertical-align: middle; +} + table { width: 100%; } diff --git a/src/app/organization/loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component.ts b/src/app/organization/loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component.ts index 2da20bf56..a622c55af 100644 --- a/src/app/organization/loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component.ts +++ b/src/app/organization/loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component.ts @@ -25,6 +25,8 @@ import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { MatDivider } from '@angular/material/divider'; import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; +import { LoanProduct } from 'app/products/loan-products/models/loan-product.model'; + /** * View Loan Provisioning */ @@ -93,9 +95,14 @@ export class ViewLoanProvisioningCriteriaComponent implements OnInit { setLoanProvisioningSelectedCriteria() { this.dataSource = new MatTableDataSource(this.provisioningData.definitions); - /** Get load products as a string. */ - for (let _id = 0; _id < this.provisioningData.loanProducts.length; _id++) { - this.loanProducts += this.provisioningData.loanProducts[_id].name + ','; + // Get loan products as a comma-separated string, no trailing comma, with type safety + if (this.provisioningData.loanProducts && this.provisioningData.loanProducts.length > 0) { + this.loanProducts = (this.provisioningData.loanProducts as LoanProduct[]) + .filter((p) => p && p.name) + .map((p) => p.name) + .join(', '); + } else { + this.loanProducts = ''; } }