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

Issues and changes : ps

Browse Source
This commit is contained in:
saravanakumarkandasami 2019-05-16 18:35:08 +05:30
parent 8e5b578136
commit f2788611eb
9 changed files with 57 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/pages/pd-question/pd-question-assessed-business/pd-question-assessed-business.ts
View File

@ -81,6 +81,7 @@ export class PdQuestionAssessedBusinessPage {
{ {
pd_expense_id:[null], pd_expense_id:[null],
fk_pd_id:[this.pdDetails.pd_id], fk_pd_id:[this.pdDetails.pd_id],
company_id:[this.pdDetails.company_id],
expense_item_id:[null,Validators.compose([Validators.required])], expense_item_id:[null,Validators.compose([Validators.required])],
expense_value:[null,Validators.compose([Validators.required])], expense_value:[null,Validators.compose([Validators.required])],
fk_frequency_id:[null,Validators.compose([Validators.required])], fk_frequency_id:[null,Validators.compose([Validators.required])],

10
src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.html
View File

@ -113,7 +113,7 @@
<ion-list *ngFor="let salesItem of sales_item_value"> <ion-list *ngFor="let salesItem of sales_item_value">
<ion-item (click)="editDetails(salesItem.sci_id)"> <ion-item (click)="editDetails(salesItem.sci_id)">
<ion-row> <ion-row>
<ion-col col-6> <ion-col col-6 text-wrap>
{{salesItem.sales_item}}<span *ngIf="salesItem.sales_item == 'Others'">({{salesItem.other_sales_item}})</span> {{salesItem.sales_item}}<span *ngIf="salesItem.sales_item == 'Others'">({{salesItem.other_sales_item}})</span>
</ion-col> </ion-col>
<ion-col col-6 text-right> <ion-col col-6 text-right>
@ -272,7 +272,7 @@
<ion-list *ngFor="let purchase of purchse_details"> <ion-list *ngFor="let purchase of purchse_details">
<ion-item (click)="editPurchaseDetails(purchase.purchase_id)"> <ion-item (click)="editPurchaseDetails(purchase.purchase_id)">
<ion-row> <ion-row>
<ion-col col-6> <ion-col col-6 text-wrap>
{{purchase.purchase_item}}<span *ngIf="purchase.purchase_item == 'Others'">({{purchase.other_purchase_item}})</span> {{purchase.purchase_item}}<span *ngIf="purchase.purchase_item == 'Others'">({{purchase.other_purchase_item}})</span>
</ion-col> </ion-col>
<ion-col col-6 text-right> <ion-col col-6 text-right>
@ -387,7 +387,7 @@
<div *ngFor="let expense of businessExpenses_details"> <div *ngFor="let expense of businessExpenses_details">
<div (click)="editExpenseDetails(expense.pd_expense_id)"> <div (click)="editExpenseDetails(expense.pd_expense_id)">
<ion-row> <ion-row>
<ion-col col-6> <ion-col col-6 text-wrap>
{{expense.expense_item}} {{expense.expense_item}}
</ion-col> </ion-col>
<ion-col col-6 text-right> <ion-col col-6 text-right>
@ -424,7 +424,7 @@
<div *ngFor="let houseExepense of houseHold_details"> <div *ngFor="let houseExepense of houseHold_details">
<div (click)="editHouseExpenseDetails(houseExepense.household_expense_id)"> <div (click)="editHouseExpenseDetails(houseExepense.household_expense_id)">
<ion-row> <ion-row>
<ion-col col-6> <ion-col col-6 text-wrap>
{{houseExepense.expense_item}} {{houseExepense.expense_item}}
</ion-col> </ion-col>
<ion-col col-6 text-right> <ion-col col-6 text-right>
@ -460,7 +460,7 @@
<div *ngFor="let busIncome of busissnessIncome"> <div *ngFor="let busIncome of busissnessIncome">
<div (click)="editIncomeDetails(busIncome.pd_business_income_id)"> <div (click)="editIncomeDetails(busIncome.pd_business_income_id)">
<ion-row> <ion-row>
<ion-col col-6> <ion-col col-6 text-wrap>
{{busIncome.business_income_item !='Others(Please Specify)'?busIncome.business_income_item:busIncome.other_frequncy_item}} {{busIncome.business_income_item !='Others(Please Specify)'?busIncome.business_income_item:busIncome.other_frequncy_item}}
</ion-col> </ion-col>
<ion-col col-6 text-right> <ion-col col-6 text-right>

4
src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.ts
View File

@ -85,10 +85,10 @@ export class PdQuestionAssessedInfoPage {
this.FormName = "Purchase Page"; this.FormName = "Purchase Page";
break; break;
case 3: case 3:
this.FormName = "Business Expense Page"; this.FormName = "Business Expenses Page";
break; break;
case 4: case 4:
this.FormName = "House Hold Page"; this.FormName = "Household Expenses Page";
break; break;
default: default:
this.FormName = "Question Page"; this.FormName = "Question Page";

14
src/pages/pd-question/pd-question-assessed-purchase/pd-question-assessed-purchase.html
View File

@ -58,7 +58,6 @@
</div> </div>
<div fxLayout="column" fxLayoutAlign="start stretch" *ngIf="item.value.purchase_type=='1'"> <div fxLayout="column" fxLayoutAlign="start stretch" *ngIf="item.value.purchase_type=='1'">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<<<<<<< HEAD
<!-- <mat-select placeholder="UOM" name="fk_uom_id" formControlName="fk_uom_id"> <!-- <mat-select placeholder="UOM" name="fk_uom_id" formControlName="fk_uom_id">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
@ -75,19 +74,6 @@
{{U.name}} {{U.name}}
</mat-option> </mat-option>
</mat-select> </mat-select>
=======
<mat-select matInput placeholder="UOM" formControlName="fk_uom_id">
<mat-option>
<ngx-mat-select-search formControlName="uomSearch" (keyup)="searchUOM(item,i)"
[placeholderLabel]="'Find UOM'" [noEntriesFoundLabel]="'No Matching Result'">
<ion-icon name="md-close" ngxMatSelectSearchClear></ion-icon>
</ngx-mat-select-search>
</mat-option>
<mat-option [value]="U.uom_id" *ngFor="let U of UOMData">
{{U.name}}
</mat-option>
</mat-select>
>>>>>>> fbff71164d0a61647d78e18401d7f601174a4500
</mat-form-field> </mat-form-field>
</div> </div>

14
src/pages/pd-question/pd-question-assests/pd-question-assests.html
View File

@ -14,7 +14,7 @@
</ion-segment-button> </ion-segment-button>
</ion-segment> </ion-segment>
</ion-header> </ion-header>
<ion-content> <ion-content padding>
<div [ngSwitch]="tab"> <div [ngSwitch]="tab">
<mat-card *ngSwitchCase="'1'" #picContent> <mat-card *ngSwitchCase="'1'" #picContent>
@ -36,7 +36,7 @@
<hr/> <hr/>
<hr/> <hr/>
<!-- </ion-grid> -->
<ion-grid *ngIf="imageBucket.length >0 "> <ion-grid *ngIf="imageBucket.length >0 ">
<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>
@ -423,12 +423,12 @@
</form> </form>
</div> </div>
<ion-fab bottom right mini> <ion-fab bottom right mini>
<button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="savePhoto()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab> <button mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="savePhoto()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button>
</ion-fab>
</ion-content> </ion-content>
<ion-footer> <ion-footer>
<span *ngIf='!complete_status'> <span *ngIf='!complete_status'>
<button ion-button ion-fixed full color="optblue" (click)="saveAssetDetails(AssetsDetailsForm.value)"> Save</button> <button ion-button full color="optblue" (click)="saveAssetDetails(AssetsDetailsForm.value)"> Save</button>
</span> </span>
</ion-footer> </ion-footer>

5
src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.html
View File

@ -187,7 +187,7 @@
<!-- <span *ngIf="(sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3) && sup.get('business_ownership_type').value == 'owned'"> --> <!-- <span *ngIf="(sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3) && sup.get('business_ownership_type').value == 'owned'"> -->
<mat-form-field> <mat-form-field>
<mat-label>Approx Vintage</mat-label> <mat-label>Age of Asset in Years</mat-label>
<input matInput autocomplete="off" placeholder="eg.99" formControlName="business_vintage" <input matInput autocomplete="off" placeholder="eg.99" formControlName="business_vintage"
minlength="1" maxlength="2" type='tel' minlength="1" maxlength="2" type='tel'
(keyup)="calculateVintagePurchase($event.target.value,i,3)"> (keyup)="calculateVintagePurchase($event.target.value,i,3)">
@ -376,7 +376,8 @@
<!-- <div *ngIf="sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3">--> <!-- <div *ngIf="sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3">-->
<div> <div>
<mat-form-field> <mat-form-field>
<mat-label>Approx Vintage</mat-label> <mat-label>Age of Asset in Years</mat-label>
<input matInput autocomplete="off" type="tel" placeholder="eg.99" <input matInput autocomplete="off" type="tel" placeholder="eg.99"
formControlName="business_vintage" minlength="1" maxlength="2" formControlName="business_vintage" minlength="1" maxlength="2"
(keyup)="calculateVintagePurchase($event.target.value,i,1)"> (keyup)="calculateVintagePurchase($event.target.value,i,1)">

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

@ -111,14 +111,14 @@
<mat-hint style="color: red;" align="start" style="font-size:11px">{{monthErrorMessage[i]}}</mat-hint> <mat-hint style="color: red;" align="start" style="font-size:11px">{{monthErrorMessage[i]}}</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:100%;" > <mat-form-field style="width:100%;" >
<input matInput autocomplete="off" placeholder="Total Work Experience" type="number" <input matInput autocomplete="off" placeholder="Total Work Experience (in years)" type="number"
formControlName="total_business_experiance" (keypress)="keyPress($event)" (keyup)="getWorkExperience(member.value,i)" formControlName="total_business_experiance" (keypress)="keyPress($event)" (keyup)="getWorkExperience(member.value,i)"
(change)="checkWithExistTotalWorkExperience($event.target.value,i,member)"> (change)="checkWithExistTotalWorkExperience($event.target.value,i,member)">
<mat-hint style="color: red;" align="start" style="font-size:11px">{{errorMessageForExistTotalWorkExperience[i]}}</mat-hint> <mat-hint style="color: red;" align="start" style="font-size:11px">{{errorMessageForExistTotalWorkExperience[i]}}</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:100%;" *ngIf="member.value.total_business_previous_experience!=undefined"> <mat-form-field style="width:100%;" *ngIf="member.value.total_business_previous_experience!=undefined">
<input matInput autocomplete="off" placeholder="Previous Work Experience" formControlName="total_business_previous_experience"> <input matInput autocomplete="off" placeholder="Previous Work Experience Details" formControlName="total_business_previous_experience">
</mat-form-field> </mat-form-field>
@ -1357,7 +1357,7 @@
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<mat-form-field style="width:100%;"> <mat-form-field style="width:100%;">
<input autocomplete="off" matInput type="number" formControlName="export_sale_of_total_sales"> <input autocomplete="off" matInput type="number" formControlName="export_sale_of_total_sales" minlength="1" maxlength="3">
</mat-form-field> </mat-form-field>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
@ -1541,6 +1541,7 @@
<ion-col> <ion-col>
<div float-right *ngIf="businessForm.controls['shop_eat_act_cert'].value == 'yes'"> <div float-right *ngIf="businessForm.controls['shop_eat_act_cert'].value == 'yes'">
<br> <br>
<div *ngIf="businessForm.controls['shop_eat_act_cert_pic']">
<div *ngIf="businessForm.controls['shop_eat_act_cert_pic'].value !== ''" > <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;"> <img src="{{businessForm.controls['shop_eat_act_cert_pic'].value}}" imageViewer style ="width: 40px;height: 35px;">
</div> </div>
@ -1552,6 +1553,7 @@
<ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(1)"></ion-icon> <ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(1)"></ion-icon>
</div> </div>
</div> </div>
</div>
</ion-col> </ion-col>
</ion-row> </ion-row>
@ -1570,6 +1572,7 @@
<ion-col> <ion-col>
<div float-right *ngIf="businessForm.controls['gst_Regn_cert'].value == 'yes'"> <div float-right *ngIf="businessForm.controls['gst_Regn_cert'].value == 'yes'">
<br> <br>
<div *ngIf="businessForm.controls['gst_Regn_cert_pic']" >
<div *ngIf="businessForm.controls['gst_Regn_cert_pic'].value !== ''" > <div *ngIf="businessForm.controls['gst_Regn_cert_pic'].value !== ''" >
<img src="{{businessForm.controls['gst_Regn_cert_pic'].value}}" imageViewer style ="width: 40px;height: 35px;"> <img src="{{businessForm.controls['gst_Regn_cert_pic'].value}}" imageViewer style ="width: 40px;height: 35px;">
</div> </div>
@ -1581,6 +1584,7 @@
<ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(2)"></ion-icon> <ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(2)"></ion-icon>
</div> </div>
</div> </div>
</div>
</ion-col> </ion-col>
</ion-row> </ion-row>
@ -1600,6 +1604,7 @@
<ion-col> <ion-col>
<div float-right *ngIf="businessForm.controls['export_import_cert'].value == 'yes'"> <div float-right *ngIf="businessForm.controls['export_import_cert'].value == 'yes'">
<br> <br>
<div *ngIf="businessForm.controls['export_import_cert_pic']" >
<div *ngIf="businessForm.controls['export_import_cert_pic'].value !== ''" > <div *ngIf="businessForm.controls['export_import_cert_pic'].value !== ''" >
<img src="{{businessForm.controls['export_import_cert_pic'].value}}" imageViewer style ="width: 40px;height: 35px;"> <img src="{{businessForm.controls['export_import_cert_pic'].value}}" imageViewer style ="width: 40px;height: 35px;">
</div> </div>
@ -1611,6 +1616,7 @@
<ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(3)"></ion-icon> <ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(3)"></ion-icon>
</div> </div>
</div> </div>
</div>
</ion-col> </ion-col>
@ -1630,6 +1636,7 @@
<ion-col> <ion-col>
<div float-right *ngIf="businessForm.controls['factory_cert'].value == 'yes'"> <div float-right *ngIf="businessForm.controls['factory_cert'].value == 'yes'">
<br> <br>
<div *ngIf="businessForm.controls['factory_cert_pic']" >
<div *ngIf="businessForm.controls['factory_cert_pic'].value !== ''" > <div *ngIf="businessForm.controls['factory_cert_pic'].value !== ''" >
<img src="{{businessForm.controls['factory_cert_pic'].value}}" imageViewer style ="width: 40px;height: 35px;"> <img src="{{businessForm.controls['factory_cert_pic'].value}}" imageViewer style ="width: 40px;height: 35px;">
</div> </div>
@ -1641,6 +1648,7 @@
<ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(4)"></ion-icon> <ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(4)"></ion-icon>
</div> </div>
</div> </div>
</div>
</ion-col> </ion-col>
</ion-row> </ion-row>
@ -1660,6 +1668,7 @@
<ion-col> <ion-col>
<div float-right *ngIf="businessForm.controls['practice_cert'].value == 'yes'"> <div float-right *ngIf="businessForm.controls['practice_cert'].value == 'yes'">
<br> <br>
<div *ngIf="businessForm.controls['practice_cert_pic']" >
<div *ngIf="businessForm.controls['practice_cert_pic'].value !== ''" > <div *ngIf="businessForm.controls['practice_cert_pic'].value !== ''" >
<img src="{{businessForm.controls['practice_cert_pic'].value}}" imageViewer style ="width: 40px;height: 35px;"> <img src="{{businessForm.controls['practice_cert_pic'].value}}" imageViewer style ="width: 40px;height: 35px;">
</div> </div>
@ -1671,6 +1680,7 @@
<ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(5)"></ion-icon> <ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(5)"></ion-icon>
</div> </div>
</div> </div>
</div>
</ion-col> </ion-col>
</ion-row> </ion-row>
@ -1689,6 +1699,7 @@
<ion-col> <ion-col>
<div float-right *ngIf="businessForm.controls['pf_regn'].value == 'yes'"> <div float-right *ngIf="businessForm.controls['pf_regn'].value == 'yes'">
<br> <br>
<div *ngIf="businessForm.controls['pf_regn_pic']" >
<div *ngIf="businessForm.controls['pf_regn_pic'].value !== ''" > <div *ngIf="businessForm.controls['pf_regn_pic'].value !== ''" >
<img src="{{businessForm.controls['pf_regn_pic'].value}}" imageViewer style ="width: 40px;height: 35px;"> <img src="{{businessForm.controls['pf_regn_pic'].value}}" imageViewer style ="width: 40px;height: 35px;">
</div> </div>
@ -1700,6 +1711,7 @@
<ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(6)"></ion-icon> <ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(6)"></ion-icon>
</div> </div>
</div> </div>
</div>
</ion-col> </ion-col>
</ion-row> </ion-row>
@ -1716,6 +1728,7 @@
<ion-col> <ion-col>
<div float-right *ngIf="businessForm.controls['esic_regn'].value == 'yes'"> <div float-right *ngIf="businessForm.controls['esic_regn'].value == 'yes'">
<br> <br>
<div *ngIf="businessForm.controls['esic_regn_pic']" >
<div *ngIf="businessForm.controls['esic_regn_pic'].value !== ''" > <div *ngIf="businessForm.controls['esic_regn_pic'].value !== ''" >
<img src="{{businessForm.controls['esic_regn_pic'].value}}" imageViewer style ="width: 40px;height: 35px;"> <img src="{{businessForm.controls['esic_regn_pic'].value}}" imageViewer style ="width: 40px;height: 35px;">
</div> </div>
@ -1727,6 +1740,7 @@
<ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(7)"></ion-icon> <ion-icon title="Click Here For Person Met Image" name="md-camera" (click)="ImageUpload(7)"></ion-icon>
</div> </div>
</div> </div>
</div>
</ion-col> </ion-col>
</ion-row> </ion-row>

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

@ -782,8 +782,8 @@ changeOfStartedBusiness(members,i,e){
console.log('businessVal',businessVal); 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'].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'].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'].practice_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'].shop_eat_act_cert =='yes'){ 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'].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'].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');} if(data['records'].export_import_cert =='yes'){ this.businessForm.addControl('export_import_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('export_import_cert_pic');}
@ -2259,16 +2259,17 @@ toGetPOSMachinesDetails(e,flag){
} }
sendImage(){ sendImage(){
this.loading.loaderForSendImage() this.loading.loaderForSendImage()
console.log("ll",JSON.stringify(this.imageBucket)); console.log("about business - Images bucket",JSON.stringify(this.imageBucket));
let records:any={ let records:any={
'pd_id':this.pdDetails.pd_id, 'pd_id':this.pdDetails.pd_id,
'formid':this.FormId, 'formid':this.FormId,
'images':this.imageBucket, 'images':this.imageBucket,
'company_id':this.pdDetails.company_id 'company_id':this.pdDetails.company_id
} }
console.log("records",JSON.stringify(records)) console.log("about Business images ",JSON.stringify(records));
this.qustCat.savePDImages(records).subscribe(res=>{ this.qustCat.savePDImages(records).subscribe(res=>{
console.log('response records',res,res['record']);
if(res['dataStatus']== true){ if(res['dataStatus']== true){
this.toast.pdTriggerappmessage("Image Saved Successfully") this.toast.pdTriggerappmessage("Image Saved Successfully")
this.imageBucket=[] this.imageBucket=[]
@ -2286,20 +2287,15 @@ toGetPOSMachinesDetails(e,flag){
} }
ImageUpload(Flag : any){ ImageUpload(Flag : any){
// alert('Inside Mobile Upload Function' + Flag);
// alert('is_person_met_pic 1');
this.cameraProvider.getpicture().then(res=>{ 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 == 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 == 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 == 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 == 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 == 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 == 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);}
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=>{ },error=>{
console.log("Camera Error ",JSON.stringify(error)); console.log("Camera Error ",JSON.stringify(error));
}) })

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

@ -190,6 +190,7 @@ export class PdQuestionGeneralInfoPage {
else{ else{
//AFTER FORM DIRTY CHECK //AFTER FORM DIRTY CHECK
if (this.imageBucket.length > 0) { if (this.imageBucket.length > 0) {
console.log('if part . this.imageBucket.length',this.imageBucket.length);
return new Promise((resolve1, reject1) => { return new Promise((resolve1, reject1) => {
let alert = this.toast.setAlert("<small>Captured Images are not Saved<small>", "<strong><small>Note:To Save the image press the Save Image button</small></strong><br> Are you sure want to Go Back?") let alert = this.toast.setAlert("<small>Captured Images are not Saved<small>", "<strong><small>Note:To Save the image press the Save Image button</small></strong><br> Are you sure want to Go Back?")
alert.present(); alert.present();
@ -215,6 +216,7 @@ export class PdQuestionGeneralInfoPage {
else{ else{
//REGULAR CHECK FOR IMAGE IS CAPTURED //REGULAR CHECK FOR IMAGE IS CAPTURED
if (this.imageBucket.length > 0) { if (this.imageBucket.length > 0) {
console.log('else part . this.imageBucket.length',this.imageBucket.length)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let alert = this.toast.setAlert("<small>Captured Images are not Saved<small>", "<strong><small>Note:To Save the image press the 'Save Image' button</small></strong><br> Are you sure want to Go Back?") let alert = this.toast.setAlert("<small>Captured Images are not Saved<small>", "<strong><small>Note:To Save the image press the 'Save Image' button</small></strong><br> Are you sure want to Go Back?")
alert.present(); alert.present();
@ -1414,16 +1416,16 @@ console.log('1)',this.temp);
} }
sendImage(){ sendImage(){
this.loading.loaderForSendImage() this.loading.loaderForSendImage()
console.log("ll",JSON.stringify(this.imageBucket)); console.log("image bucket - json data",JSON.stringify(this.imageBucket));
let records:any={ let records:any={
'pd_id':this.pdDetails.pd_id, 'pd_id':this.pdDetails.pd_id,
'formid':this.FormId.form_id, 'formid':this.FormId.form_id,
'images':this.imageBucket, 'images':this.imageBucket,
'company_id':'' 'company_id':''
} }
console.log("records",JSON.stringify(records)) console.log("DB - records",JSON.stringify(records))
this.qustCat.savePDImages(records).subscribe(res=>{ this.qustCat.savePDImages(records).subscribe(res=>{
if(res['dataStatus']== true){ if(res['dataStatus']== true){
this.toast.pdTriggerappmessage("Image Saved Successfully") this.toast.pdTriggerappmessage("Image Saved Successfully")
@ -1445,15 +1447,11 @@ console.log('1)',this.temp);
} }
ImageUpload(control,Flag : any){ ImageUpload(control,Flag : any){
// alert('Inside Mobile Upload Function' + Flag);s
if(Flag == 1){ if(Flag == 1){
// alert('is_person_met_pic 1');
this.cameraProvider.getpicture().then(res=>{ this.cameraProvider.getpicture().then(res=>{
// alert("Response 1" + res);
if(res != 'error'){ if(res != 'error'){
control.controls['is_person_met_pic'].setValue(res); control.controls['is_person_met_pic'].setValue(res);
// alert(JSON.stringify(this.generalForm.value)); //this.toast.pdTriggerappmessage('Flag 1 Success');
// this.toast.pdTriggerappmessage('Flag 1 Success');
} }
else{ else{
control.controls['is_person_met_pic'].setValue(''); control.controls['is_person_met_pic'].setValue('');
@ -1465,12 +1463,9 @@ console.log('1)',this.temp);
}) })
} }
else if(Flag == 2){ else if(Flag == 2){
// alert('is_person_met_id_proof 2');
this.cameraProvider.getpicture().then(res=>{ this.cameraProvider.getpicture().then(res=>{
// alert("Response 2" + res);
if(res != 'error'){ if(res != 'error'){
control.controls['is_person_met_id_proof'].setValue(res); control.controls['is_person_met_id_proof'].setValue(res);
// alert(JSON.stringify(this.generalForm.value));
// this.toast.pdTriggerappmessage('Flag 2 Success'); // this.toast.pdTriggerappmessage('Flag 2 Success');
} }
else{ else{
@ -1482,6 +1477,5 @@ console.log('1)',this.temp);
console.log("Camera Error ",JSON.stringify(error)); console.log("Camera Error ",JSON.stringify(error));
}) })
} }
// console.table('Overall',this.generalForm.value);
} }
} }