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

SAL changes done

Browse Source
This commit is contained in:
sriram-at-840620226347 2020-01-08 19:15:03 +05:30
parent efb46d4b8e
commit 0dd396ca19
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pages/pd-question/pd-question-emp-info/pd-question-emp-info.html
View File

@ -435,21 +435,31 @@
</div> </div>
</div> </div>
<div #officePhotoScroll></div> <div #officePhotoScroll></div>
<div *ngIf="employmentForm.controls['office_imgs']">
<ion-row style="width: 100%;"> <ion-row style="width: 100%;">
<ion-col col-6> <ion-col col-6>
<p>Office photographs</p> <p>Office Photographs</p>
</ion-col>
<ion-col col-2>
<ion-icon style="margin-top: 16px;" title="Click Here For Office photographs" name="md-camera"
(click)="savePhoto(1)"></ion-icon>
</ion-col>
</ion-row>
<div *ngIf="employmentForm.controls['name_board_img']">
<ion-row style="width: 100%;">
<ion-col col-6>
<p>Name Board Image</p>
</ion-col> </ion-col>
<ion-col col-2> <ion-col col-2>
<ion-icon style="margin-top: 16px;" title="Click Here For Office photographs" name="md-camera" <ion-icon style="margin-top: 16px;" title="Click Here For Name Board Image" name="md-camera"
(click)="ImageUpload(4)"></ion-icon> (click)="ImageUpload(4)"></ion-icon>
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row style="width: 100%;"> <ion-row style="width: 100%;">
<ion-col col-5> <ion-col col-5>
<div *ngIf="employmentForm.controls['office_imgs'].value !== ''"> <div *ngIf="employmentForm.controls['name_board_img'].value !== ''">
<img src="{{employmentForm.controls['office_imgs'].value}}" imageViewer <img src="{{employmentForm.controls['name_board_img'].value}}" imageViewer
style="width: 40px;height: 35px;"> style="width: 40px;height: 35px;">
</div> </div>

14
src/pages/pd-question/pd-question-emp-info/pd-question-emp-info.ts
View File

