Sineedge/pd_officer
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fairoj: General info error and some other issue fixed

Browse Source
This commit is contained in:
saravanakumarkandasami 2019-08-07 11:57:44 +05:30
parent 75e600721b
commit edb8106288
42 changed files with 1912 additions and 1154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.sourcemaps/0.js.map
View File

@ -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 = 714\n// module chunks = 0"],"sourceRoot":""}
{"version":3,"sources":[],"names":[],"mappings":"","sourcesContent":[]}

2
.sourcemaps/1.js.map
View File

File diff suppressed because one or more lines are too long

2
.sourcemaps/main.js.map
View File

File diff suppressed because one or more lines are too long

2
config.xml
View File

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

2817
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

5
package.json
View File

@ -13,7 +13,7 @@
"serve": "ionic build",
"start": "npm run serve",
"prod_build": "ionic cordova build android --aot --minifyjs --minifycss --max-old-space-size=4096",
"ionic:build": "node --max-old-space-size=4096 ./node_modules/@ionic/app-scripts/bin/ionic-app-scripts.js build"
"ionic:build": "node --max-old-space-size=2046 ./node_modules/@ionic/app-scripts/bin/ionic-app-scripts.js build"
},
"dependencies": {
"@angular/animations": "^5.1.1",
@ -81,7 +81,8 @@
},
"devDependencies": {
"@ionic/app-scripts": "3.1.5",
"typescript": "2.4.2"
"typescript": "2.4.2",
"gulp-sass": "^3.1.0"
},
"description": "An Ionic project",
"config": {

2
platforms/android/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
View File

@ -1,4 +1,4 @@
#Wed Jul 24 13:48:17 IST 2019
#Wed Aug 07 11:06:19 IST 2019
C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-26.1.0.aar\\7570c1d0b1da07e3dde30e732b41229f\\res\\drawable-mdpi-v4\\abc_list_selector_disabled_holo_light.9.png=S\:\\pd_office\\pd_officer_change\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_list_selector_disabled_holo_light.9.png.flat
C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-9.8.0.aar\\615b82ec9f8fe5a2e42bfc8be6032e11\\res\\drawable-mdpi-v4\\common_google_signin_btn_icon_dark_disabled.9.png=S\:\\pd_office\\pd_officer_change\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_common_google_signin_btn_icon_dark_disabled.9.png.flat
C\:\\Users\\Venba1\\.gradle\\caches\\transforms-1\\files-1.1\\play-services-base-9.8.0.aar\\615b82ec9f8fe5a2e42bfc8be6032e11\\res\\drawable-mdpi-v4\\common_google_signin_btn_text_dark_disabled.9.png=S\:\\pd_office\\pd_officer_change\\platforms\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_common_google_signin_btn_text_dark_disabled.9.png.flat

BIN
platforms/android/app/build/intermediates/res/merged/debug/xml_config.xml.flat
View File

Binary file not shown.

2
platforms/android/app/build/intermediates/transforms/dexBuilder/debug/__content__.json
View File

File diff suppressed because one or more lines are too long

2
platforms/android/app/build/intermediates/transforms/dexMerger/debug/__content__.json
View File

@ -1 +1 @@
[{"name":"main","index":0,"scopes":["PROJECT","SUB_PROJECTS","EXTERNAL_LIBRARIES","MAIN_SPLIT"],"types":["DEX"],"format":"DIRECTORY","present":true}]
[{"name":"main","index":0,"scopes":["EXTERNAL_LIBRARIES","PROJECT","MAIN_SPLIT","SUB_PROJECTS"],"types":["DEX"],"format":"DIRECTORY","present":true}]

2
platforms/android/app/build/outputs/apk/debug/output.json
View File

@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"0.0.4","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"app-debug.apk","properties":{}}]
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":100,"versionName":"0.1.0","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"app-debug.apk","properties":{}}]

8
platforms/android/app/build/outputs/logs/manifest-merger-debug-report.txt
View File

