'merge'

package.json

@@ -71,6 +71,7 @@
   },
   "devDependencies": {
     "@ionic/app-scripts": "3.1.5",
+    "@ionic/lab": "1.0.24",
     "typescript": "2.4.2"
   },
   "description": "An Ionic project",

src/pages/input/input.html

@@ -62,7 +62,11 @@
      <hr>
      <ion-row>
         <ion-col col-1><ion-icon name="md-cash"></ion-icon></ion-col>
+<<<<<<< HEAD
         <ion-col class="cardinfo">{{"&#8377;"}} {{pdMaster.loan_amount}}  ( {{inWords(pdMaster.loan_amount)}} ) </ion-col>
+=======
+        <ion-col class="cardinfo">{{"&#8377;"}} {{pdMaster.loan_amount}} ( {{inWords(pdMaster.loan_amount)}} ) </ion-col>
+>>>>>>> fbff71164d0a61647d78e18401d7f601174a4500
      </ion-row>
      <hr/>
      <div *ngFor="let addr of addresses; let i=index">

src/pages/input/input.ts

@@ -135,7 +135,7 @@ checkOtpAccess:boolean = false;
   
   ionViewDidLoad() {
     this.setPermission();
-    
+    console.log('ionViewDidLoad InputPage'); 
   }
   ionViewCanLeave()
   {
@@ -620,6 +620,11 @@ else{
   {
     this.navCtrl.push(PdGeneralImagesPage,{'pdDetails':this.applicatentDetails});
   }
+
+  inWords(e){
+    return this.constant.convertNumberToWords(+e);
+  }
+
   inprogress(data,address_child){
     // data.pd_id=address_child.pd_id
     console.log(address_child)

src/pages/pd-question-category/pd-question-category.ts

@@ -355,19 +355,14 @@ searchitem:any;
 completePDAlert()
 { 
   if(!this.overallqustioncountAccess){// For checking Answered Forms
-  this.toast.pdTriggerappmessage("Please complete all the Forms");
-  return;
-}
-
-    console.log("this.ena",this.enableAddonPD);
-
+        this.toast.pdTriggerappmessage("Please complete all the Forms");
+        return;
+  }
     if(this.enableAddonPD == true){//FOR CHECKING THE ADDRESS COUNT. IF VALUE 1 THIS BLOCK EXECUTED
   return new Promise(reject=>{
     let alert=this.toast.setAlertForCompletePD()  
     alert.present();
-    
     alert.onDidDismiss(data=>{
-      console.log('data',data)
       if(data == 'yes'){
        
         this.completed('COMPLETED');

src/pages/pd-question/pd-question-address/pd-question-address.html

@@ -211,6 +211,19 @@
           <input matInput placeholder="Specify UOM" formControlName="uom_others"
               autocomplete="off">
       </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">

src/pages/pd-question/pd-question-assessed-business/pd-question-assessed-business.html

@@ -4,7 +4,7 @@
     <button ion-button menuToggle>
       <ion-icon name="menu"></ion-icon>
     </button>
-    <ion-title *ngIf="!viewchange">Business Expense</ion-title>
+    <ion-title *ngIf="!viewchange">Business Expenses</ion-title>
 
 
   </ion-navbar>

src/pages/pd-question/pd-question-assessed-purchase/pd-question-assessed-purchase.html

@@ -58,6 +58,7 @@
           </div>
           <div fxLayout="column" fxLayoutAlign="start stretch" *ngIf="item.value.purchase_type=='1'">
             <mat-form-field style="width: 100%">
+<<<<<<< HEAD
               
               <!-- <mat-select placeholder="UOM" name="fk_uom_id" formControlName="fk_uom_id">
                   <mat-option>Select</mat-option>
@@ -74,6 +75,19 @@
                                 {{U.name}}
                             </mat-option>
                             </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>
             
           </div>

src/pages/pd-question/pd-question-assessed-purchase/pd-question-assessed-purchase.ts

@@ -31,7 +31,8 @@ export class PdQuestionAssessedPurchasePage {
   rawMaterialForm:FormGroup;
   RateOfPurchase: any=[];
   AnnualPurchase: any=[];
-  productListData:any=[]
+  productListData:any=[];
+  UOMData:any=[]
   check_type:any=[{'type_id':"1",'type_name':'Quantity and Rate Information'},{'type_id':"2",'type_name':'Value Information'}]
   complete_status: boolean = false;
   UOMData:any=[];
@@ -181,7 +182,6 @@ export class PdQuestionAssessedPurchasePage {
 
   purchaseCalculation(indexVal,values)
   {
-console.log("value",values);
     let control:any = <FormArray>this.rawMaterialForm.controls['purchase'];
     if(values.rate_per_unit != null){
             if(values.rate_per_unit != ''){
@@ -259,6 +259,11 @@ console.log("value",values);
     })
 
     if(this.rawMaterialForm.valid){
+      
+      answerData.purchase.forEach(parVal=>{
+        delete parVal.uomSearch
+      })
+      
     let records = {'records':answerData.purchase};
     console.log('data',records);
     this.qustCat.saveassessedForms('saveAssessedIncomePurchaseDetails',records).subscribe(res=>

src/pages/pd-question/pd-question-assessed-sales/pd-question-assessed-sales.ts

@@ -4,9 +4,16 @@ import { AwsServiceProvider } from '../../../providers/aws-service/aws-service';
 import { FormGroup, FormBuilder, Validators, FormArray } from '@angular/forms';
 import { QuestionCategoryProvider } from '../../../providers/question-category/question-category';
 import { ToastProvider } from '../../../providers/common-provider/toast';
+<<<<<<< HEAD
 import {ConstantsProvider} from '../../../providers/constants/constants'
 import { takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs';
+=======
+import {ConstantsProvider} from '../../../providers/constants/constants';
+import { takeUntil } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+
+>>>>>>> fbff71164d0a61647d78e18401d7f601174a4500
 /**
  * Generated class for the PdQuestionAssessedSalesPage page.
  *
@@ -41,6 +48,10 @@ export class PdQuestionAssessedSalesPage {
   complete_status: boolean = false;
   UOMData:any=[]
   protected _onDestroy = new Subject<void>();
+<<<<<<< HEAD
+=======
+
+>>>>>>> fbff71164d0a61647d78e18401d7f601174a4500
   constructor(public navCtrl: NavController, public navParams: NavParams,public aws:AwsServiceProvider,public fb:FormBuilder,public qustCat:QuestionCategoryProvider,public toast:ToastProvider,public cons:ConstantsProvider) {
     this.pdDetails = this.navParams.get('pdDetails');
     this.FormId = this.navParams.get('FormId');
@@ -390,9 +401,16 @@ export class PdQuestionAssessedSalesPage {
   {
     
     if(this.assessedForm.valid){
+<<<<<<< HEAD
       answerData.salesCalItemwise.forEach(parVal=>{
                 delete parVal.uomSearch
               });
+=======
+      
+      answerData.salesCalItemwise.forEach(parVal=>{
+        delete parVal.uomSearch
+      })
+>>>>>>> fbff71164d0a61647d78e18401d7f601174a4500
 
     let records = {'records':answerData.salesCalItemwise};
     console.log(records);
@@ -524,4 +542,26 @@ else{
         comments:[data.comments]
       });
   }
+
+  searchUOM(control:any,i:number){  
+    control.controls['uomSearch'].valueChanges
+      .pipe(takeUntil(this._onDestroy))
+      .subscribe(()=>{
+        let val = control.controls['uomSearch'].value;
+        if (!this.UOM) {
+          return
+        }
+        let searchVal = val
+        if (!searchVal) {
+  
+         this.UOMData=this.UOM.slice()
+          return
+        }
+        else {
+          searchVal = searchVal.toLowerCase()
+        }
+        this.UOMData=this.UOM.filter(res => res.name.toLowerCase().indexOf(searchVal) > -1)
+    })
+  }
+
 }

src/pages/pd-question/pd-question-assests/pd-question-assests.html

@@ -429,6 +429,6 @@
 <ion-footer>
       
         <span *ngIf='!complete_status'>
-    <button ion-button full color="optblue" (click)="saveAssetDetails(AssetsDetailsForm.value)"> Save</button>
+    <button ion-button ion-fixed full color="optblue" (click)="saveAssetDetails(AssetsDetailsForm.value)"> Save</button>
 </span>
 </ion-footer>

src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.html

@@ -133,6 +133,8 @@
                     <mat-option>Select</mat-option>
                     <mat-option value="owned">Owned</mat-option>
                     <mat-option value="rented">Rented</mat-option>
+                    <!-- <mat-option value="owned">{{ addressType + ' Owned'}}</mat-option>
+                    <mat-option value="rented">{{ addressType + ' Rented' }}</mat-option> -->
                   </mat-select>
                 </mat-form-field>
 
@@ -430,7 +432,7 @@
   <!--END OF FORM SEGMENT-->
 </div>
 <!--END OF SWITCHCASES-->
-<ion-fab bottom right   mini>
+<ion-fab bottom right  mini>
         <button  mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab>
 </ion-content>
 <ion-footer>

src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.ts

@@ -68,7 +68,7 @@ export class PdQuestionBusinessAssetsPage {
   imageBucket: any=[];
   tab: any='0';
   complete_status: boolean = false;
-  
+  addressType:any = '';
   constructor(public navCtrl: NavController, public navParams: NavParams,
     public aws:AwsServiceProvider,public fb:FormBuilder,public qustcat:QuestionCategoryProvider,
     public cons:ConstantsProvider,public toast:ToastProvider,private loading:LoadingProvider,
@@ -165,6 +165,7 @@ export class PdQuestionBusinessAssetsPage {
         business_purchase_year: '',
         business_emi: ''
       }
+      console.log('this.addressType',this.addressType);
       control.push(this.initBusinessDetailsWithdata(values));
     }
   })

src/providers/common-provider/camera.ts

@@ -11,7 +11,10 @@ import { Camera } from '@ionic-native/camera';
 export class CameraProvider {
 
   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() 
   {

src/providers/constants/constants.ts

@@ -21,7 +21,7 @@ public commonimage = "http://ssa.sineedge.com/sparqapi/logo/avatar.jpg";
     let devapiurl_beta = 'http://ssa.sineedge.com/sparqapi_beta/api/';
     let devapiurl = 'http://ssa.sineedge.com/sparqapi/api/';
     let localapiurl = 'http://192.168.0.6:9999/AWSEC2/sparqapi/api/';
-    return testapiurl;
+    return devapiurl;
   }
 
   getcurrentDate()