Compare commits
12 Commits
61898069e2
...
ecdb601e78
| Author | SHA1 | Date | |
|---|---|---|---|
|
ecdb601e78 | ||
|
|
a8dfb5ce73 | ||
|
|
8f02adb752 | ||
|
|
afc12f0b68 | ||
|
|
5025bdecb0 | ||
|
|
ba4ce6bb90 | ||
|
|
7e6a706a24 | ||
|
|
3c069cebb8 | ||
|
|
b602b48fa7 | ||
|
|
6eff26db76 | ||
|
|
d330d9f7db | ||
|
|
73f3b94f70 |
@ -1 +1 @@
|
|||||||
{"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 = 726\n// module chunks = 0"],"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 = 728\n// module chunks = 0"],"sourceRoot":""}
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
|||||||
<?xml version='1.0' encoding='utf-8'?>
|
<?xml version='1.0' encoding='utf-8'?>
|
||||||
<widget id="com.sineedge.pdgenie" version="0.0.22" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
|
<widget id="com.sineedge.pdgenie" version="0.0.24" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
|
||||||
<name>PD Genie Officer </name>
|
<name>PD Genie Officer </name>
|
||||||
<description>info@pdgenie.com</description>
|
<description>info@pdgenie.com</description>
|
||||||
<author email="info@pdgenie.com" href="https://pdgenie.com">PD Genie</author>
|
<author email="info@pdgenie.com" href="https://pdgenie.com">PD Genie</author>
|
||||||
@ -95,12 +95,12 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
<plugin name="cordova-plugin-request-location-accuracy" spec="2.2.3" />
|
<plugin name="cordova-plugin-request-location-accuracy" spec="2.2.3" />
|
||||||
<plugin name="cordova-plugin-android-permissions" spec="1.0.0" />
|
<plugin name="cordova-plugin-android-permissions" spec="1.0.0" />
|
||||||
<plugin name="phonegap-plugin-push" spec="2.2.3">
|
<plugin name="phonegap-plugin-push" spec="2.3.0">
|
||||||
<variable name="SENDER_ID" value="906855209078" />
|
<variable name="SENDER_ID" value="906855209078" />
|
||||||
<variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
|
<variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
|
||||||
<variable name="FCM_VERSION" value="11.6.2" />
|
<variable name="FCM_VERSION" value="17.0.+" />
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin name="cordova-plugin-market" spec="1.2.0" />
|
<plugin name="cordova-plugin-market" spec="1.2.0" />
|
||||||
<engine name="browser" spec="5.0.4" />
|
<engine name="browser" spec="5.0.4" />
|
||||||
<engine name="android" spec="^8.0.0" />
|
<engine name="android" spec="8.1.0" />
|
||||||
</widget>
|
</widget>
|
||||||
|
|||||||
266
package-lock.json
generated
266
package-lock.json
generated
@ -730,9 +730,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"android-versions": {
|
"android-versions": {
|
||||||
"version": "1.4.0",
|
"version": "1.5.0",
|
||||||
"resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.4.0.tgz",
|
"resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.5.0.tgz",
|
||||||
"integrity": "sha512-GnomfYsBq+nZh3c3UH/4r9Jt6FuTxdhUJbeHIdYOH5xBhQ8I0ZzC2/RM5IFFIjrzuNWSHb8JWP1lPK0/a26jrg==",
|
"integrity": "sha512-/GWUAqa2OJNlDF5VGSe3SR1QMHEPXxx54Ur56r0qQC0H9FlBr7kyBF2SgVEhzFCPbrW4UcYgVuWrq/2Ty3QvXg==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"semver": "^5.4.1"
|
"semver": "^5.4.1"
|
||||||
}
|
}
|
||||||
@ -843,6 +843,11 @@
|
|||||||
"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
|
"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"array-ify": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
|
||||||
|
"integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4="
|
||||||
|
},
|
||||||
"array-uniq": {
|
"array-uniq": {
|
||||||
"version": "1.0.3",
|
"version": "1.0.3",
|
||||||
"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
|
"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
|
||||||
@ -977,11 +982,6 @@
|
|||||||
"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
|
"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"babel-plugin-add-header-comment": {
|
|
||||||
"version": "1.0.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/babel-plugin-add-header-comment/-/babel-plugin-add-header-comment-1.0.3.tgz",
|
|
||||||
"integrity": "sha1-URxJAQYmQNWkgLSsPt1pRBlYUOw="
|
|
||||||
},
|
|
||||||
"balanced-match": {
|
"balanced-match": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
|
||||||
@ -1075,9 +1075,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"big-integer": {
|
"big-integer": {
|
||||||
"version": "1.6.44",
|
"version": "1.6.48",
|
||||||
"resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.44.tgz",
|
"resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz",
|
||||||
"integrity": "sha512-7MzElZPTyJ2fNvBkPxtFQ2fWIkVmuzw41+BZHSzpEq3ymB2MfeKp1+yXl/tS75xCx+WnyV+yb0kp+K1C3UNwmQ=="
|
"integrity": "sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w=="
|
||||||
},
|
},
|
||||||
"big.js": {
|
"big.js": {
|
||||||
"version": "5.2.2",
|
"version": "5.2.2",
|
||||||
@ -1585,6 +1585,15 @@
|
|||||||
"integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
|
"integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"compare-func": {
|
||||||
|
"version": "1.3.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz",
|
||||||
|
"integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=",
|
||||||
|
"requires": {
|
||||||
|
"array-ify": "^1.0.0",
|
||||||
|
"dot-prop": "^3.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"component-emitter": {
|
"component-emitter": {
|
||||||
"version": "1.3.0",
|
"version": "1.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
|
||||||
@ -1665,16 +1674,16 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"cordova-android": {
|
"cordova-android": {
|
||||||
"version": "8.0.0",
|
"version": "8.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-8.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-8.1.0.tgz",
|
||||||
"integrity": "sha512-Ipv8HbVJpxEyYFSFLTEOaLRp0yxBtJVNbgSuDEB4naa34FzQaRWSNiiMcPJnO+x3hRXNt7pcwa46hARNzhn7+w==",
|
"integrity": "sha512-eAY6g9q3raJ4P03wNdSWC5MOW1EfxoomWNXsPhi7T6Q9yAqmxqn0sLEUjLL1Ib0LCH3nKQWBXdxapQ5LgbHu+g==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"android-versions": "^1.3.0",
|
"android-versions": "^1.4.0",
|
||||||
"cordova-common": "^3.1.0",
|
"compare-func": "^1.3.2",
|
||||||
"elementtree": "^0.1.7",
|
"cordova-common": "^3.2.0",
|
||||||
"nopt": "^4.0.1",
|
"nopt": "^4.0.1",
|
||||||
"properties-parser": "^0.3.1",
|
"properties-parser": "^0.3.1",
|
||||||
"q": "^1.4.1",
|
"q": "^1.5.1",
|
||||||
"shelljs": "^0.5.3"
|
"shelljs": "^0.5.3"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@ -2345,9 +2354,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"cordova-common": {
|
"cordova-common": {
|
||||||
"version": "3.2.0",
|
"version": "3.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-3.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-3.2.1.tgz",
|
||||||
"integrity": "sha512-EvlQ6PirfR65hGDoQvsluW00uSS2MTVIRKQ3c1Xvsddx7D5T5JgF3fHWkGik/Y/8yNcpI0zI2NcJyie2z/ak2A==",
|
"integrity": "sha512-xg0EnjnA6EipxXG8cupdlYQYeDA6+ghbN+Pjq88xN1LInwP6Bo7IyGBdSV5QnfjOvzShF9BBwSxBAv0FOO0C2Q==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"ansi": "^0.3.1",
|
"ansi": "^0.3.1",
|
||||||
"bplist-parser": "^0.1.0",
|
"bplist-parser": "^0.1.0",
|
||||||
@ -2387,9 +2396,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"graceful-fs": {
|
"graceful-fs": {
|
||||||
"version": "4.2.2",
|
"version": "4.2.3",
|
||||||
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
|
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
|
||||||
"integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="
|
"integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
|
||||||
},
|
},
|
||||||
"semver": {
|
"semver": {
|
||||||
"version": "5.7.1",
|
"version": "5.7.1",
|
||||||
@ -2648,9 +2657,17 @@
|
|||||||
"integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
|
"integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
|
||||||
},
|
},
|
||||||
"deep-equal": {
|
"deep-equal": {
|
||||||
"version": "1.0.1",
|
"version": "1.1.1",
|
||||||
"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
|
||||||
"integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
|
"integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
|
||||||
|
"requires": {
|
||||||
|
"is-arguments": "^1.0.4",
|
||||||
|
"is-date-object": "^1.0.1",
|
||||||
|
"is-regex": "^1.0.4",
|
||||||
|
"object-is": "^1.0.1",
|
||||||
|
"object-keys": "^1.1.1",
|
||||||
|
"regexp.prototype.flags": "^1.2.0"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"define-properties": {
|
"define-properties": {
|
||||||
"version": "1.1.3",
|
"version": "1.1.3",
|
||||||
@ -2799,6 +2816,14 @@
|
|||||||
"integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
|
"integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"dot-prop": {
|
||||||
|
"version": "3.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
|
||||||
|
"integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
|
||||||
|
"requires": {
|
||||||
|
"is-obj": "^1.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"dotenv": {
|
"dotenv": {
|
||||||
"version": "6.2.0",
|
"version": "6.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
|
||||||
@ -2823,6 +2848,14 @@
|
|||||||
"dotenv-defaults": "^1.0.2"
|
"dotenv-defaults": "^1.0.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"dotignore": {
|
||||||
|
"version": "0.1.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/dotignore/-/dotignore-0.1.2.tgz",
|
||||||
|
"integrity": "sha512-UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw==",
|
||||||
|
"requires": {
|
||||||
|
"minimatch": "^3.0.4"
|
||||||
|
}
|
||||||
|
},
|
||||||
"duplexer2": {
|
"duplexer2": {
|
||||||
"version": "0.0.2",
|
"version": "0.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
|
||||||
@ -2973,22 +3006,27 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"es-abstract": {
|
"es-abstract": {
|
||||||
"version": "1.13.0",
|
"version": "1.17.4",
|
||||||
"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
|
"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
|
||||||
"integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
|
"integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"es-to-primitive": "^1.2.0",
|
"es-to-primitive": "^1.2.1",
|
||||||
"function-bind": "^1.1.1",
|
"function-bind": "^1.1.1",
|
||||||
"has": "^1.0.3",
|
"has": "^1.0.3",
|
||||||
"is-callable": "^1.1.4",
|
"has-symbols": "^1.0.1",
|
||||||
"is-regex": "^1.0.4",
|
"is-callable": "^1.1.5",
|
||||||
"object-keys": "^1.0.12"
|
"is-regex": "^1.0.5",
|
||||||
|
"object-inspect": "^1.7.0",
|
||||||
|
"object-keys": "^1.1.1",
|
||||||
|
"object.assign": "^4.1.0",
|
||||||
|
"string.prototype.trimleft": "^2.1.1",
|
||||||
|
"string.prototype.trimright": "^2.1.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"es-to-primitive": {
|
"es-to-primitive": {
|
||||||
"version": "1.2.0",
|
"version": "1.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
|
||||||
"integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
|
"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"is-callable": "^1.1.4",
|
"is-callable": "^1.1.4",
|
||||||
"is-date-object": "^1.0.1",
|
"is-date-object": "^1.0.1",
|
||||||
@ -4447,9 +4485,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"has-symbols": {
|
"has-symbols": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
|
||||||
"integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
|
"integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
|
||||||
},
|
},
|
||||||
"has-unicode": {
|
"has-unicode": {
|
||||||
"version": "2.0.1",
|
"version": "2.0.1",
|
||||||
@ -4698,6 +4736,11 @@
|
|||||||
"kind-of": "^3.0.2"
|
"kind-of": "^3.0.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"is-arguments": {
|
||||||
|
"version": "1.0.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
|
||||||
|
"integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="
|
||||||
|
},
|
||||||
"is-arrayish": {
|
"is-arrayish": {
|
||||||
"version": "0.2.1",
|
"version": "0.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
|
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
|
||||||
@ -4727,9 +4770,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"is-callable": {
|
"is-callable": {
|
||||||
"version": "1.1.4",
|
"version": "1.1.5",
|
||||||
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
|
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
|
||||||
"integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
|
"integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
|
||||||
},
|
},
|
||||||
"is-data-descriptor": {
|
"is-data-descriptor": {
|
||||||
"version": "0.1.4",
|
"version": "0.1.4",
|
||||||
@ -4741,9 +4784,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"is-date-object": {
|
"is-date-object": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
|
||||||
"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
|
"integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
|
||||||
},
|
},
|
||||||
"is-descriptor": {
|
"is-descriptor": {
|
||||||
"version": "0.1.6",
|
"version": "0.1.6",
|
||||||
@ -4827,6 +4870,11 @@
|
|||||||
"kind-of": "^3.0.2"
|
"kind-of": "^3.0.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"is-obj": {
|
||||||
|
"version": "1.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
|
||||||
|
"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
|
||||||
|
},
|
||||||
"is-plain-object": {
|
"is-plain-object": {
|
||||||
"version": "2.0.4",
|
"version": "2.0.4",
|
||||||
"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
|
"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
|
||||||
@ -4855,11 +4903,11 @@
|
|||||||
"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
|
"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
|
||||||
},
|
},
|
||||||
"is-regex": {
|
"is-regex": {
|
||||||
"version": "1.0.4",
|
"version": "1.0.5",
|
||||||
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
|
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
|
||||||
"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
|
"integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"has": "^1.0.1"
|
"has": "^1.0.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"is-stream": {
|
"is-stream": {
|
||||||
@ -4869,11 +4917,11 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"is-symbol": {
|
"is-symbol": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.3",
|
||||||
"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
|
||||||
"integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
|
"integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"has-symbols": "^1.0.0"
|
"has-symbols": "^1.0.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"is-typedarray": {
|
"is-typedarray": {
|
||||||
@ -5821,9 +5869,14 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"object-inspect": {
|
"object-inspect": {
|
||||||
"version": "1.6.0",
|
"version": "1.7.0",
|
||||||
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
|
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
|
||||||
"integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="
|
"integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
|
||||||
|
},
|
||||||
|
"object-is": {
|
||||||
|
"version": "1.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz",
|
||||||
|
"integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ=="
|
||||||
},
|
},
|
||||||
"object-keys": {
|
"object-keys": {
|
||||||
"version": "1.1.1",
|
"version": "1.1.1",
|
||||||
@ -5847,6 +5900,17 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"object.assign": {
|
||||||
|
"version": "4.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
|
||||||
|
"integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
|
||||||
|
"requires": {
|
||||||
|
"define-properties": "^1.1.2",
|
||||||
|
"function-bind": "^1.1.1",
|
||||||
|
"has-symbols": "^1.0.0",
|
||||||
|
"object-keys": "^1.0.11"
|
||||||
|
}
|
||||||
|
},
|
||||||
"object.omit": {
|
"object.omit": {
|
||||||
"version": "2.0.1",
|
"version": "2.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
|
||||||
@ -6117,11 +6181,10 @@
|
|||||||
"integrity": "sha512-1wvc3iQOQpEBaQbXgLxA2JUiLSQ2azdF/bF29ghXDiQJWSpQ1BF8gSuqttM8WZoj081Ps8OKL0gYxdDBkFNPqA=="
|
"integrity": "sha512-1wvc3iQOQpEBaQbXgLxA2JUiLSQ2azdF/bF29ghXDiQJWSpQ1BF8gSuqttM8WZoj081Ps8OKL0gYxdDBkFNPqA=="
|
||||||
},
|
},
|
||||||
"phonegap-plugin-push": {
|
"phonegap-plugin-push": {
|
||||||
"version": "2.2.3",
|
"version": "2.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/phonegap-plugin-push/-/phonegap-plugin-push-2.2.3.tgz",
|
"resolved": "https://registry.npmjs.org/phonegap-plugin-push/-/phonegap-plugin-push-2.3.0.tgz",
|
||||||
"integrity": "sha512-5mjT0G1vfRhXVnZFLwjfzcFwYjVRMibgYDCfYvEujGsP8YwwrIIzcf+xBYAjQV/W2JCjzuNaYd7xJ0yVQaPeig==",
|
"integrity": "sha512-0R35BGVvvNzov3fckBspc7snwsIdClIBhI7jUCIa7AgSZy2Lrwm8kPuLTyzMVSNR3MJTxWX6s06aDlVL7EvQ3w==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"babel-plugin-add-header-comment": "^1.0.3",
|
|
||||||
"install": "^0.8.2"
|
"install": "^0.8.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -6419,6 +6482,15 @@
|
|||||||
"safe-regex": "^1.1.0"
|
"safe-regex": "^1.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"regexp.prototype.flags": {
|
||||||
|
"version": "1.3.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
|
||||||
|
"integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
|
||||||
|
"requires": {
|
||||||
|
"define-properties": "^1.1.3",
|
||||||
|
"es-abstract": "^1.17.0-next.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
"remove-trailing-separator": {
|
"remove-trailing-separator": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
|
||||||
@ -7143,13 +7215,31 @@
|
|||||||
"integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="
|
"integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="
|
||||||
},
|
},
|
||||||
"string.prototype.trim": {
|
"string.prototype.trim": {
|
||||||
"version": "1.1.2",
|
"version": "1.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz",
|
||||||
"integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=",
|
"integrity": "sha512-MjGFEeqixw47dAMFMtgUro/I0+wNqZB5GKXGt1fFr24u3TzDXCPu7J9Buppzoe3r/LqkSDLDDJzE15RGWDGAVw==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"define-properties": "^1.1.2",
|
"define-properties": "^1.1.3",
|
||||||
"es-abstract": "^1.5.0",
|
"es-abstract": "^1.17.0-next.1",
|
||||||
"function-bind": "^1.0.2"
|
"function-bind": "^1.1.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"string.prototype.trimleft": {
|
||||||
|
"version": "2.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
|
||||||
|
"integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
|
||||||
|
"requires": {
|
||||||
|
"define-properties": "^1.1.3",
|
||||||
|
"function-bind": "^1.1.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"string.prototype.trimright": {
|
||||||
|
"version": "2.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
|
||||||
|
"integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
|
||||||
|
"requires": {
|
||||||
|
"define-properties": "^1.1.3",
|
||||||
|
"function-bind": "^1.1.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"string_decoder": {
|
"string_decoder": {
|
||||||
@ -7218,29 +7308,31 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"tape": {
|
"tape": {
|
||||||
"version": "4.11.0",
|
"version": "4.13.0",
|
||||||
"resolved": "https://registry.npmjs.org/tape/-/tape-4.11.0.tgz",
|
"resolved": "https://registry.npmjs.org/tape/-/tape-4.13.0.tgz",
|
||||||
"integrity": "sha512-yixvDMX7q7JIs/omJSzSZrqulOV51EC9dK8dM0TzImTIkHWfe2/kFyL5v+d9C+SrCMaICk59ujsqFAVidDqDaA==",
|
"integrity": "sha512-J/hvA+GJnuWJ0Sj8Z0dmu3JgMNU+MmusvkCT7+SN4/2TklW18FNCp/UuHIEhPZwHfy4sXfKYgC7kypKg4umbOw==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"deep-equal": "~1.0.1",
|
"deep-equal": "~1.1.1",
|
||||||
"defined": "~1.0.0",
|
"defined": "~1.0.0",
|
||||||
|
"dotignore": "~0.1.2",
|
||||||
"for-each": "~0.3.3",
|
"for-each": "~0.3.3",
|
||||||
"function-bind": "~1.1.1",
|
"function-bind": "~1.1.1",
|
||||||
"glob": "~7.1.4",
|
"glob": "~7.1.6",
|
||||||
"has": "~1.0.3",
|
"has": "~1.0.3",
|
||||||
"inherits": "~2.0.4",
|
"inherits": "~2.0.4",
|
||||||
|
"is-regex": "~1.0.5",
|
||||||
"minimist": "~1.2.0",
|
"minimist": "~1.2.0",
|
||||||
"object-inspect": "~1.6.0",
|
"object-inspect": "~1.7.0",
|
||||||
"resolve": "~1.11.1",
|
"resolve": "~1.14.2",
|
||||||
"resumer": "~0.0.0",
|
"resumer": "~0.0.0",
|
||||||
"string.prototype.trim": "~1.1.2",
|
"string.prototype.trim": "~1.2.1",
|
||||||
"through": "~2.3.8"
|
"through": "~2.3.8"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"glob": {
|
"glob": {
|
||||||
"version": "7.1.4",
|
"version": "7.1.6",
|
||||||
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
|
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
|
||||||
"integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
|
"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"fs.realpath": "^1.0.0",
|
"fs.realpath": "^1.0.0",
|
||||||
"inflight": "^1.0.4",
|
"inflight": "^1.0.4",
|
||||||
@ -7256,9 +7348,9 @@
|
|||||||
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
|
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
|
||||||
},
|
},
|
||||||
"resolve": {
|
"resolve": {
|
||||||
"version": "1.11.1",
|
"version": "1.14.2",
|
||||||
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
|
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.2.tgz",
|
||||||
"integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
|
"integrity": "sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"path-parse": "^1.0.6"
|
"path-parse": "^1.0.6"
|
||||||
}
|
}
|
||||||
@ -7652,9 +7744,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"underscore": {
|
"underscore": {
|
||||||
"version": "1.9.1",
|
"version": "1.9.2",
|
||||||
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
|
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz",
|
||||||
"integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
|
"integrity": "sha512-D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ=="
|
||||||
},
|
},
|
||||||
"union-value": {
|
"union-value": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
@ -8564,9 +8656,9 @@
|
|||||||
"integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
|
"integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
|
||||||
},
|
},
|
||||||
"xmldom": {
|
"xmldom": {
|
||||||
"version": "0.1.27",
|
"version": "0.1.31",
|
||||||
"resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
|
"resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
|
||||||
"integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
|
"integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="
|
||||||
},
|
},
|
||||||
"xtend": {
|
"xtend": {
|
||||||
"version": "4.0.1",
|
"version": "4.0.1",
|
||||||
|
|||||||
@ -46,7 +46,7 @@
|
|||||||
"@types/chart.js": "^2.7.40",
|
"@types/chart.js": "^2.7.40",
|
||||||
"amazon-cognito-identity-js": "^3.0.3",
|
"amazon-cognito-identity-js": "^3.0.3",
|
||||||
"chart.js": "^2.7.3",
|
"chart.js": "^2.7.3",
|
||||||
"cordova-android": "^8.0.0",
|
"cordova-android": "8.1.0",
|
||||||
"cordova-browser": "5.0.4",
|
"cordova-browser": "5.0.4",
|
||||||
"cordova-plugin-android-permissions": "1.0.0",
|
"cordova-plugin-android-permissions": "1.0.0",
|
||||||
"cordova-plugin-app-version": "0.1.9",
|
"cordova-plugin-app-version": "0.1.9",
|
||||||
@ -74,7 +74,7 @@
|
|||||||
"moment": "^2.24.0",
|
"moment": "^2.24.0",
|
||||||
"ngx-mat-select-search": "^1.6.0",
|
"ngx-mat-select-search": "^1.6.0",
|
||||||
"phonegap-plugin-multidex": "1.0.0",
|
"phonegap-plugin-multidex": "1.0.0",
|
||||||
"phonegap-plugin-push": "2.2.3",
|
"phonegap-plugin-push": "2.3.0",
|
||||||
"rxjs": "^6.3.1",
|
"rxjs": "^6.3.1",
|
||||||
"rxjs-compat": "^6.3.1",
|
"rxjs-compat": "^6.3.1",
|
||||||
"sw-toolbox": "3.6.0",
|
"sw-toolbox": "3.6.0",
|
||||||
@ -114,7 +114,7 @@
|
|||||||
"phonegap-plugin-push": {
|
"phonegap-plugin-push": {
|
||||||
"SENDER_ID": "906855209078",
|
"SENDER_ID": "906855209078",
|
||||||
"ANDROID_SUPPORT_V13_VERSION": "27.+",
|
"ANDROID_SUPPORT_V13_VERSION": "27.+",
|
||||||
"FCM_VERSION": "11.6.2"
|
"FCM_VERSION": "17.0.+"
|
||||||
},
|
},
|
||||||
"cordova-plugin-app-version": {},
|
"cordova-plugin-app-version": {},
|
||||||
"cordova-sqlite-storage": {},
|
"cordova-sqlite-storage": {},
|
||||||
|
|||||||
6
plugins/android.json
Executable file → Normal file
6
plugins/android.json
Executable file → Normal file
@ -32,6 +32,9 @@
|
|||||||
"ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+",
|
"ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+",
|
||||||
"PACKAGE_NAME": "com.sineedge.pdgenie"
|
"PACKAGE_NAME": "com.sineedge.pdgenie"
|
||||||
},
|
},
|
||||||
|
"cordova-plugin-market": {
|
||||||
|
"PACKAGE_NAME": "com.sineedge.pdgenie"
|
||||||
|
},
|
||||||
"cordova-plugin-mauron85-background-geolocation": {
|
"cordova-plugin-mauron85-background-geolocation": {
|
||||||
"GOOGLE_PLAY_SERVICES_VERSION": "11+",
|
"GOOGLE_PLAY_SERVICES_VERSION": "11+",
|
||||||
"ANDROID_SUPPORT_LIBRARY_VERSION": "26+",
|
"ANDROID_SUPPORT_LIBRARY_VERSION": "26+",
|
||||||
@ -66,9 +69,6 @@
|
|||||||
"uk.co.workingedge.phonegap.plugin.launchnavigator": {
|
"uk.co.workingedge.phonegap.plugin.launchnavigator": {
|
||||||
"OKHTTP_VERSION": "3.+",
|
"OKHTTP_VERSION": "3.+",
|
||||||
"PACKAGE_NAME": "com.sineedge.pdgenie"
|
"PACKAGE_NAME": "com.sineedge.pdgenie"
|
||||||
},
|
|
||||||
"cordova-plugin-market": {
|
|
||||||
"PACKAGE_NAME": "com.sineedge.pdgenie"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dependent_plugins": {
|
"dependent_plugins": {
|
||||||
|
|||||||
@ -21,6 +21,7 @@ import { PdtriggerProvider } from '../providers/pdtrigger/pdtrigger';
|
|||||||
import {AppVersion} from '@ionic-native/app-version'
|
import {AppVersion} from '@ionic-native/app-version'
|
||||||
import { ConstantsProvider } from '../providers/constants/constants';
|
import { ConstantsProvider } from '../providers/constants/constants';
|
||||||
import { Market } from '@ionic-native/market';
|
import { Market } from '@ionic-native/market';
|
||||||
|
import { GoogleMapPage } from '../pages/google-map/google-map';
|
||||||
|
|
||||||
// declare let notificationAccess:boolean
|
// declare let notificationAccess:boolean
|
||||||
|
|
||||||
@ -64,6 +65,7 @@ export class MyApp {
|
|||||||
this.pages = [
|
this.pages = [
|
||||||
// { title: 'Home', component: HomePage, icon: 'home' },
|
// { title: 'Home', component: HomePage, icon: 'home' },
|
||||||
{ title: 'Home', icon: 'home',method:()=>this.menulist(1) },
|
{ title: 'Home', icon: 'home',method:()=>this.menulist(1) },
|
||||||
|
{ title: 'My Location', icon: 'locate',method:()=>this.menulist(4) },
|
||||||
{ title: 'Logout', icon: 'md-exit',method:()=>this.menulist(2)},
|
{ title: 'Logout', icon: 'md-exit',method:()=>this.menulist(2)},
|
||||||
{ title: 'Complete List', icon: 'checkmark-circle',method:()=>this.menulist(3)}
|
{ title: 'Complete List', icon: 'checkmark-circle',method:()=>this.menulist(3)}
|
||||||
|
|
||||||
@ -91,7 +93,8 @@ this.notificationAccess=false
|
|||||||
this.statusBar.styleDefault();
|
this.statusBar.styleDefault();
|
||||||
if (this.platform.is('android')) {
|
if (this.platform.is('android')) {
|
||||||
this.statusBar.overlaysWebView(false);
|
this.statusBar.overlaysWebView(false);
|
||||||
this.statusBar.backgroundColorByHexString('#db4437');
|
// this.statusBar.backgroundColorByHexString('#db4437');
|
||||||
|
this.statusBar.backgroundColorByHexString('#E00201');
|
||||||
|
|
||||||
}
|
}
|
||||||
this.appVersion.getVersionNumber().then(versionNumber=>{
|
this.appVersion.getVersionNumber().then(versionNumber=>{
|
||||||
@ -243,6 +246,7 @@ let alert=this.alertCtrl.create({
|
|||||||
this.nav.setRoot(CompleteListPage);
|
this.nav.setRoot(CompleteListPage);
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
|
this.nav.push(GoogleMapPage);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -145,6 +145,7 @@ import {Market} from '@ionic-native/market'
|
|||||||
import { PdGeneralImagesModule } from '../pages/pd-general-images/Pd-general-images.module';
|
import { PdGeneralImagesModule } from '../pages/pd-general-images/Pd-general-images.module';
|
||||||
import { ReqTokenInterceptor } from '../providers/_guard/req-token.interceptor';
|
import { ReqTokenInterceptor } from '../providers/_guard/req-token.interceptor';
|
||||||
import { ImageNameModelPage } from '../pages/Modal/image-name-model/image-name-model';
|
import { ImageNameModelPage } from '../pages/Modal/image-name-model/image-name-model';
|
||||||
|
import { GoogleMapPageModule } from '../pages/google-map/google-map.module';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [
|
declarations: [
|
||||||
@ -248,7 +249,8 @@ import { ImageNameModelPage } from '../pages/Modal/image-name-model/image-name-m
|
|||||||
ContentLoaderModule,
|
ContentLoaderModule,
|
||||||
IonicStorageModule.forRoot(),
|
IonicStorageModule.forRoot(),
|
||||||
CacheModule.forRoot(),
|
CacheModule.forRoot(),
|
||||||
PdGeneralImagesModule
|
PdGeneralImagesModule,
|
||||||
|
GoogleMapPageModule
|
||||||
|
|
||||||
],
|
],
|
||||||
bootstrap: [IonicApp],
|
bootstrap: [IonicApp],
|
||||||
|
|||||||
@ -14,7 +14,8 @@
|
|||||||
<!-- add to homescreen for ios -->
|
<!-- add to homescreen for ios -->
|
||||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||||
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
||||||
|
<!-- FOR GOOGLE MAPS -->
|
||||||
|
<script src="https://maps.google.com/maps/api/js?key=AIzaSyA3lYDYxwtn5vLSl45SOKbtK7G6cEyXGr0"></script>
|
||||||
<!-- cordova.js required for cordova apps (remove if not needed) -->
|
<!-- cordova.js required for cordova apps (remove if not needed) -->
|
||||||
<script src="cordova.js"></script>
|
<script src="cordova.js"></script>
|
||||||
|
|
||||||
|
|||||||
25
src/pages/google-map/google-map.html
Normal file
25
src/pages/google-map/google-map.html
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
<!--
|
||||||
|
Generated template for the GoogleMapPage page.
|
||||||
|
|
||||||
|
See http://ionicframework.com/docs/components/#navigation for more info on
|
||||||
|
Ionic pages and navigation.
|
||||||
|
-->
|
||||||
|
<ion-header>
|
||||||
|
|
||||||
|
<ion-navbar color="optblue">
|
||||||
|
<!-- <button ion-button menuToggle>
|
||||||
|
<ion-icon name="menu"></ion-icon>
|
||||||
|
</button> -->
|
||||||
|
<ion-title style="text-align: center">{{current_coordinates}}</ion-title>
|
||||||
|
</ion-navbar>
|
||||||
|
|
||||||
|
</ion-header>
|
||||||
|
|
||||||
|
|
||||||
|
<ion-content padding>
|
||||||
|
<div id="refresh_coords" *ngIf="is_loaded">
|
||||||
|
<button ion-button (click)="addMarker()" clear
|
||||||
|
><ion-icon name="locate"></ion-icon></button>
|
||||||
|
</div>
|
||||||
|
<div #map id="map"></div>
|
||||||
|
</ion-content>
|
||||||
13
src/pages/google-map/google-map.module.ts
Normal file
13
src/pages/google-map/google-map.module.ts
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { IonicPageModule } from 'ionic-angular';
|
||||||
|
import { GoogleMapPage } from './google-map';
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
declarations: [
|
||||||
|
GoogleMapPage,
|
||||||
|
],
|
||||||
|
imports: [
|
||||||
|
IonicPageModule.forChild(GoogleMapPage),
|
||||||
|
],
|
||||||
|
})
|
||||||
|
export class GoogleMapPageModule {}
|
||||||
18
src/pages/google-map/google-map.scss
Normal file
18
src/pages/google-map/google-map.scss
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
page-google-map {
|
||||||
|
.scroll-content {
|
||||||
|
// height: 100%;
|
||||||
|
padding:3px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
#map {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
#refresh_coords{
|
||||||
|
position: absolute;
|
||||||
|
top: 10px;
|
||||||
|
right: 60px;
|
||||||
|
z-index: 5;
|
||||||
|
background-color: #fff;
|
||||||
|
}
|
||||||
|
}
|
||||||
153
src/pages/google-map/google-map.ts
Normal file
153
src/pages/google-map/google-map.ts
Normal file
@ -0,0 +1,153 @@
|
|||||||
|
import { Component, ViewChild, ElementRef } from '@angular/core';
|
||||||
|
import { IonicPage, NavController, NavParams } from 'ionic-angular';
|
||||||
|
// import { Geolocation } from '@ionic-native/geolocation';
|
||||||
|
import { Geolocation } from '@ionic-native/geolocation';
|
||||||
|
import { ConstantsProvider } from '../../providers/constants/constants';
|
||||||
|
import { Platform } from 'ionic-angular/platform/platform';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generated class for the GoogleMapPage page.
|
||||||
|
*
|
||||||
|
* See https://ionicframework.com/docs/components/#navigation for more info on
|
||||||
|
* Ionic pages and navigation.
|
||||||
|
*/
|
||||||
|
declare var google;
|
||||||
|
|
||||||
|
@IonicPage()
|
||||||
|
@Component({
|
||||||
|
selector: 'page-google-map',
|
||||||
|
templateUrl: 'google-map.html',
|
||||||
|
})
|
||||||
|
export class GoogleMapPage {
|
||||||
|
@ViewChild('map') mapElement: ElementRef;
|
||||||
|
map: any;
|
||||||
|
marker
|
||||||
|
is_loaded:boolean=false
|
||||||
|
current_coordinates:string="Loading..."
|
||||||
|
constructor(public navCtrl: NavController, public navParams: NavParams,private geolocation:Geolocation,private constantProvider:ConstantsProvider,private platform:Platform) {
|
||||||
|
this.constantProvider.enableAccuracy()
|
||||||
|
}
|
||||||
|
|
||||||
|
ionViewDidLoad() {
|
||||||
|
console.log('ionViewDidLoad GoogleMapPage');
|
||||||
|
console.log(this.platform.is('core'))
|
||||||
|
if(!this.platform.is('cordova')){
|
||||||
|
this.dummyloadMap()
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
this.loadMap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
loadMap(){
|
||||||
|
this.is_loaded=false
|
||||||
|
this.geolocation.getCurrentPosition().then((position) => {
|
||||||
|
console.log(position)
|
||||||
|
this.current_coordinates=String(position.coords.latitude)+','+String(position.coords.longitude)
|
||||||
|
let latLng = new google.maps.LatLng(position.coords.latitude, position.coords.longitude);
|
||||||
|
// let latLng = new google.maps.LatLng(12.9788093,80.1871215);
|
||||||
|
// this.current_coordinates="12.9788093,80.1871215"
|
||||||
|
let mapOptions = {
|
||||||
|
center: latLng,
|
||||||
|
zoom: 15,
|
||||||
|
mapTypeId: google.maps.MapTypeId.ROADMAP
|
||||||
|
}
|
||||||
|
|
||||||
|
this.map = new google.maps.Map(this.mapElement.nativeElement, mapOptions);
|
||||||
|
this.is_loaded=true
|
||||||
|
this.addInitialMarker(position.coords.latitude,position.coords.longitude)
|
||||||
|
|
||||||
|
}, (err) => {
|
||||||
|
console.log(err);
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
addInitialMarker(lat,lang){
|
||||||
|
this.marker = new google.maps.Marker({
|
||||||
|
map: this.map,
|
||||||
|
animation: google.maps.Animation.DROP,
|
||||||
|
position:{lat:lat,lng:lang}
|
||||||
|
});
|
||||||
|
let content = lat+','+lang;
|
||||||
|
this.addInfoWindow(this.marker, content);
|
||||||
|
}
|
||||||
|
addMarker(){
|
||||||
|
this.constantProvider.getGeoTag().then((geoCords:any)=>{
|
||||||
|
if(geoCords == undefined){
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// alert(geoCords)
|
||||||
|
let geoCords_string:string=String(geoCords)
|
||||||
|
// alert(geoCords_string)
|
||||||
|
if(this.marker != undefined){
|
||||||
|
this.marker.setMap(null)
|
||||||
|
}
|
||||||
|
let position=geoCords_string.split(',')
|
||||||
|
console.log(position);
|
||||||
|
let curr_lat=Number(position[0])
|
||||||
|
let curr_lng=Number(position[1])
|
||||||
|
console.log(curr_lat,curr_lng);
|
||||||
|
this.marker = new google.maps.Marker({
|
||||||
|
map: this.map,
|
||||||
|
animation: google.maps.Animation.DROP,
|
||||||
|
position:{lat:curr_lat,lng:curr_lng}
|
||||||
|
});
|
||||||
|
let latLng = new google.maps.LatLng(curr_lat,curr_lng);
|
||||||
|
this.map.setCenter(latLng)
|
||||||
|
this.current_coordinates=geoCords_string
|
||||||
|
let content = geoCords_string;
|
||||||
|
this.addInfoWindow(this.marker, content);
|
||||||
|
})
|
||||||
|
}
|
||||||
|
dummyloadMap(){
|
||||||
|
console.log(this.platform)
|
||||||
|
// this.geolocation.getCurrentPosition().then((position) => {
|
||||||
|
// console.log(position)
|
||||||
|
// this.current_coordinates=String(position.coords.latitude)+','+String(position.coords.longitude)
|
||||||
|
// let latLng = new google.maps.LatLng(position.coords.latitude, position.coords.longitude);
|
||||||
|
let latLng = new google.maps.LatLng(12.9912884,80.1667786);
|
||||||
|
this.current_coordinates="12.9912884,80.1667786"
|
||||||
|
let mapOptions = {
|
||||||
|
center: latLng,
|
||||||
|
zoom: 15,
|
||||||
|
mapTypeId: google.maps.MapTypeId.ROADMAP
|
||||||
|
}
|
||||||
|
|
||||||
|
this.map = new google.maps.Map(this.mapElement.nativeElement, mapOptions);
|
||||||
|
this.dummyMarker()
|
||||||
|
// }, (err) => {
|
||||||
|
// console.log(err);
|
||||||
|
|
||||||
|
// });
|
||||||
|
|
||||||
|
}
|
||||||
|
dummyMarker(){
|
||||||
|
console.log(this.marker)
|
||||||
|
if(this.marker != undefined){
|
||||||
|
this.marker.setMap(null)
|
||||||
|
}
|
||||||
|
this.marker = new google.maps.Marker({
|
||||||
|
map: this.map,
|
||||||
|
animation: google.maps.Animation.DROP,
|
||||||
|
position:{lat:12.9912884,lng:80.1667786}
|
||||||
|
});
|
||||||
|
let latLng = new google.maps.LatLng(12.9912884,80.1667786);
|
||||||
|
this.map.setCenter(latLng)
|
||||||
|
this.current_coordinates="12.9912884,80.1667786"
|
||||||
|
let content = this.current_coordinates;
|
||||||
|
this.addInfoWindow(this.marker, content);
|
||||||
|
}
|
||||||
|
|
||||||
|
addInfoWindow(marker, content){
|
||||||
|
|
||||||
|
let infoWindow = new google.maps.InfoWindow({
|
||||||
|
content: content
|
||||||
|
});
|
||||||
|
|
||||||
|
google.maps.event.addListener(marker, 'click', () => {
|
||||||
|
infoWindow.open(this.map, marker);
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -99,6 +99,7 @@ export class PdQuestionAddressPage {
|
|||||||
@ViewChild('childComp') child: PdGeneralImagesPage
|
@ViewChild('childComp') child: PdGeneralImagesPage
|
||||||
customer_segment_abbr: any;
|
customer_segment_abbr: any;
|
||||||
split_customer_abbr: any;
|
split_customer_abbr: any;
|
||||||
|
prod_catagory: any;
|
||||||
|
|
||||||
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
|
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
|
||||||
public qustCat:QuestionCategoryProvider,public aws:AwsServiceProvider,
|
public qustCat:QuestionCategoryProvider,public aws:AwsServiceProvider,
|
||||||
@ -112,6 +113,7 @@ export class PdQuestionAddressPage {
|
|||||||
this.FormId = this.navParams.get('FormId');
|
this.FormId = this.navParams.get('FormId');
|
||||||
this.lender_short_name=this.pdDetails.lender_short_name
|
this.lender_short_name=this.pdDetails.lender_short_name
|
||||||
this.product_abbr=this.pdDetails.product_abbr
|
this.product_abbr=this.pdDetails.product_abbr
|
||||||
|
this.prod_catagory=this.pdDetails.prod_catagory
|
||||||
this.customer_segment_abbr=this.pdDetails.customer_segment_abbr
|
this.customer_segment_abbr=this.pdDetails.customer_segment_abbr
|
||||||
|
|
||||||
this.split_customer_abbr = this.customer_segment_abbr.split('-')
|
this.split_customer_abbr = this.customer_segment_abbr.split('-')
|
||||||
@ -160,7 +162,8 @@ export class PdQuestionAddressPage {
|
|||||||
address_form_remark: ['']
|
address_form_remark: ['']
|
||||||
|
|
||||||
});
|
});
|
||||||
if(this.lender_short_name == 'CLIX' || this.product_abbr == 'BL'){
|
console.log("prod category",this.prod_catagory);
|
||||||
|
if(this.lender_short_name == 'CLIX' || this.prod_catagory == 'BL'){
|
||||||
this.pdQuestionAddress.removeControl('estimated_area')
|
this.pdQuestionAddress.removeControl('estimated_area')
|
||||||
this.pdQuestionAddress.removeControl('uom')
|
this.pdQuestionAddress.removeControl('uom')
|
||||||
this.pdQuestionAddress.removeControl('uom_others')
|
this.pdQuestionAddress.removeControl('uom_others')
|
||||||
@ -692,7 +695,7 @@ else{
|
|||||||
records.addresses[0].locality_mixuse = this.pdQuestionAddress.controls.locality_mixuse.value;
|
records.addresses[0].locality_mixuse = this.pdQuestionAddress.controls.locality_mixuse.value;
|
||||||
records.addresses[0].pd_location = this.pdQuestionAddress.controls.pd_location.value;
|
records.addresses[0].pd_location = this.pdQuestionAddress.controls.pd_location.value;
|
||||||
records.addresses[0].comment_locality = this.pdQuestionAddress.controls.comment_locality.value;
|
records.addresses[0].comment_locality = this.pdQuestionAddress.controls.comment_locality.value;
|
||||||
if(this.lender_short_name != 'CLIX' && this.product_abbr != 'BL')
|
if(this.lender_short_name != 'CLIX' && this.prod_catagory != 'BL')
|
||||||
{
|
{
|
||||||
records.addresses[0].estimated_area = this.pdQuestionAddress.controls.estimated_area.value;
|
records.addresses[0].estimated_area = this.pdQuestionAddress.controls.estimated_area.value;
|
||||||
records.addresses[0].uom = this.pdQuestionAddress.controls.uom.value;
|
records.addresses[0].uom = this.pdQuestionAddress.controls.uom.value;
|
||||||
@ -722,7 +725,7 @@ else{
|
|||||||
records.alternative_addresses[0].locality_mixuse = this.pdQuestionAddress.controls.locality_mixuse.value;
|
records.alternative_addresses[0].locality_mixuse = this.pdQuestionAddress.controls.locality_mixuse.value;
|
||||||
records.alternative_addresses[0].pd_location = this.pdQuestionAddress.controls.pd_location.value;
|
records.alternative_addresses[0].pd_location = this.pdQuestionAddress.controls.pd_location.value;
|
||||||
records.alternative_addresses[0].comment_locality = this.pdQuestionAddress.controls.comment_locality.value;
|
records.alternative_addresses[0].comment_locality = this.pdQuestionAddress.controls.comment_locality.value;
|
||||||
if(this.lender_short_name != 'CLIX' && this.product_abbr != 'BL')
|
if(this.lender_short_name != 'CLIX' && this.prod_catagory != 'BL')
|
||||||
{
|
{
|
||||||
records.alternative_addresses[0].estimated_area = this.pdQuestionAddress.controls.estimated_area.value;
|
records.alternative_addresses[0].estimated_area = this.pdQuestionAddress.controls.estimated_area.value;
|
||||||
records.alternative_addresses[0].uom = this.pdQuestionAddress.controls.uom.value;
|
records.alternative_addresses[0].uom = this.pdQuestionAddress.controls.uom.value;
|
||||||
@ -933,7 +936,7 @@ else{
|
|||||||
if (datas.locality == 1) {
|
if (datas.locality == 1) {
|
||||||
this.pdQuestionAddress.controls.locality_others.setValue(datas.locality_others);
|
this.pdQuestionAddress.controls.locality_others.setValue(datas.locality_others);
|
||||||
}
|
}
|
||||||
if(this.lender_short_name != 'CLIX' && this.product_abbr != 'BL')
|
if(this.lender_short_name != 'CLIX' && this.prod_catagory != 'BL')
|
||||||
{
|
{
|
||||||
this.setOthers(datas.uom, '', 5);
|
this.setOthers(datas.uom, '', 5);
|
||||||
if (data['records'].uom == 1)
|
if (data['records'].uom == 1)
|
||||||
@ -999,7 +1002,7 @@ else{
|
|||||||
if (datas.locality == 1) {
|
if (datas.locality == 1) {
|
||||||
this.pdQuestionAddress.controls.locality_others.setValue(datas.locality_others);
|
this.pdQuestionAddress.controls.locality_others.setValue(datas.locality_others);
|
||||||
}
|
}
|
||||||
if(this.lender_short_name != 'CLIX' && this.product_abbr != 'BL'){
|
if(this.lender_short_name != 'CLIX' && this.prod_catagory != 'BL'){
|
||||||
this.pdQuestionAddress.controls.estimated_area.setValue(datas.estimated_area);
|
this.pdQuestionAddress.controls.estimated_area.setValue(datas.estimated_area);
|
||||||
this.pdQuestionAddress.controls.uom.setValue(datas.uom);
|
this.pdQuestionAddress.controls.uom.setValue(datas.uom);
|
||||||
this.setOthers(datas.uom, '', 5);
|
this.setOthers(datas.uom, '', 5);
|
||||||
@ -1218,7 +1221,7 @@ else{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(this.lender_short_name != 'CLIX' && this.product_abbr != 'BL'){
|
if(this.lender_short_name != 'CLIX' && this.prod_catagory != 'BL'){
|
||||||
this.pdQuestionAddress.controls.estimated_area.setValue(datas.estimated_area ? datas.estimated_area : '');
|
this.pdQuestionAddress.controls.estimated_area.setValue(datas.estimated_area ? datas.estimated_area : '');
|
||||||
this.pdQuestionAddress.controls.uom.setValue(datas.uom);
|
this.pdQuestionAddress.controls.uom.setValue(datas.uom);
|
||||||
if (datas.uom) {
|
if (datas.uom) {
|
||||||
|
|||||||
@ -149,7 +149,7 @@
|
|||||||
autocomplete="off">
|
autocomplete="off">
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
|
|
||||||
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || product_abbr == 'LFMP'">
|
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || prod_catagory == 'LFMP'">
|
||||||
<mat-form-field style="width:100%">
|
<mat-form-field style="width:100%">
|
||||||
<input matInput placeholder="Area Covered" formControlName="area_covered_by_this_property"
|
<input matInput placeholder="Area Covered" formControlName="area_covered_by_this_property"
|
||||||
autocomplete="off" type="number">
|
autocomplete="off" type="number">
|
||||||
@ -348,7 +348,7 @@
|
|||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>-->
|
</div>-->
|
||||||
|
|
||||||
<div *ngIf="(lender_short_name != 'CLIX') && (lender_short_name == 'MWISE' ? product_abbr != 'BL' ? true : false : true) && (sup.get('assets_mode').value == 1 || sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 3)">
|
<div *ngIf="(lender_short_name != 'CLIX') && (lender_short_name == 'MWISE' ? prod_catagory != 'BL' ? true : false : true) && (sup.get('assets_mode').value == 1 || sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 3)">
|
||||||
<mat-form-field style="width:100%">
|
<mat-form-field style="width:100%">
|
||||||
|
|
||||||
<!-- <mat-label>Vintage</mat-label> -->
|
<!-- <mat-label>Vintage</mat-label> -->
|
||||||
@ -380,7 +380,7 @@
|
|||||||
</mat-form-field>-->
|
</mat-form-field>-->
|
||||||
|
|
||||||
|
|
||||||
<mat-list *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || product_abbr == 'LFMP'">
|
<mat-list *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || prod_catagory == 'LFMP'">
|
||||||
<p>Is there a Loan Existing Against this Assets?</p>
|
<p>Is there a Loan Existing Against this Assets?</p>
|
||||||
<mat-radio-group formControlName="emi">
|
<mat-radio-group formControlName="emi">
|
||||||
|
|
||||||
|
|||||||
@ -70,6 +70,7 @@ export class PdQuestionAssestsPage {
|
|||||||
product_abbr: any;
|
product_abbr: any;
|
||||||
pd_value_params:any;
|
pd_value_params:any;
|
||||||
@ViewChild('childComp') child: PdGeneralImagesPage
|
@ViewChild('childComp') child: PdGeneralImagesPage
|
||||||
|
prod_catagory: any;
|
||||||
// data:Observable <any>;
|
// data:Observable <any>;
|
||||||
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
|
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
|
||||||
public aws:AwsServiceProvider,public qustCat:QuestionCategoryProvider,public toast:ToastProvider,
|
public aws:AwsServiceProvider,public qustCat:QuestionCategoryProvider,public toast:ToastProvider,
|
||||||
@ -82,6 +83,7 @@ export class PdQuestionAssestsPage {
|
|||||||
this.pdDetails = this.navParams.get('pdDetails');
|
this.pdDetails = this.navParams.get('pdDetails');
|
||||||
this.lender_short_name=this.pdDetails.lender_short_name
|
this.lender_short_name=this.pdDetails.lender_short_name
|
||||||
this.product_abbr=this.pdDetails.product_abbr
|
this.product_abbr=this.pdDetails.product_abbr
|
||||||
|
this.prod_catagory=this.pdDetails.prod_catagory
|
||||||
this.pdid=this.pdDetails.pd_id;
|
this.pdid=this.pdDetails.pd_id;
|
||||||
this.users = localStorage.getItem('pd_user_details')
|
this.users = localStorage.getItem('pd_user_details')
|
||||||
this.users=JSON.parse(this.users).userid
|
this.users=JSON.parse(this.users).userid
|
||||||
|
|||||||
@ -215,7 +215,7 @@
|
|||||||
|
|
||||||
|
|
||||||
<!-- <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'"> -->
|
<!-- <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'"> -->
|
||||||
<div *ngIf="(lender_short_name != 'CLIX') && (lender_short_name == 'MWISE' ? product_abbr != 'BL' ? true : false : true)">
|
<div *ngIf="(lender_short_name != 'CLIX') && (lender_short_name == 'MWISE' ? prod_catagory != 'BL' ? true : false : true)">
|
||||||
<mat-form-field>
|
<mat-form-field>
|
||||||
<mat-label>Age of Asset in Years</mat-label>
|
<mat-label>Age of Asset in Years</mat-label>
|
||||||
<input matInput autocomplete="off" placeholder="eg.99" formControlName="business_vintage"
|
<input matInput autocomplete="off" placeholder="eg.99" formControlName="business_vintage"
|
||||||
@ -240,7 +240,7 @@
|
|||||||
<!-- </div> -->
|
<!-- </div> -->
|
||||||
|
|
||||||
<span>
|
<span>
|
||||||
<div *ngIf="(lender_short_name !== 'CLIX' && lender_short_name !== 'MWISE' || product_abbr === 'LFMP') && (itemrow.get('business_ownership_type').value == 'owned')">
|
<div *ngIf="(lender_short_name !== 'CLIX' && lender_short_name !== 'MWISE' || prod_catagory === 'LFMP') && (itemrow.get('business_ownership_type').value == 'owned')">
|
||||||
<p>Is There a Loan Existing Against This Asset?</p>
|
<p>Is There a Loan Existing Against This Asset?</p>
|
||||||
<mat-radio-group formControlName="business_emi">
|
<mat-radio-group formControlName="business_emi">
|
||||||
<mat-radio-button value="yes">Yes</mat-radio-button>
|
<mat-radio-button value="yes">Yes</mat-radio-button>
|
||||||
@ -426,7 +426,7 @@
|
|||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
|
|
||||||
<!-- <div *ngIf="sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3">-->
|
<!-- <div *ngIf="sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3">-->
|
||||||
<div *ngIf="(lender_short_name != 'CLIX') && (lender_short_name == 'MWISE' ? product_abbr != 'BL' ? true : false : true)">
|
<div *ngIf="(lender_short_name != 'CLIX') && (lender_short_name == 'MWISE' ? prod_catagory != 'BL' ? true : false : true)">
|
||||||
<mat-form-field>
|
<mat-form-field>
|
||||||
<mat-label>Age of Asset in Years</mat-label>
|
<mat-label>Age of Asset in Years</mat-label>
|
||||||
|
|
||||||
@ -449,7 +449,7 @@
|
|||||||
|
|
||||||
<!--<div *ngIf="sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3 || sup.get('business_assets_mode').value == 4">-->
|
<!--<div *ngIf="sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3 || sup.get('business_assets_mode').value == 4">-->
|
||||||
<div
|
<div
|
||||||
*ngIf="(lender_short_name !== 'CLIX' && lender_short_name !== 'MWISE' || product_abbr === 'LFMP') && (sup.get('business_assets_mode').value != '') && sup.get('business_ownership_type').value == 'owned'">
|
*ngIf="(lender_short_name !== 'CLIX' && lender_short_name !== 'MWISE' || prod_catagory === 'LFMP') && (sup.get('business_assets_mode').value != '') && sup.get('business_ownership_type').value == 'owned'">
|
||||||
|
|
||||||
<p>Is There a Loan Existing Against This Asset?</p>
|
<p>Is There a Loan Existing Against This Asset?</p>
|
||||||
<mat-radio-group formControlName="business_emi">
|
<mat-radio-group formControlName="business_emi">
|
||||||
|
|||||||
@ -77,6 +77,7 @@ export class PdQuestionBusinessAssetsPage {
|
|||||||
pd_value_params:any;
|
pd_value_params:any;
|
||||||
CurrentAddressLabel=null;
|
CurrentAddressLabel=null;
|
||||||
@ViewChild('childComp') child: PdGeneralImagesPage
|
@ViewChild('childComp') child: PdGeneralImagesPage
|
||||||
|
prod_catagory: any;
|
||||||
|
|
||||||
|
|
||||||
constructor(public navCtrl: NavController, public navParams: NavParams,
|
constructor(public navCtrl: NavController, public navParams: NavParams,
|
||||||
@ -88,6 +89,7 @@ export class PdQuestionBusinessAssetsPage {
|
|||||||
this.pdDetails=this.navParams.get('pdDetails');
|
this.pdDetails=this.navParams.get('pdDetails');
|
||||||
this.lender_short_name=this.pdDetails.lender_short_name
|
this.lender_short_name=this.pdDetails.lender_short_name
|
||||||
this.product_abbr=this.pdDetails.product_abbr
|
this.product_abbr=this.pdDetails.product_abbr
|
||||||
|
this.prod_catagory=this.pdDetails.prod_catagory
|
||||||
this.formDetails=this.navParams.get('formDetails');
|
this.formDetails=this.navParams.get('formDetails');
|
||||||
this.users = localStorage.getItem('pd_user_details')
|
this.users = localStorage.getItem('pd_user_details')
|
||||||
this.users=JSON.parse(this.users).userid
|
this.users=JSON.parse(this.users).userid
|
||||||
|
|||||||
@ -96,6 +96,7 @@ export class PdQuestionBusinessInfoPage {
|
|||||||
|
|
||||||
pd_value_params:any;
|
pd_value_params:any;
|
||||||
@ViewChild('childComp') child: PdGeneralImagesPage
|
@ViewChild('childComp') child: PdGeneralImagesPage
|
||||||
|
prod_catagory: any;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -103,7 +104,6 @@ export class PdQuestionBusinessInfoPage {
|
|||||||
public aws: AwsServiceProvider, public toast: ToastProvider,
|
public aws: AwsServiceProvider, public toast: ToastProvider,
|
||||||
public qustCat: QuestionCategoryProvider, public fb: FormBuilder, public cons: ConstantsProvider,
|
public qustCat: QuestionCategoryProvider, public fb: FormBuilder, public cons: ConstantsProvider,
|
||||||
private loading: LoadingProvider, private cameraProvider: CameraProvider,private modalCtrl:ModalController) {
|
private loading: LoadingProvider, private cameraProvider: CameraProvider,private modalCtrl:ModalController) {
|
||||||
this.getdropdown();
|
|
||||||
this.getStateCityDet();
|
this.getStateCityDet();
|
||||||
// console.log(typeof this.filteredCity)
|
// console.log(typeof this.filteredCity)
|
||||||
this.pdDetails = this.navParams.get('pdDetails');
|
this.pdDetails = this.navParams.get('pdDetails');
|
||||||
@ -117,12 +117,14 @@ export class PdQuestionBusinessInfoPage {
|
|||||||
|
|
||||||
this.applicants = this.pdDetails.applicat_details;
|
this.applicants = this.pdDetails.applicat_details;
|
||||||
console.log("pd", this.pdDetails);
|
console.log("pd", this.pdDetails);
|
||||||
|
this.getdropdown();
|
||||||
this.generalExistEntityType = this.pdDetails.business_entity_type
|
this.generalExistEntityType = this.pdDetails.business_entity_type
|
||||||
this.generalExistEntityType_other = this.pdDetails.business_entity_type_other
|
this.generalExistEntityType_other = this.pdDetails.business_entity_type_other
|
||||||
this.generalExistBusinessYear = this.pdDetails.business_years;
|
this.generalExistBusinessYear = this.pdDetails.business_years;
|
||||||
this.generalExistBusinessMonth = this.pdDetails.business_month;
|
this.generalExistBusinessMonth = this.pdDetails.business_month;
|
||||||
this.lender_short_name = this.pdDetails.lender_short_name;
|
this.lender_short_name = this.pdDetails.lender_short_name;
|
||||||
this.product_abbr = this.pdDetails.product_abbr;
|
this.product_abbr = this.pdDetails.product_abbr;
|
||||||
|
this.prod_catagory=this.pdDetails.prod_catagory
|
||||||
console.log("cus",this.pdDetails.customer_segment_abbr)
|
console.log("cus",this.pdDetails.customer_segment_abbr)
|
||||||
this.customer_segment_abbr=this.pdDetails.customer_segment_abbr
|
this.customer_segment_abbr=this.pdDetails.customer_segment_abbr
|
||||||
this.step = 0
|
this.step = 0
|
||||||
@ -181,7 +183,9 @@ export class PdQuestionBusinessInfoPage {
|
|||||||
this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
|
this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
|
||||||
|
|
||||||
this.pd_value_params={pd_id:this.pdDetails.pd_id,form_id:this.FormId,company_id:this.pdDetails.company_id}
|
this.pd_value_params={pd_id:this.pdDetails.pd_id,form_id:this.FormId,company_id:this.pdDetails.company_id}
|
||||||
|
// if(this.complete_status){
|
||||||
|
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
ionViewDidLoad() {
|
ionViewDidLoad() {
|
||||||
@ -267,6 +271,7 @@ export class PdQuestionBusinessInfoPage {
|
|||||||
this.qustCat.getcommondrop('TITLES').subscribe(data => {
|
this.qustCat.getcommondrop('TITLES').subscribe(data => {
|
||||||
this.titleData = data['records'].filter(val => val.isactive == 1);
|
this.titleData = data['records'].filter(val => val.isactive == 1);
|
||||||
})
|
})
|
||||||
|
console.log("getallpersonpdid",this.pdid,this.pdDetails)
|
||||||
this.qustCat.getAllPersonsName(this.pdid).subscribe(data => {
|
this.qustCat.getAllPersonsName(this.pdid).subscribe(data => {
|
||||||
if (data.dataStatus) {
|
if (data.dataStatus) {
|
||||||
|
|
||||||
@ -338,7 +343,7 @@ export class PdQuestionBusinessInfoPage {
|
|||||||
// country_sale.push(this.createCountrySale());
|
// country_sale.push(this.createCountrySale());
|
||||||
//const max_sale_state:any=<FormArray> this.businessForm.controls['manufacturing_activity_details']['controls'][0].controls.max_sale_state_name;
|
//const max_sale_state:any=<FormArray> this.businessForm.controls['manufacturing_activity_details']['controls'][0].controls.max_sale_state_name;
|
||||||
//max_sale_state.push(this.maxSaleState())
|
//max_sale_state.push(this.maxSaleState())
|
||||||
this.product_abbr == 'LAEP' ? this.businessForm.addControl('fire_noc', new FormControl('',Validators.required)) : this.businessForm.removeControl('fire_noc');
|
this.prod_catagory == 'LAEP' ? this.businessForm.addControl('fire_noc', new FormControl('',Validators.required)) : this.businessForm.removeControl('fire_noc');
|
||||||
|
|
||||||
if (data['status'] == 200) {
|
if (data['status'] == 200) {
|
||||||
|
|
||||||
@ -546,7 +551,7 @@ export class PdQuestionBusinessInfoPage {
|
|||||||
});
|
});
|
||||||
if (selectedRetail.length > 0) {
|
if (selectedRetail.length > 0) {
|
||||||
selectedRetail.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert');
|
selectedRetail.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert');
|
||||||
if(!(this.lender_short_name == 'CLIX' && this.product_abbr == 'BL') && !(this.lender_short_name == 'MWISE' && this.product_abbr == 'BL')){
|
if(!(this.lender_short_name == 'CLIX' && this.prod_catagory == 'BL') && !(this.lender_short_name == 'MWISE' && this.prod_catagory == 'BL')){
|
||||||
selectedRetail.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets');
|
selectedRetail.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets');
|
||||||
selectedRetail.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines');
|
selectedRetail.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines');
|
||||||
selectedRetail.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines');
|
selectedRetail.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines');
|
||||||
@ -627,7 +632,7 @@ export class PdQuestionBusinessInfoPage {
|
|||||||
});
|
});
|
||||||
if (selectedWholesale.length > 0) {
|
if (selectedWholesale.length > 0) {
|
||||||
selectedWholesale.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert');
|
selectedWholesale.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert');
|
||||||
if(!(this.lender_short_name == 'CLIX' && this.product_abbr == 'BL') && !(this.lender_short_name == 'MWISE' && this.product_abbr == 'BL')){
|
if(!(this.lender_short_name == 'CLIX' && this.prod_catagory == 'BL') && !(this.lender_short_name == 'MWISE' && this.prod_catagory == 'BL')){
|
||||||
selectedWholesale.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets');
|
selectedWholesale.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets');
|
||||||
selectedWholesale.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines');
|
selectedWholesale.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines');
|
||||||
selectedWholesale.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines');
|
selectedWholesale.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines');
|
||||||
@ -709,7 +714,7 @@ export class PdQuestionBusinessInfoPage {
|
|||||||
})
|
})
|
||||||
if (selectedService.length > 0) {
|
if (selectedService.length > 0) {
|
||||||
selectedService.length > 0 ? this.businessForm.addControl('practice_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('practice_cert');
|
selectedService.length > 0 ? this.businessForm.addControl('practice_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('practice_cert');
|
||||||
if(!(this.lender_short_name == 'CLIX' && this.product_abbr == 'BL') && !(this.lender_short_name == 'MWISE' && this.product_abbr == 'BL')){
|
if(!(this.lender_short_name == 'CLIX' && this.prod_catagory == 'BL') && !(this.lender_short_name == 'MWISE' && this.prod_catagory == 'BL')){
|
||||||
selectedService.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets');
|
selectedService.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets');
|
||||||
selectedService.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines');
|
selectedService.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines');
|
||||||
selectedService.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines');
|
selectedService.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines');
|
||||||
@ -830,7 +835,7 @@ export class PdQuestionBusinessInfoPage {
|
|||||||
//this.businessForm.controls['persons_with_relationships'].setValue(PartnrArray1)
|
//this.businessForm.controls['persons_with_relationships'].setValue(PartnrArray1)
|
||||||
|
|
||||||
// this.businessForm.controls['manufacturing_activity_details'].setValue(businessVal.manufacturing_activity_details)
|
// this.businessForm.controls['manufacturing_activity_details'].setValue(businessVal.manufacturing_activity_details)
|
||||||
if(this.lender_short_name != 'CLIX'){
|
|
||||||
if (businessVal.applicant_use_pos_machines == 'yes' && businessVal.hasOwnProperty('pos_machines_details')) {
|
if (businessVal.applicant_use_pos_machines == 'yes' && businessVal.hasOwnProperty('pos_machines_details')) {
|
||||||
//For Adding the bank search in data
|
//For Adding the bank search in data
|
||||||
if(businessVal.hasOwnProperty('pos_machines_details')){
|
if(businessVal.hasOwnProperty('pos_machines_details')){
|
||||||
@ -846,8 +851,7 @@ export class PdQuestionBusinessInfoPage {
|
|||||||
|
|
||||||
posControl.push(this.createPOSMachinesDetails(businessVal.pos_machines_details));
|
posControl.push(this.createPOSMachinesDetails(businessVal.pos_machines_details));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
console.log('businessVal', businessVal);
|
console.log('businessVal', businessVal);
|
||||||
if (data['records'].gst_Regn_cert == 'yes') { this.businessForm.addControl('gst_Regn_cert_pic', new FormControl('', Validators.compose([Validators.required]))); } else { this.businessForm.removeControl('gst_Regn_cert_pic'); }
|
if (data['records'].gst_Regn_cert == 'yes') { this.businessForm.addControl('gst_Regn_cert_pic', new FormControl('', Validators.compose([Validators.required]))); } else { this.businessForm.removeControl('gst_Regn_cert_pic'); }
|
||||||
if (data['records'].factory_cert == 'yes') { this.businessForm.addControl('factory_cert_pic', new FormControl('', Validators.compose([Validators.required]))); } else { this.businessForm.removeControl('factory_cert_pic'); }
|
if (data['records'].factory_cert == 'yes') { this.businessForm.addControl('factory_cert_pic', new FormControl('', Validators.compose([Validators.required]))); } else { this.businessForm.removeControl('factory_cert_pic'); }
|
||||||
@ -918,7 +922,6 @@ export class PdQuestionBusinessInfoPage {
|
|||||||
// val.toUpperCase()=='YES' ? this.businessForm.addControl('export_import_cert_pic', new FormControl('')) : this.businessForm.removeControl('export_import_cert_pic');
|
// val.toUpperCase()=='YES' ? this.businessForm.addControl('export_import_cert_pic', new FormControl('')) : this.businessForm.removeControl('export_import_cert_pic');
|
||||||
// });
|
// });
|
||||||
// }
|
// }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
filterCity(datasource: any, filterid: number) {
|
filterCity(datasource: any, filterid: number) {
|
||||||
@ -1143,12 +1146,12 @@ export class PdQuestionBusinessInfoPage {
|
|||||||
this.businessForm.value.service_provider_activity_details.length > 0 ? this.businessForm.addControl('practice_cert', new FormControl(this.businessForm.value.practice_cert, Validators.required)) : this.businessForm.removeControl('practice_cert');
|
this.businessForm.value.service_provider_activity_details.length > 0 ? this.businessForm.addControl('practice_cert', new FormControl(this.businessForm.value.practice_cert, Validators.required)) : this.businessForm.removeControl('practice_cert');
|
||||||
// check activity for extra question make dynamic
|
// check activity for extra question make dynamic
|
||||||
|
|
||||||
if(!(this.lender_short_name == 'CLIX' && this.product_abbr == 'BL') && !(this.lender_short_name == 'MWISE' && this.product_abbr == 'BL')){
|
if(!(this.lender_short_name == 'CLIX' && this.prod_catagory == 'BL') && !(this.lender_short_name == 'MWISE' && this.prod_catagory == 'BL')){
|
||||||
this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl(this.businessForm.value.applicant_use_mobile_wallets)) : this.businessForm.removeControl('applicant_use_mobile_wallets');
|
this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl(this.businessForm.value.applicant_use_mobile_wallets)) : this.businessForm.removeControl('applicant_use_mobile_wallets');
|
||||||
this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl(this.businessForm.value.applicant_use_pos_machines)) : this.businessForm.removeControl('applicant_use_pos_machines');
|
this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl(this.businessForm.value.applicant_use_pos_machines)) : this.businessForm.removeControl('applicant_use_pos_machines');
|
||||||
|
|
||||||
if (this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0) {
|
if (this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0) {
|
||||||
if (this.businessForm.controls['applicant_use_pos_machines'] && this.product_abbr == 'LAEP') {
|
if (this.businessForm.controls['applicant_use_pos_machines'] && this.prod_catagory == 'LAEP') {
|
||||||
this.businessForm.controls['applicant_use_pos_machines'].setValue('yes');
|
this.businessForm.controls['applicant_use_pos_machines'].setValue('yes');
|
||||||
}
|
}
|
||||||
this.changePOSMachinesAvailablity(this.businessForm.value.applicant_use_pos_machines, 2);
|
this.changePOSMachinesAvailablity(this.businessForm.value.applicant_use_pos_machines, 2);
|
||||||
|
|||||||
@ -351,7 +351,7 @@
|
|||||||
<input matInput autocomplete="off" placeholder="What is the reason for the Loss?" formControlName="estimate_reason_for_loss">
|
<input matInput autocomplete="off" placeholder="What is the reason for the Loss?" formControlName="estimate_reason_for_loss">
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
<mat-form-field *ngIf="lender_short_name == 'CLIX' && product_abbr =='LAEP'">
|
<mat-form-field *ngIf="lender_short_name == 'CLIX' && prod_catagory =='LAEP'">
|
||||||
<input matInput autocomplete="off" placeholder="Annual Sales through Credit Card / POS machines" formControlName="estimate_posmachine_or_cc_annual_sales" type="number" (keyup)="inWords($event,i,13)">
|
<input matInput autocomplete="off" placeholder="Annual Sales through Credit Card / POS machines" formControlName="estimate_posmachine_or_cc_annual_sales" type="number" (keyup)="inWords($event,i,13)">
|
||||||
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_posmachine_or_cc_annual_sales').value != ''">{{"₹"}} {{AV_CCAnnualSalesAmtInwords[i]}} Only </mat-hint>
|
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_posmachine_or_cc_annual_sales').value != ''">{{"₹"}} {{AV_CCAnnualSalesAmtInwords[i]}} Only </mat-hint>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
@ -388,6 +388,179 @@
|
|||||||
</div><br/>
|
</div><br/>
|
||||||
</div>
|
</div>
|
||||||
</mat-card>
|
</mat-card>
|
||||||
|
<mat-card *ngIf="lender_short_name == 'CHFPL'">
|
||||||
|
<mat-card-header><mat-card-title>
|
||||||
|
<h5>Turnover validated during PD</h5>
|
||||||
|
</mat-card-title></mat-card-header>
|
||||||
|
<mat-card-content>
|
||||||
|
|
||||||
|
<mat-form-field>
|
||||||
|
<mat-select placeholder="Is Turnover validated?"formControlName="is_turnover_validated"
|
||||||
|
(selectionChange)="turnoverValidatedValues($event.value)">
|
||||||
|
<mat-option>Select</mat-option>
|
||||||
|
<mat-option value="yes">Yes</mat-option>
|
||||||
|
<mat-option value="no">No</mat-option>
|
||||||
|
</mat-select>
|
||||||
|
<mat-error align="end" *ngIf="financialForm.controls['is_turnover_validated'].hasError('required')">Is Turnover validated is required</mat-error>
|
||||||
|
</mat-form-field>
|
||||||
|
</mat-card-content>
|
||||||
|
<div formArrayName="turnover_values">
|
||||||
|
<div *ngFor="let details of financialForm.controls.turnover_values['controls']; let i=index"
|
||||||
|
[formGroupName]="i">
|
||||||
|
<mat-card-content>
|
||||||
|
<mat-form-field>
|
||||||
|
<input matInput type="number" placeholder="Annual Sales From" formControlName="estimate_sales_from" (change)="calculateSalesAverage(i,details);AllCalculation(details,i)" (keyup)="inWords($event,i,11)">
|
||||||
|
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_sales_from').value != ''">{{"₹"}} {{AV_SalesFrmInwords[i]}} Only</mat-hint>
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field>
|
||||||
|
<input matInput type="number" placeholder="Annual Sales To" formControlName="estimate_sales_to" (change)="confirmAlert(i,details);AllCalculation(details,i)" (keyup)="inWords($event,i,12)">
|
||||||
|
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_sales_to').value != ''">{{"₹"}} {{AV_SalesToInwords[i]}} Only</mat-hint>
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field>
|
||||||
|
<input matInput type="number" placeholder="Consider Sales Average" formControlName="estimate_sales_average" readonly>
|
||||||
|
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_sales_average').value != ''">{{"₹"}} {{AV_SalesInwords[i]}} Only</mat-hint>
|
||||||
|
</mat-form-field>
|
||||||
|
|
||||||
|
<mat-form-field>
|
||||||
|
<mat-select placeholder="Was there Net Profit or Net Loss?" formControlName="estimate_profit_or_loss">
|
||||||
|
<mat-option>Select</mat-option>
|
||||||
|
<mat-option value="1">Net Profit</mat-option>
|
||||||
|
<mat-option value="2">Net Loss</mat-option>
|
||||||
|
</mat-select>
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field>
|
||||||
|
<mat-select class="select_large" placeholder="Is there Net Margin information Available?" formControlName="estimate_net_margin_availablity">
|
||||||
|
<mat-option>Select</mat-option>
|
||||||
|
<mat-option value="yes">Yes</mat-option>
|
||||||
|
<mat-option value="no">No</mat-option>
|
||||||
|
</mat-select>
|
||||||
|
</mat-form-field>
|
||||||
|
<div *ngIf="details.get('estimate_profit_or_loss').value == 1 && details.get('estimate_net_margin_availablity').value == 'yes' ">
|
||||||
|
<mat-form-field>
|
||||||
|
<input matInput autocomplete="off" placeholder="Net Profit % From" formControlName="estimate_profit_range_from" type="number" min="0" max="100" (change)="calculateMarginProfit(i,details);">
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field >
|
||||||
|
<input matInput autocomplete="off" placeholder="Net Profit % To" formControlName="estimate_profit_range_to" type="number" min='0' max='100' (change)="calculateMarginProfit( i, details);">
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field>
|
||||||
|
<input matInput autocomplete="off" placeholder="Net Profit % Considered" formControlName="estimate_profit_margin_percent" type="number" readonly>
|
||||||
|
<!-- <mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_profit_margin').value != ''"> {{"₹"}} {{AV_marginProfitAmtInwords[i]}} Only ( {{"₹"}} {{details.get('estimate_profit_margin').value}} ) </mat-hint> -->
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field >
|
||||||
|
<input matInput placeholder="Net Profit Amount Considered" formControlName="estimate_profit_margin" readonly>
|
||||||
|
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_profit_margin').value != ''"> {{"₹"}} {{AV_marginProfitAmtInwords[i]}} Only </mat-hint>
|
||||||
|
</mat-form-field>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div style="width:100%" *ngIf="details.get('estimate_profit_or_loss').value == 1 && details.get('estimate_net_margin_availablity').value == 'no' ">
|
||||||
|
<mat-form-field >
|
||||||
|
<input matInput autocomplete="off" placeholder="Net Profit Amount From" formControlName="estimate_net_profit_from" type="number" (change)="calculateProfitAmount(i, details);" (keyup)="inWords($event,i,7)">
|
||||||
|
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_net_profit_from').value != ''">{{"₹"}} {{AV_netProfitAmtFrmInwords[i]}} Only </mat-hint>
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field >
|
||||||
|
<input matInput autocomplete="off" type="number" placeholder="Net Profit Amount To" formControlName="estimate_net_profit_to" type="number" (change)="calculateProfitAmount(i, details);" (keyup)="inWords($event,i,8)">
|
||||||
|
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_net_profit_to').value != ''">{{"₹"}} {{AV_netProfitAmtToInwords[i]}} Only </mat-hint>
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field >
|
||||||
|
<input matInput autocomplete="off" placeholder="Considered Net Profit" formControlName="estimate_net_profit_percent" readonly>
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field >
|
||||||
|
<input matInput autocomplete="off" placeholder="Considered Profit Amount" formControlName="estimate_net_profit" type="number" readonly>
|
||||||
|
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_net_profit').value != ''">{{"₹"}} {{AV_netProfitAmtInwords[i]}} Only </mat-hint>
|
||||||
|
<!-- // -->
|
||||||
|
</mat-form-field>
|
||||||
|
</div>
|
||||||
|
<!--Temporary-->
|
||||||
|
<!-- <div *ngIf="details.get('estimate_net_profit').value != ''">
|
||||||
|
<mat-form-field >
|
||||||
|
<input matInput autocomplete="off" placeholder="what is the average no of days taken to receive the money?" formControlName="estimate_receive_the_money_in_days" type="number">
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field >
|
||||||
|
<input matInput autocomplete="off" placeholder="what is the average no of days taken to pay the money?" formControlName="estimate_pay_the_money_in_days" type="number">
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field >
|
||||||
|
<input matInput autocomplete="off" placeholder="What is the average no of days for which stock lies unsold during the year?" formControlName="estimate_unsold_stock_lies_in_days" type="number">
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field >
|
||||||
|
<mat-select placeholder="Is there Working Capital Facilities?" formControlName="is_there_working_capital_available">
|
||||||
|
<mat-option>Select</mat-option>
|
||||||
|
<mat-option value="yes">Yes</mat-option>
|
||||||
|
<mat-option value="no">No</mat-option>
|
||||||
|
</mat-select>
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field *ngIf="details.get('is_there_working_capital_available').value == 'yes'">
|
||||||
|
<mat-select multiple formControlName="estimate_working_capital_facilities_availed" placeholder="Working Capital Facilities availed">
|
||||||
|
<mat-option *ngFor="let a of av" [value]="a.id">{{a.name}}</mat-option>
|
||||||
|
</mat-select>
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field *ngIf="details.get('estimate_working_capital_facilities_availed').value != ''">
|
||||||
|
<input matInput autocomplete="off" placeholder="Specify The Reason" formControlName="reason_for_working_capital_facilities_availed">
|
||||||
|
</mat-form-field>
|
||||||
|
</div> -->
|
||||||
|
|
||||||
|
|
||||||
|
<!-- <span *ngIf="details.get('estimate_profit_or_loss').value == 2 "> -->
|
||||||
|
<div style="width:100%" *ngIf="details.get('estimate_profit_or_loss').value == 2 && details.get('estimate_net_margin_availablity').value == 'yes' ">
|
||||||
|
<mat-form-field >
|
||||||
|
<input matInput autocomplete="off" placeholder="Net Loss % From" formControlName="estimate_loss_range_from" min='0' max='100' type="number" (change)="calculateMarginLoss( i, details);">
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field >
|
||||||
|
<input matInput autocomplete="off" placeholder="Net Loss % To" formControlName="estimate_loss_range_to" min='0' max='100' type="number" (change)="calculateMarginLoss( i, details);">
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field >
|
||||||
|
<input matInput autocomplete="off" placeholder="Net Profit % Considered" formControlName="estimate_loss_margin_percent" type="number" readonly>
|
||||||
|
<!-- <mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_loss_margin').value != ''">{{"₹"}} {{AV_marginLossAmtInwords[i]}} Only ( {{"₹"}} {{details.get('estimate_loss_margin').value}} ) </mat-hint> -->
|
||||||
|
<!-- // -->
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field >
|
||||||
|
<input matInput placeholder="Net Loss Amount Considered" formControlName="estimate_loss_margin" readonly>
|
||||||
|
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_loss_margin').value != ''">{{"₹"}} {{AV_marginLossAmtInwords[i]}} Only </mat-hint>
|
||||||
|
</mat-form-field>
|
||||||
|
</div>
|
||||||
|
<div style="width:100%" *ngIf="details.get('estimate_profit_or_loss').value == 2 && details.get('estimate_net_margin_availablity').value == 'no' ">
|
||||||
|
<mat-form-field >
|
||||||
|
<input matInput autocomplete="off" placeholder="Net Loss Amount From" formControlName="estimate_net_loss_from" type="number" (change)="calculateLossAmount(i, details);" (keyup)="inWords($event,i,9)">
|
||||||
|
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_net_loss_from').value != ''">{{"₹"}} {{AV_netLossAmtFrmInwords[i]}} Only </mat-hint>
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field >
|
||||||
|
<input matInput autocomplete="off" placeholder="Net Loss Amount To" formControlName="estimate_net_loss_to" type="number" (change)="calculateLossAmount(i, details);" (keyup)="inWords($event,i,10)">
|
||||||
|
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_net_loss_to').value != ''">{{"₹"}} {{AV_netLossAmtToInwords[i]}} Only </mat-hint>
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field >
|
||||||
|
<input matInput autocomplete="off" placeholder="Considered Net Loss" formControlName="estimate_net_loss_percent" readonly>
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field >
|
||||||
|
<input matInput autocomplete="off" placeholder="Considered Loss Amount" formControlName="estimate_net_loss" type="number" readonly>
|
||||||
|
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_net_loss').value != ''">{{"₹"}} {{AV_netLossAmtInwords[i]}} Only</mat-hint>
|
||||||
|
<!-- // -->
|
||||||
|
</mat-form-field>
|
||||||
|
</div>
|
||||||
|
<div *ngIf="details.get('estimate_profit_or_loss').value == 2">
|
||||||
|
<mat-form-field>
|
||||||
|
<input matInput autocomplete="off" placeholder="What is the reason for the Loss?" formControlName="estimate_reason_for_loss">
|
||||||
|
</mat-form-field>
|
||||||
|
</div>
|
||||||
|
</mat-card-content>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div *ngIf="financialForm.value.is_turnover_validated == 'yes'">
|
||||||
|
<mat-card-content>
|
||||||
|
<mat-form-field style="width: 100%">
|
||||||
|
<mat-select placeholder="How was the turnover validated" formControlName="how_turnover_validated">
|
||||||
|
<mat-option>Select</mat-option>
|
||||||
|
<mat-option *ngFor="let val of turnover_validate_list" [value]="val.name">{{val.name}}</mat-option>
|
||||||
|
</mat-select>
|
||||||
|
<mat-error align="end" *ngIf="financialForm.controls['how_turnover_validated'].hasError('required')">How was the Turnover validated is required</mat-error>
|
||||||
|
</mat-form-field>
|
||||||
|
<mat-form-field style="width: 100%" *ngIf="financialForm.value.how_turnover_validated == 'Others'">
|
||||||
|
<input matInput type="text" autocomplete="off" placeholder="Please specify the turnover validated (Others)" formControlName="turnover_validated_others">
|
||||||
|
</mat-form-field>
|
||||||
|
</mat-card-content>
|
||||||
|
</div>
|
||||||
|
</mat-card>
|
||||||
|
|
||||||
<mat-card *ngIf="financialForm.controls['tot_business_FY']">
|
<mat-card *ngIf="financialForm.controls['tot_business_FY']">
|
||||||
<div >
|
<div >
|
||||||
<mat-form-field>
|
<mat-form-field>
|
||||||
@ -403,6 +576,7 @@
|
|||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
</mat-card>
|
</mat-card>
|
||||||
|
|
||||||
<mat-card>
|
<mat-card>
|
||||||
<mat-card-header>
|
<mat-card-header>
|
||||||
<mat-card-title>
|
<mat-card-title>
|
||||||
|
|||||||
@ -73,8 +73,22 @@ export class PdQuestionFinancialInfoPage {
|
|||||||
pd_value_params:any;
|
pd_value_params:any;
|
||||||
@ViewChild('childComp') child: PdGeneralImagesPage
|
@ViewChild('childComp') child: PdGeneralImagesPage
|
||||||
@ViewChild(PdGeneralImagesPage) imagesValue
|
@ViewChild(PdGeneralImagesPage) imagesValue
|
||||||
|
prod_catagory: any;
|
||||||
|
|
||||||
|
turnover_validate_list:any=[{
|
||||||
|
id:2,
|
||||||
|
name:'Validated from Bills/Records'
|
||||||
|
},{
|
||||||
|
id:3,
|
||||||
|
name:'Validated from Business activities seen'
|
||||||
|
},{
|
||||||
|
id:4,
|
||||||
|
name:'Validated from Stock/Inventory seen'
|
||||||
|
},{
|
||||||
|
id:1,
|
||||||
|
name:'Others'
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
constructor(public navCtrl: NavController, public navParams: NavParams,public aws:AwsServiceProvider,
|
constructor(public navCtrl: NavController, public navParams: NavParams,public aws:AwsServiceProvider,
|
||||||
public toast:ToastProvider, public qustCat:QuestionCategoryProvider,
|
public toast:ToastProvider, public qustCat:QuestionCategoryProvider,
|
||||||
@ -93,6 +107,7 @@ export class PdQuestionFinancialInfoPage {
|
|||||||
this.CustSegAbbr=x[1]
|
this.CustSegAbbr=x[1]
|
||||||
this.lender_short_name = this.pdDetails.lender_short_name;
|
this.lender_short_name = this.pdDetails.lender_short_name;
|
||||||
this.product_abbr = this.pdDetails.product_abbr;
|
this.product_abbr = this.pdDetails.product_abbr;
|
||||||
|
this.prod_catagory=this.pdDetails.prod_catagory
|
||||||
this.initFinancialForm()
|
this.initFinancialForm()
|
||||||
|
|
||||||
this.pd_value_params={pd_id:this.pdDetails.pd_id,form_id:this.FormId,company_id:this.pdDetails.company_id}
|
this.pd_value_params={pd_id:this.pdDetails.pd_id,form_id:this.FormId,company_id:this.pdDetails.company_id}
|
||||||
@ -107,6 +122,13 @@ export class PdQuestionFinancialInfoPage {
|
|||||||
this.financialForm.addControl('kuccha_bill_allowed',new FormControl())
|
this.financialForm.addControl('kuccha_bill_allowed',new FormControl())
|
||||||
this.financialForm.addControl('customer_declared_turnover',new FormControl())
|
this.financialForm.addControl('customer_declared_turnover',new FormControl())
|
||||||
}
|
}
|
||||||
|
if(this.lender_short_name == 'CHFPL'){
|
||||||
|
this.financialForm.addControl('is_turnover_validated',new FormControl('yes',Validators.compose([Validators.required])))
|
||||||
|
this.financialForm.addControl('how_turnover_validated',new FormControl('',Validators.compose([Validators.required])))
|
||||||
|
this.financialForm.addControl('turnover_validated_others',new FormControl(''))
|
||||||
|
this.financialForm.addControl('turnover_values',this.fb.array([]))
|
||||||
|
this.turnoverValidatedValues('yes')
|
||||||
|
}
|
||||||
this.qustCat.getTypeofActivityForSuppliedInfoForm(this.pdDetails.pd_id, this.company_id).subscribe(data => {
|
this.qustCat.getTypeofActivityForSuppliedInfoForm(this.pdDetails.pd_id, this.company_id).subscribe(data => {
|
||||||
if (data.dataStatus) {
|
if (data.dataStatus) {
|
||||||
if(data.records.type_of_activity.length == 1){
|
if(data.records.type_of_activity.length == 1){
|
||||||
@ -242,6 +264,20 @@ ionViewCanLeave(){
|
|||||||
control.push(this.createValue(''));
|
control.push(this.createValue(''));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
turnoverValidatedValues(e:string){
|
||||||
|
const control = <FormArray>this.financialForm.controls['turnover_values'];
|
||||||
|
if(e == 'no'){
|
||||||
|
while (control.length !== 0) {
|
||||||
|
control.removeAt(0);
|
||||||
|
}
|
||||||
|
this.financialForm.controls['how_turnover_validated'].clearValidators()
|
||||||
|
}
|
||||||
|
else if (e == 'yes' && control.length === 0){
|
||||||
|
control.push(this.createValue(''));
|
||||||
|
this.financialForm.controls['how_turnover_validated'].setValidators(Validators.required)
|
||||||
|
}
|
||||||
|
this.financialForm.controls['how_turnover_validated'].updateValueAndValidity();
|
||||||
|
}
|
||||||
|
|
||||||
selectedProfitOrLossType(e,detail){
|
selectedProfitOrLossType(e,detail){
|
||||||
|
|
||||||
@ -581,8 +617,11 @@ submitDetails(){
|
|||||||
retrieveData.hasOwnProperty('remarks_tot_business_FY') ? retrieveData.remarks_tot_business_FY : retrieveData.remarks_tot_business_FY=''
|
retrieveData.hasOwnProperty('remarks_tot_business_FY') ? retrieveData.remarks_tot_business_FY : retrieveData.remarks_tot_business_FY=''
|
||||||
retrieveData.hasOwnProperty('orders_hand_FY') ? retrieveData.orders_hand_FY : retrieveData.orders_hand_FY=''
|
retrieveData.hasOwnProperty('orders_hand_FY') ? retrieveData.orders_hand_FY : retrieveData.orders_hand_FY=''
|
||||||
}
|
}
|
||||||
|
if(this.lender_short_name == 'CHFPL'){
|
||||||
|
this.turnoverValidatedValues(retrieveData.is_turnover_validated);
|
||||||
|
}
|
||||||
|
|
||||||
this.financialForm.setValue(retrieveData)
|
this.financialForm.patchValue(retrieveData)
|
||||||
|
|
||||||
if(this.ServiceDataAvailability == false && retrieveData.unsold_stock_lies_in_days == 'NA' ){
|
if(this.ServiceDataAvailability == false && retrieveData.unsold_stock_lies_in_days == 'NA' ){
|
||||||
this.financialForm.controls['unsold_stock_lies_in_days'].setValue('');
|
this.financialForm.controls['unsold_stock_lies_in_days'].setValue('');
|
||||||
|
|||||||
@ -42,6 +42,7 @@ export class PdQuestionFuturePlansAndBusinessEnvironmentPage {
|
|||||||
|
|
||||||
pd_value_params:any;
|
pd_value_params:any;
|
||||||
@ViewChild('childComp') child: PdGeneralImagesPage
|
@ViewChild('childComp') child: PdGeneralImagesPage
|
||||||
|
prod_catagory: any;
|
||||||
|
|
||||||
|
|
||||||
constructor(public navCtrl: NavController, public navParams: NavParams, public fb: FormBuilder,
|
constructor(public navCtrl: NavController, public navParams: NavParams, public fb: FormBuilder,
|
||||||
@ -59,6 +60,7 @@ export class PdQuestionFuturePlansAndBusinessEnvironmentPage {
|
|||||||
this.users=JSON.parse(this.users).userid
|
this.users=JSON.parse(this.users).userid
|
||||||
this.lender_short_name = this.pdDetails.lender_short_name;
|
this.lender_short_name = this.pdDetails.lender_short_name;
|
||||||
this.product_abbr = this.pdDetails.product_abbr;
|
this.product_abbr = this.pdDetails.product_abbr;
|
||||||
|
this.prod_catagory=this.pdDetails.prod_catagory
|
||||||
this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
|
this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
|
||||||
|
|
||||||
this._futurePlansForm = this.fb.group({
|
this._futurePlansForm = this.fb.group({
|
||||||
|
|||||||
@ -105,7 +105,7 @@
|
|||||||
</mat-select>
|
</mat-select>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
<span *ngIf="mrm.get('stock_observed').value == 'yes'">
|
<span *ngIf="mrm.get('stock_observed').value == 'yes'">
|
||||||
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || product_abbr == 'LFMP'">
|
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || prod_catagory == 'LFMP'">
|
||||||
<mat-form-field style="width:100%">
|
<mat-form-field style="width:100%">
|
||||||
<input matInput autocomplete="off" placeholder="Estimated Quantity"
|
<input matInput autocomplete="off" placeholder="Estimated Quantity"
|
||||||
formControlName="raw_quantity" type="number">
|
formControlName="raw_quantity" type="number">
|
||||||
@ -199,7 +199,7 @@
|
|||||||
</mat-select>
|
</mat-select>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
<span *ngIf="mfg.get('goods_observed').value == 'yes'">
|
<span *ngIf="mfg.get('goods_observed').value == 'yes'">
|
||||||
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || product_abbr == 'LFMP'">
|
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || prod_catagory == 'LFMP'">
|
||||||
<mat-form-field style="width:100%">
|
<mat-form-field style="width:100%">
|
||||||
<input matInput autocomplete="off" placeholder="Estimated Quantity"
|
<input matInput autocomplete="off" placeholder="Estimated Quantity"
|
||||||
formControlName="goods_quantity" type="number">
|
formControlName="goods_quantity" type="number">
|
||||||
@ -293,7 +293,7 @@
|
|||||||
</mat-select>
|
</mat-select>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
<span *ngIf="item.get('traded_goods_observed').value == 'yes'">
|
<span *ngIf="item.get('traded_goods_observed').value == 'yes'">
|
||||||
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || product_abbr == 'LFMP'">
|
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || prod_catagory == 'LFMP'">
|
||||||
<mat-form-field style="width:100%">
|
<mat-form-field style="width:100%">
|
||||||
<input matInput autocomplete="off" placeholder="Estimated Quantity"
|
<input matInput autocomplete="off" placeholder="Estimated Quantity"
|
||||||
formControlName="traded_goods_quantity" type="number">
|
formControlName="traded_goods_quantity" type="number">
|
||||||
@ -391,7 +391,7 @@
|
|||||||
</mat-select>
|
</mat-select>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
<span *ngIf="tradetg.get('traded_goods_observed').value == 'yes'">
|
<span *ngIf="tradetg.get('traded_goods_observed').value == 'yes'">
|
||||||
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || product_abbr == 'LFMP'">
|
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || prod_catagory == 'LFMP'">
|
||||||
<mat-form-field style="width:100%">
|
<mat-form-field style="width:100%">
|
||||||
<input matInput autocomplete="off" placeholder="Estimated Quantity"
|
<input matInput autocomplete="off" placeholder="Estimated Quantity"
|
||||||
formControlName="traded_goods_quantity" type="number">
|
formControlName="traded_goods_quantity" type="number">
|
||||||
@ -508,7 +508,7 @@
|
|||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
|
|
||||||
<span *ngIf="serv.get('service_provider_observed').value == 'yes'">
|
<span *ngIf="serv.get('service_provider_observed').value == 'yes'">
|
||||||
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || product_abbr == 'LFMP'">
|
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || prod_catagory == 'LFMP'">
|
||||||
<mat-form-field style="width:100%">
|
<mat-form-field style="width:100%">
|
||||||
<input matInput autocomplete="off" placeholder="Estimated Quantity"
|
<input matInput autocomplete="off" placeholder="Estimated Quantity"
|
||||||
formControlName="service_provider_quantity" type="number">
|
formControlName="service_provider_quantity" type="number">
|
||||||
|
|||||||
@ -73,6 +73,7 @@ export class PdQuestionStockInfoPage {
|
|||||||
|
|
||||||
pd_value_params:any;
|
pd_value_params:any;
|
||||||
@ViewChild('childComp') child: PdGeneralImagesPage
|
@ViewChild('childComp') child: PdGeneralImagesPage
|
||||||
|
prod_catagory: any;
|
||||||
|
|
||||||
constructor(public navCtrl: NavController, public navParams: NavParams, public qustCat: QuestionCategoryProvider,
|
constructor(public navCtrl: NavController, public navParams: NavParams, public qustCat: QuestionCategoryProvider,
|
||||||
public aws: AwsServiceProvider, public toast: ToastProvider, public fb: FormBuilder,
|
public aws: AwsServiceProvider, public toast: ToastProvider, public fb: FormBuilder,
|
||||||
@ -83,6 +84,7 @@ export class PdQuestionStockInfoPage {
|
|||||||
this.pdDetails = this.navParams.get('pdDetails');
|
this.pdDetails = this.navParams.get('pdDetails');
|
||||||
this.lender_short_name=this.pdDetails.lender_short_name
|
this.lender_short_name=this.pdDetails.lender_short_name
|
||||||
this.product_abbr=this.pdDetails.product_abbr
|
this.product_abbr=this.pdDetails.product_abbr
|
||||||
|
this.prod_catagory=this.pdDetails.prod_catagory
|
||||||
this.formDetails = this.navParams.get('formDetails');
|
this.formDetails = this.navParams.get('formDetails');
|
||||||
this.users = localStorage.getItem('pd_user_details')
|
this.users = localStorage.getItem('pd_user_details')
|
||||||
this.users=JSON.parse(this.users).userid
|
this.users=JSON.parse(this.users).userid
|
||||||
|
|||||||
@ -121,7 +121,7 @@
|
|||||||
</mat-select>
|
</mat-select>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
|
|
||||||
<mat-form-field style="width:100% !important;" *ngIf="currentLoans.controls.existing_loan.value == 'Yes' && currentLoans.controls.existing_loan.value == 'Yes' && (productAbbr == 'LAEP' || productAbbr == 'BL')">
|
<mat-form-field style="width:100% !important;" *ngIf="currentLoans.controls.existing_loan.value == 'Yes' && currentLoans.controls.existing_loan.value == 'Yes' && (prod_catagory == 'LAEP' || prod_catagory == 'BL')">
|
||||||
<mat-select (selectionChange)="exitsCheck($event.value)" placeholder="Details of all loan info available"
|
<mat-select (selectionChange)="exitsCheck($event.value)" placeholder="Details of all loan info available"
|
||||||
formControlName="loan_info_available">
|
formControlName="loan_info_available">
|
||||||
<mat-option>Select</mat-option>
|
<mat-option>Select</mat-option>
|
||||||
|
|||||||
@ -61,6 +61,7 @@ applicants: any;
|
|||||||
|
|
||||||
pd_value_params:any;
|
pd_value_params:any;
|
||||||
@ViewChild('childComp') child: PdGeneralImagesPage
|
@ViewChild('childComp') child: PdGeneralImagesPage
|
||||||
|
prod_catagory: any;
|
||||||
|
|
||||||
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
|
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
|
||||||
public qustCat:QuestionCategoryProvider,public toast:ToastProvider,
|
public qustCat:QuestionCategoryProvider,public toast:ToastProvider,
|
||||||
@ -74,6 +75,7 @@ applicants: any;
|
|||||||
this.FormId = this.navParams.get('FormId');
|
this.FormId = this.navParams.get('FormId');
|
||||||
this.applicants = this.pdDetails.applicat_details.filter(val=>val.pd_co_applicant_id != 0);
|
this.applicants = this.pdDetails.applicat_details.filter(val=>val.pd_co_applicant_id != 0);
|
||||||
this.productAbbr=this.pdDetails.product_abbr
|
this.productAbbr=this.pdDetails.product_abbr
|
||||||
|
this.prod_catagory=this.pdDetails.prod_catagory
|
||||||
|
|
||||||
this.applicants.push({'pd_co_applicant_id':'0','applicant_name':'Others'});
|
this.applicants.push({'pd_co_applicant_id':'0','applicant_name':'Others'});
|
||||||
|
|
||||||
@ -86,7 +88,7 @@ applicants: any;
|
|||||||
this.currentLoans = this.fb.group(
|
this.currentLoans = this.fb.group(
|
||||||
{
|
{
|
||||||
existing_loan: [null],
|
existing_loan: [null],
|
||||||
loan_info_available:[this.productAbbr == 'LAEP' || this.productAbbr == 'BL' ? null : 'Yes'],
|
loan_info_available:[this.prod_catagory == 'LAEP' || this.prod_catagory == 'BL' ? null : 'Yes'],
|
||||||
currentloan_remarks:[null],
|
currentloan_remarks:[null],
|
||||||
loan_details: this.fb.array([])
|
loan_details: this.fb.array([])
|
||||||
});
|
});
|
||||||
|
|||||||
@ -305,6 +305,7 @@
|
|||||||
<input matInput placeholder="Gross Monthly Salary" formControlName="gross_monthly_salary" type="number" required (keyup)="inWords($event.target.value,2)">
|
<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 != '' && grossMthlySlryAmtInWords !=''">{{"₹"}}
|
<mat-hint align="end" *ngIf="employmentForm.controls.gross_monthly_salary.value != '' && grossMthlySlryAmtInWords !=''">{{"₹"}}
|
||||||
{{grossMthlySlryAmtInWords}} Only</mat-hint>
|
{{grossMthlySlryAmtInWords}} Only</mat-hint>
|
||||||
|
<mat-error *ngIf="employmentForm.controls.gross_monthly_salary.hasError('required')">Gross Monthly Salary is required</mat-error>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
<div fxLayout="column" fxLayoutAlign="start stretch">
|
<div fxLayout="column" fxLayoutAlign="start stretch">
|
||||||
@ -312,7 +313,8 @@
|
|||||||
<input matInput placeholder="Net Monthly Salary" formControlName="net_monthly_salary" type="number"
|
<input matInput placeholder="Net Monthly Salary" formControlName="net_monthly_salary" type="number"
|
||||||
required (keyup)="inWords($event.target.value,3)" (change)="Validategrosssalary()" #grossSalaryFocus>
|
required (keyup)="inWords($event.target.value,3)" (change)="Validategrosssalary()" #grossSalaryFocus>
|
||||||
<mat-hint align="end" *ngIf="employmentForm.value.net_monthly_salary != '' && netMthlySlryAmtInWords!=''">{{"₹"}} {{netMthlySlryAmtInWords}} Only</mat-hint>
|
<mat-hint align="end" *ngIf="employmentForm.value.net_monthly_salary != '' && netMthlySlryAmtInWords!=''">{{"₹"}} {{netMthlySlryAmtInWords}} Only</mat-hint>
|
||||||
<mat-error *ngIf="employmentForm.controls.net_monthly_salary.hasError('max')">Given Value is Maximum of Gross Monthly Salary</mat-error>
|
<mat-error *ngIf="employmentForm.controls.net_monthly_salary.hasError('max')">Net Month Salary is greater than Gross monthly Salary</mat-error>
|
||||||
|
<mat-error *ngIf="employmentForm.controls.net_monthly_salary.hasError('required')">Net Month Salary is required</mat-error>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -367,6 +369,7 @@
|
|||||||
required (keyup)="inWords($event.target.value,4)">
|
required (keyup)="inWords($event.target.value,4)">
|
||||||
<mat-hint align="end" *ngIf="employmentForm.controls.bonus_incentive.value != '' && bonusIncentiveAmtInWords !='' ">{{"₹"}}
|
<mat-hint align="end" *ngIf="employmentForm.controls.bonus_incentive.value != '' && bonusIncentiveAmtInWords !='' ">{{"₹"}}
|
||||||
{{bonusIncentiveAmtInWords}} Only</mat-hint>
|
{{bonusIncentiveAmtInWords}} Only</mat-hint>
|
||||||
|
<mat-error *ngIf="employmentForm.controls.bonus_incentive.hasError('required')">Bonus or Incentive is required</mat-error>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@ -39,4 +39,7 @@ page-pd-question-emp-info {
|
|||||||
.radio-margin{
|
.radio-margin{
|
||||||
margin-bottom: 18px;
|
margin-bottom: 18px;
|
||||||
}
|
}
|
||||||
|
.mat-radio-button{
|
||||||
|
margin: 1px 8px 1px 6px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -344,7 +344,9 @@ this.pd_value_params={pd_id:this.pdDetails.pd_id,form_id:this.FormId.form_id,com
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!this.employmentForm.valid) {
|
if (!this.employmentForm.valid) {
|
||||||
this.toast.pdTriggerappmessage('Form Invalid Try Again.!');
|
this.employmentForm.markAsTouched()
|
||||||
|
this.employmentForm.markAsDirty
|
||||||
|
this.toast.pdTriggerappmessage("Please Fill all the Fields marked with '*'");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -200,7 +200,7 @@
|
|||||||
</ion-row>
|
</ion-row>
|
||||||
</ion-buttons>
|
</ion-buttons>
|
||||||
</mat-card>
|
</mat-card>
|
||||||
<mat-card *ngIf="tech.get('selected_person').value != '' && (lender_short_name != 'CLIX' && lender_short_name != 'MWISE') || product_abbr === 'LFMP'">
|
<mat-card *ngIf="tech.get('selected_person').value != '' && (lender_short_name != 'CLIX' && lender_short_name != 'MWISE') || prod_catagory === 'LFMP'">
|
||||||
<div formArrayName="family_members_details" >
|
<div formArrayName="family_members_details" >
|
||||||
<div *ngFor="let item of tech.controls.family_members_details['controls']; let ix=index; let last=last" [formGroupName]="ix">
|
<div *ngFor="let item of tech.controls.family_members_details['controls']; let ix=index; let last=last" [formGroupName]="ix">
|
||||||
|
|
||||||
@ -301,7 +301,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
</mat-card>
|
</mat-card>
|
||||||
<mat-card *ngIf="lender_short_name == 'CLIX' || lender_short_name == 'MWISE' && product_abbr !== 'LFMP'">
|
<mat-card *ngIf="lender_short_name == 'CLIX' || lender_short_name == 'MWISE' && prod_catagory !== 'LFMP'">
|
||||||
<mat-card-header appearence="outline">
|
<mat-card-header appearence="outline">
|
||||||
<mat-card-title><h5>Family Details Of {{FamilyMemberAsLabel[i]}}</h5></mat-card-title>
|
<mat-card-title><h5>Family Details Of {{FamilyMemberAsLabel[i]}}</h5></mat-card-title>
|
||||||
</mat-card-header>
|
</mat-card-header>
|
||||||
|
|||||||
@ -79,6 +79,7 @@ data:any;
|
|||||||
|
|
||||||
pd_value_params:any;
|
pd_value_params:any;
|
||||||
@ViewChild('childComp') child: PdGeneralImagesPage
|
@ViewChild('childComp') child: PdGeneralImagesPage
|
||||||
|
prod_catagory: any;
|
||||||
|
|
||||||
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
|
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
|
||||||
public qustCat:QuestionCategoryProvider,public aws:AwsServiceProvider,
|
public qustCat:QuestionCategoryProvider,public aws:AwsServiceProvider,
|
||||||
@ -91,6 +92,7 @@ data:any;
|
|||||||
this.pdDetails = this.navParams.get('pdDetails');
|
this.pdDetails = this.navParams.get('pdDetails');
|
||||||
this.lender_short_name=this.pdDetails.lender_short_name
|
this.lender_short_name=this.pdDetails.lender_short_name
|
||||||
this.product_abbr=this.pdDetails.product_abbr
|
this.product_abbr=this.pdDetails.product_abbr
|
||||||
|
this.prod_catagory=this.pdDetails.prod_catagory
|
||||||
this.selected_person=this.pdDetails.pdapplicants_details;
|
this.selected_person=this.pdDetails.pdapplicants_details;
|
||||||
this.selectPerson=this.pdDetails.applicat_details
|
this.selectPerson=this.pdDetails.applicat_details
|
||||||
this.users = localStorage.getItem('pd_user_details')
|
this.users = localStorage.getItem('pd_user_details')
|
||||||
|
|||||||
@ -210,7 +210,7 @@
|
|||||||
</mat-form-field> -->
|
</mat-form-field> -->
|
||||||
</mat-card-content>
|
</mat-card-content>
|
||||||
</mat-card>
|
</mat-card>
|
||||||
<mat-card *ngIf="lender_short_name == 'CLIX' || lender_short_name == 'MWISE' || product_abbr == 'LAEP'">
|
<mat-card *ngIf="lender_short_name == 'CLIX' || lender_short_name == 'MWISE' || prod_catagory == 'LAEP'">
|
||||||
<mat-card-content>
|
<mat-card-content>
|
||||||
<mat-card-subtitle *ngIf="lender_short_name == 'CLIX'">CLIX</mat-card-subtitle>
|
<mat-card-subtitle *ngIf="lender_short_name == 'CLIX'">CLIX</mat-card-subtitle>
|
||||||
<mat-card-subtitle *ngIf="lender_short_name == 'MWISE'">MWISE</mat-card-subtitle>
|
<mat-card-subtitle *ngIf="lender_short_name == 'MWISE'">MWISE</mat-card-subtitle>
|
||||||
@ -224,7 +224,7 @@
|
|||||||
</mat-select>
|
</mat-select>
|
||||||
<mat-error style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="_finalRemarkForm.controls['outlet_location'].hasError('required')">Comment Required</mat-error>
|
<mat-error style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="_finalRemarkForm.controls['outlet_location'].hasError('required')">Comment Required</mat-error>
|
||||||
</mat-form-field> -->
|
</mat-form-field> -->
|
||||||
<div *ngIf="product_abbr == 'LAEP' && _finalRemarkForm.controls['outlet_location']">
|
<div *ngIf="prod_catagory == 'LAEP' && _finalRemarkForm.controls['outlet_location']">
|
||||||
<p>Comment on Footfall in the market where the B2C outlet is located…</p>
|
<p>Comment on Footfall in the market where the B2C outlet is located…</p>
|
||||||
<mat-radio-group formControlName="outlet_location">
|
<mat-radio-group formControlName="outlet_location">
|
||||||
|
|
||||||
|
|||||||
@ -47,6 +47,7 @@ export class PdQuestionFinalRemarkPage {
|
|||||||
|
|
||||||
pd_value_params:any;
|
pd_value_params:any;
|
||||||
@ViewChild('childComp') child: PdGeneralImagesPage
|
@ViewChild('childComp') child: PdGeneralImagesPage
|
||||||
|
prod_catagory: any;
|
||||||
|
|
||||||
constructor(public navCtrl: NavController, public navParams: NavParams, public fb:FormBuilder,
|
constructor(public navCtrl: NavController, public navParams: NavParams, public fb:FormBuilder,
|
||||||
public qustcat:QuestionCategoryProvider,public aws:AwsServiceProvider,
|
public qustcat:QuestionCategoryProvider,public aws:AwsServiceProvider,
|
||||||
@ -61,6 +62,7 @@ export class PdQuestionFinalRemarkPage {
|
|||||||
this.users=JSON.parse(this.users).userid
|
this.users=JSON.parse(this.users).userid
|
||||||
this.lender_short_name = this.pdDetails.lender_short_name;
|
this.lender_short_name = this.pdDetails.lender_short_name;
|
||||||
this.product_abbr = this.pdDetails.product_abbr;
|
this.product_abbr = this.pdDetails.product_abbr;
|
||||||
|
this.prod_catagory=this.pdDetails.prod_catagory
|
||||||
|
|
||||||
this._finalRemarkForm=this.fb.group({
|
this._finalRemarkForm=this.fb.group({
|
||||||
fk_createdby:[this.users],
|
fk_createdby:[this.users],
|
||||||
@ -87,8 +89,8 @@ export class PdQuestionFinalRemarkPage {
|
|||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MWISE' || this.product_abbr == 'LAEP'){
|
if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MWISE' || this.prod_catagory == 'LAEP'){
|
||||||
this.product_abbr == 'LAEP' ? this._finalRemarkForm.addControl('outlet_location', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('outlet_location');
|
this.prod_catagory == 'LAEP' ? this._finalRemarkForm.addControl('outlet_location', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('outlet_location');
|
||||||
this._finalRemarkForm.addControl('is_competition', new FormControl(''));
|
this._finalRemarkForm.addControl('is_competition', new FormControl(''));
|
||||||
this._finalRemarkForm.addControl('sealing_activity', new FormControl(''));
|
this._finalRemarkForm.addControl('sealing_activity', new FormControl(''));
|
||||||
this._finalRemarkForm.addControl('demolition_activity', new FormControl(''));
|
this._finalRemarkForm.addControl('demolition_activity', new FormControl(''));
|
||||||
@ -99,7 +101,7 @@ export class PdQuestionFinalRemarkPage {
|
|||||||
this._finalRemarkForm.removeControl('sealing_activity');
|
this._finalRemarkForm.removeControl('sealing_activity');
|
||||||
this._finalRemarkForm.removeControl('demolition_activity');
|
this._finalRemarkForm.removeControl('demolition_activity');
|
||||||
}
|
}
|
||||||
// this.product_abbr != 'LAEP' ?
|
// this.prod_catagory != 'LAEP' ?
|
||||||
// this._finalRemarkForm.controls['final_form_remarks'].setValidators(Validators.compose([Validators.required])) :
|
// this._finalRemarkForm.controls['final_form_remarks'].setValidators(Validators.compose([Validators.required])) :
|
||||||
// this._finalRemarkForm.controls['final_form_remarks'].clearValidators()
|
// this._finalRemarkForm.controls['final_form_remarks'].clearValidators()
|
||||||
// this._finalRemarkForm.controls['final_form_remarks'].updateValueAndValidity()
|
// this._finalRemarkForm.controls['final_form_remarks'].updateValueAndValidity()
|
||||||
@ -420,9 +422,9 @@ RecommendationChange(e) {
|
|||||||
}
|
}
|
||||||
this._finalRemarkForm.controls.final_form_remarks.setValue(data['records'].final_form_remarks);
|
this._finalRemarkForm.controls.final_form_remarks.setValue(data['records'].final_form_remarks);
|
||||||
|
|
||||||
if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MWISE' || this.product_abbr == 'LAEP'){
|
if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MWISE' || this.prod_catagory == 'LAEP'){
|
||||||
|
|
||||||
if(this.product_abbr == 'LAEP'){this._finalRemarkForm.controls.outlet_location.setValue(this.product_abbr == 'LAEP' ? data['records'].outlet_location : '')}
|
if(this.prod_catagory == 'LAEP'){this._finalRemarkForm.controls.outlet_location.setValue(this.prod_catagory == 'LAEP' ? data['records'].outlet_location : '')}
|
||||||
this._finalRemarkForm.controls.is_competition.setValue(data['records'].is_competition);
|
this._finalRemarkForm.controls.is_competition.setValue(data['records'].is_competition);
|
||||||
this._finalRemarkForm.controls.sealing_activity.setValue(data['records'].sealing_activity);
|
this._finalRemarkForm.controls.sealing_activity.setValue(data['records'].sealing_activity);
|
||||||
this._finalRemarkForm.controls.demolition_activity.setValue(data['records'].demolition_activity);
|
this._finalRemarkForm.controls.demolition_activity.setValue(data['records'].demolition_activity);
|
||||||
|
|||||||
@ -73,7 +73,7 @@
|
|||||||
<mat-form-field *ngIf="isOtherPurpose" style="width: 100%">
|
<mat-form-field *ngIf="isOtherPurpose" style="width: 100%">
|
||||||
<input matInput placeholder="Specify End Use" formControlName="end_use_other">
|
<input matInput placeholder="Specify End Use" formControlName="end_use_other">
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
<mat-form-field style="width: 100%" *ngIf="lender_short_name == 'CLIX' || lender_short_name == 'MWISE' && productAbbr != 'LFMP'">
|
<mat-form-field style="width: 100%" *ngIf="lender_short_name == 'CLIX' || lender_short_name == 'MWISE' && prod_catagory != 'LFMP'">
|
||||||
<mat-select placeholder="Total fund requirement"
|
<mat-select placeholder="Total fund requirement"
|
||||||
formControlName="is_there_total_fund">
|
formControlName="is_there_total_fund">
|
||||||
<mat-option>Select</mat-option>
|
<mat-option>Select</mat-option>
|
||||||
@ -89,7 +89,7 @@
|
|||||||
<mat-hint align="end" *ngIf="loanDetailsForm.controls['fund_amt'].value != '' && fundAmtInWords !=''">{{"₹"}} {{fundAmtInWords}} Only</mat-hint>
|
<mat-hint align="end" *ngIf="loanDetailsForm.controls['fund_amt'].value != '' && fundAmtInWords !=''">{{"₹"}} {{fundAmtInWords}} Only</mat-hint>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</span>
|
</span>
|
||||||
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || productAbbr == 'LFMP'">
|
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || prod_catagory == 'LFMP'">
|
||||||
<mat-form-field style="width: 100%">
|
<mat-form-field style="width: 100%">
|
||||||
<mat-select placeholder="Is there a balance transfer ? " (selectionChange)="selectedBalancesTransferChanges($event.value)"
|
<mat-select placeholder="Is there a balance transfer ? " (selectionChange)="selectedBalancesTransferChanges($event.value)"
|
||||||
formControlName="is_transfer" >
|
formControlName="is_transfer" >
|
||||||
@ -131,7 +131,7 @@
|
|||||||
<input matInput placeholder="Top Up Amt" type="number" formControlName="topup_amount" (keyup)="inWords($event,5)">
|
<input matInput placeholder="Top Up Amt" type="number" formControlName="topup_amount" (keyup)="inWords($event,5)">
|
||||||
<mat-hint align="end" *ngIf="loanDetailsForm.controls['topup_amount'].value != ''">{{"₹"}} {{topUpAmtInWords}} Only</mat-hint>
|
<mat-hint align="end" *ngIf="loanDetailsForm.controls['topup_amount'].value != ''">{{"₹"}} {{topUpAmtInWords}} Only</mat-hint>
|
||||||
</mat-form-field >
|
</mat-form-field >
|
||||||
<mat-form-field style="width:100%" *ngIf="loanDetailsForm.controls['topup_amount'].value > 0 && (lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || productAbbr == 'LFMP')" >
|
<mat-form-field style="width:100%" *ngIf="loanDetailsForm.controls['topup_amount'].value > 0 && (lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || prod_catagory == 'LFMP')" >
|
||||||
<mat-select placeholder="What is the End Use of the Top Up?"
|
<mat-select placeholder="What is the End Use of the Top Up?"
|
||||||
formControlName="end_use_topup" >
|
formControlName="end_use_topup" >
|
||||||
<mat-option>Select</mat-option>
|
<mat-option>Select</mat-option>
|
||||||
@ -226,7 +226,7 @@
|
|||||||
<mat-hint align="end" *ngIf="loanDetailsForm.controls['emv_per_customer'].value != ''">{{"₹"}} {{emvAmtInWords}} Only</mat-hint>
|
<mat-hint align="end" *ngIf="loanDetailsForm.controls['emv_per_customer'].value != ''">{{"₹"}} {{emvAmtInWords}} Only</mat-hint>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
<!-- <div *ngIf="productAbbr == 'HL' || productAbbr == 'NRPL' || productAbbr == 'LL'"> -->
|
<!-- <div *ngIf="productAbbr == 'HL' || productAbbr == 'NRPL' || productAbbr == 'LL'"> -->
|
||||||
<mat-form-field style="width: 100%" *ngIf="productAbbr !== 'LAP'" >
|
<mat-form-field style="width: 100%" *ngIf="prod_catagory !== 'LAP'" >
|
||||||
<input matInput placeholder="Name of the Current Owner(s)/Seller(s) of the Property" formControlName="property_seller">
|
<input matInput placeholder="Name of the Current Owner(s)/Seller(s) of the Property" formControlName="property_seller">
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
<mat-form-field style="width: 100%">
|
<mat-form-field style="width: 100%">
|
||||||
|
|||||||
@ -95,6 +95,7 @@ export class PdQuestionLoansPage {
|
|||||||
address_placeholder: string;
|
address_placeholder: string;
|
||||||
pd_value_params:any;
|
pd_value_params:any;
|
||||||
@ViewChild('childComp') child: PdGeneralImagesPage
|
@ViewChild('childComp') child: PdGeneralImagesPage
|
||||||
|
prod_catagory: any;
|
||||||
|
|
||||||
constructor(public navCtrl: NavController, public navParams: NavParams, public fb: FormBuilder,
|
constructor(public navCtrl: NavController, public navParams: NavParams, public fb: FormBuilder,
|
||||||
public qustCat: QuestionCategoryProvider, public aws: AwsServiceProvider,
|
public qustCat: QuestionCategoryProvider, public aws: AwsServiceProvider,
|
||||||
@ -109,6 +110,7 @@ export class PdQuestionLoansPage {
|
|||||||
this.applicants = this.pdDetails.applicat_details
|
this.applicants = this.pdDetails.applicat_details
|
||||||
this.applicants = this.applicants.filter(appt => appt.applicant_type != 2 && appt.applicant_type != 3);
|
this.applicants = this.applicants.filter(appt => appt.applicant_type != 2 && appt.applicant_type != 3);
|
||||||
this.productAbbr = this.pdDetails.product_abbr;
|
this.productAbbr = this.pdDetails.product_abbr;
|
||||||
|
this.prod_catagory=this.pdDetails.prod_catagory
|
||||||
this.subProductName = this.pdDetails.subproduct_name;
|
this.subProductName = this.pdDetails.subproduct_name;
|
||||||
this.users = localStorage.getItem('pd_user_details')
|
this.users = localStorage.getItem('pd_user_details')
|
||||||
this.users=JSON.parse(this.users).userid
|
this.users=JSON.parse(this.users).userid
|
||||||
@ -160,19 +162,19 @@ export class PdQuestionLoansPage {
|
|||||||
this.onChangeSubProduct(this.pdDetails.fk_subproduct_id);
|
this.onChangeSubProduct(this.pdDetails.fk_subproduct_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(this.pdDetails.product_abbr !="BL" || this.pdDetails.product_abbr !="PL" || this.pdDetails.product_abbr !="LAEP")
|
if(this.pdDetails.prod_catagory !="BL" || this.pdDetails.prod_catagory !="PL" || this.pdDetails.prod_catagory !="LAEP")
|
||||||
{
|
{
|
||||||
this.mortagetypeAccess = true;
|
this.mortagetypeAccess = true;
|
||||||
}else
|
}else
|
||||||
{
|
{
|
||||||
this.mortagetypeAccess = false;
|
this.mortagetypeAccess = false;
|
||||||
}
|
}
|
||||||
if(this.productAbbr == 'HL' || this.productAbbr == 'NRPL' || this.productAbbr == 'LL'){
|
if(this.prod_catagory == 'HL' || this.prod_catagory == 'NRPL' || this.prod_catagory == 'LL'){
|
||||||
this.addControlAddress('')
|
this.addControlAddress('')
|
||||||
this.owner_name_placeholder='Name of the Proposed Owner'
|
this.owner_name_placeholder='Name of the Proposed Owner'
|
||||||
this.address_placeholder='Address of the Proposed Property'
|
this.address_placeholder='Address of the Proposed Property'
|
||||||
}
|
}
|
||||||
// if(this.productAbbr == 'HL' || this.productAbbr == 'NRPL' || this.productAbbr == 'LL')
|
// if(this.prod_catagory == 'HL' || this.prod_catagory == 'NRPL' || this.prod_catagory == 'LL')
|
||||||
else{
|
else{
|
||||||
this.addControlAddress('')
|
this.addControlAddress('')
|
||||||
this.owner_name_placeholder='Name of Owner'
|
this.owner_name_placeholder='Name of Owner'
|
||||||
@ -180,7 +182,7 @@ export class PdQuestionLoansPage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(this.productAbbr == 'PL' || this.productAbbr == 'BL' || this.productAbbr == 'LAP' || this.productAbbr == 'LFMP'){
|
if(this.prod_catagory == 'PL' || this.prod_catagory == 'BL' || this.prod_catagory == 'LAP' || this.prod_catagory == 'LFMP'){
|
||||||
this.isContribution = true;
|
this.isContribution = true;
|
||||||
}
|
}
|
||||||
this.loanDetailsForm.controls['filterCtrl'].valueChanges
|
this.loanDetailsForm.controls['filterCtrl'].valueChanges
|
||||||
@ -942,7 +944,7 @@ export class PdQuestionLoansPage {
|
|||||||
this.loading.dismissLoader();
|
this.loading.dismissLoader();
|
||||||
this.toast.pdTriggerappmessage("Network Error");
|
this.toast.pdTriggerappmessage("Network Error");
|
||||||
})
|
})
|
||||||
if(this.productAbbr == 'BL' || this.productAbbr == 'PL' || this.productAbbr == 'LL' || this.productAbbr == 'LAEP'){
|
if(this.prod_catagory == 'BL' || this.prod_catagory == 'PL' || this.prod_catagory == 'LL' || this.prod_catagory == 'LAEP'){
|
||||||
this.mortageCardAccess = false;
|
this.mortageCardAccess = false;
|
||||||
this.loanDetailsForm.controls['owner_name'].setValue('');
|
this.loanDetailsForm.controls['owner_name'].setValue('');
|
||||||
this.loanDetailsForm.controls['owner_name'].clearValidators();
|
this.loanDetailsForm.controls['owner_name'].clearValidators();
|
||||||
|
|||||||
@ -46,6 +46,7 @@ export class QueriesDocsPage {
|
|||||||
link:[''],
|
link:[''],
|
||||||
addtional_requirements:this.fb.array([this.createview()])
|
addtional_requirements:this.fb.array([this.createview()])
|
||||||
})
|
})
|
||||||
|
this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
|
||||||
}
|
}
|
||||||
createview(){
|
createview(){
|
||||||
return this.fb.group({
|
return this.fb.group({
|
||||||
|
|||||||
@ -33,7 +33,7 @@ public commonimage = "http://pdgenie.com/logo/avatar.jpg";
|
|||||||
// let test='https://demo.pdgenie.com/sparqapi/api/'
|
// let test='https://demo.pdgenie.com/sparqapi/api/'
|
||||||
// LIVE ENVIRONMENT
|
// LIVE ENVIRONMENT
|
||||||
let production={
|
let production={
|
||||||
url:'https://pdgenie.com/sparqprod/api/',
|
url:'https://api.pdgenie.com/sparqprod/api/',
|
||||||
environment_name:'production',
|
environment_name:'production',
|
||||||
authorization:'TnAwuc64pVpcB9xf',
|
authorization:'TnAwuc64pVpcB9xf',
|
||||||
login_string: "cognito-idp.ap-south-1.amazonaws.com/ap-south-1_MlTee1O5V",
|
login_string: "cognito-idp.ap-south-1.amazonaws.com/ap-south-1_MlTee1O5V",
|
||||||
@ -43,7 +43,8 @@ public commonimage = "http://pdgenie.com/logo/avatar.jpg";
|
|||||||
}
|
}
|
||||||
// DEVELOPMENT ENVIRONMENT
|
// DEVELOPMENT ENVIRONMENT
|
||||||
let development={
|
let development={
|
||||||
url:'https://demo.pdgenie.com/sparqapi/api/',
|
// url:'https://demo.pdgenie.com/sparqapi/api/',
|
||||||
|
url:'https://apitest.pdgenie.com/sparqapi/api/',
|
||||||
environment_name:'development',
|
environment_name:'development',
|
||||||
authorization:'sparqvenba2018',
|
authorization:'sparqvenba2018',
|
||||||
login_string: "cognito-idp.ap-south-1.amazonaws.com/ap-south-1_qQ85yQZJO",
|
login_string: "cognito-idp.ap-south-1.amazonaws.com/ap-south-1_qQ85yQZJO",
|
||||||
@ -54,7 +55,7 @@ public commonimage = "http://pdgenie.com/logo/avatar.jpg";
|
|||||||
}
|
}
|
||||||
// TESTING ENVIRONMNET
|
// TESTING ENVIRONMNET
|
||||||
let testing={
|
let testing={
|
||||||
url:'https://demo.pdgenie.com/sparqtest/api/',
|
url:'https://apitest.pdgenie.com/sparqtest/api/',
|
||||||
environment_name:'testing',
|
environment_name:'testing',
|
||||||
authorization:'sparqvenba2018',
|
authorization:'sparqvenba2018',
|
||||||
login_string: "cognito-idp.ap-south-1.amazonaws.com/ap-south-1_qQ85yQZJO",
|
login_string: "cognito-idp.ap-south-1.amazonaws.com/ap-south-1_qQ85yQZJO",
|
||||||
@ -66,7 +67,7 @@ public commonimage = "http://pdgenie.com/logo/avatar.jpg";
|
|||||||
userPoolId:'ap-south-1_qQ85yQZJO',
|
userPoolId:'ap-south-1_qQ85yQZJO',
|
||||||
clientId:'2o5c3cs9k3als16nqhp3irh8rs' //for mobile
|
clientId:'2o5c3cs9k3als16nqhp3irh8rs' //for mobile
|
||||||
}
|
}
|
||||||
return testing;
|
return production;
|
||||||
}
|
}
|
||||||
|
|
||||||
getcurrentDate()
|
getcurrentDate()
|
||||||
|
|||||||
@ -17,7 +17,8 @@
|
|||||||
<!-- add to homescreen for ios -->
|
<!-- add to homescreen for ios -->
|
||||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||||
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
||||||
|
<!-- FOR GOOGLE MAPS -->
|
||||||
|
<script src="https://maps.google.com/maps/api/js?key=AIzaSyA3lYDYxwtn5vLSl45SOKbtK7G6cEyXGr0"></script>
|
||||||
<!-- cordova.js required for cordova apps (remove if not needed) -->
|
<!-- cordova.js required for cordova apps (remove if not needed) -->
|
||||||
<script src="cordova.js"></script>
|
<script src="cordova.js"></script>
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user