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

Fairoj : current loan changes, credit person display in view screen and SEP_INDV changes are done

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-09-25 16:07:08 +05:30
parent 42ae3f0978
commit c54d2199a7
26 changed files with 507 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

18
build.json Normal file
View File

@ -0,0 +1,18 @@
{
"android": {
"debug": {
"keystore": "releaseApk/pd-genie-officer.jks",
"storePassword": "pdgenieofficer",
"alias": "my-alias",
"password" : "pdgenieofficer",
"keystoreType": ""
},
"release": {
"keystore": "releaseApk/pd-genie-officer.jks",
"storePassword": "pdgenieofficer",
"alias": "my-alias",
"password" : "pdgenieofficer",
"keystoreType": ""
}
}
}

3
config.xml
View File

@ -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.14" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="com.sineedge.pdgenie" version="0.0.16" 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>
@ -100,6 +100,7 @@
<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="11.6.2" />
</plugin> </plugin>
<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.0.0" />
</widget> </widget>

10
package-lock.json generated
View File

@ -180,6 +180,11 @@
"resolved": "https://registry.npmjs.org/@ionic-native/location-accuracy/-/location-accuracy-4.19.0.tgz", "resolved": "https://registry.npmjs.org/@ionic-native/location-accuracy/-/location-accuracy-4.19.0.tgz",
"integrity": "sha512-jxpAGAzMfaMB7iB48n9M28hKRQdMdQHmUBFJUDf0dFI84QKDTRIScdUTiyW9Ny7AmDSuZdwLGbpC0L3wp73Oeg==" "integrity": "sha512-jxpAGAzMfaMB7iB48n9M28hKRQdMdQHmUBFJUDf0dFI84QKDTRIScdUTiyW9Ny7AmDSuZdwLGbpC0L3wp73Oeg=="
}, },
"@ionic-native/market": {
"version": "4.20.0",
"resolved": "https://registry.npmjs.org/@ionic-native/market/-/market-4.20.0.tgz",
"integrity": "sha512-MGYj/uEbamyRHdrcV/zqX3MT9WCBer5wpAO3iK6jrdYXc5glw1EdUJ3N+HkkWJ4waVHO3+qBexJsWHSnz64+1Q=="
},
"@ionic-native/push": { "@ionic-native/push": {
"version": "4.20.0", "version": "4.20.0",
"resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-4.20.0.tgz", "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-4.20.0.tgz",
@ -2451,6 +2456,11 @@
"resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-2.2.0.tgz", "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-2.2.0.tgz",
"integrity": "sha512-mNTJaIRsz83Vntk2d3jrPCnlqEPQsfOJW6U2AzS7WV1T15Jj/STdXI/Uv1vIyvPVd9h1OLF+yu64ZsmQH2VRMQ==" "integrity": "sha512-mNTJaIRsz83Vntk2d3jrPCnlqEPQsfOJW6U2AzS7WV1T15Jj/STdXI/Uv1vIyvPVd9h1OLF+yu64ZsmQH2VRMQ=="
}, },
"cordova-plugin-market": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/cordova-plugin-market/-/cordova-plugin-market-1.2.0.tgz",
"integrity": "sha1-YeNkKBR+lUAsZOr4bjFzeP/bJ08="
},
"cordova-plugin-mauron85-background-geolocation": { "cordova-plugin-mauron85-background-geolocation": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/cordova-plugin-mauron85-background-geolocation/-/cordova-plugin-mauron85-background-geolocation-3.0.1.tgz", "resolved": "https://registry.npmjs.org/cordova-plugin-mauron85-background-geolocation/-/cordova-plugin-mauron85-background-geolocation-3.0.1.tgz",

5
package.json
View File

@ -36,6 +36,7 @@
"@ionic-native/geolocation": "^4.19.0", "@ionic-native/geolocation": "^4.19.0",
"@ionic-native/launch-navigator": "^4.16.0", "@ionic-native/launch-navigator": "^4.16.0",
"@ionic-native/location-accuracy": "^4.19.0", "@ionic-native/location-accuracy": "^4.19.0",
"@ionic-native/market": "^4.20.0",
"@ionic-native/push": "^4.20.0", "@ionic-native/push": "^4.20.0",
"@ionic-native/splash-screen": "4.4.0", "@ionic-native/splash-screen": "4.4.0",
"@ionic-native/sqlite": "^4.19.0", "@ionic-native/sqlite": "^4.19.0",
@ -56,6 +57,7 @@
"cordova-plugin-geolocation": "2.4.3", "cordova-plugin-geolocation": "2.4.3",
"cordova-plugin-ionic-keyboard": "^2.0.5", "cordova-plugin-ionic-keyboard": "^2.0.5",
"cordova-plugin-ionic-webview": "^2.0.0", "cordova-plugin-ionic-webview": "^2.0.0",
"cordova-plugin-market": "1.2.0",
"cordova-plugin-mauron85-background-geolocation": "3.0.1", "cordova-plugin-mauron85-background-geolocation": "3.0.1",
"cordova-plugin-request-location-accuracy": "2.2.3", "cordova-plugin-request-location-accuracy": "2.2.3",
"cordova-plugin-splashscreen": "5.0.2", "cordova-plugin-splashscreen": "5.0.2",
@ -124,7 +126,8 @@
"ACCOUNT_LABEL": "@string/app_name", "ACCOUNT_LABEL": "@string/app_name",
"ACCOUNT_TYPE": "$PACKAGE_NAME.account", "ACCOUNT_TYPE": "$PACKAGE_NAME.account",
"CONTENT_AUTHORITY": "$PACKAGE_NAME" "CONTENT_AUTHORITY": "$PACKAGE_NAME"
} },
"cordova-plugin-market": {}
}, },
"platforms": [ "platforms": [
"browser", "browser",

3
plugins/android.json
View File

@ -66,6 +66,9 @@
"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": {

8
plugins/fetch.json
View File

@ -174,5 +174,13 @@
}, },
"is_top_level": true, "is_top_level": true,
"variables": {} "variables": {}
},
"cordova-plugin-market": {
"source": {
"type": "registry",
"id": "cordova-plugin-market"
},
"is_top_level": true,
"variables": {}
} }
} }

36
src/app/app.component.ts
View File

