-->
-
+
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 6406a8c..84bb614 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
@@ -1,4 +1,4 @@
-import { Component, Input, EventEmitter, Output,ViewChild, ElementRef } from '@angular/core';
+import { Component, Input, EventEmitter, Output,ViewChild, ElementRef, OnDestroy, HostListener } from '@angular/core';
import { FormGroup, FormArray, FormBuilder, FormControl,FormControlName } from '@angular/forms';
//import { QuesServiceProvider } from '../../providers/ques-service/ques-service';
//import { SalesPdService } from '../../providers/sales-pd/sales-pd';
@@ -45,9 +45,10 @@ import { ImageEditComponent } from './image-edit/image-edit.component';
templateUrl: 'ques-template.html',
styleUrls: ['ques-template.scss']
})
-export class QuesTemplateComponent {
+export class QuesTemplateComponent implements OnDestroy {
photoStructure = photoJSONStructure
text: string;
+ @Output() login = new EventEmitter
();
private notifier: NotifierService;
// notifier: NotifierService;
@Input() questions_JSON:any;
@@ -87,6 +88,15 @@ export class QuesTemplateComponent {
local_city1: any;
local_pincode1: any;
role_id: any;
+ disable_capture:any=false;
+
+
+// @HostListener('window:unload', ['$event'])
+// unloadHandler(event) {
+// console.log('window:unload');
+// this.Destroy()
+
+
constructor( private cameraService: CameraService,public dialogRef: MatDialogRef,private route: ActivatedRoute,private router: Router,private dialog:MatDialog,private _fb:FormBuilder,private questionService:QuestionServiceService,private SalesPdService:SalesPdService,notifier: NotifierService,private loaderService:LoaderService) {
this.role_id = localStorage.getItem('LenderRoleID')
console.log('Hello QuesTemplateComponent Component');
@@ -99,6 +109,10 @@ export class QuesTemplateComponent {
console.log(this.roleID)
}
+ @HostListener("window:beforeunload", ["$event"]) unloadHandler(event: Event) {
+ console.log("Processing beforeunload...", );
+ this.Destroy();
+ }
ngOnChanges(){
//alert('abi');
@@ -184,7 +198,11 @@ this.pdstatus = status.status
console.log(this.pdstatus)
// alert('pass');
console.log(sales_pd_id)
+ if(sales_pd_id == null){
+ sales_pd_id = status.sales_pd_id
+ }
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}
@@ -194,27 +212,34 @@ console.log(this.pdstatus)
console.log(response);
if(response['dataStatus']){
// alert('3rd');
+ console.log('response1');
+ this.disable_capture = false
+ localStorage.setItem('disable_capture','false')
this.raw_data_Section=response['records'][0]
this.original_result_data=response['records'][0].section_data
this.original_result_data=JSON.parse(this.original_result_data);
console.log(this.original_result_data)
- console.log(response['records'][0].section_data)
+ console.log(JSON.parse(response['records'][0].section_data))
// this.original_result_data.questions=this.original_result_data.questions.filter(val=>val.question_key == 'selfie_with_person_met')
this.checkGroupandPatchValues()
this.loaderService.closeMatSpinnerDialog()
}
- else{
+ else{
+ this.disable_capture = false
+
// alert('4th');
this.sendAutomaticallyToApi()
// FOR DISPLAYING THE CUSTOMER CAPTURED IMAGE (STRUCTURED DYNAMICALLY CREATED IN FRONTEND) (***TELE PD ONLY***)
-
+ console.log(sales_pd_id , this.sales_pd_type , this.sales_pd_type == '2', this.local_ques_JSON.section_id ,this. sales_pd_id.includes('local'))
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')) {
let sales_rand_string = localStorage.getItem('sales_rand_string')
+ console.log('response2');
// 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']){
+ this.disable_capture = true
this.updateCustomerImages(result['records'])
this.checkGroupandPatchValues()
}
@@ -225,7 +250,28 @@ console.log(this.pdstatus)
// })
}
else{
+ console.log('response3');
// alert('5th');
+ const role = JSON.parse(localStorage.getItem("user_role"));
+
+ if (role == "20" && this.local_ques_JSON.section_id == '9' ) {
+ 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']){
+ //this.disable_capture = true
+ // localStorage.setItem('disable_capture','true')
+ console.log(result['records']);
+ this.original_result_data = []
+ this.updateCustomerImages(result['records'])
+ this.checkGroupandPatchValues()
+ }
+ this.loaderService.closeMatSpinnerDialog()
+ },err=>{
+ this.loaderService.closeMatSpinnerDialog()
+ })
+ }
this.loaderService.closeMatSpinnerDialog()
}
}
@@ -296,7 +342,11 @@ console.log(this.pdstatus)
current_control_obj = createPhotoStructure[findRootIndex]
console.log(createPhotoStructure[findRootIndex],createPhotoStructure[findRootIndex].is_repeatable)
if(img_obj.is_multiple != '1'){
+ // location = element.image_location
+ // imgid = element.image_id
current_control_obj.answer_value = img_obj.img_url
+ current_control_obj.image_location = img_obj.location
+ current_control_obj.image_id = img_obj.img_id
}
else {
if(img_obj.hasOwnProperty('img_data') && img_obj.img_data.length > 0) {
@@ -325,6 +375,8 @@ console.log(this.pdstatus)
temp_obj.question = img_obj.img_name
temp_obj.question_key = img_obj.img_key
temp_obj.answer_value = multi_obj.img_url
+ temp_obj.image_location = multi_obj.location
+ temp_obj.image_id = multi_obj.img_id
// console.log(temp_obj);
// debugger;
// current_control_obj.questions_group.unshift({questions:[temp_obj]})
@@ -344,7 +396,7 @@ console.log(this.pdstatus)
}
}
- proceedonChangeProperty(local_value_obj?){
+ proceedonChangeProperty(local_value_obj?){
console.log("On Change Property",this.quesAnsForm.value.questions);
this.quesAnsForm.controls.questions['controls'].forEach((val,p_i)=>{
@@ -412,6 +464,7 @@ console.log(this.pdstatus)
// JSON QUESTION CHANGE FOR GROUP
// setTimeout(()=>{
+ console.log(JSON.parse(this.original_result_data.section_data))
let form_c=single_ques
let form_control=this.quesAnsForm.value.questions[p_i].questions_group[g_i].questions[s_i]
let local__g_data=this.original_result_data.questions[p_i].questions_group[g_i].questions
@@ -421,6 +474,7 @@ console.log(this.pdstatus)
}
}
+
// })
//---- END OF JSON QUESTION CHANGE----
})
@@ -457,12 +511,16 @@ console.log(this.pdstatus)
}
}
})
+ setTimeout(() => {
+
+
this.proceedonChangeProperty(modified)
this.quesAnsForm.get('questions').patchValue(this.original_result_data.questions);
console.log( this.quesAnsForm)
+ }, 500);
}
setStep(index: number) {
this.step = index;
@@ -511,6 +569,9 @@ this.proceedonChangeProperty(modified)
this.tmp_control = this.questionService
this.current_index = index;
+ console.log( this.current_index)
+
+ console.log( this.current_index)
}
addImage(event, index, parent_index, data,single_ques1) {
this.loaderService.showMatSpinnerDialog('Fetching Data...')
@@ -535,7 +596,13 @@ this.proceedonChangeProperty(modified)
console.log(single_ques)
console.log(event, index);
this.imageData = this.quesAnsForm.value.questions
-
+ this.imageData.forEach(element => {
+ if(element.question_key == this.tmp[0].value.question_key){
+ index= this.imageData.indexOf(element)
+ }
+
+ });
+ console.log('index', index,this.current_index);
console.log(this.quesAnsForm.value.questions)
// console.log(this.questions_JSON.questions)
console.log(this.imageData);
@@ -554,40 +621,48 @@ this.proceedonChangeProperty(modified)
console.log(geoCords);
console.log(this.imageData);
console.log(this.current_index);
- this.cameraService.addWatermarks(reader.result, geoCoordinates).then(watermarked_img => {
- if (this.current_index != 'last') {
- if (this.imageData[this.current_index].is_multiple == 1) {
- console.log('multi');
- let img_param = {img_url: watermarked_img, is_base64: true, link: geoCoordinates};
- this.imageData[this.current_index].img_data.push(img_param);
- console.log(this.imageData)
- // this.sendImage(this.imageData, this.imageData[this.current_index].img_data.length - 1);
- } else {
- this.imageData[this.current_index].img_url = watermarked_img;
- this.imageData[this.current_index].is_base64 = true;
- this.imageData[this.current_index].link = geoCoordinates;
- console.log(this.imageData)
- // this.sendImage(this.imageData);
- }
- } else {
- this.getImageName().then(result => {
- console.log(result);
- this.imageData.push( {
- img_key: 'common_image',
- img_name:this.tmp[0].value.group_title,
- img_url: watermarked_img,
- fk_form_id: '',
- is_base64: true,
- link: geoCoordinates
+ this.imageData = this.quesAnsForm.value.questions
+ let tmp_index;
+ this.imageData.forEach(element => {
+ if(element.question_key == this.tmp[0].value.question_key){
+ tmp_index= this.imageData.indexOf(element)
+ }
+
});
- // let el = document.getElementById('dummy-img-more');
- // el.scrollIntoView();
- setTimeout(() => {
- this.dummyImgMoreRef.nativeElement.scrollIntoView({behavior: 'smooth', block: 'end'});
- }, 1000);
- // this.sendImage(this.imageData);
- });
- }
+ this.cameraService.addWatermarks(reader.result, geoCoordinates).then(watermarked_img => {
+ // if (this.current_index != 'last') {
+ // if (this.imageData[this.current_index].is_multiple == 1) {
+ // console.log('multi');
+ // let img_param = {img_url: watermarked_img, is_base64: true, link: geoCoordinates};
+ // this.imageData[this.current_index].img_data.push(img_param);
+ // console.log(this.imageData)
+ // // this.sendImage(this.imageData, this.imageData[this.current_index].img_data.length - 1);
+ // } else {
+ // this.imageData[this.current_index].img_url = watermarked_img;
+ // this.imageData[this.current_index].is_base64 = true;
+ // this.imageData[this.current_index].link = geoCoordinates;
+ // console.log(this.imageData)
+ // // this.sendImage(this.imageData);
+ // }
+ // } else {
+ // this.getImageName().then(result => {
+ // console.log(result);
+ // this.imageData.push( {
+ // img_key: 'common_image',
+ // img_name:this.tmp[0].value.group_title,
+ // img_url: watermarked_img,
+ // fk_form_id: '',
+ // is_base64: true,
+ // link: geoCoordinates
+ // });
+ // // let el = document.getElementById('dummy-img-more');
+ // // el.scrollIntoView();
+ // setTimeout(() => {
+ // this.dummyImgMoreRef.nativeElement.scrollIntoView({behavior: 'smooth', block: 'end'});
+ // }, 1000);
+ // // this.sendImage(this.imageData);
+ // });
+ // }
console.log(watermarked_img);
console.log(single_ques.controls)
console.log(single_ques.value.question)
@@ -656,7 +731,8 @@ this.proceedonChangeProperty(modified)
parent_index
control.push(this._fb.group({ 'questions': this._fb.array([]) }))
- let sub_childControl: any = control.controls[this.current_index + 1].get('questions') as FormArray
+ console.log(control)
+ let sub_childControl: any = control.controls[this.current_index+1].get('questions') as FormArray
console.log(sub_childControl)
console.log(data)
@@ -1750,7 +1826,14 @@ this.proceedonChangeProperty(modified)
// alert('lastsave');
console.log('lastsave');
console.log(params);
+ if(params.section_id == 9 || this.local_ques_JSON.section_id == 9){
+ params.questions = this.key_set(params.questions)
+ }
+ console.log(params);
console.log('1158',this.local_ques_JSON.section_id)
+ setTimeout(() => {
+
+
this.SalesPdService.saveSalesPDSection(params).subscribe(response=>{
if(this.local_ques_JSON.section_id != 9){
if(response.dataStatus){
@@ -1771,6 +1854,7 @@ this.proceedonChangeProperty(modified)
}
}
},err=>this.loaderService.closeMatSpinnerDialog())
+ }, 1000);
// this.loaderService.closeMatSpinnerDialog()
}
sendDatatoApi(section_data?){
@@ -1995,6 +2079,45 @@ this.proceedonChangeProperty(modified)
this.sendSectiontoApi(sectionApi_param)
}
}
+ Destroy(){
+ // console.clear()
+ console.log("dirty check",this.quesAnsForm.dirty)
+ if(this.local_ques_JSON.section_id == 9 && this.emittedFormGroup != null){
+ // FOR SENDING THE IMAGE SECTION (SECTION ID 9) JSON Structure
+ let form_structure=this.quesAnsForm.getRawValue().questions
+ form_structure.forEach((parent_ques,p_index, p_object)=>{
+ if(parent_ques.hasOwnProperty('is_repeatable') && parent_ques.is_repeatable != '1'){
+ if(parent_ques.answer_value != '' && parent_ques.answer_value != null){
+ //parent_ques.answer_value = 'SAVED'
+ if(parent_ques.is_loader == false && parent_ques.is_saved == false){
+ p_object.splice(p_index,1)
+ }
+ }
+ }
+ else{
+ parent_ques.questions_group.forEach((group_ques,g_index,g_object)=>{
+ group_ques.questions.forEach((single_ques,s_index, s_object)=>{
+ if(single_ques.answer_value != '' && single_ques.answer_value != null){
+ // single_ques.answer_value = 'SAVED'
+ if(single_ques.is_loader == false && single_ques.is_saved == false){
+ // single_ques.is_saved = ''
+ // single_ques.is_loader = ''
+ // single_ques.is_image_status=false
+ g_object.splice(g_index,1)
+ // delete parent_ques.questions_group[g_index]
+ }
+ }
+ })
+ })
+ }
+ })
+
+ let sectionApi_param=this.questions_JSON
+ sectionApi_param.questions=form_structure
+ sectionApi_param.is_complete=1
+ this.sendSectiontoApi(sectionApi_param)
+ }
+ }
imageReupload(single_ques){
let storage_param=this.questions_JSON
@@ -2097,7 +2220,7 @@ this.proceedonChangeProperty(modified)
//pic.pdid = this.pdid;
const imageRef = this.dialog.open(ImageEditComponent, {
// const imageRef = this.dialog.open(CropToolsComponent, {
- data: {'json':this.questions_JSON,img:pic,'sales_pd_id':modified.sales_pd_id,'question_key':key,'location':location,'img_id':imgid},
+ data: {'json':this.questions_JSON,img:pic,'sales_pd_id':this.sales_pd_id,'question_key':key,'location':location,'img_id':imgid},
maxWidth: '100vw',
maxHeight: '100vh',
height: '200%',
@@ -2107,8 +2230,49 @@ this.proceedonChangeProperty(modified)
.subscribe(dataresult => {
if (dataresult == 1) {
this.notifier.notify("success","Image Saved Successfully");
- this.getSalesPDSectionFromApi(modified.sales_pd_id)
+ this.emitter.emit('1');
+ this.SalesPdService.nav_close.next(1);
+
+ //this.getSalesPDSectionFromApi(modified.sales_pd_id)
+ // this.router.navigate(['../../fly-hi/sectionlist'], {relativeTo: this.route});
}
});
}
+
+ key_set(param){
+ let data =param
+ if(data instanceof Array){
+
+
+ data.forEach(element => {
+
+ if(element.hasOwnProperty('answer_value') ){
+ console.log(element)
+ if(element.answer_value != ''){
+ element.answer_value = 'saved'
+ }
+
+ }else{
+ if( element.questions_group instanceof Array){
+ element.questions_group.forEach(e => {
+ e.questions.forEach(c => {
+ if(c.hasOwnProperty('answer_value') ){
+ console.log(c)
+ if(c.answer_value != ''){
+ c.answer_value = 'saved'
+ }
+ }
+
+ });
+
+ });
+ }
+
+
+ }
+
+ });
+ return data
+ }
+}
}
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 5a98dc1..20ccad7 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
@@ -17,15 +17,19 @@ export class SingleCaptureBtnComponent implements OnInit {
@Output() singleDataEmitter = new EventEmitter
sales_pd_type: string;
role_id: string;
+ disable_capture:any;
constructor(private ng2ImgMax:Ng2ImgMaxService,private loaderService:LoaderService,private dialog: MatDialog) {
this.role_id = localStorage.getItem('user_role')
this.sales_pd_type = localStorage.getItem('sales_pd_type')
- console.log(this.sales_pd_type)
+ this.disable_capture = localStorage.getItem('disable_capture')
+ console.log(this.disable_capture,this.sales_pd_type)
}
ngOnInit(): void {
console.log(this.addMoreBtn)
+ this.disable_capture = localStorage.getItem('disable_capture')
+ console.log(this.disable_capture,this.sales_pd_type)
}
singlecapturedImage(event){
this.loaderService.showMatSpinnerDialog('Fetching Data...')
@@ -50,7 +54,10 @@ export class SingleCaptureBtnComponent implements OnInit {
// // this.getApiData()
// // }
-
+ if(imageData == undefined){
+ this.loaderService.closeMatSpinnerDialog()
+ }else{
+
// });
@@ -63,8 +70,10 @@ export class SingleCaptureBtnComponent implements OnInit {
},
error => {
console.log('😢 Oh no!', error);
+ this.loaderService.closeMatSpinnerDialog()
}
);
+ }
}
singlecapture(event){
@@ -72,6 +81,9 @@ export class SingleCaptureBtnComponent implements OnInit {
let element:HTMLElement = document.getElementById('input-files') as HTMLElement
element.click();
}
+ ngOnChanges(){
+ this.disable_capture = localStorage.getItem('disable_capture')
+ }
}
diff --git a/ng6-seed/src/app/sales-pd/home/home.html b/ng6-seed/src/app/sales-pd/home/home.html
index cce38af..b53f3db 100755
--- a/ng6-seed/src/app/sales-pd/home/home.html
+++ b/ng6-seed/src/app/sales-pd/home/home.html
@@ -11,7 +11,7 @@
diff --git a/ng6-seed/src/app/sales-pd/home/home.ts b/ng6-seed/src/app/sales-pd/home/home.ts
index abc7fcd..e87bdba 100755
--- a/ng6-seed/src/app/sales-pd/home/home.ts
+++ b/ng6-seed/src/app/sales-pd/home/home.ts
@@ -46,6 +46,14 @@ export class HomePage{
// @Inject(MAT_DIALOG_DATA)public pd_all_details: any ){
constructor(public dialogRef: MatDialogRef