Fairoj : Complete List Loader implemented and emp form issue fixed

This commit is contained in:
venbatechnologies@gmail.com 2020-01-04 19:45:20 +05:30
parent d48ace4832
commit 12d9d941e2
6 changed files with 34 additions and 7 deletions

File diff suppressed because one or more lines are too long

View File

@ -6,10 +6,20 @@
<ion-title>Complete List</ion-title> <ion-title>Complete List</ion-title>
</ion-navbar> </ion-navbar>
</ion-header> </ion-header>
<ion-content> <ion-content>
<ion-grid> <ion-grid>
<div *ngIf="pdlistaccess else allocateaccess">
<div *ngFor="let i of [1,2,3,4,5]">
<content-loader>
<svg:rect x="80" y="40" rx="5" ry="5" width="300" height="70" />
<svg:circle cx="40" cy="70" r="30" stroke="3" stroke-width="3" fill="red" />
</content-loader>
</div>
</div>
<ng-template #allocateaccess>
<mat-card class="md-box" reorder="true" *ngFor="let progess of pdcomplete;let i = index;"> <mat-card class="md-box" reorder="true" *ngFor="let progess of pdcomplete;let i = index;">
<ion-list > <ion-list >
<!-- WITH APPLICANT DETAILS --> <!-- WITH APPLICANT DETAILS -->
@ -67,5 +77,6 @@
</ion-list> </ion-list>
<hr/> <hr/>
</mat-card> </mat-card>
</ng-template>
</ion-grid> </ion-grid>
</ion-content> </ion-content>

View File

