From 9660b8944a6f5e3c5dd2746372ac0d0d68e473a2 Mon Sep 17 00:00:00 2001 From: venbainfotech Date: Sat, 5 Feb 2022 16:14:42 +0530 Subject: [PATCH] feedbacks issue fix --- ng6-seed/package.json | 4 +- .../capture-btn/capture-btn.component.html | 2 +- .../capture-btn/capture-btn.component.ts | 13 +++- .../ques-template/ques-template.html | 74 +++++++++++++------ .../ques-template/ques-template.scss | 26 +++++++ .../components/ques-template/ques-template.ts | 22 ++++-- .../single-capture-btn.component.html | 2 +- .../single-capture-btn.component.ts | 10 ++- .../sales-pd-list/sales-pd.component.ts | 2 +- .../section-list/section-list.component.html | 9 ++- .../section-list/section-list.component.ts | 43 ++++++----- .../services/question-service.service.ts | 54 +++++++++----- .../app/sales-pd/services/sales-pd.service.ts | 2 +- 13 files changed, 184 insertions(+), 79 deletions(-) diff --git a/ng6-seed/package.json b/ng6-seed/package.json index 918c0c9..c9fb365 100755 --- a/ng6-seed/package.json +++ b/ng6-seed/package.json @@ -3,8 +3,8 @@ "version": "0.0.0", "license": "MIT", "scripts": { - "production": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --prod --build-optimizer=true --base-href /salespdpwa/", - "staging": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --prod --configuration=staging --base-href /salespdpwa/", + "production": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --prod --build-optimizer=true --base-href", + "staging": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --prod --configuration=staging --base-href", "ng": "ng", "start": "ng serve", "build": "ng build", diff --git a/ng6-seed/src/app/sales-pd/components/ques-template/capture-btn/capture-btn.component.html b/ng6-seed/src/app/sales-pd/components/ques-template/capture-btn/capture-btn.component.html index df2be95..78fda35 100644 --- a/ng6-seed/src/app/sales-pd/components/ques-template/capture-btn/capture-btn.component.html +++ b/ng6-seed/src/app/sales-pd/components/ques-template/capture-btn/capture-btn.component.html @@ -1,4 +1,4 @@ - diff --git a/ng6-seed/src/app/sales-pd/components/ques-template/capture-btn/capture-btn.component.ts b/ng6-seed/src/app/sales-pd/components/ques-template/capture-btn/capture-btn.component.ts index bd85d91..1d9c4a6 100644 --- a/ng6-seed/src/app/sales-pd/components/ques-template/capture-btn/capture-btn.component.ts +++ b/ng6-seed/src/app/sales-pd/components/ques-template/capture-btn/capture-btn.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit, Output, EventEmitter, Input } from '@angular/core'; import { Ng2ImgMaxService } from 'ng2-img-max'; +import { LoaderService } from 'app/shared/loaderService/loader.service'; @Component({ selector: 'app-capture-btn', @@ -11,19 +12,27 @@ export class CaptureBtnComponent implements OnInit { @Input() addMoreBtn; @Output() imageDataEmitter = new EventEmitter @Output() singleDataEmitter = new EventEmitter + sales_pd_type: string; - constructor(private ng2ImgMax:Ng2ImgMaxService) { } + constructor(private ng2ImgMax:Ng2ImgMaxService,private loaderService:LoaderService) { + this.sales_pd_type = localStorage.getItem('sales_pd_type') + console.log(this.sales_pd_type) + } ngOnInit(): void { console.log(this.addMoreBtn) } capturedImage(event){ + this.loaderService.showMatSpinnerDialog('Fetching Data...') console.log(event); let imageData= event.target.files[0] + this.ng2ImgMax.resizeImage(imageData, 450, 650).subscribe( result => { + this.imageDataEmitter.emit(result) - this.singleDataEmitter.emit(result) + this.singleDataEmitter.emit(result) + this.loaderService.closeMatSpinnerDialog() }, error => { console.log('😢 Oh no!', error); diff --git a/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.html b/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.html index ec59452..4dfc25f 100755 --- a/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.html +++ b/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.html @@ -9,14 +9,20 @@
- - + {{parent_ques.get('question').value}} - + + > --> + {{"₹"}}{{parent_ques.get('answer_value').value | numberToWords}} @@ -52,7 +58,6 @@ {{validation.message}}
- {{parent_ques.get('question').value}} @@ -63,7 +68,7 @@ {{validation.message}} - +
@@ -77,8 +82,8 @@
- - + +
@@ -102,20 +107,21 @@ -->
-
- + {{validation.message}} - - + --> + {{parent_ques.get('question').value}} - @@ -178,9 +184,16 @@ {{single_ques.get('question').value}} - + autocomplete="off" (change)="onChangeProperty($event,single_ques,group_ques,2,s_i)"> + {{"₹"}}{{single_ques.get('answer_value').value | numberToWords}} @@ -230,8 +243,11 @@ {{single_ques.get('question').value}} - + {{validation.message}} @@ -263,8 +279,14 @@ {{single_ques.get('subfield_caption').value}} - + + @@ -400,8 +422,14 @@ {{parent_ques.get('subfield_caption').value}} - + + diff --git a/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.scss b/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.scss index 021894a..07ea1f7 100755 --- a/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.scss +++ b/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.scss @@ -46,3 +46,29 @@ // background-color: red; // } } +// textarea.mat-input-element { +// overflow: hidden !important; +// } +::ng-deep .mat-select-value-text{ + line-height: initial !important; + word-wrap: break-word !important; + white-space: pre-wrap !important; +} +::ng-deep .mat-select-value-text { + margin: 1rem 0; + overflow: visible; + line-height: initial; + word-wrap: break-word; + white-space: pre-wrap; + } + + .mat-option-text.mat-option-text { + white-space: normal; + } + ::ng-deep .mat-select-panel mat-option.mat-option { + height: unset; + } + + ::ng-deep .mat-option-text.mat-option-text { + white-space: normal; + } \ No newline at end of file diff --git a/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.ts b/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.ts index 6aadb1e..87eae8c 100755 --- a/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.ts +++ b/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.ts @@ -9,6 +9,7 @@ import { FormGroup, FormArray, FormBuilder, FormControl,FormControlName } from ' import { NotifierService } from 'angular-notifier'; import { takeUntil, single } from 'rxjs/operators'; import { Subject } from 'rxjs'; +import { CdkTextareaAutosize } from '@angular/cdk/text-field'; //import { LoadingProvider } from '../../../../providers/common-provider/loading'; //import { NavController } from 'ionic-angular/navigation/nav-controller'; import { Section9, Section1, Section2, Section3, Section4, Section5, Section6, Section7, Section8 } from '../../home/home'; @@ -62,6 +63,7 @@ export class QuesTemplateComponent { original_result_data: any={is_complete:''}; // spinner_access:boolean=false raw_data_Section: any={status:''}; + @ViewChild('autosize') autosize: CdkTextareaAutosize; @ViewChild('accordion') Accordion: MatAccordion @ViewChild('mapanel') matExpansionPanel:MatExpansionPanel @Output() imageDataEmitter = new EventEmitter @@ -109,7 +111,7 @@ export class QuesTemplateComponent { if(raw_data_ques.hasOwnProperty('sections') ){ console.log("FROM COMPONENT",this.questions_JSON); - //this.local_ques_JSON={"section_id":"1","section_name":"General Section","onsubmit":null,"questions":[{"question":"Name of The Main Loan Applicant","question_key":"main_loan_applicant","place_holder":"Enter text","type":"1","answers":null,"api_properties":null,"is_repeatable":null,"field_type":"string","validations":[{"name":"required","isactive":"1","validator":"Validators.required","message":"Main Loan Applicant Name Required","value":null},{"name":"pattern","isactive":"1","validator":"[A-Za-z ]*","message":"alphabets only ","value":null}],"onchange_properties":null},{"question":"Name of the Company/Firm","question_key":"company_name","place_holder":"Enter text","type":"1","answers":null,"api_properties":null,"onchange_properties":null,"is_repeatable":null,"field_type":"string","validations":[{"name":"required","isactive":"1","validator":"Validators.required","message":"Company Name Required","value":null}]},{"question":"Name of Person Met during visit","question_key":"person_met_during_visit","place_holder":"Enter text","type":"1","answers":null,"api_properties":null,"onchange_properties":null,"is_repeatable":null,"field_type":"string","validations":[{"name":"required","isactive":"1","validator":"Validators.required","message":"Person Met Name Required","value":null},{"name":"pattern","isactive":"1","validator":"[A-Za-z ]*","message":"alphabets only ","value":null}]},{"question":"Address Visited","question_key":"address_visited","place_holder":"Enter door no,street","type":"1","answers":null,"api_properties":null,"onchange_properties":null,"is_repeatable":null,"field_type":"string","validations":[{"name":"required","isactive":"1","validator":"Validators.required","message":"Address Required","value":null}]},{"question":"State","question_key":"state","type":"8","answers":null,"api_properties":{"api":"getListOfMaster","api_method":"POST","params":{"master_name":"STATE"},"fields":["state_id","name"]},"onchange_properties":[{"purpose":"api","api":"getListOfStatesAndCities","api_method":"POST","params":"{records:{state_id:'value_of_answer'}}","fields":["state_id","name"],"local_variable":"local_city"}],"is_repeatable":null,"validations":[{"name":"required","isactive":"1","validator":"Validators.required","message":"State Required","value":null}]},{"question":"City","question_key":"city","type":"8","answers":null,"api_properties":"local_city","onchange_properties":null,"is_repeatable":null,"validations":[{"name":"required","isactive":"1","validator":"Validators.required","message":"CIty Required","value":null}]},{"question":"Pincode","question_key":"pincode","type":"8","answers":null,"api_properties":"local_pincode","onchange_properties":[{"purpose":"FORM_CTRL","form_controls":[{"insert_index":"pincode","expression":"(pincode == 1)","value_keys":["pincode"],"questions":[{"question_key":"pincode_others","question":"Specify the Pincode","place_holder":"Enter the Pincode","type":"1","api_properties":null,"answers":null,"onchange_properties":null,"is_repeatable":null,"field_type":"num","validations":[{"name":"required","isactive":"1","validator":"Validators.required","message":"Pincode is Required","value":null},{"name":"pattern","isactive":"1","validator":"[0-9]{6}","message":"Pincode should be 6 digit","value":null}]}]}]}],"is_repeatable":null,"validations":[{"name":"required","isactive":"1","validator":"Validators.required","message":"Pincode Required","value":null}]}],"order_id":1} + this.local_ques_JSON=this.questions_JSON; if(this.local_ques_JSON.section_id == raw_data_ques.sections[raw_data_ques.sections.length -1].section_id){ this.submit_btn=true @@ -117,8 +119,9 @@ export class QuesTemplateComponent { } console.log('99',this.local_ques_JSON.section_id) - this.quesAnsForm=this.questionService.assignFormControl_array(this.quesAnsForm,this.local_ques_JSON.questions) + this.quesAnsForm = this.questionService.assignFormControl_array(this.quesAnsForm,this.local_ques_JSON.questions) console.log(this.quesAnsForm); + // localStorage.setItem('sales_pd_id_PRIMARYKEY', 'null') let key_value = localStorage.getItem('sales_pd_id_PRIMARYKEY') @@ -161,7 +164,7 @@ this.sales_pd_type = localStorage.getItem('sales_pd_type') getSalesPDSectionFromApi(sales_pd_id){ // alert('pass'); console.log(sales_pd_id) - this.loaderService.showMatSpinnerDialog('Fetching Data...') + // this.loaderService.showMatSpinnerDialog('Fetching Data...') // this.checkGroupandPatchValues() // this.loadingProvider.pdloader("Fetching Data...") let params={sales_pd_id:sales_pd_id,section_id:this.local_ques_JSON.section_id} @@ -187,7 +190,8 @@ this.sales_pd_type = localStorage.getItem('sales_pd_type') // FOR DISPLAYING THE CUSTOMER CAPTURED IMAGE (STRUCTURED DYNAMICALLY CREATED IN FRONTEND) (***TELE PD ONLY***) if(sales_pd_id && this.sales_pd_type && this.sales_pd_type == '2' && this.local_ques_JSON.section_id == '9' && !this. sales_pd_id.includes('local')) { - this.SalesPdService.getData_fromLocal('sales_rand_string').then((sales_rand_string)=>{ + let sales_rand_string = localStorage.getItem('sales_rand_string') + // this.SalesPdService.getData_fromLocal('sales_rand_string').then((sales_rand_string)=>{ let params = {"rand_string":sales_rand_string} this.SalesPdService.getSalesPDImgDataCusLink(params).subscribe(result=>{ if(result['dataStatus']){ @@ -198,7 +202,7 @@ this.sales_pd_type = localStorage.getItem('sales_pd_type') },err=>{ this.loaderService.closeMatSpinnerDialog() }) - }) + // }) } else{ // alert('5th'); @@ -1319,6 +1323,7 @@ this.proceedonChangeProperty(modified) return updateMsg; } onSubmitProperty(sales_pd_id = this.sales_pd_id){ + // this.loaderService.showMatSpinnerDialog('Please wait...') console.log(this.sales_pd_id) let return_val=[] let send_val:boolean=true @@ -1640,6 +1645,9 @@ this.proceedonChangeProperty(modified) // } } sendSectiontoApi(params){ + setTimeout(()=>{ + this.loaderService.showMatSpinnerDialog('Please wait...') + },1200) // alert('lastsave'); console.log('lastsave'); console.log(params); @@ -1649,7 +1657,7 @@ this.proceedonChangeProperty(modified) if(response.dataStatus){ console.log('response',response); // alert('saved successfully'); - this.loaderService.closeMatSpinnerDialog() + // this.loaderService.closeMatSpinnerDialog() this.notifier.notify("success","Saved Successfully"); // let product_id=localStorage.getItem('product_id_salesPD') // this.router.navigate(['../../sectionlist',product_id,this.sales_pd_type],{ relativeTo: this.route }) @@ -1780,7 +1788,7 @@ this.proceedonChangeProperty(modified) // this.navCtrl.pop(); // }) } - this.loaderService.closeMatSpinnerDialog(); + // this.loaderService.closeMatSpinnerDialog(); this.loaderService.closeMatSpinnerDialog() },err=>{ this.loaderService.closeMatSpinnerDialog(); diff --git a/ng6-seed/src/app/sales-pd/components/ques-template/single-capture-btn/single-capture-btn.component.html b/ng6-seed/src/app/sales-pd/components/ques-template/single-capture-btn/single-capture-btn.component.html index ccd091d..2c203d7 100644 --- a/ng6-seed/src/app/sales-pd/components/ques-template/single-capture-btn/single-capture-btn.component.html +++ b/ng6-seed/src/app/sales-pd/components/ques-template/single-capture-btn/single-capture-btn.component.html @@ -1,4 +1,4 @@ - diff --git a/ng6-seed/src/app/sales-pd/components/ques-template/single-capture-btn/single-capture-btn.component.ts b/ng6-seed/src/app/sales-pd/components/ques-template/single-capture-btn/single-capture-btn.component.ts index 189d9bf..3f30d62 100644 --- a/ng6-seed/src/app/sales-pd/components/ques-template/single-capture-btn/single-capture-btn.component.ts +++ b/ng6-seed/src/app/sales-pd/components/ques-template/single-capture-btn/single-capture-btn.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit, Output, EventEmitter, Input } from '@angular/core'; import { Ng2ImgMaxService } from 'ng2-img-max'; +import { LoaderService } from 'app/shared/loaderService/loader.service'; @Component({ selector: 'app-single-capture-btn', @@ -12,19 +13,26 @@ export class SingleCaptureBtnComponent implements OnInit { @Input() addMoreBtn; @Output() singleDataEmitter = new EventEmitter + sales_pd_type: string; - constructor(private ng2ImgMax:Ng2ImgMaxService) { } + constructor(private ng2ImgMax:Ng2ImgMaxService,private loaderService:LoaderService) { + this.sales_pd_type = localStorage.getItem('sales_pd_type') + console.log(this.sales_pd_type) + } ngOnInit(): void { console.log(this.addMoreBtn) } singlecapturedImage(event){ + this.loaderService.showMatSpinnerDialog('Fetching Data...') console.log(event); let imageData= event.target.files[0] + this.ng2ImgMax.resizeImage(imageData, 450, 650).subscribe( result => { this.singleDataEmitter.emit(result) + this.loaderService.closeMatSpinnerDialog() }, error => { console.log('😢 Oh no!', error); diff --git a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts index f34a951..206fe48 100644 --- a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts +++ b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts @@ -63,7 +63,7 @@ export class SalesPdComponent implements OnInit { this.is_sales_login = false this.getListofPD() } - },1000) + },2000) setTimeout(()=>{ this.common = JSON.parse(localStorage.getItem('commonSettings')) diff --git a/ng6-seed/src/app/sales-pd/section-list/section-list.component.html b/ng6-seed/src/app/sales-pd/section-list/section-list.component.html index c97fff1..96cca85 100644 --- a/ng6-seed/src/app/sales-pd/section-list/section-list.component.html +++ b/ng6-seed/src/app/sales-pd/section-list/section-list.component.html @@ -6,13 +6,20 @@

Section List

+ +    + + + - diff --git a/ng6-seed/src/app/sales-pd/section-list/section-list.component.ts b/ng6-seed/src/app/sales-pd/section-list/section-list.component.ts index 4976351..154d2d3 100644 --- a/ng6-seed/src/app/sales-pd/section-list/section-list.component.ts +++ b/ng6-seed/src/app/sales-pd/section-list/section-list.component.ts @@ -392,9 +392,11 @@ export class SectionListComponent implements OnInit { this.getSectionStats() this.loadTemplates(this.product_id,2,this.sales_pd_type); // } - if(dataresult.is_completed == true){ - console.log('396') - this.loadPdViewCompoent() + if(dataresult != undefined){ + if(dataresult.hasOwnProperty('is_completed') && dataresult.is_completed == true){ + console.log('396') + this.loadPdViewCompoent() + } } }); // setTimeout(()=>{ @@ -440,23 +442,24 @@ export class SectionListComponent implements OnInit { // } // }) // } -// copyToClipBoard(message,user_msg?) { -// const selBox = document.createElement('textarea'); -// selBox.style.position = 'fixed'; -// selBox.style.left = '0'; -// selBox.style.top = '0'; -// selBox.style.opacity = '0'; -// selBox.value = message; -// document.body.appendChild(selBox); -// selBox.focus(); -// selBox.select(); -// document.execCommand('copy'); -// document.body.removeChild(selBox); -// if(message == '') { -// user_msg = "Something went wrong" -// } -// this.toastProvider.lenderappmessage(user_msg) -// } +copyToClipBoard(message,user_msg?) { + const selBox = document.createElement('textarea'); + selBox.style.position = 'fixed'; + selBox.style.left = '0'; + selBox.style.top = '0'; + selBox.style.opacity = '0'; + selBox.value = message; + document.body.appendChild(selBox); + selBox.focus(); + selBox.select(); + document.execCommand('copy'); + document.body.removeChild(selBox); + if(message == '') { + user_msg = "Something went wrong" + } + this.notifier.notify("warning",user_msg); + // this.toastProvider.lenderappmessage(user_msg) +} // shareViaSMS() { // this.socialSharing.shareViaSMS(this.customer_link_with_text,'').then(result=>{ diff --git a/ng6-seed/src/app/sales-pd/services/question-service.service.ts b/ng6-seed/src/app/sales-pd/services/question-service.service.ts index 39b2c47..17a3c34 100644 --- a/ng6-seed/src/app/sales-pd/services/question-service.service.ts +++ b/ng6-seed/src/app/sales-pd/services/question-service.service.ts @@ -9,7 +9,8 @@ import { FormGroup, FormControl, FormArray, FormBuilder, Validators } from '@ang //import { SalesPdProvider } from '../sales-pd/sales-pd'; import { DatePipe } from '@angular/common'; -import { SalesPdService } from './sales-pd.service'; +import { SalesPdService } from './sales-pd.service';2 +import { ApiServiceService } from 'app/lender-credit-pd/services/apiService/api-service.service'; const api_url = environment.apiEndpoint; @Injectable({ providedIn: 'root' @@ -17,13 +18,13 @@ const api_url = environment.apiEndpoint; export class QuestionServiceService { datepipe: DatePipe; curr_pd_info: any; - constructor(public http: HttpClient,private _fb:FormBuilder,private salesPDProvider:SalesPdService) { + constructor(public http: HttpClient,private _fb:FormBuilder,private salesPDProvider:SalesPdService,private apiService:ApiServiceService) { this.datepipe=new DatePipe('en-US') } // FOR CREATING A FORM CONTROL DYNAMICALLY assignFormControl_array(formgroup: FormGroup, ques_data: any) { // alert('question'); - // this.curr_pd_info = this.apiService.curr_credit_pd_data + this.curr_pd_info = this.apiService.curr_credit_pd_data console.log(formgroup, ques_data) const control: any = formgroup.get('questions') as FormArray ques_data.forEach((val, index) => { @@ -54,7 +55,7 @@ export class QuestionServiceService { // console.log(param) group_indi.raw_validations = group_indi.validations sub_childControl.push(this.createValue(group_indi)) - this.addAdditionalControl(group_indi, sub_childControl, arr_index) + this.addAdditionalControl(group_indi,sub_childControl,arr_index) // if(group_indi.type == '5'){ // sub_childControl.controls[arr_index].removeControl('answer_value'); // console.log("loop",arr_index,sub_childControl); @@ -143,9 +144,11 @@ export class QuestionServiceService { // control.push(this.createValue(val)) // } console.log(formgroup) - + } + console.log('149') }, err => console.log(err)) + console.log('151') return formgroup } // END OF FORM CREATION @@ -279,12 +282,14 @@ export class QuestionServiceService { //FOR CHECKBOX CHANGE THE VALUE STORAGE AS ARRAY if(data.type == '5'){ + console.log('305') curr_control.controls[curr_index].removeControl('answer_value'); curr_control.controls[curr_index].addControl('answer_value',this._fb.array([])) } //FOR numeric of string field if(data.type == '1'){ + console.log('292') curr_control.controls[curr_index].addControl('field_type',new FormControl(data.field_type)) curr_control.controls[curr_index].addControl('place_holder',new FormControl(data.place_holder)) } @@ -305,24 +310,35 @@ export class QuestionServiceService { } if(data.hasOwnProperty('question_enable') && data.question_enable != null && data.question_enable) { + console.log('313',data.hasOwnProperty('question_enable') && data.question_enable != null && data.question_enable) let expression= data.question_enable; console.log("Check started",expression,expression.includes('PD_FORM_VALUES')); if(expression.includes('PD_FORM_VALUES')) { + console.log('311',expression.includes('PD_FORM_VALUES')) let sales_pd_id = localStorage.getItem('sales_pd_id_PRIMARYKEY') + console.log('319',sales_pd_id) // this.salesPDProvider.getData_fromLocal('sales_pd_id_PRIMARYKEY').then(sales_pd_id => { - if(sales_pd_id) { - let PD_FORM_VALUES = localStorage.getItem('PD_FORM_VALUES-'+sales_pd_id) - if(PD_FORM_VALUES) { - PD_FORM_VALUES = JSON.parse(PD_FORM_VALUES) - // expression = expression.split('PD_FORM_VALUES').join(local_pd_form_values) - console.log("ex",expression) - let result = eval(expression) - console.log(result); - if(!result) { - curr_control.removeAt(curr_index); - } + setTimeout(()=>{ + if(sales_pd_id) { + console.log('322',sales_pd_id) + let PD_FORM_VALUES = localStorage.getItem('PD_FORM_VALUES-'+sales_pd_id) + console.log('324',PD_FORM_VALUES) + if(PD_FORM_VALUES) { + console.log('326',PD_FORM_VALUES) + PD_FORM_VALUES = JSON.parse(PD_FORM_VALUES) + console.log('328',PD_FORM_VALUES) + // expression = expression.split('PD_FORM_VALUES').join(local_pd_form_values) + console.log("ex",expression) + let result = eval(expression) + console.log(result); + if(!result) { + console.log('324',!result,curr_control.removeAt(curr_index)) + curr_control.removeAt(curr_index); + } + } } - } + },500) + // }) } // expression = expression.split(res).join(control_value_obj.answer_value) @@ -334,7 +350,7 @@ export class QuestionServiceService { // FOR SETTING THE ARRAY OF VALIDATORS COMING FROM JSON Temp, settingArrayofValidators(data,curr_control,curr_index){ - console.log("entered 334",data); + console.log("entered 334",data,curr_control,curr_index); if(data.hasOwnProperty('validations') && data.validations.length > 0 ){ const validList :any= []; let validator_value @@ -361,7 +377,7 @@ export class QuestionServiceService { console.log( '358',validList) // curr_control.controls[curr_index].controls.answer_value.setValidators(validList) curr_control.controls.answer_value.setValidators(validList) - console.log("ddvdeeqq 361",validList) + console.log("ddvdeeqq 361", curr_control.controls.answer_value.setValidators(validList),validList) curr_control.controls.answer_value.updateValueAndValidity() console.log("after setting validators 363",curr_control) } diff --git a/ng6-seed/src/app/sales-pd/services/sales-pd.service.ts b/ng6-seed/src/app/sales-pd/services/sales-pd.service.ts index edbc5f4..673eef4 100644 --- a/ng6-seed/src/app/sales-pd/services/sales-pd.service.ts +++ b/ng6-seed/src/app/sales-pd/services/sales-pd.service.ts @@ -346,7 +346,7 @@ getData_fromLocal(key){ // console.log("all key in storage",this.storage.keys()) return key; // return this.storage.get(key); - // return localStorage.getItem(key); + // return localStorage.getItem(key) } getSalesPdpdf(pdfdetail): Observable { return this._http.get(api_url + "downloadSalesPDReport/" + pdfdetail)