Fairoj : Issue Fixes

.sourcemaps/0.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/pages/pd-question-rental-dash/pd-question-rental-dash.module.ts","../../src/pages/pd-question-rental-dash/pd-question-rental-dash.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAyC;AACO;AACqB;AAUrE;IAAA;IAA6C,CAAC;IAAjC,8BAA8B;QAR1C,uEAAQ,CAAC;YACR,YAAY,EAAE;gBACZ,0FAAwB;aACzB;YACD,OAAO,EAAE;gBACP,sEAAe,CAAC,QAAQ,CAAC,0FAAwB,CAAC;aACnD;SACF,CAAC;OACW,8BAA8B,CAAG;IAAD,qCAAC;CAAA;AAAH;;;;;;;;;;;;;;;;;;;;;ACZD;AACe;AAEzD;;;;;GAKG;AAOH;IAEE,kCAAmB,OAAsB,EAAS,SAAoB;QAAnD,YAAO,GAAP,OAAO,CAAe;QAAS,cAAS,GAAT,SAAS,CAAW;IACtE,CAAC;IAED,iDAAc,GAAd;QACE,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;IACzD,CAAC;IAPU,wBAAwB;QAJpC,wEAAS,CAAC;YACT,QAAQ,EAAE,8BAA8B;WACG;SAC5C,CAAC;iCAGsE;OAF3D,wBAAwB,CASpC;IAAD,CAAC;AAAA;SATY,wBAAwB,kB","file":"0.js","sourcesContent":["import { NgModule } from '@angular/core';\nimport { IonicPageModule } from 'ionic-angular';\nimport { PdQuestionRentalDashPage } from './pd-question-rental-dash';\n\n@NgModule({\n  declarations: [\n    PdQuestionRentalDashPage,\n  ],\n  imports: [\n    IonicPageModule.forChild(PdQuestionRentalDashPage),\n  ],\n})\nexport class PdQuestionRentalDashPageModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/pd-question-rental-dash/pd-question-rental-dash.module.ts","import { Component } from '@angular/core';\nimport { IonicPage, NavController, NavParams } from 'ionic-angular';\n\n/**\n * Generated class for the PdQuestionRentalDashPage page.\n *\n * See https://ionicframework.com/docs/components/#navigation for more info on\n * Ionic pages and navigation.\n */\n\n@IonicPage()\n@Component({\n  selector: 'page-pd-question-rental-dash',\n  templateUrl: 'pd-question-rental-dash.html',\n})\nexport class PdQuestionRentalDashPage {\n\n  constructor(public navCtrl: NavController, public navParams: NavParams) {\n  }\n\n  ionViewDidLoad() {\n    console.log('ionViewDidLoad PdQuestionRentalDashPage');\n  }\n\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/pd-question-rental-dash/pd-question-rental-dash.ts"],"sourceRoot":""}
+{"version":3,"sources":["../../@angular/common/http (ignored)"],"names":[],"mappings":";;;;;AAAA,e","file":"0.js","sourcesContent":["/* (ignored) */\n\n\n//////////////////\n// WEBPACK FOOTER\n// @angular/common/http (ignored)\n// module id = 705\n// module chunks = 0"],"sourceRoot":""}

package-lock.json

@@ -208,13 +208,13 @@
       }
     },
     "@ionic/storage": {
-      "version": "2.1.3",
+      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ionic/storage/-/storage-2.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/@ionic/storage/-/storage-2.2.0.tgz",
-      "integrity": "sha512-/i3Vn2jNBqteAm5FuGCNei5oJlFQB2JYFkH3nR5f5i7X4kRz17XAsAKXVQjyR9wiye8HmxglIz05JsC92nYUjQ==",
+      "integrity": "sha512-2pszrzmI+fAar2Rx0WmJDVpc15D1k5tvLkB49NLYWJ2pOMaO/3/vp7mg/mEbg3rdsPE9FRbYI6vdKjQ2pP1EWA==",
       "requires": {
-        "@types/localforage": "0.0.30",
+        "localforage": "1.7.1",
-        "localforage": "1.4.3",
+        "localforage-cordovasqlitedriver": "1.7.0",
-        "localforage-cordovasqlitedriver": "1.5.0"
+        "tslib": "1.8.1"
       }
     },
     "@netbasal/content-loader": {
@@ -237,11 +237,6 @@
       "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.7.40.tgz",
       "integrity": "sha512-yC8Ff5vsHFTClGCWXoAmNCh33cNYfP2/yFANBLjLiso4jTKsLfQ0KQuBEuKxOWTRoOSLyT6v+ZYcvz0uonvvsA=="
     },
-    "@types/localforage": {
-      "version": "0.0.30",
-      "resolved": "https://registry.npmjs.org/@types/localforage/-/localforage-0.0.30.tgz",
-      "integrity": "sha1-PWCmv23aOOP4pGlhFZg3nx9klQk="
-    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -258,11 +253,6 @@
         "negotiator": "0.6.1"
       }
     },
-    "acorn": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz",
-      "integrity": "sha1-yM4n3grMdtiW0rH6099YjZ6C8BQ="
-    },
     "acorn-dynamic-import": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
@@ -322,7 +312,8 @@
     "amdefine": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
     },
     "ansi-regex": {
       "version": "2.1.1",
@@ -426,11 +417,6 @@
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
       "dev": true
     },
