{
- enduse.push(val.premises_types);
- existPremises.push(val);
- });
+ // // console.log(bussiness_address_type);
+
- this.formPremisesArray = existPremises;
+ // let selectedPremisesDBData = Object.keys(data.records.bussiness_address_type).map(function (key) {
+ // return data.records.bussiness_address_type[key];
+ // });
- this.addressForm.controls.bussiness_address_type.setValue(enduse);
-
- var additionalPremisesResult = Object.keys(data.records.additional_premises).map(function (key) {
- return data.records.additional_premises[key];
- });
+ // let enduse: any = [];
+ // let existPremises: any =[];
- // let cityenduse: any = [];
- // let existcity: any =[];
+ // selectedPremisesDBData.forEach(val => {
+ // enduse.push(val.premises_types);
+ // existPremises.push(val);
+ // });
- // additionalPremisesResult.forEach(val => {
- // cityenduse.push(val.premises_types);
- // existcity.push(val);
- // });
-
- // this.formPremisesCityArray = existcity;
-
- additionalPremisesResult.forEach((val,index)=>
- {
- console.log(val);
- let cityenduse: any = [];
- let existcity: any =[];
-
- if(val.premises_city != ''){
- this.formPremisesCityArray = [];
- val.premises_city.forEach(option => {
- // cityenduse.push(option);
- // existcity.push(val);
- //this.formPremisesCityArray.push({additional_premises_city: option});
- //this.addressForm.controls.additional_premises.value[index].premises_city = cityenduse;
- console.log(option);
- });
- //console.log(cityenduse);
- //this.formPremisesCityArray = existcity;
- }
-
-
- });
-
-
- if (additionalPremisesResult.length == 0) {
- additionalPremisesControl.push(this.createPremises());
- } else {
- let cityenduse: any = [];
- let existcity: any =[];
-
- additionalPremisesResult.forEach(datas => {
- if(datas.premises_city != ''){
- cityenduse.push(datas.additional_premises_city);
- existcity.push(datas);
- }
- additionalPremisesControl.push(this.createPremises());
- });
-
- this.formPremisesCityArray = existcity;
- console.log(cityenduse);
- console.log(existcity);
-
- this.addressForm.controls['additional_premises'].setValue(additionalPremisesResult);
+ // this.formPremisesArray = existPremises;
- }
+
+ // this.addressForm.controls.bussiness_address_type.setValue(enduse);
+
+ // var additionalPremisesResult = Object.keys(data.records.additional_premises).map(function (key) {
+ // return data.records.additional_premises[key];
+ // });
+
+ // this.additional_premises = additionalPremisesResult;
+
+ // if (additionalPremisesResult.length == 0) {
+ // additionalPremisesControl.push(this.createPremises());
+ // } else {
+ // additionalPremisesResult.forEach(datas => {
+ // additionalPremisesControl.push(this.createPremises());
+ // });
+ // }
- if(data.records.bussiness_address_type == 12) {
- this.addressForm.controls.bussiness_address_type_others.setValue(data.records.bussiness_address_type_others);
- }
+ // if(data.records.bussiness_address_type == 12) {
+ // this.addressForm.controls.bussiness_address_type_others.setValue(data.records.bussiness_address_type_others);
+ // }
+ // }
+
+ if(data.records.bussiness_activity == 'yes' && data.records.bussiness_address_type !=null) {
+ let that = this;
+ this.bussiness_address_type = [];
+
+ this.bussiness_address_type = (Object.keys(data.records.bussiness_address_type).map(function(key)
+ {
+ return data.records.bussiness_address_type[key].premises_types;
+ }))
+
+ this.additional_premises = Object.keys(data.records.additional_premises).map(function(key)
+ {
+ return data.records.additional_premises[key];
+ })
+
}
+ console.log(this.bussiness_address_type);
+ console.log(this.additional_premises);
+
+ this.selectedValue(this.bussiness_address_type,this.additional_premises);
if (data.records.locality_others) {
this.addressForm.controls.locality_others.setValue(data.records.locality_others);
}
+
// if (result.length == 0) {
// control.push(this.createNeighbour());
// } else {
@@ -221,6 +212,7 @@ export class AddressComponent implements OnInit {
}
});
}
+
public initAddressForm(): void {
this.addressForm = this.fb.group({
address: ['', Validators.compose([Validators.required])],
@@ -376,8 +368,12 @@ export class AddressComponent implements OnInit {
// console.log(val);
});
}
-
-
+ else{
+ this.formPremisesCityArray = [];
+
+ this.addressForm.controls.additional_premises.value[index].premises_city = null;
+
+ }
});
records.additional_premises = this.addressForm.controls.additional_premises.value;
@@ -402,59 +398,194 @@ export class AddressComponent implements OnInit {
// this.formPremisesCityArray.push({city: option});
// });
// }
-
SelectedPremises($event){
- console.log('event',$event);
let premisesData = $event.source.value;
-
-
- if($event.source._selected === true ){
-
+ console.log(premisesData);
+
+ if($event.checked === true ){
+
//this.formPremisesArray.push({member: $event.source.value});
//this.selectedSegmentDatas.push(CustomerSegmentName.name);
//console.log('true',premisesData);
-
+
//console.log(this.formPremisesArray);
-
+
this.formPremisesArray.push({premises_types: $event.source.value});
-
- //console.log(this.formPremisesArray);
-
- let array = this.addressData.filter(data => data.address_type_id == premisesData);
-
+
+ console.log(this.formPremisesArray);
+ const control = this.addressForm.controls['additional_premises'];
+ let array = this.addressData.filter(data => data.address_type_id == premisesData)[0];
+ console.log(array);
if(premisesData == 12){
this.PremisesOtherFlag = true;
- this.PremisesLabel[this.z] = this.addressForm.get('bussiness_address_type_others').value;
+ // this.PremisesLabel[this.z] = this.pdQuestionAddress.get('bussiness_address_type_others').value;
+ control.push(this.createPremises());
+
}
else{
- this.PremisesLabel[this.z] = array[0].address_type;
- }
- this.z++;
-
-
- const control = this.addressForm.controls['additional_premises'];
+ this.PremisesLabel[this.z] = array.address_type;
control.push(this.createPremises());
-
-
+
+ }
+ console.log(this.PremisesLabel);
+ this.z++;
+
+
+
+
+
}
- else if($event.source._selected === false ){
-
- console.log('false',premisesData);
-
+ else if($event.checked === false ){
if(premisesData == 12){
this.PremisesOtherFlag = false;
}
-
+ console.log(this.formPremisesArray);
+ let index = this.formPremisesArray.findIndex(form=>form.premises_types== $event.source.value);
+ console.log(index);
const control = this.addressForm.controls['additional_premises'];
- control.removeAt(this.z);
+ control.removeAt(index);
+ this.PremisesLabel.splice(index,1);
+ console.log(this.z);
this.z--;
- //let index = this.selectedSegmentDatas.indexOf(CustomerSegmentName.name);
- //this.selectedSegmentDatas.splice(index,1);
}
+
+ }
+
+ getCity(e)
+ {
+ this.cityData = [];
+ e.forEach(val=>
+ {
+ this.cityData.push({additional_premises_city:val});
+ });
+ console.log(this.cityData);
+ }
+ otherValueset()
+ {
+ let z = this.z;
+ this.PremisesLabel[z-1] = this.addressForm.get('bussiness_address_type_others').value;
+ }
+// checkaddress(value)
+// {
+// // console.log(value);
+// if(value=="OTHERS")
+// {
+// this.addressRemarksAccess = true;
+// }else
+// {
+// this.addressRemarksAccess = false;
+// }
+// }
+
+
+ // SelectedPremises($event){
+ // console.log('event',$event);
+
+ // let premisesData = $event.source.value;
+
+
+ // if($event.source._selected === true ){
+
+ // //this.formPremisesArray.push({member: $event.source.value});
+ // //this.selectedSegmentDatas.push(CustomerSegmentName.name);
+ // //console.log('true',premisesData);
+
+ // //console.log(this.formPremisesArray);
+
+ // this.formPremisesArray.push({premises_types: $event.source.value});
+
+ // //console.log(this.formPremisesArray);
+
+ // let array = this.addressData.filter(data => data.address_type_id == premisesData);
+ // if(premisesData == 12){
+ // this.PremisesOtherFlag = true;
+ // this.PremisesLabel[this.z] = this.addressForm.get('bussiness_address_type_others').value;
+ // }
+ // else{
+ // this.PremisesLabel[this.z] = array[0].address_type;
+ // }
+ // this.z++;
+
+
+ // const control = this.addressForm.controls['additional_premises'];
+ // control.push(this.createPremises());
+
+
+
+ // }
+ // else if($event.source._selected === false ){
+
+ // console.log('false',premisesData);
+
+
+ // if(premisesData == 12){
+ // this.PremisesOtherFlag = false;
+ // }
+
+ // const control = this.addressForm.controls['additional_premises'];
+ // control.removeAt(this.z);
+ // this.z--;
+ // //let index = this.selectedSegmentDatas.indexOf(CustomerSegmentName.name);
+ // //this.selectedSegmentDatas.splice(index,1);
+ // }
+
+ // }
+
+ selectedValue(e,data)
+ {
+ console.log('501 function',);
+ console.log('inside function in bussiness_address_type,',e);
+ console.log('inside function in this.additional_premises,',data);
+
+ let premisesData = e ;
+ this.tempArr = [];
+ let that = this;
+ this.addressData = Object.keys(this.addressData).map(function(key)
+ {
+ that.addressData[key].status = 0;
+ return that.addressData[key];
+ })
+ console.log(this.addressData);
+ premisesData.forEach((val,index)=>
+ {
+ console.log(val);
+ this.z++;
+ // console.log(this.addressTypes);
+ this.formPremisesArray.push({premises_types: val});
+
+ this.tempArr.push(this.addressData.filter(add=>add.address_type_id==val)[0]);
+
+ this.PremisesLabel[index] = this.tempArr[index].address_type;
+
+ if(data[index] !==undefined && data[index].premises_ownership < 2 ){
+ data[index].premises_city = Object.keys(data[index].premises_city).map(function(key)
+ {
+ return data[index].premises_city[key].additional_premises_city;
+ });
+ }
+ this.addressData.forEach(data=>
+ {
+ if(data.address_type_id == val)
+ {
+ data.status = 1;
+ }
+ });
+
+ });
+
+ const control = this.addressForm.controls['additional_premises'] as FormArray;
+
+ // control.removeAt(0);
+ this.tempArr.forEach((item,index)=>
+ {
+ control.push(this.createPremises());
+ });
+
+ this.addressForm.controls['additional_premises'].setValue(data);
}
validateAllFormFields(formGroup: FormGroup) {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
index 99fa55fac..140440a93 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
@@ -14,7 +14,307 @@
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ asset.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ prop.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ freqn.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ins_type.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Yes
+ No
+ NAN
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Yes
+ No
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -233,11 +533,37 @@
-
-
+
+
+
+
+
+ {{owner.applicant_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{relations.name}}
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ prop.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ freqn.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ ins_type.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Yes
- No
- NAN
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
-
+
-
+
+
+
-
-
+
+
-
+ 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Yes
- No
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
- 
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -26,39 +26,50 @@
-
+
-
+
+ formControlName="stock_observed" required
+ (selectionChange)="RawMaterialValidation($event)">
Yes
No
-
+ Please comment on the stock level observed?
+
+
+
+
Raw Materials
-
+
+
-
+
{{uom.name}}
-
+
-
-
+
+
+ {{"₹"}} {{rawValueInWords}} Only
-
-
+
+
+
+ Yes
+ No
+
-
+