@ -58,19 +58,19 @@ INJECTED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\Andr
INJECTED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\AndroidManifest.xml:2:1-65:12
INJECTED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\AndroidManifest.xml:2:1-65:12
package
ADDED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\AndroidManifest.xml:2:98-128
ADDED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\AndroidManifest.xml:2:100-130
INJECTED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\AndroidManifest.xml
INJECTED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\AndroidManifest.xml
android:versionName
ADDED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\AndroidManifest.xml:2:70-97
ADDED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\AndroidManifest.xml:2:72-99
INJECTED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\AndroidManifest.xml
INJECTED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\AndroidManifest.xml
android:hardwareAccelerated
ADDED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\AndroidManifest.xml:2:11-45
xmlns:android
ADDED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\AndroidManifest.xml:2:129-187
ADDED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\AndroidManifest.xml:2:131-189
android:versionCode
ADDED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\AndroidManifest.xml:2:46-69
ADDED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\AndroidManifest.xml:2:46-71
INJECTED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\AndroidManifest.xml
INJECTED from S:\pd_office\pd_officer_change\platforms\android\app\src\main\AndroidManifest.xml
supports-screens

2
platforms/android/app/src/main/AndroidManifest.xml
View File

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

BIN
platforms/android/app/src/main/assets/www/assets/fonts/Roboto-Bold.ttf
View File

Binary file not shown.

BIN
platforms/android/app/src/main/assets/www/assets/fonts/Roboto-Light.ttf
View File

Binary file not shown.

BIN
platforms/android/app/src/main/assets/www/assets/fonts/Roboto-Medium.ttf
View File

Binary file not shown.

BIN
platforms/android/app/src/main/assets/www/assets/fonts/Roboto-Regular.ttf
View File

Binary file not shown.

2
platforms/android/app/src/main/assets/www/build/main.css
View File

File diff suppressed because one or more lines are too long

2
platforms/android/app/src/main/assets/www/build/main.js
View File

File diff suppressed because one or more lines are too long

2
platforms/android/app/src/main/assets/www/build/vendor.js
View File

File diff suppressed because one or more lines are too long

2
platforms/android/app/src/main/res/xml/config.xml
View File

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

BIN
releaseApk/app-release-unsigned.apk
View File

Binary file not shown.

BIN
releaseApk/pd_genie_officer_24-07-19(1).apk
View File

Binary file not shown.

BIN
releaseApk/pd_genie_officer_25-07-19.apk
View File

Binary file not shown.

BIN
releaseApk/pd_genie_officer_27-07-19.apk
View File

Binary file not shown.

2
src/pages/input/input.ts
View File