-    "ast-types": {
-      "version": "0.8.15",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.8.15.tgz",
-      "integrity": "sha1-ju8IJ/BN/w7IhXupJavj/qYZTlI="
-    },
     "async": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
@@ -532,11 +518,6 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
-    "base62": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/base62/-/base62-0.1.1.tgz",
-      "integrity": "sha1-e0F0wvlESXU7EcJlHAg9qEGnsIQ="
-    },
     "base64-js": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
@@ -2282,16 +2263,6 @@
         "is-arrayish": "0.2.1"
       }
     },
-    "es3ify": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/es3ify/-/es3ify-0.1.4.tgz",
-      "integrity": "sha1-rZ+l3xrjTz8x4SEbWBiy1RB439E=",
-      "requires": {
-        "esprima-fb": "3001.1.0-dev-harmony-fb",
-        "jstransform": "3.0.0",
-        "through": "2.3.8"
-      }
-    },
     "es5-ext": {
       "version": "0.10.37",
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz",
@@ -2386,16 +2357,6 @@
         "estraverse": "4.2.0"
       }
     },
-    "esmangle-evaluator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/esmangle-evaluator/-/esmangle-evaluator-1.0.1.tgz",
-      "integrity": "sha1-Yg2GbvSGGzMR91dm1SqFcrs8YzY="
-    },
-    "esprima-fb": {
-      "version": "3001.1.0-dev-harmony-fb",
-      "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz",
-      "integrity": "sha1-t303q8046gt3Qmu4vCkizmtCZBE="
-    },
     "esrecurse": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
@@ -2553,24 +2514,6 @@
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
       "dev": true
     },
-    "falafel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/falafel/-/falafel-1.2.0.tgz",
-      "integrity": "sha1-wY0k71CRF0pJfzGM0ksCaiXN2rQ=",
-      "requires": {
-        "acorn": "1.2.2",
-        "foreach": "2.0.5",
-        "isarray": "0.0.1",
-        "object-keys": "1.1.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-        }
-      }
-    },
     "fast-deep-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
@@ -2647,11 +2590,6 @@
         "for-in": "1.0.2"
       }
     },
-    "foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
-    },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -3473,15 +3411,6 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
-    "inline-process-browser": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/inline-process-browser/-/inline-process-browser-1.0.0.tgz",
-      "integrity": "sha1-RqYbFT3TybFiSxoAYm7bT39BTyI=",
-      "requires": {
-        "falafel": "1.2.0",
-        "through2": "0.6.5"
-      }
-    },
     "interpret": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
@@ -3499,6 +3428,11 @@
       "resolved": "https://registry.npmjs.org/ionic-angular/-/ionic-angular-3.9.2.tgz",
       "integrity": "sha512-BEZ6magY1i5GwM9ki/MOpszUz62+g518HsGICtw9TE1D4v9Eb6n/o7e+X0vtvpK4TdouFjQ8r5XA9VPAKW9/+Q=="
     },
+    "ionic-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/ionic-cache/-/ionic-cache-4.0.1.tgz",
+      "integrity": "sha512-X7ekRjgaRyxhrspwJSzua4I8enMv6d8y8QQExqG5X2ZMj/ICh/Z7uQfNP2xEfQ+/QgSLrMuevbHkBOnT9G622g=="
+    },
     "ionic-img-viewer": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/ionic-img-viewer/-/ionic-img-viewer-2.9.0.tgz",
@@ -3734,26 +3668,6 @@
         "verror": "1.10.0"
       }
     },
-    "jstransform": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/jstransform/-/jstransform-3.0.0.tgz",
-      "integrity": "sha1-olkats7o2XvzvoMNv6IxO4fNZAs=",
-      "requires": {
-        "base62": "0.1.1",
-        "esprima-fb": "3001.1.0-dev-harmony-fb",
-        "source-map": "0.1.31"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.1.31",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz",
-          "integrity": "sha1-n3BNDWnZ4TioG63267T94z0VHGE=",
-          "requires": {
-            "amdefine": "1.0.1"
-          }
-        }
-      }
-    },
     "kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -3778,14 +3692,11 @@
       }
     },
     "lie": {
-      "version": "3.0.2",
+      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lie/-/lie-3.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
-      "integrity": "sha1-/9oh17uibzd8rYZdNkmy/Izjn+o=",
+      "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
       "requires": {
-        "es3ify": "0.1.4",
+        "immediate": "3.0.6"
-        "immediate": "3.0.6",
-        "inline-process-browser": "1.0.0",
-        "unreachable-branch-transform": "0.3.0"
       }
     },
     "livereload-js": {
@@ -3825,20 +3736,19 @@
       }
     },
     "localforage": {
-      "version": "1.4.3",
+      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.4.3.tgz",
+      "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.7.1.tgz",
-      "integrity": "sha1-ohJUPDnHx2Qk7dEr9HTEiarKSUw=",
+      "integrity": "sha1-5JJ+BCMCuGTbMPMhHxO1xvDell0=",
       "requires": {
-        "lie": "3.0.2"
+        "lie": "3.1.1"
       }
     },
     "localforage-cordovasqlitedriver": {
-      "version": "1.5.0",
+      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/localforage-cordovasqlitedriver/-/localforage-cordovasqlitedriver-1.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/localforage-cordovasqlitedriver/-/localforage-cordovasqlitedriver-1.7.0.tgz",
-      "integrity": "sha1-+TR4nmrZo5usBf3RFogS9DhTV2I=",
+      "integrity": "sha1-i5OVd1nuaI06WNW6fAR39sy1ODg=",
       "requires": {
-        "@types/localforage": "0.0.30",
+        "localforage": "1.7.1"
-        "localforage": "1.4.3"
       }
     },
     "locate-path": {
@@ -4345,11 +4255,6 @@
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
       "dev": true
     },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-    },
     "object.omit": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
