diff --git a/ng6-seed/dist.zip b/ng6-seed/dist.zip deleted file mode 100644 index 54bc847b7..000000000 Binary files a/ng6-seed/dist.zip and /dev/null differ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts index 71c641a87..28d6cbc4a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts @@ -159,7 +159,7 @@ export class AddPdComponent implements OnInit, OnDestroy { pd_branch_id: [null], lender_applicant_id: [null, Validators.compose([Validators.required])], lender_sales_person:[null], - lender_credit_person:[null,Validators.compose([Validators.required])], + lender_credit_person:[null], imgc_fin_institute:[null], // lender_contact_person: [null], // lender_contact_mobile: [null, Validators.compose([Validators.minLength(10), Validators.maxLength(12), Validators.pattern('^[0-9]*$')])], diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index f5341160c..34713d7d6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -163,7 +163,7 @@ sms --> - diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts index b6e0fa487..2d6f04b66 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts @@ -149,9 +149,11 @@ export class AllPdComponent implements OnInit, OnChanges { pageChange(e) { console.log(e); } - viewPD(pdid:string,randomString,faceApiEnabled){ - localStorage.setItem("is_face_api_enabled",faceApiEnabled) - console.log(pdid,randomString); + viewPD(pdid:string,randomString,details){ + + localStorage.setItem("digilocker_access",details.digilocker_access) + localStorage.setItem("is_face_api_enabled",details.is_face_api_enabled) + console.log(pdid,randomString,details); let pdidwithRandomString = {'id':pdid,'string': randomString}; console.log(pdidwithRandomString); this.loadPdView.emit(pdidwithRandomString); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html index 18d54d35c..8b2369bcd 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html @@ -119,10 +119,12 @@ matTooltipPosition="below" [style.visibility]="_generalForm.controls.individuals.value[i].is_main_applicant == true ? 'hidden':'visible'"> delete +
+
= new ReplaySubject(1); lender_short_name: any; faceApiEnabled: string; + digilocker_access_Enabled: string; /********************** Declaration Section Ends Here *****************/ @@ -129,9 +130,10 @@ export class GeneralInfoComponent implements OnInit { this.role_id=localStorage.getItem('user_role') console.log('User Role',this.role_id); this.image_doc_params={pdid:this.pdid,form_id:this.form_id,company_id:''} - + + this.digilocker_access_Enabled = localStorage.getItem('digilocker_access') this.faceApiEnabled = localStorage.getItem('is_face_api_enabled') - console.log(this.faceApiEnabled) + console.log(this.faceApiEnabled, this.digilocker_access_Enabled) } /********************** Constructor Section Ends Here ****************/ documentsAndFilesList: any = []; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/image-video/image-video.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/image-video/image-video.component.ts index 744964fed..45415bb35 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/image-video/image-video.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/image-video/image-video.component.ts @@ -6,7 +6,7 @@ import { ViewPdComponent } from '../view-pd.component'; import { PdTrigerService } from 'app/personal-discussion/pd-service/pd-triger.service'; import { VideoPlayerComponent } from 'app/video-chat/video-player/video-player.component'; import { UploadVideoComponent } from 'app/quality-check/upload-video/upload-video.component'; - +import Swal from 'sweetalert2'; @Component({ selector: 'app-image-video', templateUrl: './image-video.component.html', @@ -149,7 +149,51 @@ export class ImageVideoComponent implements OnInit { window.open(url,'_blank') } else if(event == 'G_Meet'){ let url = this.google_Meet_Link - window.open(url,'_blank') + let swal:any = Swal + // swal.fire({ + // title: 'Please ensure you press the call record option, else the video will not be saved', + // showDenyButton: true, + // showCancelButton: false, + // confirmButtonText: 'Ok', + // denyButtonText: `Don't save`, + // }).then((result) => { + // /* Read more about isConfirmed, isDenied below */ + // if (result.isConfirmed) { + // // swal.fire('Saved!', '', 'success') + // window.open(url,'_blank') + // } else if (result.isDenied) { + // //swal.fire('Changes are not saved', '', 'info') + // } + // }) + swal.fire({ + title: '', + icon: 'info', + html: + 'Please ensure you press the call record option, else the video will not be saved', + showCloseButton: true, + showCancelButton: false, + focusConfirm: false, + confirmButtonColor: '#008000', + confirmButtonText: + ' OK', + confirmButtonAriaLabel: 'Thumbs up, great!', + + }).then((result) => { + console.log(result) + /* Read more about isConfirmed, isDenied below */ + if (result.value == true) { + // swal.fire('Saved!', '', 'success') + window.open(url,'_blank') + } else if (result.isDenied) { + //swal.fire('Changes are not saved', '', 'info') + } + }) + // Swal('Password Successfully Changed..!'); + //this.notifier.notify('info',"Please ensure you press the call record option, else the video will not be saved"); + // setTimeout(() => { + // window.open(url,'_blank') + // }, 3000); + } } openPlayer(){ diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html index 1ef369087..aceb7ea78 100755 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html @@ -241,7 +241,7 @@
-
+
{{ opt.score_option_name }} @@ -249,14 +249,22 @@ Field Required.
-
+
{{face.face_name}} Field Required. -
+
+
+ + + {{digi.digiLocker_name}} + + Field Required. + +
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts index 7ff60faae..e5fffe4f3 100755 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts @@ -36,6 +36,7 @@ export class EntityEditComponent implements OnInit, OnDestroy { @Input() public childMessage: any; public faceOption: any = [{'face_name':'Yes','face_option_value':'1'},{'face_name':'No','face_option_value':'0'}]; + public digiLockerOption: any = [{'digiLocker_name':'Yes','digiLocker_option_value':'1'},{'digiLocker_name':'No','digiLocker_option_value':'0'}]; public scoreCardOptions: any = [{'score_option_name':'Yes','score_option_value':'1'},{'score_option_name':'No','score_option_value':'0'}]; @@ -82,6 +83,7 @@ export class EntityEditComponent implements OnInit, OnDestroy { if (data.records) { this.noEntityNameFound = false; this.entityNameRecord = data.records.data[0]; + console.log( this.entityNameRecord) this.localEntityType = this.entityNameRecord.fk_entity_type_id; this.setFormDatas(); } else { @@ -101,6 +103,7 @@ export class EntityEditComponent implements OnInit, OnDestroy { full_name: [this.entityNameRecord.full_name, Validators.compose([Validators.required]) ], short_name: [this.entityNameRecord.short_name, Validators.compose([Validators.required]) ], is_face_api_enabled: [this.entityNameRecord.is_face_api_enabled, Validators.compose([Validators.required])], + digilocker_access: [this.entityNameRecord.digilocker_access, Validators.compose([Validators.required])], is_score_card_enabled:[this.entityNameRecord.is_score_card_enabled || '',Validators.compose([Validators.required])], is_otp_enabled:[this.entityNameRecord.is_otp_enabled || '',Validators.compose([Validators.required])], is_sms_enabled:[this.entityNameRecord.is_sms_enabled || '',Validators.compose([Validators.required])],