Merge branch 'smc_credit_pd_new' of https://bitbucket.org/venbaittech/sparq-lender into smc_credit_pd_new
This commit is contained in:
parent
cdf4a07e4d
commit
71ef84c3f1
16077
ng6-seed/package-lock.json
generated
16077
ng6-seed/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -28,7 +28,8 @@
|
||||
<mat-dialog-actions align="end">
|
||||
|
||||
<button type="button" mat-raised-button mat-icon-button (click)="addRequiremnts(const_requirement)" matTooltip="Add More Additional Requirements" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary" type="button"> <mat-icon>add</mat-icon> </button>
|
||||
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Save" matTooltipPosition="above" (click)="updateAdditionalRequirement(_EditPDRequirementForm.value)"><mat-icon>save</mat-icon></button>
|
||||
<button mat-raised-button mat-icon-button *ngIf="show == '1'" class="mr-1 mb-1 hover-icon" type="button" matTooltip="Save" matTooltipPosition="above" (click)="updateAdditionalRequirement(_EditPDRequirementForm.value)"><mat-icon>save</mat-icon></button>
|
||||
<button mat-raised-button mat-icon-button *ngIf="show == '0'" class="mr-1 mb-1 hover-icon" type="button" matTooltip="Save" matTooltipPosition="above" (click)="updateAdditionalRequirement2(_EditPDRequirementForm.value)"><mat-icon>save</mat-icon></button>
|
||||
</mat-dialog-actions>
|
||||
|
||||
</form>
|
||||
|
||||
@ -24,6 +24,8 @@ export class PdRequirementComponent implements OnInit {
|
||||
};
|
||||
form_data: any=[];
|
||||
records: { addtional_requirements: any; createdby: string; pdid: any; };
|
||||
queries_value: any;
|
||||
show: any=[];
|
||||
constructor(private _fb: FormBuilder, private pdTriggerService:PdTrigerService,
|
||||
private _pd: PdTrigerService, notifier: NotifierService,private dialogRef: MatDialogRef<PdRequirementComponent>,
|
||||
@Inject(MAT_DIALOG_DATA) public data: any) {
|
||||
@ -61,6 +63,7 @@ export class PdRequirementComponent implements OnInit {
|
||||
});
|
||||
};
|
||||
addRequiremnts(getData:any) {
|
||||
this.show = '1';
|
||||
if(this._EditPDRequirementForm.valid){
|
||||
this.addtional_requirements = this._EditPDRequirementForm.get('addtional_requirements') as FormArray;
|
||||
this.addtional_requirements.push(this.createRequiremnt(getData));
|
||||
@ -74,7 +77,7 @@ export class PdRequirementComponent implements OnInit {
|
||||
console.log(index)
|
||||
console.log(formValue)
|
||||
console.log(formValue.pdid)
|
||||
|
||||
this.show = '0';
|
||||
console.log( formValue.addtional_requirements[index].add_requirement)
|
||||
|
||||
if(formValue.addtional_requirements[index].add_requirement !=''){
|
||||
@ -93,24 +96,36 @@ export class PdRequirementComponent implements OnInit {
|
||||
|
||||
formValues.cm_queries.forEach(element => {
|
||||
element.parent_id
|
||||
console.log(element.parent_id)
|
||||
console.log(element)
|
||||
if(element.question == remove_name){
|
||||
var formula_index:any = formValues.cm_queries.indexOf(element);
|
||||
console.log(formula_index)
|
||||
const index = formula_index
|
||||
if (index > -1) {
|
||||
formValues.cm_queries.splice(index, 1);
|
||||
const index1 = formula_index
|
||||
if (index1 > -1) {
|
||||
formValues.cm_queries.splice(index1, 1);
|
||||
}
|
||||
console.log( formValues.cm_queries)
|
||||
}
|
||||
|
||||
});
|
||||
console.log( formValues.cm_queries)
|
||||
console.log(formValues)
|
||||
this.form_data = formValues
|
||||
console.log( this.form_data)
|
||||
let param :any = {"fk_pd_id":formValue.pdid,"fk_form_id":"18","json": this.form_data,createdby:''}
|
||||
|
||||
console.log(param)
|
||||
const requirement_control = <FormArray>this._EditPDRequirementForm.controls['addtional_requirements'];
|
||||
console.log(requirement_control)
|
||||
if(requirement_control.value[index].add_req_id != ''){
|
||||
|
||||
requirement_control.controls[index]['controls'].isactive.setValue(0)
|
||||
}
|
||||
else{
|
||||
|
||||
requirement_control.removeAt(index);
|
||||
}
|
||||
console.log(formValue)
|
||||
this.pdTriggerService.saveSMCCreditPDsection(param).subscribe(result=>{
|
||||
if(result['dataStatus']) {
|
||||
console.log("insert")
|
||||
@ -120,16 +135,7 @@ export class PdRequirementComponent implements OnInit {
|
||||
}
|
||||
})
|
||||
}
|
||||
const requirement_control = <FormArray>this._EditPDRequirementForm.controls['addtional_requirements'];
|
||||
console.log(requirement_control)
|
||||
if(requirement_control.value[index].add_req_id != ''){
|
||||
|
||||
requirement_control.controls[index]['controls'].isactive.setValue(0)
|
||||
}
|
||||
else{
|
||||
|
||||
requirement_control.removeAt(index);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
updateAdditionalRequirement(formValue: any) {
|
||||
@ -190,28 +196,94 @@ export class PdRequirementComponent implements OnInit {
|
||||
})
|
||||
}else{
|
||||
console.log("dd")
|
||||
this.queries_value=result['records'].json
|
||||
let formValues = JSON.parse(this.queries_value)
|
||||
console.log(formValues)
|
||||
console.log( this.queries_value)
|
||||
let records:any=formValue.addtional_requirements;
|
||||
console.log( records)
|
||||
for (let i = 0; i <records.length; ++i) {
|
||||
|
||||
|
||||
if(records[i].is_insert_json == null){
|
||||
formValues.cm_queries.push({question:records[i].add_requirement, answer: ''})
|
||||
}
|
||||
|
||||
let records:any=formValue;
|
||||
|
||||
this._pd.saveAdditionalRequirements(records).subscribe(result => {
|
||||
console.log(result)
|
||||
if (result.status == 200) {
|
||||
this.notifier.notify('success', 'Additional Requirements Updated.');
|
||||
this.dialogRef.close();
|
||||
}
|
||||
else {
|
||||
|
||||
}
|
||||
console.log(formValues)
|
||||
// formValue.addtional_requirements.forEach(element => {
|
||||
// element.is_insert_json ="1"
|
||||
// });
|
||||
console.log(formValue)
|
||||
let record_param:any=formValue;
|
||||
console.log( record_param)
|
||||
|
||||
let param :any = {"fk_pd_id":formValue.pdid,"fk_form_id":"18","json":formValues,createdby:''}
|
||||
|
||||
console.log(param)
|
||||
console.log(record_param)
|
||||
if(result['dataStatus']) {
|
||||
console.log("insert")
|
||||
this._pd.saveAdditionalRequirements(record_param).subscribe(result => {
|
||||
console.log(result)
|
||||
if (result.status == 200) {
|
||||
this.pdTriggerService.saveSMCCreditPDsection(param).subscribe(result=>{
|
||||
|
||||
})
|
||||
this.notifier.notify('success', 'Additional Requirements Updated.');
|
||||
this.dialogRef.close();
|
||||
}
|
||||
else {
|
||||
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
|
||||
}
|
||||
}, error => {
|
||||
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
|
||||
}
|
||||
}, error => {
|
||||
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
updateAdditionalRequirement2(formValue: any) {
|
||||
console.log(formValue)
|
||||
console.log(formValue.addtional_requirements)
|
||||
|
||||
let record_param:any=formValue;
|
||||
console.log( record_param)
|
||||
|
||||
|
||||
console.log(record_param)
|
||||
this._pd.saveAdditionalRequirements(record_param).subscribe(result => {
|
||||
console.log(result)
|
||||
if (result.status == 200) {
|
||||
|
||||
this.notifier.notify('success', 'Additional Requirements Updated.');
|
||||
this.dialogRef.close();
|
||||
}
|
||||
else {
|
||||
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
|
||||
}
|
||||
}, error => {
|
||||
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
// validate all form group and form array fields
|
||||
validateAllFormFields(formGroup: any) {
|
||||
Object.keys(formGroup.controls).forEach(field => {
|
||||
|
||||
@ -214,8 +214,20 @@ export class DynamicFormComponent implements OnInit {
|
||||
removeData(index,json_obj) {
|
||||
|
||||
// debugger;
|
||||
console.log(json_obj)
|
||||
console.log(json_obj.group_key)
|
||||
console.log(this.json_answers);
|
||||
let control = this.form_group_name.get(json_obj.group_key) as FormArray
|
||||
console.log(control)
|
||||
control.removeAt(index)
|
||||
if(this.json_answers){
|
||||
if(this.json_answers.cm_queries instanceof Array){
|
||||
this.json_answers.cm_queries.splice(index,1)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
console.log(control)
|
||||
json_obj.group_questions.splice(index,1)
|
||||
this.step = control.length-1
|
||||
|
||||
|
||||
@ -71,7 +71,7 @@ export class FormComponent implements OnInit {
|
||||
|
||||
ngOnInit() {
|
||||
|
||||
this.getSectionData()
|
||||
//this.getSectionData()
|
||||
if(this.pd_all_details.form_id=='5' && this.pd_all_details.pdmaster_details.product_abbr=='LFMP')
|
||||
{
|
||||
|
||||
@ -222,23 +222,18 @@ else
|
||||
})
|
||||
}
|
||||
getSectionData() {
|
||||
let pdid = localStorage.getItem('pdid')
|
||||
let pdid = localStorage.getItem('pdid')
|
||||
|
||||
console.log(pdid)
|
||||
this.pdTriggerService.getAdditionalRequirements(pdid).subscribe(res=>{
|
||||
console.log(res)
|
||||
if(res['dataStatus']){
|
||||
this.additional_query =[];
|
||||
this.queries_value=res['records'].pd_additional_requirements
|
||||
|
||||
for (let i = 0; i < this.queries_value.length; ++i) {
|
||||
let d = {question:this.queries_value[i].add_requirement, answer: ''}
|
||||
this.additional_query.push({question:this.queries_value[i].add_requirement, answer: ''})
|
||||
console.log(pdid)
|
||||
this.pdTriggerService.getAdditionalRequirements(pdid).subscribe(res=>{
|
||||
console.log(res)
|
||||
if(res['dataStatus']){
|
||||
this.additional_query =[];
|
||||
this.queries_value=res['records'].pd_additional_requirements
|
||||
|
||||
}
|
||||
//localStorage.setItem('queriesviewdata',this.queries_docs)
|
||||
console.log( this.additional_query)
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
let params = {"fk_pd_id":this.pd_all_details.pdmaster_details.pd_id,"fk_form_id":this.pd_all_details.form_id}
|
||||
this.pdTriggerService.getSMCCreditPDSectionData(params).subscribe(result=>{
|
||||
console.log(result)
|
||||
@ -250,42 +245,15 @@ else
|
||||
console.log(formValues)
|
||||
let s = this.queries_value
|
||||
console.log(s)
|
||||
// formValues.cm_queries.forEach(element => {
|
||||
// element.parent_id
|
||||
// console.log(element.parent_id)
|
||||
// if(element.question == "dd"){
|
||||
// var formula_index:any = formValues.cm_queries.indexOf(element);
|
||||
// console.log(formula_index)
|
||||
// const index = formula_index
|
||||
// if (index > -1) {
|
||||
// formValues.cm_queries.splice(index, 1);
|
||||
// }
|
||||
// }
|
||||
|
||||
// if(formValues.cm_queries instanceof Array){
|
||||
|
||||
|
||||
this.quesService.formanswers= formValues
|
||||
|
||||
|
||||
// });
|
||||
console.log(formValues.cm_queries)
|
||||
// var formula_index:any = tableCrtlName.indexOf(element);
|
||||
console.log(formValues)
|
||||
setTimeout(()=>{
|
||||
|
||||
for (let i = 0; i < this.queries_value.length; ++i) {
|
||||
console.log(this.queries_value[i].is_insert_json)
|
||||
console.log(this.queries_value[i].add_requirement)
|
||||
// const result = formValues.cm_queries.filter(word => word.question == this.queries_value[i].add_requirement);
|
||||
// console.log(result)
|
||||
// var formula_index:any = formValues.cm_queries.indexOf(formValues.cm_queries.filter(word => word.question == this.queries_value[i].add_requirement));
|
||||
// console.log(formula_index)
|
||||
// let tmp_data = {question:this.queries_value[i].add_requirement, answer: ''}
|
||||
if(this.queries_value[i].is_insert_json == null){
|
||||
formValues.cm_queries.push({question:this.queries_value[i].add_requirement, answer: '',parent_id:this.queries_value[i].add_req_id})
|
||||
}
|
||||
|
||||
|
||||
} //<<<---using ()=> syntax
|
||||
this.quesService.formanswers= formValues
|
||||
}, 1000);
|
||||
|
||||
|
||||
// }
|
||||
|
||||
this.loaderService.showMatSpinnerDialog("")
|
||||
// setTimeout(()=>{
|
||||
// this.quesService.formanswers = null
|
||||
|
||||
Loading…
Reference in New Issue
Block a user