merge confit removed ps

src/pages/input/input.ts

@@ -621,10 +621,6 @@ 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/pd-question-address/pd-question-address.html

@@ -211,19 +211,6 @@
           <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">
@@ -418,7 +405,7 @@
       <!-- <ion-buttons >
       <ion-button color="optblue" full [disabled]="!pdforms.valid" mat-raised-button style="width:100%" (click)="savepdDetails(pdforms.value)">Save <ion-icon name="md-disc"></ion-icon></ion-button> -->
       <span *ngIf='!complete_status'>
-        <button ion-button full ion-fixed color="optblue" (click)="savepdQuestion(pdQuestionAddress.value)"> Save</button>
+        <button ion-button full color="optblue" (click)="savepdQuestion(pdQuestionAddress.value)"> Save</button>
       </span>
        <!-- </ion-buttons> -->
      

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

@@ -4,16 +4,10 @@ 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.
  *
@@ -48,10 +42,6 @@ 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');
@@ -401,16 +391,9 @@ 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);
@@ -498,26 +481,6 @@ else{
     }
     
 
-    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)
-          })
-        }
 
   createSaleswithData(data)
   {

src/pages/pd-question/pd-question-general-info/pd-question-general-info.ts

@@ -1445,14 +1445,14 @@ console.log('1)',this.temp);
    }
 
     ImageUpload(control,Flag : any){ 
-      // alert('Inside Mobile Upload Function' + Flag);
+      // alert('Inside Mobile Upload Function' + Flag);s
       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));
+            //  alert(JSON.stringify(this.generalForm.value));
             //  this.toast.pdTriggerappmessage('Flag 1 Success');
           }
           else{

www/index.html

@@ -1,9 +1,6 @@
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 <head>
-  <script data-ionic="inject">
-    (function(w){var i=w.Ionic=w.Ionic||{};i.version='3.9.2';i.angular='^5.0.3';i.staticDir='build/';})(window);
-  </script>
   <meta charset="UTF-8">
   <title>Ionic App</title>
   <meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">