@ -19,6 +19,8 @@ import { CookieStorage } from 'amazon-cognito-identity-js';
import {ToastProvider} from '../providers/common-provider/toast' import {ToastProvider} from '../providers/common-provider/toast'
import { PdtriggerProvider } from '../providers/pdtrigger/pdtrigger'; 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 { Market } from '@ionic-native/market';
// declare let notificationAccess:boolean // declare let notificationAccess:boolean
@ -39,11 +41,13 @@ export class MyApp {
pages: Array<{title: string,icon:any, method: any}>; pages: Array<{title: string,icon:any, method: any}>;
Camerauri: any; Camerauri: any;
curr_environmnet:any;
constructor(public platform: Platform, public statusBar: StatusBar, public splashScreen: SplashScreen,public aws:AwsServiceProvider,public shared:CognitoServiceProvider,public AWS:AwsServiceProvider constructor(public platform: Platform, public statusBar: StatusBar, public splashScreen: SplashScreen,public aws:AwsServiceProvider,public shared:CognitoServiceProvider,public AWS:AwsServiceProvider
,public alertCtrl:AlertController,cache:CacheService,private push:Push, ,public alertCtrl:AlertController,cache:CacheService,private push:Push,
private event:Events,private toastProvider:ToastProvider, private event:Events,private toastProvider:ToastProvider,
private pdtrigger:PdtriggerProvider,private appVersion:AppVersion) { private pdtrigger:PdtriggerProvider,private appVersion:AppVersion,private constantProvider:ConstantsProvider,
private marketOpener:Market) {
if(this.platform.is('android')){ if(this.platform.is('android')){
this.platform.resume.subscribe((event:any)=>{ this.platform.resume.subscribe((event:any)=>{
@ -51,6 +55,7 @@ export class MyApp {
this.handleAndroidCameraRestart(event) this.handleAndroidCameraRestart(event)
}) })
} }
this.curr_environmnet=this.constantProvider.environment()
// cache.setDefaultTTL(60*60) // cache.setDefaultTTL(60*60)
cache.enableCache(false); cache.enableCache(false);
this.initializeApp(); this.initializeApp();
@ -82,6 +87,9 @@ this.notificationAccess=false
this.platform.ready().then(() => { this.platform.ready().then(() => {
// Okay, so the platform is ready and our plugins are available. // Okay, so the platform is ready and our plugins are available.
// Here you can do any higher level native things you might need. // Here you can do any higher level native things you might need.
if(this.curr_environmnet.environment_name == 'production'){
this.checkAppVersion();
}
this.statusBar.styleDefault(); this.statusBar.styleDefault();
if (this.platform.is('android')) { if (this.platform.is('android')) {
this.statusBar.overlaysWebView(false); this.statusBar.overlaysWebView(false);
@ -333,5 +341,31 @@ let alert=this.alertCtrl.create({
console.log("Push permission",res); console.log("Push permission",res);
}) })
} }
checkAppVersion(){
this.pdtrigger.checkAppVersion().subscribe(result=>{
if(result['dataStatus']){
console.log("app versions",this.app_version,result);
console.log(result['records'][0].version.toString())
if(this.app_version != result['records'][0].version.toString()){
return new Promise((resolve,reject)=>{
let alert= this.toastProvider.setAlertwithOKButton("Update Available","A new version of App is available Please download it..!")
alert.present();
alert.onDidDismiss((data)=>{
if(data == false){
this.platform.exitApp();
reject()
return true;
}
else{
this.marketOpener.open('com.sineedge.pdgenie');
this.platform.exitApp();
}
})
})
}
}
})
}
} }

5
src/app/app.module.ts
View File

@ -141,6 +141,7 @@ import {AppVersion} from '@ionic-native/app-version'
import { OfficerNotesModalPage } from '../pages/officer-notes-modal/officer-notes-modal'; import { OfficerNotesModalPage } from '../pages/officer-notes-modal/officer-notes-modal';
import { QueriesDocsPage } from '../pages/queries-docs/queries-docs'; import { QueriesDocsPage } from '../pages/queries-docs/queries-docs';
import {Market} from '@ionic-native/market'
@NgModule({ @NgModule({
declarations: [ declarations: [
@ -326,8 +327,8 @@ import { QueriesDocsPage } from '../pages/queries-docs/queries-docs';
PdPipe,LocationAccuracy, PdPipe,LocationAccuracy,
LoadingProvider,Geolocation, LoadingProvider,Geolocation,
DatabaseProvider, DatabaseProvider,
StorageProvider StorageProvider,
Market
] ]
}) })
export class AppModule { export class AppModule {

41
src/pages/input/input.html
View File

@ -168,7 +168,7 @@
<mat-card-title><h5>Lender Contact Details</h5></mat-card-title> <mat-card-title><h5>Lender Contact Details</h5></mat-card-title>
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<div *ngIf="pdMaster.pd_contact_person != null && pdMaster.pd_contact_person != ''">
<ion-row> <ion-row>
<ion-col> <ion-col>
<ion-col class="cardinfo"><ion-icon name="contact"></ion-icon>&nbsp; {{pdMaster.pd_contact_person}}</ion-col> <ion-col class="cardinfo"><ion-icon name="contact"></ion-icon>&nbsp; {{pdMaster.pd_contact_person}}</ion-col>
@ -181,6 +181,45 @@
<a href="tel:?{{pdMaster.pd_contact_mobileno}}" style="text-decoration: none;"><ion-icon color="optblue" style="font-size: 24px;" name="call"></ion-icon> <a href="tel:?{{pdMaster.pd_contact_mobileno}}" style="text-decoration: none;"><ion-icon color="optblue" style="font-size: 24px;" name="call"></ion-icon>
</a></ion-col> </a></ion-col>
</ion-row> </ion-row>
</div>
<div *ngIf="pdMaster.lender_credit_person_name != null && pdMaster.lender_credit_person_name != ''">
<hr/>
<!--<mat-card-header>-->
<mat-card-subtitle>Credit Person</mat-card-subtitle>
<!-- </mat-card-header> -->
<ion-row>
<ion-col>
<ion-col class="cardinfo"><ion-icon name="contact"></ion-icon>&nbsp; {{pdMaster.lender_credit_person_name}}</ion-col>
</ion-col>
</ion-row>
<ion-row>
<ion-col col-1><ion-icon name="call"></ion-icon></ion-col>
<ion-col class="cardinfo">{{pdMaster.lender_credit_person_contact_mobileno}}</ion-col>
<ion-col col-2 color="optblue">
<a href="tel:?{{pdMaster.lender_credit_person_contact_mobileno}}" style="text-decoration: none;"><ion-icon color="optblue" style="font-size: 24px;" name="call"></ion-icon>
</a></ion-col>
</ion-row>
</div>
<div *ngIf="pdMaster.lender_sales_person_name != null && pdMaster.lender_sales_person_name != ''">
<hr/>
<!-- <mat-card-sub-header> -->
<mat-card-subtitle>Sales Person</mat-card-subtitle>
<!-- </mat-card-sub-header> -->
<ion-row>
<ion-col>
<ion-col class="cardinfo"><ion-icon name="contact"></ion-icon>&nbsp; {{pdMaster.lender_sales_person_name}}</ion-col>
</ion-col>
</ion-row>
<ion-row>
<ion-col col-1><ion-icon name="call"></ion-icon></ion-col>
<ion-col class="cardinfo">{{pdMaster.lender_sales_contact_mobileno}}</ion-col>
<ion-col col-2 color="optblue">
<a href="tel:?{{pdMaster.lender_sales_contact_mobileno}}" style="text-decoration: none;"><ion-icon color="optblue" style="font-size: 24px;" name="call"></ion-icon>
</a></ion-col>
</ion-row>
</div>
</mat-card-content> </mat-card-content>
</mat-card><br/> </mat-card><br/>

4
src/pages/pd-list/pd-list.ts
View File

@ -25,7 +25,7 @@ import {Content} from 'ionic-angular'
}) })
export class PdListPage { export class PdListPage {
@ViewChild(Content) content: Content // @ViewChild(Content) content: Content
@ViewChild('slider') slider:Slides; @ViewChild('slider') slider:Slides;
searchinprogress: any; searchinprogress: any;
searchpast: any; searchpast: any;
@ -54,7 +54,7 @@ export class PdListPage {
selectedTab(ind) selectedTab(ind)
{ {
this.slider.slideTo(ind) this.slider.slideTo(ind)
this.content.scrollToTop(); // this.content.scrollToTop();
} }
moveButton(event){ moveButton(event){
this.pdlist=event._snapIndex.toString(); this.pdlist=event._snapIndex.toString();

2
src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.html
View File

@ -129,7 +129,7 @@
<mat-option value="no">No</mat-option> <mat-option value="no">No</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<p style="margin-left: 2% !important">No of Years in Current Business</p> <p style="margin-left: 2% !important">No of Years in Current <span *ngIf="customer_segment_abbr == 'SEP_INDV'">Profession</span> <span *ngIf="customer_segment_abbr != 'SEP_INDV'">Business</span></p>
<mat-form-field style="width:100%;" style="width: 45%"> <mat-form-field style="width:100%;" style="width: 45%">
<input matInput autocomplete="off" placeholder="Year" type="number" <input matInput autocomplete="off" placeholder="Year" type="number"
formControlName="current_business_experiance_year" formControlName="current_business_experiance_year"

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

@ -48,7 +48,7 @@ export class PdQuestionBusinessInfoPage {
activityData: any = []; activityData: any = [];
relativeNames: any; relativeNames: any;
companyRelationShipList: any = [] companyRelationShipList: any = []
countryDataList: any = [] countryDataList: any = [{}]
exist_status: any; exist_status: any;
filterCityList: any = []; filterCityList: any = [];
@ -89,6 +89,7 @@ export class PdQuestionBusinessInfoPage {
imageBucket: any = []; imageBucket: any = [];
tab: string = '0'; tab: string = '0';
complete_status: boolean = false; complete_status: boolean = false;
customer_segment_abbr: any;
constructor(public navCtrl: NavController, public navParams: NavParams, constructor(public navCtrl: NavController, public navParams: NavParams,
public aws: AwsServiceProvider, public toast: ToastProvider, public aws: AwsServiceProvider, public toast: ToastProvider,
@ -112,6 +113,8 @@ export class PdQuestionBusinessInfoPage {
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;
console.log("cus",this.pdDetails.customer_segment_abbr)
this.customer_segment_abbr=this.pdDetails.customer_segment_abbr
this.step = 0 this.step = 0
@ -863,6 +866,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')){
@ -879,6 +883,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'); }
@ -1426,9 +1431,16 @@ export class PdQuestionBusinessInfoPage {
} }
// Out of Total Export Sales what % of Sales is done in Albania? // Out of Total Export Sales what % of Sales is done in Albania?
getPlaceHolderName(id) { getPlaceHolderName(id) {
let name = this.countryDataList.filter(value => value.country_id == id); let name;
// name.country_name=''
return 'Out of Total Export Sales what % of Sales is done in ' + name[0].country_name + ' ?'; name = this.countryDataList.filter(value => value.country_id == id)[0];
console.log("name[0]",name)
if(name){
return 'Out of Total Export Sales what % of Sales is done in ' + name.country_name + ' ?';
}
else {
return 'Out of Total Export Sales what % of Sales is done in'
}
// return name[0].country_name +'?'; // return name[0].country_name +'?';
} }
ConvertMonthintoYear(itemrow, e, i) { ConvertMonthintoYear(itemrow, e, i) {
@ -1752,7 +1764,7 @@ export class PdQuestionBusinessInfoPage {
const control_with_index = <FormArray>control.controls[index]; const control_with_index = <FormArray>control.controls[index];
this.cameraProvider.getpicture().then(res => { this.cameraProvider.getpicture().then(res => {
control_with_index.controls['document_pic'].setValue(res != 'error' ? res : ''); control_with_index.controls['document_pic'].setValue(res != 'error' ? res : '');
let img_name='document_pic' let img_name=control_with_index.controls['document'].value
if(res != 'error'){ if(res != 'error'){
this.cons.getGeoTag().then(geoCoordinates=>{ this.cons.getGeoTag().then(geoCoordinates=>{
let bucket:any=[] let bucket:any=[]
@ -2160,12 +2172,13 @@ export class PdQuestionBusinessInfoPage {
records.hasOwnProperty('esic_regn_pic') && records.esic_regn_pic != '' ? records.esic_regn_pic = 'SAVED' :'' records.hasOwnProperty('esic_regn_pic') && records.esic_regn_pic != '' ? records.esic_regn_pic = 'SAVED' :''
records.hasOwnProperty('fire_noc_pic') && records.fire_noc_pic != '' ? records.fire_noc_pic = 'SAVED' :'' records.hasOwnProperty('fire_noc_pic') && records.fire_noc_pic != '' ? records.fire_noc_pic = 'SAVED' :''
console.log("record params2",records.gst_Regn_cert_pic) console.log("record params2",records.gst_Regn_cert_pic)
if(records.hasOwnProperty('documents')){
if(records.documents.length >0){ if(records.documents.length >0){
records.documents.forEach(value=>{ records.documents.forEach(value=>{
value.document_pic != '' ? value.document_pic = 'SAVED' :'' value.document_pic != '' ? value.document_pic = 'SAVED' :''
}) })
} }
}
this.cons.getGeoTag().then(geoCordinates=>{ this.cons.getGeoTag().then(geoCordinates=>{
if(!records.business_info_location){ if(!records.business_info_location){
records.business_info_location=geoCordinates records.business_info_location=geoCordinates

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

@ -195,20 +195,25 @@
</span> </span>
</div> </div>
</div> </div>
</mat-card-content>
<ion-buttons end> <ion-buttons end>
<ion-col col-3 offset-3> <ion-col col-3 offset-3>
<a *ngIf="item.controls.main_raw_materials.controls.length > 1" (click)="removeRawMaterials(l)"> <a *ngIf="item.controls.main_raw_materials.controls.length > 0" (click)="removeRawMaterials(l)">
<ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon> <ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon>
</a> </a>
</ion-col> </ion-col>
</ion-buttons>
</div><br/>
<ion-buttons>
<ion-col col-2 offset-1> <ion-col col-2 offset-1>
<a (click)="addMoreRawMaterials($event); false" *ngIf="last"> <a (click)="addMoreRawMaterials($event); false" >
<ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> <!-- <ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> -->
<button ion-button color="optblue" small >Add More Client</button>
</a> </a>
</ion-col> </ion-col>
</ion-buttons> </ion-buttons>
</mat-card-content>
</div>
</div> </div>
<div *ngIf="mfgCreditCardFlag"> <div *ngIf="mfgCreditCardFlag">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
@ -333,20 +338,25 @@
</span> </span>
</div> </div>
</div> </div>
</mat-card-content>
<ion-buttons end> <ion-buttons end>
<ion-col col-3 offset-3> <ion-col col-3 offset-3>
<a *ngIf="item.controls.trading_products.controls.length > 1" (click)="removeTradingProduct(l)"> <a *ngIf="item.controls.trading_products.controls.length > 0" (click)="removeTradingProduct(l)">
<ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon> <ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon>
</a> </a>
</ion-col> </ion-col>
</ion-buttons>
</div><br/>
<ion-buttons>
<ion-col col-2 offset-1> <ion-col col-2 offset-1>
<a (click)="addMoretradeProduct($event); false" *ngIf="last"> <a (click)="addMoretradeProduct($event); false" >
<ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> <!-- <ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> -->
<button ion-button color="optblue" small >Add More Client</button>
</a> </a>
</ion-col> </ion-col>
</ion-buttons> </ion-buttons>
</mat-card-content>
</div>
</div> </div>
<div *ngIf="trdCreditCardFlag"> <div *ngIf="trdCreditCardFlag">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
@ -470,20 +480,25 @@
</span> </span>
</div> </div>
</div> </div>
</mat-card-content>
<ion-buttons end> <ion-buttons end>
<ion-col col-3 offset-3> <ion-col col-3 offset-3>
<a *ngIf="item.controls.service_products.controls.length > 1" (click)="removeServiceProduct(l)"> <a *ngIf="item.controls.service_products.controls.length > 0" (click)="removeServiceProduct(l)">
<ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon> <ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon>
</a> </a>
</ion-col> </ion-col>
</ion-buttons>
</div><br/>
<ion-buttons>
<ion-col col-2 offset-1> <ion-col col-2 offset-1>
<a (click)="addMoreServiceProduct($event); false" *ngIf="last"> <a (click)="addMoreServiceProduct($event); false" >
<ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> <!-- <ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> -->
<button ion-button color="optblue" small >Add More Client</button>
</a> </a>
</ion-col> </ion-col>
</ion-buttons> </ion-buttons>
</mat-card-content>
</div>
</div> </div>
<div *ngIf="spCreditCardFlag"> <div *ngIf="spCreditCardFlag">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">

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

@ -135,21 +135,25 @@
</span> </span>
</mat-card-content> </mat-card-content>
<mat-card-actions> <!-- <mat-card-actions> -->
<ion-buttons end> <ion-buttons end>
<ion-col col-3 offset-3> <ion-col col-3 offset-3 text-right>
<a (click)="deleteRawMaterials(a,1)" *ngIf="md.controls.manufacturing_raw_materials.controls.length>1"> <a (click)="deleteRawMaterials(a,1)" *ngIf="md.controls.manufacturing_raw_materials.controls.length>0">
<ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon> <ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon>
</a> </a>
</ion-col> </ion-col>
<ion-col col-2 offset-1> </ion-buttons>
<a (click)="addRawMaterials(1)" *ngIf="last"> </div><br/>
<ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> <ion-buttons end>
<ion-col col-2 offset-1 align="end">
<a (click)="addRawMaterials(1)" >
<button ion-button color="optblue" small >Add More Raw Materials</button>
</a> </a>
</ion-col> </ion-col>
</ion-buttons> </ion-buttons>
</mat-card-actions> <!-- </ion-buttons> -->
</div> <!-- </mat-card-actions> -->
</div> </div>
<div *ngIf="RMCommentCard"> <div *ngIf="RMCommentCard">
@ -176,6 +180,7 @@
</div> </div>
<hr/> <hr/>
<div formArrayName="manufacturing_finished_goods"> <div formArrayName="manufacturing_finished_goods">
<mat-card-subtitle><h6>Finished Goods</h6></mat-card-subtitle>
<div *ngFor="let mfg of md.controls.manufacturing_finished_goods['controls']; let b=index;let last=last" <div *ngFor="let mfg of md.controls.manufacturing_finished_goods['controls']; let b=index;let last=last"
[formGroupName]="b"> [formGroupName]="b">
<mat-card-subtitle>Finished Goods #{{b+1}}</mat-card-subtitle> <mat-card-subtitle>Finished Goods #{{b+1}}</mat-card-subtitle>
@ -236,21 +241,27 @@
</mat-form-field> --> </mat-form-field> -->
</span> </span>
</mat-card-content> </mat-card-content>
<mat-card-actions>
<!-- <mat-card-actions> -->
<ion-buttons end> <ion-buttons end>
<ion-col col-3 offset-3> <ion-col col-3 offset-3>
<a (click)="deleteGoods(b,1)" *ngIf="md.controls.manufacturing_finished_goods.controls.length>1"> <a (click)="deleteGoods(b,1)" *ngIf="md.controls.manufacturing_finished_goods.controls.length>0">
<ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon> <ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon>
</a> </a>
</ion-col> </ion-col>
</ion-buttons>
</div><br/>
<ion-buttons>
<ion-col col-2 offset-1> <ion-col col-2 offset-1>
<a (click)="addGoods(1)" *ngIf="last"> <a (click)="addGoods(1)" >
<ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> <!-- <ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> -->
<button ion-button color="optblue" small >Add More Finished Goods</button>
</a> </a>
</ion-col> </ion-col>
</ion-buttons> </ion-buttons>
</mat-card-actions> <!-- </mat-card-actions> -->
</div>
</div> </div>
</div> </div>
</div> </div>
@ -326,21 +337,27 @@
</mat-form-field> --> </mat-form-field> -->
</span> </span>
</mat-card-content> </mat-card-content>
<mat-card-actions>
<!-- <mat-card-actions> -->
<ion-buttons end> <ion-buttons end>
<ion-col col-3 offset-3> <ion-col col-3 offset-3>
<a (click)="deleteTradedGoods(e,1)" *ngIf="rd.controls.retail_traded_goods.controls.length>1"> <a (click)="deleteTradedGoods(e,1)" *ngIf="rd.controls.retail_traded_goods.controls.length>0">
<ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon> <ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon>
</a> </a>
</ion-col> </ion-col>
</ion-buttons>
</div><br/>
<ion-buttons>
<ion-col col-2 offset-1> <ion-col col-2 offset-1>
<a (click)="addTradedGoods(1)" *ngIf="last"> <a (click)="addTradedGoods(1)" >
<ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> <!-- <ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> -->
<button ion-button color="optblue" small >Add More Traded Goods</button>
</a> </a>
</ion-col> </ion-col>
</ion-buttons> </ion-buttons>
</mat-card-actions> <!-- </mat-card-actions> -->
</div>
</div> </div>
</div> </div>
</div> </div>
@ -417,21 +434,27 @@
</mat-form-field> --> </mat-form-field> -->
</span> </span>
</mat-card-content> </mat-card-content>
<mat-card-actions>
<!-- <mat-card-actions> -->
<ion-buttons end> <ion-buttons end>
<ion-col col-3 offset-3> <ion-col col-3 offset-3>
<a (click)="deleteTradedGoods(g,2)" *ngIf="td.controls.trading_traded_goods.controls.length>1"> <a (click)="deleteTradedGoods(g,2)" *ngIf="td.controls.trading_traded_goods.controls.length>0">
<ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon> <ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon>
</a> </a>
</ion-col> </ion-col>
</ion-buttons>
</div><br/>
<ion-buttons>
<ion-col col-2 offset-1> <ion-col col-2 offset-1>
<a (click)="addTradedGoods(2)" *ngIf="last"> <a (click)="addTradedGoods(2)" >
<ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> <!-- <ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> -->
<button ion-button color="optblue" small >Add More Traded Goods</button>
</a> </a>
</ion-col> </ion-col>
</ion-buttons> </ion-buttons>
</mat-card-actions> <!-- </mat-card-actions> -->
</div>
</div> </div>
</div> </div>
</div> </div>
@ -515,21 +538,27 @@
</mat-form-field> </mat-form-field>
</span> </span>
</mat-card-content> </mat-card-content>
<mat-card-actions>
<!-- <mat-card-actions> -->
<ion-buttons end> <ion-buttons end>
<ion-col col-3 offset-3> <ion-col col-3 offset-3>
<a (click)="deleteTradedGoods(c,3)" *ngIf="dtl.controls.service_provider.controls.length>1"> <a (click)="deleteTradedGoods(c,3)" *ngIf="dtl.controls.service_provider.controls.length>0">
<ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon> <ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon>
</a> </a>
</ion-col> </ion-col>
</ion-buttons>
</div><br/>
<ion-buttons>
<ion-col col-2 offset-1> <ion-col col-2 offset-1>
<a (click)="addTradedGoods(3)" *ngIf="last"> <a (click)="addTradedGoods(3)" >
<ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> <!-- <ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> -->
<button ion-button color="optblue" small >Add More Service Provider</button>
</a> </a>
</ion-col> </ion-col>
</ion-buttons> </ion-buttons>
</mat-card-actions> <!-- </mat-card-actions> -->
</div>
</div> </div>
</div> </div>
</div> </div>

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

@ -183,19 +183,25 @@
</div> </div>
</div> </div>
</mat-card-content> </mat-card-content>
<ion-buttons end> <ion-buttons end>
<ion-col col-3 offset-3> <ion-col col-3 offset-3>
<a *ngIf="item.controls.main_raw_materials.controls.length > 1" (click)="removeRawMaterials(l)"> <a *ngIf="item.controls.main_raw_materials.controls.length > 0" (click)="removeRawMaterials(l)">
<ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon> <ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon>
</a> </a>
</ion-col> </ion-col>
</ion-buttons>
</div><br/>
<ion-buttons>
<ion-col col-2 offset-1> <ion-col col-2 offset-1>
<a (click)="addMoreRawMaterials($event); false" *ngIf="last"> <a (click)="addMoreRawMaterials($event); false" >
<ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> <!-- <ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> -->
<button ion-button color="optblue" small >Add More Supplier</button>
</a> </a>
</ion-col> </ion-col>
</ion-buttons> </ion-buttons>
</div>
</div> </div>
<div *ngIf="mfgCreditCardFlag"> <div *ngIf="mfgCreditCardFlag">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
@ -310,19 +316,24 @@
</div> </div>
</div> </div>
</mat-card-content> </mat-card-content>
<ion-buttons end> <ion-buttons end>
<ion-col col-3 offset-3> <ion-col col-3 offset-3>
<a (click)="removeTradingProduct(l)" *ngIf="item.controls.trading_products.controls.length > 1"> <a (click)="removeTradingProduct(l)" *ngIf="item.controls.trading_products.controls.length > 0">
<ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon> <ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon>
</a> </a>
</ion-col> </ion-col>
</ion-buttons>
</div><br/>
<ion-buttons>
<ion-col col-2 offset-1> <ion-col col-2 offset-1>
<a (click)="addMoretradeProduct($event); false" *ngIf="last"> <a (click)="addMoretradeProduct($event); false" >
<ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> <!-- <ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> -->
<button ion-button color="optblue" small >Add More Supplier</button>
</a> </a>
</ion-col> </ion-col>
</ion-buttons> </ion-buttons>
</div>
</div> </div>
<div *ngIf="trdCreditCardFlag"> <div *ngIf="trdCreditCardFlag">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
@ -445,19 +456,25 @@
</div> </div>
</div> </div>
</mat-card-content> </mat-card-content>
<ion-buttons end> <ion-buttons end>
<ion-col col-3 offset-3> <ion-col col-3 offset-3>
<a (click)="removeServiceProvider(l)" *ngIf="item.controls.service_providers.controls.length > 1"> <a (click)="removeServiceProvider(l)" *ngIf="item.controls.service_providers.controls.length > 0">
<ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon> <ion-icon name="md-trash" color="optblue" style="font-size: 22px;"></ion-icon>
</a> </a>
</ion-col> </ion-col>
</ion-buttons>
</div><br/>
<ion-buttons>
<ion-col col-2 offset-1> <ion-col col-2 offset-1>
<a (click)="addMoreServiceProvider($event); false" *ngIf="last"> <a (click)="addMoreServiceProvider($event); false" >
<ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> <!-- <ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon> -->
<button ion-button color="optblue" small >Add More Supplier</button>
</a> </a>
</ion-col> </ion-col>
</ion-buttons> </ion-buttons>
</div>
</div> </div>
<div *ngIf="spCreditCardFlag"> <div *ngIf="spCreditCardFlag">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">

25
src/pages/pd-question/pd-question-current-loans/pd-question-current-loans.html
View File

@ -110,14 +110,22 @@
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<mat-label>Do you have any other Existing Loans</mat-label> <mat-label>Do you have any other Existing Loans</mat-label>
<mat-select <mat-select
formControlName="existing_loan" (selectionChange)="exitsCheck($event.value)"> formControlName="existing_loan" >
<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 style="width:100% !important;" *ngIf="currentLoans.controls.existing_loan.value == 'Yes' && currentLoans.controls.existing_loan.value == 'Yes'">
<mat-select (selectionChange)="exitsCheck($event.value)" placeholder="Details of all loan info available"
formControlName="loan_info_available">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="Yes">Yes</mat-option> <mat-option value="Yes">Yes</mat-option>
<mat-option value="No">No</mat-option> <mat-option value="No">No</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<div *ngIf="currentLoans.controls.existing_loan.value == 'Yes'"> <div *ngIf="currentLoans.controls.loan_info_available.value == 'Yes' && currentLoans.controls.existing_loan.value == 'Yes'">
<div formArrayName="loan_details"> <div formArrayName="loan_details">
<div *ngFor="let details of currentLoans.get('loan_details').controls; let i=index;let last=last" <div *ngFor="let details of currentLoans.get('loan_details').controls; let i=index;let last=last"
[formGroupName]="i"> [formGroupName]="i">
@ -214,6 +222,19 @@
</div> </div>
</div> </div>
</div> </div>
<div *ngIf="currentLoans.controls.loan_info_available.value == 'No'&& currentLoans.controls['tot_outstanding_loans'] && currentLoans.controls.existing_loan.value == 'Yes'">
<mat-card-content>
<mat-form-field style="width: 100%">
<input matInput type="number" placeholder="Total no of running loans" formControlName="tot_running_loans">
</mat-form-field>
<mat-form-field style="width: 100%">
<input matInput type="number" placeholder="Total EMI being paid" formControlName="tot_emi_paid">
</mat-form-field>
<mat-form-field style="width: 100%">
<input matInput type="number" placeholder="Total Outstanding of all running loans" formControlName="tot_outstanding_loans">
</mat-form-field>
</mat-card-content>
</div>
</mat-card> </mat-card>
<mat-card> <mat-card>
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">

72
src/pages/pd-question/pd-question-current-loans/pd-question-current-loans.ts
View File

@ -1,6 +1,6 @@
import { Component, ApplicationInitStatus, ViewChild, ElementRef } from '@angular/core'; import { Component, ApplicationInitStatus, ViewChild, ElementRef } from '@angular/core';
import { IonicPage, NavController, NavParams, ModalOptions, ModalController } from 'ionic-angular'; import { IonicPage, NavController, NavParams, ModalOptions, ModalController } from 'ionic-angular';
import { FormGroup,FormArray,FormBuilder,Validators } from '@angular/forms'; import { FormGroup,FormArray,FormBuilder,Validators, FormControl } from '@angular/forms';
import { QuestionCategoryProvider } from '../../../providers/question-category/question-category'; import { QuestionCategoryProvider } from '../../../providers/question-category/question-category';
import { AwsServiceProvider } from '../../../providers/aws-service/aws-service'; import { AwsServiceProvider } from '../../../providers/aws-service/aws-service';
import { ToastProvider } from '../../../providers/common-provider/toast'; import { ToastProvider } from '../../../providers/common-provider/toast';
@ -78,6 +78,7 @@ applicants: any;
this.currentLoans = this.fb.group( this.currentLoans = this.fb.group(
{ {
existing_loan: [null], existing_loan: [null],
loan_info_available:[null],
currentloan_remarks:[null], currentloan_remarks:[null],
loan_details: this.fb.array([]) loan_details: this.fb.array([])
}); });
@ -219,8 +220,22 @@ tabChange(){
if(val =="Yes") if(val =="Yes")
{ {
this.currentLoans.removeControl('tot_running_loans')
this.currentLoans.removeControl('tot_emi_paid')
this.currentLoans.removeControl('tot_outstanding_loans')
this.addLoanDetails(); this.addLoanDetails();
} }
else{
const arr = <FormArray>this.currentLoans.controls.loan_details;
arr.removeAt(0);
// this.currentLoanForm.removeControl('')
this.currentLoans.addControl('tot_running_loans',new FormControl(''))
this.currentLoans.addControl('tot_emi_paid',new FormControl(''))
this.currentLoans.addControl('tot_outstanding_loans',new FormControl(''))
}
} }
createLoanDetail(data) { createLoanDetail(data) {
@ -443,11 +458,23 @@ submitCurrentloan(answerData) {
records.formid = this.FormId.form_id; records.formid = this.FormId.form_id;
records.fk_createdby = this.users; records.fk_createdby = this.users;
records.existing_loan = answerData.existing_loan; records.existing_loan = answerData.existing_loan;
records.loan_info_available=answerData.loan_info_available;
if (records.loan_info_available == 'Yes') {
records.loan_details = answerData.loan_details; records.loan_details = answerData.loan_details;
records.currentloan_remarks = answerData.currentloan_remarks;
records.loan_details.forEach(val=>{ records.loan_details.forEach(val=>{
delete val.bankSearch delete val.bankSearch
}) })
}
else{
records.tot_running_loans=answerData.tot_running_loans
records.tot_emi_paid=answerData.tot_emi_paid
records.tot_outstanding_loans=answerData.tot_outstanding_loans
}
// records.loan_details = answerData.loan_details;
records.currentloan_remarks = answerData.currentloan_remarks;
// records.loan_details.forEach(val=>{
// delete val.bankSearch
// })
this.spinner_access=true; this.spinner_access=true;
console.log(' final records when save',records); console.log(' final records when save',records);
this.qustCat.saveForm(records).subscribe(data => { this.qustCat.saveForm(records).subscribe(data => {
@ -479,11 +506,29 @@ submitCurrentloan(answerData) {
let records = {'parent_pdid':this.pdDetails.parent_pd_id,'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id}; let records = {'parent_pdid':this.pdDetails.parent_pd_id,'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id};
this.qustCat.retiverForm(records).subscribe(res=> this.qustCat.retiverForm(records).subscribe(res=>
{ {
console.log(res)
const control = <FormArray>this.currentLoans.controls['loan_details']; const control = <FormArray>this.currentLoans.controls['loan_details'];
if(res['dataStatus']==true ) if(res['dataStatus']==true )
{ {
let currentLoanDetails = res['records'];
let currentLoanDetails = res['records'];
console.log(currentLoanDetails)
// if(currentLoanDetails.loan_info_available == 'Yes'){
//}
// console.log("resutl",result);
this.currentLoans.controls['existing_loan'].setValue(currentLoanDetails.existing_loan);
console.log(currentLoanDetails.loan_info_available)
this.currentLoans.controls['loan_info_available'].setValue(currentLoanDetails.hasOwnProperty('loan_info_available') ? currentLoanDetails.loan_info_available : 'Yes');
currentLoanDetails.loan_info_available=this.currentLoans.value.loan_info_available
this.currentLoans.controls['currentloan_remarks'].setValue(currentLoanDetails.currentloan_remarks);
const control = <FormArray>this.currentLoans.controls['loan_details'];
if(this.currentLoans.value.loan_info_available == 'No'){
this.exitsCheck(currentLoanDetails.loan_info_available)
}
if(currentLoanDetails.loan_info_available != 'No')
{
if(res['records'].loan_details !== undefined && res['records'].loan_details !=null && res['records'].loan_details !=''){ if(res['records'].loan_details !== undefined && res['records'].loan_details !=null && res['records'].loan_details !=''){
currentLoanDetails.loan_details.forEach(val=>{ currentLoanDetails.loan_details.forEach(val=>{
val.bankSearch='' val.bankSearch=''
@ -493,12 +538,6 @@ submitCurrentloan(answerData) {
return res['records'].loan_details[key]; return res['records'].loan_details[key];
}); });
console.log("resutl",result);
this.currentLoans.controls['existing_loan'].setValue(currentLoanDetails.existing_loan);
this.currentLoans.controls['currentloan_remarks'].setValue(currentLoanDetails.currentloan_remarks);
const control = <FormArray>this.currentLoans.controls['loan_details'];
if(currentLoanDetails.existing_loan != 'No')
{
if(result.length ==0) if(result.length ==0)
{ {
control.push(this.createLoanDetail(null)); control.push(this.createLoanDetail(null));
@ -522,11 +561,21 @@ submitCurrentloan(answerData) {
} }
} }
else{
// this.currentLoans.patchValue({
// tot_running_loans:currentLoanDetails.tot_running_loans,
// tot_emi_paid:currentLoanDetails.tot_emi_paid,
// tot_outstanding_loans:currentLoanDetails.tot_outstanding_loans
// })
}
} }
else else
{ {
this.currentLoans.controls['existing_loan'].setValue(currentLoanDetails.existing_loan); this.currentLoans.patchValue({
this.currentLoans.controls['currentloan_remarks'].setValue(currentLoanDetails.currentloan_remarks); tot_running_loans:currentLoanDetails.tot_running_loans,
tot_emi_paid:currentLoanDetails.tot_emi_paid,
tot_outstanding_loans:currentLoanDetails.tot_outstanding_loans
})
} }
} }
@ -720,6 +769,7 @@ submitCurrentloan(answerData) {
let arr : any = []; let arr : any = [];
if(this.labelArr.length > 0){ if(this.labelArr.length > 0){
this.currentLoans.controls['existing_loan'].setValue('Yes'); this.currentLoans.controls['existing_loan'].setValue('Yes');
this.currentLoans.controls['loan_info_available'].setValue('Yes');
this.labelArr.forEach((v,index) => { this.labelArr.forEach((v,index) => {
arr = { arr = {

28
src/pages/pd-question/pd-question-general-info/pd-question-general-info.html
View File

@ -237,8 +237,11 @@
<ion-row> <ion-row>
<ion-col end> <ion-col end>
<button *ngIf="addIndi" float-right ion-button color="optblue" (click)="addParticular(1,indi)">Save</button> <ion-buttons end>
<button *ngIf="!addIndi" float-right ion-button color="optblue" (click)="update(1,indi)">Update</button> <ion-spinner style="font-size: 27px;" color="optblue" *ngIf="applicant_spinner_access"></ion-spinner>
<button *ngIf="addIndi && !applicant_spinner_access" float-right ion-button color="optblue" (click)="addParticular(1,indi)">Save</button>
<button *ngIf="!addIndi && !applicant_spinner_access" float-right ion-button color="optblue" (click)="update(1,indi)">Update</button>
</ion-buttons>
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>
@ -268,7 +271,7 @@
<!--Company Value Display Field--> <!--Company Value Display Field-->
<mat-card style="padding: 0px 10px !important;" *ngIf="customer_segment_abbr != 'SE-RI'"> <mat-card style="padding: 0px 10px !important;" *ngIf="customer_segment_abbr != 'SE-RI'">
<h6 padding> Company/Firm </h6> <h6 padding><span *ngIf="customer_segment_abbr == 'SEP_INDV'">Nature of Service</span><span *ngIf="customer_segment_abbr != 'SEP_INDV'"> Company/Firm </span></h6>
<div formArrayName="company_value"> <div formArrayName="company_value">
<ion-list> <ion-list>
<ion-item-sliding [formGroupName]="i" *ngFor="let item of generalForm.controls.company_value['controls']; let i=index"> <ion-item-sliding [formGroupName]="i" *ngFor="let item of generalForm.controls.company_value['controls']; let i=index">
@ -328,13 +331,17 @@
<div *ngIf="h_companies"> <div *ngIf="h_companies">
<mat-card-header> <mat-card-header>
<mat-card-title *ngIf="addComp"> Add Company/Firm</mat-card-title> <mat-card-title *ngIf="addComp && customer_segment_abbr == 'SEP_INDV'" > Add Nature of Service</mat-card-title>
<mat-card-title *ngIf="!addComp">Update Company/Firm</mat-card-title> <mat-card-title *ngIf="addComp && customer_segment_abbr != 'SEP_INDV'" > Add Company / Firm</mat-card-title>
<mat-card-title *ngIf="!addComp && customer_segment_abbr == 'SEP_INDV'">Update Nature of Service</mat-card-title>
<mat-card-title *ngIf="!addComp && customer_segment_abbr != 'SEP_INDV'">Update Company / Firm</mat-card-title>
</mat-card-header> </mat-card-header>
<div formArrayName="companies" #comp> <div formArrayName="companies" #comp>
<div *ngFor="let cmp of generalForm.controls.companies['controls']; let i=index" [formGroupName]="i"> <div *ngFor="let cmp of generalForm.controls.companies['controls']; let i=index" [formGroupName]="i">
<mat-form-field style="width:100%"> <mat-form-field style="width:100%">
<mat-label color="primary" stacked>Company / Firm</mat-label> <mat-label color="primary" stacked *ngIf="customer_segment_abbr == 'SEP_INDV'">Nature of Service</mat-label>
<mat-label color="primary" stacked *ngIf="customer_segment_abbr != 'SEP_INDV'">Company / Firm</mat-label>
<input matInput type="text" formControlName="company_name" required> <input matInput type="text" formControlName="company_name" required>
<mat-error style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="cmp.controls['company_name'].errors?.required || cmp.controls['company_name'].touched">Company <mat-error style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="cmp.controls['company_name'].errors?.required || cmp.controls['company_name'].touched">Company
Name is Required</mat-error> Name is Required</mat-error>
@ -345,7 +352,7 @@
<br /> <br />
<mat-form-field style="width:100%"> <mat-form-field style="width:100%">
<mat-select #focusBusiness placeholder="Business Entity Type" formControlName="business_entity_type" required> <mat-select #focusBusiness [placeholder]="customer_segment_abbr == 'SEP_INDV' ? 'Entity Type' : 'Business Entity Type'" formControlName="business_entity_type" required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let business of businessEntityTypeList" [value]="business.business_entity_type_id"> <mat-option *ngFor="let business of businessEntityTypeList" [value]="business.business_entity_type_id">
{{business.business_entity_type_name}} {{business.business_entity_type_name}}
@ -358,7 +365,9 @@
<mat-form-field style="width:100%" *ngIf="cmp.value.business_entity_type==1"> <mat-form-field style="width:100%" *ngIf="cmp.value.business_entity_type==1">
<input matInput type="text" placeholder="Please Specity Others" formControlName="business_entity_type_other"> <input matInput type="text" placeholder="Please Specity Others" formControlName="business_entity_type_other">
</mat-form-field> </mat-form-field>
<p>Number of Years For Which The Business Has Been Running</p> <p>
<span *ngIf="customer_segment_abbr == 'SEP_INDV'">Number of Years in Current Profession</span>
<span *ngIf="customer_segment_abbr != 'SEP_INDV'">Number of Years For Which The Business Has Been Running</span></p>
<mat-form-field style="width:100%"> <mat-form-field style="width:100%">
<mat-label>Year</mat-label> <mat-label>Year</mat-label>
<input matInput type="number" placeholder="No of Years (Eg. 20)" formControlName="business_years" autocomplete="off"> <input matInput type="number" placeholder="No of Years (Eg. 20)" formControlName="business_years" autocomplete="off">
@ -439,7 +448,8 @@
<mat-card *ngIf="customer_segment_abbr != 'SE-RI'"> <mat-card *ngIf="customer_segment_abbr != 'SE-RI'">
<div formArrayName="company_with_relationships"> <div formArrayName="company_with_relationships">
<mat-card-header> <mat-card-header>
<mat-card-title style="font-size:16px;font-weight:bold"> Relationship of Individuals to Company / Firm</mat-card-title> <mat-card-title style="font-size:16px;font-weight:bold" *ngIf="customer_segment_abbr == 'SEP_INDV'"> Relationship of Individuals to Profession</mat-card-title>
<mat-card-title style="font-size:16px;font-weight:bold" *ngIf="customer_segment_abbr != 'SEP_INDV'"> Relationship of Individuals to Company / Firm</mat-card-title>
</mat-card-header> </mat-card-header>
<div *ngFor="let cmprel of generalForm.controls.company_with_relationships['controls']; let i=index" <div *ngFor="let cmprel of generalForm.controls.company_with_relationships['controls']; let i=index"
[formGroupName]="i"> [formGroupName]="i">

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

@ -77,6 +77,7 @@ export class PdQuestionGeneralInfoPage {
complete_status : boolean = false; complete_status : boolean = false;
spinner_access:boolean=false; spinner_access:boolean=false;
applicant_spinner_access:boolean=false
@ViewChild('remark') nameField: ElementRef; @ViewChild('remark') nameField: ElementRef;
@ViewChild('focusBusiness') focus_business_entity : MatSelect @ViewChild('focusBusiness') focus_business_entity : MatSelect
@ -286,6 +287,7 @@ export class PdQuestionGeneralInfoPage {
}); });
control.push(formData); control.push(formData);
this.buttonClick=false; this.buttonClick=false;
// this.generalForm.value.individuals.value="" // this.generalForm.value.individuals.value=""
} }
console.log(control.value); console.log(control.value);
@ -667,7 +669,7 @@ dataobj:any;
qualification_name:c_qualification_name qualification_name:c_qualification_name
}); });
this.buttonClick=false; // this.buttonClick=false;
console.log("edit",control.value) console.log("edit",control.value)
// console.log(this.generalForm.controls.list_value['controls']) // console.log(this.generalForm.controls.list_value['controls'])
@ -772,6 +774,7 @@ dataobj:any;
} }
saveApplicants(datas,purpose){ saveApplicants(datas,purpose){
this.applicant_spinner_access=true
let dataResponse let dataResponse
let params=datas let params=datas
@ -785,6 +788,7 @@ dataobj:any;
console.log("Params value",params) console.log("Params value",params)
this.qustCat.saveApplicantFromGeneralForm(params).subscribe(result=>{ this.qustCat.saveApplicantFromGeneralForm(params).subscribe(result=>{
console.log(result)
if(result['dataStatus']){ if(result['dataStatus']){
let result_data=result['records'] let result_data=result['records']
@ -809,6 +813,7 @@ dataobj:any;
console.log("edit",control.value) console.log("edit",control.value)
} }
} }
this.applicant_spinner_access=false
}) })
}) })
// return dataResponse // return dataResponse

15
src/providers/_guard/token.interceptor.ts
View File

@ -17,6 +17,7 @@ import { HttpErrorResponse } from "@angular/common/http";
import { CognitoServiceProvider } from '../aws-service/cognito.service'; import { CognitoServiceProvider } from '../aws-service/cognito.service';
import {ConstantsProvider} from '../constants/constants' import {ConstantsProvider} from '../constants/constants'
import { ToastProvider } from '../common-provider/toast';
@Injectable() @Injectable()
export class TokenInterceptor implements HttpInterceptor{ export class TokenInterceptor implements HttpInterceptor{
constructor(private injector:Injector ) { constructor(private injector:Injector ) {
@ -30,17 +31,20 @@ export class TokenInterceptor implements HttpInterceptor{
return Observable.create((observer: any) => { return Observable.create((observer: any) => {
setTimeout(() => { setTimeout(() => {
const authService = this.injector.get(CognitoServiceProvider) const authService = this.injector.get(CognitoServiceProvider)
authService.refresh();
observer.next(authService.getToken()) observer.next(authService.getToken())
observer.complete() observer.complete()
// console.log("token",authService.getToken()) // console.log("token",authService.getToken())
}) })
}) })
.mergeMap((token: any) => { .mergeMap((token_res: any) => {
let authReq = request let authReq = request
let token=token_res || null
if (token_res) {
if (token) { token=token_res.idToken.jwtToken
}
token=token.idToken.jwtToken
// console.log("authorization",token) // console.log("authorization",token)
env=env.authorization env=env.authorization
// console.log("Sparq",env) // console.log("Sparq",env)
@ -51,7 +55,7 @@ export class TokenInterceptor implements HttpInterceptor{
'From':'1', 'From':'1',
} }
}) })
} // }
return next.handle(authReq).pipe( return next.handle(authReq).pipe(
catchError(this.handleError<any>('role', [])) catchError(this.handleError<any>('role', []))
@ -88,7 +92,10 @@ export class TokenInterceptor implements HttpInterceptor{
} }
private handleError<T> (operation = 'operation', result?: T) { private handleError<T> (operation = 'operation', result?: T) {
const toastProvider=this.injector.get(ToastProvider)
return (error: any): Observable<T> => { return (error: any): Observable<T> => {
toastProvider.pdTriggerappmessage('Network Error');
console.log("error",error) console.log("error",error)
if(error instanceof HttpErrorResponse){ if(error instanceof HttpErrorResponse){
console.error("Error: ", error.status); console.error("Error: ", error.status);

17
src/providers/common-provider/toast.ts
View File

@ -31,6 +31,7 @@ let alert=this.alertCtrl.create({
title:title_name, title:title_name,
message:msg, message:msg,
cssClass:'buttoncss', cssClass:'buttoncss',
enableBackdropDismiss:false,
buttons:[{ buttons:[{
text:'No', text:'No',
cssClass:'btnNo', cssClass:'btnNo',
@ -115,6 +116,7 @@ setAlertForCompletePD(){
return alert return alert
} }
//FOR NOTIFICATION
setAlertwithButton(data){ setAlertwithButton(data){
let alert =this.alertCtrl.create({ let alert =this.alertCtrl.create({
title: 'Notification', title: 'Notification',
@ -124,4 +126,19 @@ setAlertwithButton(data){
}) })
alert.present(); alert.present();
} }
//FOR ALL PURPOSE CURRENTLY USED FOR APP UPDATE NOTIFICATION
setAlertwithOKButton(title,msg){
let alert =this.alertCtrl.create({
title:title,
message:msg,
enableBackdropDismiss:false,
buttons: [{
text:'OK',
handler:()=>{
alert.dismiss('s')
return false
}}]
})
return alert;
}
} }

3
src/providers/constants/constants.ts
View File

@ -33,6 +33,7 @@ public commonimage = "http://pdgenie.com/logo/avatar.jpg";
// LIVE ENVIRONMENT // LIVE ENVIRONMENT
let production={ let production={
url:'https://pdgenie.com/sparqprod/api/', url:'https://pdgenie.com/sparqprod/api/',
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",
identityPoolId:'ap-south-1:31774418-8384-4fbb-b3e2-b87ce0f26ef1', identityPoolId:'ap-south-1:31774418-8384-4fbb-b3e2-b87ce0f26ef1',
@ -42,6 +43,7 @@ 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/',
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",
@ -52,6 +54,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://demo.pdgenie.com/sparqtest/api/',
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",

4
src/providers/pdtrigger/pdtrigger.ts
View File

@ -78,4 +78,8 @@ export class PdtriggerProvider {
getQCLenderRemarks(values){ getQCLenderRemarks(values){
return this.http.post(this.apiurl+'getQCLenderRemarks',{records:{'pd_id':values.pd_id,'flag':values.flag}}) return this.http.post(this.apiurl+'getQCLenderRemarks',{records:{'pd_id':values.pd_id,'flag':values.flag}})
} }
//FOR CHECKING APP VERSION
checkAppVersion(){
return this.http.get(this.apiurl+'checkAppVersion/get?client=MOB')
}
} }

4
src/providers/question-category/question-category.ts
View File

@ -3,6 +3,7 @@ import { Injectable } from '@angular/core';
import { ConstantsProvider } from '../constants/constants'; import { ConstantsProvider } from '../constants/constants';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import {CacheService} from 'ionic-cache' import {CacheService} from 'ionic-cache'
import { state } from '@angular/animations';
/* /*
Generated class for the QuestionCategoryProvider provider. Generated class for the QuestionCategoryProvider provider.
@ -98,9 +99,10 @@ getCompaniesListsForBusiness(pdid:any){
// return this.cache.loadFromObservable(cacheKey,request,'companies') // return this.cache.loadFromObservable(cacheKey,request,'companies')
} }
getStateWiseCities(stateid:any){ getStateWiseCities(stateid:any){
let cacheKey='getListOfStatesAndCities' let cacheKey='getListOfStatesAndCities-'+stateid
let request= this.http.post<any>(this.apiurl + "getListOfStatesAndCities", { "records":{ "state_id" : stateid}}) let request= this.http.post<any>(this.apiurl + "getListOfStatesAndCities", { "records":{ "state_id" : stateid}})
return this.cache.loadFromObservable(cacheKey,request,'cityandpincode',ttl); return this.cache.loadFromObservable(cacheKey,request,'cityandpincode',ttl);
// return this.http.post<any>(this.apiurl + "getListOfStatesAndCities", { "records":{ "state_id" : stateid}})
} }
getAllPersonsName(pdid:any){ getAllPersonsName(pdid:any){
return this.http.post<any>(this.apiurl + "getAllPersonsName", {"pd_id" : pdid}) return this.http.post<any>(this.apiurl + "getAllPersonsName", {"pd_id" : pdid})