@ -71,7 +71,7 @@ export class CompleteListPage {
} }
getpdTriggerdetails() getpdTriggerdetails()
{ {
this.pdlistaccess=true
let userid = this.awsservice.getlocale(); let userid = this.awsservice.getlocale();
//.log("User",userid) //.log("User",userid)
// this.pdlistaccess = true; // this.pdlistaccess = true;
@ -106,6 +106,9 @@ export class CompleteListPage {
this.pdlistaccess = false; this.pdlistaccess = false;
this.pdlistdetails = "No Records Found"; this.pdlistdetails = "No Records Found";
} }
},err=>{
this.pdlistaccess=false
this.pdlistdetails = "No Records Found";
}) })
} }
random_bg_color() { random_bg_color() {

View File

@ -128,12 +128,14 @@
</div> </div>
<div *ngIf="pd_cus_segment!='SAL-CHQ'"> <div *ngIf="pd_cus_segment!='SAL-CHQ'">
<div class="radio-margin">
<p>Was the Employer Met</p> <p>Was the Employer Met</p>
<mat-radio-group name="was_met" formControlName="was_met"> <mat-radio-group name="was_met" formControlName="was_met">
<!-- //(change)="checkotherDetails($event.value)" --> <!-- //(change)="checkotherDetails($event.value)" -->
<mat-radio-button value="yes">YES</mat-radio-button> <mat-radio-button value="yes">YES</mat-radio-button>
<mat-radio-button value="no">NO</mat-radio-button> <mat-radio-button value="no">NO</mat-radio-button>
</mat-radio-group> </mat-radio-group>
</div>
<!-- *ngIf="otherIncomeForm.controls.other_income.value == 'Yes'" --> <!-- *ngIf="otherIncomeForm.controls.other_income.value == 'Yes'" -->
@ -174,11 +176,13 @@
</div> </div>
<div *ngIf="pd_cus_segment!='SAL-CHQ'"> <div *ngIf="pd_cus_segment!='SAL-CHQ'">
<div class="radio-margin">
<p>Salary amount confirmed ?</p> <p>Salary amount confirmed ?</p>
<mat-radio-group formControlName="confirm_salary"> <mat-radio-group formControlName="confirm_salary">
<mat-radio-button value="yes">YES</mat-radio-button> <mat-radio-button value="yes">YES</mat-radio-button>
<mat-radio-button value="no">NO</mat-radio-button> <mat-radio-button value="no">NO</mat-radio-button>
</mat-radio-group> </mat-radio-group>
</div>
<mat-form-field appearance="outline" style="width: 100%" *ngIf="employmentForm.controls['confirm_salary'].value == 'no'"> <mat-form-field appearance="outline" style="width: 100%" *ngIf="employmentForm.controls['confirm_salary'].value == 'no'">
<!-- <mat-label>why salary amount was not confirmed</mat-label> --> <!-- <mat-label>why salary amount was not confirmed</mat-label> -->
<textarea matInput placeholder="why salary amount was not confirmed" formControlName="sal_amount_was_not_confirmed"></textarea> <textarea matInput placeholder="why salary amount was not confirmed" formControlName="sal_amount_was_not_confirmed"></textarea>
@ -228,11 +232,13 @@
<ion-row *ngIf="pd_cus_segment!='SAL-CHQ'"> <ion-row *ngIf="pd_cus_segment!='SAL-CHQ'">
<ion-col> <ion-col>
<div class="radio-margin">
<P>Salary register seen ?</P> <P>Salary register seen ?</P>
<mat-radio-group name="sal_reg_seen" formControlName="sal_reg_seen" (change)="idcardChange($event,3)"> <mat-radio-group name="sal_reg_seen" formControlName="sal_reg_seen" (change)="idcardChange($event,3)">
<mat-radio-button value="yes">YES</mat-radio-button> <mat-radio-button value="yes">YES</mat-radio-button>
<mat-radio-button value="no">NO</mat-radio-button> <mat-radio-button value="no">NO</mat-radio-button>
</mat-radio-group> </mat-radio-group>
</div>
</ion-col> </ion-col>
<ion-col> <ion-col>
<div float-right *ngIf="employmentForm.controls['sal_reg_seen'].value == 'yes'" style="width: 20%"> <div float-right *ngIf="employmentForm.controls['sal_reg_seen'].value == 'yes'" style="width: 20%">
@ -387,13 +393,13 @@
<input matInput placeholder="Bonus Type Others" formControlName="bonus_type_other"> <input matInput placeholder="Bonus Type Others" formControlName="bonus_type_other">
</mat-form-field> </mat-form-field>
</div> </div>
<div class="radio-margin">
<P>Is there any delay in receiving the salary</P> <P>Is there any delay in receiving the salary</P>
<mat-radio-group name="any_delays" formControlName="any_delays"> <mat-radio-group name="any_delays" formControlName="any_delays">
<mat-radio-button value="yes">YES</mat-radio-button> <mat-radio-button value="yes">YES</mat-radio-button>
<mat-radio-button value="no">NO</mat-radio-button> <mat-radio-button value="no">NO</mat-radio-button>
</mat-radio-group> </mat-radio-group>
<br> </div>
<mat-form-field style="width: 80%"> <mat-form-field style="width: 80%">
<mat-select placeholder="ID Card issued by the Company seen ?" formControlName="id_card_issued_company" <mat-select placeholder="ID Card issued by the Company seen ?" formControlName="id_card_issued_company"
(selectionChange)="idcardChange($event,1)" required> (selectionChange)="idcardChange($event,1)" required>

View File

@ -36,4 +36,7 @@ page-pd-question-emp-info {
height: 28px; height: 28px;
} }
.radio-margin{
margin-bottom: 18px;
}
} }

View File

@ -519,6 +519,9 @@ checkWorkingExperiences(){
} }
inWords(val,flag:number){ inWords(val,flag:number){
console.log(val)
if(val != '' && val != undefined && val != null)
{
switch(flag){ switch(flag){
case 1 : case 1 :
this.mthlySlryAmtInWords= this.constant.convertNumberToWords(val); this.mthlySlryAmtInWords= this.constant.convertNumberToWords(val);
@ -540,6 +543,7 @@ inWords(val,flag:number){
break; break;
} }
} }
}
getEmploymentDetails(){ getEmploymentDetails(){