Fairoj : SMART PD FEEDBACK CHANGES
This commit is contained in:
venbatechnologies@gmail.com
parent
fbeb5b28ce
commit
4541f61b6a
@ -92,6 +92,10 @@
|
||||
<mat-error
|
||||
*ngIf="init_addr.controls['pincode_others'].hasError('required')">
|
||||
Pincode Required</mat-error>
|
||||
<mat-error
|
||||
*ngIf="init_addr.controls['pincode_others'].hasError('minlength') ||
|
||||
init_addr.controls['pincode_others'].hasError('maxlength')">
|
||||
Pincode should be 6 digit</mat-error>
|
||||
</mat-form-field>
|
||||
|
||||
</div>
|
||||
@ -258,7 +262,7 @@
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field style="width: 46%;"
|
||||
*ngIf="addressForm.controls['locality'].value == 1">
|
||||
*ngIf="addressForm.controls['locality'].value == 1 && addressForm.controls['locality_others']">
|
||||
<input matInput placeholder="Specify Locality " required
|
||||
formControlName="locality_others" autocomplete="off">
|
||||
<!-- autofocus -->
|
||||
|
||||
@ -420,6 +420,7 @@ export class AddressComponent implements OnInit {
|
||||
e == 1 ? this.addressForm.addControl('address_type_others', new FormControl('', Validators.required)) : this.addressForm.removeControl('address_type_others');
|
||||
break;
|
||||
case 4:
|
||||
console.log("value",e );
|
||||
e == 1 ? this.addressForm.addControl('locality_others', new FormControl('', Validators.required)) : this.addressForm.removeControl('locality_others');
|
||||
break;
|
||||
case 5:
|
||||
@ -534,12 +535,24 @@ export class AddressComponent implements OnInit {
|
||||
});
|
||||
|
||||
}
|
||||
public findInvalidControls() {
|
||||
const invalid = [];
|
||||
const controls = this.addressForm.controls;
|
||||
for (const name in controls) {
|
||||
if (controls[name].invalid) {
|
||||
invalid.push(name);
|
||||
}
|
||||
}
|
||||
return invalid;
|
||||
}
|
||||
onSubmit() {
|
||||
|
||||
if (!this.addressForm.valid) {
|
||||
this.validateAllFormFields(this.addressForm);
|
||||
this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!');
|
||||
this.disableAfterSubmit = false;
|
||||
let inavalidCtrls = this.findInvalidControls();
|
||||
console.log(inavalidCtrls)
|
||||
return;
|
||||
}
|
||||
// else if (this.addressForm.value.address_form_remark == '') {
|
||||
@ -881,9 +894,85 @@ export class AddressComponent implements OnInit {
|
||||
|
||||
this._pd.getVendorDatas('address',this.pdid).subscribe(result=>{
|
||||
if(result) {
|
||||
let initiated_address_check =result.records.hasOwnProperty('is_pd_done_on_initiated_address') ? result.records.is_pd_done_on_initiated_address : true ;
|
||||
if (initiated_address_check == false) {
|
||||
|
||||
this.addressForm.addControl('alternative_addresses', this.fb.array([]));
|
||||
const alternative_address_control = <FormArray>this.addressForm.controls['alternative_addresses'];
|
||||
if (result.records.alternative_addresses.length > 0) {
|
||||
|
||||
result.records.alternative_addresses.forEach((datas, index) => {
|
||||
|
||||
if (datas.citySearch == "" || datas.citySearch == null){
|
||||
delete datas.citySearch;
|
||||
}
|
||||
if (datas.pinSearch == "" || datas.pinSearch == null){
|
||||
delete datas.pinSearch;
|
||||
}
|
||||
if (datas.stateSearch == "" || datas.stateSearch == null){
|
||||
delete datas.stateSearch;
|
||||
}
|
||||
|
||||
let obj = {
|
||||
'alternative_address': this.transformName(datas.alternative_address),
|
||||
'alternative_state': datas.alternative_state,
|
||||
'alternative_city': datas.alternative_city,
|
||||
'alternative_pincode': datas.alternative_pincode,
|
||||
// 'alternative_pincode_others': datas.alternative_pincode == 1 ? datas.alternative_pincode_others : '',
|
||||
'reason_for_alternative_address': datas.reason_for_alternative_address,
|
||||
}
|
||||
this.getCityAndPincodeDetails(datas.alternative_state, index, 2);
|
||||
if(alternative_address_control.length == 1) {
|
||||
alternative_address_control.removeAt(0);
|
||||
}
|
||||
alternative_address_control.push(this.createAlternativeAddresses(obj));
|
||||
this.setOthers(+datas.alternative_pincode, index, 2);
|
||||
if(datas.alternative_pincode == 1) {
|
||||
let AltCtrl: any = alternative_address_control.controls[index];
|
||||
AltCtrl.controls['alternative_pincode_others'].setValue(datas.alternative_pincode_others);
|
||||
AltCtrl.controls['alternative_pincode_others'].updateValueAndValidity();
|
||||
}
|
||||
|
||||
this.addressForm.controls.pd_location.setValue(result.records.pd_location);
|
||||
this.addressForm.controls.address_type.setValue(result.records.address_type);
|
||||
|
||||
let selectedAddressType = this.addressData.filter(element => element.address_type_id == result.records.address_type)[0];
|
||||
if(selectedAddressType != undefined && selectedAddressType.hasOwnProperty('address_type')){
|
||||
this.selectedAddressType(selectedAddressType.address_type);
|
||||
}
|
||||
|
||||
this.setOthers(result.records.address_type, '', 3);
|
||||
|
||||
if (result.records.address_type == 1) {
|
||||
this.addressForm.controls.address_type_others.setValue(result.records.address_type_others);
|
||||
this.selectedAddressType(result.records.address_type_others);
|
||||
}
|
||||
|
||||
this.addressForm.controls.comment_locality.setValue(result.records.comment_locality);
|
||||
|
||||
this.addressForm.controls.locality.setValue(result.records.locality);
|
||||
this.setOthers(result.records.locality, '', 4);
|
||||
|
||||
if (result.records.locality == 1) {
|
||||
this.addressForm.controls.locality_others.setValue(result.records.locality_others);
|
||||
}
|
||||
|
||||
if(this.lender_short_name != 'CLIX' && this.prod_catagory != 'BL'){
|
||||
this.addressForm.controls.estimated_area.setValue(result.records.estimated_area);
|
||||
this.addressForm.controls.uom.setValue(result.records.uom);
|
||||
this.setOthers(result.records.uom, '', 5);
|
||||
if (result.records.uom == 1) {
|
||||
this.addressForm.controls.uom_others.setValue(result.records.uom_others);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
setTimeout(() =>{
|
||||
this.addressForm.patchValue(result.records);
|
||||
},1000)
|
||||
// console.log(this.addressForm.value,this.commentData,this.locationdata);
|
||||
// console.log(this.a.value)
|
||||
console.log(this.addressForm.value)
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<!-- <div *ngIf="form_group_name.controls['questions']"> -->
|
||||
<!-- <section formArrayName="questions">fxFlex.md="33" fxFlex.lg="33" fxFlex.xl="33" -->
|
||||
<!-- {{form_group_name.value | json}} -->
|
||||
<span *ngFor="let parent_ques of questions_JSON.questions;let p_i =index; let p_last=last" fxFlex.xs="100" fxFlex.sm="50" [fxFlex]="parent_ques.hasOwnProperty('field_width') && parent_ques.field_width ? parent_ques.field_width : '100'" >
|
||||
<span *ngFor="let parent_ques of questions_JSON.questions;let p_i =index; let p_last=last" fxFlex.xs="100" fxFlex.sm="100" [fxFlex]="parent_ques.hasOwnProperty('field_width') && parent_ques.field_width ? parent_ques.field_width : '100'" >
|
||||
<!-- <div *ngFor="let parent_ques of form_group_name.controls['questions']['controls'];let p_i=index; let p_l=last" [formGroupName]="p_i"> -->
|
||||
<!-- {{parent_ques | json}} -->
|
||||
<div *ngIf="parent_ques.is_repeatable != '1'" >
|
||||
|
||||
@ -70,7 +70,6 @@
|
||||
<mat-card style="margin-left: 15px;">
|
||||
<mat-card-content formArrayName="docs_to_be_sighted">
|
||||
<div *ngFor="let item of docsCollectedForm.controls.docs_to_be_sighted['controls'];let i=index" [formGroupName]="i">
|
||||
|
||||
<div fxLayout="row wrap">
|
||||
<div fxFlex="60">
|
||||
<div >
|
||||
@ -87,6 +86,7 @@
|
||||
<!-- <button style="color:#E00201" *ngIf="camera_btn[i] == true" ion-button slot="end" clear small float-right (click)="capture(i,item)"><ion-icon style="font-size:30px;float:right;" name="md-camera"></ion-icon></button> -->
|
||||
<!-- </ion-buttons> -->
|
||||
<!-- </div> -->
|
||||
|
||||
<div *ngIf="item.controls['img'] && item.value.img != ''">
|
||||
<img [src]="item.value.img" style="width:85px; height: 85px;float:right" ngxViewer>
|
||||
</div>
|
||||
|
||||
@ -198,10 +198,50 @@ export class QueriesDocsComponent implements OnInit {
|
||||
this.docsCollectedForm.patchValue(retrieved_data)
|
||||
|
||||
}
|
||||
if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.hasOwnProperty('vendor_status') && this.pd_all_details.pdmaster_details.vendor_status == 'COMPLETED') {
|
||||
console.log(this.pd_all_details.pdmaster_details.vendor_status);
|
||||
setTimeout(()=>{
|
||||
this.getDataFromVendor()
|
||||
},1000)
|
||||
}
|
||||
},err=>{
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
/************************* START OF VENDOR FORM DATAS *********************************/
|
||||
|
||||
getDataFromVendor() {
|
||||
|
||||
this.pdTriggerService.getVendorDatas('queries_form',this.pdid).subscribe(result=>{
|
||||
if(result && result['dataStatus']) {
|
||||
if(result.records.hasOwnProperty('docs_to_be_sighted') && result.records.docs_to_be_sighted.length > 0) {
|
||||
result.records.docs_to_be_sighted.forEach((doc_value,index)=>{
|
||||
console.log(doc_value)
|
||||
if(doc_value.hasOwnProperty('img') && doc_value.img && doc_value.img != '') {
|
||||
this.docs_change_fun(index,'yes')
|
||||
}
|
||||
else if(doc_value.hasOwnProperty('reason') && doc_value.reason && doc_value.reason != '') {
|
||||
this.docs_change_fun(index,'no');
|
||||
}
|
||||
// let data=doc_value.control_name
|
||||
// data=parseInt(data)
|
||||
// console.log("data",data);
|
||||
// data=doc_value.data
|
||||
// this.docs_change_fun(index,data)
|
||||
})
|
||||
this.docsCollectedForm.patchValue(result.records);
|
||||
}
|
||||
// let curr_control: any = <FormArray>ParCtrls.controls[0];
|
||||
// result.records.business_address_availability ='yes'
|
||||
|
||||
// console.log(this._generalForm.value)
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
/************************* END OF VENDOR FORM DATAS *********************************/
|
||||
|
||||
initControls(){
|
||||
if(this.queries_docs.length != 0){
|
||||
this.queries_docs.forEach(res=>{
|
||||
@ -375,7 +415,7 @@ export class QueriesDocsComponent implements OnInit {
|
||||
if(value == 'yes'){
|
||||
// this.camera_btn[index]=true
|
||||
control.controls[index].removeControl('reason')
|
||||
// control.controls[index].addControl('img',new FormControl('',Validators.required))
|
||||
control.controls[index].addControl('img',new FormControl('',Validators.required))
|
||||
// control.controls[index].addControl('is_new',new FormControl('',Validators.required))
|
||||
}
|
||||
else if(value == 'no'){
|
||||
|
||||
@ -179,7 +179,7 @@
|
||||
<strong> {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Addon Pending' : master.pd_status | titlecase}}</strong>
|
||||
</button>
|
||||
|
||||
<span *ngIf="userRoleID == 10 || userRoleID == 3"><button *ngIf="roleAccessDetails.trigger && currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdMaster(master)" matTooltipPosition="above" matTooltip="Edit PD Master"><mat-icon>edit</mat-icon></button>
|
||||
<span *ngIf="userRoleID == 10 || userRoleID == 3"><button *ngIf="roleAccessDetails.trigger && currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED || currentPDStatus==pdStatusCheck.ALLOCATED_TO_PARTNER" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdMaster(master)" matTooltipPosition="above" matTooltip="Edit PD Master"><mat-icon>edit</mat-icon></button>
|
||||
<button *ngIf="roleAccessDetails.trigger && currentPDStatus==pdStatusCheck.DRAFT" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Trigger" matTooltipPosition="above" (click)="directTriggerPD(mandatoryFieldsValidations,master)"><mat-icon>flash_on</mat-icon></button>
|
||||
</span>
|
||||
<span *ngIf="userRoleID != 4 || userRoleID != 8 || userRoleID != 9"><button *ngIf="roleAccessDetails.reports && master.pd_type_name && currentPDStatus==pdStatusCheck.QC_COMPLETED" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Report" matTooltipPosition="above" (click)="getPDIDReport(viewID)"><mat-icon>ballot</mat-icon></button></span>
|
||||
@ -211,7 +211,7 @@
|
||||
<span><button *ngIf="roleAccessDetails.trigger && addresses.assigned_pd==null || addresses.assigned_pd==''" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate PD for this address' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button></span>
|
||||
<span *ngIf="userRoleID == 2 || userRoleID == 3 || userRoleID == 10"><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.COMPLETED && master.pd_status!=pdStatusCheck.ADD_ON_PENDING && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button></span>
|
||||
<span *ngIf="userRoleID == 2 || userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 10"><button *ngIf="roleAccessDetails.schedule && addresses.assigned_pd && master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.COMPLETED && master.pd_status!=pdStatusCheck.ADD_ON_PENDING && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master,addresses)"><mat-icon>schedule</mat-icon></button></span>
|
||||
<span *ngIf="userRoleID == 2 || userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 10"><button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.TRIGGERED && enableStartPD" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,master.pd_status)"><mat-icon>question_answer</mat-icon></button></span>
|
||||
<span *ngIf="userRoleID == 2 || userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 10"><button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.TRIGGERED && currentPDStatus!=pdStatusCheck.ALLOCATED_TO_PARTNER && enableStartPD" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,master.pd_status)"><mat-icon>question_answer</mat-icon></button></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -348,7 +348,7 @@
|
||||
<div fxFlex="70" align="left" style="padding: 10px !important;">
|
||||
<mat-card-title>Applicants</mat-card-title>
|
||||
</div>
|
||||
<div fxFlex="30" align="end" style="padding: 10px !important;" *ngIf="roleAccessDetails.trigger && currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED">
|
||||
<div fxFlex="30" align="end" style="padding: 10px !important;" *ngIf="roleAccessDetails.trigger && currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED || currentPDStatus==pdStatusCheck.ALLOCATED_TO_PARTNER">
|
||||
<span *ngIf="userRoleID == 10 || userRoleID == 3"><button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdApplicant(pdApplicantData,CustomerSegmentAbbr)"><mat-icon>edit</mat-icon></button></span>
|
||||
</div>
|
||||
</mat-card-header>
|
||||
@ -398,7 +398,7 @@
|
||||
<div fxFlex="70" align="left" style="padding: 10px !important;">
|
||||
<mat-card-title>Credit Manager’s Specific Queries</mat-card-title>
|
||||
</div>
|
||||
<div fxFlex="30" align="end" style="padding: 10px !important;" *ngIf="roleAccessDetails.trigger && currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED">
|
||||
<div fxFlex="30" align="end" style="padding: 10px !important;" *ngIf="roleAccessDetails.trigger && currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED || currentPDStatus==pdStatusCheck.ALLOCATED_TO_PARTNER">
|
||||
<span *ngIf="userRoleID == 10 || userRoleID == 3"><button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editAdditionalRequirement(pdAdditionalReqData)"><mat-icon>edit</mat-icon></button></span>
|
||||
</div>
|
||||
</mat-card-header>
|
||||
@ -421,7 +421,7 @@
|
||||
<div fxFlex="70" align="left" style="padding: 10px !important;">
|
||||
<mat-card-title>Documents to be collected</mat-card-title>
|
||||
</div>
|
||||
<div fxFlex="30" align="end" style="padding: 10px !important;" *ngIf="roleAccessDetails.trigger && currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED">
|
||||
<div fxFlex="30" align="end" style="padding: 10px !important;" *ngIf="roleAccessDetails.trigger && currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED || currentPDStatus==pdStatusCheck.ALLOCATED_TO_PARTNER">
|
||||
<span *ngIf="userRoleID == 10 || userRoleID == 3"><button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editCollectedDocument(pdCollectedDocument)"><mat-icon>edit</mat-icon></button></span>
|
||||
</div>
|
||||
</mat-card-header>
|
||||
|
||||
@ -90,6 +90,7 @@ export class ViewPdComponent implements OnInit, OnDestroy {
|
||||
"COMPLETED": 'COMPLETED',
|
||||
"ADD_ON_PENDING": 'ADD_ON_PENDING',
|
||||
"QC_COMPLETED": 'QC_COMPLETED',
|
||||
"ALLOCATED_TO_PARTNER":'ALLOCATED_TO_PARTNER'
|
||||
};
|
||||
|
||||
mandatoryFieldsValidations: any = [];
|
||||
|
||||
@ -938,7 +938,8 @@ export class PdTrigerService {
|
||||
getVendorDatas(form_name,pd_id?) {
|
||||
let formsDet = [{form_name:"general",form_id:"18"},{form_name:"address",form_id:"5"},{form_name:"business_info",form_id:"13"},
|
||||
{form_name:"business_assets",form_id:"22"},{form_name:"neighbourhood_details",form_id:"19"},
|
||||
{form_name:"final_remarks",form_id:"20"}
|
||||
{form_name:"final_remarks",form_id:"20"},
|
||||
{form_name:"queries_form",form_id:"24"}
|
||||
]
|
||||
|
||||
// let records = {"records":data[form_name]}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user