Fairoj: Add On implemented

package.json

@@ -104,4 +104,4 @@
       "android"
     ]
   }
-}
+}

platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Mon Apr 15 19:50:50 IST 2019
+#Mon Apr 22 19:26:46 IST 2019
 base.0=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\0
 path.0=classes.dex
 renamed.0=classes.dex

platforms/android/app/build/intermediates/incremental/packageDebug/debug/file-input-save-data.txt

@@ -1,5 +1,5 @@
 #Internal package file, do not edit.
-#Fri Apr 12 13:01:24 IST 2019
+#Mon Apr 22 19:26:47 IST 2019
 60.set=ASSET
 52.set=ASSET
 53.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
@@ -8,22 +8,22 @@
 79.baseType=DIRECTORY
 28.set=ASSET
 39.baseType=DIRECTORY
-40.path=www/assets/fonts/roboto-regular.woff
+40.path=www/build/0.js
 82.baseType=DIRECTORY
 42.baseType=DIRECTORY
 13.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 3.path=www/assets/fonts/roboto-light.woff
-47.path=www/plugins/cordova-plugin-statusbar/www/statusbar.js
+47.path=www/assets/fonts/roboto.scss
 60.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 72.baseType=DIRECTORY
 62.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
-54.path=www/assets/fonts/Roboto-MediumItalic.ttf
+54.path=www/build/main.js
 69.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 9.set=ASSET
 22.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 14.path=www/assets/img/misc/login.jpg
 29.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
-61.path=www/assets/fonts/noto-sans-regular.ttf
+61.path=www/assets/fonts/Roboto-BlackItalic.ttf
 76.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 51.set=ASSET
 65.baseType=DIRECTORY
@@ -31,7 +31,7 @@
 43.set=ASSET
 35.set=ASSET
 27.set=DEX
-63.path=lib/armeabi-v7a/libsqlc-native-driver.so
+63.path=www/assets/fonts/noto-sans-regular.ttf
 7.baseType=DIRECTORY
 19.set=NATIVE_RESOURCE
 36.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
@@ -39,9 +39,9 @@
 58.baseType=DIRECTORY
 18.baseType=DIRECTORY
 23.path=www/assets/img/misc/sidemenubg.jpg
-70.path=www/plugins/cordova-plugin-ionic-webview/src/www/util.js
+70.path=www/assets/img/misc/avatar.jpg
 21.baseType=DIRECTORY
-77.path=www/assets/img/misc/adrian-199150-unsplash 1.jpg
+77.path=www/assets/fonts/ionicons.woff2
 8.set=ASSET
 30.path=www/plugins/cordova-plugin-geolocation/www/PositionError.js
 48.baseType=DIRECTORY
@@ -51,7 +51,7 @@
 51.baseType=DIRECTORY
 8.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 11.baseType=DIRECTORY
-84.path=www/plugins/cordova-plugin-splashscreen/www/splashscreen.js
+84.path=www/assets/icon/favicon.ico
 50.set=ASSET
 42.set=ASSET
 52.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
@@ -62,10 +62,10 @@
 18.set=ASSET
 12.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 2.path=www/plugins/cordova-plugin-android-permissions/www/permissions.js
-46.path=www/assets/fonts/roboto.scss
+46.path=www/manifest.json
 9.path=www/cordova.js
 74.baseType=DIRECTORY
-53.path=www/build/main.js
+53.path=www/assets/fonts/ionicons.ttf
 7.set=ASSET
 68.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 21.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
@@ -73,7 +73,7 @@
 67.baseType=DIRECTORY
 27.baseType=DIRECTORY
 28.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
-60.path=www/assets/fonts/roboto-regular.ttf
+60.path=www/assets/fonts/noto-sans-bold.woff
 75.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 70.baseType=DIRECTORY
 41.set=ASSET
@@ -82,16 +82,16 @@
 9.baseType=DIRECTORY
 25.set=ASSET
 17.set=ASSET
-62.path=www/plugins/cordova-plugin-geolocation/www/android/geolocation.js
+62.path=www/assets/fonts/roboto-regular.ttf
 35.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
-69.path=www/plugins/cordova-plugin-actionsheet/www/ActionSheet.js
+69.path=www/build/polyfills.js
 82.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 79.set=ASSET
 60.baseType=DIRECTORY
 22.path=www/plugins/cordova-plugin-fingerprint-aio/www/Fingerprint.js
 29.path=www/assets/fonts/noto-sans-regular.woff
 2.baseType=DIRECTORY
-76.path=www/assets/fonts/Roboto-Thin.ttf
+76.path=www/plugins/cordova-plugin-camera/www/CameraPopoverOptions.js
 6.set=ASSET
 53.baseType=DIRECTORY
 13.baseType=DIRECTORY
@@ -99,7 +99,7 @@
 44.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 36.path=www/plugins/cordova-plugin-dialogs/www/notification.js
 7.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
-83.path=www/assets/fonts/roboto-bold.woff2
+83.path=www/assets/indigo-pink.css
 40.set=ASSET
 83.baseType=DIRECTORY
 32.set=ASSET
@@ -108,17 +108,18 @@
 46.baseType=DIRECTORY
 58.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 16.set=ASSET
+86.set=ASSET
 78.set=ASSET
 11.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 1.path=www/assets/fonts/noto-sans-bold.ttf
-45.path=www/manifest.json
+45.path=www/assets/imgs/logo.png
 76.baseType=DIRECTORY
 8.path=www/plugins/uk.co.workingedge.phonegap.plugin.launchnavigator/www/common.js
 36.baseType=DIRECTORY
 5.set=ASSET
-52.path=www/assets/fonts/ionicons.ttf
+52.path=www/plugins/cordova-plugin-datepicker/www/android/DatePicker.js
 67.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
-59.path=www/assets/fonts/Roboto-BlackItalic.ttf
+59.path=www/build/1.js
 69.baseType=DIRECTORY
 29.baseType=DIRECTORY
 20.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
@@ -130,24 +131,26 @@
 23.set=ASSET
 15.set=ASSET
 59.baseType=DIRECTORY
+85.set=ASSET
 62.baseType=DIRECTORY
 34.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 77.set=ASSET
-68.path=www/assets/img/misc/avatar.jpg
+68.path=www/assets/fonts/Roboto-Italic.ttf
 81.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 69.set=ASSET
 4.baseType=DIRECTORY
 21.path=www/assets/fonts/Roboto-Black.ttf
 28.path=www/cordova-js-src/android/nativeapiprovider.js
-75.path=www/assets/fonts/ionicons.woff2
+75.path=www/assets/fonts/ionicons.scss
 4.set=ASSET
 55.baseType=DIRECTORY
 15.baseType=DIRECTORY
 43.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 35.path=www/assets/fonts/roboto-medium.woff2
 6.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
-82.path=www/assets/icon/favicon.ico
+82.path=www/service-worker.js
 0.baseType=DIRECTORY
+85.baseType=DIRECTORY
 30.set=ASSET
 22.set=ASSET
 50.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
@@ -160,16 +163,16 @@
 10.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 38.baseType=DIRECTORY
 0.path=www/plugins/cordova-plugin-dialogs/www/android/notification.js
-44.path=www/assets/imgs/logo.png
+44.path=www/assets/fonts/roboto-light.woff2
 81.baseType=DIRECTORY
 41.baseType=DIRECTORY
 7.path=www/assets/deep.min.css
 3.set=ASSET
 19.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\transforms\\mergeJniLibs\\debug\\0
-51.path=www/plugins/cordova-plugin-datepicker/www/android/DatePicker.js
+51.path=www/assets/fonts/ionicons.svg
 66.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 71.baseType=DIRECTORY
-58.path=www/assets/fonts/noto-sans-bold.woff
+58.path=www/index.html
 34.baseType=DIRECTORY
 11.path=www/plugins/cordova-plugin-ionic-keyboard/www/android/keyboard.js
 26.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
@@ -182,7 +185,7 @@
 75.set=ASSET
 33.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\transforms\\mergeJniLibs\\debug\\0
 67.set=ASSET
-67.path=www/build/polyfills.js
+67.path=www/assets/fonts/noto-sans.scss
 80.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 6.baseType=DIRECTORY
 59.set=ASSET
@@ -191,13 +194,13 @@
 17.baseType=DIRECTORY
 27.path=classes.dex
 2.set=ASSET
-74.path=www/plugins/cordova-plugin-camera/www/CameraPopoverOptions.js
+74.path=www/cordova_plugins.js
 20.baseType=DIRECTORY
 42.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 34.path=www/assets/css/deeppurple-amber.css
 47.baseType=DIRECTORY
 5.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
-81.path=www/assets/indigo-pink.css
+81.path=www/cordova-js-src/platform.js
 49.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 50.baseType=DIRECTORY
 20.set=ASSET
@@ -208,16 +211,16 @@
 66.set=ASSET
 58.set=ASSET
 43.baseType=DIRECTORY
-43.path=www/assets/fonts/roboto-light.woff2
+43.path=www/assets/fonts/Roboto-BoldItalic.ttf
 16.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 6.path=www/assets/fonts/roboto-medium.ttf
 1.set=ASSET
 73.baseType=DIRECTORY
 18.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
-50.path=www/assets/fonts/ionicons.svg
+50.path=www/cordova-js-src/android/promptbasednativeapi.js
-65.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
+65.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\transforms\\mergeJniLibs\\debug\\0
-count=85
+count=87
-57.path=www/index.html
+57.path=www/plugins/cordova-plugin-camera/www/Camera.js
 10.path=www/assets/img/avatar/girl-avatar.png
 25.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 72.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
@@ -228,18 +231,19 @@ count=85
 81.set=ASSET
 73.set=ASSET
 8.baseType=DIRECTORY
-65.set=ASSET
+65.set=NATIVE_RESOURCE
 19.path=lib/arm64-v8a/libsqlc-native-driver.so
 32.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 57.set=ASSET
-66.path=www/assets/fonts/Roboto-Italic.ttf
+66.path=www/assets/fonts/Roboto-ThinItalic.ttf
 39.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\transforms\\mergeJniLibs\\debug\\0
 49.set=ASSET
+86.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 19.baseType=DIRECTORY
 0.set=ASSET
 22.baseType=DIRECTORY
 26.path=www/assets/fonts/roboto-regular.woff2
-73.path=www/assets/fonts/ionicons.scss
+73.path=www/build/vendor.js
 1.baseType=DIRECTORY
 49.baseType=DIRECTORY
 41.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
@@ -247,7 +251,7 @@ count=85
 33.path=lib/x86_64/libsqlc-native-driver.so
 12.baseType=DIRECTORY
 4.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
-80.path=www/service-worker.js
+80.path=www/assets/fonts/roboto-light.ttf
 48.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 10.set=ASSET
 80.set=ASSET
@@ -257,15 +261,15 @@ count=85
 45.baseType=DIRECTORY
 56.set=ASSET
 48.set=ASSET
-42.path=www/assets/fonts/Roboto-BoldItalic.ttf
+42.path=www/assets/fonts/ionicons.eot
 15.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 5.path=www/plugins/cordova-plugin-camera/www/CameraPopoverHandle.js
-49.path=www/cordova-js-src/android/promptbasednativeapi.js
+49.path=www/build/main.css
 75.baseType=DIRECTORY
 35.baseType=DIRECTORY
 17.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 64.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
-56.path=www/plugins/cordova-plugin-camera/www/Camera.js
+56.path=www/plugins/uk.co.workingedge.phonegap.plugin.launchnavigator/www/localforage.v1.5.0.min.js
 68.baseType=DIRECTORY
 28.baseType=DIRECTORY
 24.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
@@ -274,19 +278,20 @@ count=85
 31.baseType=DIRECTORY
 78.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 71.set=ASSET
-63.set=NATIVE_RESOURCE
+63.set=ASSET
 55.set=ASSET
 18.path=www/assets/fonts/roboto-bold.ttf
 31.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 47.set=ASSET
-65.path=www/assets/fonts/noto-sans.scss
+65.path=lib/armeabi-v7a/libsqlc-native-driver.so
 61.baseType=DIRECTORY
 38.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 39.set=NATIVE_RESOURCE
+85.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 3.baseType=DIRECTORY
 25.path=www/cordova-js-src/plugin/android/app.js
-72.path=www/cordova_plugins.js
+72.path=www/plugins/cordova-plugin-ionic-webview/src/www/util.js
-79.path=www/cordova-js-src/platform.js
+79.path=www/assets/img/misc/adrian-199150-unsplash 1.jpg
 54.baseType=DIRECTORY
 14.baseType=DIRECTORY
 40.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
@@ -294,6 +299,7 @@ count=85
 3.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 47.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 39.path=lib/armeabi/libsqlc-native-driver.so
+86.path=www/plugins/cordova-plugin-splashscreen/www/splashscreen.js
 84.baseType=DIRECTORY
 70.set=ASSET
 62.set=ASSET
@@ -302,17 +308,17 @@ count=85
 10.baseType=DIRECTORY
 46.set=ASSET
 38.set=ASSET
-41.path=www/assets/fonts/ionicons.eot
+41.path=www/assets/fonts/roboto-regular.woff
 77.baseType=DIRECTORY
 14.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 4.path=www/plugins/cordova-sqlite-storage/www/SQLitePlugin.js
 37.baseType=DIRECTORY
-48.path=www/build/main.css
+48.path=www/plugins/cordova-plugin-statusbar/www/statusbar.js
 61.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 80.baseType=DIRECTORY
 40.baseType=DIRECTORY
-63.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\transforms\\mergeJniLibs\\debug\\0
+63.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
-55.path=www/plugins/uk.co.workingedge.phonegap.plugin.launchnavigator/www/localforage.v1.5.0.min.js
+55.path=www/assets/fonts/Roboto-MediumItalic.ttf
 33.baseType=DIRECTORY
 23.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 15.path=www/build/sw-toolbox.js
@@ -326,18 +332,20 @@ count=85
 17.path=www/assets/fonts/ionicons.woff
 30.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 37.set=NATIVE_RESOURCE
-64.path=www/assets/fonts/Roboto-ThinItalic.ttf
+64.path=www/plugins/cordova-plugin-geolocation/www/android/geolocation.js
 29.set=ASSET
 37.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\transforms\\mergeJniLibs\\debug\\0
 84.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 5.baseType=DIRECTORY
 24.path=www/plugins/cordova-plugin-camera/www/CameraConstants.js
-71.path=www/build/vendor.js
+71.path=www/plugins/cordova-plugin-actionsheet/www/ActionSheet.js
 56.baseType=DIRECTORY
 16.baseType=DIRECTORY
-78.path=www/assets/fonts/roboto-light.ttf
+78.path=www/assets/fonts/Roboto-Thin.ttf
 31.path=www/assets/fonts/Roboto-LightItalic.ttf
 2.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 46.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
 38.path=www/assets/fonts/roboto-bold.woff
+86.baseType=DIRECTORY
 9.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug
+85.path=www/assets/fonts/roboto-bold.woff2

src/app/app.component.ts

