diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html
index 47a54f55b..1ea0be4fa 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html
@@ -27,6 +27,6 @@
+ > Complete anyway
\ No newline at end of file
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts
index f4f9bdb63..4f0504af6 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts
@@ -68,6 +68,9 @@ export class PdStatusChangeDialogueComponent implements OnInit {
"pd_id":this.data.pdid,
};
update_status.pd_completeness_override = this.pd_completeness_override
+ if(this.pd_completeness_override == '1') {
+ update_status.complete_override_data = this.dialoge_subcontent
+ }
this.pd.editPdMasterDetails(update_status, status,this.masterRandomString).subscribe(result => {
if (result.status == 200) {
this.dialogRef.close({update_status:true});
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts
index f39d57771..c00e0100a 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts
@@ -297,8 +297,8 @@ export class EmploymentInfoComponent implements OnInit {
sal_reg_seen: [this.pd_cus_segment == 'SAL-CHQ' ? 'no' : '',this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.required]) : ''],
from_date_the_salary_is_rcv: ['',this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.max(31), Validators.min(0)]) : ''],
to_date_the_salary_is_rcv: ['',this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.max(31), Validators.min(0)]): ''],
- gross_monthly_salary: ['', ,this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.required]) : ''],
- net_monthly_salary: ['', ,this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.required]) : ''],
+ gross_monthly_salary: ['',this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.required]) : ''],
+ net_monthly_salary: ['', this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.required]) : ''],
amount_paid_in_cash: [''],
amount_paid_through_bank: [''],
mode_of_getting_salary:[''],
diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts
index 2f2aa0d6c..f4fa0625d 100755
--- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts
+++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts
@@ -395,7 +395,7 @@ export class QcViewComponent implements OnInit, OnDestroy {
this._qc.getRecordedPlaybackUrl(params).subscribe(result=>{
if(result && result['dataStatus'] && result['records'] && result['records'].length > 0) {
let dialogRef = this.dialog.open(VideoPlayerComponent,{
- data:{videoUrl:result['records']},
+ data:{videoUrl:result['records'],masterData:this.pdMasterData[0]},
maxWidth: '100vw',
maxHeight: '100vh',
height: '90%',
diff --git a/ng6-seed/src/app/session/login/login-component.html b/ng6-seed/src/app/session/login/login-component.html
index 3f334010e..a85f210a5 100755
--- a/ng6-seed/src/app/session/login/login-component.html
+++ b/ng6-seed/src/app/session/login/login-component.html
@@ -43,7 +43,7 @@