@@ -12,6 +12,7 @@ export class LoanProductCapitalizedIncomeStepComponent implements OnChanges {
12
12
@Input ( ) capitalizedIncome : CapitalizedIncome ;
13
13
@Input ( ) capitalizedIncomeCalculationTypeOptions : StringEnumOptionData [ ] ;
14
14
@Input ( ) capitalizedIncomeStrategyOptions : StringEnumOptionData [ ] ;
15
+ @Input ( ) capitalizedIncomeTypeOptions : StringEnumOptionData [ ] ;
15
16
16
17
loanIncomeCapitalizationForm : UntypedFormGroup ;
17
18
@@ -31,12 +32,16 @@ export class LoanProductCapitalizedIncomeStepComponent implements OnChanges {
31
32
if ( this . enableIncomeCapitalization ) {
32
33
this . loanIncomeCapitalizationForm = this . formBuilder . group ( {
33
34
enableIncomeCapitalization : [ this . enableIncomeCapitalization ] ,
34
- incomeCapitalizationCalculationType : [
35
- this . capitalizedIncome . incomeCapitalizationCalculationType ,
35
+ capitalizedIncomeCalculationType : [
36
+ this . capitalizedIncome . capitalizedIncomeCalculationType ,
36
37
Validators . required
37
38
] ,
38
- incomeCapitalizationStrategy : [
39
- this . capitalizedIncome . incomeCapitalizationStrategy ,
39
+ capitalizedIncomeStrategy : [
40
+ this . capitalizedIncome . capitalizedIncomeStrategy ,
41
+ Validators . required
42
+ ] ,
43
+ capitalizedIncomeType : [
44
+ this . capitalizedIncome . capitalizedIncomeType ,
40
45
Validators . required
41
46
]
42
47
} ) ;
@@ -53,8 +58,9 @@ export class LoanProductCapitalizedIncomeStepComponent implements OnChanges {
53
58
if ( this . enableIncomeCapitalization ) {
54
59
this . loanIncomeCapitalizationForm . patchValue ( {
55
60
enableIncomeCapitalization : this . enableIncomeCapitalization ,
56
- incomeCapitalizationCalculationType : this . capitalizedIncome . incomeCapitalizationCalculationType ,
57
- incomeCapitalizationStrategy : this . capitalizedIncome . incomeCapitalizationStrategy
61
+ capitalizedIncomeCalculationType : this . capitalizedIncome . capitalizedIncomeCalculationType ,
62
+ capitalizedIncomeStrategy : this . capitalizedIncome . capitalizedIncomeStrategy ,
63
+ capitalizedIncomeType : this . capitalizedIncome . capitalizedIncomeType
58
64
} ) ;
59
65
}
60
66
this . setViewChildForm . emit ( this . loanIncomeCapitalizationForm ) ;
@@ -64,54 +70,71 @@ export class LoanProductCapitalizedIncomeStepComponent implements OnChanges {
64
70
this . loanIncomeCapitalizationForm . get ( 'enableIncomeCapitalization' ) . valueChanges . subscribe ( ( enabled : boolean ) => {
65
71
this . enableIncomeCapitalization = enabled ;
66
72
if ( this . enableIncomeCapitalization ) {
67
- const incomeCapitalizationCalculationType =
68
- this . capitalizedIncome . incomeCapitalizationCalculationType == ''
69
- ? ''
70
- : this . capitalizedIncome . incomeCapitalizationCalculationType ;
73
+ const capitalizedIncomeCalculationType =
74
+ ! this . capitalizedIncome . capitalizedIncomeCalculationType ||
75
+ this . capitalizedIncome . capitalizedIncomeCalculationType == ''
76
+ ? this . capitalizedIncomeCalculationTypeOptions [ 0 ] . id
77
+ : this . capitalizedIncome . capitalizedIncomeCalculationType ;
78
+ this . loanIncomeCapitalizationForm . addControl (
79
+ 'capitalizedIncomeCalculationType' ,
80
+ new UntypedFormControl ( capitalizedIncomeCalculationType , Validators . required )
81
+ ) ;
82
+ const capitalizedIncomeStrategy =
83
+ ! this . capitalizedIncome . capitalizedIncomeStrategy || this . capitalizedIncome . capitalizedIncomeStrategy == ''
84
+ ? this . capitalizedIncomeStrategyOptions [ 0 ] . id
85
+ : this . capitalizedIncome . capitalizedIncomeStrategy ;
71
86
this . loanIncomeCapitalizationForm . addControl (
72
- 'incomeCapitalizationCalculationType' ,
73
- new UntypedFormControl (
74
- this . capitalizedIncome . incomeCapitalizationCalculationType ||
75
- this . capitalizedIncomeCalculationTypeOptions [ 0 ] . id ,
76
- Validators . required
77
- )
87
+ 'capitalizedIncomeStrategy' ,
88
+ new UntypedFormControl ( capitalizedIncomeStrategy , Validators . required )
78
89
) ;
79
- const incomeCapitalizationStrategy =
80
- this . capitalizedIncome . incomeCapitalizationStrategy == ''
81
- ? ''
82
- : this . capitalizedIncome . incomeCapitalizationStrategy ;
90
+ const capitalizedIncomeType =
91
+ ! this . capitalizedIncome . capitalizedIncomeType || this . capitalizedIncome . capitalizedIncomeType == ''
92
+ ? this . capitalizedIncomeTypeOptions [ 0 ] . id
93
+ : this . capitalizedIncome . capitalizedIncomeType ;
83
94
this . loanIncomeCapitalizationForm . addControl (
84
- 'incomeCapitalizationStrategy ' ,
85
- new UntypedFormControl ( incomeCapitalizationStrategy , Validators . required )
95
+ 'capitalizedIncomeType ' ,
96
+ new UntypedFormControl ( capitalizedIncomeType , Validators . required )
86
97
) ;
87
98
this . setCapitalizedIncome . emit ( {
88
99
enableIncomeCapitalization : true ,
89
- incomeCapitalizationCalculationType : incomeCapitalizationCalculationType ,
90
- incomeCapitalizationStrategy : incomeCapitalizationStrategy
100
+ capitalizedIncomeCalculationType : capitalizedIncomeCalculationType ,
101
+ capitalizedIncomeStrategy : capitalizedIncomeStrategy ,
102
+ capitalizedIncomeType : capitalizedIncomeType
91
103
} ) ;
92
104
93
105
this . loanIncomeCapitalizationForm
94
- . get ( 'incomeCapitalizationCalculationType ' )
106
+ . get ( 'capitalizedIncomeCalculationType ' )
95
107
. valueChanges . subscribe ( ( newValue : string ) => {
96
108
this . setCapitalizedIncome . emit ( {
97
109
enableIncomeCapitalization : true ,
98
- incomeCapitalizationCalculationType : newValue ,
99
- incomeCapitalizationStrategy : this . loanIncomeCapitalizationForm . value . incomeCapitalizationStrategy
110
+ capitalizedIncomeCalculationType : newValue ,
111
+ capitalizedIncomeStrategy : this . loanIncomeCapitalizationForm . value . capitalizedIncomeStrategy ,
112
+ capitalizedIncomeType : this . loanIncomeCapitalizationForm . value . capitalizedIncomeType
100
113
} ) ;
101
114
} ) ;
102
115
this . loanIncomeCapitalizationForm
103
- . get ( 'incomeCapitalizationStrategy ' )
116
+ . get ( 'capitalizedIncomeStrategy ' )
104
117
. valueChanges . subscribe ( ( newValue : string ) => {
105
118
this . setCapitalizedIncome . emit ( {
106
119
enableIncomeCapitalization : true ,
107
- incomeCapitalizationCalculationType :
108
- this . loanIncomeCapitalizationForm . value . incomeCapitalizationCalculationType ,
109
- incomeCapitalizationStrategy : newValue
120
+ capitalizedIncomeCalculationType :
121
+ this . loanIncomeCapitalizationForm . value . capitalizedIncomeCalculationType ,
122
+ capitalizedIncomeStrategy : newValue ,
123
+ capitalizedIncomeType : this . loanIncomeCapitalizationForm . value . capitalizedIncomeType
110
124
} ) ;
111
125
} ) ;
126
+ this . loanIncomeCapitalizationForm . get ( 'capitalizedIncomeType' ) . valueChanges . subscribe ( ( newValue : string ) => {
127
+ this . setCapitalizedIncome . emit ( {
128
+ enableIncomeCapitalization : true ,
129
+ capitalizedIncomeCalculationType : this . loanIncomeCapitalizationForm . value . capitalizedIncomeCalculationType ,
130
+ capitalizedIncomeStrategy : this . loanIncomeCapitalizationForm . value . capitalizedIncomeStrategy ,
131
+ capitalizedIncomeType : newValue
132
+ } ) ;
133
+ } ) ;
112
134
} else {
113
- this . loanIncomeCapitalizationForm . removeControl ( 'incomeCapitalizationCalculationType' ) ;
114
- this . loanIncomeCapitalizationForm . removeControl ( 'incomeCapitalizationStrategy' ) ;
135
+ this . loanIncomeCapitalizationForm . removeControl ( 'capitalizedIncomeCalculationType' ) ;
136
+ this . loanIncomeCapitalizationForm . removeControl ( 'capitalizedIncomeStrategy' ) ;
137
+ this . loanIncomeCapitalizationForm . removeControl ( 'capitalizedIncomeType' ) ;
115
138
this . setCapitalizedIncome . emit ( { enableIncomeCapitalization : false } ) ;
116
139
}
117
140
0 commit comments