merge angular-17 into dev to upgrade from Angular v16 to v17
This commit is contained in:
+45
-10
@@ -91,7 +91,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
|
||||
this.clientClassificationData = this.fixedDepositProductsTemplate.chartTemplate.clientClassificationOptions;
|
||||
this.incentiveTypeData = this.fixedDepositProductsTemplate.chartTemplate.incentiveTypeOptions;
|
||||
|
||||
if (!(this.fixedDepositProductsTemplate === undefined)) {
|
||||
if (this.fixedDepositProductsTemplate) {
|
||||
this.assignFormData();
|
||||
}
|
||||
}
|
||||
@@ -145,7 +145,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
|
||||
formArray.push(chartSlabInfo);
|
||||
|
||||
// Iterate for every slab in chartSlab
|
||||
const chartIncentiveControl = chartDetailControl.controls['chartSlabs']['controls'][j];
|
||||
const chartIncentiveControl = (chartDetailControl.controls['chartSlabs'] as UntypedFormArray).controls[j];
|
||||
|
||||
// Iterate to input all the incentive for particular chart slab
|
||||
this.chartsDetail[i].chartSlabs[j].incentives.forEach((chartIncentiveDetail: any) => {
|
||||
@@ -158,8 +158,8 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
|
||||
chartIncentiveDetail.attributeName,
|
||||
Validators.required
|
||||
],
|
||||
attribureValue: [
|
||||
chartIncentiveDetail.attribureValue,
|
||||
attributeValue: [
|
||||
chartIncentiveDetail.attributeValue,
|
||||
Validators.required
|
||||
],
|
||||
conditionType: [
|
||||
@@ -175,7 +175,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
|
||||
Validators.required
|
||||
]
|
||||
});
|
||||
const newFormArray = chartIncentiveControl['controls']['incentives'] as UntypedFormArray;
|
||||
const newFormArray = (chartIncentiveControl as UntypedFormGroup).controls['incentives'] as UntypedFormArray;
|
||||
newFormArray.push(incentiveInfo);
|
||||
});
|
||||
});
|
||||
@@ -183,8 +183,8 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
|
||||
}
|
||||
|
||||
getChartsDetailsData() {
|
||||
this.chartDetailData.forEach((chartData: any) => {
|
||||
const chart = {
|
||||
this.chartDetailData.forEach((chartData: ChartData) => {
|
||||
const chart: Chart = {
|
||||
endDate: chartData.endDate ? new Date(chartData.endDate) : '',
|
||||
fromDate: chartData.fromDate ? new Date(chartData.fromDate) : '',
|
||||
isPrimaryGroupingByAmount: chartData.isPrimaryGroupingByAmount,
|
||||
@@ -193,7 +193,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
|
||||
chartSlabs: this.getChartSlabsData(chartData)
|
||||
};
|
||||
if (chartData.id) {
|
||||
chart['id'] = chartData.id;
|
||||
chart.id = chartData.id;
|
||||
}
|
||||
this.chartsDetail.push(chart);
|
||||
});
|
||||
@@ -213,7 +213,17 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
|
||||
}
|
||||
|
||||
chartSlabData.forEach((eachChartSlabData: any) => {
|
||||
const chartSlab = {
|
||||
const chartSlab: {
|
||||
id?: any;
|
||||
periodType: any;
|
||||
amountRangeFrom: any;
|
||||
amountRangeTo: any;
|
||||
annualInterestRate: any;
|
||||
description: any;
|
||||
fromPeriod: any;
|
||||
toPeriod: any;
|
||||
incentives: any[];
|
||||
} = {
|
||||
periodType: eachChartSlabData.periodType.id,
|
||||
amountRangeFrom: eachChartSlabData.amountRangeFrom,
|
||||
amountRangeTo: eachChartSlabData.amountRangeTo,
|
||||
@@ -221,7 +231,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
|
||||
description: eachChartSlabData.description ? eachChartSlabData.description : '',
|
||||
fromPeriod: eachChartSlabData.fromPeriod,
|
||||
toPeriod: eachChartSlabData.toPeriod,
|
||||
incentives: this.getIncentivesData(chartSlabData)
|
||||
incentives: this.getIncentivesData(eachChartSlabData)
|
||||
};
|
||||
if (eachChartSlabData.id) {
|
||||
chartSlab['id'] = eachChartSlabData.id;
|
||||
@@ -468,3 +478,28 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
|
||||
return fixedDepositProductInterestRateChart;
|
||||
}
|
||||
}
|
||||
|
||||
interface ChartData {
|
||||
id?: number;
|
||||
endDate?: string;
|
||||
fromDate?: string;
|
||||
isPrimaryGroupingByAmount: boolean;
|
||||
name: string;
|
||||
description: string;
|
||||
chartSlabs: ChartSlab[];
|
||||
}
|
||||
|
||||
interface ChartSlab {
|
||||
periodType?: string;
|
||||
fromPeriod?: number;
|
||||
toPeriod?: number;
|
||||
amountRangeFrom?: number;
|
||||
amountRangeTo?: number;
|
||||
annualInterestRate?: number;
|
||||
description?: string;
|
||||
}
|
||||
|
||||
interface Chart extends Omit<ChartData, 'endDate' | 'fromDate'> {
|
||||
endDate: Date | string;
|
||||
fromDate: Date | string;
|
||||
}
|
||||
|
||||
+2
-2
@@ -378,7 +378,7 @@
|
||||
|
||||
<div class="flex-fill layout-row">
|
||||
<span class="flex-47">{{ 'labels.inputs.Repayment Strategy' | translate }}:</span>
|
||||
<span class="flex-53" class="repayment-strategy">{{
|
||||
<span class="flex-53 repayment-strategy">{{
|
||||
loanProduct.transactionProcessingStrategyName | translateKey: 'catalogs'
|
||||
}}</span>
|
||||
</div>
|
||||
@@ -563,7 +563,7 @@
|
||||
<span class="flex-53">{{ loanProduct.canUseForTopup | yesNo }}</span>
|
||||
</div>
|
||||
|
||||
<h3 class="mat-h3" class="flex-fill">{{ 'labels.heading.Interest Recalculation' | translate }}</h3>
|
||||
<h3 class="mat-h3 flex-fill">{{ 'labels.heading.Interest Recalculation' | translate }}</h3>
|
||||
|
||||
<mat-divider [inset]="true"></mat-divider>
|
||||
|
||||
|
||||
+1
-1
@@ -212,7 +212,7 @@
|
||||
|
||||
<span class="flex-48 hide-lt-md"></span>
|
||||
|
||||
<div style="display: flex; justify-content: flex-start; width: 100%">
|
||||
<div class="full-width-flex">
|
||||
<div *ngIf="isAdvancedTransactionProcessingStrategy">
|
||||
<h3 class="mat-h4 flex-98">{{ 'labels.inputs.Loan Charge-off behaviour' | translate }}</h3>
|
||||
|
||||
|
||||
@@ -21,14 +21,12 @@
|
||||
<fa-icon
|
||||
(click)="arrowBooleansToggle(0); $event.stopPropagation()"
|
||||
*ngIf="!arrowBooleans[0]"
|
||||
style="z-index: 1000"
|
||||
icon="arrow-down"
|
||||
size="md"
|
||||
></fa-icon>
|
||||
<fa-icon
|
||||
(click)="arrowBooleansToggle(0); $event.stopPropagation()"
|
||||
*ngIf="arrowBooleans[0]"
|
||||
style="z-index: 1000"
|
||||
icon="arrow-up"
|
||||
size="md"
|
||||
></fa-icon>
|
||||
|
||||
+21
-4
@@ -145,7 +145,7 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
|
||||
formArray.push(chartSlabInfo);
|
||||
|
||||
// Iterate for every slab in chartSlab
|
||||
const chartIncentiveControl = chartDetailControl.controls['chartSlabs']['controls'][j];
|
||||
const chartIncentiveControl = (chartDetailControl.controls['chartSlabs'] as UntypedFormArray).controls[j];
|
||||
|
||||
// Iterate to input all the incentive for particular chart slab
|
||||
this.chartsDetail[i].chartSlabs[j].incentives.forEach((chartIncentiveDetail: any) => {
|
||||
@@ -175,7 +175,7 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
|
||||
Validators.required
|
||||
]
|
||||
});
|
||||
const newFormArray = chartIncentiveControl['controls']['incentives'] as UntypedFormArray;
|
||||
const newFormArray = (chartIncentiveControl as UntypedFormGroup).controls['incentives'] as UntypedFormArray;
|
||||
newFormArray.push(incentiveInfo);
|
||||
});
|
||||
});
|
||||
@@ -184,7 +184,14 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
|
||||
|
||||
getChartsDetailsData() {
|
||||
this.chartDetailData.forEach((chartData: any) => {
|
||||
const chart = {
|
||||
const chart: {
|
||||
id?: any;
|
||||
endDate: string | Date;
|
||||
fromDate: string | Date;
|
||||
isPrimaryGroupingByAmount: any;
|
||||
name: any;
|
||||
chartSlabs: any[];
|
||||
} = {
|
||||
endDate: chartData.endDate ? new Date(chartData.endDate) : '',
|
||||
fromDate: chartData.fromDate ? new Date(chartData.fromDate) : '',
|
||||
isPrimaryGroupingByAmount: chartData.isPrimaryGroupingByAmount,
|
||||
@@ -212,7 +219,17 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
|
||||
}
|
||||
|
||||
chartSlabData.forEach((eachChartSlabData: any) => {
|
||||
const chartSlab = {
|
||||
const chartSlab: {
|
||||
id?: any;
|
||||
periodType: any;
|
||||
amountRangeFrom: any;
|
||||
amountRangeTo: any;
|
||||
annualInterestRate: any;
|
||||
description: any;
|
||||
fromPeriod: any;
|
||||
toPeriod: any;
|
||||
incentives: any[];
|
||||
} = {
|
||||
periodType: eachChartSlabData.periodType.id,
|
||||
amountRangeFrom: eachChartSlabData.amountRangeFrom,
|
||||
amountRangeTo: eachChartSlabData.amountRangeTo,
|
||||
|
||||
Reference in New Issue
Block a user