Fairoj : Issues Fixed

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.sineedge.pdgenie" version="0.0.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.sineedge.pdgenie" version="0.0.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>PD Genie Officer </name>
     <description>info@pdgenie.com</description>
     <author email="info@pdgenie.com" href="https://pdgenie.com">PD Genie</author>

platforms/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="2" android:versionName="0.0.2" package="com.sineedge.pdgenie" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="3" android:versionName="0.0.3" package="com.sineedge.pdgenie" xmlns:android="http://schemas.android.com/apk/res/android">
     <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
     <uses-permission android:name="android.permission.INTERNET" />
     <application android:hardwareAccelerated="true" android:icon="@mipmap/icon" android:label="@string/app_name" android:supportsRtl="true">

platforms/android/app/src/main/res/xml/config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.sineedge.pdgenie" version="0.0.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.sineedge.pdgenie" version="0.0.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <feature name="ActionSheet">
         <param name="android-package" value="nl.xservices.plugins.actionsheet.ActionSheet" />
     </feature>

src/pages/complete-list/complete-list.html

@@ -43,7 +43,7 @@
            <!-- <ion-icon item-start="" class="lettericon" [style.background]="bgColor[i]">{{progess.applicat_details[0].applicant_name | slice : 0 :1 | uppercase}}</ion-icon> -->
            <p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_id}}</p>
                <ion-row>
-                 <ion-col col-5 *ngIf="progess.applicat_details.length !=0 && progess.applicat_details[0].applicant_type == 1">
+                 <ion-col col-7 *ngIf="progess.applicat_details.length !=0 && progess.applicat_details[0].applicant_type == 1">
                    <h1>{{progess.applicat_details[0].applicant_name | titlecase}}</h1>
                    <!--<p>28 Sep 2018 10:00 AM</p>-->
                  </ion-col>
@@ -55,7 +55,7 @@
                    </ion-col>                 
                </ion-row>  
                 <ion-row>
-                 <ion-col col-6>
+                 <ion-col col-7>
                    <h6 class="app_id">{{progess.lender_short_name}}, {{progess.lender_applicant_id}}</h6>
                  </ion-col>
                  <ion-col text-right>
@@ -69,7 +69,7 @@
             <!-- <ion-icon item-start="" class="lettericon" [style.background]="bgColorPast[i]" >{{progess.pd_status | slice : 0 :1 | uppercase}}</ion-icon> -->
             <p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_id}}</p>
                 <ion-row>
-                  <ion-col col-5 >
+                  <ion-col col-7 >
                     <h1>Add On for {{progess.parent_pd_id}}</h1>
                     <!--<p>28 Sep 2018 10:00 AM</p>-->
                   </ion-col>

src/pages/complete-list/complete-list.scss

@@ -20,7 +20,9 @@ page-complete-list {
       }
       h1{
           margin: 2px 0;
-          font-size: 2.2rem !important;    
+          font-size: 2.1rem !important; 
+          overflow: auto;
+          // text-overflow: ellipsis;   
           // font-weight: bold!important;
       }
       // .box{
@@ -85,4 +87,8 @@ page-complete-list {
      .fab-md-optblue{
        box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
      }
+     .app_id{
+       overflow:hidden ;
+       text-overflow: ellipsis;
+     }
 }

src/pages/input/bounced-reject/bounced-reject.ts

