+ filter_list Filter
+ - {{details.lender_applicant_id}} -({{details.customer_segment_abbr}} ) -
- {{details.product_abbr}}/{{details.subproduct_abbr}}
- {{details.loan_amount}} -
- {{details.city_name}}-{{details.pincode}} -
- {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} - - {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} - - {{details.scheduled_on}} - -
+
+
+ {{type.type_name}}
+
+
+
+
+ {{status.pd_status_name}}
+
+
+
+
+
+
+
+
+
+
+ {{pro.name}}
+
+
+
+
+ {{city.name}}
+
+
+
+
+ {{ent.full_name}}
+
+
+
+
+
+
+
+
+
+ +
+ + +
+
+ {{details.lender_applicant_id}} + -({{details.customer_segment_abbr}} ) +
+ {{details.product_abbr}}/{{details.subproduct_abbr}} +
+ + {{details.loan_amount}} +
+ + {{details.city_name}}-{{details.pincode}} +
+ {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + + {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + + {{details.scheduled_on}} + +
filter_list Filter
+
+
+
+ {{type.type_name}}
+
+
+
+
+ {{status.pd_status_name}}
+
+
+
+
+
+
+
+
+
+
+ {{pro.name}}
+
+
+
+
+ {{city.name}}
+
+
+
+
+ {{ent.full_name}}
+
+
+
+
+
+
+
+
+
+ +
+ + +
+
filter_list Filter
+
+
+
+ {{type.type_name}}
+
+
+
+
+ {{status.pd_status_name}}
+
+
+
+
+
+
+
+
+
+
+ {{pro.name}}
+
+
+
+
+ {{city.name}}
+
+
+
+
+ {{ent.full_name}}
+
+
+
+
+
+
+
+
+
+ +
+ + +
-
-
+
+
+
@@ -10,7 +10,7 @@
-
+
+
+
+
+
-
-
-
-
-
+
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
index f736a200e..5dd5e0f4f 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
@@ -35,7 +35,9 @@ export class AssetsInfoComponent implements OnInit {
public _assetsQuesFrom: FormGroup;
public submitted = false;
public m_assets_type = [];
-
+ public m_relation = [];
+ public applicants: any;
+
// public m_assets_type = [
// {
// 'id': "1",
@@ -168,6 +170,8 @@ public m_investmentType = [];
private pdTrigerService: PdTrigerService,
@Inject(MAT_DIALOG_DATA) public pd_all_details: any) {
this.pdid = this.pd_all_details.pdmaster_details.pd_id;
+ this.applicants = this.pd_all_details.pdapplicants_detials;
+ this.applicants.push({'pd_co_applicant_id':'0','applicant_name':'Others'});
this.notifier = notifier;
}
@@ -199,6 +203,7 @@ public m_investmentType = [];
this.getM_PropertyType();
this.getM_InvestmentType();
this.getM_FreqOfPurchase();
+ this.getM_Relation();
//this.getM_InsuranceType();
}
@@ -240,7 +245,18 @@ public m_investmentType = [];
)
}
- getM_FreqOfPurchase() {
+ getM_Relation() {
+ this.pdTrigerService.getAllMasterDatas('RELATIONSHIPS').subscribe(
+ data => {
+ this.m_relation = data.records.filter(data => data.isactive == 1);
+ },
+ error => {
+ this.notifier.notify('warning', 'No Category Records Found.!');
+ }
+ )
+ }
+
+ getM_FreqOfPurchase() {
this.pdTrigerService.getAllMasterDatas('FREQUENCY').subscribe(
data => {
this.m_freqOfPurchase = data.records.filter(data => data.isactive == 1);
@@ -297,7 +313,7 @@ public m_investmentType = [];
assets_form_remark:[value.assets_form_remark || 'check']
});
this.addAssetsDetailsWithData(value.assets_details);
- this.addAssetsDetailsWithData2(value.business_assets_details);
+ this.addBusinessAssetsDetailsWithData(value.business_assets_details);
} else {
this._assetsQuesFrom = this._formBuilder.group({
pdid: [this.pdid],
@@ -306,7 +322,7 @@ public m_investmentType = [];
this.initDetails(),
]),
business_assets_details : this._formBuilder.array([
- this.initnewDetails(),
+ this.initBusinessDetails(),
]),
assets_form_remark:['']
});
@@ -328,6 +344,8 @@ public m_investmentType = [];
details: this._formBuilder.array([]),
approximate_market_value: ['', Validators.compose([])],
name_of_the_owner: ['', Validators.compose([])],
+ other_owner:[''],
+ relation: [''],
// purchase_year: ['', Validators.compose([])],
//purchase_month: ['', Validators.compose([])],
emi: [''],
@@ -338,12 +356,14 @@ public m_investmentType = [];
});
}
- initnewDetails() {
+ initBusinessDetails() {
return this._formBuilder.group({
business_assets_mode: ['', Validators.compose([Validators.required])],
business_details: this._formBuilder.array([]),
business_approximate_market_value: ['', Validators.compose([])],
business_name_of_the_owner: ['', Validators.compose([])],
+ // other_owner:[''],
+ // relation:[''],
// purchase_year: ['', Validators.compose([])],
//purchase_month: ['', Validators.compose([])],
business_emi: [''],
@@ -562,6 +582,8 @@ public m_investmentType = [];
details: this._formBuilder.array([]),
approximate_market_value: [data.approximate_market_value, Validators.compose([])],
name_of_the_owner: [data.name_of_the_owner, Validators.compose([])],
+ other_owner:[data.other_owner || ''],
+ relation: [data.relation || ''],
// purchase_year: [data.purchase_year, Validators.compose([])],
// purchase_month: [data.purchase_month, Validators.compose([])],
emi: [data.emi || 0],
@@ -571,12 +593,14 @@ public m_investmentType = [];
elapsed_tenure: [data.elapsed_tenure || '']
});
}
- initnewDetailsWithdata(data) {
+ initBusinessDetailsWithdata(data) {
return this._formBuilder.group({
business_assets_mode: [data.business_assets_mode, Validators.compose([Validators.required])],
business_details: this._formBuilder.array([]),
business_approximate_market_value: [data.business_approximate_market_value, Validators.compose([])],
business_name_of_the_owner: [data.business_name_of_the_owner, Validators.compose([])],
+ // other_owner:[data.other_owner || ''],
+ // relation: [data.relation || ''],
// purchase_year: [data.purchase_year, Validators.compose([])],
// purchase_month: [data.purchase_month, Validators.compose([])],
business_emi: [data.business_emi || 0],
@@ -598,6 +622,8 @@ public m_investmentType = [];
assets_mode: val.assets_mode,
approximate_market_value: val.approximate_market_value,
name_of_the_owner: val.name_of_the_owner,
+ other_owner:val.other_owner,
+ relation: val.relation,
// purchase_year: val.purchase_year,
// purchase_month: val.purchase_month,
emi: val.emi,
@@ -614,7 +640,7 @@ public m_investmentType = [];
this.loadDetails = true;
}
- addAssetsDetailsWithData2(supp_data) {
+ addBusinessAssetsDetailsWithData(supp_data) {
console.log(supp_data);
@@ -627,6 +653,8 @@ public m_investmentType = [];
business_assets_mode: val.business_assets_mode,
business_approximate_market_value: val.business_approximate_market_value,
business_name_of_the_owner: val.business_name_of_the_owner,
+ // other_owner: val.other_owner,
+ // relation : val.relation,
// purchase_year: val.purchase_year,
// purchase_month: val.purchase_month,
business_emi: val.business_emi,
@@ -640,7 +668,7 @@ public m_investmentType = [];
// this.setAssetsDetailsWithData(vals.business_assets_mode, val.details, control.length - 1)
const control = this._assetsQuesFrom.controls['business_assets_details'];
- control.push(this.initnewDetailsWithdata(vals));
+ control.push(this.initBusinessDetailsWithdata(vals));
this.setAssetsDetailsWithData2(vals.business_assets_mode, val.business_details, control.length - 1)
}
}
@@ -763,7 +791,7 @@ public m_investmentType = [];
control.push(this.initDetails());
}else if(flag == 2){
const control = this._assetsQuesFrom.controls['business_assets_details'];
- control.push(this.initnewDetails());
+ control.push(this.initBusinessDetails());
}
}
removeLanguage(i: number,flag) {
@@ -857,8 +885,9 @@ public m_investmentType = [];
}
}
- loanCalc(details)
+ loanCalc(details ,flag)
{
+ if(flag == 1){
//console.log(details.value);
let ElapsedValues;
@@ -866,6 +895,15 @@ public m_investmentType = [];
ElapsedValues = details.value.original_loan_tenure - details.value.balance_tenure ;
details.controls['elapsed_tenure'].setValue(ElapsedValues);
}
+ }
+ else if(flag == 2){
+ let BusinessElapsedValues;
+
+ if(details.value.business_original_loan_tenure != null && details.value.business_original_loan_tenure != '' && details.value.business_balance_tenure != null && details.value.business_balance_tenure != ''){
+ BusinessElapsedValues = details.value.business_original_loan_tenure - details.value.business_balance_tenure ;
+ details.controls['business_elapsed_tenure'].setValue(BusinessElapsedValues);
+ }
+ }
}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
index 5db1ff5fb..7da90f6ca 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
@@ -192,6 +192,7 @@
+
-
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
index 0d921b9be..53be6499e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
@@ -388,6 +388,7 @@
+
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
index dcc253f18..6f215861d 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
@@ -107,6 +107,7 @@
+
-
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
index ccaeb1c8d..5aba83c46 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
@@ -128,6 +128,7 @@
+
-
+
+
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html
index 0153e37cc..869792c14 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html
@@ -1,4 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts
index 360ca9a6f..b2de54cbf 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts
@@ -1,6 +1,8 @@
-import { Component,ViewChild, OnInit, ViewEncapsulation, Input, Output, EventEmitter, OnDestroy, AfterViewInit, OnChanges, SimpleChanges } from '@angular/core';
+import { Component, ViewChild, OnInit, ViewEncapsulation, Input, Output, EventEmitter, OnDestroy, AfterViewInit, OnChanges, SimpleChanges } from '@angular/core';
import { PdTrigerService } from './../../../pd-service/pd-triger.service';
import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { DatePipe } from '@angular/common';
@Component({
selector: 'app-qc-completed-pd',
@@ -11,21 +13,31 @@ import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/m
})
export class QcCompletedPdComponent implements OnInit, OnChanges {
+ xpandStatus: boolean = false;
+ PRODUCTS: any;
+ ENTITY: any;
+ CITY: any;
+ PDType: any;
+ pdStatus: any;
recordStatus: boolean;
- errorMessage:any[]=[];
- tabStatus:string="QC_COMPLETED";
+ errorMessage: any[] = [];
+ tabStatus: string = "QC_COMPLETED";
+ pipe = new DatePipe('en-US');
+
public dataLengthTab5: number;
public dataSourceTab5 = new MatTableDataSource();
- displayedColumns = ['PDType','Name','Lenderid','Address','Status','Action'];
+ tempStore = new MatTableDataSource();
+ searchForm: FormGroup;
+ displayedColumns = ['PDType', 'Name', 'Lenderid', 'Address', 'Status', 'Action'];
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
-
+
@Input() bindFilterValue: string;
@Output() loadPdView = new EventEmitter();
// data source variable details
- qcCompletedPdListData:any[] = [];
+ qcCompletedPdListData: any[] = [];
// pagination variable details
length = 50;
@@ -33,12 +45,26 @@ export class QcCompletedPdComponent implements OnInit, OnChanges {
pageSize = 10;
pageEvent: PageEvent;
- constructor(private _pd: PdTrigerService) {
- }
+ constructor(private _pd: PdTrigerService, public _fb: FormBuilder) {
+
+ this.searchForm = this._fb.group(
+ {
+ pd_type: [null],
+ pd_status: [null],
+ pd_from_date: [null],
+ pd_to_date: [null],
+ pd_city: [null],
+ pd_products: [null],
+ pd_lender: [null],
+ pd_name: [null],
+ pd_applicant_id: [null],
+ });
+ }
ngOnInit() {
- this.recordStatus=false;
- // this.loadPDDetails();
+ this.recordStatus = false;
+ // this.loadPDDetails();
+ this.getcommonDropDown();
}
ngAfterViewInit() {
this.dataSourceTab5.paginator = this.paginator;
@@ -51,39 +77,105 @@ export class QcCompletedPdComponent implements OnInit, OnChanges {
filteredText = filteredText ? filteredText.trim() : filteredText;
filteredText = filteredText ? filteredText.toLowerCase() : filteredText;
this.dataSourceTab5.filter = filteredText;
-}
+ }
-// load inprogress pd list
+ // load inprogress pd list
loadPDDetails() {
this._pd.getTabStatusPdDetails(this.tabStatus)
- .subscribe(
+ .subscribe(
data => {
if (data.status == 200) {
this.qcCompletedPdListData = data.records;
this.dataLengthTab5 = data.records.length;
this.dataSourceTab5.data = this.qcCompletedPdListData;
-
+ this.tempStore.data = this.qcCompletedPdListData;
}
- else{
- this.qcCompletedPdListData=[];
- this.dataLengthTab5= null;
- this.recordStatus=true;
+ else {
+ this.qcCompletedPdListData = [];
+ this.dataLengthTab5 = null;
+ this.recordStatus = true;
}
- }, error => this.errorMessage = error);
+ }, error => this.errorMessage = error);
}
pageChange(e) {
console.log(e);
}
- viewPD(pdid:string){
+ viewPD(pdid: string) {
this.loadPdView.next(pdid);
}
- titleCaseWord(word:string) {
+ titleCaseWord(word: string) {
if (!word) return word;
return word[0].toUpperCase() + word.substr(1).toLowerCase();
}
+ /**
+ * Common Search
+ * sriram
+ */
+
+ getcommonDropDown() {
+ this._pd.getAllMasterDatas('PDSTATUS').subscribe(res => {
+ if (res.dataStatus == true) {
+ this.pdStatus = res.records.filter(status => status.isactive == 1 && status.pd_status_name == this.tabStatus);
+ // this.searchForm.controls['pd_status'].setValue(this.pdStatus[0]);
+ }
+ });
+
+ this._pd.getAllMasterDatas('PDTYPE').subscribe(res => {
+ if (res.dataStatus == true) {
+ this.PDType = res.records.filter(type => type.isactive == 1);
+ }
+ });
+ this._pd.getAllMasterDatas('CITY').subscribe(res => {
+ if (res.dataStatus == true) {
+ this.CITY = res.records.filter(city => city.isactive == 1);
+ }
+ });
+ this._pd.getAllMasterDatas('ENTITY').subscribe(res => {
+ if (res.dataStatus == true) {
+ this.ENTITY = res.records.filter(ent => ent.isactive == 1);
+ }
+ });
+ this._pd.getAllMasterDatas('PRODUCTS').subscribe(res => {
+ if (res.dataStatus == true) {
+ this.PRODUCTS = res.records.filter(pro => pro.isactive == 1);
+ }
+ });
+ }
+ checkDate(e) {
+ console.log(e);
+ }
+ searchItem() {
+
+ if (this.searchForm.value.pd_type != null) {
+
+ } else {
+ this.searchForm.value.pd_type = [];
+ }
+
+ if (this.searchForm.value.pd_status != null) {
+
+ } else {
+ this.searchForm.value.pd_status = [];
+ }
+
+ this.searchForm.value.pd_from_date = this.pipe.transform(this.searchForm.value.pd_from_date, 'yyyy-MM-dd');
+ this.searchForm.value.pd_to_date = this.pipe.transform(this.searchForm.value.pd_to_date, 'yyyy-MM-dd');
+
+ this._pd.overAllSearchFormDetails(this.searchForm.value).subscribe(res => {
+ this.xpandStatus = false;
+ if (res['dataStatus'] == true) {
+ this.dataSourceTab5 = res['records'];
+ } else {
+ console.log('else');
+ // this.notifier.notify('warning', 'No Records Found');
+ this.dataSourceTab5 = this.tempStore;
+ }
+ })
+ }
+
}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html
index 186a64ad6..776b9a9c0 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html
@@ -1,4 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts
index d6c030214..299a747e5 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts
@@ -1,6 +1,8 @@
import { Component,ViewChild, OnInit, ViewEncapsulation, Input, Output, EventEmitter, OnDestroy, AfterViewInit, OnChanges, SimpleChanges } from '@angular/core';
import { PdTrigerService } from './../../../pd-service/pd-triger.service';
import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { DatePipe } from '@angular/common';
@Component({
selector: 'app-scheduled-pd',
@@ -9,11 +11,20 @@ import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/m
encapsulation: ViewEncapsulation.None
})
export class ScheduledPdComponent implements OnInit, OnChanges {
+ xpandStatus: boolean = false;
+ PRODUCTS: any;
+ ENTITY: any;
+ CITY: any;
+ PDType: any;
+ pdStatus: any;
recordStatus: boolean;
errorMessage:any[]=[];
tabStatus:string="SCHEDULED";
+ pipe = new DatePipe('en-US');
+ searchForm:FormGroup;
public dataLengthTab3: number;
public dataSourceTab3 = new MatTableDataSource();
+ tempStore = new MatTableDataSource();
displayedColumns = ['PDType','Name','Lenderid','Address','Status','Action'];
@ViewChild(MatPaginator) paginator: MatPaginator;
@@ -31,12 +42,26 @@ export class ScheduledPdComponent implements OnInit, OnChanges {
pageSize = 10;
pageEvent: PageEvent;
- constructor(private _pd: PdTrigerService) {
+ constructor(private _pd: PdTrigerService,public _fb:FormBuilder) {
+
+ this.searchForm = this._fb.group(
+ {
+ pd_type:[null],
+ pd_status:[null],
+ pd_from_date:[null],
+ pd_to_date:[null],
+ pd_city:[null],
+ pd_products:[null],
+ pd_lender:[null],
+ pd_name:[null],
+ pd_applicant_id:[null],
+ });
}
ngOnInit() {
this.recordStatus=false;
// this.loadPDDetails();
+ this.getcommonDropDown();
}
ngAfterViewInit() {
this.dataSourceTab3.paginator = this.paginator;
@@ -61,6 +86,7 @@ export class ScheduledPdComponent implements OnInit, OnChanges {
this.scheduledPdListData = data.records;
this.dataLengthTab3 = data.records.length;
this.dataSourceTab3.data = this.scheduledPdListData;
+ this.tempStore.data = this.scheduledPdListData
}
else{
@@ -81,7 +107,89 @@ export class ScheduledPdComponent implements OnInit, OnChanges {
if (!word) return word;
return word[0].toUpperCase() + word.substr(1).toLowerCase();
}
+/**
+ * Common Search
+ * sriram
+ */
+ getcommonDropDown()
+ {
+ this._pd.getAllMasterDatas('PDSTATUS').subscribe(res=>
+ {
+ if(res.dataStatus==true)
+ {
+ this.pdStatus = res.records.filter(status=>status.isactive==1 && status.pd_status_name==this.tabStatus);
+ // this.searchForm.controls['pd_status'].setValue(this.pdStatus[0]);
+ }
+ });
+
+ this._pd.getAllMasterDatas('PDTYPE').subscribe(res=>
+ {
+ if(res.dataStatus==true)
+ {
+ this.PDType = res.records.filter(type=>type.isactive==1);
+ }
+ });
+ this._pd.getAllMasterDatas('CITY').subscribe(res=>
+ {
+ if(res.dataStatus==true)
+ {
+ this.CITY = res.records.filter(city=>city.isactive==1);
+ }
+ });
+ this._pd.getAllMasterDatas('ENTITY').subscribe(res=>
+ {
+ if(res.dataStatus==true)
+ {
+ this.ENTITY = res.records.filter(ent=>ent.isactive==1);
+ }
+ });
+ this._pd.getAllMasterDatas('PRODUCTS').subscribe(res=>
+ {
+ if(res.dataStatus==true)
+ {
+ this.PRODUCTS = res.records.filter(pro=>pro.isactive==1);
+ }
+ });
+ }
+ checkDate(e)
+ {
+ console.log(e);
+ }
+ searchItem()
+ {
+
+ if(this.searchForm.value.pd_type !=null)
+ {
+
+ }else
+ {
+ this.searchForm.value.pd_type = [];
+ }
+
+ if(this.searchForm.value.pd_status !=null)
+ {
+
+ }else
+ {
+ this.searchForm.value.pd_status = [];
+ }
+
+ this.searchForm.value.pd_from_date = this.pipe.transform(this.searchForm.value.pd_from_date,'yyyy-MM-dd');
+ this.searchForm.value.pd_to_date = this.pipe.transform(this.searchForm.value.pd_to_date,'yyyy-MM-dd');
+
+ this._pd.overAllSearchFormDetails(this.searchForm.value).subscribe(res=>
+ {
+ this.xpandStatus = false;
+ if(res['dataStatus']==true)
+ {
+ this.dataSourceTab3 = res['records'];
+ }else{
+ // this.notifier.notify('warning', 'No Records Found');
+ this.dataSourceTab3 = this.tempStore;
+ }
+ })
+ }
}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
index 765b9f2ea..78a36ac59 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
@@ -102,19 +102,25 @@
-
-
+
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
index 99fa55fac..140440a93 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
@@ -14,7 +14,307 @@
filter_list Filter
+
+
+
+ {{type.type_name}}
+
+
+
+
+ {{status.pd_status_name}}
+
+
+
+
+
+
+
+
+
+
+ {{pro.name}}
+
+
+
+
+ {{city.name}}
+
+
+
+
+ {{ent.full_name}}
+
+
+
+
+
+
+
+
+
+ +
+ + +
filter_list Filter
+
+
+
+ {{type.type_name}}
+
+
+
+
+ {{status.pd_status_name}}
+
+
+
+
+
+
+
+
+
+
+ {{pro.name}}
+
+
+
+
+ {{city.name}}
+
+
+
+
+ {{ent.full_name}}
+
+
+
+
+
+
+
+
+
+ +
+ + +
Type of Premises
+
+
+ {{at.address_type}}
+
+ {
- enduse.push(val.premises_types);
- existPremises.push(val);
- });
+ // // console.log(bussiness_address_type);
+
- this.formPremisesArray = existPremises;
+ // let selectedPremisesDBData = Object.keys(data.records.bussiness_address_type).map(function (key) {
+ // return data.records.bussiness_address_type[key];
+ // });
- this.addressForm.controls.bussiness_address_type.setValue(enduse);
-
- var additionalPremisesResult = Object.keys(data.records.additional_premises).map(function (key) {
- return data.records.additional_premises[key];
- });
+ // let enduse: any = [];
+ // let existPremises: any =[];
- // let cityenduse: any = [];
- // let existcity: any =[];
+ // selectedPremisesDBData.forEach(val => {
+ // enduse.push(val.premises_types);
+ // existPremises.push(val);
+ // });
- // additionalPremisesResult.forEach(val => {
- // cityenduse.push(val.premises_types);
- // existcity.push(val);
- // });
-
- // this.formPremisesCityArray = existcity;
-
- additionalPremisesResult.forEach((val,index)=>
- {
- console.log(val);
- let cityenduse: any = [];
- let existcity: any =[];
-
- if(val.premises_city != ''){
- this.formPremisesCityArray = [];
- val.premises_city.forEach(option => {
- // cityenduse.push(option);
- // existcity.push(val);
- //this.formPremisesCityArray.push({additional_premises_city: option});
- //this.addressForm.controls.additional_premises.value[index].premises_city = cityenduse;
- console.log(option);
- });
- //console.log(cityenduse);
- //this.formPremisesCityArray = existcity;
- }
-
-
- });
-
-
- if (additionalPremisesResult.length == 0) {
- additionalPremisesControl.push(this.createPremises());
- } else {
- let cityenduse: any = [];
- let existcity: any =[];
-
- additionalPremisesResult.forEach(datas => {
- if(datas.premises_city != ''){
- cityenduse.push(datas.additional_premises_city);
- existcity.push(datas);
- }
- additionalPremisesControl.push(this.createPremises());
- });
-
- this.formPremisesCityArray = existcity;
- console.log(cityenduse);
- console.log(existcity);
-
- this.addressForm.controls['additional_premises'].setValue(additionalPremisesResult);
+ // this.formPremisesArray = existPremises;
- }
+
+ // this.addressForm.controls.bussiness_address_type.setValue(enduse);
+
+ // var additionalPremisesResult = Object.keys(data.records.additional_premises).map(function (key) {
+ // return data.records.additional_premises[key];
+ // });
+
+ // this.additional_premises = additionalPremisesResult;
+
+ // if (additionalPremisesResult.length == 0) {
+ // additionalPremisesControl.push(this.createPremises());
+ // } else {
+ // additionalPremisesResult.forEach(datas => {
+ // additionalPremisesControl.push(this.createPremises());
+ // });
+ // }
- if(data.records.bussiness_address_type == 12) {
- this.addressForm.controls.bussiness_address_type_others.setValue(data.records.bussiness_address_type_others);
- }
+ // if(data.records.bussiness_address_type == 12) {
+ // this.addressForm.controls.bussiness_address_type_others.setValue(data.records.bussiness_address_type_others);
+ // }
+ // }
+
+ if(data.records.bussiness_activity == 'yes' && data.records.bussiness_address_type !=null) {
+ let that = this;
+ this.bussiness_address_type = [];
+
+ this.bussiness_address_type = (Object.keys(data.records.bussiness_address_type).map(function(key)
+ {
+ return data.records.bussiness_address_type[key].premises_types;
+ }))
+
+ this.additional_premises = Object.keys(data.records.additional_premises).map(function(key)
+ {
+ return data.records.additional_premises[key];
+ })
+
}
+ console.log(this.bussiness_address_type);
+ console.log(this.additional_premises);
+
+ this.selectedValue(this.bussiness_address_type,this.additional_premises);
if (data.records.locality_others) {
this.addressForm.controls.locality_others.setValue(data.records.locality_others);
}
+
// if (result.length == 0) {
// control.push(this.createNeighbour());
// } else {
@@ -221,6 +212,7 @@ export class AddressComponent implements OnInit {
}
});
}
+
public initAddressForm(): void {
this.addressForm = this.fb.group({
address: ['', Validators.compose([Validators.required])],
@@ -376,8 +368,12 @@ export class AddressComponent implements OnInit {
// console.log(val);
});
}
-
-
+ else{
+ this.formPremisesCityArray = [];
+
+ this.addressForm.controls.additional_premises.value[index].premises_city = null;
+
+ }
});
records.additional_premises = this.addressForm.controls.additional_premises.value;
@@ -402,59 +398,194 @@ export class AddressComponent implements OnInit {
// this.formPremisesCityArray.push({city: option});
// });
// }
-
SelectedPremises($event){
- console.log('event',$event);
let premisesData = $event.source.value;
-
-
- if($event.source._selected === true ){
-
+ console.log(premisesData);
+
+ if($event.checked === true ){
+
//this.formPremisesArray.push({member: $event.source.value});
//this.selectedSegmentDatas.push(CustomerSegmentName.name);
//console.log('true',premisesData);
-
+
//console.log(this.formPremisesArray);
-
+
this.formPremisesArray.push({premises_types: $event.source.value});
-
- //console.log(this.formPremisesArray);
-
- let array = this.addressData.filter(data => data.address_type_id == premisesData);
-
+
+ console.log(this.formPremisesArray);
+ const control = this.addressForm.controls['additional_premises'];
+ let array = this.addressData.filter(data => data.address_type_id == premisesData)[0];
+ console.log(array);
if(premisesData == 12){
this.PremisesOtherFlag = true;
- this.PremisesLabel[this.z] = this.addressForm.get('bussiness_address_type_others').value;
+ // this.PremisesLabel[this.z] = this.pdQuestionAddress.get('bussiness_address_type_others').value;
+ control.push(this.createPremises());
+
}
else{
- this.PremisesLabel[this.z] = array[0].address_type;
- }
- this.z++;
-
-
- const control = this.addressForm.controls['additional_premises'];
+ this.PremisesLabel[this.z] = array.address_type;
control.push(this.createPremises());
-
-
+
+ }
+ console.log(this.PremisesLabel);
+ this.z++;
+
+
+
+
+
}
- else if($event.source._selected === false ){
-
- console.log('false',premisesData);
-
+ else if($event.checked === false ){
if(premisesData == 12){
this.PremisesOtherFlag = false;
}
-
+ console.log(this.formPremisesArray);
+ let index = this.formPremisesArray.findIndex(form=>form.premises_types== $event.source.value);
+ console.log(index);
const control = this.addressForm.controls['additional_premises'];
- control.removeAt(this.z);
+ control.removeAt(index);
+ this.PremisesLabel.splice(index,1);
+ console.log(this.z);
this.z--;
- //let index = this.selectedSegmentDatas.indexOf(CustomerSegmentName.name);
- //this.selectedSegmentDatas.splice(index,1);
}
+
+ }
+
+ getCity(e)
+ {
+ this.cityData = [];
+ e.forEach(val=>
+ {
+ this.cityData.push({additional_premises_city:val});
+ });
+ console.log(this.cityData);
+ }
+ otherValueset()
+ {
+ let z = this.z;
+ this.PremisesLabel[z-1] = this.addressForm.get('bussiness_address_type_others').value;
+ }
+// checkaddress(value)
+// {
+// // console.log(value);
+// if(value=="OTHERS")
+// {
+// this.addressRemarksAccess = true;
+// }else
+// {
+// this.addressRemarksAccess = false;
+// }
+// }
+
+
+ // SelectedPremises($event){
+ // console.log('event',$event);
+
+ // let premisesData = $event.source.value;
+
+
+ // if($event.source._selected === true ){
+
+ // //this.formPremisesArray.push({member: $event.source.value});
+ // //this.selectedSegmentDatas.push(CustomerSegmentName.name);
+ // //console.log('true',premisesData);
+
+ // //console.log(this.formPremisesArray);
+
+ // this.formPremisesArray.push({premises_types: $event.source.value});
+
+ // //console.log(this.formPremisesArray);
+
+ // let array = this.addressData.filter(data => data.address_type_id == premisesData);
+ // if(premisesData == 12){
+ // this.PremisesOtherFlag = true;
+ // this.PremisesLabel[this.z] = this.addressForm.get('bussiness_address_type_others').value;
+ // }
+ // else{
+ // this.PremisesLabel[this.z] = array[0].address_type;
+ // }
+ // this.z++;
+
+
+ // const control = this.addressForm.controls['additional_premises'];
+ // control.push(this.createPremises());
+
+
+
+ // }
+ // else if($event.source._selected === false ){
+
+ // console.log('false',premisesData);
+
+
+ // if(premisesData == 12){
+ // this.PremisesOtherFlag = false;
+ // }
+
+ // const control = this.addressForm.controls['additional_premises'];
+ // control.removeAt(this.z);
+ // this.z--;
+ // //let index = this.selectedSegmentDatas.indexOf(CustomerSegmentName.name);
+ // //this.selectedSegmentDatas.splice(index,1);
+ // }
+
+ // }
+
+ selectedValue(e,data)
+ {
+ console.log('501 function',);
+ console.log('inside function in bussiness_address_type,',e);
+ console.log('inside function in this.additional_premises,',data);
+
+ let premisesData = e ;
+ this.tempArr = [];
+ let that = this;
+ this.addressData = Object.keys(this.addressData).map(function(key)
+ {
+ that.addressData[key].status = 0;
+ return that.addressData[key];
+ })
+ console.log(this.addressData);
+ premisesData.forEach((val,index)=>
+ {
+ console.log(val);
+ this.z++;
+ // console.log(this.addressTypes);
+ this.formPremisesArray.push({premises_types: val});
+
+ this.tempArr.push(this.addressData.filter(add=>add.address_type_id==val)[0]);
+
+ this.PremisesLabel[index] = this.tempArr[index].address_type;
+
+ if(data[index] !==undefined && data[index].premises_ownership < 2 ){
+ data[index].premises_city = Object.keys(data[index].premises_city).map(function(key)
+ {
+ return data[index].premises_city[key].additional_premises_city;
+ });
+ }
+ this.addressData.forEach(data=>
+ {
+ if(data.address_type_id == val)
+ {
+ data.status = 1;
+ }
+ });
+
+ });
+
+ const control = this.addressForm.controls['additional_premises'] as FormArray;
+
+ // control.removeAt(0);
+ this.tempArr.forEach((item,index)=>
+ {
+ control.push(this.createPremises());
+ });
+
+ this.addressForm.controls['additional_premises'].setValue(data);
}
validateAllFormFields(formGroup: FormGroup) {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html
index 9800a1c2e..206bbfe1e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html
@@ -280,6 +280,7 @@
+
-
+
+
@@ -369,7 +370,8 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ asset.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ prop.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ freqn.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ins_type.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Yes
+ No
+ NAN
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Yes
+ No
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -233,11 +533,37 @@
-
-
+
+
+
+
+
+ {{owner.applicant_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{relations.name}}
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ prop.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ freqn.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ ins_type.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Yes
- No
- NAN
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
-
+
-
+
+
+
-
-
+
+
-
+ 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Yes
- No
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
- 
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -281,7 +282,8 @@
@@ -478,7 +479,7 @@
@@ -196,7 +197,8 @@
@@ -217,7 +218,8 @@