diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts index c4b6b05c5..d7b6cb6ac 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts @@ -145,6 +145,8 @@ export class AddressComponent implements OnInit { 'state': datas.fk_state, 'city': datas.fk_city, 'pincode': datas.pincode_id, + 'pd_address_id': datas.pd_address_id, + // 'pincode_others': datas.pincode_id == 1 ? datas.other_pincode :'', } this.getCityAndPincodeDetails(datas.fk_state, index, 1); @@ -243,6 +245,7 @@ export class AddressComponent implements OnInit { stateSearch: [''], citySearch: [''], pinSearch: [''], + pd_address_id: [AddressDetails.pd_address_id], state: [AddressDetails.state], city: [AddressDetails.city], pincode: [AddressDetails.pincode],/** ,Validators.compose([Validators.minLength(6),Validators.maxLength(6)]) */ @@ -258,6 +261,7 @@ export class AddressComponent implements OnInit { stateSearch: [''], citySearch: [''], pinSearch: [''], + pd_address_id: [''], pincode_others: ['', Validators.compose([Validators.minLength(6), Validators.maxLength(6)])], }); } @@ -273,6 +277,8 @@ export class AddressComponent implements OnInit { alternative_pincode: [AddressDetails.alternative_pincode], stateSearch:[''], citySearch:[''], + pinSearch:[''], + alternative_pd_address_id:[''], alternative_pincode_others: [AddressDetails.alternative_pincode_others, Validators.compose([Validators.minLength(6), Validators.maxLength(6)])], reason_for_alternative_address: [AddressDetails.reason_for_alternative_address, Validators.compose([Validators.required])], }); @@ -287,6 +293,7 @@ export class AddressComponent implements OnInit { stateSearch:[''], citySearch:[''], pinSearch:[''], + alternative_pd_address_id: [''], alternative_pincode_others:['', Validators.compose([Validators.minLength(6), Validators.maxLength(6)])], reason_for_alternative_address: ['', Validators.compose([Validators.required])], }); @@ -680,6 +687,7 @@ export class AddressComponent implements OnInit { 'state': datas.state, 'city': datas.city, 'pincode': datas.pincode, + 'pd_address_id': datas.pd_address_id, // 'pincode_others': datas.pincode ? datas.pincode_others : '' } this.getCityAndPincodeDetails(datas.state, index, 1); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts index 2a1dcecf4..adb1c24f2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts @@ -39,6 +39,8 @@ export class BusinessAssetsInfoComponent implements OnInit { isOtherOwner: any = []; loadDetails: boolean; + CurrentAddressLabel=null; + CustSegAbbr: any; generalExistBusinessYear: Number; generalExistBusinessMonth: Number; @@ -228,13 +230,58 @@ export class BusinessAssetsInfoComponent implements OnInit { if (data.status == 200) { if(flag == 1){ + // console.log('first',flag == 1) let initiated_address_check = data.records.hasOwnProperty('is_pd_done_on_initiated_address') ? data.records.is_pd_done_on_initiated_address : true; this.addressList.push({ key_name: 'initiate_address', value: data.records.addresses[0].address, description: 'Initiated Address' }); if (initiated_address_check == false ) { this.addressList.push({ key_name: 'alternative_addresses', value: data.records.alternative_addresses[0].alternative_address, description: 'Alternative Address' }); } + let addressarry= data.records.addresses + if(initiated_address_check == false){ + addressarry = data.records.alternative_addresses + } + addressarry.forEach((dataValue, inx) => { + if(initiated_address_check == false){ + dataValue.address=dataValue.alternative_address + dataValue.state=dataValue.alternative_state + dataValue.city=dataValue.alternative_city + dataValue.pincode=dataValue.alternative_pincode + } + // + this.pdTrigerService.getStateWiseCities(dataValue.state).subscribe(data => { + + if (data.status == 200) { + + this.cityArr = data.records.cities; + this.pinArr = data.records.pincode; + + let selectedAddressType = this.m_address_type.filter(element => element.address_type_id == dataValue.address_type)[0]; + // console.log('typedata',selectedAddressType); + let selectedState = this.m_state_for_address.filter(element => element.state_id == dataValue.state)[0]; + let selectedCity = this.cityArr.filter(element => element.city_id == dataValue.city)[0]; + // console.log(selectedCity,dataValue.city,selectedState); + let selectedPincode = this.pinArr.filter(element => element.pincode_id == dataValue.pincode)[0]; + + let addressType = dataValue.address_type != 1 ? selectedAddressType.address_type : dataValue.address_type_others; + this.address_type = addressType; + let address = dataValue.address.replace(/\n/g,"") + ' , ' + selectedCity.city_name + ',' + selectedState.name + '-' + (dataValue.pincode == 1 ? dataValue.pincode_others : selectedPincode.pincode); + + this.placeholderName[inx] = 'Was any business activity seen at the ' + addressType + ' during PD visit?'; + let addressLabel = address + ' / ' + addressType; + + this.CurrentAddressLabel = addressLabel; + // console.log(addressLabel); + const control = this._businessAssetsQuesFrom.controls['business_assets_for_address']; + + // console.log(addressLabel,control); + control.controls[0]['controls'].address_label.setValue(this.CurrentAddressLabel); + + } + }) + }) } else if(flag == 2){ + // console.log('Second',flag == 1) let dataOfAddress = data.records.addresses.filter(item => item.isactive == 1); this.addressList.push({ key_name: 'initiate_address', value: data.records.addresses[0].address, description: 'Initiated Address' }); let initiated_address_check = data.records.hasOwnProperty('is_pd_done_on_initiated_address') ? data.records.is_pd_done_on_initiated_address : true; @@ -676,8 +723,9 @@ export class BusinessAssetsInfoComponent implements OnInit { let addressType = splitted_label[1] != '' ? splitted_label[1] : 'Address Type'; this.placeholderName[index] = 'Was any business activity seen at the ' + addressType + ' during PD visit?'; this.address_type = addressType; + // console.log(this.CurrentAddressLabel) let vals = { - address_label: val.address_label, + address_label: this.CurrentAddressLabel == null ? val.address_label : this.CurrentAddressLabel, business_years: val.business_years, business_month: val.business_month, business_address_availability: val.business_address_availability, diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html index 7e707a428..66b941058 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html @@ -397,12 +397,7 @@ {{AV_netProfitAmtInwords[i]}} Only --> - - - {{"₹"}} - {{details.get('estimate_posmachine_or_cc_annual_sales').value | numberToWords}} Only - + @@ -482,6 +477,12 @@ formControlName="estimate_reason_for_loss"> + + + {{"₹"}} + {{details.get('estimate_posmachine_or_cc_annual_sales').value | numberToWords}} Only + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.html index 8e6a1dba3..15dbb9b68 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.html @@ -30,7 +30,15 @@
Annual Rent Amount as per Applicant : {{ad.applicants_rent}}
- +
+
+ +
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.scss index 7f0c3ecf5..3c12c4f84 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.scss @@ -3,7 +3,7 @@ background-color: #e00201 !important; } .card-property { - height: 250px; + height: 300px; color: black; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts index 906a81a30..417eedf71 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit, Inject } from '@angular/core'; import { MatDialog, MAT_DIALOG_DATA } from '@angular/material'; import { PdTrigerService } from './../../../../../pd-service/pd-triger.service'; import { ManageRentalVerificationComponent } from './manage-rental-verification/manage-rental-verification.component'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-rental-verification', @@ -33,14 +34,16 @@ export class RentalVerificationComponent implements OnInit { existing_rental_list: any = []; existing_rental_count_id: any; + private notifier: NotifierService; - - constructor(private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any, private dialog: MatDialog) { + constructor(notifier: NotifierService,private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any, private dialog: MatDialog) { this.parentData = this.data; + this.notifier = notifier; this.parent_pdid = this.data.pdmaster_details.parent_pd_id; this.pdid = this.data.pdmaster_details.pd_id; this.form_id = 17; this.main_applicant = this.data.pdmaster_details.main_applicant; + console.log('user records',this.data.pdmaster_details) this.lender_applicant_id = this.data.pdmaster_details.lender_applicant_id; this.subproduct_abbr = this.data.pdmaster_details.subproduct_abbr; this.customer_segment_abbr = this.data.pdmaster_details.customer_segment_abbr; @@ -95,6 +98,7 @@ export class RentalVerificationComponent implements OnInit { } loadFormData() { + this.existing_rental_list=[] let params: any = {}; params.parent_pdid = this.parent_pdid; params.pd_id = this.pdid; @@ -207,4 +211,25 @@ export class RentalVerificationComponent implements OnInit { this.data.pdapplicants_detials.splice(index, 1); } + isactiveProperty(ad){ + // console.log('No 1',ad); + let params: any = {}; + // console.log('No 2',params); + // params.parent_pdid = this.parent_pdid; + params.fk_pd_id = this.pdid; + params.fk_form_id = this.form_id; + params.rental_count_id = ad.rental_count_id; + params.company_id = null; + this._pd.removeProperty(params) + .subscribe(data => { + if (data.status == 200) { + this.notifier.notify('success', 'Deleted Successfully.!'); + this.loadFormData(); + + } + + }) + + } + } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index d0e4b2835..1e751441f 100755 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -63,6 +63,13 @@ export class PdTrigerService { catchError(this.handleError('role', [])) ) } + removeProperty(params): Observable { + params.fk_createdby = this._aws.getlocale(); + return this._http.post(this.apiUrl + 'deactiveFormData', { "records": params }) + .pipe( + catchError(this.handleError('role', [])) + ) + } /* To get Files., */ retriveFile(PDID,FormID,CompanyID): Observable {