@@ -33,7 +33,7 @@ export class BouncedRejectPage {
     // this.pdDetails = this.navParams.get('appdetails');
     // this.status = this.navParams.get('status');
     this.pdDetails=this.navParams.get('details')
-   // console.log(this.pdDetails)
+   console.log(this.pdDetails)
     this.users = this.aws.getlocale();
         this.getDropdown();
     
@@ -60,13 +60,16 @@ export class BouncedRejectPage {
     // console.log(this.bounce_reason)
     // console.log(this.bounce_reason_others);
     console.log(data);
-    this.toast.pdTriggerappmessage("Thank You");
+  
     this.pdservice.updatepdStatus(data).subscribe(res=>
         {
           // this.updateStatus = res;
           if(res['dataStatus'] == true)
           {
+            this.toast.pdTriggerappmessage("Updated Successfully");
+            setTimeout(()=>{
               this.navCtrl.setRoot(PdListPage); 
+            },2000)
           }
         })
       }
@@ -76,13 +79,16 @@ export class BouncedRejectPage {
         // console.log(this.bounce_reason)
         // console.log(this.bounce_reason_others);
         console.log(data);
-        this.toast.pdTriggerappmessage("Thank You");
+        this.toast.pdTriggerappmessage("Updated Successfully");
         this.pdservice.updatepdStatus(data).subscribe(res=>
             {
               // this.updateStatus = res;
               if(res['dataStatus'] == true)
               {
+                this.toast.pdTriggerappmessage("Updated Successfully");
+                setTimeout(()=>{
                   this.navCtrl.setRoot(PdListPage); 
+                },2000)
               }
             })
           }

src/pages/input/input.ts

@@ -283,7 +283,7 @@ checkOtpAccess:boolean = false;
     if(status == 'BOUNCED')
     {
       // data = {'pd_id':appdetails.pd_id,'pd_status':status,'fk_updatedby':this.users,'updatedon':currentdate};
-      data = {'pd_id':this.address_pd_id,'pd_status':status,'fk_updatedby':this.users,'updatedon':currentdate};
+      data = {'pd_id':this.address_pd_id,'pd_status':status,'fk_updatedby':this.users,'updatedon':currentdate,'random_string':this.applicatentDetails.random_string,'parent_pdid':this.pdMaster.parent_pd_id};
       this.navCtrl.push(BouncedRejectPage,{'details':data})
       // this.pdDetails.updatepdStatus(data).subscribe(res=>
       //   {

src/pages/pd-list/pd-list.html

@@ -125,7 +125,7 @@
                          <!-- <ion-icon item-start="" class="lettericon" [style.background]="bgColor[i]">{{progess.applicat_details[0].applicant_name | slice : 0 :1 | uppercase}}</ion-icon> -->
                          <p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_id}}</p>
                              <ion-row>
-                               <ion-col col-5 *ngIf="progess.applicat_details.length !=0 && progess.applicat_details[0].applicant_type == 1">
+                               <ion-col col-7 *ngIf="progess.applicat_details.length !=0 && progess.applicat_details[0].applicant_type == 1">
                                  <h1 >{{progess.applicat_details[0].applicant_name | titlecase}}</h1>
                                  <!--<p>28 Sep 2018 10:00 AM</p>-->
                                </ion-col>

src/pages/pd-list/pd-list.scss

@@ -21,7 +21,9 @@ page-pd-list{
     }
     h1{
         margin: 2px 0;
-        font-size: 2.2rem !important;    
+        font-size: 2.1rem !important;    
+        overflow: auto;
+        // text-overflow:ellipsis;
         // font-weight: bold!important;
     }
     // .box{

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

@@ -83,7 +83,7 @@
                       <h3>Total Business Income:</h3>
                     </ion-col>
                       <ion-col col-6>
-                        <h3><img [src]="'http://ssa.sineedge.com/sparqapi/logo/indian-rupee-symbol.jpg'" style="width: 10%; height: 10%;"> {{grandIncomeTotal}}</h3>
+                        <h3><img [src]="'http://pdgenie.com/logo/indian-rupee-symbol.jpg'" style="width: 10%; height: 10%;"> {{grandIncomeTotal}}</h3>
                       </ion-col>
                       </ion-row>
         </mat-card>

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

@@ -78,7 +78,7 @@
                       <h3>Total Business Expenses:</h3>
                     </ion-col>
                       <ion-col col-6>
