Fairoj: Subproduct field added in loan details and Overall some changes finished

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

@@ -36,8 +36,8 @@
 
               </mat-form-field> -->
               <mat-label>Reason to Reject</mat-label>
-              <mat-radio-group text-wrap   [(ngModel)]="bounce_reason">
+              <mat-radio-group  [(ngModel)]="bounce_reason">
-                <mat-radio-button  style="padding:5px" color="primary" *ngFor="let bouns of bounseMaster" [value]="bouns.bounce_id"> 
+                <mat-radio-button   text-wrap  style="padding:5px" color="primary" *ngFor="let bouns of bounseMaster" [value]="bouns.bounce_id"> 
                     {{bouns.bounce_reason_name}}
                 </mat-radio-button>
               </mat-radio-group>

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

@@ -11,5 +11,6 @@ page-bounced-reject {
         border-radius: 10px;
        
       }
+      
 
 }

src/pages/input/input.ts

@@ -387,16 +387,19 @@ other_applicant:any;
      if(this.applicatentDetails.pd_status == 'ACCEPTED')
      {
        this.scheduleAccess = true;
+       this.toast.pdTriggerappmessage("Accepted Successfully")
      }
      if(this.applicatentDetails.pd_status == 'SCHEDULED')
      {
        this.initiatedAccess = true;
        this.getFullPD();
+       this.toast.pdTriggerappmessage("Scheduled Successfully")
      }
 
      if(this.applicatentDetails.pd_status == 'INITIATED')
      {
        this.startedAccess = true;
+       this.toast.pdTriggerappmessage("Initiated Successfully")
      }
         }
       })

src/pages/pd-list/pd-list.ts

@@ -185,7 +185,7 @@ export class PdListPage {
       {
         this.navCtrl.push(OtpPage,{'pdDetails':pddetails});
       }else if(pddetails.pd_status == 'INPROGRESS'){
-        this.navCtrl.setRoot(PdQuestionCategoryPage,{'pdDetails':pddetails});
+        this.navCtrl.push(PdQuestionCategoryPage,{'pdDetails':pddetails});
       }else{
       this.navCtrl.push(InputPage,{'pdDetails':pddetails});
     }

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

@@ -438,12 +438,12 @@ export class PdQuestionAddressPage {
               // setTimeout(function(){
               //   this.toast.pdTriggerappmessage('Record Saved Successfully.!');
               // },5000)
-      if(data){
+              if(data['dataStatus']==true){
-        this.toast.pdTriggerappmessage('Record Saved Successfully.!');
+                this.toast.pdTriggerappmessage('Record Saved Successfully');
-      }       
+        setTimeout(()=>{
               this.navCtrl.pop();
-           
+            },2000);   
-
+          }
       },err=>{
         this.toast.pdTriggerappmessage('Something went wrong ');
       });

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

@@ -238,8 +238,8 @@
                                         </div>
                                         <div>
                                             <mat-form-field style="width:100%;">
-                                                <mat-select placeholder="Name of the Owner" formControlName="name_of_the_owner" [compareWith]="compareObjects">
+                                                <mat-select multiple placeholder="Name of the Owner" formControlName="name_of_the_owner" [compareWith]="compareObjects">
-                                                    <mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName">
+                                                    <mat-optgroup *ngFor="let group of mergeCompanyApplicant" [label]="group.groupName" >
                                                     <mat-option *ngFor="let val of group.groupValues" [value]="val">
                                                            {{val.name}}
                                                     </mat-option>

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

@@ -467,7 +467,9 @@ export class PdQuestionAssestsPage {
           if(res['dataStatus']==true)
           {
             this.toast.pdTriggerappmessage('Record Saved Successfully.!');
+            setTimeout(()=>{
             this.navCtrl.pop();
+          },2000);
           }
         })
   }

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

@@ -231,7 +231,9 @@ inWords(e,i,flag){
             if(data['dataStatus']==true)
       {
         this.toast.pdTriggerappmessage('Record Saved Successfully.!');
+        setTimeout(()=>{
         this.navCtrl.pop();
+      },2000);
       }
         })
      

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