@@ -4617,11 +4522,6 @@
       "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
       "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks="
     },
-    "private": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
-    },
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -4818,24 +4718,6 @@
         "set-immediate-shim": "1.0.1"
       }
     },
-    "recast": {
-      "version": "0.10.43",
-      "resolved": "https://registry.npmjs.org/recast/-/recast-0.10.43.tgz",
-      "integrity": "sha1-uV1Q9tYHYaX2JS4V2AZ4FoSRzn8=",
-      "requires": {
-        "ast-types": "0.8.15",
-        "esprima-fb": "15001.1001.0-dev-harmony-fb",
-        "private": "0.1.8",
-        "source-map": "0.5.7"
-      },
-      "dependencies": {
-        "esprima-fb": {
-          "version": "15001.1001.0-dev-harmony-fb",
-          "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz",
-          "integrity": "sha1-Q761fsJujPI3092LM+QlM1d/Jlk="
-        }
-      }
-    },
     "redent": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
@@ -5389,43 +5271,6 @@
         "inherits": "2.0.3"
       }
     },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-    },
-    "through2": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-      "requires": {
-        "readable-stream": "1.0.34",
-        "xtend": "4.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-        }
-      }
-    },
     "timers-browserify": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz",
@@ -5672,16 +5517,6 @@
       "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
       "dev": true
     },
-    "unreachable-branch-transform": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/unreachable-branch-transform/-/unreachable-branch-transform-0.3.0.tgz",
-      "integrity": "sha1-2ZzExudG0mSSiEW2EdtUsPNHTKo=",
-      "requires": {
-        "esmangle-evaluator": "1.0.1",
-        "recast": "0.10.43",
-        "through2": "0.6.5"
-      }
-    },
     "url": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
@@ -6090,7 +5925,8 @@
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
     },
     "y18n": {
       "version": "3.2.1",

package.json

@@ -35,7 +35,7 @@
     "@ionic-native/splash-screen": "4.4.0",
     "@ionic-native/sqlite": "^4.19.0",
     "@ionic-native/status-bar": "^4.16.0",
-    "@ionic/storage": "^2.1.3",
+    "@ionic/storage": "^2.2.0",
     "@netbasal/content-loader": "^1.1.0",
     "@types/chart.js": "^2.7.40",
     "amazon-cognito-identity-js": "^3.0.3",
@@ -58,6 +58,7 @@
     "hammerjs": "^2.0.8",
     "increase-memory-limit": "^1.0.6",
     "ionic-angular": "3.9.2",
+    "ionic-cache": "^4.0.1",
     "ionic-img-viewer": "^2.9.0",
     "ionicons": "3.0.0",
     "moment": "^2.24.0",
@@ -103,4 +104,4 @@
       "android"
     ]
   }
-}
+}

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

@@ -1,4 +1,4 @@
-#Fri Apr 12 13:01:24 IST 2019
+#Mon Apr 15 19:50:50 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

src/app/app.component.ts

@@ -11,6 +11,7 @@ import { PasswordPage } from '../pages/password/password';
 import { AuthPage } from '../pages/auth/auth';
 import {AlertController} from 'ionic-angular'
 import { platformBrowser } from '@angular/platform-browser';
+import {CacheService} from 'ionic-cache'
 // import { AndroidPermissions } from '@ionic-native/android-permissions';
 
 