-                        <h3><img [src]="'http://ssa.sineedge.com/sparqapi/logo/indian-rupee-symbol.jpg'" style="width: 10%; height: 10%;"> {{grandExpenseTotal}}</h3>
+                        <h3><img [src]="'http://pdgenie.com/logo/indian-rupee-symbol.jpg'" style="width: 10%; height: 10%;"> {{grandExpenseTotal}}</h3>
                       </ion-col>
                       </ion-row>
         </mat-card>

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

@@ -69,7 +69,7 @@
                             <h3>Total Household Expenses :</h3>
                           </ion-col>
                             <ion-col col-6>
-                              <h3><img [src]="'http://ssa.sineedge.com/sparqapi/logo/indian-rupee-symbol.jpg'" style="width: 10%; height: 10%;"> {{grandHouseExpenseTotal}}</h3>
+                              <h3><img [src]="'http://pdgenie.com/logo/indian-rupee-symbol.jpg'" style="width: 10%; height: 10%;"> {{grandHouseExpenseTotal}}</h3>
                             </ion-col>
                             </ion-row>
               </mat-card>

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

@@ -156,7 +156,7 @@
                   <h3>Grand Total:</h3>
                 </ion-col>
                   <ion-col col-6>
-                    <h3><img [src]="'http://ssa.sineedge.com/sparqapi/logo/indian-rupee-symbol.jpg'" style="width: 10%; height: 10%;"> {{grandpurchaseTotal}}</h3>
+                    <h3><img [src]="'http://pdgenie.com/logo/indian-rupee-symbol.jpg'" style="width: 10%; height: 10%;"> {{grandpurchaseTotal}}</h3>
                   </ion-col>
                   </ion-row>
         </mat-card>

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