@@ -640,7 +640,9 @@ createBusinessAssetsForAddress(): FormGroup {
      this.qustcat.saveForm(answerData).subscribe(result=>{
        if(result['dataStatus']==true){
             this.toast.pdTriggerappmessage("Record Saved Successfully");
-            this.navCtrl.pop();
+            setTimeout(()=>{
+              this.navCtrl.pop();
+            },2000);
        }
        else{
          this.toast.pdTriggerappmessage("Sorry!! something went Wrong ");

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

@@ -310,7 +310,9 @@ step:number
             if(data['dataStatus']==true)
       {
         this.toast.pdTriggerappmessage('Record Saved Successfully.!');
-        this.navCtrl.pop();
+        setTimeout(()=>{
+          this.navCtrl.pop();
+        },2000);
       }
       else{
         this.toast.pdTriggerappmessage("Sorry!! Something Went Wrong");

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

@@ -18,7 +18,7 @@
         <mat-accordion  *ngFor="let member of businessForm.controls.partners['controls']; let i=index ; let l=last"  [formGroupName]="i">
           <mat-expansion-panel [expanded]="step==i" >
           <mat-expansion-panel-header>
-              <mat-panel-title><h5>{{businessEntityTypeList.section_label}}</h5></mat-panel-title>
+              <mat-panel-title><h5>{{businessEntityTypeList.section_label }} # {{i+1}} </h5></mat-panel-title>
           </mat-expansion-panel-header>
             <mat-card-content>
                     <mat-form-field>
@@ -82,7 +82,7 @@
             <mat-expansion-panel  [expanded]="step == i" >
             <mat-expansion-panel-header>
                 <!-- <mat-panel-title >{{person.get('family_member_name').value | titlecase}}</mat-panel-title> -->
-                <mat-panel-title><h5>Member #{{i+1}}</h5></mat-panel-title>
+                <mat-panel-title><h5>Family Member #{{i+1}}</h5></mat-panel-title>
             </mat-expansion-panel-header>
             <mat-card-content>
             <mat-form-field >
@@ -734,7 +734,7 @@
                                 <input matInput type="text" placeholder="Services Provided" formControlName="main_products"  required>
                         </mat-form-field>
                         <mat-form-field >
-                                <mat-select formControlName="area_of_sale" placeholder="Area of Service" (selectionChange)="changeServiceArea(serviceprovider,sp); CheckExport($event.value,'SActivity',sp);" required>
+                                <mat-select formControlName="area_of_sale" placeholder="Area of Service" (selectionChange)="changeServiceArea(serviceprovider,sp); CheckExport($event.value,'SPActivity',sp);" required>
                                     <mat-option value="Within India">Within India</mat-option>
                                     <mat-option value="Export">Export</mat-option>
                                     <mat-option value="Both">Both</mat-option>
@@ -954,7 +954,7 @@
                         </mat-card-header>
                 <mat-card-content>
                                 <mat-form-field >
-                                        <input matInput type="number" Export Sale As a % of Total Sales" formControlName="export_sale_of_total_sales">
+                                        <input autocomplete="off" matInput type="number" formControlName="export_sale_of_total_sales">
                                 </mat-form-field>                                                                                              
                 </mat-card-content>
             </mat-card>

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

@@ -847,7 +847,7 @@ changeBusinessActivity(event: any){
     this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl(this.businessForm.value.applicant_use_mobile_wallets)) : this.businessForm.removeControl('applicant_use_mobile_wallets');
     this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl(this.businessForm.value.applicant_use_pos_machines)) : this.businessForm.removeControl('applicant_use_pos_machines');
 
-    if(this.ManufacturingChecked && this.RetailedChecked && this.WholeSalesChecked && this.ServiceChecked){
+      if(this.ManufacturingChecked || this.ManufacturingChecked==undefined && this.RetailedChecked || this.RetailedChecked==undefined && this.WholeSalesChecked ||this.WholeSalesChecked==undefined  && this.ServiceChecked || this.ServiceChecked==undefined){
         this.ExportFlag = false;
     }
 }
@@ -1592,7 +1592,9 @@ submitDetails() {
     if(data['dataStatus']==true)
     {
       this.toast.pdTriggerappmessage('Record Saved Successfully.!');
+      setTimeout(()=>{
       this.navCtrl.pop();
+    },3000);
     }
   });
 }
@@ -1708,13 +1710,15 @@ ServiceCounterArray: any = [];
   
    
     if(!this.ManufacturingChecked){
+       // console.log("Manu")
     if(stringFlag == 'MActivity' && value != "Within India"){
         this.ManufacturingCounterArray[index] = 1;
     }
-    else if(stringFlag == 'MActivity' && value != "Within India"){
+    else if(stringFlag == 'MActivity' && value == "Within India"){
         this.ManufacturingCounterArray[index] = 0;
     }
     }else if (this.ManufacturingChecked && stringFlag == 'MActivity'){
+       // console.log("manu");
         this.ManufacturingCounterArray[index] = 0;
     }
 
@@ -1722,7 +1726,7 @@ ServiceCounterArray: any = [];
         if(stringFlag == 'RActivity' && value != "Within India"){
             this.RetailCounterArray[index] = 1;
         }
-        else if(stringFlag == 'RActivity' && value != "Within India"){
+        else if(stringFlag == 'RActivity' && value == "Within India"){
             this.RetailCounterArray[index] = 0;
         }
     }
@@ -1734,7 +1738,7 @@ ServiceCounterArray: any = [];
         if(stringFlag == 'WActivity' && value != "Within India"){
             this.WholeSaleCounterArray[index] = 1;
         }
-        else if(stringFlag == 'WActivity' && value != "Within India"){
+        else if(stringFlag == 'WActivity' && value == "Within India"){
             this.WholeSaleCounterArray[index] = 0;
         }
     }
@@ -1748,7 +1752,7 @@ ServiceCounterArray: any = [];
             {              
                 this.ServiceCounterArray[index] = 1;
             }
-            else if(stringFlag == 'SPActivity' && value != "Within India"){
+            else if(stringFlag == 'SPActivity' && value == "Within India"){
                 this.ServiceCounterArray[index] = 0;
             }
 
@@ -1769,6 +1773,8 @@ ServiceCounterArray: any = [];
     
 
     this.ExportFlag = overallCounter > 0 ? true : false ;
+   // console.log(this.ExportFlag);
+    //console.log(overallCounter)
 
 }
 toGetPOSMachinesDetails(e,flag){

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

@@ -555,8 +555,11 @@ export class PdQuestionClientInfoPage {
     Object.keys(answerFormValues).forEach((key) => { if (answerFormValues[key] === null || answerFormValues[key] === undefined || answerFormValues[key] === '') { delete answerFormValues[key] }; });
     this.qustCat.saveForm(answerFormValues).subscribe(responsed => {
       if (responsed['status'] == 200) {
-        this.navCtrl.pop();
+      
         this.toast.pdTriggerappmessage('Record Saved Successfully.!');
+        setTimeout(()=>{
+          this.navCtrl.pop();
+        },2000);
       } else {
         this.toast.pdTriggerappmessage('Something Wents Wrong Try Again.!');
       }

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

@@ -293,18 +293,18 @@
   </mat-card-header>
   <mat-card-content>
     <mat-form-field style="width:100%">
-      <mat-label>
+      <mat-placeholder>
-          In case of Credit Sales, what is the average no of days taken to receive the money?
+        In case of Credit Sales, what is the average no of days taken to receive the money?
-      </mat-label>
+      </mat-placeholder>
-      <input matInput autocomplete="off" placeholder="In case of Credit Sales, what is the average no of days taken to receive the money?"
+      <input class="large" matInput autocomplete="off" 
           formControlName="receive_the_money_in_days" type="number">
   </mat-form-field>
   <mat-form-field style="width:100%">
-      <input matInput autocomplete="off" placeholder="In case of Credit Purchase, what is the average no of days taken to pay the money?"
+      <input class="large" matInput autocomplete="off" placeholder="In case of Credit Purchase, what is the average no of days taken to pay the money?"
           formControlName="pay_the_money_in_days" type="number">
   </mat-form-field>
   <mat-form-field style="width:100%">
-      <input matInput autocomplete="off" placeholder="What is the average no of days for which stock lies unsold during the year?"
+      <input class="large" matInput autocomplete="off" placeholder="What is the average no of days for which stock lies unsold during the year?"
           formControlName="unsold_stock_lies_in_days" type="number">
   </mat-form-field>
   <mat-form-field style="width:100%">

src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.scss

@@ -32,6 +32,21 @@ page-pd-question-financial-info {
   .scroll-content{
     background-color: #eee;
   }
+  .large{
+    height: 50px;
+  }
+  .mat-form-field-label {
+    white-space: normal;
+  }
+  
+  textarea.mat-input-element {
+    padding: 0px 0;
+    margin: 5px 0;
+  }
+  
+  .mat-input-placeholder {
+    white-space: normal;
+  }
 
 
 }

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

@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component,ViewEncapsulation } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import {AwsServiceProvider} from '../../../../providers/aws-service/aws-service'
 import {ToastProvider} from '../../../../providers/common-provider/toast'
@@ -17,6 +17,7 @@ import {ConstantsProvider} from '../../../../providers/constants/constants'
 @Component({
   selector: 'page-pd-question-financial-info',
   templateUrl: 'pd-question-financial-info.html',
+  encapsulation: ViewEncapsulation.None,
 })
 export class PdQuestionFinancialInfoPage {
   
@@ -267,7 +268,9 @@ submitDetails(){
     this.qustCat.saveForm(records).subscribe(res=>{
         if(res['status']== 200){
             this.toast.pdTriggerappmessage("Record Saved Successfully");
-            this.navCtrl.pop()
+            setTimeout(()=>{
+                this.navCtrl.pop();
+              },2000);
         }
         else{
             this.toast.pdTriggerappmessage("Warning !! Something went Wrong");

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

@@ -72,7 +72,8 @@
                             <hr/>
                             <div >
                                 <mat-form-field style="width:100%">
-                                    <mat-select placeholder="Is the stock of Raw Materials observed, sufficient considering the size of operations"
+                                    <mat-placeholder>Is the stock of Raw Materials observed, sufficient considering the size of operations</mat-placeholder><br/>
+                                    <mat-select 
                                         formControlName="is_sufficiant_raw" (selectionChange)="checkComments($event.value,1,a)">
                                         <mat-option value="yes">Yes</mat-option>
                                         <mat-option value="no">No</mat-option>
@@ -304,7 +305,8 @@
                     <div *ngIf="finishedAndTradedGoodsCommentCard">
                         <br>
                             <mat-form-field style="width:100%">
-                                    <mat-select placeholder="Is the stock of finished / traded goods observed, sufficient considering the size of operations" formControlName="is_sufficiant_finished_and_traded_goods">
+                                <mat-placeholder>Is the stock of finished / traded goods observed, sufficient considering the size of operations</mat-placeholder><br/>
+                                    <mat-select  formControlName="is_sufficiant_finished_and_traded_goods">
                                         <mat-option>Select</mat-option>
                                         <mat-option value="yes" >Yes</mat-option>
                                         <mat-option value="no" >No</mat-option>

src/pages/pd-question/pd-question-business-group/pd-question-stock-info/pd-question-stock-info.scss

@@ -13,4 +13,20 @@ page-pd-question-stock-info {
     .mat-card-content{
         margin-bottom: 0px !important;
     }
+    .mat-form-field-label {
+        white-space: normal;
+      }
+      
+      textarea.mat-input-element {
+        padding: 0px 0;
+       margin: 5px 0;
+      }
+      
+      .mat-input-placeholder {
+         white-space: normal;
+      }
+      mat-select{
+          margin:5px 0;
+      }
+  
 }

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

@@ -109,8 +109,8 @@ export class PdQuestionStockInfoPage {
                           finished_and_traded_goods_remarks:[dataForm.finished_and_traded_goods_remarks],
 
                           manufacturing_details: this.fb.array([this.manufacturingFormCreation(record)]),
-                          retail_details : this.fb.array([this.retailFormCreation(api)]),
+                          retail_details : this.fb.array([this.retailFormCreation(type3length)]),
-                          trade_details: this.fb.array([this.tradingFormCreation(api)]),
+                          trade_details: this.fb.array([this.tradingFormCreation(type4length)]),
                       });
                       if(api.length > 0){     
                          api.forEach(val => {
@@ -164,8 +164,8 @@ export class PdQuestionStockInfoPage {
                   is_sufficiant_finished_and_traded_goods:[''],
                   finished_and_traded_goods_remarks:[''],
                   manufacturing_details: this.fb.array([this.manufacturingFormCreation(record)]),
-                  retail_details : this.fb.array([this.retailFormCreation(record.from_business)]),
+                  retail_details : this.fb.array([this.retailFormCreation(type3length)]),
-                  trade_details: this.fb.array([this.tradingFormCreation(record.from_business)]),
+                  trade_details: this.fb.array([this.tradingFormCreation(type4length)]),
                 });
                 if(api.length > 0){     
                   api.forEach(val => {
@@ -218,9 +218,9 @@ export class PdQuestionStockInfoPage {
                   finished_and_traded_goods_remarks:[''],
                   
                   manufacturing_details: this.fb.array([this.manufacturingFormCreation(record)]),
-                  retail_details : this.fb.array([this.retailFormCreation(record.from_business)]),
+                  retail_details : this.fb.array([this.retailFormCreation(type3length)]),
                 
-                  trade_details: this.fb.array([this.tradingFormCreation(record.from_business)]),
+                  trade_details: this.fb.array([this.tradingFormCreation(type4length)]),
                 });
                 if(api.length > 0){     
                           api.forEach(val => {
@@ -295,9 +295,10 @@ export class PdQuestionStockInfoPage {
 
   retailForm: Boolean = false;
   retailFormCreation(val) {
-    let arr = val.filter(data => data.type_of_activity_id == 3);
+    //let arr = val.filter(data => data.type_of_activity_id == 3);
-   // console.log("retail Form ",arr);
+    let arr=val
-    if (arr.length > 0) {
+  console.log("retail Form ",arr);
+    if (arr > 0) {
       // if(arr.products != undefined){
         this.retailForm = true;
         return this.fb.group({
@@ -308,16 +309,19 @@ export class PdQuestionStockInfoPage {
       //   return;
       // }  
     } else {
-      return;
+      return this.fb.group({
+        retail_traded_goods: this.fb.array([])
+      });  
+     // return;
     }
   }
 
   tradingForm: Boolean = false;
   tradingFormCreation(val) {
-  
+    let arr=val
-    let arr = val.filter(data => data.type_of_activity_id == 4);
+    //let arr = val.filter(data => data.type_of_activity_id == 4);
     
-    if (arr.length > 0) {
+    if (arr > 0) {
      
       // if(arr.products === undefined){
      
@@ -329,7 +333,10 @@ export class PdQuestionStockInfoPage {
           trading_traded_goods: this.fb.array([])
       });      
     } else {
-      return;
+      return this.fb.group({
+        trading_traded_goods: this.fb.array([])
+    });  
+     // return;
     }
   }
 
@@ -667,8 +674,11 @@ export class PdQuestionStockInfoPage {
     Object.keys(answerFormValues).forEach((key) => (answerFormValues[key] == null) && delete answerFormValues[key]);
     this.qustCat.saveForm(answerFormValues).subscribe(responsed => {
           if(responsed['status'] == 200) { 
-            this.navCtrl.pop();
+         
             this.toast.pdTriggerappmessage('Record Saved Successfully.!');
+            setTimeout(()=>{
+              this.navCtrl.pop();
+            },2000);
           }else{
             this.toast.pdTriggerappmessage('Something Wents Wrong Try Again.!');    
           }

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

@@ -405,8 +405,11 @@ export class PdQuestionSupplierInfoPage {
 
     this.qustCat.saveForm(answerFormValues).subscribe(responsed => {
       if (responsed['status'] == 200) {
-        this.navCtrl.pop();
+      
         this.toast.pdTriggerappmessage('Record Saved Successfully.!');
+        setTimeout(()=>{
+          this.navCtrl.pop();
+        },2000);
       } else {
         this.toast.pdTriggerappmessage('Something Wents Wrong Try Again.!');
       }

src/pages/pd-question/pd-question-current-loans/pd-question-current-loans.ts

@@ -264,7 +264,9 @@ submitCurrentloan(answerData) {
       if(data['dataStatus']==true)
       {
         this.toast.pdTriggerappmessage('Record Saved Successfully.!');
-        this.navCtrl.pop();
+        setTimeout(()=>{
+          this.navCtrl.pop();
+        },2000);
       }
   });
 }

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

@@ -499,7 +499,9 @@ savepdfamily(answerData)
   this.qustCat.saveForm(records).subscribe(res=>{
 
       this.toast.pdTriggerappmessage("Record Saved Successfully");
-      this.navCtrl.pop();
+      setTimeout(()=>{
+        this.navCtrl.pop();
+      },2000);
      
   },err=>{
     this.toast.pdTriggerappmessage("Some Fields value is Missing Please Fill It");

src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.html

@@ -36,8 +36,9 @@
     </mat-card-header><br/>
     <mat-card-content>
         <mat-form-field>
+          <mat-placeholder>Is the location of the business / profession suited to the nature of business / service provided? </mat-placeholder><br/>
             <mat-select 
-                        placeholder="Is the location of the business / profession suited to the nature of business / service provided? "
+                       
                         formControlName="is_service_provided" required>
                         <mat-option>Select</mat-option>    
                 <mat-option value="well_suited.">Well Suited.</mat-option>

src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.scss

@@ -10,5 +10,23 @@ page-pd-question-final-remark {
     .scroll-content{
         background-color: #eee;
       }
+      .mat-form-field-label {
+        white-space: normal;
+      }
+      
+      textarea.mat-input-element {
+        padding: 0px 0;
+       margin: 5px 0;
+      }
+      
+      .mat-input-placeholder {
+         white-space: normal;
+      }
+      mat-select{
+         
+          margin : 5px 0;
+      }
+     
+      
 
 }

src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.ts

@@ -163,7 +163,9 @@ RecommendationChange(e){
      this.qustcat.saveForm(answerData).subscribe(res=>{
        if(res['dataStatus']==true){
           this.toast.pdTriggerappmessage("Record Saved Successfully");
-          this.navCtrl.pop();
+          setTimeout(()=>{
+            this.navCtrl.pop();
+          },2000);
        }
        else{
         this.toast.pdTriggerappmessage("Sorry!! Something Went Wrong");

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

@@ -863,7 +863,10 @@ getDateObjects(values: any, controlIndex) {
     this.qustCat.saveForm(saveRecords).subscribe(dataResult=>{
       if(dataResult['dataStatus']==true){
         this.toast.pdTriggerappmessage('Record Saved Successfully.!');
-        this.navCtrl.pop();
+        setTimeout(()=>{
+          this.navCtrl.pop();
+        },3000);
+        
 
       }
       else{

src/pages/pd-question/pd-question-lender-representative/pd-question-lender-representative.ts

@@ -71,8 +71,11 @@ export class PdQuestionLenderRepresentativePage {
           {
             if(res['dataStatus']==true)
             {
-              this.navCtrl.pop();
+            
               this.toast.pdTriggerappmessage('Record Saved Successfully.!');
+              setTimeout(()=>{
+                this.navCtrl.pop();
+              },2000);
             }
           });
       }else

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

@@ -26,6 +26,11 @@
         <mat-label>Loan Tenture applied for?</mat-label>
         <input matInput autocomplete="off" placeholder="No of Months" formControlName="loan_tenure" type="number">
         </mat-form-field>
+        <mat-form-field style="width:100%">
+            <mat-select placeholder="Sub Product" formControlName="sub_product" (selectionChange)="subProductChange($event.value)">
+                <mat-option *ngFor="let sub of subProductData" [value]="sub.subproduct_id">{{sub.name}}</mat-option>
+            </mat-select>
+        </mat-form-field>
         <mat-form-field style="width: 100%">
             <mat-select multiple (selectionChange)="endUserChange($event.value)" placeholder="What is the end use" formControlName="end_use" required>
                 <mat-option *ngFor="let enduse of m_endUseForLoan" [value]="enduse.enduse_of_loan_id">{{ enduse.enduse_of_loan }}</mat-option>

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

@@ -59,6 +59,7 @@ export class PdQuestionLoansPage {
     sourceList:any=[];
     pdid:number;
     m_endUseForLoan:any;
+  subProductData: any=[];
 
 
   constructor(public navCtrl: NavController, public navParams: NavParams, public fb: FormBuilder, public qustCat: QuestionCategoryProvider, public aws: AwsServiceProvider, public toast: ToastProvider,public constant:ConstantsProvider) {
@@ -72,6 +73,7 @@ export class PdQuestionLoansPage {
     this.loanDetailsForm = this.fb.group({
       loan_amount: [this.pdDetails.loan_amount],
       loan_tenure:[''],
+      sub_product:[''],
       end_use: ['', Validators.compose([Validators.required])],
       end_use_other: [''],
       is_transfer: ['', Validators.compose([Validators.required])],
@@ -126,7 +128,7 @@ export class PdQuestionLoansPage {
       data => {
         this.m_btLenderList = data['records'].filter(data => data.isactive == 1);
       })
-      this.qustCat.getEndUseForLoan(this.pdid).subscribe(data=>{
+      this.qustCat.getEndUseForLoan(this.pdid,this.pdDetails.fk_subproduct_id).subscribe(data=>{
        
         this.m_endUseForLoan=data['records'].filter(data=>data.isactive==1);
         
@@ -205,6 +207,10 @@ export class PdQuestionLoansPage {
     this.qustCat.getcommondrop('ENDUSEOFTOPUP').subscribe(data=>{
       this.m_endUseOFTopUpList=data['records'].filter(val=>val.is_active == 1)
     })
+    this.qustCat.getcommondrop('SUBPRODUCTS').subscribe(data=>{
+      this.subProductData=data['records'].filter(val=>val.isactive ==1);
+      console.log(this.subProductData);
+    })
   
   
         
@@ -295,6 +301,11 @@ export class PdQuestionLoansPage {
   }    }
       //this.loanDetailsForm.controls['topup_amount'].setValue(topupAmt);
   }
+  subProductChange(event){
+    this.qustCat.getEndUseForLoan(this.pdid,event).subscribe(res=>{
+      this.m_endUseForLoan=res['records'].filter(data=>data.isactive==1);
+    })
+  }
   endUserChange(event) {
     //this.endUserList = [];
     event.forEach(option => {
@@ -366,7 +377,7 @@ export class PdQuestionLoansPage {
         records.fk_createdby = this.users;
         records.loan_amount = this.loanDetailsForm.controls['loan_amount'].value;
         records.loan_tenure=this.loanDetailsForm.controls['loan_tenure'].value;
-        
+      records.sub_product=this.loanDetailsForm.controls['sub_product'].value;
         // get end user final group data
         let dataEnd_user_data = [];
         this.loanDetailsForm.controls['end_use'].value.forEach(element => {
@@ -459,8 +470,15 @@ export class PdQuestionLoansPage {
         //records.value_per_agreement = this.loanDetailsForm.controls['value_per_agreement'].value;
         records.loandetails_remarks = this.loanDetailsForm.controls['loandetails_remarks'].value;
     this.qustCat.saveForm(records).subscribe(data => {
-      this.navCtrl.pop();
+      if(data['dataStatus']== true){
       this.toast.pdTriggerappmessage('Record Saved Successfully.!');
+      setTimeout(()=>{
+        this.navCtrl.pop();
+      },2000);
+    }
+    else{
+      this.toast.pdTriggerappmessage('Error');
+    }
       // this.notifier.notify('success', 'Saved Successfully.');
     })
   // }else
@@ -498,6 +516,7 @@ export class PdQuestionLoansPage {
         this.loanDetailsForm.controls['loan_amount'].setValue(loanDetails.loan_amount);
         this.loanDetailsForm.controls['loan_tenure'].setValue(loanDetails.loan_tenure);
         if(loanDetails.loan_amount){ this.loanAmtInWords = this.constant.convertNumberToWords(loanDetails.loan_amount); }
+        this.loanDetailsForm.controls['sub_product'].setValue(loanDetails.sub_product)
         this.loanDetailsForm.controls['end_use'].setValue(this.enduse);
         this.endUserChange(this.enduse);
 

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

@@ -13,5 +13,21 @@ page-pd-question-neighbour-hood {
     .scroll-content{
         background-color: #eee;
       }
+      .mat-form-field-label {
+        white-space: normal;
+      }
+      
+      textarea.mat-input-element {
+        padding: 0px 0;
+       margin: 5px 0;
+      }
+      
+      .mat-input-placeholder {
+         white-space: normal;
+      }
+      mat-select{
+          margin:5px 0;
+      }
+     
 
 }

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

@@ -257,8 +257,11 @@ checkOthers(values){
           {
             if(res['dataStatus']==true)
             {
-              this.navCtrl.pop();
+             
               this.toast.pdTriggerappmessage('Record Saved Successfully.!');
+              setTimeout(()=>{
+                this.navCtrl.pop();
+              },2000);
             }
           })
       

src/pages/pd-question/pd-question-other-income/pd-question-other-income.ts

@@ -139,8 +139,11 @@ submitOtherIncome(answerData)
         records.income_details = answerData.income_details;
         records.otherincome_remarks = answerData.otherincome_remarks;
         this.qustCat.saveForm(records).subscribe(data => {
-            this.navCtrl.pop();
+           
             this.toast.pdTriggerappmessage('Record Saved Successfully.!');
+            setTimeout(()=>{
+              this.navCtrl.pop();
+            },2000);
         }, error => {
           
         })

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

@@ -261,8 +261,11 @@ submitPersonalForm(formData:any) {
    };
    this.qustCat.saveForm(save_details).subscribe(result => {
     if (result['dataStatus']==true) {
-      this.navCtrl.pop();
+     
       this.toast.pdTriggerappmessage('Record Saved Successfully.!');
+      setTimeout(()=>{
+        this.navCtrl.pop();
+      },2000);
       // this.notifier.notify('success', 'Success.');
     }
     else {

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

@@ -141,7 +141,9 @@ export class PdQuestionRentalInfoPage {
         if(res['dataStatus']==true)
           {
             this.toast.pdTriggerappmessage('Record Saved Successfully.!');
-            this.navCtrl.pop();
+            setTimeout(()=>{
+              this.navCtrl.pop();
+            },2000);
           }
       })
     // }else

src/providers/question-category/question-category.ts

@@ -72,8 +72,8 @@ apiurl:any;
         
 }
 
-getEndUseForLoan(pdid:any){
+getEndUseForLoan(pdid:any,subproduct){
-  return this.http.post<any>(this.apiurl+ "getEndUseOfLoan",{ "records":{ "pd_id" : pdid}})
+  return this.http.post<any>(this.apiurl+ "getEndUseOfLoan",{ "records":{ "pd_id" : pdid,"sub_product_id":subproduct}})
 }
 getCompaniesListsForBusiness(pdid:any){
   return this.http.post<any>(this.apiurl+ "getCompaniesListsForBusiness", { "records":{ "pd_id" : pdid}})

www/build/main.css

@@ -29471,6 +29471,23 @@ page-pd-question-financial-info .scroll-content {
   background-color: #eee;
 }
 
+page-pd-question-financial-info .large {
+  height: 50px;
+}
+
+page-pd-question-financial-info .mat-form-field-label {
+  white-space: normal;
+}
+
+page-pd-question-financial-info textarea.mat-input-element {
+  padding: 0px 0;
+  margin: 5px 0;
+}
+
+page-pd-question-financial-info .mat-input-placeholder {
+  white-space: normal;
+}
+
 page-pd-question-stock-info mat-hint {
   font-size: 12px;
 }
@@ -29490,6 +29507,23 @@ page-pd-question-stock-info .mat-card-content {
   margin-bottom: 0px !important;
 }
 
+page-pd-question-stock-info .mat-form-field-label {
+  white-space: normal;
+}
+
+page-pd-question-stock-info textarea.mat-input-element {
+  padding: 0px 0;
+  margin: 5px 0;
+}
+
+page-pd-question-stock-info .mat-input-placeholder {
+  white-space: normal;
+}
+
+page-pd-question-stock-info mat-select {
+  margin: 5px 0;
+}
+
 page-pd-question-supplier-info mat-hint {
   font-size: 12px;
 }
@@ -29570,6 +29604,23 @@ page-pd-question-final-remark .scroll-content {
   background-color: #eee;
 }
 
+page-pd-question-final-remark .mat-form-field-label {
+  white-space: normal;
+}
+
+page-pd-question-final-remark textarea.mat-input-element {
+  padding: 0px 0;
+  margin: 5px 0;
+}
+
+page-pd-question-final-remark .mat-input-placeholder {
+  white-space: normal;
+}
+
+page-pd-question-final-remark mat-select {
+  margin: 5px 0;
+}
+
 page-pd-question-general-info .item-md {
   padding-left: 0px !important;
 }
@@ -29648,6 +29699,23 @@ page-pd-question-neighbour-hood .scroll-content {
   background-color: #eee;
 }
 
+page-pd-question-neighbour-hood .mat-form-field-label {
+  white-space: normal;
+}
+
+page-pd-question-neighbour-hood textarea.mat-input-element {
+  padding: 0px 0;
+  margin: 5px 0;
+}
+
+page-pd-question-neighbour-hood .mat-input-placeholder {
+  white-space: normal;
+}
+
+page-pd-question-neighbour-hood mat-select {
+  margin: 5px 0;
+}
+
 page-pd-question-other-income mat-form-field {
   width: 100%;
 }