@@ -28,7 +29,8 @@ export class MyApp {
   pages: Array<{title: string,icon:any, method: any}>;
 
   constructor(public platform: Platform, public statusBar: StatusBar, public splashScreen: SplashScreen,public aws:AwsServiceProvider,public shared:CognitoServiceProvider,public AWS:AwsServiceProvider
-              ,public alertCtrl:AlertController) {
+              ,public alertCtrl:AlertController,cache:CacheService) {
+                cache.setDefaultTTL(60*60)
     this.initializeApp();
 
     // used for an example of ngFor and navigation

src/app/app.module.ts

@@ -126,6 +126,7 @@ import {PdQuestionAssessedImagesPage} from '../pages/pd-question/pd-question-ass
 import {IonicStorageModule} from '@Ionic/storage'
 import { StorageProvider } from '../providers/storage/storage';
 import {PdQuestionRentalDashPage} from '../pages/pd-question/pd-question-rental-info/pd-question-rental-dash/pd-question-rental-dash'
+import {CacheModule} from 'ionic-cache'
 
 @NgModule({
     declarations: [
@@ -220,7 +221,8 @@ import {PdQuestionRentalDashPage} from '../pages/pd-question/pd-question-rental-
         MatTooltipModule,
         MatStepperModule,HttpClientModule,IonicImageViewerModule,NgxMatSelectSearchModule,
         ContentLoaderModule,
-        IonicStorageModule.forRoot()
+        IonicStorageModule.forRoot(),
+        CacheModule.forRoot()
         
     ],
     bootstrap: [IonicApp],
@@ -296,7 +298,8 @@ import {PdQuestionRentalDashPage} from '../pages/pd-question/pd-question-rental-
     PdPipe,LocationAccuracy,
     LoadingProvider,Geolocation,
     DatabaseProvider,
-    StorageProvider,
+    StorageProvider
+    
     ]
 })
 export class AppModule {}

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

@@ -12,6 +12,8 @@ import {searchValue} from '../search'
 import { takeUntil } from 'rxjs/operators';
 import{LoadingProvider} from '../../../providers/common-provider/loading'
 import {StorageProvider} from '../../../providers/storage/storage'
+import 'rxjs/add/observable/interval';
+// import{CacheService} from 'ionic-cache-observable'
 /**
  * Generated class for the PdQuestionAddressPage page.
  *
@@ -78,6 +80,8 @@ export class PdQuestionAddressPage {
   imageBucket: any=[];
   tab:string='0';
   imageDisplay: any=[];
+  public data$:Observable<any>
+  timer:any;
 
   constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
     public qustCat:QuestionCategoryProvider,public aws:AwsServiceProvider,
@@ -135,6 +139,8 @@ export class PdQuestionAddressPage {
       //  .subscribe(()=>{
       //    this.SearchCity(0);
       //  })
+      this.timer = Observable.interval(10000)
+      .subscribe((val) => { console.log('test',val); });
   
      
   }
@@ -268,6 +274,7 @@ countRowsForTextarea(text){
    
   }
   ionViewCanLeave(){
+    this.timer.unsubscribe();
     console.log("dirty",this.pdQuestionAddress.dirty);
     if(this.pdQuestionAddress.dirty){
     //  console.log("dirty",this.AssetsDetailsForm.dirty)
@@ -421,7 +428,13 @@ countRowsForTextarea(text){
       {
         if(res['dataStatus']==true){
         this.addressTypes = res['records'].filter(add=>add.isactive==1);  
+        console.log("dk",this.addressTypes)
+        // this.cacheObservable.register('addressType',this.addressTypes).subscribe(res=>{
+        //   this.data$=res.get$
+        //   console.log("data",this.data$)
+        // })
       }
+      // this.cacheObservable.loadFromObservable()
       
       })
     

src/pages/pd-question/pd-question-assessed-daily-sales/pd-question-assessed-daily-sales.html

@@ -76,7 +76,7 @@
                   <mat-form-field style="width:100%">
                     <input matInput placeholder="Value" formControlName="frequency_value" (keyup)="salesCalculation(sale_i,item.value);inWords($event.target.value,i,3)">
                   </mat-form-field>
-                  <mat-label align="end" style="font-size:12px;color:gray" *ngIf="tenants.value.frequency_value != ''">{{"&#8377;"}} {{freqAmtInwords[i]}} Only</mat-label>
+                  <mat-label float-right style="font-size:12px;color:gray" *ngIf="tenants.value.frequency_value != '' && freqAmtInwords[i] != ''">{{"&#8377;"}} {{freqAmtInwords[i]}} Only</mat-label>
                   <mat-form-field style="width: 100%">
                       <input OnlyNumber type="text" matInput placeholder="Annual Value" (keyup)="salesCalculation(sale_i,item.value)" formControlName="sales_value" readonly required>             
                       <mat-hint align="end" style="font-size:12px" *ngIf="tenants.get('sales_value').value != ''">{{"&#8377;"}} {{Value[i]}} Only</mat-hint>

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

@@ -475,6 +475,9 @@ changeOptions(indexVal: any,event: any): void{
           if(item.sales_value !=null){
           this.Value[i]=this.constant.convertNumberToWords(item.sales_value)
           }
+          if(item.frequency_value != null){
+            this.freqAmtInwords[i]=this.constant.convertNumberToWords(item.frequency_value);
+          }
         })
       
 

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

@@ -6,6 +6,8 @@ import { QuestionCategoryProvider } from '../../../providers/question-category/q
 import {ConstantsProvider} from '../../../providers/constants/constants'
 import { ToastProvider } from '../../../providers/common-provider/toast';
 import {Camera} from '@ionic-native/camera'
+// import {CacheService} from 'ionic-cache-observable'
+// import { Observable } from 'rxjs/Observable';
 
 /**
  * Generated class for the PdQuestionAssestsPage page.
@@ -57,6 +59,7 @@ export class PdQuestionAssestsPage {
   imageDisplay: any=[];
   @ViewChild('focusName') inputFocus;
   @ViewChild('picContent') content: Content
+  // data:Observable <any>;
   constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,public aws:AwsServiceProvider,public qustCat:QuestionCategoryProvider,public toast:ToastProvider,public constprovider:ConstantsProvider,public camera:Camera,public alert: AlertController) {
   
     this.assestInfo = "busass";
@@ -163,6 +166,7 @@ export class PdQuestionAssestsPage {
         if(res['dataStatus']==true)
         {
           this.m_assets_type = res['records'].filter(data=>data.isactive==1 && data.id!=5);
+        
         }
     })
     
@@ -172,6 +176,7 @@ export class PdQuestionAssestsPage {
           if(res['dataStatus']==true)
           {
             this.m_propertyType = res['records'].filter(data => data.isactive == 1);
+           
           }
     })
   
@@ -253,7 +258,7 @@ export class PdQuestionAssestsPage {
                // this.listOfLanguagues.splice(this.listOfLanguagues.indexOf(languague), 1);
               }
             })
-            
+          
         
   }
   createAsset() : FormGroup

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

@@ -462,13 +462,13 @@
                         <mat-label>Description of {{manufacturing.value.main_products}} Manufacturing Process</mat-label>
                         <textarea matInput placeholder="Description" formControlName="description"></textarea>
                     </mat-form-field>
-                    <ion-buttons >
+                    <ion-buttons end>
-                        <ion-col col-1>
+                        <ion-col col-3 offset-3>
                             <button ion-button clear color="optblue" (click)="removeManufacturing(i)">
                                 <ion-icon style="font-size: 22px;" name="md-trash"></ion-icon>
                             </button>
-                        </ion-col>
+                        </ion-col><br/>
-                        <ion-col offset-8 col-3 *ngIf="l">
+                        <ion-col offset-1 col-2 *ngIf="l">
                             <!-- <button  float-right ion-button clear (click)="addMoreManufacturing()" ><ion-icon style="font-size:24px"  color="optblue" name="add-circle"></ion-icon></button><br/> -->
                             <button ion-button color="optblue" round (click)="addMoreManufacturing()">Add More Product</button>
                         </ion-col>
@@ -747,7 +747,7 @@
                             <button ion-button clear color="optblue" (click)="removeRetail(r)">
                                 <ion-icon style="font-size: 22px;" name="md-trash"></ion-icon>
                             </button>
-                        </ion-col>
+                        </ion-col><br/>
                         <ion-col *ngIf="l" col-2 offset-1>
                             <!-- <button  float-right ion-button clear (click)="addMoreRetail()" ><ion-icon style="font-size:24px"  color="optblue" name="add-circle"></ion-icon></button><br/> -->
                             <button ion-button color="optblue" round (click)="addMoreRetail()">Add More Product</button>
@@ -1028,7 +1028,7 @@
                             <button ion-button clear color="optblue" (click)="removeWholesale(w)">
                                 <ion-icon style="font-size: 22px;" name="md-trash"></ion-icon>
                             </button>
-                        </ion-col>
+                        </ion-col><br/>
                         <ion-col *ngIf="l" col-2 offset-1>
                             <!-- <button  float-right ion-button clear (click)="addMoreWholesale()" ><ion-icon style="font-size:24px"  color="optblue" name="add-circle"></ion-icon></button><br/> -->
                             <button ion-button color="optblue" round (click)="addMoreWholesale()">Add More Product</button>
@@ -1322,7 +1322,7 @@
                             <button ion-button clear color="optblue" (click)="removeServiceProvider(sp)">
                                 <ion-icon style="font-size: 22px;" name="md-trash"></ion-icon>
                             </button>
-                        </ion-col>
+                        </ion-col><br/>
                         <ion-col *ngIf="l" col-2 offset-1>
                             <!-- <button  float-right ion-button clear (click)="addMoreServiceprovider()" ><ion-icon style="font-size:24px"  color="optblue" name="add-circle"></ion-icon></button><br/> -->
                             <button ion-button color="optblue" round (click)="addMoreServiceprovider()">Add More

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

@@ -91,7 +91,7 @@ applicants: any;
     if(this.currentLoans.dirty){
    
    return new Promise((resolve,reject)=>{
-    let alert=this.toast.setAlert("Form is Modified","Are you sure want to Go Back")
+    let alert=this.toast.setAlert("Data will be Lost","Are you sure want to Go Back")
     alert.present();
     alert.onDidDismiss((data)=>{
       console.log("d",data);

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

@@ -153,7 +153,7 @@
                         <mat-form-field style="width: 100%">
                             <input matInput placeholder="What is the salary amount confirmed?" formControlName="confirm_salary_amount"
                                 type="number" (keyup)="inWords($event.target.value,1)">
-                            <mat-hint align="end" *ngIf="employmentForm.controls.confirm_salary_amount.value != ''">{{"&#8377;"}}
+                            <mat-hint align="end" *ngIf="employmentForm.controls.confirm_salary_amount.value != '' && mthlySlryAmtInWords != ''">{{"&#8377;"}}
                                 {{mthlySlryAmtInWords}} Only</mat-hint>
                         </mat-form-field>
                     </div>
@@ -205,7 +205,7 @@
                 <div fxLayout="column" fxLayoutAlign="start stretch">
                     <mat-form-field style="width: 100%">
                         <input matInput placeholder="Gross Monthly Salary" formControlName="gross_monthly_salary" type="number" required (keyup)="inWords($event.target.value,2)">
-                        <mat-hint align="end" *ngIf="employmentForm.controls.gross_monthly_salary.value != ''">{{"&#8377;"}}
+                        <mat-hint align="end" *ngIf="employmentForm.controls.gross_monthly_salary.value != '' && grossMthlySlryAmtInWords !=''">{{"&#8377;"}}
                             {{grossMthlySlryAmtInWords}} Only</mat-hint>
                     </mat-form-field>
                 </div>
@@ -213,8 +213,7 @@
                     <mat-form-field style="width: 100%">
                         <input matInput placeholder="Net Monthly Salary" formControlName="net_monthly_salary" type="number"
                              required (keyup)="inWords($event.target.value,3)">
-                        <mat-hint align="end" *ngIf="employmentForm.controls.net_monthly_salary.value != ''">{{"&#8377;"}}
+                        <mat-hint align="end" *ngIf="employmentForm.value.net_monthly_salary != '' && netMthlySlryAmtInWords!=''">{{"&#8377;"}} {{netMthlySlryAmtInWords}} Only</mat-hint>
-                            {{netMthlySlryAmtInWords}} Only</mat-hint>
                     </mat-form-field>
                 </div>
 
@@ -222,7 +221,7 @@
                     <mat-form-field style="width: 100%">
                         <input matInput placeholder="Amount paid in Cash" formControlName="amount_paid_in_cash"
                              type="number" autocomplete="off" (keyup)="inWords($event.target.value,6)" (change)="ValidateNetSalary()" #cashPaidFocus>
-                        <mat-hint align="end" *ngIf="employmentForm.controls.amount_paid_in_cash.value != ''">{{"&#8377;"}}
+                        <mat-hint align="end" *ngIf="employmentForm.controls.amount_paid_in_cash.value != '' && cashAmtInWords != ''">{{"&#8377;"}}
                             {{cashAmtInWords}} Only</mat-hint>
                         <mat-error *ngIf="employmentForm.controls.amount_paid_in_cash.hasError('max')">Given Value is Maximum of Net Salary</mat-error>
                     </mat-form-field>
@@ -232,7 +231,7 @@
                     <mat-form-field style="width: 100%">
                         <input matInput placeholder="Amount paid through Bank" formControlName="amount_paid_through_bank"
                             type="number" autocomplete="off" (keyup)="inWords($event.target.value,5)" (change)="ValidateNetSalary()">
-                        <mat-hint align="end" *ngIf="employmentForm.controls.amount_paid_through_bank.value != ''">{{"&#8377;"}}
+                        <mat-hint align="end" *ngIf="employmentForm.controls.amount_paid_through_bank.value != '' && bankAmtInWords != ''">{{"&#8377;"}}
                             {{bankAmtInWords}} Only</mat-hint>
                         <mat-error *ngIf="employmentForm.controls.amount_paid_through_bank.hasError('max')">Given Value is Maximum of Net Salary</mat-error>
                     </mat-form-field>
@@ -267,7 +266,7 @@
                     <mat-form-field style="width: 100%">
                         <input matInput placeholder="Bonus or Incentive" formControlName="bonus_incentive" type="number"
                             required (keyup)="inWords($event.target.value,4)">
-                        <mat-hint align="end" *ngIf="employmentForm.controls.bonus_incentive.value != ''">{{"&#8377;"}}
+                        <mat-hint align="end" *ngIf="employmentForm.controls.bonus_incentive.value != '' && bonusIncentiveAmtInWords !='' ">{{"&#8377;"}}
                             {{bonusIncentiveAmtInWords}} Only</mat-hint>
                     </mat-form-field>
                 </div>

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

@@ -127,7 +127,7 @@ export class PdQuestionEmpInfoPage {
     if(this.employmentForm.dirty){
    
       return new Promise((resolve,reject)=>{
-        let alert=this.toast.setAlert("Form is Modified","Are you sure want to Go Back")
+        let alert=this.toast.setAlert("Data will be Lost","Are you sure want to Go Back")
         alert.present();
         alert.onDidDismiss((data)=>{
           console.log("d",data);
@@ -235,6 +235,7 @@ export class PdQuestionEmpInfoPage {
         let balance=salary-this.employmentForm.controls['amount_paid_in_cash'].value
         console.log("bal",balance)
       this.employmentForm.controls['amount_paid_through_bank'].setValue(balance);
+      this.inWords(balance,5)
       }
       if(maxamt >= 0 ){
         this.employmentForm.controls['amount_paid_through_bank'].setValidators([Validators.max(salary-cash_amount)]);   
@@ -524,8 +525,8 @@ inWords(val,flag:number){
         this.inWords(Emp.gross_monthly_salary,2);
         this.inWords(Emp.net_monthly_salary,3);
         this.inWords(Emp.bonus_incentive,4);
-        this.inWords(Emp.amount_paid_in_cash,5);
+        this.inWords(Emp.amount_paid_in_cash,6);
-        this.inWords(Emp.amount_paid_through_bank,6);
+        this.inWords(Emp.amount_paid_through_bank,5);
         if(Emp.total_business_experience != ''){
           this.checkWorkingExperiences();
 }

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

@@ -107,7 +107,7 @@ data:any;
     if(this.familyForm.dirty){
    
       return new Promise((resolve,reject)=>{
-        let alert=this.toast.setAlert("Form is Modified","Are you sure want to Go Back")
+        let alert=this.toast.setAlert("Data will be Lost","Are you sure want to Go Back")
         alert.present();
         alert.onDidDismiss((data)=>{
           console.log("d",data);

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

@@ -73,7 +73,7 @@ export class PdQuestionFinalRemarkPage {
     if(this._finalRemarkForm.dirty){
    
       return new Promise((resolve,reject)=>{
-        let alert=this.toast.setAlert("Form is Modified","Are you sure want to Go Back")
+        let alert=this.toast.setAlert("Data will be Lost","Are you sure want to Go Back")
         alert.present();
         alert.onDidDismiss((data)=>{
           console.log("d",data);

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

@@ -166,7 +166,7 @@
               <mat-checkbox class="table-checkbox-com" color="primary" formControlName="is_applicant">Is Applicant</mat-checkbox>
               <ion-row>
                 <ion-col end>
-                  <button *ngIf="addIndi" float-right ion-button color="optblue" (click)="delete(1,indi)">Add</button>
+                  <button *ngIf="addIndi" float-right ion-button color="optblue" (click)="addParticular(1,indi)">Add</button>
                   <button *ngIf="!addIndi" float-right ion-button color="optblue" (click)="update(1,indi)">Update</button>
                 </ion-col>
               </ion-row>
@@ -302,7 +302,7 @@
               </mat-form-field>
               <ion-row>
                 <ion-col end>
-                  <button *ngIf="addComp" ion-button float-right color="optblue" (click)="delete(2,indi)">Add</button>
+                  <button *ngIf="addComp" ion-button float-right color="optblue" (click)="addParticular(2,indi)">Add</button>
                   <button *ngIf="!addComp" float-right ion-button color="optblue" (click)="update(2)">Update</button>
                 </ion-col>
               </ion-row>

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

@@ -170,7 +170,7 @@ export class PdQuestionGeneralInfoPage {
     if(this.generalForm.dirty){
    
       return new Promise((resolve,reject)=>{
-        let alert=this.toast.setAlert("Form is Modified","Are you sure want to Go Back")
+        let alert=this.toast.setAlert("Data will be Lost","Are you sure want to Go Back")
         alert.present();
         alert.onDidDismiss((data)=>{
           console.log("d",data);
@@ -661,7 +661,7 @@ dataobj:any;
 
  }
  
-  delete(v,controlVal):void{
+  addParticular(v,controlVal):void{
     //console.log("controlVAl",controlVal)
    // const control=<FormArray>this.generalForm.controls['individuals'];
     //control.removeAt(i);
@@ -713,7 +713,7 @@ dataobj:any;
        else{
        this.initCompanyValue(this.generalForm.value.companies,'ins')
      }
-    }
+     }
   
   }
   removeList(i,index){
@@ -1009,16 +1009,22 @@ console.log('1)',this.temp);
     var existData=Object.keys(answerData.company_value).map(function(key){
       return answerData.company_value[key]
     })
+    if(this.customer_segment_abbr != 'SE-RI'){
+    let count=0
     existData.forEach((element,index)=>{
       console.log("company value",element)
       if(element.business_entity_type=='' || element.business_entity_type == null){
-        this.toast.pdTriggerappmessage("Please choose business entity type for each companies");
         this.editCompanies(index);
        // this.focus_business_entity.focused=true;
-        return;
+      count=count+1;
       }
       valuesData.push(element)
     })
+    if(count >0){
+      this.toast.pdTriggerappmessage("Please choose business entity type for each companies");
+      return
+    }
+  }
     if(this.OldData.length>0){
     this.OldData.forEach((element)=>{
       valuesData.push(element)

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

@@ -57,7 +57,7 @@ export class PdQuestionLenderRepresentativePage {
     if(this.representativeForm.dirty){
    
       return new Promise((resolve,reject)=>{
-        let alert=this.toast.setAlert("Form is Modified","Are you sure want to Go Back")
+        let alert=this.toast.setAlert("Data will be Lost","Are you sure want to Go Back")
         alert.present();
         alert.onDidDismiss((data)=>{
           console.log("d",data);

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

@@ -67,7 +67,7 @@
            
         <mat-form-field style="width: 100%">
             <input matInput placeholder="Loan Amount Applied for ? " type="number" formControlName="loan_amount" (keyup)="inWords($event,1)" (blur)="loanCalc()" required >
-            <mat-hint align="end" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
+            <mat-hint align="end" *ngIf="loanDetailsForm.controls['loan_amount'].value != '' && loanAmtInWords !=''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
         </mat-form-field>
         <mat-form-field style="width:100%">
         <mat-label>Loan Tenure applied for?</mat-label>

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

@@ -171,7 +171,7 @@ export class PdQuestionLoansPage {
     if(this.loanDetailsForm.dirty){
    
       return new Promise((resolve,reject)=>{
-        let alert=this.toast.setAlert("Form is Modified","Are you sure want to Go Back")
+        let alert=this.toast.setAlert("Data will be Lost","Are you sure want to Go Back")
         alert.present();
         alert.onDidDismiss((data)=>{
           console.log("d",data);

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

@@ -5,7 +5,7 @@ import { QuestionCategoryProvider } from '../../../providers/question-category/q
 import { AwsServiceProvider } from '../../../providers/aws-service/aws-service';
 import { ToastProvider } from '../../../providers/common-provider/toast';
 import { ConstantsProvider } from '../../../providers/constants/constants'
-import { PdQuestionRentalInfoPage } from '../pd-question-rental-info/pd-question-rental-info';
+import { PdQuestionRentalDashPage } from '../pd-question-rental-info/pd-question-rental-dash/pd-question-rental-dash';
 import {CameraProvider} from '../../../providers/common-provider/camera'
 import {LoadingProvider} from '../../../providers/common-provider/loading'
 
@@ -300,7 +300,7 @@ Toview(){
   // here Hardcoded;
   this.otherIncomeForm.reset(this.otherIncomeForm.value)
   let RIFormDtls = {'form_id':17,'form_name':'Rental Verification'};
-  this.navCtrl.push(PdQuestionRentalInfoPage,{'FormId':RIFormDtls,'pdDetails':this.pdDetails});
+  this.navCtrl.push(PdQuestionRentalDashPage,{'FormId':RIFormDtls,'pdDetails':this.pdDetails});
 }
 submitOtherIncome(answerData)
 {

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

@@ -14,6 +14,7 @@
 
 
 <ion-content padding>
+  <mat-label *ngIf="existing_rental_list.length == 0">No Records Found..</mat-label>
 <mat-card *ngFor="let info of existing_rental_list;let i=index" (click)="editDet(info.rental_existing_data)">
   <mat-card-header>
     <mat-card-title><h6>Property {{i+1}}</h6></mat-card-title>

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

@@ -1,13 +0,0 @@
-import { NgModule } from '@angular/core';
-import { IonicPageModule } from 'ionic-angular';
-import { PdQuestionRentalDashPage } from './pd-question-rental-dash';
-
-@NgModule({
-  declarations: [
-    PdQuestionRentalDashPage,
-  ],
-  imports: [
-    IonicPageModule.forChild(PdQuestionRentalDashPage),
-  ],
-})
-export class PdQuestionRentalDashPageModule {}

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

@@ -20,7 +20,7 @@ export class PdQuestionRentalDashPage {
   pdDetails:any;
   form_details:any;
   pageTitle:any
-  existing_rental_count_id: number;
+  existing_rental_count_id: number=0;
   existing_rental_list: any=[];
   constructor(public navCtrl: NavController, public navParams: NavParams,private qustCat:QuestionCategoryProvider) {
     this.pdDetails=this.navParams.get('pdDetails');
@@ -39,13 +39,23 @@ export class PdQuestionRentalDashPage {
   }
   getAllRentalInfo(){
     this.existing_rental_list=[]
+   
     let records = { 'pd_id': this.pdDetails.pd_id, 'pd_form_id': this.form_details.form_id };
     this.qustCat.retiverForm(records).subscribe(res=>{
       if(res['dataStatus']==true){
-        let rentalVal=res['records'];
+       
+       // console.log("rental",rentalVal.length)
+      // console.log(JSON.parse(res['records']))
+      let rentalVal:any=res['records']
+     
+       
+       console.log("tyeva",typeof(rentalVal))
         let tempArray: any = [];
         let amt: any = [];
         this.existing_rental_count_id = rentalVal.length;
+       // if(rentalVal.length >0){
+         console.log("rental val",rentalVal);
+         
         rentalVal.forEach((value,index)=>{
           let annualRentAmt:any
           if(value.property_unit_details){
@@ -86,6 +96,7 @@ export class PdQuestionRentalDashPage {
       this.existing_rental_count_id=0
       }
     })
+    console.log("ren",this.existing_rental_list);
   }
   editDet(values){
     let passValues: any = {

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

@@ -217,7 +217,7 @@ export class PdQuestionRentalInfoPage {
     if(this.rentalForms.dirty){
    
       return new Promise((resolve,reject)=>{
-        let alert=this.toast.setAlert("Form is Modified","Are you sure want to Go Back")
+        let alert=this.toast.setAlert("Data will be Lost","Are you sure want to Go Back")
         alert.present();
         alert.onDidDismiss((data)=>{
           console.log("d",data);

src/pipes/rupee-currency-format/rupee-currency-format.ts

@@ -28,7 +28,7 @@ export class RupeeCurrencyFormatPipe implements PipeTransform {
           output += "." + result[1];
       }            
 
-      return currencySymbol +' '+ output;
+      return currencySymbol+output;
   }
     // return value.toLowerCase();
   }

src/providers/constants/constants.ts

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

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

@@ -1,6 +1,8 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { ConstantsProvider } from '../constants/constants';
+import { Observable } from 'rxjs';
+import {CacheService} from 'ionic-cache'
 
 /*
   Generated class for the QuestionCategoryProvider provider.
@@ -11,7 +13,7 @@ import { ConstantsProvider } from '../constants/constants';
 @Injectable()
 export class QuestionCategoryProvider {
 apiurl:any;
-  constructor(public http: HttpClient,public constant:ConstantsProvider) {
+  constructor(public http: HttpClient,public constant:ConstantsProvider,private cache:CacheService) {
     console.log('Hello QuestionCategoryProvider Provider');
       this.apiurl = constant.apiurl();
   }
@@ -39,8 +41,12 @@ apiurl:any;
    */
   getcommondrop(tableName)
   {
+   
+    // return Observable.defer(()=>{
       let masters = {'master_name':tableName}
-      return this.http.post(this.apiurl+'getListOfMaster',masters);
+    return this.http.post(this.apiurl+'getListOfMaster',masters);
+      // return this.cache.loadFromObservable(cacheKey,data)
+    // })
   }
 
   saveForm(records)
@@ -77,7 +83,9 @@ getEndUseForLoan(pdid:any,subproduct){
   return this.http.post<any>(this.apiurl+ "getEndUseOfLoan",{ "records":{ "pd_id" : pdid,"sub_product_id":subproduct}})
 }
 getCompaniesListsForBusiness(pdid:any){
-  return this.http.post<any>(this.apiurl+ "getCompaniesListsForBusiness", { "records":{ "pd_id" : pdid}})
+  // let cacheKey=pdid
+ return this.http.post<any>(this.apiurl+ "getCompaniesListsForBusiness", { "records":{ "pd_id" : pdid}})
+ // return this.cache.loadFromObservable(cacheKey,data)
 }
 getStateWiseCities(stateid:any){
   return this.http.post<any>(this.apiurl + "getListOfStatesAndCities", { "records":{ "state_id" : stateid}})

src/providers/storage/storage.ts

@@ -70,6 +70,7 @@ retrieveLocalStorage(data){
     console.log("storage get",res)
     if(res != null){
     return res.filter(val=>val.form_id==data.form_id)
+    
     }
   })
 }