Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/sriramv18/sparqsineedge

Browse Source
This commit is contained in:
sriram-at-840620226347 2020-11-07 14:07:49 +05:30
commit 31007bd525
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html
View File

@ -27,6 +27,6 @@
</mat-dialog-actions> </mat-dialog-actions>
<mat-dialog-actions align="end" *ngIf="!CompletenessCheck"> <mat-dialog-actions align="end" *ngIf="!CompletenessCheck">
<button mat-raised-button color="primary" (click)="overwritten_pd()" <button mat-raised-button color="primary" (click)="overwritten_pd()"
*ngIf="fk_pd_type == '3'"> <strong>Complete anyway </strong></button>&nbsp;&nbsp; > <strong>Complete anyway </strong></button>&nbsp;&nbsp;
<button mat-raised-button mat-dialog-close><strong> Ok </strong></button> <button mat-raised-button mat-dialog-close><strong> Ok </strong></button>
</mat-dialog-actions> </mat-dialog-actions>

3
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts
View File

@ -68,6 +68,9 @@ export class PdStatusChangeDialogueComponent implements OnInit {
"pd_id":this.data.pdid, "pd_id":this.data.pdid,
}; };
update_status.pd_completeness_override = this.pd_completeness_override 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 => { this.pd.editPdMasterDetails(update_status, status,this.masterRandomString).subscribe(result => {
if (result.status == 200) { if (result.status == 200) {
this.dialogRef.close({update_status:true}); this.dialogRef.close({update_status:true});

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts
View File

@ -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]) : ''], 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)]) : ''], 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)]): ''], 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]) : ''], 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]) : ''], net_monthly_salary: ['', this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.required]) : ''],
amount_paid_in_cash: [''], amount_paid_in_cash: [''],
amount_paid_through_bank: [''], amount_paid_through_bank: [''],
mode_of_getting_salary:[''], mode_of_getting_salary:[''],

2
ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts
View File

@ -395,7 +395,7 @@ export class QcViewComponent implements OnInit, OnDestroy {
this._qc.getRecordedPlaybackUrl(params).subscribe(result=>{ this._qc.getRecordedPlaybackUrl(params).subscribe(result=>{
if(result && result['dataStatus'] && result['records'] && result['records'].length > 0) { if(result && result['dataStatus'] && result['records'] && result['records'].length > 0) {
let dialogRef = this.dialog.open(VideoPlayerComponent,{ let dialogRef = this.dialog.open(VideoPlayerComponent,{
data:{videoUrl:result['records']}, data:{videoUrl:result['records'],masterData:this.pdMasterData[0]},
maxWidth: '100vw', maxWidth: '100vw',
maxHeight: '100vh', maxHeight: '100vh',
height: '90%', height: '90%',

2
ng6-seed/src/app/session/login/login-component.html
View File

@ -43,7 +43,7 @@
<footer class="page-footer"> <footer class="page-footer">
<!-- © Copyright --> <!-- © Copyright -->
<div class="footer-copyright text-center">&#169; 2018 <div class="footer-copyright text-center">&#169; 2020
<a href="http://www.sineedge.com" target="_blank"> SineEdge Consulting Pvt Ltd. </a> All rights are reserved <a href="http://www.sineedge.com" target="_blank"> SineEdge Consulting Pvt Ltd. </a> All rights are reserved
</div> </div>
<!-- © Copyright --> <!-- © Copyright -->