@ -96,7 +96,7 @@ checkOtpAccess:boolean = false;
private loading:LoadingProvider,public storagedb:StorageProvider,private backgroundgeolocation:BackgroundGeolocation) {
console.log("Hi Input")
this.storagedb.clearItem('qc_notes')
// this.storagedb.clearItem('qc_notes')
this.maxdate = this.pipe.transform(new Date(),'yyyy-MM-ddTHH:mm').toString();
// this.maxdate=new Date().toLocaleString();

12
src/pages/pd-question/pd-question-assessed-info/pd-question-assessed-info.html
View File

@ -94,7 +94,7 @@
<mat-card-header><h4>Sales Details</h4></mat-card-header>
<ion-row>
<ion-col col-3 *ngIf="sales_item_value">
<ion-col col-3 *ngIf="sales_item_value != ''">
<a (click)="editAllDetails(sales_item_value)">
<h2>{{"&#9998;"}}</h2>
</a>
@ -144,7 +144,7 @@
</mat-expansion-panel-header>
<mat-card-header><h4>Daily Sales Details</h4></mat-card-header>
<ion-row>
<ion-col col-3 *ngIf="sales_item_month_value">
<ion-col col-3 *ngIf="sales_item_month_value !=''">
<a (click)="allEditSalesDailyWise(sales_item_month_value)">
<h2>{{"&#9998;"}}</h2>
</a>
@ -262,7 +262,7 @@
<mat-card *ngIf="purchase_type == '1'">
<mat-card-header><h4>Item-wise Purchase Calculation</h4></mat-card-header>
<ion-row>
<ion-col col-3 *ngIf="purchse_details !=''"><a (click)="editPurchaseAllDetails(purchse_details)"><h2>{{"&#9998;"}}</h2></a></ion-col>
<ion-col col-3 *ngIf="purchse_details !='' "><a (click)="editPurchaseAllDetails(purchse_details)"><h2>{{"&#9998;"}}</h2></a></ion-col>
<ion-col offset-9 col-3 text-right>
<a (click)="AddPurchaseForm()">
<ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon>
@ -377,7 +377,7 @@
<mat-card-header><h4>Business Expenses</h4></mat-card-header>
<ion-row>
<ion-col col-3 *ngIf="businessExpenses_details!=''"><a (click)="editExpenseAllDetails(businessExpenses_details)"><h2>{{"&#9998;"}}</h2></a></ion-col>
<ion-col col-3 *ngIf="businessExpenses_details!='' "><a (click)="editExpenseAllDetails(businessExpenses_details)"><h2>{{"&#9998;"}}</h2></a></ion-col>
<ion-col offset-6 col-3 text-right>
<a (click)="AddExpenseForm()">
<ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon>
@ -414,7 +414,7 @@
<mat-card-header><h4>Household Expenses</h4></mat-card-header>
<ion-row>
<ion-col col-3 *ngIf="houseHold_details !=''"><a (click)="editHouseExpenseAllDetails(houseHold_details)"><h2>{{"&#9998;"}}</h2></a></ion-col>
<ion-col col-3 *ngIf="houseHold_details !='' "><a (click)="editHouseExpenseAllDetails(houseHold_details)"><h2>{{"&#9998;"}}</h2></a></ion-col>
<ion-col offset-6 col-3 text-right>
<a (click)="AddHouseExpenseForm()">
<ion-icon name="add-circle" color="optblue" style="font-size: 22px;"></ion-icon>
@ -450,7 +450,7 @@
<mat-card-header><h4>Other Business Income Items</h4></mat-card-header>
<ion-row>
<ion-col col-3 *ngIf="busissnessIncome !=''"><a (click)="editIncomeAllDetails(busissnessIncome)"><h2>{{"&#9998;"}}</h2></a></ion-col>
<ion-col col-3 *ngIf="busissnessIncome !='' "><a (click)="editIncomeAllDetails(busissnessIncome)"><h2>{{"&#9998;"}}</h2></a></ion-col>
<ion-col offset-6 col-3 text-right>
<a (click)="AddIncomeForm()">
<ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon>

56
src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.ts
View File

@ -195,12 +195,14 @@ export class PdQuestionBusinessAssetsPage {
})
}
getAddress(flag){
// console.log("flag",flag);
let params:any={};
params.parent_pdid=this.pdDetails.parent_pd_id
params.pd_id=this.pdDetails.pd_id;
params.pd_form_id='5'
this.qustcat.retiverForm(params).subscribe(data => {
// console.log("daa",data);
const control= <FormArray>this._businessAssetsQuesFrom.controls['business_assets_for_address'];
if(data['status'] == 200) {
if(flag == 1){
@ -214,7 +216,7 @@ export class PdQuestionBusinessAssetsPage {
let dataOfAddress = data['records'].addresses.filter(item => item.isactive == 1);
this.addressList.push({ key_name: 'initiate_address', value: data['records'].addresses[0].address, description: 'Initiated Address' });
let initiated_address_check = data['records'].hasOwnProperty('is_pd_done_on_initiated_address') ? data['records'].is_pd_done_on_initiated_address : true;
if (initiated_address_check == true && data['records'].addresses.length > 0)
// if (initiated_address_check == true && data['records'].addresses.length > 0)
if(initiated_address_check == true && data['records'].addresses.length > 0){
data['records'].addresses.forEach((data,inx)=>{
@ -275,40 +277,32 @@ export class PdQuestionBusinessAssetsPage {
})
}
else if(initiated_address_check == true && data['records'].alternative_addresses.length > 0)
else if(initiated_address_check == false && data['records'].alternative_addresses.length > 0)
{
this.addressList.push({ key_name: 'alternative_addresses', value: data['records'].alternative_addresses[0].alternative_address, description: 'Alternative Address' });
data['records'].alternative_address.forEach((data,inx)=>{
this.qustcat.getStateWiseCities(data.state).subscribe(res=>{
if (data['status'] == 200) {
console.log("state",res)
this.cityArr=res.records.cities
// console.log("data[",data['records'].alternative_address)
data['records'].alternative_addresses.forEach((data,inx)=>{
this.qustcat.getStateWiseCities(data.alternative_state).subscribe(res=>{
console.log("entered",res);
if (res.status == 200) {
this.cityArr = res.records.cities;
this.pinArr = res.records.pincode;
let selectedAddressType = this.m_address_type.filter(element => element.address_type_id == data.address_type)[0];
let selectedState = this.m_state_for_address.filter(element => element.state_id == data.state)[0];
let selectedCity = this.cityArr.filter(element => element.city_id == data.city)[0];
let selectedPincode = this.pinArr.filter(element => element.pincode_id == data.pincode)[0];
console.log(selectedCity)
if(selectedAddressType != '' && selectedAddressType != undefined){
this.addressType = data.address_type != 1 ? selectedAddressType.address_type : data.address_type_others;
}
else{
this.addressType=''
}
// let address = data.address + ' , ' + selectedCity.city_name + ','+selectedState.name +'-' + (data.pincode == 1 ? data.pincode_others : selectedPincode.pincode);
let address = data.address.replace(/\n/g,"") + ' , ' + selectedCity.city_name + ','+selectedState.name +'-' + (data.pincode == 1 ? data.pincode_others : selectedPincode.pincode);
// let selectedAddressType = this.m_address_type.filter(element =>element.address_type_id == data.address_type)[0];
// let address = data.address;
// let addressType = data.address_type != 1 ? selectedAddressType.address_type : data.address_type_others;
this.placeholderName[inx] = 'Was any business activity seen at the '+ this.addressType+' during PD visit?';
//console.log(this.placeholderName)
let addressLabel = " : "+address+' / '+ this.addressType ;
console.log("dd",addressLabel)
let selectedState = this.m_state_for_address.filter(element => element.state_id == data.alternative_state)[0];
let selectedCity = this.cityArr.filter(element => element.city_id == data.alternative_city)[0];
let selectedPincode = this.pinArr.filter(element => element.pincode_id == data.alternative_pincode)[0];
let addressType = data.address_type != 1 ? selectedAddressType.address_type : data.address_type_others;
this.addressType = addressType;
let address = data.alternative_address.replace(/\n/g,"") + ' , ' + selectedCity.city_name + ',' + selectedState.name + '-' + (data.alternative_pincode == 1 ? data.alternative_pincode_others : selectedPincode.pincode);
this.placeholderName[inx] = 'Was any business activity seen at the ' + addressType + ' during PD visit?';
let addressLabel = address + ' / ' + addressType;
let values={
address_label:addressLabel,
business_years: '',

17
src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts
View File

@ -572,7 +572,7 @@ export class PdQuestionBusinessInfoPage {
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 && 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('pos_machines_details', this.fb.array([])) : this.businessForm.removeControl('pos_machines_details')
selectedRetail.length > 0 && businessVal.applicant_use_pos_machines == 'yes' && businessVal.hasOwnProperty('pos_machines_details') ? this.businessForm.addControl('pos_machines_details', this.fb.array([])) : this.businessForm.removeControl('pos_machines_details')
selectedRetail.forEach((element, index) => {
this.CheckExport(element.area_of_sale, 'RActivity', index)
retailControl.push(this.manufactureDetails());
@ -651,7 +651,7 @@ export class PdQuestionBusinessInfoPage {
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 && 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('pos_machines_details', this.fb.array([])) : this.businessForm.removeControl('pos_machines_details')
selectedWholesale.length > 0 && businessVal.applicant_use_pos_machines == 'yes' && businessVal.hasOwnProperty('pos_machines_details') ? this.businessForm.addControl('pos_machines_details', this.fb.array([])) : this.businessForm.removeControl('pos_machines_details')
selectedWholesale.forEach((element, index) => {
this.CheckExport(element.area_of_sale, 'WActivity', index)
wholesaleControl.push(this.manufactureDetails());
@ -731,7 +731,7 @@ export class PdQuestionBusinessInfoPage {
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 && 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('pos_machines_details', this.fb.array([])) : this.businessForm.removeControl('pos_machines_details')
selectedService.length > 0 && businessVal.applicant_use_pos_machines == 'yes' && businessVal.hasOwnProperty('pos_machines_details') ? this.businessForm.addControl('pos_machines_details', this.fb.array([])) : this.businessForm.removeControl('pos_machines_details')
selectedService.forEach((element, index) => {
this.CheckExport(element.area_of_sale, 'SPActivity', index)
@ -848,11 +848,14 @@ export class PdQuestionBusinessInfoPage {
//this.businessForm.controls['persons_with_relationships'].setValue(PartnrArray1)
// this.businessForm.controls['manufacturing_activity_details'].setValue(businessVal.manufacturing_activity_details)
if (businessVal.applicant_use_pos_machines == 'yes') {
if (businessVal.applicant_use_pos_machines == 'yes' && businessVal.hasOwnProperty('pos_machines_details')) {
//For Adding the bank search in data
if(businessVal.hasOwnProperty('pos_machines_details')){
// console.log("dd",this.businessForm.controls['pos_machines_details']);
businessVal.pos_machines_details.forEach(value => {
value.bankSearch = ''
})
}
//-----------------------
this.businessForm.controls.no_of_pos_machines.setValue(businessVal.no_of_pos_machines);
const posControl: any = <FormArray>this.businessForm.controls['pos_machines_details'];
@ -1982,10 +1985,11 @@ export class PdQuestionBusinessInfoPage {
if (records.partners.length > 0) {
records.partners.forEach(element => {
// console.log(element)
count += element.shareholding
count += parseInt(element.shareholding)
})
}
if (count >= 101) {
console.log("count",count)
this.toast.pdTriggerappmessage("Share Holding is Greater than 100 %");
// this.businessForm.get('shareholding').value.setFocus()
//this.businessForm.controls['partners']
@ -2107,11 +2111,12 @@ export class PdQuestionBusinessInfoPage {
// });
// }
// console.log('records',records);
this.spinner_access=true;
this.cons.getGeoTag().then(geoCordinates=>{
if(!records.business_info_location){
records.business_info_location=geoCordinates
}
this.spinner_access=true;
// console.log("records",records)
this.qustCat.saveForm(records).subscribe(data => {
if (data['dataStatus'] == true) {

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

@ -570,6 +570,7 @@ submitDetails(){
}
if (val.exist_status == 1 && val.id == 3) {
this.financialForm.addControl('cash_credit_limit', new FormControl(''));
retrieveData.hasOwnProperty('cash_credit_limit') ? retrieveData.cash_credit_limit : retrieveData.cash_credit_limit=''
}
if (val.exist_status == 1 && val.id == 4) {
this.financialForm.addControl('factoring', new FormControl(''));

13
src/pages/pd-question/pd-question-family/pd-question-family.html
View File

@ -159,8 +159,19 @@
<mat-form-field *ngIf="tech.get('residence_pin').value == 1">
<input matInput autocomplete="off" type="number" placeholder="Specify Pincode" formControlName="residence_other_pincode">
</mat-form-field>
<mat-form-field>
<!-- <mat-form-field>
<input matInput type="number" placeholder="No of years in current residence" formControlName="residence_No_of_years" />
</mat-form-field> --><br/>
<mat-label>
No of years in current residence
</mat-label>
<mat-form-field class="year_month">
<mat-label>Year</mat-label>
<input matInput type="number" placeholder="No of years (Eg. 10)" formControlName="residence_No_of_years" />
</mat-form-field>&nbsp;&nbsp;
<mat-form-field class="year_month">
<mat-label>Month</mat-label>
<input matInput type="number" placeholder="No of months (Eg. 6)" formControlName="residence_No_of_months" />
</mat-form-field>
<mat-form-field>
<mat-select placeholder="Ownership " formControlName="residence_ownership" >

3
src/pages/pd-question/pd-question-family/pd-question-family.scss
View File

@ -36,4 +36,7 @@ page-pd-question-family {
height: 28px;
}
.year_month{
width: 46%;
}
}

2
src/pages/pd-question/pd-question-family/pd-question-family.ts
View File

@ -194,6 +194,7 @@ data:any;
residence_pin: [''],
residence_other_pincode:[''],
residence_No_of_years: [''],
residence_No_of_months:[''],
residence_ownership: [''],
ownershipOther: [''],
rent: [''],
@ -222,6 +223,7 @@ data:any;
residence_pin:[val.residence_pin],
residence_other_pincode:[val.residence_other_pincode],
residence_No_of_years: [val.residence_No_of_years],
residence_No_of_months:[val.residence_No_of_months || ''],
residence_ownership:[val.residence_ownership],
rent:[val.rent || null],
ownershipOther:[val.ownershipOther || null],

20
src/pages/pd-question/pd-question-general-info/pd-question-general-info.ts
View File

@ -103,7 +103,7 @@ export class PdQuestionGeneralInfoPage {
this.customer_segment_abbr = this.pdDetails.customer_segment_abbr;
// console.log('this.customer_segment_abbr',this.customer_segment_abbr)
this.users = this.aws.getlocale();
this.getdropdown();
this.generalForm = this.fb.group({
parent_pdid:this.pdDetails.parent_pd_id,
@ -171,7 +171,7 @@ export class PdQuestionGeneralInfoPage {
ionViewDidLoad() {
// this.pd_applicants_details.pop();
console.info("%cionViewDidLoad, PdQuestionGeneralInfoPage","font-size:100%;color:purple;font-weight:bold;font-family:Mongoose;");
this.getGeneralForm()
this.getdropdown();
this.getPDImages();
}
@ -815,10 +815,7 @@ dataobj:any;
this.qualificationList=res['records'].filter(com=>com.isactive==1);
}
});
this.qustCat.getcommondrop('BUSINESSENTITYTYPE').subscribe(res=>{
this.businessEntityTypeList=res['records'].filter(com=>com.isactive==1);
});
this.qustCat.getcommondrop('RELATIONSHIPS').subscribe(res=>
{
if(res['dataStatus']==true)
@ -839,6 +836,13 @@ dataobj:any;
this.titleList=res['records'].filter(com=>com.isactive==1);
}
});
this.qustCat.getcommondrop('BUSINESSENTITYTYPE').subscribe(res=>{
this.businessEntityTypeList=res['records'].filter(com=>com.isactive==1);
this.getGeneralForm();
});
}
@ -1128,13 +1132,13 @@ console.log('1)',this.temp);
saveRecords.persons_with_relationships=answerData.persons_with_relationships;
// saveRecords.company_with_relationships=answerData.company_with_relationships
saveRecords.general_remark=answerData.general_remark;
this.spinner_access=true;
this.cons.getGeoTag().then(res=>{
// console.log("Geo Coords",res)
if(!saveRecords.general_info_location){
saveRecords.general_info_location=res
}
this.spinner_access=true;
// console.log("save records",saveRecords);
this.qustCat.saveForm(saveRecords).subscribe(dataResult=>{
if(dataResult['dataStatus']==true){

8
src/pages/pd-question/pd-question-loans/pd-question-loans.html
View File

@ -260,12 +260,12 @@
formControlName="emv_per_customer" type="number" (keyup)="inWords($event,7)" >
<mat-hint align="end" *ngIf="loanDetailsForm.controls['emv_per_customer'].value != ''">{{"&#8377;"}} {{emvAmtInWords}} Only</mat-hint>
</mat-form-field>
<div *ngIf="productAbbr == 'HL' || productAbbr == 'NRPL' || productAbbr == 'LL'">
<mat-form-field style="width: 100%">
<!-- <div *ngIf="productAbbr == 'HL' || productAbbr == 'NRPL' || productAbbr == 'LL'"> -->
<mat-form-field style="width: 100%" *ngIf="productAbbr !== 'LAP'" >
<input matInput placeholder="Name of the Current Owner(s)/Seller(s) of the Property" formControlName="property_seller">
</mat-form-field>
<mat-form-field style="width: 100%">
<mat-label>Address of the Proposed Property</mat-label>
<mat-label>{{address_placeholder}}</mat-label>
<input matInput placeholder="Eg. No.20 Gandhi Street" formControlName="address">
</mat-form-field>
@ -312,7 +312,7 @@
<mat-form-field *ngIf="loanDetailsForm.get('pincode').value == 1">
<input matInput autocomplete="off" type="number" placeholder="Specify Pincode" formControlName="other_pincode">
</mat-form-field>
</div>
<!-- </div> -->
<!-- <mat-form-field>
<input matInput placeholder="Value as Per Agreement"
formControlName="value_per_agreement" type="number" (keyup)="inWords($event,3)">

71
src/pages/pd-question/pd-question-loans/pd-question-loans.ts
View File

@ -90,6 +90,7 @@ export class PdQuestionLoansPage {
stateDataValue: any;
original_mortageTypeProperty: any=[];
spinner_access:boolean=false
address_placeholder: string;
constructor(public navCtrl: NavController, public navParams: NavParams, public fb: FormBuilder,
public qustCat: QuestionCategoryProvider, public aws: AwsServiceProvider,
@ -153,7 +154,7 @@ export class PdQuestionLoansPage {
this.onChangeSubProduct(this.pdDetails.fk_subproduct_id);
}
if(this.pdDetails.product_abbr !="BL" || this.pdDetails.product_abbr !="PL" || this.pdDetails.product_abbr !="LL")
if(this.pdDetails.product_abbr !="BL" || this.pdDetails.product_abbr !="PL" || this.pdDetails.product_abbr !="LAEP")
{
this.mortagetypeAccess = true;
}else
@ -163,10 +164,13 @@ export class PdQuestionLoansPage {
if(this.productAbbr == 'HL' || this.productAbbr == 'NRPL' || this.productAbbr == 'LL'){
this.addControlAddress('')
this.owner_name_placeholder='Name of the Proposed Owner'
this.address_placeholder='Address of the Proposed Property'
}
// if(this.productAbbr == 'HL' || this.productAbbr == 'NRPL' || this.productAbbr == 'LL')
else{
this.addControlAddress('')
this.owner_name_placeholder='Name of Owner'
this.address_placeholder='Address of Property'
}
@ -653,17 +657,17 @@ export class PdQuestionLoansPage {
records.is_there_total_fund = this.loanDetailsForm.controls['is_there_total_fund'].value;
records.fund_amt = this.loanDetailsForm.controls['fund_amt'].value;
if(this.productAbbr == 'HL' || this.productAbbr == 'NRPL' || this.productAbbr == 'LL'){
// if(this.productAbbr == 'HL' || this.productAbbr == 'NRPL' || this.productAbbr == 'LL'){
records.property_seller=this.loanDetailsForm.controls['property_seller'].value
records.address=this.loanDetailsForm.controls['address'].value
records.state=this.loanDetailsForm.controls['state'].value
records.city=this.loanDetailsForm.controls['city'].value
records.pincode=this.loanDetailsForm.controls['pincode'].value
if(this.loanDetailsForm.controls['pincode'].value == '1'){
records.other_pincode=this.loanDetailsForm.controls['other_pincode'].value
}
}
// records.property_seller=this.loanDetailsForm.controls['property_seller'].value
// records.address=this.loanDetailsForm.controls['address'].value
// records.state=this.loanDetailsForm.controls['state'].value
// records.city=this.loanDetailsForm.controls['city'].value
// records.pincode=this.loanDetailsForm.controls['pincode'].value
// if(this.loanDetailsForm.controls['pincode'].value == '1'){
// records.other_pincode=this.loanDetailsForm.controls['other_pincode'].value
// }
// }
// get end user final group data
let dataEnd_user_data = [];
this.loanDetailsForm.controls['end_use'].value.forEach(element => {
@ -744,6 +748,15 @@ export class PdQuestionLoansPage {
records.construction_status = this.loanDetailsForm.controls['construction_status'].value;
// records.percentage_of_construction = this.loanDetailsForm.controls['percentage_of_construction'].value;
records.property_seller=this.loanDetailsForm.controls['property_seller'].value
records.address=this.loanDetailsForm.controls['address'].value
records.state=this.loanDetailsForm.controls['state'].value
records.city=this.loanDetailsForm.controls['city'].value
records.pincode=this.loanDetailsForm.controls['pincode'].value
if(this.loanDetailsForm.controls['pincode'].value == '1'){
records.other_pincode=this.loanDetailsForm.controls['other_pincode'].value
}
}else{
records.property_type = null;
@ -897,7 +910,17 @@ export class PdQuestionLoansPage {
if(loanDetails.property_type !=null && loanDetails.property_type !=''){
this.mortage_type(this.propertyType);
if(this.mortageCardAccess == true){
this.loanDetailsForm.controls['property_type_others'].setValue(loanDetails.property_type_others);
this.loanDetailsForm.controls['property_type_others'].setValue(loanDetails.property_type_others);
this.getCity(loanDetails.state,'')
// this.addControlAddress(loanDetails)
// this.owner_name_placeholder='Name of the Proposed Owner'
this.loanDetailsForm.controls['property_seller'].setValue(loanDetails.property_seller)
this.loanDetailsForm.controls['address'].setValue(loanDetails.address)
this.loanDetailsForm.controls['state'].setValue(loanDetails.state)
this.loanDetailsForm.controls['city'].setValue(loanDetails.city)
this.loanDetailsForm.controls['pincode'].setValue(loanDetails.pincode)
if(loanDetails.pincode == '1'){
this.loanDetailsForm.controls['other_pincode'].setValue(loanDetails.other_pincode)}
// this.mortage_type(loanDetails.property_type_others);
}
@ -909,18 +932,18 @@ export class PdQuestionLoansPage {
{
this.emvAmtInWords=this.constant.convertNumberToWords(loanDetails.emv_per_customer);
}
if(this.productAbbr == 'HL' || this.productAbbr == 'NRPL' || this.productAbbr == 'LL'){
this.getCity(loanDetails.state,'')
// this.addControlAddress(loanDetails)
// this.owner_name_placeholder='Name of the Proposed Owner'
this.loanDetailsForm.controls['property_seller'].setValue(loanDetails.property_seller)
this.loanDetailsForm.controls['address'].setValue(loanDetails.address)
this.loanDetailsForm.controls['state'].setValue(loanDetails.state)
this.loanDetailsForm.controls['city'].setValue(loanDetails.city)
this.loanDetailsForm.controls['pincode'].setValue(loanDetails.pincode)
if(loanDetails.pincode == '1'){
this.loanDetailsForm.controls['other_pincode'].setValue(loanDetails.other_pincode)}
}
// if(this.productAbbr == 'HL' || this.productAbbr == 'NRPL' || this.productAbbr == 'LL'){
// this.getCity(loanDetails.state,'')
// // this.addControlAddress(loanDetails)
// // this.owner_name_placeholder='Name of the Proposed Owner'
// this.loanDetailsForm.controls['property_seller'].setValue(loanDetails.property_seller)
// this.loanDetailsForm.controls['address'].setValue(loanDetails.address)
// this.loanDetailsForm.controls['state'].setValue(loanDetails.state)
// this.loanDetailsForm.controls['city'].setValue(loanDetails.city)
// this.loanDetailsForm.controls['pincode'].setValue(loanDetails.pincode)
// if(loanDetails.pincode == '1'){
// this.loanDetailsForm.controls['other_pincode'].setValue(loanDetails.other_pincode)}
// }
// this.loanDetailsForm.controls['value_per_agreement'].setValue(loanDetails.value_per_agreement);

2
src/theme/officer-notes-modal.scss
View File

@ -13,7 +13,7 @@
// height: 98% !important;
// width:10% !important;
// margin-top: 13.5%;
margin-top:29%;
margin-top:15%;
mat-card{
// background-color:rgb(252, 252, 161);

BIN
www/assets/fonts/roboto-bold.ttf
View File

Binary file not shown.

BIN
www/assets/fonts/roboto-light.ttf
View File

Binary file not shown.

BIN
www/assets/fonts/roboto-medium.ttf
View File

Binary file not shown.

BIN
www/assets/fonts/roboto-regular.ttf
View File

Binary file not shown.

3
www/index.html
View File

@ -1,6 +1,9 @@
<!DOCTYPE html>
<html lang="en" dir="ltr">
<head>
<script data-ionic="inject">
(function(w){var i=w.Ionic=w.Ionic||{};i.version='3.9.2';i.angular='^5.0.3';i.staticDir='build/';})(window);
</script>
<meta charset="UTF-8">
<title>Ionic App</title>
<meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">