@@ -718,7 +718,7 @@ createBusinessAssetsForAddress(): FormGroup {
  
 
     let formGroup= this.fb.group({
-      address_label:[data.address_label.replace(/\n/g,"")],
+      address_label:[data.address_label],
       business_assets_mode: [data.business_assets_mode],
       
       business_years:[data.business_year],

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

@@ -2253,7 +2253,7 @@
 
 
                                 </mat-radio-group>
-                                <mat-error style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="businessForm.controls['fir_noc'].errors?.required ">Fire NOC
+                                <mat-error style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="businessForm.controls['fire_noc'].errors?.required ">Fire NOC
                                     is Required</mat-error>
                             </ion-col>
                             <ion-col>

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

@@ -299,7 +299,8 @@ export class PdQuestionBusinessInfoPage {
             // country_sale.push(this.createCountrySale());
             //const max_sale_state:any=<FormArray> this.businessForm.controls['manufacturing_activity_details']['controls'][0].controls.max_sale_state_name;
             //max_sale_state.push(this.maxSaleState())
-            this.product_abbr == 'LAEP' ? this.businessForm.addControl('fire_noc', new FormControl(null, Validators.compose([Validators.required]))) : this.businessForm.removeControl('fire_noc');
+            this.product_abbr == 'LAEP' ? this.businessForm.addControl('fire_noc', new FormControl('',Validators.required)) : this.businessForm.removeControl('fire_noc');
+           
             if (data['status'] == 200) {
 
                 let DocArray: any;
@@ -799,7 +800,7 @@ export class PdQuestionBusinessInfoPage {
                 if (data['records'].esic_regn == 'yes') { this.businessForm.addControl('esic_regn_pic', new FormControl('', Validators.compose([Validators.required]))); } else { this.businessForm.removeControl('esic_regn_pic'); }
                 if (data['records'].export_import_cert == 'yes') { this.businessForm.addControl('export_import_cert_pic', new FormControl('', Validators.compose([Validators.required]))); } else { this.businessForm.removeControl('export_import_cert_pic'); }
                 if (data['records'].fire_noc == 'yes') { this.businessForm.addControl('fire_noc_pic', new FormControl('', Validators.compose([Validators.required]))); } else { this.businessForm.removeControl('fire_noc_pic'); }
-
+                businessVal.business_info_location ? delete businessVal.business_info_location : ''
                 this.businessForm.setValue(businessVal);
 
 

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

@@ -406,7 +406,7 @@
                 <mat-option>Select</mat-option>
                 <mat-option [value]="member.relationship_id" *ngFor="let member of relationShipList">{{member.name + '
                   Of' | titlecase}}</mat-option>
-                <mat-option value="0"> Not Applicable </mat-option>
+                <mat-option value="0"> Not Related </mat-option>
               </mat-select>
             </mat-form-field>
             <!-- | searchRelation : { currentApplicantID:generalForm.controls.persons_with_relationships.value[i].pd_co_applicant_id, existRelationList:generalForm.controls.persons_with_relationships.value}" -->
@@ -416,7 +416,7 @@
                     <mat-option>Select</mat-option>
                     <mat-option *ngFor="let appc of individualsList | searchRelation : { currentApplicantID:generalForm.controls.persons_with_relationships.value[i].pd_co_applicant_id, existRelationList:generalForm.controls.persons_with_relationships.value}" 
                         [value]="appc.pd_co_applicant_id">{{appc.applicant_name | titlecase}}</mat-option>
-                    <mat-option value="0"> Not Applicable </mat-option>
+                    <mat-option value="0"> Not Related </mat-option>
                 </mat-select>
 
               <!-- <mat-select placeholder="RelationTo" formControlName="relation_to">

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

@@ -96,7 +96,7 @@ export class PdQuestionGeneralInfoPage {
     //this.maxDate=new Date(get_max_date)
     this.FormId = this.navParams.get('FormId');
     this.customer_segment_abbr = this.pdDetails.customer_segment_abbr;
-    console.log('this.customer_segment_abbr',this.customer_segment_abbr)
+    // console.log('this.customer_segment_abbr',this.customer_segment_abbr)
     this.users = this.aws.getlocale();
     this.getdropdown();
    
@@ -121,9 +121,9 @@ export class PdQuestionGeneralInfoPage {
   //this.initIndividuals();
   this.pd_applicants_details = this.pdDetails.applicat_details;
   
-   console.log("persons_with_relationships",this.generalForm.controls['persons_with_relationships']['controls'][0])
+  //  console.log("persons_with_relationships",this.generalForm.controls['persons_with_relationships']['controls'][0])
    let control=this.generalForm.get('persons_with_relationships')
-   console.log('p1',control)
+  //  console.log('p1',control)
   
  
   // this.getcoapplicantDetails();
@@ -185,7 +185,7 @@ export class PdQuestionGeneralInfoPage {
         let alert=this.toast.setAlert("Data will be Lost","Are you sure want to Go Back")
         alert.present();
         alert.onDidDismiss((data)=>{
-          console.log("d",data);
+          // console.log("d",data);
           if(data== false){
             reject();
             return true;
@@ -193,12 +193,12 @@ export class PdQuestionGeneralInfoPage {
           else{
             //AFTER FORM DIRTY CHECK
             if (this.imageBucket.length > 0) {
-              console.log('if part . this.imageBucket.length',this.imageBucket.length);
+              // console.log('if part . this.imageBucket.length',this.imageBucket.length);
               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?")
                 alert.present();
                 alert.onDidDismiss((data) => {
-                  console.log("d", data);
+                  // console.log("d", data);
                   if (data == false) {
                     //reject1();
                     reject();
@@ -219,12 +219,12 @@ export class PdQuestionGeneralInfoPage {
         else{
           //REGULAR CHECK FOR IMAGE IS CAPTURED
           if (this.imageBucket.length > 0) {
-            console.log('else part . this.imageBucket.length',this.imageBucket.length)
+            // console.log('else part . this.imageBucket.length',this.imageBucket.length)
             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?")
               alert.present();
               alert.onDidDismiss((data) => {
-                console.log("d", data);
+                // console.log("d", data);
                 if (data == false) {
                   reject();
                 }
@@ -242,7 +242,7 @@ export class PdQuestionGeneralInfoPage {
   initlistv(data,purpose) :void
   {
     const control=<FormArray>this.generalForm.controls['list_value'];
-    console.log("control",control.length)
+    // console.log("control",control.length)
     if(purpose=='ins')
     {
      for(let val of data)
@@ -478,13 +478,13 @@ export class PdQuestionGeneralInfoPage {
   }
    }
   initPersonRelationship(value):void{
-    console.log('From Genral Form - value are',value)
+    // console.log('From Genral Form - value are',value)
     const control=<FormArray>this.generalForm.controls['persons_with_relationships'];
     if(value=='')
     {
-      console.log('fulldata',this.fulldata);
+      // console.log('fulldata',this.fulldata);
-      console.log('control.length+1',control.length+1);
+      // console.log('control.length+1',control.length+1);
-      console.log('full data',this.fulldata[control.length]);
+      // console.log('full data',this.fulldata[control.length]);
 
       let formData:FormGroup=this.fb.group({
         pd_co_applicant_id:[''],
@@ -499,7 +499,7 @@ export class PdQuestionGeneralInfoPage {
     }
    else{
      value.forEach((val,index)=>{
-       console.log("val for each",val)
+      //  console.log("val for each",val)
     let formData:FormGroup=this.fb.group({
       pd_co_applicant_id:[val.pd_co_applicant_id],
       applicant_name:[val.applicant_name],
@@ -513,7 +513,7 @@ export class PdQuestionGeneralInfoPage {
    
   }
   initCompanyRelationShip(value):void{
-    console.log(value)
+    // console.log(value)
     if(value=='')
     {
     let formData:FormGroup=this.fb.group({
@@ -525,7 +525,7 @@ export class PdQuestionGeneralInfoPage {
     control.push(formData);
   }
   else{
-    console.log("data",value);
+    // console.log("data",value);
     for(let val of value){
       let formData:FormGroup=this.fb.group({
         applicant_name:[val.applicant_name],
@@ -559,17 +559,17 @@ dataobj:any;
    }
    if(v=='2')
    {
-     console.log("companies",this.h_companies);
+    //  console.log("companies",this.h_companies);
      this.addComp=true
   //   this.h_companies=true;
     this.h_companies=!this.h_companies;
-     console.log("companies",this.h_companies);
+    //  console.log("companies",this.h_companies);
     this.initCompanies(null);
    }
  }
  editIndividuals(index){
   let values=this.generalForm.controls.list_value.value[index]
-  console.log(values)
+  // console.log(values)
   this.addIndi=false
   this.updateIndex_indi=index;
   this.initIndividuals(values);
@@ -577,16 +577,16 @@ dataobj:any;
 
  }
  editCompanies(index){
-   console.log("index",index);
+  //  console.log("index",index);
    let values=this.generalForm.controls.company_value.value[index]
-   console.log(values)
+  //  console.log(values)
    this.updateIndex_comp=index
    this.addComp=false
    //this.
    this.initCompanies(values)
  }
  update(v,controlVal){
-   console.log("index",v)
+  //  console.log("index",v)
    if(v=='1'){
 
     let values=this.generalForm.controls['individuals'].value[0]
@@ -601,7 +601,7 @@ dataobj:any;
       controlVal.controls['qualification'].updateValueAndValidity()
      }
      if(values.is_person_met != true){
-       console.log("1st");
+      //  console.log("1st");
       controlVal.controls['age'].setValidators(Validators.compose([Validators.required]));
       controlVal.controls['age'].updateValueAndValidity()
 
@@ -646,15 +646,15 @@ dataobj:any;
             qualification_name:c_qualification_name
       });
       this.buttonClick=false;
-      console.log(this.generalForm.controls.list_value['controls'])
+      // console.log(this.generalForm.controls.list_value['controls'])
      // this.generalForm.controls.list_value.value.scrollToTop();
     // this.generalForm.controls['list_value']._scrollContent;
      //this.myinput._scrollContent();
       
     
-       console.log("values",val)
+      //  console.log("values",val)
-       console.log("old",old);
+      //  console.log("old",old);
-       console.log(control);
+      //  console.log(control);
  
    }
   }
@@ -684,7 +684,7 @@ dataobj:any;
        business_entity_type_name:c_business_name
        })
        this.h_companies=false
-       console.log(this.generalForm.controls['company_value']['controls'][this.updateIndex_comp])
+      //  console.log(this.generalForm.controls['company_value']['controls'][this.updateIndex_comp])
      }
    }
    
@@ -1114,11 +1114,11 @@ console.log('1)',this.temp);
   saveRecords.general_remark=answerData.general_remark;
  
   this.cons.getGeoTag().then(res=>{
-    console.log("Geo Coords",res)
+    // console.log("Geo Coords",res)
     if(!saveRecords.general_info_location){
     saveRecords.general_info_location=res
     }
-    console.log("save records",saveRecords);
+    // console.log("save records",saveRecords);
     this.qustCat.saveForm(saveRecords).subscribe(dataResult=>{
       if(dataResult['dataStatus']==true){
          //TO CHANGE THE FORM STATE 
@@ -1221,7 +1221,7 @@ console.log('1)',this.temp);
            exist_company_with_relationship=Object.keys(res['records'].company_with_relationships).map(function(key){
             return res['records'].company_with_relationships[key];
            })
-          console.log("Customer Segment",this.customer_segment_abbr)
+          // console.log("Customer Segment",this.customer_segment_abbr)
            if(this.customer_segment_abbr !='SE-RI')
            {
              if(exist_company_with_relationship.length>0){
@@ -1284,7 +1284,7 @@ console.log('1)',this.temp);
       
       }
       else{
-        console.log("Else data",this.pd_applicants_details)
+        // console.log("Else data",this.pd_applicants_details)
         this.pd_applicants_details.forEach((datas,index)=>{
           datas.is_applicant=true,
           datas.is_person_met = false;
@@ -1300,7 +1300,7 @@ console.log('1)',this.temp);
           datas.course_name = ''
           
            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 }
              companyControl.push(this.createCompanies(setCompanyValues))
           }
@@ -1310,7 +1310,7 @@ console.log('1)',this.temp);
         // this.lengthv.push("companies")
         // this.lengthv.push('persons_with_relationships')
         //this.lengthv.push("")
-        console.log("applicant",this.lengthv)
+        // console.log("applicant",this.lengthv)
         this.initlistv(this.pd_applicants_details,'get');
         this.initPersonRelationship(this.pd_applicants_details)
        // this.initCompanyValue(this.pd_applicants_details,'get');
@@ -1386,19 +1386,19 @@ console.log('1)',this.temp);
     let record_for_pic = {'pd_id':this.pdDetails.pd_id,'form_id':this.FormId.form_id,'company_id':null}
     this.qustCat.getPDImages(record_for_pic).subscribe(val=>{
       if(!val['msg']){
-        console.log(val['records'])
+        // console.log(val['records'])
         if(val['records'].length>0){
         val['records'].forEach(result=>{
           this.imageDisplay.push({'image':result.doc_url,'Name':result.pd_document_title,'option':'dummy'})
         })
-        console.log("imageBuck",this.imageDisplay);
+        // console.log("imageBuck",this.imageDisplay);
       }
     }
     })
  }
 
  changeName(value,index,img){
-   console.log(value);
+  //  console.log(value);
    this.imageDisplay[index]={'image':img,'Name':value}
    
  }
@@ -1414,16 +1414,16 @@ console.log('1)',this.temp);
  capture(){
    //FOR CAPTURING PICS
   this.cameraProvider.getpicture().then(res=>{
-    console.log("Value",res)
+    // console.log("Value",res)
     if(res != 'error'){
       this.cons.getGeoTag().then(geoCoordinates=>{
-        console.log("geo promise",geoCoordinates)
+        // console.log("geo promise",geoCoordinates)
      this.imageBucket.push({'image':res,'Name':'','link':geoCoordinates});
      //FOR GETTING THE DOC NAME FROM ALERT
       let alert =this.toast.setAlertForDocName()
       alert.present()
       alert.onDidDismiss(value=>{
-        console.log("alert value",value);
+        // console.log("alert value",value);
         if(value){
           this.imageBucket[this.imageBucket.length-1].Name=value.Name
         }
@@ -1441,7 +1441,7 @@ console.log('1)',this.temp);
    sendImage(){
      
      this.loading.loaderForSendImage()
-     console.log("image bucket - json data",JSON.stringify(this.imageBucket));
+    //  console.log("image bucket - json data",JSON.stringify(this.imageBucket));
    
      let records:any={
        'pd_id':this.pdDetails.pd_id,
@@ -1450,7 +1450,7 @@ console.log('1)',this.temp);
        'company_id':'',
      
      }
-     console.log("DB - records",JSON.stringify(records))
+    //  console.log("DB - records",JSON.stringify(records))
      this.qustCat.savePDImages(records).subscribe(res=>{
        if(res['dataStatus']== true){
         this.toast.pdTriggerappmessage("Image Saved Successfully")
@@ -1467,7 +1467,7 @@ console.log('1)',this.temp);
      
    }
    changeSentence(value){
-    console.log("val",value)
+    // console.log("val",value)
     let name=value.get('applicant_name').value
      value.get('applicant_name').setValue(this.cons.sentenceCase(name));
    }

src/pages/pd-question/pd-question-neighbour-hood/pd-question-neighbour-hood.ts

@@ -347,9 +347,17 @@ ChdCtrls.controls.other_organisation_owner.updateValueAndValidity();
     let NbhdCtrlLength: any = neighbourhoodControl.controls.length;
         // this.neighbourhoodForm.controls['neighbourhood_status'].setValidators([Validators.required]);
         // this.neighbourhoodForm.controls['neighbourhood_status'].updateValueAndValidity();
-
+    if(this.neighbourhoodForm.controls['neighbourhood_status'].value != 'Positive'){
-        // this.neighbourhoodForm.controls['neighbour_reference_remark'].setValidators([Validators.required])
+        this.neighbourhoodForm.controls['neighbour_reference_remark'].setValidators(Validators.compose([Validators.required]))
-        // this.neighbourhoodForm.controls['neighbour_reference_remark'].updateValueAndValidity();
+        this.neighbourhoodForm.controls['neighbour_reference_remark'].updateValueAndValidity();
+        if(this.neighbourhoodForm.controls['neighbour_reference_remark'].value == ''){
+          this.toast.pdTriggerappmessage("Remarks is Mandatory");
+          return;
+        }
+    }else{
+      this.neighbourhoodForm.controls['neighbour_reference_remark'].clearValidators();
+      this.neighbourhoodForm.controls['neighbour_reference_remark'].updateValueAndValidity();
+    }
       if (NbhdCtrlLength > 0) {
        let Ncnt = 0;
        while(Ncnt < NbhdCtrlLength){

src/providers/constants/constants.ts

@@ -14,7 +14,7 @@ import {environment as ENV} from '../../environments/environment'
 */
 @Injectable()
 export class ConstantsProvider {
-public commonimage = "http://ssa.sineedge.com/sparqapi/logo/avatar.jpg";
+public commonimage = "http://pdgenie.com/logo/avatar.jpg";
   constructor(public http: HttpClient,private geo:Geolocation,private locationAccuracy:LocationAccuracy) {
     console.log('Hello ConstantsProvider Provider');
   }