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

inline image changes :ps

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-05-09 12:31:56 +05:30
parent 04cc170b41
commit 54ab40eca3
16 changed files with 263246 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.sourcemaps/main.js.map
View File

File diff suppressed because one or more lines are too long

33193
platforms/android/app/src/main/assets/www/build/main.css Executable file → Normal file
View File

File diff suppressed because one or more lines are too long

25787
platforms/android/app/src/main/assets/www/build/main.js Executable file → Normal file
View File

File diff suppressed because one or more lines are too long

0
platforms/android/app/src/main/assets/www/build/polyfills.js Executable file → Normal file
View File

0
platforms/android/app/src/main/assets/www/build/sw-toolbox.js Executable file → Normal file
View File

203814
platforms/android/app/src/main/assets/www/build/vendor.js Executable file → Normal file
View File

File diff suppressed because one or more lines are too long

2
src/pages/input/input.ts
View File

@ -135,7 +135,7 @@ checkOtpAccess:boolean = false;
ionViewDidLoad() { ionViewDidLoad() {
this.setPermission(); this.setPermission();
console.log('ionViewDidLoad InputPage');
} }
ionViewCanLeave() ionViewCanLeave()
{ {

13
src/pages/pd-question/pd-question-address/pd-question-address.html
View File

@ -212,6 +212,19 @@
autocomplete="off"> autocomplete="off">
</mat-form-field> </mat-form-field>
<!-- <!--
<div float-right>
<div *ngIf="item.get('address_pic').value !== ''" >
<img src="{{indi.get('address_pic').value}}" imageViewer style ="width: 40px;height: 35px;">
</div>
<div *ngIf="item.get('address_pic').value === ''" >
<label style="display: block; text-align: center !important;"> Address
Image </label>
</div>
<div style="text-align: -webkit-center;" >
<ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(indi,2)"></ion-icon>
</div>
</div> -->
<!--
<div fxLayout="column" fxLayoutAlign="start stretch"> <div fxLayout="column" fxLayoutAlign="start stretch">
<mat-form-field style="width: 100%;"> <mat-form-field style="width: 100%;">

161
src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.html
View File

@ -1526,21 +1526,39 @@
<mat-card-title>Documents Sighted </mat-card-title> <mat-card-title>Documents Sighted </mat-card-title>
</mat-card-header> </mat-card-header>
<mat-card-content class="matcard"> <mat-card-content class="matcard">
<ion-grid>
<ion-row>
<ion-col>
<p>Shop and Est Act Cert</p> <p>Shop and Est Act Cert</p>
<mat-radio-group formControlName="shop_eat_act_cert"> <mat-radio-group formControlName="shop_eat_act_cert" (change)="radioChange($event,1)">
<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-button value="not applicable">NA</mat-radio-button> <mat-radio-button value="not applicable">NA</mat-radio-button>
</mat-radio-group> </mat-radio-group>
</ion-col>
<ion-col>
<div float-right *ngIf="businessForm.controls['shop_eat_act_cert'].value == 'yes'">
<br>
<div *ngIf="businessForm.controls['shop_eat_act_cert_pic'].value !== ''" >
<img src="{{businessForm.controls['shop_eat_act_cert_pic'].value}}" imageViewer style ="width: 40px;height: 35px;">
</div>
<div *ngIf="businessForm.controls['shop_eat_act_cert_pic'].value === ''" >
<label style="display: block; text-align: center !important;"> Shop and Est Act Cert
Image </label>
</div>
<div style="text-align: -webkit-center;" >
<ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(1)"></ion-icon>
</div>
</div>
</ion-col>
</ion-row>
<ion-row>
<ion-col>
<p>GST Regn Cert</p> <p>GST Regn Cert</p>
<mat-radio-group formControlName="gst_Regn_cert"> <mat-radio-group formControlName="gst_Regn_cert" (change)="radioChange($event,2)">
<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>
@ -1548,10 +1566,29 @@
</mat-radio-group> </mat-radio-group>
</ion-col>
<ion-col>
<div float-right *ngIf="businessForm.controls['gst_Regn_cert'].value == 'yes'">
<br>
<div *ngIf="businessForm.controls['gst_Regn_cert_pic'].value !== ''" >
<img src="{{businessForm.controls['gst_Regn_cert_pic'].value}}" imageViewer style ="width: 40px;height: 35px;">
</div>
<div *ngIf="businessForm.controls['gst_Regn_cert_pic'].value === ''" >
<label style="display: block; text-align: center !important;"> GST Regn Cert
Image </label>
</div>
<div style="text-align: -webkit-center;" >
<ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(2)"></ion-icon>
</div>
</div>
<div *ngIf="businessForm.controls['export_import_cert']"> </ion-col>
</ion-row>
<ion-row *ngIf="businessForm.controls['export_import_cert']">
<ion-col>
<p>Export / Import cert</p> <p>Export / Import cert</p>
<mat-radio-group formControlName="export_import_cert"> <mat-radio-group formControlName="export_import_cert" (change)="radioChange($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>
@ -1559,23 +1596,59 @@
</mat-radio-group> </mat-radio-group>
</ion-col>
<ion-col>
<div float-right *ngIf="businessForm.controls['export_import_cert'].value == 'yes'">
<br>
<div *ngIf="businessForm.controls['export_import_cert_pic'].value !== ''" >
<img src="{{businessForm.controls['export_import_cert_pic'].value}}" imageViewer style ="width: 40px;height: 35px;">
</div>
<div *ngIf="businessForm.controls['export_import_cert_pic'].value === ''" >
<label style="display: block; text-align: center !important;"> Export / Import cert
Image </label>
</div>
<div style="text-align: -webkit-center;" >
<ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(3)"></ion-icon>
</div>
</div> </div>
<div *ngIf="businessForm.controls['factory_cert']">
</ion-col>
</ion-row>
<ion-row *ngIf="businessForm.controls['factory_cert']">
<ion-col>
<p>Factory Cert</p> <p>Factory Cert</p>
<mat-radio-group formControlName="factory_cert"> <mat-radio-group formControlName="factory_cert" (change)="radioChange($event,4)">
<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-button value="not applicable">NA</mat-radio-button> <mat-radio-button value="not applicable">NA</mat-radio-button>
</mat-radio-group> </mat-radio-group>
</ion-col>
<ion-col>
<div float-right *ngIf="businessForm.controls['factory_cert'].value == 'yes'">
<br>
<div *ngIf="businessForm.controls['factory_cert_pic'].value !== ''" >
<img src="{{businessForm.controls['factory_cert_pic'].value}}" imageViewer style ="width: 40px;height: 35px;">
</div>
<div *ngIf="businessForm.controls['factory_cert_pic'].value === ''" >
<label style="display: block; text-align: center !important;"> Factory Cert
Image </label>
</div>
<div style="text-align: -webkit-center;" >
<ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(4)"></ion-icon>
</div>
</div> </div>
<div *ngIf="businessForm.controls['practice_cert']"> </ion-col>
</ion-row>
<ion-row *ngIf="businessForm.controls['practice_cert']">
<ion-col>
<p>Cert of Practice</p> <p>Cert of Practice</p>
<mat-radio-group formControlName="practice_cert"> <mat-radio-group formControlName="practice_cert" (change)="radioChange($event,5)">
<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>
@ -1583,12 +1656,28 @@
</mat-radio-group> </mat-radio-group>
</ion-col>
<ion-col>
<div float-right *ngIf="businessForm.controls['practice_cert'].value == 'yes'">
<br>
<div *ngIf="businessForm.controls['practice_cert_pic'].value !== ''" >
<img src="{{businessForm.controls['practice_cert_pic'].value}}" imageViewer style ="width: 40px;height: 35px;">
</div> </div>
<div *ngIf="businessForm.controls['practice_cert_pic'].value === ''" >
<label style="display: block; text-align: center !important;"> Cert of Practice
Image </label>
</div>
<div style="text-align: -webkit-center;" >
<ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(5)"></ion-icon>
</div>
</div>
</ion-col>
</ion-row>
<ion-row>
<ion-col>
<p>PF Regn</p> <p>PF Regn</p>
<mat-radio-group formControlName="pf_regn"> <mat-radio-group formControlName="pf_regn" (change)="radioChange($event,6)">
<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>
@ -1596,16 +1685,52 @@
</mat-radio-group> </mat-radio-group>
</ion-col>
<ion-col>
<div float-right *ngIf="businessForm.controls['pf_regn'].value == 'yes'">
<br>
<div *ngIf="businessForm.controls['pf_regn_pic'].value !== ''" >
<img src="{{businessForm.controls['pf_regn_pic'].value}}" imageViewer style ="width: 40px;height: 35px;">
</div>
<div *ngIf="businessForm.controls['pf_regn_pic'].value === ''" >
<label style="display: block; text-align: center !important;"> PF Regn
Image </label>
</div>
<div style="text-align: -webkit-center;" >
<ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(6)"></ion-icon>
</div>
</div>
</ion-col>
</ion-row>
<ion-row>
<ion-col>
<p>ESIC Regn</p> <p>ESIC Regn</p>
<mat-radio-group formControlName="esic_regn"> <mat-radio-group formControlName="esic_regn" (change)="radioChange($event,7)">
<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-button value="not applicable">NA</mat-radio-button> <mat-radio-button value="not applicable">NA</mat-radio-button>
</mat-radio-group> </mat-radio-group>
</ion-col>
<ion-col>
<div float-right *ngIf="businessForm.controls['esic_regn'].value == 'yes'">
<br>
<div *ngIf="businessForm.controls['esic_regn_pic'].value !== ''" >
<img src="{{businessForm.controls['esic_regn_pic'].value}}" imageViewer style ="width: 40px;height: 35px;">
</div>
<div *ngIf="businessForm.controls['esic_regn_pic'].value === ''" >
<label style="display: block; text-align: center !important;"> ESIC Regn
Image </label>
</div>
<div style="text-align: -webkit-center;" >
<ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(7)"></ion-icon>
</div>
</div>
</ion-col>
</ion-row>
</ion-grid>
<p>Do You Want to Add Other Documents?</p> <p>Do You Want to Add Other Documents?</p>
<mat-radio-group formControlName="other_documents"> <mat-radio-group formControlName="other_documents">

70
src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts
View File

@ -137,6 +137,7 @@ export class PdQuestionBusinessInfoPage {
was_the_company_name_board_sighted:['',Validators.compose([Validators.required])], was_the_company_name_board_sighted:['',Validators.compose([Validators.required])],
officer_total: ['', Validators.compose([Validators.required])], officer_total: ['', Validators.compose([Validators.required])],
shop_eat_act_cert: [''], shop_eat_act_cert: [''],
shop_eat_act_cert_pic:[''],
gst_Regn_cert: [''], gst_Regn_cert: [''],
//export_import_cert: [''], //export_import_cert: [''],
// factory_cert: [''], // factory_cert: [''],
@ -297,6 +298,7 @@ changeOfStartedBusiness(members,i,e){
//max_sale_state.push(this.maxSaleState()) //max_sale_state.push(this.maxSaleState())
if(data['status']==200){ if(data['status']==200){
let DocArray: any; let DocArray: any;
let PartnrArray=Object.keys(data['records'].partners).map(function(key){ let PartnrArray=Object.keys(data['records'].partners).map(function(key){
return data['records'].partners[key]; return data['records'].partners[key];
@ -755,8 +757,11 @@ changeOfStartedBusiness(members,i,e){
this.businessForm.addControl('peak_period_of_business', new FormControl('', Validators.required)); this.businessForm.addControl('peak_period_of_business', new FormControl('', Validators.required));
this.businessForm.addControl('month_of_business_run', new FormControl('', Validators.required)); } this.businessForm.addControl('month_of_business_run', new FormControl('', Validators.required)); }
} }
// this.businessForm.controls['partners'].setValue(PartnrArray); // this.businessForm.controls['partners'].setValue(PartnrArray);
//this.businessForm.controls['persons_with_relationships'].setValue(PartnrArray1) //this.businessForm.controls['persons_with_relationships'].setValue(PartnrArray1)
@ -774,12 +779,21 @@ changeOfStartedBusiness(members,i,e){
posControl.push(this.createPOSMachinesDetails(businessVal.pos_machines_details)); posControl.push(this.createPOSMachinesDetails(businessVal.pos_machines_details));
} }
} }
console.log('businessVal',businessVal);
if(data['records'].gst_Regn_cert =='yes'){ this.businessForm.addControl('gst_Regn_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('gst_Regn_cert_pic');}
if(data['records'].factory_cert =='yes'){ this.businessForm.addControl('factory_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('factory_cert_pic');}
if(data['records'].practice_cert_cert =='yes'){ this.businessForm.addControl('practice_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('practice_cert_pic');}
if(data['records'].shop_eat_act_cert =='yes'){ alert('if control'); this.businessForm.addControl('shop_eat_act_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('shop_eat_act_cert_pic');}
if(data['records'].pf_regn =='yes'){ this.businessForm.addControl('pf_regn_pic', new FormControl('')); }else{ this.businessForm.removeControl('pf_regn_pic');}
if(data['records'].esic_regn =='yes'){ this.businessForm.addControl('esic_regn_pic', new FormControl('')); }else{ this.businessForm.removeControl('esic_regn_pic');}
if(data['records'].export_import_cert =='yes'){ this.businessForm.addControl('export_import_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('export_import_cert_pic');}
this.businessForm.setValue(businessVal); this.businessForm.setValue(businessVal);
} }
else{ else{
console.log('console.log 2');
Partnr.push(this.createPartners()); Partnr.push(this.createPartners());
control1.push(this.createRelationShip()) control1.push(this.createRelationShip())
@ -802,6 +816,36 @@ changeOfStartedBusiness(members,i,e){
val.toUpperCase()=='YES' ? this.businessForm.addControl('month_of_business_run', new FormControl('', Validators.required)) : this.businessForm.removeControl('month_of_business_run'); val.toUpperCase()=='YES' ? this.businessForm.addControl('month_of_business_run', new FormControl('', Validators.required)) : this.businessForm.removeControl('month_of_business_run');
}); });
// if(this.businessForm.controls['gst_Regn_cert']){
// this.businessForm.controls['gst_Regn_cert'].valueChanges.subscribe(val => {
// val.toUpperCase()=='YES' ? this.businessForm.addControl('gst_Regn_cert_pic', new FormControl('')) : this.businessForm.removeControl('gst_Regn_cert_pic');
// });}
// if(this.businessForm.controls['factory_cert']){
// this.businessForm.controls['factory_cert'].valueChanges.subscribe(val => {
// val.toUpperCase()=='YES' ? this.businessForm.addControl('factory_cert_pic', new FormControl('')) : this.businessForm.removeControl('factory_cert_pic');
// });}
// if(this.businessForm.controls['practice_cert_cert']){
// this.businessForm.controls['practice_cert_cert'].valueChanges.subscribe(val => {
// val.toUpperCase()=='YES' ? this.businessForm.addControl('practice_cert_pic', new FormControl('')) : this.businessForm.removeControl('practice_cert_pic');
// });}
// if(this.businessForm.controls['shop_eat_act_cert']){
// this.businessForm.controls['shop_eat_act_cert'].valueChanges.subscribe(val => {
// val.toUpperCase()=='YES' ? this.businessForm.addControl('shop_eat_act_cert_pic', new FormControl('')) : this.businessForm.removeControl('shop_eat_act_cert_pic');
// });}
// if(this.businessForm.controls['pf_regn']){
// this.businessForm.controls['pf_regn'].valueChanges.subscribe(val => {
// val.toUpperCase()=='YES' ? this.businessForm.addControl('pf_regn_pic', new FormControl('')) : this.businessForm.removeControl('pf_regn_pic');
// });}
// if(this.businessForm.controls['esic_regn']){
// this.businessForm.controls['esic_regn'].valueChanges.subscribe(val => {
// val.toUpperCase()=='YES' ? this.businessForm.addControl('esic_regn_pic', new FormControl('')) : this.businessForm.removeControl('esic_regn_pic');
// });}
// if(this.businessForm.controls['export_import_cert']){
// this.businessForm.controls['export_import_cert'].valueChanges.subscribe(val => {
// val.toUpperCase()=='YES' ? this.businessForm.addControl('export_import_cert_pic', new FormControl('')) : this.businessForm.removeControl('export_import_cert_pic');
// });
// }
} }
@ -2241,7 +2285,33 @@ toGetPOSMachinesDetails(e,flag){
value.get('partner_other_name').setValue(this.cons.sentenceCase(name)); value.get('partner_other_name').setValue(this.cons.sentenceCase(name));
} }
ImageUpload(Flag : any){
// alert('Inside Mobile Upload Function' + Flag);
// alert('is_person_met_pic 1');
this.cameraProvider.getpicture().then(res=>{
if(Flag == 1 ){ this.businessForm.controls.shop_eat_act_cert_pic.setValue(res != 'error' ? res : ''); alert('Inside Mobile Upload Function' + Flag);}
if(Flag == 2 ){ this.businessForm.controls.gst_Regn_cert_pic.setValue(res != 'error' ? res : ''); alert('Inside Mobile Upload Function' + Flag);}
if(Flag == 3 ){ this.businessForm.controls.export_import_cert_pic.setValue(res != 'error' ? res : ''); alert('Inside Mobile Upload Function' + Flag);}
if(Flag == 4 ){ this.businessForm.controls.factory_cert_pic.setValue(res != 'error' ? res : ''); alert('Inside Mobile Upload Function' + Flag);}
if(Flag == 5 ){ this.businessForm.controls.practice_cert_pic.setValue(res != 'error' ? res : ''); alert('Inside Mobile Upload Function' + Flag);}
if(Flag == 6 ){ this.businessForm.controls.pf_regn_pic.setValue(res != 'error' ? res : ''); alert('Inside Mobile Upload Function' + Flag);}
if(Flag == 7 ){ this.businessForm.controls.esic_regn_pic.setValue(res != 'error' ? res : ''); alert('Inside Mobile Upload Function' + Flag);}
// console.table('1',this.businessForm.value);
},error=>{
console.log("Camera Error ",JSON.stringify(error));
})
}
radioChange(event,Flag){
if(Flag == 1) {event.value =='yes' ? this.businessForm.addControl('shop_eat_act_cert_pic', new FormControl('')) : this.businessForm.removeControl('shop_eat_act_cert_pic');}
if(Flag == 2) {event.value =='yes' ? this.businessForm.addControl('gst_Regn_cert_pic', new FormControl('')) : this.businessForm.removeControl('gst_Regn_cert_pic'); }
if(Flag == 4) {event.value =='yes' ? this.businessForm.addControl('factory_cert_pic', new FormControl('')) : this.businessForm.removeControl('factory_cert_pic');}
if(Flag == 5) {event.value =='yes' ? this.businessForm.addControl('practice_cert_pic', new FormControl('')) : this.businessForm.removeControl('practice_cert_pic');}
if(Flag == 6) {event.value =='yes' ? this.businessForm.addControl('pf_regn_pic', new FormControl('')) : this.businessForm.removeControl('pf_regn_pic');}
if(Flag == 7) {event.value =='yes' ? this.businessForm.addControl('esic_regn_pic', new FormControl('')) : this.businessForm.removeControl('esic_regn_pic');}
if(Flag == 3) {event.value =='yes' ? this.businessForm.addControl('export_import_cert_pic', new FormControl('')) : this.businessForm.removeControl('export_import_cert_pic');}
}
} }

76
src/pages/pd-question/pd-question-general-info/pd-question-general-info.html
View File

@ -27,7 +27,7 @@
<ion-grid *ngIf="imageDisplay.length >0 "> <ion-grid *ngIf="imageDisplay.length >0 ">
<ion-row> <ion-row>
<ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding> <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
<img src="{{image.image}}" imageViewer><br/> <img src="{{image.image}}" imageViewer class="doc-image-bucket"><br/>
<label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label> <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
<input *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)"> <input *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@ -45,7 +45,7 @@
<label style="font-size:14px;color:gray">Newly Captured Pics</label><br/> <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
<ion-row> <ion-row>
<ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding> <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
<img src="{{image.image}}" imageViewer><br/> <img src="{{image.image}}" imageViewer class="doc-image-bucket"><br/>
<label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label> <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
<input #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)"> <input #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">
@ -67,15 +67,25 @@
<ion-item-sliding [formGroupName]="i" *ngFor="let item of generalForm.controls.list_value['controls']; let i=index"> <ion-item-sliding [formGroupName]="i" *ngFor="let item of generalForm.controls.list_value['controls']; let i=index">
<ion-item> <ion-item>
<ion-label> <ion-label>
<h2 style="font-size: 18px !important;">{{item.get('applicant_name').value | titlecase}}</h2> <ion-row>
<p>Age : {{item.get('age').value}}&nbsp;&nbsp; <ion-col class="avatar_col">
<span *ngIf="item.get('qualification_name').value != ''"> <ion-avatar slot="start">
<span *ngIf="item.get('is_person_met_pic').value ===''"><img src="../../../assets/img/avatar/girl-avatar.png" ></span>
<span *ngIf="item.get('is_person_met_pic').value !==''"><img src="{{item.get('is_person_met_pic').value}}" ></span>
</ion-avatar>
</ion-col>
<ion-col>
<h2 style="font-size: 16px !important;">{{item.get('applicant_name').value | titlecase}}</h2>
<p style="font-size: 13px !important;">Age : {{item.get('age').value}} &nbsp;
<span *ngIf="item.get('qualification_name').value != ''" style="font-size: 13px !important;">
<ion-icon name="school"> <ion-icon name="school">
</ion-icon> </ion-icon>
{{item.get('qualification_name').value}}</span></p> {{item.get('qualification_name').value}}</span></p>
<p *ngIf="item.get('course_name').value != ''"> <p *ngIf="item.get('course_name').value != ''" style="font-size: 13px !important;">
<ion-icon name="copy"></ion-icon>&nbsp; {{item.get('course_name').value | titlecase}} <ion-icon name="copy"></ion-icon>&nbsp; {{item.get('course_name').value | titlecase}}
</p> </p>
</ion-col>
</ion-row>
</ion-label> </ion-label>
<!--<p><ion-icon name="school"></ion-icon> {{item.get('qualification').value}}</p>--> <!--<p><ion-icon name="school"></ion-icon> {{item.get('qualification').value}}</p>-->
<button ion-button align="end" item-end small clear (click)="editIndividuals(i)"> <button ion-button align="end" item-end small clear (click)="editIndividuals(i)">
@ -99,7 +109,6 @@
</ion-list> </ion-list>
<button ion-button color="danger" (click)="removeList(i,1)"> <button ion-button color="danger" (click)="removeList(i,1)">
<ion-icon name="trash"></ion-icon> <ion-icon name="trash"></ion-icon>
</button> </button>
</ion-item-options> </ion-item-options>
@ -161,9 +170,62 @@
<input matInput placeholder="Qualification Details" formControlName="course_name"> <input matInput placeholder="Qualification Details" formControlName="course_name">
</mat-form-field> </mat-form-field>
</div> </div>
<ion-row class="igelabel">
<ion-col>
<mat-checkbox class="table-checkbox-com" color="primary" formControlName="is_person_met">Is Person Met</mat-checkbox><br/> <mat-checkbox class="table-checkbox-com" color="primary" formControlName="is_person_met">Is Person Met</mat-checkbox><br/>
<br/> <br/>
<mat-checkbox class="table-checkbox-com" color="primary" formControlName="is_applicant">Is Applicant</mat-checkbox> <mat-checkbox class="table-checkbox-com" color="primary" formControlName="is_applicant">Is Applicant</mat-checkbox>
<br/>
</ion-col>
<ion-col end *ngIf="indi.get('is_person_met').value === true ">
<!-- <div class="hoverdp" float-right>
<div *ngIf="indi.get('is_person_met_pic').value !== ''" >
<img src="{{indi.get('is_person_met_pic').value}}" imageViewer style="width: 80px;height:80px;border-radius: 50%;border:2px">
</div>
<div *ngIf="indi.get('is_person_met_pic').value === ''" >
<img [src]="'https://image.ibb.co/mGjZB9/usernew.png'" style="width: 80px;height:80px;border-radius: 50%;border:2px">
</div>
<ion-icon style="color:#716462;position: absolute; top: 28%;left: 14.5%;" name="school"></ion-icon>
</div> -->
<div float-right>
<div *ngIf="indi.get('is_person_met_pic').value !== ''" >
<img src="{{indi.get('is_person_met_pic').value}}" imageViewer style ="width: 40px;height: 35px;">
</div>
<div *ngIf="indi.get('is_person_met_pic').value === ''" >
<label style="display: block; text-align: center !important;"> Person Met
Image </label>
</div>
<div style="text-align: -webkit-center;" >
<ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(indi,1)"></ion-icon>
</div>
</div>
<!-- <div *ngIf="indi.get('is_person_met_pic').value !== ''" float-right>
<img src="{{indi.get('is_person_met_pic').value}}" imageViewer style ="width: 40px;height: 35px;">
</div> -->
</ion-col>
<ion-col start *ngIf="indi.get('is_person_met').value === true ">
<div float-left>
<div *ngIf="indi.get('is_person_met_id_proof').value !== ''">
<img src="{{indi.get('is_person_met_id_proof').value}}" imageViewer style ="width: 40px;height: 35px;">
</div>
<div *ngIf="indi.get('is_person_met_id_proof').value === ''" >
<!-- <label style="text-align: -webkit-center;" > Person Met ID Proof </label> -->
<label style="display: block; text-align: center !important;"> Person Met
ID Proof </label>
</div>
<div style="text-align: -webkit-center;" >
<ion-icon name="md-camera" title="Click Here For Person Met ID Proof" (click)="ImageUpload(indi,2)"></ion-icon>
</div>
</div>
<!-- <div *ngIf="indi.get('is_person_met_id_proof').value !== ''" float-left>
<img src="{{indi.get('is_person_met_id_proof').value}}" imageViewer style ="width: 40px;height: 35px;">
</div> -->
</ion-col>
</ion-row>
<ion-row> <ion-row>
<ion-col end> <ion-col end>
<button *ngIf="addIndi" float-right ion-button color="optblue" (click)="addParticular(1,indi)">Add</button> <button *ngIf="addIndi" float-right ion-button color="optblue" (click)="addParticular(1,indi)">Add</button>

17
src/pages/pd-question/pd-question-general-info/pd-question-general-info.scss
View File

@ -22,22 +22,27 @@ page-pd-question-general-info {
zoom: 0.8; zoom: 0.8;
} }
/*FOR IMAGES*/ /*FOR IMAGES*/
img{ .doc-image-bucket{
padding:0 5px 0 0; padding:0 5px 0 0 !important;
height: 180px; height: 180px !important;
//width:130px; //width:130px;
//border:3px solid black; //border:3px solid black;
//border-radius: 20px; //border-radius: 20px;
//background-color: gray; //background-color: gray;
} }
.avatar_col{
padding: 0px !important;
height: 40px !important;
width: 40px !important;
flex-grow: 0 !important;
}
input{ input{
width: 100px; width: 100px;
border-radius: 4px; border-radius: 4px;
border-color: gray; border-color: gray;
font-size: 12px; font-size: 12px;
height: 28px; height: 28px;
} }
} }

62
src/pages/pd-question/pd-question-general-info/pd-question-general-info.ts
View File

@ -162,7 +162,7 @@ export class PdQuestionGeneralInfoPage {
ionViewDidLoad() { ionViewDidLoad() {
// this.pd_applicants_details.pop(); // this.pd_applicants_details.pop();
console.log('ionViewDidLoad PdQuestionGeneralInfoPage'); console.log("%cionViewDidLoad, PdQuestionGeneralInfoPage","font-size:300%;color:purple;font-weight:bold;font-family:Mongoose;");
this.getGeneralForm() this.getGeneralForm()
this.getPDImages(); this.getPDImages();
@ -175,7 +175,7 @@ export class PdQuestionGeneralInfoPage {
} }
ionViewCanLeave(){ ionViewCanLeave(){
console.log("dirty",this.generalForm.dirty); console.table("dirty",this.generalForm.dirty);
if(this.generalForm.dirty){ if(this.generalForm.dirty){
return new Promise((resolve,reject)=>{ return new Promise((resolve,reject)=>{
@ -247,6 +247,8 @@ export class PdQuestionGeneralInfoPage {
applicant_title_name:[val.applicant_title_name], applicant_title_name:[val.applicant_title_name],
applicant_name:[val.applicant_name], applicant_name:[val.applicant_name],
is_person_met:val.is_person_met, is_person_met:val.is_person_met,
is_person_met_pic :val.is_person_met_pic,
is_person_met_id_proof : val.is_person_met_id_proof,
is_applicant:val.is_applicant, is_applicant:val.is_applicant,
age:[val.age], age:[val.age],
qualification:[val.qualification], qualification:[val.qualification],
@ -274,6 +276,8 @@ export class PdQuestionGeneralInfoPage {
applicant_title_name:[val.applicant_title_name], applicant_title_name:[val.applicant_title_name],
applicant_name:[val.applicant_name], applicant_name:[val.applicant_name],
is_person_met:val.is_person_met, is_person_met:val.is_person_met,
is_person_met_pic:val.is_person_met_pic,
is_person_met_id_proof:val.is_person_met_id_proof,
is_applicant:val.is_applicant, is_applicant:val.is_applicant,
age:[val.age], age:[val.age],
qualification:[val.qualification], qualification:[val.qualification],
@ -400,6 +404,8 @@ export class PdQuestionGeneralInfoPage {
let formData : FormGroup=this.fb.group({ let formData : FormGroup=this.fb.group({
applicant_name:['',Validators.required], applicant_name:['',Validators.required],
is_person_met:false, is_person_met:false,
is_person_met_pic:[''],
is_person_met_id_proof:[''],
is_applicant:false, is_applicant:false,
age:[''], age:[''],
qualification:[''], qualification:[''],
@ -415,6 +421,8 @@ export class PdQuestionGeneralInfoPage {
applicant_name:[data.applicant_name,Validators.required], applicant_name:[data.applicant_name,Validators.required],
is_person_met:data.is_person_met, is_person_met:data.is_person_met,
is_person_met_pic : data.is_person_met_pic,
is_person_met_id_proof : data.is_person_met_id_proof,
is_applicant:data.is_applicant, is_applicant:data.is_applicant,
age:[data.age], age:[data.age],
qualification:[data.qualification], qualification:[data.qualification],
@ -614,6 +622,8 @@ dataobj:any;
applicant_title_name:val.applicant_title_name, applicant_title_name:val.applicant_title_name,
applicant_name:val.applicant_name, applicant_name:val.applicant_name,
is_person_met:val.is_person_met, is_person_met:val.is_person_met,
is_person_met_pic : val.is_person_met_pic,
is_person_met_id_proof: val.is_person_met_id_proof,
is_applicant:val.is_applicant, is_applicant:val.is_applicant,
age:val.age, age:val.age,
qualification:val.qualification, qualification:val.qualification,
@ -1000,6 +1010,9 @@ temp: number = 0;
submitData(answerData) submitData(answerData)
{ {
console.table(this.generalForm.value);
console.log(answerData);
console.log('1)',this.temp); console.log('1)',this.temp);
let saveRecords:any={} let saveRecords:any={}
var valuesData_indi:any=[] var valuesData_indi:any=[]
@ -1253,6 +1266,8 @@ console.log('1)',this.temp);
this.pd_applicants_details.forEach((datas,index)=>{ this.pd_applicants_details.forEach((datas,index)=>{
datas.is_applicant=true, datas.is_applicant=true,
datas.is_person_met = false; datas.is_person_met = false;
datas.is_person_met_pic = '';
datas.is_person_met_id_proof = '';
datas.is_new = false; datas.is_new = false;
datas.is_main_applicant = datas.applicant_type == '1' ? true : false; datas.is_main_applicant = datas.applicant_type == '1' ? true : false;
datas.is_active = true; datas.is_active = true;
@ -1261,6 +1276,7 @@ console.log('1)',this.temp);
datas.age = '', datas.age = '',
datas.qualification = '', datas.qualification = '',
datas.course_name = '' datas.course_name = ''
if (datas.company_name != '' && datas.company_name != null) { if (datas.company_name != '' && datas.company_name != null) {
console.log("company"); console.log("company");
let setCompanyValues: any = { company_order_id: companyControl.controls.length + 1, company_name: datas.company_name, is_company_applicant: datas.is_company_applicant, business_entity_type: datas.business_entity_type, business_entity_type_other: datas.business_entity_type_other, business_years: datas.business_years, business_month: datas.business_month, business_date_object: datas.business_date_object, is_new: datas.is_new, is_active: true, associate_pd_id:this.pdDetails.pd_id } let setCompanyValues: any = { company_order_id: companyControl.controls.length + 1, company_name: datas.company_name, is_company_applicant: datas.is_company_applicant, business_entity_type: datas.business_entity_type, business_entity_type_other: datas.business_entity_type_other, business_years: datas.business_years, business_month: datas.business_month, business_date_object: datas.business_date_object, is_new: datas.is_new, is_active: true, associate_pd_id:this.pdDetails.pd_id }
@ -1396,6 +1412,7 @@ console.log('1)',this.temp);
} }
sendImage(){ sendImage(){
this.loading.loaderForSendImage() this.loading.loaderForSendImage()
console.log("ll",JSON.stringify(this.imageBucket)); console.log("ll",JSON.stringify(this.imageBucket));
@ -1427,5 +1444,44 @@ console.log('1)',this.temp);
value.get('applicant_name').setValue(this.cons.sentenceCase(name)); value.get('applicant_name').setValue(this.cons.sentenceCase(name));
} }
ImageUpload(control,Flag : any){
// alert('Inside Mobile Upload Function' + Flag);
if(Flag == 1){
// alert('is_person_met_pic 1');
this.cameraProvider.getpicture().then(res=>{
// alert("Response 1" + res);
if(res != 'error'){
control.controls['is_person_met_pic'].setValue(res);
alert(JSON.stringify(this.generalForm.value));
// this.toast.pdTriggerappmessage('Flag 1 Success');
}
else{
control.controls['is_person_met_pic'].setValue('');
// this.toast.pdTriggerappmessage('Flag 1 Fail');
}
console.table('1',this.generalForm.value);
},error=>{
console.log("Camera Error ",JSON.stringify(error));
})
}
else if(Flag == 2){
// alert('is_person_met_id_proof 2');
this.cameraProvider.getpicture().then(res=>{
// alert("Response 2" + res);
if(res != 'error'){
control.controls['is_person_met_id_proof'].setValue(res);
// alert(JSON.stringify(this.generalForm.value));
// this.toast.pdTriggerappmessage('Flag 2 Success');
}
else{
control.controls['is_person_met_id_proof'].setValue('');
// this.toast.pdTriggerappmessage('Flag 2 Fail');
}
// console.table('1',this.generalForm.value);
},error=>{
console.log("Camera Error ",JSON.stringify(error));
})
}
// console.table('Overall',this.generalForm.value);
}
} }

5
src/providers/common-provider/camera.ts
View File

@ -11,7 +11,10 @@ import { Camera } from '@ionic-native/camera';
export class CameraProvider { export class CameraProvider {
constructor(public http: HttpClient,public camera:Camera) { constructor(public http: HttpClient,public camera:Camera) {
console.log('Hello CameraProvider Provider'); console.log(
"%cWelcome, Camera Provider",
"font-size:300%;color:purple;font-weight:bold;font-family:Mongoose; text-transform: uppercase;"
);
} }
getpicture() getpicture()
{ {

16
www/build/main.css
View File

@ -32931,9 +32931,19 @@ page-pd-question-general-info ion-toggle {
zoom: 0.8; zoom: 0.8;
} }
page-pd-question-general-info img { page-pd-question-general-info .doc-image-bucket {
padding: 0 5px 0 0; padding: 0 5px 0 0 !important;
height: 180px; height: 180px !important;
}
page-pd-question-general-info .avatar_col {
padding: 0px !important;
height: 40px !important;
width: 40px !important;
-webkit-box-flex: 0 !important;
-webkit-flex-grow: 0 !important;
-ms-flex-positive: 0 !important;
flex-grow: 0 !important;
} }
page-pd-question-general-info input { page-pd-question-general-info input {