@@ -75,7 +75,7 @@
(selectionChange)="getOtherOrganisationOwner($event.value,n)">
- {{val.name}}
+ {{val.name | titlecase}}
@@ -85,9 +85,9 @@
-
+
+ type="text" [value]="neighbourhood.controls.other_organisation_owner.value | titlecase">
@@ -122,7 +122,8 @@
[formGroupName]="r">
-
+
this._neighbourhoodForm.controls['referencecheck_list'];
// const referencecheckControl = this._neighbourhoodForm.get('referencecheck_list') as FormControl;
// let RefCtrlLength : any = referencecheckControl.controls.length;
- // const neighbourhoodControl : FormGroup = this._neighbourhoodForm.controls['neighbourhood_list'] as FormGroup;
- // let NbhdCtrlLength: any = neighbourhoodControl.controls.length;
- // if (NbhdCtrlLength > 0) {
- // let Ncnt = 0;
- // while(Ncnt < NbhdCtrlLength){
-
- // let nbhdChildCtrl : any = neighbourhoodControl.controls[Ncnt];
-
+ const neighbourhoodControl : FormGroup = this._neighbourhoodForm.controls['neighbourhood_list'] as FormGroup;
+ let NbhdCtrlLength: any = neighbourhoodControl.controls.length;
+ if (NbhdCtrlLength > 0) {
+ let Ncnt = 0;
+ while(Ncnt < NbhdCtrlLength){
+
+ let nbhdChildCtrl : any = neighbourhoodControl.controls[Ncnt];
+
// nbhdChildCtrl.controls['neighbourhood_name'].setValidators([Validators.required]);
// nbhdChildCtrl.controls['neighbourhood_name'].updateValueAndValidity();
@@ -311,28 +311,32 @@ pdf(fileURL){
// nbhdChildCtrl.controls['how_long_do_know_in_year'].setValidators([Validators.required]);
// nbhdChildCtrl.controls['how_long_do_know_in_year'].updateValueAndValidity();
// }
- // else if(nbhdChildCtrl.controls.did_not_know_the_business_operation.value == true){
+ // else
+ if(nbhdChildCtrl.controls.did_not_know_the_business_operation.value == true){
- // nbhdChildCtrl.controls['how_long_do_know_in_month'].setValue('');
- // // nbhdChildCtrl.controls['how_long_do_know_in_month'].clearValidators();
- // nbhdChildCtrl.controls['how_long_do_know_in_month'].updateValueAndValidity();
- // nbhdChildCtrl.controls['how_long_do_know_in_year'].setValue('');
- // nbhdChildCtrl.controls['how_long_do_know_in_year'].clearValidators();
- // nbhdChildCtrl.controls['how_long_do_know_in_year'].updateValueAndValidity();
- // }
+ nbhdChildCtrl.controls['how_long_do_know_in_month'].setValue('');
+ // nbhdChildCtrl.controls['how_long_do_know_in_month'].clearValidators();
+ nbhdChildCtrl.controls['how_long_do_know_in_month'].updateValueAndValidity();
+ nbhdChildCtrl.controls['how_long_do_know_in_year'].setValue('');
+ // nbhdChildCtrl.controls['how_long_do_know_in_year'].clearValidators();
+ nbhdChildCtrl.controls['how_long_do_know_in_year'].updateValueAndValidity();
+ }
// if(nbhdChildCtrl.controls.did_not_know_the_owner.value == '' || nbhdChildCtrl.controls.did_not_know_the_owner.value == false){
// nbhdChildCtrl.controls['organisation_owner'].setValidators([Validators.required]);
// nbhdChildCtrl.controls['organisation_owner'].updateValueAndValidity();
// }
- // else if(nbhdChildCtrl.controls.did_not_know_the_owner.value == true){
- // nbhdChildCtrl.controls['organisation_owner'].setValue('');
- // nbhdChildCtrl.controls['organisation_owner'].clearValidators();
- // nbhdChildCtrl.controls['organisation_owner'].updateValueAndValidity();
- // }
- // Ncnt++;
- // }
- // }
+ // else
+ if(nbhdChildCtrl.controls.did_not_know_the_owner.value == true){
+ nbhdChildCtrl.controls['organisation_owner'].setValue('');
+ // nbhdChildCtrl.controls['organisation_owner'].clearValidators();
+ nbhdChildCtrl.controls['organisation_owner'].updateValueAndValidity();
+ nbhdChildCtrl.controls['other_organisation_owner'].setValue('');
+ nbhdChildCtrl.controls['other_organisation_owner'].updateValueAndValidity();
+ }
+ Ncnt++;
+ }
+ }
this._neighbourhoodForm.controls.neighbourhood_status.setValidators([Validators.required]);
this._neighbourhoodForm.controls.neighbourhood_status.updateValueAndValidity();
@@ -476,6 +480,7 @@ toggleVisibility(e,index,flag){
}
else if(flag==2){
this.isDisplay2[index] = e;
+ // console.log(this.isOrganisationOwner[index]);
}
}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
index b4e5ceb5d..20958ceb4 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
@@ -85,20 +85,20 @@
[compareWith]="compareObjects" (selectionChange)="getOtherIncomeEarnedBy($event.value,i)">
- {{val.name}}
+ {{val.name | titlecase}}
-
Income earned by is Required
+ OnlyNumber type="text">
{{"₹"}} {{ details.get('amount').value | numberToWords}} Only
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html
index d5166a691..a660918d4 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html
@@ -112,7 +112,8 @@
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
index 7d4aeb3c3..d965986e4 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
@@ -44,7 +44,8 @@
-
+
+ maxlength="10" [value]="items.get('trade_product_contact_person_name').value | titlecase">