@@ -151,7 +151,7 @@ let alert=this.alertCtrl.create({
       break;
       case 2:
   this.AWS.logout().subscribe(()=>{
-    
+    this.userDetails=''
     this.nav.setRoot(LoginPage);
   });
   break;

src/app/app.scss

@@ -236,6 +236,7 @@ ion-content {
 }
 
 }
+/* FOR ALERT */
 .buttoncss{
   color:darkseagreen;
   //background: green
@@ -265,10 +266,49 @@ ion-content {
   input.alert-input{
     border:1px solid blueviolet;
   }
+}
+  .complete_alert{
+    color:darkblue;
+  .alert-message{
+    color:olivedrab
+    }
+    button.alert-button:nth-child(1){
+     // margin-bottom:20px;
+      color: red;
+      border:1px solid red;
+      border-radius: 10px;
+      width: 85%;
+      text-align: center;
+    // position: relative;
+    // right:20px;
+    font-size: 14px;
+    }
+  
+    button.alert-button:nth-child(2){
+      margin-top:10px;
+      color: darkgreen;
+      // border:1px solid green;
+      // border-radius: 10px;
+      // background-color: gray;
+      // padding:5px;
+      // border: 1px solid blue;
+      width: 60px;
+    }
+    button.alert-button:nth-child(3){
+      margin-top:8px;
+      color: darkred;
+      // border:1px solid green;
+      // border-radius: 10px;
+      // background-color: gray;
+      // padding:5px;
+      // border: 1px solid blue;
+      // width: 60px;
+    }
+  }
+  
+/* END OF ALERT*/
   
 
-  
-}
 
 // .prompt_alert .alert-input{
 //   border-bottom: none!important;

src/pages/input/input.html

@@ -3,12 +3,12 @@
       <button ion-button menuToggle>
         <ion-icon name="menu"></ion-icon>
       </button>
-      <ion-title>{{applicatentDetails.lender_full_name}} - {{applicatentDetails.lender_applicant_id}}</ion-title>
+      <ion-title>{{pdMaster.lender_full_name}} - {{pdMaster.lender_applicant_id}}</ion-title>
     </ion-navbar>
   </ion-header>
   
   
-  <ion-content padding >
+  <ion-content padding>
       
       <!--Fab with Mulitple Options-->
       <!-- <ion-fab middle right >
@@ -21,13 +21,16 @@
 
         </ion-fab> -->
      <mat-card style=" border-radius: 10px;">
-       <ion-row>
+       <ion-row *ngIf="other_applicant[0]">
-         <ion-col class="cardinfo"><ion-icon name="contact"></ion-icon>&nbsp; {{applicatentDetails.applicat_details[0].applicant_name | titlecase}}</ion-col>
+         <ion-col class="cardinfo"><ion-icon name="contact"></ion-icon>&nbsp; {{mainApplicant.applicant_name | titlecase}}</ion-col>
        </ion-row>
+       <!-- <ion-row *ngIf="!applicatentDetails.applicat_details">
+          <ion-col class="cardinfo"><ion-icon name="contact"></ion-icon>&nbsp; {{applicatentDetails.applicat_details[0].applicant_name | titlecase}}</ion-col>
+        </ion-row> -->
        <hr/>
        <ion-row>
         <ion-col col-1><ion-icon name="md-people"></ion-icon></ion-col>
-        <ion-col class="cardinfo">{{applicatentDetails.customer_segment_name}}</ion-col>
+        <ion-col class="cardinfo">{{pdMaster.customer_segment_name}}</ion-col>
      </ion-row>
      <hr/>
      <!-- <a (click)="locationnavicate(applicatentDetails.addressline1)" style="text-decoration: none;"><ion-row>
@@ -45,37 +48,49 @@
     
         <ion-row>
           <ion-col col-1 class=""><ion-icon name="call"></ion-icon></ion-col>
-          <ion-col class="cardinfo">{{applicatentDetails.applicat_details[0].mobile_no}} </ion-col>
+          <ion-col class="cardinfo">{{mainApplicant.mobile_no}} </ion-col>
-          <ion-col col-2 color="optblue"><a href="tel:?{{applicatentDetails.applicat_details[0].mobile_no}}" style="text-decoration: none;">
+          <ion-col col-2 color="optblue"><a href="tel:?{{mainApplicant.mobile_no}}" style="text-decoration: none;">
             <ion-icon color="optblue" style="font-size: 24px;" name="call"></ion-icon></a></ion-col>
        </ion-row>
        <hr/>
         <ion-row>
           <ion-col col-1><ion-icon name="md-briefcase"></ion-icon></ion-col>
-          <ion-col class="cardinfo">{{applicatentDetails.product_name}}
+          <ion-col class="cardinfo">{{pdMaster.product_name}}
           <span class="cardinfo" *ngIf="applicatentDetails.subproduct_name != 'Not Applicable' && applicatentDetails.subproduct_name !=null ">/ {{applicatentDetails.subproduct_name}}</span></ion-col>
        </ion-row>
      <hr>
      <ion-row>
         <ion-col col-1><ion-icon name="md-cash"></ion-icon></ion-col>
-        <ion-col class="cardinfo">{{"&#8377;"}} {{applicatentDetails.loan_amount}}</ion-col>
+        <ion-col class="cardinfo">{{"&#8377;"}} {{pdMaster.loan_amount}}</ion-col>
      </ion-row>
      <hr/>
      <div *ngFor="let addr of addresses; let i=index">
-       <mat-label style="font-size:12px;color:gray">Address # {{i+1}}</mat-label>
+       <mat-label style="font-size:12px;color:gray">Address {{i+1}}</mat-label>
-     <a (click)="locationnavicate(i)" style="text-decoration: none;"><ion-row>
+     <a (click)="locationnavicate(i)" style="text-decoration: none;">
-       
+        <div *ngFor="let status of addr.addtional_pd_data">
+        <ion-row  float-right >
+            <h6 class="status">{{status.pd_status}}</h6>
+          </ion-row><br/>
+        </div>  
+      <ion-row> 
         <ion-col col-1 top><ion-icon name="pin"></ion-icon></ion-col>
-           <ion-col class="cardinfo">{{addr.addressline1}}<br/>
+           <ion-col class="addressinfo">{{addr.addressline1}}<br/>
            {{addr.city_name}}<br/>
            {{addr.state_name}}
-           <span  class="cardinfo" *ngIf="addr.pincode !='' && addr.pincode != null && addr.pincode != 'Others'">-{{addr.pincode}}</span>
+           <span  class="addressinfo" *ngIf="addr.pincode !='' && addr.pincode != null && addr.pincode != 'Others'">-{{addr.pincode}}</span>
-          <span  class="cardinfo" *ngIf="addr.pincode != '' && addr.pincode != null && addr.pincode == 'Others'">-{{addr.other_pincode}}</span></ion-col>
+          <span  class="addressinfo" *ngIf="addr.pincode != '' && addr.pincode != null && addr.pincode == 'Others'">-{{addr.other_pincode}}</span></ion-col>
-          </ion-row></a>
+          </ion-row>
-     <hr/>
+        </a>
+        <div *ngFor="let status of addr.addtional_pd_data;let i=index">
+            <ion-icon *ngIf="status.scheduled_on != null"  item-start class="addressinfo" name="md-calendar">  {{status.scheduled_on}}</ion-icon>
+            <ion-icon float-right class="addressinfo" name="md-people">  {{status.customer_segment_abbr}}</ion-icon><br/>
+        <span *ngIf="status.pd_status == 'COMPLETED' || status.pd_status == 'INPROGRESS' || status.pd_status == 'ADD_ON_PENDING'" class="inprogress_btn"> <button  ion-button clear color="optblue" (click)="inprogress(applicatentDetails,status)"><ion-icon style="font-size:24px;" name="md-chatbubbles"></ion-icon></button></span>
+        </div>
+        <hr/>
      </div>
+     
        <ion-row class="schdul" *ngIf="scheduleAccess" #scroll>
-        
+        <hr/>
          <ion-item> <!--class="cusicon"-->
           <ion-label  color="primary" floating>Schedule Date</ion-label>
           <ion-input #focusinp type="datetime-local" [min]="maxdate" (input)="datetime-local = $event.target.value" [(ngModel)]="scheduleDate" placeholder="Text Input"></ion-input>
@@ -85,8 +100,9 @@
        </ion-row>
          <ion-row *ngIf="initiatedAccess || startedAccess">
                 <ion-row>
+                  <ion-label>Scheduled On</ion-label><br/>
                     <ion-col col-1><ion-icon name="md-calendar"></ion-icon></ion-col>
-                    <ion-col class="cardinfo"> &nbsp;{{applicatentDetails.scheduled_on}}</ion-col>
+                    <ion-col class="cardinfo"> &nbsp;{{address_allocated_data.scheduled_on}}</ion-col>
                   </ion-row>
              </ion-row> 
        
@@ -125,14 +141,14 @@
         <br/>
       <mat-card-content *ngFor="let other_app of other_applicant; let i=index">
           <mat-card-header>
-              <mat-card-title><h5>Applicant # {{i+1}}</h5></mat-card-title>
+              <mat-card-title><h5>Applicant {{i+1}}</h5></mat-card-title>
             </mat-card-header>
         <ion-row>
           <ion-col>
           <ion-col class="cardinfo"><ion-icon name="contact"></ion-icon>&nbsp; {{other_app.applicant_name | titlecase}}</ion-col>
           </ion-col>
         </ion-row>
-        <ion-row>
+        <ion-row *ngIf="other_app.mobile_no != '' && other_app.mobile_no != null">
          <ion-col col-1><ion-icon name="call"></ion-icon></ion-col>
          <ion-col class="cardinfo">{{other_app.mobile_no}}</ion-col>
          <ion-col col-2 >
@@ -150,20 +166,20 @@
       
     <ion-row>
       <ion-col>
-        <ion-col class="cardinfo"><ion-icon name="contact"></ion-icon>&nbsp; {{applicatentDetails.pd_contact_person}}</ion-col>
+        <ion-col class="cardinfo"><ion-icon name="contact"></ion-icon>&nbsp; {{pdMaster.pd_contact_person}}</ion-col>
       </ion-col>
     </ion-row>
     <ion-row>
     <ion-col col-1><ion-icon name="call"></ion-icon></ion-col>
-      <ion-col class="cardinfo">{{applicatentDetails.pd_contact_mobileno}}</ion-col>
+      <ion-col class="cardinfo">{{pdMaster.pd_contact_mobileno}}</ion-col>
       <ion-col col-2 color="optblue">
-          <a href="tel:?{{applicatentDetails.pd_contact_mobileno}}" style="text-decoration: none;"><ion-icon color="optblue" style="font-size: 24px;" name="call"></ion-icon>
+          <a href="tel:?{{pdMaster.pd_contact_mobileno}}" style="text-decoration: none;"><ion-icon color="optblue" style="font-size: 24px;" name="call"></ion-icon>
           </a></ion-col>
     </ion-row>
   </mat-card-content>
-    </mat-card>
+    </mat-card><br/><br/>
     </ion-content>
-  <ion-footer>
+  <ion-footer *ngIf="address_pd_id != null">
         <mat-card style="padding:0px !important;">
             <ion-row *ngIf="scheduleAccess">
          
@@ -206,11 +222,15 @@
               
               <ion-row *ngIf="startedAccess">
                  
-                <button ion-button full  color="primary" style="background-color: green !important;" (click)="startPdDiscussion(applicatentDetails)">
+                <button ion-button full  color="primary" style="background-color: green !important;" (click)="checkOTP(applicatentDetails)">
                           Start</button>
                 
                 
                 </ion-row>
+                <ion-row *ngIf="checkOtpAccess">
+                    <button ion-button full  color="primary" style="background-color: green !important;" (click)="startPdDiscussion()">
+                        Check OTP</button>
+                </ion-row>
           
         </mat-card>
      </ion-footer>

src/pages/input/input.scss

@@ -76,6 +76,12 @@ page-input{
    {
     font-size: 19px!important;
     padding-bottom: 30px!important;
+    //text-align: center
+    // padding-top:15px !important;
+   }
+   .addressinfo{
+    font-size: 19px!important;
+    //padding-bottom: 30px!important;
    }
    .schdul{
     // border:2px solid black;
@@ -102,4 +108,23 @@ page-input{
    ion-icon{
      font-size: 120%;
    }
+   .status{
+     color:#E00201;
+    //  float: right;
+    //  text-align: right;
+    //background-blend-mode: color-burn;
+    //background-color:lavender;
+    border:2px solid darkmagenta;
+    padding:7px;
+    border-radius: 10px;
+   }
+   .inprogress_btn{
+     //float: right;
+   position: relative;
+    left:80%;
+  //   top: 50%;
+  bottom:50%;
+   }
+  
+  
   }

src/pages/input/input.ts

@@ -24,6 +24,7 @@ import { ConstantsProvider } from '../../providers/constants/constants';
 import { PdGeneralImagesPage } from '../pd-general-images/pd-general-images';
 import { AndroidPermissions } from '@ionic-native/android-permissions';
 import {BouncedRejectPage} from '../../pages/input/bounced-reject/bounced-reject'
+import {PdQuestionCategoryPage} from '../../pages/pd-question-category/pd-question-category'
 
 
 /**
@@ -61,10 +62,18 @@ startedAccess:boolean = false;
 timeOut:any = 15*1000;
 timeInterval:any;
 currentPosPDofficer:any;
-other_applicant:any;
+other_applicant:any=[];
+loadDetails=false;
+mainApplicant:any=[]
+pdMaster:any=[]
+checkOtpAccess:boolean=false
 @ViewChild('focusinp') input_focus ;
 @ViewChild('scroll') scrolltop : Content;
   addresses: any=[];
+  address_pd_id: any;
+  address_pd_status: any;
+  address_allocated_data:any
+  // address_child_schedule_time:any;
   constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
     public statusBar:StatusBar,public platform: Platform,public launchNavigator:LaunchNavigator,
     public aws:AwsServiceProvider,public pdDetails:PdtriggerProvider,public geolocation:Geolocation,
@@ -91,26 +100,26 @@ other_applicant:any;
     this.getFullPD();
       
      
-     if(this.applicatentDetails.pd_status == 'ALLOCATED')
+    //  if(this.applicatentDetails.pd_status == 'ALLOCATED')
-     {
+    //  {
-       this.acceptedAccess = true;
+    //    this.acceptedAccess = true;
-     }
+    //  }
-     if(this.applicatentDetails.pd_status == 'ACCEPTED')
+    //  if(this.applicatentDetails.pd_status == 'ACCEPTED')
-     {
+    //  {
-       this.scheduleAccess = true;
+    //    this.scheduleAccess = true;
-     }
+    //  }
-     if(this.applicatentDetails.pd_status == 'SCHEDULED')
+    //  if(this.applicatentDetails.pd_status == 'SCHEDULED')
-     {
+    //  {
        
-       this.initiatedAccess = true;
+    //    this.initiatedAccess = true;
-     }
+    //  }
-     //console.log(this.initiatedAccess);
+    //  //console.log(this.initiatedAccess);
-     if(this.applicatentDetails.pd_status == 'INITIATED')
+    //  if(this.applicatentDetails.pd_status == 'INITIATED')
-     {
+    //  {
-       this.startedAccess = true;
+    //    this.startedAccess = true;
-       this.getenableAccuracy();
+    //    this.getenableAccuracy();
        
-     }
+    //  }
      this.users = this.aws.getlocale();
     
   }
@@ -152,15 +161,63 @@ other_applicant:any;
 
   getFullPD()
   {
-    let records = {'pdid':this.applicatentDetails.pd_id};
+    let pdDetails_pdid=this.applicatentDetails.is_child != '1' ? this.applicatentDetails.pd_id :this.applicatentDetails.parent_pd_id
+    let records = {'pdid':pdDetails_pdid};
     this.pdDetails.getFullPDdetails(records).subscribe(res=>
       {
         if(res['dataStatus']==true){
           this.other_applicant=res['records'].applicants_details
+          this.mainApplicant=res['records'].applicants_details[0]
+          this.pdMaster=res['records'].pd_master_details[0]
+          console.log("other",this.mainApplicant)
           this.addresses=res['records'].pd_address
+          this.address_pd_id=this.addresses.addtional_pd_data
+        //FOR GETTING THE ALLOCATED/SCHEDULE/INITIATE PDID 
+          this.addresses.forEach(res=>{
+           console.log("address",res);
+           if(res.addtional_pd_data.length != 0){
+           if(res.addtional_pd_data[0].pd_status == 'ALLOCATED' || res.addtional_pd_data[0].pd_status == 'ACCEPTED'  || res.addtional_pd_data[0].pd_status == 'SCHEDULED'  || res.addtional_pd_data[0].pd_status == 'INITIATED' || res.addtional_pd_data[0].pd_status == 'STARTED'){
+             this.address_pd_id=res.addtional_pd_data[0].pd_id
+             this.address_pd_status=res.addtional_pd_data[0].pd_status
+             this.address_allocated_data=res.addtional_pd_data[0]
+            
+             console.log("pd",this.address_pd_id)
+             return;
+           }
+          }
+         })
+         //FOR CHANGING THE PD ID based on assigned pd address
+         //this.applicatentDetails.pd_id=this.address_pd_id
+         //FOR GIVING ACCESS FOR BUTTONS BASED ON pd status IN ADDRESS
+         if(this.address_pd_status == 'ALLOCATED')
+         {
+           this.acceptedAccess = true;
+         }
+         if(this.address_pd_status == 'ACCEPTED')
+         {
+           this.scheduleAccess = true;
+         }
+         if(this.address_pd_status == 'SCHEDULED')
+         {
+           
+           this.initiatedAccess = true;
+         }
+         //console.log(this.initiatedAccess);
+         if(this.address_pd_status == 'INITIATED')
+         {
+           this.startedAccess = true;
+           this.getenableAccuracy();
+           
+         }
+         if(this.address_pd_status == 'STARTED')
+         {
+           this.checkOtpAccess=true;
+         }
+         console.log("address allocated",this.address_allocated_data);
           console.log(this.other_applicant);
+          if(this.address_allocated_data != '' && this.address_allocated_data !=undefined){
         let courrentDateTime: string = this.pipe.transform(new Date(), 'yyyy-MM-dd HH:mm');   
-     let scheduledDateTime: string= res['records'].pd_master_details[0].scheduled_on_for_validation;
+     let scheduledDateTime: string=this.address_allocated_data.scheduled_on_for_validation;
      let diffInMs: number = Date.parse(courrentDateTime) - Date.parse(scheduledDateTime);
      let diffInHours: number = Math.floor(diffInMs / 1000 / 60 / 60);
      console.log(diffInHours);
@@ -172,7 +229,10 @@ other_applicant:any;
     {
       this.enableStartPD = false;
     }
+  }
+  this.loadDetails=true
     }  
+   
     })
       
   }
@@ -182,7 +242,8 @@ other_applicant:any;
     
     if(status == 'BOUNCED')
     {
-      data = {'pd_id':appdetails.pd_id,'pd_status':status,'fk_updatedby':this.users,'updatedon':currentdate};
+      // 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};
       this.navCtrl.push(BouncedRejectPage,{'details':data})
       // this.pdDetails.updatepdStatus(data).subscribe(res=>
       //   {
@@ -194,13 +255,15 @@ other_applicant:any;
       //   })
     }else if(status == 'ACCEPTED')
     {
-        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};
         this.pdDetails.updatepdStatus(data).subscribe(res=>
           {
             this.updateStatus = res;
             if(this.updateStatus.dataStatus == true)
             {
               this.getNewpdupdate();
+              
               this.scheduleAccess = true;
               
             }else
@@ -220,13 +283,14 @@ other_applicant:any;
     if(scheduledate != undefined){
       let schDate = scheduledate.slice(0,19).replace('T',' ');
       console.log(schDate);
-      data = {'pd_id':appdetails.pd_id,'pd_status':'SCHEDULED','scheduled_on':schDate,'fk_updatedby':this.users,'updatedon':currentdate};
+      data = {'pd_id':this.address_pd_id,'pd_status':'SCHEDULED','scheduled_on':schDate,'fk_updatedby':this.users,'updatedon':currentdate};
       this.pdDetails.updatepdStatus(data).subscribe(res=>
         {
             this.updateSchedule = res;
             if(this.updateSchedule.dataStatus == true)
             {
               this.getNewpdupdate();
+              
               this.initiatedAccess = true;
             }
         });
@@ -273,7 +337,7 @@ other_applicant:any;
         this.currentPosPDofficer = resp.coords.latitude+","+resp.coords.longitude;
         // this.toast.pdTriggerappmessage(this.currentPosPDofficer);
         console.log(this.currentPosPDofficer);
-    data = {'pd_id':this.applicatentDetails.pd_id,'link':this.currentPosPDofficer};
+    data = {'pd_id':this.address_pd_id,'link':this.currentPosPDofficer};
 
 
     this.pdDetails.saveCurrentLocation(data).subscribe(res=>
@@ -314,7 +378,7 @@ other_applicant:any;
       // resp.coords.longitude
      
         this.currentPosPDofficer = resp.coords.latitude+","+resp.coords.longitude;
-    data = {'pd_id':appdetails.pd_id,'pd_status':'INITIATED','mobile_no':appdetails.applicat_details[0].mobile_no,'officerName':appdetails.pd_allocated_to,'firstName':appdetails.applicat_details[0].applicant_name,'fk_updatedby':this.users,'updatedon':currentdate,'link':this.currentPosPDofficer};
+    data = {'pd_id':this.address_pd_id,'pd_status':'INITIATED','mobile_no':this.mainApplicant.mobile_no,'officerName':appdetails.pd_allocated_to,'firstName':this.mainApplicant.applicant_name,'fk_updatedby':this.users,'updatedon':currentdate,'link':this.currentPosPDofficer};
 
 
     this.pdDetails.updatepdStatus(data).subscribe(res=>
@@ -337,11 +401,55 @@ other_applicant:any;
   );
   }
   
+  },error=>{
+    alert(JSON.stringify(error))
+    data = {'pd_id':this.address_pd_id,'pd_status':'INITIATED','mobile_no':this.mainApplicant.mobile_no,'officerName':appdetails.pd_allocated_to,'firstName':this.mainApplicant.applicant_name,'fk_updatedby':this.users,'updatedon':currentdate,'link': this.currentPosPDofficer};
+    this.pdDetails.updatepdStatus(data).subscribe(res=>
+      {
+          this.updateinitiated = res;
+          if(this.updateinitiated.dataStatus == true)
+          { 
+            this.getNewpdupdate();
+            this.getcurrentLocation();
+            this.startedAccess = true;
+          }else
+          {
+            this.startedAccess = false;
+          }
+      })
   });
   }
+  checkOTP(appdetails){
+    let data:any;
+    this.geolocation.getCurrentPosition().then((resp) => {
+      this.currentPosPDofficer = resp.coords.latitude+","+resp.coords.longitude;
 
-  startPdDiscussion(appdetails)
+    data = {'pd_id':this.address_pd_id,'pd_status':'STARTED','mobile_no':this.mainApplicant.mobile_no,'fk_updatedby':this.users,'updatedon':currentdate,'link':this.currentPosPDofficer };
+    console.log(data);
+this.pdDetails.updatepdStatus(data).subscribe(res=>
+{
+  this.updatestarted = res;
+if(this.updatestarted.dataStatus == true)
+{
+ //appdetails.pd_id=this.address_pd_id
+ //clearInterval(this.timeInterval);
+ //console.log("appdetails",appdetails)
+ //this.navCtrl.setRoot(OtpPage,{'pdDetails':appdetails});
+ this.getNewpdupdate();
+ this.checkOtpAccess=true
+}
+else{
+  this.checkOtpAccess=false
+}
+
+})
+   // console.log('Buy clicked');
+ })
+  }
+
+  startPdDiscussion()
   {
+
     let data:any;
     let alert = this.alertCtrl.create({
       title: 'Start Discussion',
@@ -359,22 +467,31 @@ other_applicant:any;
         {
           text: 'YES',
           handler: () => {
-    this.geolocation.getCurrentPosition().then((resp) => {
+    // this.geolocation.getCurrentPosition().then((resp) => {
-        this.currentPosPDofficer = resp.coords.latitude+","+resp.coords.longitude;
+    //     this.currentPosPDofficer = resp.coords.latitude+","+resp.coords.longitude;
               
-             data = {'pd_id':appdetails.pd_id,'pd_status':'STARTED','mobile_no':appdetails.applicat_details[0].mobile_no,'fk_updatedby':this.users,'updatedon':currentdate,'link':this.currentPosPDofficer};
+    //          data = {'pd_id':this.address_pd_id,'pd_status':'STARTED','mobile_no':this.mainApplicant.mobile_no,'fk_updatedby':this.users,'updatedon':currentdate,'link':  this.currentPosPDofficer };
-             console.log(data);
+    //          console.log(data);
-    this.pdDetails.updatepdStatus(data).subscribe(res=>
+    // this.pdDetails.updatepdStatus(data).subscribe(res=>
-      {this.updatestarted = res;
+    //   {this.updatestarted = res;
-        if(this.updatestarted.dataStatus == true)
+    //     if(this.updatestarted.dataStatus == true)
-        {
+    //     {
-          clearInterval(this.timeInterval);
+    //       appdetails.pd_id=this.address_pd_id
-          this.navCtrl.setRoot(OtpPage,{'pdDetails':appdetails});
+    //       clearInterval(this.timeInterval);
-        }
+    //       console.log("appdetails",appdetails)
+    //       this.navCtrl.setRoot(OtpPage,{'pdDetails':appdetails});
+    //     }
         
-      })
+    //   })
-            // console.log('Buy clicked');
+    //         // console.log('Buy clicked');
-          })
+    //       })
+    clearInterval(this.timeInterval);
+    //FOR GIVING THE CORRECT ADDRESS MASTER
+    console.log("address",this.address_allocated_data);
+    //Assigning applicant details to the params
+   let pdValues= this.address_allocated_data
+   pdValues.applicat_details=this.other_applicant
+    this.navCtrl.setRoot(OtpPage,{'pdDetails':pdValues});
         }  
         }
       ]
@@ -383,6 +500,7 @@ other_applicant:any;
   }
   getNewpdupdate()
   {
+    console.log("new pd",this.applicatentDetails.pd_id)
       this.acceptedAccess = false;
       this.initiatedAccess = false;
       this.scheduleAccess = false;
@@ -393,33 +511,86 @@ other_applicant:any;
         if(this.appdata.dataStatus == true)
         {
           this.applicatentDetails = this.appdata.records.filter(app=>app.pd_id == this.applicatentDetails.pd_id)[0];
-          if(this.applicatentDetails.pd_status == 'ALLOCATED')
+          // this.address_pd_status=this.applicatentDetails
-     {
+          //FOR GETTING THE LATEST ADDRESS STATUS FROM getFullPDdetails
-       this.acceptedAccess = true;
+          let rec_pdid = {'pdid':this.applicatentDetails.pd_id};
-     }
+          this.pdDetails.getFullPDdetails(rec_pdid).subscribe(result=>{
-     if(this.applicatentDetails.pd_status == 'ACCEPTED')
+            result['records'].pd_address.forEach(data=>{
-     {
+              if(data.addtional_pd_data.length != 0){
-       this.scheduleAccess = true;
+                if(data.addtional_pd_data[0].pd_status == 'ALLOCATED' || data.addtional_pd_data[0].pd_status == 'ACCEPTED'  || data.addtional_pd_data[0].pd_status == 'SCHEDULED'  || data.addtional_pd_data[0].pd_status == 'INITIATED'){
-       this.toast.pdTriggerappmessage("Accepted Successfully")
+                  // this.address_pd_id=data.addtional_pd_data[0].pd_id
-     }
+                  this.address_pd_status=data.addtional_pd_data[0].pd_status
-     if(this.applicatentDetails.pd_status == 'SCHEDULED')
+                  // this.address_allocated_data=data.addtional_pd_data[0]
-     {
+                  console.log("pd",this.address_pd_id)
-       this.initiatedAccess = true;
+                  return;
-       this.getFullPD();
+                }
-       this.toast.pdTriggerappmessage("Scheduled Successfully")
+               }
-     }
+            })
+          
+    //       if(this.applicatentDetails.pd_status == 'ALLOCATED')
+    //  {
+    //    this.acceptedAccess = true;
+    //  }
+    //  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')
+    //  if(this.applicatentDetails.pd_status == 'INITIATED')
-     {
+    //  {
-       this.startedAccess = true;
+    //    this.startedAccess = true;
-       this.toast.pdTriggerappmessage("Initiated Successfully")
+    //    this.toast.pdTriggerappmessage("Initiated Successfully")
-     }
+    //  }
+
+    if(this.address_pd_status == 'ALLOCATED')
+    {
+      this.acceptedAccess = true;
+    }
+    if(this.address_pd_status == 'ACCEPTED')
+    {
+      this.scheduleAccess = true;
+      this.toast.pdTriggerappmessage("Accepted Successfully")
+    }
+    if(this.address_pd_status == 'SCHEDULED')
+    {
+      this.initiatedAccess = true;
+      this.getFullPD();
+      this.toast.pdTriggerappmessage("Scheduled Successfully")
+    }
+
+    if(this.address_pd_status == 'INITIATED')
+    {
+      this.startedAccess = true;
+      this.toast.pdTriggerappmessage("Initiated Successfully")
+    }
+    if(this.address_pd_status == 'STARTED'){
+      this.checkOtpAccess=true;
+    }
+
+    })
         }
+      
       })
+      console.log("app",this.applicatentDetails);
+    
   }
 
   camerasetup()
   {
     this.navCtrl.push(PdGeneralImagesPage,{'pdDetails':this.applicatentDetails});
   }
+  inprogress(data,address_child){
+    // data.pd_id=address_child.pd_id
+    console.log(address_child)
+    let pdValues=address_child
+    pdValues.applicat_details=this.other_applicant
+    this.navCtrl.push(PdQuestionCategoryPage,{'pdDetails':pdValues})
+  }
 }

src/pages/otp/otp.ts

@@ -36,11 +36,14 @@ export class OtpPage {
   applicatentDetails: any;
   commonImage:any;
   maxtime: any=30;
+  //address_pd_id:any;
   
   reasonForm:FormGroup
   constructor(public navCtrl: NavController, public navParams: NavParams,public pddetails:PdtriggerProvider,public toast:ToastProvider,public Menu:MenuController,public commonconstant:ConstantsProvider,public aws:AwsServiceProvider,public alertCtrl:AlertController,public qustCat:QuestionCategoryProvider,public fb:FormBuilder,public geolocation:Geolocation,public androidPermissions:AndroidPermissions) {
     this.commonImage = this.commonconstant.commonimage;
     this.applicatentDetails =  this.navParams.get('pdDetails');
+    console.log("this",this.applicatentDetails);
+    // this.address_pd_id=this.navParams.get('address_pd_id')
     this.users = this.aws.getlocale();
     console.log("user",this.users)
     this.reasonForm = this.fb.group(

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

@@ -120,9 +120,10 @@
              <mat-card class="md-box" reorder="true" *ngFor="let progess of pdinprogress;let i = index;">
               
                 <ion-list >
-                 
+                 <!-- WITH APPLICANT DETAILS -->
-                       <ion-item (click)="PdAllocation(progess)" > 
+                       <ion-item (click)="PdAllocation(progess)" *ngIf="progess.is_child != 1"> 
-                         <ion-icon item-start="" class="lettericon" [style.background]="bgColor[i]">{{progess.applicat_details[0].applicant_name | slice : 0 :1 | uppercase}}</ion-icon>
+                         <!-- <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">
                                  <h1>{{progess.applicat_details[0].applicant_name | titlecase}}</h1>
@@ -136,15 +137,40 @@
                                  </ion-col>                 
                              </ion-row>  
                               <ion-row>
-                               <ion-col col-5>
+                               <ion-col col-6>
-                                 <h6>{{progess.lender_short_name}}, {{progess.lender_applicant_id}}</h6>
+                                 <h6 class="app_id">{{progess.lender_short_name}}, {{progess.lender_applicant_id}}</h6>
                                </ion-col>
                                <ion-col text-right>
                                    <h6>{{progess.pd_status}}</h6>
                                 </ion-col>                                             
                              </ion-row>  
                        </ion-item>  
-   
+
+                       <!-- WITHOUT APPLICAT DETAILS FOR ADD ON PD -->
+                       <ion-item (click)="PdAllocation(progess)" *ngIf="progess.is_child == 1"> 
+                          <!-- <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 >
+                                  <h1>Add On for {{progess.parent_pd_id}}</h1>
+                                  <!--<p>28 Sep 2018 10:00 AM</p>-->
+                                </ion-col>
+                                <ion-col text-right>
+                                    <div style="font-size: 13px;">
+                                       <h6>{{progess.pd_date_of_initiation}}</h6>
+                                       <h6>{{progess.city_name}}</h6>
+                                    </div>
+                                  </ion-col>                 
+                              </ion-row>  
+                               <ion-row>
+                                <ion-col col-6>
+                                  <h6 class="app_id">{{progess.lender_short_name}}, {{progess.lender_applicant_id}}</h6>
+                                </ion-col>
+                                <ion-col text-right>
+                                    <h6>{{progess.pd_status}}</h6>
+                                 </ion-col>                                             
+                              </ion-row>  
+                        </ion-item>  
                  </ion-list>
                  <hr/>
              </mat-card>
@@ -175,18 +201,24 @@
                   <mat-card class="md-box" reorder="true" *ngFor="let progess of pdschduleDetails;let i = index;">
                     
                        
-                    <ion-list >
+                    <ion-list  >
-                             <ion-item (click)="PdAllocation(progess)"> 
+                    
-                               <ion-icon item-start="" class="lettericon" [style.background]="bgColorPast[i]">{{progess.applicat_details[0].applicant_name | slice : 0 :1 | uppercase}}</ion-icon>
+                      <!-- With Applicant Details -->
-                                   <ion-row>
+                             <ion-item (click)="PdAllocation(progess)" *ngIf="progess.is_child == '0'"> 
-                                     <ion-col *ngIf="progess.applicat_details.length !=0 && progess.applicat_details[0].applicant_type == 1">
+                             
+                               <!-- <ion-icon  *ngIf="progess.applicat_details && progess.applicat_details.length !=0; else applicat" item-start="" class="lettericon" [style.background]="bgColorPast[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-icon item-start="" class="lettericon" [style.background]="bgColorPast[i]" >{{progess.applicat_details[0].applicant_name | slice : 0 :1 | uppercase}}</ion-icon> -->
+                                   <ion-row  *ngIf="progess.applicat_details && progess.applicat_details.length !=0">
+                                     <ion-col *ngIf="progess.applicat_details && 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>                                                                                          
+                                     </ion-col>                                                                                       
                                    </ion-row>  
                                     <ion-row>
-                                     <ion-col col-5>
+                                     <ion-col col-6>
-                                       <h6>{{progess.lender_short_name}}, {{progess.lender_applicant_id}}</h6>
+                                       <h6 class="app_id">{{progess.lender_short_name}}, {{progess.lender_applicant_id}}</h6>
                                      </ion-col>  
                                      <ion-col text-right>
                                         <h6>{{progess.city_name}}</h6>
@@ -205,6 +237,38 @@
                                    </ion-row>
                                   
                              </ion-item>  
+                             <!-- Without Applicant details for Add On PD -->
+                             <ion-item (click)="PdAllocation(progess)" *ngIf="progess.is_child == '1' "> 
+                              <p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_id}}</p>
+                              <!-- <ion-icon item-start="" class="lettericon" [style.background]="bgColorPast[i]" >{{progess.pd_status | slice : 0 :1 | uppercase}}</ion-icon> -->
+                              <!-- <ion-label align="start" item-start >{{progess.pd_id}} -->
+                                  <ion-row >
+                                    <ion-col  >
+                                      <h1>Add On for {{progess.parent_pd_id}}</h1>
+                                     </ion-col>                                                                                
+                                  </ion-row>  
+                                
+                                   <ion-row>
+                                    <ion-col col-6>
+                                      <h6 class="app_id">{{progess.lender_short_name}}, {{progess.lender_applicant_id}}</h6>
+                                    </ion-col>  
+                                    <ion-col text-right>
+                                       <h6>{{progess.city_name}}</h6>
+                                    </ion-col>                              
+                                  </ion-row> 
+                                  <ion-row>
+                                    <ion-col>
+                                       <h6>{{progess.pd_status}}</h6>
+                                    </ion-col>
+                                     <ion-col text-right>
+                                         <div style="font-size: 13px;">
+                                            <h6 *ngIf="progess.scheduled_on ==null">{{progess.pd_date_of_initiation}}</h6>
+                                            <h6 *ngIf="progess.scheduled_on !=null">{{progess.scheduled_on}}</h6>                                           
+                                         </div>
+                                       </ion-col>
+                                  </ion-row>
+                                 
+                            </ion-item>  
 
                        </ion-list>
                        <hr/>

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

@@ -46,11 +46,26 @@ page-pd-list{
     .list-md{
       margin: 0px;
     }
+    // .lettericon{
+    //   background-color: cadetblue;
+    //     padding: 10px 15px 10px 15px;
+    //     border-radius: 50%;
+    //     color: #fff;
+    // }
     .lettericon{
       background-color: cadetblue;
-        padding: 10px 15px 10px 15px;
+        padding: 10px 8px 10px 8px;
-        border-radius: 50%;
+        border-radius: 20%;
         color: #fff;
+        font-size: 90%;
+        font-weight: bold
+    }
+    .no_applicant_pd{
+      background-color: cadetblue;
+      padding: 10px 15px 10px 15px;
+      border-radius: 50%;
+      color: #fff;
+      
     }
     .label-md{
       margin: 0px;
@@ -83,9 +98,15 @@ page-pd-list{
    }
    ion-slide.swiper-slide {
     align-items: flex-start;
+    overflow-x:scroll;
+    display: block;
 }
-ion-slides{
+// ion-slides{
-  height: auto;
+// //  height: auto;
- 
+// }
+
+.app_id{
+   overflow: hidden;
+  text-overflow: ellipsis;
 }
     }

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

@@ -128,12 +128,13 @@ export class PdListPage {
        {
         this.pdlistaccess = false;
         
-          this.pdschduleDetails = this.pdlistdetails.records.filter(sch=>sch.pd_status =="ACCEPTED" || sch.pd_status =="SCHEDULED" || sch.pd_status =="INITIATED" || sch.pd_status =="STARTED" || sch.pd_status =="INPROGRESS" && sch.applicat_details);
+          this.pdschduleDetails = this.pdlistdetails.records.filter(sch=>sch.pd_status =="ACCEPTED" || sch.pd_status =="SCHEDULED" || sch.pd_status =="INITIATED" || sch.pd_status =="STARTED" || sch.pd_status =="INPROGRESS" || sch.pd_status == "ADD_ON_PENDING" && sch.applicat_details );
           this.searchpast = this.pdschduleDetails;
           
           this.pdinprogress =  this.pdlistdetails.records.filter(allocate=>allocate.pd_status == "ALLOCATED");
           this.searchinprogress = this.pdinprogress;
-         
+         console.log("allocated",this.pdinprogress);
+         console.log("inpr",this.pdschduleDetails);
           this.random_bg_color();
           this.random_ng_past();
        }else
@@ -180,13 +181,19 @@ export class PdListPage {
   
   PdAllocation(pddetails)
   {
+  
     
-      if(pddetails.pd_status == 'STARTED')
+      if(pddetails.pd_status == '')//for STARTED
       {
         this.navCtrl.push(OtpPage,{'pdDetails':pddetails});
-      }else if(pddetails.pd_status == 'INPROGRESS'){
+      
-        this.navCtrl.push(PdQuestionCategoryPage,{'pdDetails':pddetails});
+      // }else if(pddetails.pd_status == 'INPROGRESS'){
-      }else{
+      //   this.navCtrl.push(PdQuestionCategoryPage,{'pdDetails':pddetails});
+      }else //if(pddetails.pd_status == 'ADD_ON_PENDING' || pddetails.pd_status == 'ALLOCATED')
+      {
+          //FOR ASSIGNING THE PARENT PD ID
+    //pddetails.pd_id=pddetails.parent_pd_id
+      //  pddetails.pd_id=pddetails.parent_pd_id
       this.navCtrl.push(InputPage,{'pdDetails':pddetails});
     }
   }

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

@@ -4,7 +4,7 @@
       <ion-icon name="menu"></ion-icon>
     </button>
     <!-- <ion-title *ngIf="!viewchange">{{pddetails.applicat_details[0].applicant_name | titlecase}}</ion-title> -->
-    <ion-title *ngIf="!viewchange">{{pddetails.applicant_name | titlecase}}</ion-title>
+    <ion-title *ngIf="!viewchange">{{pageTitle | titlecase}}</ion-title>
     
     <ion-title *ngIf="viewchange"> <ion-searchbar
      
@@ -75,7 +75,7 @@
                              <ion-row>
                                <ion-col *ngIf="pddetails.applicat_details.length !=0 && pddetails.applicat_details[0].applicant_type == 1">
                                  <h1>{{pddetails.applicat_details[0].applicant_name | titlecase}}</h1>
-                                 <!--<p>28 Sep 2018 10:00 AM</p>-
+                                 <p>28 Sep 2018 10:00 AM</p>-
                                </ion-col>                                                                                          
                              </ion-row>  
                               <ion-row>
@@ -160,7 +160,7 @@
             <ion-row>
               <!-- <button ion-button full color="primary" [disabled]="!overallqustioncountAccess"style="background-color: green !important;" (click)="completed()">
                   Completed </button> -->
-                  <button ion-button full color="primary" style="background-color: green !important;" (click)="completed()">
+                  <button ion-button full color="primary" style="background-color: green !important;" (click)="completePDAlert()">
                     Completed </button>
             </ion-row>
             </ion-footer>

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

@@ -65,10 +65,20 @@ overallqustioncountAccess:boolean = true;
 doughnutChart: any;
 completedAccess:any;
 searchitem:any;
+  enableAddonPD: boolean=false;
+  pageTitle:string;
   constructor(public navCtrl: NavController, public navParams: NavParams,public templateget:QuestionCategoryProvider,public aws:AwsServiceProvider, public shared:CognitoServiceProvider,public toast:ToastProvider,public pdstatusprovide:PdtriggerProvider) {
     this.pddetails = this.navParams.get('pdDetails');
+    this.pageTitle=this.pddetails.is_child != '1' ? this.pddetails.applicat_details[0].applicant_name : 'Add On for'+' '+this.pddetails.parent_pd_id
       
-    
+    let params: any={};
+      params.pd_id = this.pddetails.pd_id;
+      this.pdstatusprovide.getPDCompleteDetails(params).subscribe(result => {
+        if (result['dataStatus'] === true) {
+          this.enableAddonPD = result['records'].address_count>0 ? true: false;
+          console.log("addon",this.enableAddonPD);
+        }
+    });
   }
 
   ionViewCanEnter()
@@ -335,14 +345,61 @@ searchitem:any;
   }
   }
 }
-  completed()
+completePDAlert()
+{ 
+  if(!this.overallqustioncountAccess){// For checking Answered Forms
+  this.toast.pdTriggerappmessage("Please complete all the Forms");
+  return;
+}
+
+    console.log("this.ena",this.enableAddonPD);
+
+    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');
+      }
+      else if(data == 'addon'){
+        this.completed('ADD_ON_PENDING')
+      } 
+      else{
+        reject();
+      }
+    })
+  })
+}
+else{ //IF ADDRESS COUNT 0 THIS BLOCK EXECUTED
+  return new Promise(reject=>{
+    let alert=this.toast.setAlert('Complete Discussion','Please confirm you are completing the Discussion and forwarding for Quality Check ?')
+    alert.present()
+    alert.onDidDismiss(data=>{
+      if(data==false){
+        reject()
+      }
+      else{
+        this.completed('COMPLETED')
+      }
+    })
+  })
+}
+}
+  completed(status:string)
   {
+  
+    
+    //alert.present();
     let users = this.aws.getlocale();
     if(!this.overallqustioncountAccess){// For checking Answered Forms
-      this.toast.pdTriggerappmessage("Please Fill all the Forms");
+      this.toast.pdTriggerappmessage("Please complete all the Forms");
     }
     else{
-    let data = {'pd_id':this.questionCate.pdmaster_details.pd_id,'pd_status':'COMPLETED','fk_updatedby':users,'updatedon':currentdate};
+    let data = {'pd_id':this.questionCate.pdmaster_details.pd_id,'pd_status':status,'fk_updatedby':users,'updatedon':currentdate};
     
       this.pdstatusprovide.updatepdStatus(data).subscribe(res=>
         {

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

@@ -27,7 +27,7 @@
                 <ion-grid *ngIf="imageDisplay.length >0 ">
                         <ion-row>
                     <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                            <img src="{{image.image}}" imageViewer>
+                            <img src="{{image.image}}" imageViewer><br/>
                             <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
 
                             <input  *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -44,7 +44,7 @@
                             <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                         <ion-row>
                     <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                            <img src="{{image.image}}" imageViewer>
+                            <img src="{{image.image}}" imageViewer><br/>
                             <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
 
                             <input #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">

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

@@ -17,7 +17,8 @@ page-pd-question-address {
   //FOR IMAGE AND INPUT FIELD
   img{
     padding:0 5px 0 0;
-    height: 180px;
+    height:170px;
+    //width:auto;
     //width:130px;
     //border:3px solid black;
     //border-radius: 20px;

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

@@ -689,6 +689,7 @@ countRowsForTextarea(text){
       records.addresses=answerData.addresses
      // records.addressess
       records.address_form_remark=answerData.address_form_remark
+      records.parent_pdid=this.pdDetails.parent_pd_id
       records.pdid = this.pdDetails.pd_id;
       records.formid = this.FormId.form_id;
       records.fk_createdby = this.users;
@@ -731,7 +732,7 @@ countRowsForTextarea(text){
     }
     getaddressFormFromLocal(){
       let local_value:any;
-      let data:any={'pd_id':this.pdDetails.pd_id,'form_id':this.FormId.form_id};
+      let data:any={'parent_pdid':this.pdDetails.parent_pd_id,'pd_id':this.pdDetails.pd_id,'form_id':this.FormId.form_id};
       // data.pd_id=this.pdDetails.pd_id
       // data.form_id=this.FormId.form_id
       this.storagedb.retrieveLocalStorage(data).then(res=>{
@@ -781,7 +782,7 @@ countRowsForTextarea(text){
                
                 // let selectedAddressType = this.addressTypes.filter(element => element.address_type_id == datas.address_type)[0];
                 // console.log("selected add type",selectedAddressType)
-                if(datas.address_type){
+                if(datas.address_type != ''){
                   this.selectedAddressType(datas.address_type,index);
                 // this.selectedAddressType(selectedAddressType.address_type,index);
                 if (datas.address_type == 1) {
@@ -814,10 +815,11 @@ countRowsForTextarea(text){
 
     getaddressForm()
     {
+      console.log("pd",this.pdDetails);
      
       let res:any;
 
-      let records = {'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id}
+      let records = {'parent_pdid':this.pdDetails.parent_pd_id,'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id}
         
         this.qustCat.retiverForm(records).subscribe(res=>
           {
@@ -857,12 +859,13 @@ countRowsForTextarea(text){
                     'uom': datas.uom,
                     'uom_others': datas.uom_others
                   }
-                 
+                 if(datas.address_type != ''){
                   let selectedAddressType = this.addressTypes.filter(element => element.address_type_id == datas.address_type)[0];
                   this.selectedAddressType(selectedAddressType.address_type,index);
                   if (datas.address_type == 1) {
                       this.selectedAddressType(datas.address_type_others,index);
                   }
+                }
                   control.push(this.initAddress(val))
                 })
                 this.pdQuestionAddress.controls.address_form_remark.setValue(res['records'].address_form_remark);

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

@@ -137,7 +137,7 @@ else{
 
   getassessedIncome()
   {
-    let records = {'pd_id':this.pdDetails.pd_id,'company_id':this.pdDetails.company_id};
+    let records = {'parent_pdid':this.pdDetails.parent_pd_id,'pd_id':this.pdDetails.pd_id,'company_id':this.pdDetails.company_id};
     this.qustCat.retiverassessedForm('getAssessedIncome',records).subscribe(res=>
       {
           if(res['dataStatus']==true)

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

@@ -17,12 +17,12 @@
     <mat-card #picContent>
          
         <mat-card-content>
-            <mat-label *ngIf="imageDisplay.length ==0  && imageBucket.length ==0 "><strong>No Documents Found</strong></mat-label>
+            <mat-label *ngIf="imageDisplay.length ==0  && imageBucket.length ==0 "><strong>No Documents Found. Press the camera button below to capture</strong></mat-label>
             
             <ion-grid *ngIf="imageDisplay.length >0 ">
                     <ion-row>
                 <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                        <img src="{{image.image}}" imageViewer>
+                        <img src="{{image.image}}" imageViewer><br/>
                         <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
 
                         <input  *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -32,14 +32,15 @@
                 </ion-row>
                 </ion-grid>
                 
-                <hr/>
+            
-                <hr/>
 
                 <ion-grid *ngIf="imageBucket.length >0 ">
+                    <hr/>
+                    <hr/>
                         <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                     <ion-row>
                 <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                        <img src="{{image.image}}" imageViewer>
+                        <img src="{{image.image}}" imageViewer><br/>
                         <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
 
                         <input #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">

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

@@ -24,7 +24,7 @@
                 <ion-grid *ngIf="imageDisplay.length >0 ">
                         <ion-row>
                     <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                            <img src="{{image.image}}" imageViewer>
+                            <img src="{{image.image}}" imageViewer><br/>
                             <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
 
                             <input  *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -41,7 +41,7 @@
                             <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                         <ion-row>
                     <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                            <img src="{{image.image}}" imageViewer>
+                            <img src="{{image.image}}" imageViewer><br/>
                             <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
 
                             <input #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">
@@ -325,7 +325,7 @@
 
                                                     <!-- <mat-label>Vintage</mat-label> -->
                                                     <mat-label>Age of Asset in Years</mat-label>
-                                                    <input type="number" matInput autocomplete="off" placeholder="eg.999" formControlName="vintage_personal" minlength="1" maxlength="3" (keypress)="keyPress($event)" (keyup)="calculateVintagePurchase($event.target.value,i,3)">
+                                                    <input type="tel" matInput autocomplete="off" placeholder="eg.99" formControlName="vintage_personal" minlength="1" maxlength="2" (keypress)="keyPress($event)" (keyup)="calculateVintagePurchase($event.target.value,i,3)">
                                                     <!-- <mat-error> Invalid format</mat-error> -->
 
                                               </mat-form-field>

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

@@ -543,7 +543,7 @@ export class PdQuestionAssestsPage {
     //       val.original_loan_tenure ='';
     //     }
     //   });
-     
+     answerData.parent_pdid=this.pdDetails.parent_pd_id
       answerData.pdid = this.pdDetails.pd_id;
       answerData.formid = this.FormId.form_id;
       answerData.fk_createdby = this.users;
@@ -567,7 +567,7 @@ export class PdQuestionAssestsPage {
   // To Fetch The Asset Value;
   getAssetDetails()
   {
-    let records = {'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id}
+    let records = {'parent_pdid':this.pdDetails.parent_pd_id,'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id}
     
     this.qustCat.retiverForm(records).subscribe(res=>
       {

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

@@ -26,7 +26,7 @@
                     <ion-grid *ngIf="imageDisplay.length >0 ">
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input  *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -44,7 +44,7 @@
                                 <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">

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

@@ -347,6 +347,7 @@ inWords(e,i,flag){
       });
      // console.log("logs",answerData)
       let records: any = {};
+      records.parent_pdid=this.pdDetails.parent_pd_id
         records.pdid = this.pdDetails.pd_id;
         records.formid = this.FormId.form_id;
         records.fk_createdby = this.users;
@@ -380,7 +381,7 @@ inWords(e,i,flag){
 
     retiveBankDetails()
     {
-      let records = {'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id}
+      let records = {'parent_pdid':this.pdDetails.parent_pd_id,'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id}
       this.qustCat.retiverForm(records).subscribe(res=>
         {
           if(res['dataStatus']==true){

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

@@ -34,7 +34,7 @@
                 <ion-grid *ngIf="imageDisplay.length >0 ">
                         <ion-row>
                     <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                            <img src="{{image.image}}" imageViewer>
+                            <img src="{{image.image}}" imageViewer><br/>
                             <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
 
                             <input  *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -52,7 +52,7 @@
                             <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                         <ion-row>
                     <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                            <img src="{{image.image}}" imageViewer>
+                            <img src="{{image.image}}" imageViewer><br/>
                             <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
 
                             <input #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">
@@ -130,6 +130,7 @@
                 <mat-form-field>
                   <mat-select placeholder="Ownership Type" formControlName="business_ownership_type"
                     (selectionChange)="setRequiredValidation($event.value,itemrow,7)">
+                    <mat-option>Select</mat-option>
                     <mat-option value="owned">Owned</mat-option>
                     <mat-option value="rented">Rented</mat-option>
                   </mat-select>
@@ -185,8 +186,8 @@
                   <!-- <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-label>Approx Vintage</mat-label>
-                    <input matInput autocomplete="off" placeholder="eg.999" formControlName="business_vintage"
+                    <input matInput autocomplete="off" placeholder="eg.99" formControlName="business_vintage"
-                      minlength="1" maxlength="3" type='numbers'
+                      minlength="1" maxlength="2" type='tel'
                       (keyup)="calculateVintagePurchase($event.target.value,i,3)">
                     <!-- <mat-error> Invalid format</mat-error> -->
                   </mat-form-field>
@@ -231,10 +232,12 @@
             <mat-card-content>
               <mat-form-field>
                 <mat-select placeholder="Asset Type" (selectionChange)="selectedAssetsType($event,i)"
-                  formControlName="business_assets_mode" required>
+                  formControlName="business_assets_mode" >
+                  <mat-option>Select</mat-option>
                   <mat-option *ngFor="let asset of m_assets_type" [value]="asset.id" [disabled]="asset.flag!=1">
                     {{asset.name | titlecase}}</mat-option>
                 </mat-select>
+               <!-- <mat-error style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="sup.controls['business_assets_mode'].errors?.required || sup.controls['business_assets_mode'].touched">Asset Type Required</mat-error>-->
               </mat-form-field>
             </mat-card-content>
 
@@ -288,7 +291,8 @@
                 <div *ngFor="let detail of sup['controls'].business_details['controls']; let s=index">
                   <div [formGroupName]="s">
                     <mat-form-field>
-                      <input matInput formControlName="equipment_manufacturing_description" placeholder="Description">
+                      <input matInput formControlName="equipment_manufacturing_description" placeholder="Description" required>
+                      <!-- <mat-error style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="detail.controls['equipment_manufacturing_description'].errors?.required || detail.controls['equipment_manufacturing_description'].touched">Description Required</mat-error> -->
                     </mat-form-field>
                   </div>
                 </div>
@@ -300,6 +304,7 @@
                     <mat-form-field>
                       <input matInput formControlName="any_other_assets" placeholder="Description of the Assets"
                         autocomplete="off">
+                        <mat-error style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="detail.controls['any_other_assets'].value != '' || detail.controls['any_other_assets'].errors?.required || detail.controls['any_other_assets'].touched">Description is Required</mat-error>
                     </mat-form-field>
                     <!-- <mat-form-field>
                     <input matInput type="number" formControlName="any_other_asset_value" placeholder="Value of the Assets" autocomplete="off" (keyup)="inWords($event,s,1)">
@@ -370,8 +375,8 @@
               <div>
                 <mat-form-field>
                   <mat-label>Approx Vintage</mat-label>
-                  <input matInput autocomplete="off" type="number" placeholder="eg.999"
+                  <input matInput autocomplete="off" type="tel" placeholder="eg.99"
-                    formControlName="business_vintage" minlength="1" maxlength="3"
+                    formControlName="business_vintage" minlength="1" maxlength="2"
                     (keyup)="calculateVintagePurchase($event.target.value,i,1)">
                 </mat-form-field>
                 <mat-form-field>

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

@@ -104,6 +104,7 @@ export class PdQuestionBusinessAssetsPage {
   }
   getAddress(){
     let params:any={};
+    params.parent_pdid=this.pdDetails.parent_pd_id
     params.pd_id=this.pdDetails.pd_id;
     params.pd_form_id='5'
 
@@ -127,7 +128,13 @@ export class PdQuestionBusinessAssetsPage {
                 let selectedPincode = this.pinArr.filter(element => element.pincode_id == data.pincode)[0];
            
         console.log(selectedCity)
-                let addressType = data.address_type != 1 ? selectedAddressType.address_type : data.address_type_others;
+        let addressType
+        if(selectedAddressType != '' && selectedAddressType != undefined){
+                 addressType = data.address_type != 1 ? selectedAddressType.address_type : data.address_type_others;
+              }
+              else{
+                addressType=''
+              }
                 let address = data.address + ' , ' + selectedCity.city_name + ','+selectedState.name +'-' + (data.pincode == 1 ? data.pincode_others : selectedPincode.pincode);
         
         
@@ -221,6 +228,7 @@ export class PdQuestionBusinessAssetsPage {
   apiLoadFinish:boolean=false
   getDetails(){
     let params:any={};
+    params.parent_pdid=this.pdDetails.parent_pd_id
     params.pd_id=this.pdDetails.pd_id
     params.company_id=this.company_id
     params.pd_form_id=22
@@ -269,6 +277,7 @@ export class PdQuestionBusinessAssetsPage {
   formLoadData(data){
     if(data==null){
       this._businessAssetsQuesFrom=this.fb.group({
+        parent_pdid:[this.pdDetails.parent_pd_id],
         pdid: [this.pdDetails.pd_id],
         /* formid: ['22'],*/
         formid: [this.formDetails.form_id],
@@ -289,6 +298,7 @@ export class PdQuestionBusinessAssetsPage {
    
       let value=data;
       this._businessAssetsQuesFrom=this.fb.group({
+        parent_pdid:[this.pdDetails.parent_pd_id],
         pdid: [this.pdDetails.pd_id],
         /* formid: ['22'],*/
         formid: [this.formDetails.form_id],
@@ -363,7 +373,7 @@ export class PdQuestionBusinessAssetsPage {
   }
   otherBusinessAssetsDescription() {
     return this.fb.group({
-      any_other_assets: [''],
+      any_other_assets: ['',Validators.compose([Validators.required])],
       any_other_asset_value : [''],
       any_other_asset_loan : [''],      
     });
@@ -677,9 +687,15 @@ createBusinessAssetsForAddress(): FormGroup {
   
 
   onSubmit(){
+    //console.log("Remarks",this.focusRemark);
     if(!this._businessAssetsQuesFrom.valid){
       this.toast.pdTriggerappmessage("Please Fill the Required Field")
-      this.focusRemark.nativeElement.focus();
+      this._businessAssetsQuesFrom.value.business_assets_for_address.forEach(element=>{
+        console.log(element)
+        if(element.business_address_availability != 'no' && element.business_pd_visited_remark ==''){
+          this.focusRemark.nativeElement.focus()
+        }
+      })
       return;
     }
     

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

@@ -30,7 +30,7 @@
                     <ion-grid *ngIf="imageDisplay.length >0 ">
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input  *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -48,7 +48,7 @@
                                 <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">
@@ -185,8 +185,7 @@
           
         <mat-card>
             <mat-form-field style="width: 100%">
-                <input matInput placeholder="Remarks"
+                <input matInput autocomplete="off" placeholder="Remarks" type="text" formControlName="banking_form_remark">
-                       formControlName="banking_form_remark">
             </mat-form-field>
           </mat-card>
         <ion-row>

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

@@ -318,7 +318,7 @@ console.log(this.generalExistBusinessYear)
   }
 
   retiveBankDetails(){
-    let records = {'pd_id':this.pdDetails.pd_id,'pd_form_id':this.form_id,'company_id':this.company_id}
+    let records = {'parent_pdid':this.pdDetails.parent_pd_id,'pd_id':this.pdDetails.pd_id,'pd_form_id':this.form_id,'company_id':this.company_id}
     const control = <FormArray>this.bankingForm.controls['itemRows'];
       this.qustCat.retiverForm(records).subscribe(res=>
         {
@@ -366,6 +366,7 @@ console.log(this.generalExistBusinessYear)
       })
       console.log("logs",answerData)
       let records: any = {};
+        records.parent_pdid=this.pdDetails.parent_pd_id
         records.pdid = this.pdDetails.pd_id;
         records.formid = this.form_id;
         records.fk_createdby = this.users;

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

@@ -28,7 +28,7 @@
                             <ion-grid *ngIf="imageDisplay.length >0 ">
                                     <ion-row>
                                 <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                                        <img src="{{image.image}}" imageViewer>
+                                        <img src="{{image.image}}" imageViewer><br/>
                                         <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
             
                                         <input class="docName" *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -46,7 +46,7 @@
                                         <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                                     <ion-row>
                                 <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                                        <img src="{{image.image}}" imageViewer>
+                                        <img src="{{image.image}}" imageViewer><br/>
                                         <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
             
                                         <input class="docName" #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">
@@ -89,34 +89,34 @@
                                 formControlName="shareholding" autocomplete="off">
                         </mat-form-field>
                     </div>
-                        <mat-form-field style="width:100%;" *ngIf="!EntityTypeFlag">
+                        <mat-form-field style="width:100%;" >
                             <mat-select placeholder="Started Business" formControlName="started_business"
-                                (selectionChange)="changeOfStartedBusiness(member,i,$event.value);" *ngIf="!EntityTypeFlag">
+                                (selectionChange)="changeOfStartedBusiness(member,i,$event.value);" >
                                 <mat-option>Select</mat-option>
                                 <mat-option value="yes">Yes</mat-option>
                                 <mat-option value="no">No</mat-option>
                             </mat-select>
                         </mat-form-field>
-                        <p *ngIf="!EntityTypeFlag" style="margin-left: 2% !important">No of Years in Current Business</p>
+                        <p  style="margin-left: 2% !important">No of Years in Current Business</p>
-                        <mat-form-field style="width:100%;" *ngIf="!EntityTypeFlag" style="width: 45%">
+                        <mat-form-field style="width:100%;"  style="width: 45%">
                             <input matInput autocomplete="off" placeholder="Year" type="number" formControlName="current_business_experiance_year"
                                 (keyup)="getWorkExperience(member.value,i)" (keypress)="keyPress($event)" (change)="checkWithExistBusinessYear($event.target.value,i,member)"
                                 [readonly]="isreadonlyyear[i]">
                             <mat-hint style="color: red;" align="start" style="font-size:11px">{{yearErrorMessage[i]}}</mat-hint>
                         </mat-form-field>&nbsp;&nbsp;
-                        <mat-form-field style="width:100%;" *ngIf="!EntityTypeFlag" style="width: 45%">
+                        <mat-form-field style="width:100%;" style="width: 45%">
                             <input matInput autocomplete="off" placeholder="Month" type="number" formControlName="current_business_experiance_month"
                                 (keypress)="keyPress($event)" (change)="ConvertMonthintoYear(member,$event.target.value,i)"
                                 [readonly]="isreadonlymonth[i]">
                             <mat-hint style="color: red;" align="start" style="font-size:11px">{{monthErrorMessage[i]}}</mat-hint>
                         </mat-form-field>
-                        <mat-form-field style="width:100%;" *ngIf="!EntityTypeFlag">
+                        <mat-form-field style="width:100%;" >
                             <input matInput autocomplete="off" placeholder="Total Work Experience" type="number"
                                 formControlName="total_business_experiance" (keypress)="keyPress($event)" (keyup)="getWorkExperience(member.value,i)"
                                 (change)="checkWithExistTotalWorkExperience($event.target.value,i,member)">
                             <mat-hint style="color: red;" align="start" style="font-size:11px">{{errorMessageForExistTotalWorkExperience[i]}}</mat-hint>
                         </mat-form-field>
-                        <mat-form-field style="width:100%;" *ngIf="!EntityTypeFlag && 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">
                         </mat-form-field>
 
@@ -272,10 +272,10 @@
                                             <button ion-button clear (click)="removeState(i,s,'1')">
                                                 <ion-icon style="font-size:22px" color="optblue" name="md-trash"></ion-icon>
                                             </button>
-                                        </ion-col>
+                                        </ion-col><br/>
                                         <ion-col col-2 offset-1 *ngIf="l">
                                             <button *ngIf="manufacturing.value.pan_india_options == 'No'" ion-button
-                                                color="optblue" (click)="addMoreState(i,1)">Add More State</button>
+                                            small color="optblue" (click)="addMoreState(i,1)">Add More State</button>
                                         </ion-col>
                                     </ion-buttons>
                                 </div>
@@ -329,9 +329,9 @@
                                         <button *ngIf="c>0" ion-button clear (click)="removeState(i,c,'2')">
                                             <ion-icon style="font-size:22px" color="optblue" name="md-trash"></ion-icon>
                                         </button>
-                                    </ion-col>
+                                    </ion-col><br/>
                                     <ion-col col-2 offset-1 *ngIf="l">
-                                        <button ion-button color="optblue" (click)="addMoreState(i,2)">Add More Countries</button>
+                                        <button ion-button small color="optblue" (click)="addMoreState(i,2)">Add More Countries</button>
                                     </ion-col>
                                 </ion-buttons>
                             </div>
@@ -385,10 +385,10 @@
                                         <button ion-button clear (click)="removeState(i,s,'1')">
                                             <ion-icon style="font-size:22px" color="optblue" name="md-trash"></ion-icon>
                                         </button>
-                                    </ion-col>
+                                    </ion-col><br/>
                                     <ion-col col-2 offset-1 *ngIf="l">
                                         <button *ngIf="manufacturing.get('india_where_sale_done').value.length>0"
-                                            ion-button color="optblue" (click)="addMoreState(i,1)">Add More State</button>
+                                            ion-button small color="optblue" (click)="addMoreState(i,1)">Add More State</button>
                                     </ion-col>
                                 </ion-buttons>
                             </div>
@@ -445,9 +445,9 @@
                                         <button ion-button clear (click)="removeState(i,mx,'2')">
                                             <ion-icon style="font-size:22px" color="optblue" name="md-trash"></ion-icon>
                                         </button>
-                                    </ion-col>
+                                    </ion-col><br/>
                                     <ion-col col-2 offset-1 *ngIf="l">
-                                        <button ion-button color="optblue" (click)="addMoreState(i,2)">Add More Countries</button>
+                                        <button ion-button small color="optblue" (click)="addMoreState(i,2)">Add More Countries</button>
                                     </ion-col>
                                 </ion-buttons>
                             </div>
@@ -547,9 +547,9 @@
                                         <button ion-button color="optblue" (click)="removeRetailState(r,s,'1')">
                                             <ion-icon name="md-trash"></ion-icon>
                                         </button>
-                                    </ion-col>
+                                    </ion-col><br/>
                                     <ion-col col-2 offset-1 *ngIf="retail.value.pan_india_options=='No' && l">
-                                        <button ion-button color="optblue" (click)="addRetailMoreState(r,'1')">Add More State</button>
+                                        <button ion-button small color="optblue" (click)="addRetailMoreState(r,'1')">Add More State</button>
                                     </ion-col>
                                 </ion-buttons>
                             </div>
@@ -605,12 +605,12 @@
                                 </mat-form-field>
                                 <ion-buttons end>
                                     <ion-col col-3 offset-3 *ngIf="c>0">
-                                        <button ion-button color="optblue" (click)="removeRetailState(r,c,'2')">
+                                        <button ion-button clear color="optblue" (click)="removeRetailState(r,c,'2')">
                                             <ion-icon name="md-trash"></ion-icon>
                                         </button>
-                                    </ion-col>
+                                    </ion-col><br/>
                                     <ion-col *ngIf="l">
-                                        <button ion-button color="optblue" (click)="addRetailMoreState(r,'2')">Add More Countries</button>
+                                        <button ion-button small color="optblue" (click)="addRetailMoreState(r,'2')">Add More Countries</button>
                                     </ion-col>
                                 </ion-buttons>
                             </div>
@@ -665,10 +665,9 @@
                                         <button ion-button clear color="optblue" (click)="removeRetailState(r,s,'1')">
                                             <ion-icon name="md-trash"></ion-icon>
                                         </button>
-                                    </ion-col>
+                                    </ion-col><br/>
                                     <ion-col col-2 offset-1 *ngIf="l">
-                                        <button ion-button color="optblue" (click)="addRetailMoreState(r,'1')">Add More
+                                        <button small ion-button color="optblue" (click)="addRetailMoreState(r,'1')">Add More State</button>
-                                            State</button>
                                     </ion-col>
                                 </ion-buttons>
                             </div>
@@ -720,13 +719,13 @@
                                 </mat-form-field>
                                 <ion-buttons end>
                                     <ion-col col-3 offset-3 *ngIf="c>0">
-                                        <button ion-button clear (click)="removeRetailState(r,c,'2')">
+                                        <button ion-button clear color="optblue" (click)="removeRetailState(r,c,'2')">
                                             <ion-icon name="md-trash"></ion-icon>
                                         </button>
-                                    </ion-col>
+                                    </ion-col><br/>
                                     <ion-col col-2 offset-1 *ngIf="l">
 
-                                        <button ion-button color="optblue" (click)="addRetailMoreState(r,'2')">Add More Countries</button>
+                                        <button ion-button small color="optblue" (click)="addRetailMoreState(r,'2')">Add More Countries</button>
                                     </ion-col>
                                 </ion-buttons>
                             </div>
@@ -828,10 +827,9 @@
                                             <button ion-button color="optblue" clear (click)="removeWholesaleState(w,s,'1')">
                                                 <ion-icon name="md-trash"></ion-icon>
                                             </button>
-                                        </ion-col>
+                                        </ion-col><br/>
                                         <ion-col col-2 offset-1 *ngIf="l">
-                                            <button ion-button color="optblue" (click)="addWholesaleMoreState(w,'1')">Add
+                                            <button small ion-button color="optblue" (click)="addWholesaleMoreState(w,'1')">Add More State</button>
-                                                More State</button>
                                         </ion-col>
                                     </ion-buttons>
                                 </div>
@@ -889,10 +887,9 @@
                                             <button ion-button color="optblue" clear (click)="removeWholesaleState(w,c,'2')">
                                                 <ion-icon name="md-trash"></ion-icon>
                                             </button>
-                                        </ion-col>
+                                        </ion-col><br/>
                                         <ion-col col-2 offset-1 *ngIf="l">
-                                            <button ion-button color="optblue" (click)="addWholesaleMoreState(w,'2')">Add
+                                            <button small ion-button color="optblue" (click)="addWholesaleMoreState(w,'2')">Add More Countries</button>
-                                                More Countries</button>
                                         </ion-col>
 
                                     </ion-buttons>
@@ -949,10 +946,9 @@
                                         *ngIf="s>0">
                                         <ion-icon name="md-trash"></ion-icon>
                                     </button>
-                                </div>
+                                </div><br/>
                                 <div *ngIf="wholesale.get('india_where_sale_done').value.length>0">
-                                    <button ion-button float-right color="optblue" (click)="addWholesaleMoreState(w,'1')">Add
+                                    <button small ion-button float-right color="optblue" (click)="addWholesaleMoreState(w,'1')">Add More State</button>
-                                        State</button>
                                 </div>
 
                             </div>
@@ -1006,9 +1002,8 @@
                                         *ngIf="c>0">
                                         <ion-icon name="md-trash"></ion-icon>
                                     </button>
-                                </div>
+                                </div><br/>
-                                <button ion-button float-right color="optblue" (click)="addWholesaleMoreState(w,'2')">Add
+                                <button small ion-button float-right color="optblue" (click)="addWholesaleMoreState(w,'2')">Add More Countries</button>
-                                    Countries</button>
                             </div>
 
 
@@ -1108,10 +1103,9 @@
                                         <button ion-button clear color="optblue" (click)="removeServiceState(sp,s,'1')">
                                             <ion-icon name="md-trash"></ion-icon>
                                         </button>
-                                    </ion-col>
+                                    </ion-col><br/>
                                     <ion-col col-2 offset-1 *ngIf="serviceprovider.value.pan_india_options=='No' && l">
-                                        <button ion-button color="optblue" (click)="addServiceMoreState(sp,1)">Add More
+                                        <button small ion-button color="optblue" (click)="addServiceMoreState(sp,1)">Add More State</button>
-                                            State</button>
                                     </ion-col>
                                 </ion-buttons>
                             </div>
@@ -1171,9 +1165,9 @@
                                         <button ion-button color="optblue" clear (click)="removeServiceState(sp,c,'2')">
                                             <ion-icon name="md-trash"></ion-icon>
                                         </button>
-                                    </ion-col>
+                                    </ion-col><br/>
                                     <ion-col col-2 offset-1 *ngIf="l">
-                                        <button ion-button color="optblue" (click)="addServiceMoreState(sp,'2')">Add More Countries</button>
+                                        <button ion-button small color="optblue" (click)="addServiceMoreState(sp,'2')">Add More Countries</button>
                                     </ion-col>
                                 </ion-buttons>
 
@@ -1232,10 +1226,9 @@
                                         <button ion-button color="optblue" clear (click)="removeServiceState(sp,s,'1')">
                                             <ion-icon name="md-trash"></ion-icon>
                                         </button>
-                                    </ion-col>
+                                    </ion-col><br/>
                                     <ion-col col-2 offset-1 *ngIf="serviceprovider.get('india_where_sale_done').value.length>0 && l">
-                                        <button ion-button color="optblue" (click)="addServiceMoreState(sp,'1')">Add
+                                        <button small ion-button color="optblue" (click)="addServiceMoreState(sp,'1')">Add More State</button>
-                                            More State</button>
                                     </ion-col>
                                 </ion-buttons>
                             </div>
@@ -1294,10 +1287,9 @@
                                         <button ion-button clear color="optblue" (click)="removeServiceState(sp,c,'2')">
                                             <ion-icon name="md-trash"></ion-icon>
                                         </button>
-                                    </ion-col>
+                                    </ion-col><br/>
                                     <ion-col col-2 offset-1 *ngIf="l">
-                                        <button ion-button color="optblue" (click)="addServiceMoreState(sp,'2')">Add
+                                        <button small ion-button color="optblue" (click)="addServiceMoreState(sp,'2')">Add More Countries</button>
-                                            More Countries</button>
                                     </ion-col>
                                 </ion-buttons>
                                 <!-- </div>

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

@@ -57,7 +57,9 @@ page-pd-question-business-info {
     margin-top : 8px ;
 }
 .checkbo{
-  margin:15px;
+  margin:10px;
+  padding-top:10px;
+  color:darkcyan;
 }
 
 img{

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

@@ -98,7 +98,7 @@ export class PdQuestionBusinessInfoPage {
     this.users = this.aws.getlocale();
    
    this.applicants=this.pdDetails.applicat_details;
- 
+ console.log("pd",this.pdDetails);
    this.generalExistEntityType=this.pdDetails.business_entity_type
    this.generalExistEntityType_other=this.pdDetails.business_entity_type_other
    this.generalExistBusinessYear=this.pdDetails.business_years;
@@ -259,6 +259,7 @@ changeOfStartedBusiness(members,i,e){
   getDetails(){
    
     let params: any = {};
+    params.parent_pdid=this.pdDetails.parent_pd_id
     params.pd_id = this.pdid;
     params.pd_form_id = 13
     params.company_id = this.pdDetails.company_id;
@@ -417,12 +418,16 @@ changeOfStartedBusiness(members,i,e){
                             element.india_where_sale_done.forEach((innerElement,innerIndex) => {
                                 this.filterCityData(this.stateList,innerElement.state_name,innerIndex);
                              let innercontrol:any = manufacture_details.controls[index].get('india_where_sale_done') as FormArray;
+                             innerElement.stateSearch=''
+                             innerElement.citySearch=''
                              innercontrol.push(this.indiaSalesDone())
                             });
                             manufacture_details.controls[index].addControl('max_sale_state_name',this.fb.array([]));  
                          element.max_sale_state_name.forEach((innerElement,innerIndex) => {
                             this.filterCityData(this.stateList,innerElement.state_name,innerIndex);
                             let innercontrol:any = manufacture_details.controls[index].get('max_sale_state_name') as FormArray;
+                            innerElement.stateSearch=''
+                            innerElement.citySearch=''
                             innercontrol.push(this.maxSaleState())
                          })
                         }
@@ -441,11 +446,15 @@ changeOfStartedBusiness(members,i,e){
                             element.india_where_sale_done.forEach((innerElement,innerIndex) => {
                                 this.filterCityData(this.stateList,innerElement.state_name,innerIndex);
                              let innercontrol:any = manufacture_details.controls[index].get('india_where_sale_done') as FormArray;
+                             innerElement.stateSearch=''
+                             innerElement.citySearch=''
                              innercontrol.push(this.indiaSalesDone())
                          });
                          element.max_sale_state_name.forEach((innerElement,innerIndex) => {
                             this.filterCityData(this.stateList,innerElement.state_name,innerIndex);
                             let innercontrol:any = manufacture_details.controls[index].get('max_sale_state_name') as FormArray;
+                            innerElement.stateSearch=''
+                            innerElement.citySearch=''
                             innercontrol.push(this.maxSaleState())
                         });
 
@@ -491,6 +500,8 @@ changeOfStartedBusiness(members,i,e){
                             element.india_where_sale_done.forEach((innerElement,innerIndex) => {
                                 this.filterCityData(this.stateList,innerElement.state_name,innerIndex);
                              let innercontrol:any = retailControl.controls[index].get('india_where_sale_done') as FormArray;
+                             innerElement.stateSearch=''
+                             innerElement.citySearch=''
                              innercontrol.push(this.indiaSalesDone())
                          });
 
@@ -498,6 +509,8 @@ changeOfStartedBusiness(members,i,e){
                          element.max_sale_state_name.forEach((innerElement,innerIndex) => {
                             this.filterCityData(this.stateList,innerElement.state_name,innerIndex);
                             let innercontrol:any = retailControl.controls[index].get('max_sale_state_name') as FormArray;
+                            innerElement.stateSearch=''
+                            innerElement.citySearch=''
                             innercontrol.push(this.maxSaleState())
                         });
                         }
@@ -515,11 +528,15 @@ changeOfStartedBusiness(members,i,e){
                             element.india_where_sale_done.forEach((innerElement,innerIndex) => {
                                 this.filterCityData(this.stateList,innerElement.state_name,innerIndex);
                              let innercontrol:any = retailControl.controls[index].get('india_where_sale_done') as FormArray;
+                             innerElement.stateSearch=''
+                             innerElement.citySearch=''
                              innercontrol.push(this.indiaSalesDone())
                          });
                          element.max_sale_state_name.forEach((innerElement,innerIndex) => {
                             this.filterCityData(this.stateList,innerElement.state_name,innerIndex);
                             let innercontrol:any = retailControl.controls[index].get('max_sale_state_name') as FormArray;
+                            innerElement.stateSearch=''
+                            innerElement.citySearch=''
                             innercontrol.push(this.maxSaleState())
                         });
                          retailControl.controls[index].addControl('countries_where_export_done', this.fb.array([]));
@@ -560,6 +577,8 @@ changeOfStartedBusiness(members,i,e){
                             element.india_where_sale_done.forEach((innerElement,innerIndex) => {
                                 this.filterCityData(this.stateList,innerElement.state_name,innerIndex);
                              let innercontrol:any = wholesaleControl.controls[index].get('india_where_sale_done') as FormArray;
+                             innerElement.stateSearch=''
+                             innerElement.citySearch=''
                              innercontrol.push(this.indiaSalesDone())
                          });
 
@@ -567,6 +586,8 @@ changeOfStartedBusiness(members,i,e){
                          element.max_sale_state_name.forEach((innerElement,innerIndex) => {
                             this.filterCityData(this.stateList,innerElement.state_name,innerIndex);
                             let innercontrol:any = wholesaleControl.controls[index].get('max_sale_state_name') as FormArray;
+                            innerElement.stateSearch=''
+                            innerElement.citySearch=''
                             innercontrol.push(this.maxSaleState())
                         });
                         }
@@ -584,11 +605,15 @@ changeOfStartedBusiness(members,i,e){
                             element.india_where_sale_done.forEach((innerElement,innerIndex) => {
                                 this.filterCityData(this.stateList,innerElement.state_name,innerIndex);
                              let innercontrol:any = wholesaleControl.controls[index].get('india_where_sale_done') as FormArray;
+                             innerElement.stateSearch=''
+                             innerElement.citySearch=''
                              innercontrol.push(this.indiaSalesDone())
                          });
                          element.max_sale_state_name.forEach((innerElement,innerIndex) => {
                             this.filterCityData(this.stateList,innerElement.state_name,innerIndex);
                             let innercontrol:any = wholesaleControl.controls[index].get('max_sale_state_name') as FormArray;
+                            innerElement.stateSearch=''
+                            innerElement.citySearch=''
                             innercontrol.push(this.maxSaleState())
                         });
                          wholesaleControl.controls[index].addControl('countries_where_export_done', this.fb.array([]));
@@ -632,6 +657,8 @@ changeOfStartedBusiness(members,i,e){
                             element.india_where_sale_done.forEach((innerElement,innerIndex) => {
                                 this.filterCityData(this.stateList,innerElement.state_name,innerIndex);
                              let innercontrol:any = serviceProviderControl.controls[index].get('india_where_sale_done') as FormArray;
+                             innerElement.stateSearch=''
+                             innerElement.citySearch=''
                              innercontrol.push(this.indiaSalesDone())
                          });
                        
@@ -639,6 +666,8 @@ changeOfStartedBusiness(members,i,e){
                       element.max_sale_state_name.forEach((innerElement,innerIndex) => {
                         this.filterCityData(this.stateList,innerElement.state_name,innerIndex);
                          let innercontrol:any = serviceProviderControl.controls[index].get('max_sale_state_name') as FormArray;
+                         innerElement.stateSearch=''
+                         innerElement.citySearch=''
                          innercontrol.push(this.maxSaleState())
                      });
                         }
@@ -657,12 +686,16 @@ changeOfStartedBusiness(members,i,e){
                             element.india_where_sale_done.forEach((innerElement,innerIndex) => {
                                 this.filterCityData(this.stateList,innerElement.state_name,innerIndex);
                              let innercontrol:any = serviceProviderControl.controls[index].get('india_where_sale_done') as FormArray;
+                             innerElement.stateSearch=''
+                             innerElement.citySearch=''
                              innercontrol.push(this.indiaSalesDone())
                          });
 
                          element.max_sale_state_name.forEach((innerElement,innerIndex) => {
                             this.filterCityData(this.stateList,innerElement.state_name,innerIndex);
                             let innercontrol:any = serviceProviderControl.controls[index].get('max_sale_state_name') as FormArray;
+                            innerElement.stateSearch=''
+                            innerElement.citySearch=''
                             innercontrol.push(this.maxSaleState())
                         });
                          serviceProviderControl.controls[index].addControl('countries_where_export_done', this.fb.array([]));
@@ -1589,6 +1622,7 @@ createPOSMachinesDetails(data){
 
   public initBusinessForm(): void {
     this.businessForm = this.fb.group({
+        parent_pdid:this.pdDetails.parent_pd_id,
         pdid: this.pdDetails.pd_id,
         formid: this.FormId,
         fk_createdby: this.users,
@@ -1837,7 +1871,7 @@ if(records.pos_machines_details){
 }
   getBuisnessDetails()
   {
-    let records = {'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId};    
+    let records = {'parent_pdid':this.pdDetails.parent_pd_id,'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId};    
     this.qustCat.retiverForm(records).subscribe(data => {
       let businessVal = data['records'];
    
@@ -1898,6 +1932,7 @@ if(records.pos_machines_details){
               businessVal.rent_paid  = '';
           }
           businessVal.family_members_involved  = enduse;
+          businessVal.parent_pdid=this.pdDetails.parent_pd_id
           businessVal.pdid  = this.pdDetails.pd_id;
           businessVal.formid  = this.FormId;
           businessVal.fk_createdby  = this.users;

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

@@ -25,7 +25,7 @@
                             <ion-grid *ngIf="imageDisplay.length >0 ">
                                     <ion-row>
                                 <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                                        <img src="{{image.image}}" imageViewer>
+                                        <img src="{{image.image}}" imageViewer><br/>
                                         <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
             
                                         <input class="docName" *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -43,7 +43,7 @@
                                         <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                                     <ion-row>
                                 <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                                        <img src="{{image.image}}" imageViewer>
+                                        <img src="{{image.image}}" imageViewer><br/>
                                         <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
             
                                         <input class="docName" #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">
@@ -255,7 +255,7 @@
                                                         Cash.</mat-option>
                                                     <mat-option value="Payment received through Banking channels.">Payment
                                                         received through Banking channels.</mat-option>
-                                                        <mat-option value="Payment received in Cash and also through Banking channels.">Payment received in Cash and also through Banking channels.</mat-option>
+                                                        <mat-option value="Payment received in Cash and also through Banking channels.">Payment received in Cash and Bank.</mat-option>
                                                 </mat-select>
 
                                             </mat-form-field>
@@ -376,7 +376,7 @@
                                                         Cash.</mat-option>
                                                     <mat-option value="Payment received through Banking channels.">Payment
                                                         received through Banking channels.</mat-option>
-                                                        <mat-option value="Payment received in Cash and also through Banking channels.">Payment received in Cash and also through Banking channels.</mat-option>
+                                                        <mat-option value="Payment received in Cash and also through Banking channels.">Payment received in Cash and Bank.</mat-option>
                                                 </mat-select>
                                             </mat-form-field>
                                             <!-- <mat-form-field style="width: 45%" *ngIf="items.get('service_provider_product_payment_type').value == 3">

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

@@ -109,6 +109,7 @@ export class PdQuestionClientInfoPage {
 
   initFormLoadDetails(record) {
     let params: any = {};
+    params.parent_pdid=this.pdDetails.parent_pd_id
     params.pd_id = this.pdid;
     params.pd_form_id = this.formDetails.form_id;
     params.company_id = this.company_id;
@@ -118,6 +119,7 @@ export class PdQuestionClientInfoPage {
           let dataForm = data['records'];
           if (dataForm !== undefined) {
             this.clientInfoForm = this.fb.group({
+              parent_pdid:[this.pdDetails.parent_pd_id],
               pdid: [this.pdid],
               formid: [this.formDetails.form_id],
               company_id: [this.company_id],
@@ -193,6 +195,7 @@ export class PdQuestionClientInfoPage {
             this.noRecordsFound = true;
           } else {
             this.clientInfoForm = this.fb.group({
+              parent_pdid:[this.pdDetails.parent_pd_id],
               pdid: [this.pdid],
               formid: [this.formDetails.form_id],
               company_id: [this.company_id],
@@ -230,6 +233,7 @@ export class PdQuestionClientInfoPage {
           }
         } else {
           this.clientInfoForm = this.fb.group({
+            parent_pdid:[this.pdDetails.parent_pd_id],
             pdid: [this.pdid],
             formid: [this.formDetails.form_id],
             company_id: [this.company_id],

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

@@ -31,7 +31,7 @@
                     <ion-grid *ngIf="imageDisplay.length >0 ">
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input class="docName" *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -49,7 +49,7 @@
                                 <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input class="docName" #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">

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

@@ -210,6 +210,7 @@ export class PdQuestionFinancialInfoPage {
 
   initFinancialForm(){
     this.financialForm = this.fb.group({
+        parent_pdid:this.pdDetails.parent_pd_id,
       pdid: this.pdDetails.pd_id,
       formid: this.FormId,
       company_id: this.company_id,
@@ -336,6 +337,7 @@ submitDetails(){
     const estimate= <FormArray> this.financialForm.controls['estimated_value']
     //estimate.push(this.createValue(''))
     let params:any={}
+    params.parent_pdid=this.pdDetails.parent_pd_id
     params.pd_id=this.pdDetails.pd_id
     params.pd_form_id=this.FormId
     params.company_id=this.company_id
@@ -387,6 +389,7 @@ submitDetails(){
         }
     }
 }
+        retrieveData.parent_pdid=this.pdDetails.parent_pd_id
         retrieveData.pdid=this.pdDetails.pd_id
         retrieveData.company_id=this.company_id
         retrieveData.fk_createdby=this.users

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

@@ -24,7 +24,7 @@
                             <ion-grid *ngIf="imageDisplay.length >0 ">
                                     <ion-row>
                                 <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                                        <img src="{{image.image}}" imageViewer>
+                                        <img src="{{image.image}}" imageViewer><br/>
                                         <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
             
                                         <input class="docName" *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -42,7 +42,7 @@
                                         <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                                     <ion-row>
                                 <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                                        <img src="{{image.image}}" imageViewer>
+                                        <img src="{{image.image}}" imageViewer><br/>
                                         <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
             
                                         <input class="docName" #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">

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

@@ -112,6 +112,7 @@ export class PdQuestionStockInfoPage {
       let rm_api = record.from_supplier.hasOwnProperty("raw_material") ? record.from_supplier.raw_material : [];
 
       let params: any = {};
+      params.parent_pdid=this.pdDetails.parent_pd_id;
       params.pd_id = this.pdid;
       params.pd_form_id = this.formDetails.form_id;
       params.company_id = this.company_id;
@@ -128,6 +129,7 @@ export class PdQuestionStockInfoPage {
           // })
           if (dataForm !== undefined) {
             this.stockForm = this.fb.group({
+              parent_pdid:[this.pdDetails.parent_pd_id],
               pdid: [this.pdid],
               formid: [this.formDetails.form_id],
               company_id: [this.company_id],
@@ -185,6 +187,7 @@ export class PdQuestionStockInfoPage {
           }
           else {
             this.stockForm = this.fb.group({
+              parent_pdid:[this.pdDetails.parent_pd_id],
               pdid: [this.pdid],
               formid: [this.formDetails.form_id],
               company_id: [this.company_id],
@@ -237,6 +240,7 @@ export class PdQuestionStockInfoPage {
         else {
           console.log("Record", record)
           this.stockForm = this.fb.group({
+            parent_pdid:[this.pdDetails.parent_pd_id],
             pdid: [this.pdid],
             formid: [this.formDetails.form_id],
             company_id: [this.company_id],

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

@@ -24,7 +24,7 @@
                     <ion-grid *ngIf="imageDisplay.length >0 ">
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input class="docName"  *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -42,7 +42,7 @@
                                 <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input class="docName" #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">

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

@@ -107,6 +107,7 @@ export class PdQuestionSupplierInfoPage {
   serviceProviderForm: Boolean = false;
   initFormLoadDetails(record) {
     let params: any = {};
+    params.parent_pdid=this.pdDetails.parent_pd_id
     params.pd_id = this.pdDetails.pd_id;
     params.pd_form_id = this.form_id;
     params.company_id = this.company_id;
@@ -117,6 +118,7 @@ export class PdQuestionSupplierInfoPage {
           let dataForm = data['records'];
           if (dataForm !== undefined) {
             this.supplierInfoForm = this.fb.group({
+              parent_pdid:[this.pdDetails.parent_pd_id],
               pdid: [this.pdDetails.pd_id],
               formid: [this.form_id],
               company_id: [this.company_id],
@@ -164,6 +166,7 @@ export class PdQuestionSupplierInfoPage {
             this.noRecordsFound = true;
           } else {
             this.supplierInfoForm = this.fb.group({
+              parent_pdid:[this.pdDetails.parent_pd_id],
               pdid: [this.pdDetails.pd_id],
               formid: [this.form_id],
               company_id: [this.company_id],
@@ -191,6 +194,7 @@ export class PdQuestionSupplierInfoPage {
           }
         } else {
           this.supplierInfoForm = this.fb.group({
+            parent_pdid:[this.pdDetails.parent_pd_id],
             pdid: [this.pdDetails.pd_id],
             formid: [this.form_id],
             company_id: [this.company_id],

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

@@ -26,7 +26,7 @@
                         <ion-grid *ngIf="imageDisplay.length >0 ">
                                 <ion-row>
                             <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                                    <img src="{{image.image}}" imageViewer>
+                                    <img src="{{image.image}}" imageViewer><br/>
                                     <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
         
                                     <input  *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -44,7 +44,7 @@
                                     <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                                 <ion-row>
                             <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                                    <img src="{{image.image}}" imageViewer>
+                                    <img src="{{image.image}}" imageViewer><br/>
                                     <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
         
                                     <input #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">
@@ -143,14 +143,15 @@
                         
                        
                         <mat-form-field style="width: 100%">
-                            <input type="number" matInput placeholder="Original Tenure in Months" formControlName="original_tenure" (change)="checkTenure(details);calculateTenure(details)">
+                            <input type="number" matInput placeholder="Original Tenure in Months" formControlName="original_tenure" (change)="checkTenure(details);calculateTenure(details,1)">
                         </mat-form-field>
                         <mat-form-field style="width: 100%">
-                            <input type="number" matInput placeholder="Current Balance Tenure in Months" formControlName="current_balance_tenure" #balanceTenure (change)="calculateTenure(details)"> 
+                            <input type="number" matInput placeholder="Current Balance Tenure in Months" formControlName="current_balance_tenure" #balanceTenure (change)="calculateTenure(details,1)"> 
-                            <mat-error style="font-size: 12px" *ngIf="tentureErrorFlag == true">Oringinal Tenure Less than Current Balance Tenure</mat-error>
+                            <mat-error style="font-size: 12px" *ngIf="tentureErrorFlag || details.controls.current_balance_tenure.hasError('max')">Oringinal Tenure Less than Current Balance Tenure</mat-error>
                         </mat-form-field>
                         <mat-form-field>
-                                <input type="number" matInput placeholder="Elapsed Tenure in Months" formControlName="elapsed_tenure" autocomplete="off">
+                                <input type="number" matInput placeholder="Elapsed Tenure in Months" formControlName="elapsed_tenure" autocomplete="off" (change)="calculateTenure(details,2)">
+                                <mat-error style="font-size: 12px" *ngIf="tentureErrorFlag">Oringinal Tenure Less than Elapsed Tenure</mat-error>
                         </mat-form-field>
                         <ion-buttons end>
                       

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

@@ -294,16 +294,27 @@ checkTenure(details){
       
   // }
 }
-calculateTenure(details)
+calculateTenure(details,flag)
 {
+ 
+  switch(flag){
+    
+ 
+  case 1:
   let ElapsedValues;
   console.log(details)
   if(details.value.original_tenure != null && details.value.original_tenure != '' && details.value.current_balance_tenure != null && details.value.current_balance_tenure != '' ){
     console.log("not null")
+  
+    if(details.value.current_balance_tenure == 0){
+      details.controls['elapsed_tenure'].setValue(details.value.original_tenure)
+     }
     if(details.value.current_balance_tenure <= details.value.original_tenure){
+      
       console.log("validate")
       this.tentureErrorFlag=false
     ElapsedValues = details.value.original_tenure - details.value.current_balance_tenure ;
+   
     details.controls['elapsed_tenure'].setValue(ElapsedValues);
   }
   else{
@@ -316,7 +327,33 @@ calculateTenure(details)
 else{
   this.tentureErrorFlag=false
 }
-
+break;
+case 2:
+let balance
+console.log("case 2",details);
+ if(details.value.original_tenure !=null && details.value.original_tenure != '' && details.value.elapsed_tenure != null && details.value.elapsed_tenure != ''){
+ 
+   if(details.value.elapsed_tenure == 0){
+    details.controls['current_balance_tenure'].setValue(details.value.original_tenure)
+   }
+  if(details.value.elapsed_tenure <= details.value.original_tenure){
+    this.tentureErrorFlag=false
+    balance=details.value.original_tenure - details.value.elapsed_tenure;
+    
+    console.log("ba",balance);
+    details.controls['current_balance_tenure'].setValue(balance)
+  }
+  else{
+    //this.toast.pdTriggerappmessage("Oringinal Tenure Less than Current Balance Tenure")
+    this.tentureErrorFlag=true
+  // this.TenureFocus.nativeElement.focus();
+  }
+}
+else{
+  this.tentureErrorFlag=false
+}
+  
+}
 }
 keyPress(event: any) {
   const pattern = /[0-9]/;
@@ -372,12 +409,14 @@ submitCurrentloan(answerData) {
   //   return
   // }
   if(this.tentureErrorFlag == true){
-    this.toast.pdTriggerappmessage("Original Tenure Less than Current Balance Tenure");
+    // this.toast.pdTriggerappmessage("Original Tenure Less than Current Balance Tenure");
+    this.toast.pdTriggerappmessage("Original Tenture is Lower");
     this.TenureFocus.nativeElement.focus();
     return
   }
  
   let records: any = {};
+  records.parent_pdid=this.pdDetails.parent_pd_id
   records.pdid = this.pdDetails.pd_id;
   records.formid = this.FormId.form_id;
   records.fk_createdby = this.users;
@@ -406,7 +445,7 @@ submitCurrentloan(answerData) {
 }
   getcurrentLoans()
   {
-    let records = {'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id};
+    let records = {'parent_pdid':this.pdDetails.parent_pd_id,'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id};
     this.qustCat.retiverForm(records).subscribe(res=>
       {
         const control = <FormArray>this.currentLoans.controls['loan_details'];

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

@@ -25,7 +25,7 @@
                             <ion-grid *ngIf="imageDisplay.length >0 ">
                                     <ion-row>
                                 <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                                        <img src="{{image.image}}" imageViewer>
+                                        <img src="{{image.image}}" imageViewer><br/>
                                         <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
             
                                         <input  *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -43,7 +43,7 @@
                                         <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                                     <ion-row>
                                 <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                                        <img src="{{image.image}}" imageViewer>
+                                        <img src="{{image.image}}" imageViewer><br/>
                                         <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
             
                                         <input #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">

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

@@ -205,7 +205,7 @@ export class PdQuestionEmpInfoPage {
 
   getCompanyFromGeneralDetails(){
       
-        let records = { 'pd_id': this.pdDetails.pd_id, 'pd_form_id': '18' };
+        let records = { 'parent_pdid':this.pdDetails.parent_pd_id,'pd_id': this.pdDetails.pd_id, 'pd_form_id': '18' };
     
         this.qustCat.retiverForm(records).subscribe(value => {
           if (value['dataStatus'] == true) {
@@ -286,6 +286,7 @@ export class PdQuestionEmpInfoPage {
     
 
       let records: any = {};
+      records.parent_pdid=this.pdDetails.parent_pd_id
       records.pdid = this.pdDetails.pd_id;
       records.formid = this.FormId.form_id;
       records.fk_createdby = this.users;
@@ -474,7 +475,7 @@ inWords(val,flag:number){
 
  getEmploymentDetails(){
  
-    let records = { 'pd_id': this.pdDetails.pd_id, 'pd_form_id': this.FormId.form_id };
+    let records = {'parent_pdid':this.pdDetails.parent_pd_id, 'pd_id': this.pdDetails.pd_id, 'pd_form_id': this.FormId.form_id };
 
     this.qustCat.retiverForm(records).subscribe(value => {
       if (value['dataStatus'] == true) {

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

@@ -25,7 +25,7 @@
                             <ion-grid *ngIf="imageDisplay.length >0 ">
                                     <ion-row>
                                 <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                                        <img src="{{image.image}}" imageViewer>
+                                        <img src="{{image.image}}" imageViewer><br/>
                                         <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
             
                                         <input  *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -43,7 +43,7 @@
                                         <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                                     <ion-row>
                                 <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                                        <img src="{{image.image}}" imageViewer>
+                                        <img src="{{image.image}}" imageViewer><br/>
                                         <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
             
                                         <input #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">

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

@@ -594,7 +594,7 @@ savepdfamily(answerData)
 
   Object.keys(records).forEach((key)=>(records[key]==null)&& delete records[key]);
   
-
+  records.parent_pdid=this.pdDetails.parent_pd_id
   records.pdid=this.pdDetails.pd_id;
   records.formid=this.FormId.form_id;
   records.fk_createdby=this.users;
@@ -807,7 +807,7 @@ resValue:any;
           this.apiFamilyMembers = [].concat.apply([],Temparr);
         }
       })
-      let records={'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id};
+      let records={'parent_pdid':this.pdDetails.parent_pd_id,'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id};
 
       this.qustCat.retiverForm(records).subscribe(res=>{
        console.log("Entering Retrieve");

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

@@ -34,7 +34,7 @@
                     <ion-grid *ngIf="imageDisplay.length >0 ">
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input  *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -52,7 +52,7 @@
                                 <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">
@@ -162,7 +162,19 @@
           </ion-buttons>
     </div>
   </div>
-</div>
+</div><br/>
+<mat-label float-right>Was the PD Address Outside Geographic Limit (OGL)
+  <mat-slide-toggle float-right formControlName="was_the_pd_address_ogl" color="primary"></mat-slide-toggle>
+</mat-label><br/>
+<mat-form-field>
+  <mat-select placeholder="Mode Of Transport used to visit the PD Address" formControlName="mode_of_transport_during_visit" (selectionChange)="setValidation()" required>
+    <mat-option>Select</mat-option>
+    <mat-option *ngFor="let transport of mode_of_transport_values" [value]="transport.id">{{transport.name}}</mat-option>
+  </mat-select>
+</mat-form-field>
+<mat-form-field *ngIf="_finalRemarkForm.value.mode_of_transport_during_visit == 'others'" required>
+  <input matInput type="text" autocomplete="off" formControlName="others_transport" placeholder="Specify the Mode of Transport">
+</mat-form-field>
   <!-- <mat-form-field *ngIf="_finalRemarkForm.controls['pd_officers_recommendation'].value == 2">                  
       <input matInput autocomplete="off" placeholder="Reason for marking PD Status as Positive" formControlName="reason_for_positive">
   </mat-form-field>

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

@@ -33,6 +33,10 @@ export class PdQuestionFinalRemarkPage {
   imageDisplay: any=[];
   imageBucket: any=[];
   tab: any='0';
+  mode_of_transport_values=[{'id':'two_wheeler','name':'Two Wheeler'},
+                    {'id':'four_wheeler','name':'Four Wheeler'},
+                    {'id':'public_transport','name':'Public Transport'},
+                    {'id':'others','name':'Others'}]
   constructor(public navCtrl: NavController, public navParams: NavParams, public fb:FormBuilder,
        public qustcat:QuestionCategoryProvider,public aws:AwsServiceProvider,
        public toast:ToastProvider,private cameraProvider:CameraProvider,private loading:LoadingProvider) {
@@ -43,6 +47,7 @@ export class PdQuestionFinalRemarkPage {
     
     this._finalRemarkForm=this.fb.group({
       fk_createdby:[this.users],
+      parent_pdid:[this.pdDetails.parent_pd_id],
       pdid:[this.pdid],
       formid:[this.FormId.form_id],
       final_custormer_remark_type:[null,Validators.compose([Validators.required])],
@@ -56,7 +61,11 @@ export class PdQuestionFinalRemarkPage {
       // reason_for_refer_to_credit:[''],
       recommendation_positive:this.fb.array([]),
       recommendation_negative:this.fb.array([]),
-      recommendation_refer_to_credit:this.fb.array([])
+      recommendation_refer_to_credit:this.fb.array([]),
+
+      was_the_pd_address_ogl:[''],
+      mode_of_transport_during_visit:['',Validators.compose([Validators.required])],
+      others_transport:['',Validators.compose([Validators.required])]
       
     })
     this.getDropDown();
@@ -364,14 +373,18 @@ RecommendationChange(e) {
   }
 }
  getFinalRemark(){
-   let saveRecords={'pd_id':this.pdid,'pd_form_id':this.FormId.form_id}
+   let saveRecords={'parent_pdid':this.pdDetails.parent_pd_id,'pd_id':this.pdid,'pd_form_id':this.FormId.form_id}
    this.qustcat.retiverForm(saveRecords).subscribe(data=>{
     if(data['dataStatus']==true){
       this._finalRemarkForm.controls.final_custormer_remark_type.setValue(data['records'].final_custormer_remark_type);
+      
       this._finalRemarkForm.controls.final_other_customer_behaviour.setValue(data['records'].final_other_customer_behaviour);
       this._finalRemarkForm.controls.is_service_provided.setValue(data['records'].is_service_provided);
       this._finalRemarkForm.controls.pd_officers_recommendation.setValue(data['records'].pd_officers_recommendation);
       this._finalRemarkForm.controls.others_pd_officers_recommendation.setValue(data['records'].others_pd_officers_recommendation)
+      this._finalRemarkForm.controls.was_the_pd_address_ogl.setValue(data['records'].was_the_pd_address_ogl);
+      this._finalRemarkForm.controls.mode_of_transport_during_visit.setValue(data['records'].mode_of_transport_during_visit)
+      this._finalRemarkForm.controls.others_transport.setValue(data['records'].others_transport);
       // this._finalRemarkForm.controls.reason_for_positive.setValue(data['records'].reason_for_positive)
       // this._finalRemarkForm.controls.reason_for_refer_to_credit.setValue(data['records'].reason_for_refer_to_credit);
       // this._finalRemarkForm.controls.reason_for_negative.setValue(data['records'].reason_for_negative);
@@ -513,5 +526,18 @@ capture(){
       }
     })
   }
+  setValidation(){
+    console.log("enter");
+    if(this._finalRemarkForm.controls['mode_of_transport_during_visit'].value == 'others'){
+      this._finalRemarkForm.controls['others_transport'].setValue('');
+    this._finalRemarkForm.controls['others_transport'].setValidators(Validators.compose([Validators.required]))
+    this._finalRemarkForm.controls['others_transport'].updateValueAndValidity()
+    }
+    else{
+      this._finalRemarkForm.controls['others_transport'].setValue('');
+      this._finalRemarkForm.controls['others_transport'].clearValidators();
+      this._finalRemarkForm.controls['others_transport'].updateValueAndValidity()
+    }
+  }
 
 }

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

@@ -27,7 +27,7 @@
                     <ion-grid *ngIf="imageDisplay.length >0 ">
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input  *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -45,7 +45,7 @@
                                 <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">

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

@@ -97,6 +97,7 @@ export class PdQuestionGeneralInfoPage {
     this.getdropdown();
    
     this.generalForm = this.fb.group({
+      parent_pdid:this.pdDetails.parent_pd_id,
       pdid:this.pdDetails.pd_id,
       formid:this.FormId.form_id,
       applicant_list: this.fb.array([]),
@@ -328,6 +329,7 @@ export class PdQuestionGeneralInfoPage {
         business_years:[val.business_years],
         business_month:[val.business_month],
         business_date_object:[val.business_date_object],
+        associate_pd_id:[this.pdDetails.pd_id],
 
        business_entity_type_name:[c_business_name]
       });
@@ -362,6 +364,7 @@ export class PdQuestionGeneralInfoPage {
         business_years:[val.business_years],
         business_month:[val.business_month],
         business_date_object:[val.business_date_object],
+        associate_pd_id:[val.associate_pd_id],
 
         business_entity_type_name:[c_business_name]
       });
@@ -432,7 +435,7 @@ export class PdQuestionGeneralInfoPage {
       business_entity_type_other:[''],
       business_years:[''],
       business_month:[''],
-      business_date_object:['']
+      business_date_object:[''],
     });
     control.controls=[]
     control.push(formData)
@@ -1012,7 +1015,7 @@ console.log('1)',this.temp);
     if(this.customer_segment_abbr != 'SE-RI'){
     let count=0
     existData.forEach((element,index)=>{
-      console.log("company value",element)
+      // console.log("company value",element)
       if(element.business_entity_type=='' || element.business_entity_type == null){
         this.editCompanies(index);
        // this.focus_business_entity.focused=true;
@@ -1032,19 +1035,19 @@ console.log('1)',this.temp);
   }
  
   if (valuesData_indi.length > 0) {
-    console.log('2)',this.temp);
+    // console.log('2)',this.temp);
     valuesData_indi.forEach((val, index) => {
       if (val.is_person_met == false) {
         this.temp++;
       }
-      console.log('3)',this.temp);
+      // console.log('3)',this.temp);
     });
-    console.log('4)',this.temp,'length',valuesData_indi.length);
+    // console.log('4)',this.temp,'length',valuesData_indi.length);
     if (this.temp == valuesData_indi.length) {
-      console.log('5)',this.temp);
+      // console.log('5)',this.temp);
       this.toast.pdTriggerappmessage('Please Choose Name of Person Met.!');
       this.temp = 0;
-      console.log('6)',this.temp);
+      // console.log('6)',this.temp);
       return;
     }
   }
@@ -1066,6 +1069,7 @@ console.log('1)',this.temp);
 
   saveRecords.individuals=valuesData_indi;
   // saveRecords.companies=valuesData
+  saveRecords.parent_pdid=answerData.parent_pdid
   saveRecords.pdid=answerData.pdid;
   saveRecords.formid=answerData.formid;
   saveRecords.fk_createdby=this.users; 
@@ -1135,7 +1139,7 @@ console.log('1)',this.temp);
 
   getGeneralForm()
   {
-    let records={'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id};
+    let records={'parent_pdid':this.pdDetails.parent_pd_id,'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id};
     this.qustCat.retiverForm(records).subscribe(res=>{
       this.data_all=res['records'];
       let exist_companies:any;
@@ -1251,7 +1255,7 @@ console.log('1)',this.temp);
           datas.course_name = ''
            if (datas.company_name != '' && datas.company_name != null) {
              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 }
+             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))
           }
         });

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

@@ -29,7 +29,7 @@
                     <ion-grid *ngIf="imageDisplay.length >0 ">
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input  *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -47,7 +47,7 @@
                                 <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">

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

@@ -37,6 +37,7 @@ export class PdQuestionLenderRepresentativePage {
     
     this.users = this.aws.getlocale();
     this.representativeForm = this.fb.group({
+      parent_pdid:[this.pdDetails.parent_pd_id],
       pdid:[this.pdDetails.pd_id],
       formid:[this.FormId.form_id],
       fk_createdby:[this.users],
@@ -156,7 +157,7 @@ export class PdQuestionLenderRepresentativePage {
 
   getLenderReDetails()
   {
-    let records = {'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id}
+    let records = {'parent_pdid':this.pdDetails.parent_pd_id,'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id}
     
     this.qustCat.retiverForm(records).subscribe(res=>
       {

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

@@ -29,7 +29,7 @@
                             <ion-grid *ngIf="imageDisplay.length >0 ">
                                     <ion-row>
                                 <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                                        <img src="{{image.image}}" imageViewer>
+                                        <img src="{{image.image}}" imageViewer><br/>
                                         <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
             
                                         <input  *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -47,7 +47,7 @@
                                         <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                                     <ion-row>
                                 <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                                        <img src="{{image.image}}" imageViewer>
+                                        <img src="{{image.image}}" imageViewer><br/>
                                         <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
             
                                         <input #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">

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

@@ -127,7 +127,7 @@ export class PdQuestionLoansPage {
     });
     console.log(this.pdDetails)
     //Setting Initial value from PD Master
-    if(this.loanDetailsForm.controls['loan_amount'] !=null){
+    if(this.pdDetails.loan_amount!=null){
       this.loanDetailsForm.controls['loan_amount'].setValue(this.pdDetails.loan_amount)
       this.loanAmtInWords=this.constant.convertNumberToWords(this.pdDetails.loan_amount);
     }
@@ -349,7 +349,7 @@ export class PdQuestionLoansPage {
   this.qustCat.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{
     if(data['dataStatus']==true){
         this.existCompanyList=data['records'].filter(val =>val.is_active===true && val.is_company_applicant===true)
-    }
+    
     let modifyCompanyList : any=[];
     if(this.existCompanyList.length>0){
        modifyCompanyList = this.existCompanyList.map(element => {
@@ -357,6 +357,7 @@ export class PdQuestionLoansPage {
        });
        this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList})
       }
+    }
       })
     
     let modifyApplicantList: any=[];
@@ -373,6 +374,7 @@ export class PdQuestionLoansPage {
     this.qustCat.getcommondrop('ENDUSEOFTOPUP').subscribe(data=>{
       this.m_endUseOFTopUpList=data['records'].filter(val=>val.is_active == 1)
     })  
+  
   }
 
   selectedBalancesTransferChanges(event: any){
@@ -535,6 +537,7 @@ export class PdQuestionLoansPage {
   submitLoanDetails() {
     // if(this.loanDetailsForm.valid){
     let records: any = {};
+      records.parent_pdid=this.pdDetails.parent_pd_id
         records.pdid = this.pdDetails.pd_id;
         records.formid = this.FormId.form_id;
         records.fk_createdby = this.users;
@@ -654,7 +657,7 @@ export class PdQuestionLoansPage {
   }
 
   getLoanDetails() {
-    let records = { 'pd_id': this.pdDetails.pd_id, 'pd_form_id': this.FormId.form_id };
+    let records = {'parent_pdid':this.pdDetails.parent_pd_id, 'pd_id': this.pdDetails.pd_id, 'pd_form_id': this.FormId.form_id };
 
     this.qustCat.retiverForm(records).subscribe(value => {
       if (value['dataStatus'] == true) {
@@ -769,6 +772,7 @@ export class PdQuestionLoansPage {
       //  this.mortage_type(loanDetails.property_type_others);
       
         }
+      }
         this.loanDetailsForm.controls['owner_name'].setValue(ownername);
         this.loanDetailsForm.controls['construction_status'].setValue(loanDetails.construction_status);
         this.loanDetailsForm.controls['emv_per_customer'].setValue(loanDetails.emv_per_customer);
@@ -776,7 +780,7 @@ export class PdQuestionLoansPage {
         {
           this.emvAmtInWords=this.constant.convertNumberToWords(loanDetails.emv_per_customer);
         }
-      }
+      
         // this.loanDetailsForm.controls['value_per_agreement'].setValue(loanDetails.value_per_agreement);
         this.loanDetailsForm.controls['loandetails_remarks'].setValue(loanDetails.loandetails_remarks);
       } else {

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

@@ -29,7 +29,7 @@
                       <ion-grid *ngIf="imageDisplay.length >0 ">
                               <ion-row>
                           <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                                  <img src="{{image.image}}" imageViewer>
+                                  <img src="{{image.image}}" imageViewer><br/>
                                   <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
       
                                   <input  *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -47,7 +47,7 @@
                                   <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                               <ion-row>
                           <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                                  <img src="{{image.image}}" imageViewer>
+                                  <img src="{{image.image}}" imageViewer><br/>
                                   <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
       
                                   <input #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">
@@ -74,7 +74,7 @@
           <div *ngFor="let neighbourhood of neighbourhoodForm.controls.neighbourhood_list['controls']; let n = index;let last=last;"
             [formGroupName]="n">
             
-              <h5>Neighbour Details #{{n+1}}</h5><br/>
+              <h5>Neighbour Details {{n+1}}</h5><br/>
           
             <mat-form-field style="width: 100%">
               <input matInput placeholder="Neighbour Name" formControlName="neighbourhood_name" type="text">

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

@@ -55,6 +55,7 @@ export class PdQuestionNeighbourHoodPage {
     this.applicants.push({'pd_co_applicant_id': 0,'applicant_name': "Others"})
     this.neighbourhoodForm = this.fb.group(
       {
+        parent_pdid:this.pdDetails.parent_pd_id,
       pdid:this.pdDetails.pd_id,
       formid:this.FormId.form_id,
       check_type:0,
@@ -441,6 +442,7 @@ ChdCtrls.controls.other_organisation_owner.updateValueAndValidity();
           saveRecords.referencecheck_list=referencecheck_list;
           
         // }
+        saveRecords.parent_pdid=answerData.parent_pd_id
         saveRecords.pdid=answerData.pdid;
         saveRecords.formid=answerData.formid;
         // saveRecords.check_type=answerData.check_type;
@@ -465,7 +467,7 @@ ChdCtrls.controls.other_organisation_owner.updateValueAndValidity();
 
   getneighbourhood()
   {
-    let records = {'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id};
+    let records = {'parent_pdid':this.pdDetails.parent_pd_id,'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id};
     const control = <FormArray>this.neighbourhoodForm.controls['referencecheck_list'];  
     const neicontrol = <FormArray>this.neighbourhoodForm.controls['neighbourhood_list'];
       

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

@@ -29,7 +29,7 @@
                     <ion-grid *ngIf="imageDisplay.length >0 ">
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input  *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">
@@ -47,7 +47,7 @@
                                 <label style="font-size:14px;color:gray">Newly Captured Pics</label><br/>
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageBucket; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input #focusName *ngIf="image.Name ==''" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeNameForBucket($event.target.value,i,image.image)">

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

@@ -306,6 +306,7 @@ submitOtherIncome(answerData)
 {
   
   let records: any = {};
+        records.parent_pdid=this.pdDetails.parent_pd_id
         records.pdid = this.pdDetails.pd_id;
         records.formid = this.FormId.form_id;
         records.fk_createdby = this.users;
@@ -314,7 +315,7 @@ submitOtherIncome(answerData)
         records.otherincome_remarks = answerData.otherincome_remarks;
         this.qustCat.saveForm(records).subscribe(data => {
             //TO CHANGE THE FORM STATE 
-        this.otherIncomeForm.reset(this.otherIncomeDetails.value);
+        this.otherIncomeForm.reset(this.otherIncomeForm.value);
             this.toast.pdTriggerappmessage('Record Saved Successfully.!');
             setTimeout(()=>{
               this.navCtrl.pop();
@@ -326,7 +327,7 @@ submitOtherIncome(answerData)
 
 getOtherIncome()
 {
-  let records = {'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id};
+  let records = {'parent_pdid':this.pdDetails.parent_pd_id,'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id};
 
   this.qustCat.retiverForm(records).subscribe(res=>
     {

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

@@ -40,7 +40,7 @@ export class PdQuestionRentalDashPage {
   getAllRentalInfo(){
     this.existing_rental_list=[]
    
-    let records = { 'pd_id': this.pdDetails.pd_id, 'pd_form_id': this.form_details.form_id };
+    let records = {'parent_pdid':this.pdDetails.parent_pd_id, 'pd_id': this.pdDetails.pd_id, 'pd_form_id': this.form_details.form_id };
     this.qustCat.retiverForm(records).subscribe(res=>{
       if(res['dataStatus']==true){
        
@@ -94,6 +94,7 @@ export class PdQuestionRentalDashPage {
       }
       else{
       this.existing_rental_count_id=0
+      this.addMore();
       }
     })
     console.log("ren",this.existing_rental_list);

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

@@ -26,7 +26,7 @@
                     <ion-grid *ngIf="imageDisplay.length >0 ">
                             <ion-row>
                         <ion-col col-6 *ngFor="let image of imageDisplay; let i=index" no-padding>
-                                <img src="{{image.image}}" imageViewer>
+                                <img src="{{image.image}}" imageViewer><br/>
                                 <label *ngIf="image.Name != ''"><strong>{{image.Name}}</strong></label>
     
                                 <input class="docName" *ngIf="image.Name =='' && image.option != 'dummy'" width="20px" ion-input type="text" placeholder="Document Name" (blur)="changeName($event.target.value,i,image.image)">

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

@@ -94,6 +94,7 @@ export class PdQuestionRentalInfoPage {
 
     this.rentalForms = this.fb.group(
       {
+        parent_pdid:this.pdDetails.parent_pd_id,
         pdid: this.pdDetails.pd_id,
         formid: this.FormId.form_id,
         address_property:['',Validators.required],
@@ -1095,7 +1096,7 @@ compareSingleObjects(o1: any, o2: any) {
   getRentalDetails()
   {
 
-    let records = { 'pd_id': this.pdDetails.pd_id, 'pd_form_id': this.FormId.form_id };
+    let records = { 'parent_pdid':this.pdDetails.parent_pd_id,'pd_id': this.pdDetails.pd_id, 'pd_form_id': this.FormId.form_id };
     
       
       
@@ -1106,6 +1107,7 @@ compareSingleObjects(o1: any, o2: any) {
         
           let rentalDetails = this.data.editData;
           console.log("rental",rentalDetails)
+              rentalDetails.parent_pdid=this.pdDetails.parent_pd_id
               rentalDetails.pdid  = this.pdDetails.pd_id,
               rentalDetails.formid  = this.FormId.form_id;
               rentalDetails.other_name_person_type ? this.rentalForms.addControl('other_name_person_type', new FormControl('', Validators.required)): this.rentalForms.removeControl('other_name_person_type');

src/providers/common-provider/toast.ts

@@ -67,10 +67,58 @@ setAlertForDocName(){
   ],
   buttons:[
     {
-      text:'Submit',
+      text:'Yes / Allow Addon PD',
-      handler:data=>{
+      handler:()=>{
-        console.log(data.Name)
+        alert.dismiss('add_on')
-        alert.dismiss(data.Name)
+        return false
+      }
+    },
+    {
+      text:'Yes',
+      handler:()=>{
+        alert.dismiss('yes')
+        return false
+      }
+    },
+    {
+      text:'No',
+      handler:()=>{
+        alert.dismiss('No')
+        return false
+      }
+    }
+  ]
+  })
+  //alert.present();
+  //this.inputFocus.setFocus();
+
+return alert
+}
+setAlertForCompletePD(){
+  let alert=this.alertCtrl.create({
+    title:'Complete Discussion',
+    message: 'Please confirm you are completing the Discussion and forwarding for Quality Check ?',
+  cssClass:'complete_alert',
+  buttons:[
+    {
+      text:'Yes / Allow Addon PD',
+      handler:()=>{
+       alert.dismiss('addon')
+       return false
+      }
+    },
+    {
+      text:'Yes',
+      handler:()=>{
+       alert.dismiss('yes')
+       return false
+      }
+    },
+    {
+      text:'No',
+      handler:()=>{
+       alert.dismiss('no')
+       return false
       }
     }
   ]

src/providers/constants/constants.ts

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

src/providers/pdtrigger/pdtrigger.ts

@@ -54,4 +54,7 @@ export class PdtriggerProvider {
    
     return this.http.post(this.apiurl+'checkOTP',records); 
   }
+  getPDCompleteDetails(details){
+    return this.http.post(this.apiurl+'getPDCompleteDetails',{'records':details})
+  }
 }

www/build/main.css

@@ -28310,6 +28310,7 @@ image-viewer.ion-page img {
   margin-bottom: 5px;
 }
 
+/* FOR ALERT */
 .buttoncss {
   color: darkseagreen;
 }
@@ -28343,6 +28344,35 @@ image-viewer.ion-page img {
   border: 1px solid blueviolet;
 }
 
+.complete_alert {
+  color: darkblue;
+}
+
+.complete_alert .alert-message {
+  color: olivedrab;
+}
+
+.complete_alert button.alert-button:nth-child(1) {
+  color: red;
+  border: 1px solid red;
+  border-radius: 10px;
+  width: 85%;
+  text-align: center;
+  font-size: 14px;
+}
+
+.complete_alert button.alert-button:nth-child(2) {
+  margin-top: 10px;
+  color: darkgreen;
+  width: 60px;
+}
+
+.complete_alert button.alert-button:nth-child(3) {
+  margin-top: 8px;
+  color: darkred;
+}
+
+/* END OF ALERT*/
 page-auth .scroll-content {
   background-color: #eee;
 }
@@ -28565,6 +28595,10 @@ page-input .cardinfo {
   padding-bottom: 30px !important;
 }
 
+page-input .addressinfo {
+  font-size: 19px !important;
+}
+
 page-input .schdul {
   border-radius: 5px;
   color: red;
@@ -28594,6 +28628,19 @@ page-input ion-icon {
   font-size: 120%;
 }
 
+page-input .status {
+  color: #E00201;
+  border: 2px solid darkmagenta;
+  padding: 7px;
+  border-radius: 10px;
+}
+
+page-input .inprogress_btn {
+  position: relative;
+  left: 80%;
+  bottom: 50%;
+}
+
 page-bounced-reject .scroll-content {
   background-color: #eee !important;
 }
@@ -28864,6 +28911,15 @@ page-pd-list .list-md {
 }
 
 page-pd-list .lettericon {
+  background-color: cadetblue;
+  padding: 10px 8px 10px 8px;
+  border-radius: 20%;
+  color: #fff;
+  font-size: 90%;
+  font-weight: bold;
+}
+
+page-pd-list .no_applicant_pd {
   background-color: cadetblue;
   padding: 10px 15px 10px 15px;
   border-radius: 50%;
@@ -28913,10 +28969,13 @@ page-pd-list ion-slide.swiper-slide {
   -webkit-align-items: flex-start;
   -ms-flex-align: start;
   align-items: flex-start;
+  overflow-x: scroll;
+  display: block;
 }
 
-page-pd-list ion-slides {
+page-pd-list .app_id {
-  height: auto;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 page-pd-question .SwipedTabs-indicatorSegment {
@@ -29090,7 +29149,7 @@ page-pd-question-address textarea {
 
 page-pd-question-address img {
   padding: 0 5px 0 0;
-  height: 180px;
+  height: 170px;
 }
 
 page-pd-question-address input {
@@ -29742,7 +29801,9 @@ page-pd-question-business-info mat-select {
 }
 
 page-pd-question-business-info .checkbo {
-  margin: 15px;
+  margin: 10px;
+  padding-top: 10px;
+  color: darkcyan;
 }
 
 page-pd-question-business-info img {