@ -131,7 +131,7 @@ export class PdQuestionEmpInfoPage {
bonus_type: [''], bonus_type: [''],
bonus_type_other: [''], bonus_type_other: [''],
id_card_issued_company:[''], id_card_issued_company:[''],
office_imgs:[''], name_board_img:[''],
why_company_id_proof_not_available: [''], why_company_id_proof_not_available: [''],
any_delays: [''], any_delays: [''],
employment_remarks: [''], employment_remarks: [''],
@ -337,8 +337,8 @@ this.pd_value_params={pd_id:this.pdDetails.pd_id,form_id:this.FormId.form_id,com
return; return;
} }
} }
if (this.employmentForm.controls['office_imgs'].invalid) { if (this.employmentForm.controls['name_board_img'].invalid) {
this.toast.pdTriggerappmessage("Office Photographs is required"); this.toast.pdTriggerappmessage("Name board image is required");
this.officePhotoScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"}) this.officePhotoScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
return; return;
} }
@ -430,7 +430,7 @@ this.pd_value_params={pd_id:this.pdDetails.pd_id,form_id:this.FormId.form_id,com
records.bonus_type = this.employmentForm.controls['bonus_type'].value; records.bonus_type = this.employmentForm.controls['bonus_type'].value;
records.bonus_type_other = this.employmentForm.controls['bonus_type_other'].value; records.bonus_type_other = this.employmentForm.controls['bonus_type_other'].value;
records.office_imgs = this.employmentForm.controls['office_imgs'].value; records.name_board_img = this.employmentForm.controls['name_board_img'].value;
records.id_card_issued_company = this.employmentForm.controls['id_card_issued_company'].value; records.id_card_issued_company = this.employmentForm.controls['id_card_issued_company'].value;
if(records.id_card_issued_company == 'no'){ if(records.id_card_issued_company == 'no'){
records.why_company_id_proof_not_available = this.employmentForm.controls['why_company_id_proof_not_available'].value; records.why_company_id_proof_not_available = this.employmentForm.controls['why_company_id_proof_not_available'].value;
@ -452,7 +452,7 @@ this.pd_value_params={pd_id:this.pdDetails.pd_id,form_id:this.FormId.form_id,com
records.hasOwnProperty('id_card_image') && records.id_card_image != '' ? records.id_card_image = 'SAVED' :'' records.hasOwnProperty('id_card_image') && records.id_card_image != '' ? records.id_card_image = 'SAVED' :''
records.hasOwnProperty('attendance_seen_pic') && records.attendance_seen_pic != '' ? records.attendance_seen_pic = 'SAVED' :'' records.hasOwnProperty('attendance_seen_pic') && records.attendance_seen_pic != '' ? records.attendance_seen_pic = 'SAVED' :''
records.hasOwnProperty('sal_reg_seen_pic') && records.sal_reg_seen_pic != '' ? records.sal_reg_seen_pic = 'SAVED' :'' records.hasOwnProperty('sal_reg_seen_pic') && records.sal_reg_seen_pic != '' ? records.sal_reg_seen_pic = 'SAVED' :''
records.hasOwnProperty('office_imgs') && records.sal_reg_seen_pic != '' ? records.office_imgs = 'SAVED' :'' records.hasOwnProperty('name_board_img') && records.sal_reg_seen_pic != '' ? records.name_board_img = 'SAVED' :''
this.qustCat.saveForm(records).subscribe(data => { this.qustCat.saveForm(records).subscribe(data => {
@ -687,7 +687,7 @@ inWords(val,flag:number){
this.employmentForm.controls['bonus_frequency'].setValue(Emp.bonus_frequency); this.employmentForm.controls['bonus_frequency'].setValue(Emp.bonus_frequency);
this.employmentForm.controls['bonus_type'].setValue(Emp.bonus_type); this.employmentForm.controls['bonus_type'].setValue(Emp.bonus_type);
this.employmentForm.controls['bonus_type_other'].setValue(Emp.bonus_type_other); this.employmentForm.controls['bonus_type_other'].setValue(Emp.bonus_type_other);
this.employmentForm.controls['office_imgs'].setValue(Emp.office_imgs); this.employmentForm.controls['name_board_img'].setValue(Emp.name_board_img);
this.employmentForm.controls['id_card_issued_company'].setValue(Emp.id_card_issued_company); this.employmentForm.controls['id_card_issued_company'].setValue(Emp.id_card_issued_company);
if(Emp.id_card_issued_company == 'no'){ if(Emp.id_card_issued_company == 'no'){
this.employmentForm.controls['why_company_id_proof_not_available'].setValue(Emp.why_company_id_proof_not_available); this.employmentForm.controls['why_company_id_proof_not_available'].setValue(Emp.why_company_id_proof_not_available);
@ -831,7 +831,7 @@ inWords(val,flag:number){
if (Flag == 1) { this.employmentForm.controls.id_card_image.setValue(res != 'error' ? watermarkedImage : ''); img_name="id_card_image"}//alert('Inside Mobile Upload Function' + Flag);} if (Flag == 1) { this.employmentForm.controls.id_card_image.setValue(res != 'error' ? watermarkedImage : ''); img_name="id_card_image"}//alert('Inside Mobile Upload Function' + Flag);}
if (Flag == 2) { this.employmentForm.controls.attendance_seen_pic.setValue(res != 'error' ? watermarkedImage : ''); img_name="attendance_seen_pic"}//alert('Inside Mobile Upload Function' + Flag);} if (Flag == 2) { this.employmentForm.controls.attendance_seen_pic.setValue(res != 'error' ? watermarkedImage : ''); img_name="attendance_seen_pic"}//alert('Inside Mobile Upload Function' + Flag);}
if (Flag == 3) { this.employmentForm.controls.sal_reg_seen_pic.setValue(res != 'error' ? watermarkedImage : ''); img_name="sal_reg_seen_pic"}//alert('Inside Mobile Upload Function' + Flag);} if (Flag == 3) { this.employmentForm.controls.sal_reg_seen_pic.setValue(res != 'error' ? watermarkedImage : ''); img_name="sal_reg_seen_pic"}//alert('Inside Mobile Upload Function' + Flag);}
if (Flag == 4) { this.employmentForm.controls.office_imgs.setValue(res != 'error' ? watermarkedImage : ''); img_name="office_imgs"}//alert('Inside Mobile Upload Function' + Flag);} if (Flag == 4) { this.employmentForm.controls.name_board_img.setValue(res != 'error' ? watermarkedImage : ''); img_name="name_board_img"}//alert('Inside Mobile Upload Function' + Flag);}
let bucket:any=[] let bucket:any=[]
bucket.push({ 'image': watermarkedImage, 'Name': img_name, 'link': geoCoordinates }); bucket.push({ 'image': watermarkedImage, 'Name': img_name, 'link': geoCoordinates });