From 3487cf012acbd04121abf69bfead7130745772b1 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Thu, 8 Nov 2018 18:08:39 +0530 Subject: [PATCH 1/3] User profile and Mat Field Width UI --- .../layouts/admin/admin-layout.component.ts | 2 +- .../entity-edit/entity.edit.component.html | 4 +- .../users/register/register.component.html | 111 ++++++------ .../users/register/register.component.scss | 3 + .../user-profile/user-profile-component.html | 169 +++++------------- .../user-profile/user-profile.component.ts | 10 +- 6 files changed, 105 insertions(+), 194 deletions(-) diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts index 2dc3b1ea5..0d8ac289a 100644 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts @@ -64,7 +64,7 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { } let users= { 'userid':this.currentUser.userid, - 'entityid':this.currentUser.fk_entity_id, + 'entityid':this.currentUser.fk_entity_type_id, 'profilepic':this.currentUser.profilepic } this.users.getprofilepic(users).subscribe(res=>{ diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html index 86216b766..a94cc5b09 100644 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html @@ -193,13 +193,13 @@
- + You must Include Entity Full Name.
- + You must Include Entity Short Name. diff --git a/ng6-seed/src/app/settings/users/register/register.component.html b/ng6-seed/src/app/settings/users/register/register.component.html index 9fcaa8124..4564ad88a 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.html +++ b/ng6-seed/src/app/settings/users/register/register.component.html @@ -96,71 +96,66 @@ Role
+ + + -- + + {{types.name}} + + + Enitity Type Required + Enitity Type Required + + + + + -- + + {{ent.full_name}} + + + Lender Name Required. + + + + + -- + + {{ent.full_name}} + + Vendor Name Required. + + + - - -- - - {{types.name}} - - - Enitity Type Required - Enitity Type Required - - - - - -- - - {{ent.full_name}} - - - Lender Name Required. - - - - - -- - - {{ent.full_name}} - - Vendor Name Required. - - - - - - - {{role.role_name}} - - - -
- User Role Required - User Role Required - - - - -- - - {{pd.team_name}} - - - + + + {{role.role_name}} + + + +
+ User Role Required + User Role Required + + + + -- + + {{pd.team_name}} + + +
- - +
- - - +
- - - + diff --git a/ng6-seed/src/app/settings/users/register/register.component.scss b/ng6-seed/src/app/settings/users/register/register.component.scss index b05fce9d5..7ad10372b 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.scss +++ b/ng6-seed/src/app/settings/users/register/register.component.scss @@ -8,4 +8,7 @@ .hoverdp:hover mat-icon{ display:block; } +mat-form-field { + width:20%; +} \ No newline at end of file diff --git a/ng6-seed/src/app/settings/users/user-profile/user-profile-component.html b/ng6-seed/src/app/settings/users/user-profile/user-profile-component.html index 2998114c9..4b0fc9fb6 100755 --- a/ng6-seed/src/app/settings/users/user-profile/user-profile-component.html +++ b/ng6-seed/src/app/settings/users/user-profile/user-profile-component.html @@ -1,130 +1,43 @@ - +
+

{{userDetails.user_first_name}} {{userDetails.user_last_name}}

+

{{userDetails.role_name}}

+

{{userDetails.email}}

+

{{userDetails.mobile_no}}

+

{{userDetails.city_name}} ,{{userDetails.state_name}}

+
+
+ +
+ + +
+ + + + + + + + diff --git a/ng6-seed/src/app/settings/users/user-profile/user-profile.component.ts b/ng6-seed/src/app/settings/users/user-profile/user-profile.component.ts index fb19559e7..4fcf5b1be 100755 --- a/ng6-seed/src/app/settings/users/user-profile/user-profile.component.ts +++ b/ng6-seed/src/app/settings/users/user-profile/user-profile.component.ts @@ -68,7 +68,7 @@ export class UserProfileComponent implements OnInit { getprofilepic(){ let users= { 'userid':this.userDetails.userid, - 'entityid':this.userDetails.fk_entity_id, + 'entityid':this.userDetails.fk_entity_type_id, 'profilepic':this.userDetails.profilepic } this.users.getprofilepic(users).subscribe(res=>{ @@ -85,7 +85,7 @@ export class UserProfileComponent implements OnInit { @Component({ selector: 'app-jazz-dialog', template: ` -
New Password Change.
+
Change Password
@@ -99,15 +99,15 @@ export class UserProfileComponent implements OnInit {
- + Passwords do not math.
- - + + ` }) From f26cb6ee8ebd681400a250a6bc662e2923062596 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Thu, 8 Nov 2018 18:20:28 +0530 Subject: [PATCH 2/3] Form field UI --- .../src/app/settings/users/register/register.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ng6-seed/src/app/settings/users/register/register.component.scss b/ng6-seed/src/app/settings/users/register/register.component.scss index 7ad10372b..34effee20 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.scss +++ b/ng6-seed/src/app/settings/users/register/register.component.scss @@ -9,6 +9,6 @@ display:block; } mat-form-field { - width:20%; + width:23%; } \ No newline at end of file From d616ce6f86723ab193b22967dea968e0dcdc71e5 Mon Sep 17 00:00:00 2001 From: Akisha Date: Thu, 8 Nov 2018 20:59:56 +0530 Subject: [PATCH 3/3] OLD FORMS MODIFIED NEW FORMS ADDED --- .../forms/address/address.component.html | 7 +- .../forms/address/address.component.ts | 56 +++++++---- .../banking-details.component.html | 3 +- .../banking-details.component.ts | 32 +++--- .../current-loan/current-loan.component.html | 1 + .../current-loan/current-loan.component.scss | 1 + .../current-loan/current-loan.component.ts | 36 ++++++- .../family-details.component.html | 9 +- .../family-details.component.ts | 97 +++++++++++-------- .../other-income/other-income.component.html | 8 +- .../other-income/other-income.component.scss | 1 + .../other-income/other-income.component.ts | 41 ++++++-- .../list-pd/start-pd/start-pd.component.html | 10 +- .../list-pd/start-pd/start-pd.component.ts | 9 -- 14 files changed, 206 insertions(+), 105 deletions(-) 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 4b25b783e..8817c55f5 100644 --- 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 @@ -29,6 +29,10 @@ Others (Please specify) + + + - \ No newline at end of file + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts index 0e00cb7c7..3d8b9a9d1 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts @@ -28,6 +28,8 @@ import {ActivatedRoute, Router} from "@angular/router"; styleUrls: ['./address.component.scss'] }) export class AddressComponent implements OnInit { + @Input() pdid: number; + locationdata: any = []; commentData: any = []; customerData: any = []; @@ -46,6 +48,7 @@ export class AddressComponent implements OnInit { constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService) { + this.notifier = notifier; } ngOnInit() { @@ -58,25 +61,32 @@ export class AddressComponent implements OnInit { params.pd_form_id = '250'; this._pd.retriveForm(params).subscribe(data => { console.log('data', data); - var result = Object.keys(data.records.neighbourhood).map(function(key) { - return data.records.neighbourhood[key]; - }); - this.addressForm.controls.address.setValue(data.records.address); - this.addressForm.controls.pd_location.setValue(data.records.pd_location); - this.addressForm.controls.address_type.setValue(data.records.address_type); - this.addressForm.controls.comment_locality.setValue(data.records.comment_locality); - this.addressForm.controls.customer_behaviour.setValue(data.records.customer_behaviour); - this.addressForm.controls.locality.setValue(data.records.locality); const control = this.addressForm.controls['neighbourhood']; - if(result.length == 0) { - control.push(this.createNeighbour()); - } else { - result.forEach(datas => { - control.push(this.createNeighbour()); - }); - this.addressForm.controls.neighbourhood.setValue(result); - } - console.log('result', result); + if(data.status == 200) { + var result = Object.keys(data.records.neighbourhood).map(function (key) { + return data.records.neighbourhood[key]; + }); + this.addressForm.controls.address.setValue(data.records.address); + this.addressForm.controls.pd_location.setValue(data.records.pd_location); + this.addressForm.controls.address_type.setValue(data.records.address_type); + this.addressForm.controls.comment_locality.setValue(data.records.comment_locality); + this.addressForm.controls.customer_behaviour.setValue(data.records.customer_behaviour); + this.addressForm.controls.locality.setValue(data.records.locality); + if (data.records.locality_others) { + this.addressForm.controls.locality_others.setValue(data.records.locality_others); + } + if (result.length == 0) { + control.push(this.createNeighbour()); + } else { + result.forEach(datas => { + control.push(this.createNeighbour()); + }); + this.addressForm.controls.neighbourhood.setValue(result); + } + console.log('result', result); + } else { + control.push(this.createNeighbour()); + } }); } public initAddressForm(): void { @@ -84,6 +94,7 @@ export class AddressComponent implements OnInit { address: ['', Validators.compose([Validators.required])], address_type: ['', Validators.compose([Validators.required])], locality: ['', Validators.compose([Validators.required])], + locality_others: [''], pd_location: ['', Validators.compose([Validators.required])], comment_locality: ['', Validators.compose([Validators.required])], customer_behaviour: ['', Validators.compose([Validators.required])], @@ -157,10 +168,13 @@ export class AddressComponent implements OnInit { records.address = this.address.value; records.address_type = this.addressType.value; records.locality = this.locality.value; + if (this.locality.value == 'Others') { + records.locality_others = this.addressForm.controls.locality_others.value; + } records.pd_location = this.pdLocation.value; records.comment_locality = this.commentlocality.value; records.customer_behaviour = this.commentlocality.value; - records.neighbourhood = this.addressForm.value.items; + records.neighbourhood = this.addressForm.controls.neighbourhood.value; records.pdid = '250'; records.formid = '250'; records.fk_createdby = '250'; @@ -169,7 +183,9 @@ export class AddressComponent implements OnInit { console.log('data', data); this.notifier.notify('success', 'Saved Successfully.'); - }); + }, error => { + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + }); } validateAllFormFields(formGroup: FormGroup) { Object.keys(formGroup.controls).forEach(field => { 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 c7363fbe0..756612cc6 100644 --- 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 @@ -62,4 +62,5 @@ - \ No newline at end of file + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts index 755405c4b..fd7e5155f 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts @@ -28,6 +28,7 @@ import {ActivatedRoute, Router} from "@angular/router"; styleUrls: ['./banking-details.component.scss'] }) export class BankingDetailsComponent implements OnInit { + @Input() pdid: number; public bankingForm: FormGroup; step: any; private notifier: NotifierService; @@ -35,6 +36,7 @@ export class BankingDetailsComponent implements OnInit { constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService) { + this.notifier = notifier; } ngOnInit() { @@ -45,18 +47,22 @@ export class BankingDetailsComponent implements OnInit { params.pd_form_id = '252'; this._pd.retriveForm(params).subscribe(data => { console.log('data', data); - var result = Object.keys(data.records.banking_details).map(function(key) { - return data.records.banking_details[key]; - }); const control = this.bankingForm.controls['itemRows']; - if(result.length == 0) { - control.push(this.createBankarray()); - } else { - result.forEach(datas => { - control.push(this.createBankarray()); - }); - this.bankingForm.controls.itemRows.setValue(result); - } + if( data.status == 200) { + var result = Object.keys(data.records.banking_details).map(function (key) { + return data.records.banking_details[key]; + }); + if (result.length == 0) { + control.push(this.createBankarray()); + } else { + result.forEach(datas => { + control.push(this.createBankarray()); + }); + this.bankingForm.controls.itemRows.setValue(result); + } + } else { + control.push(this.createBankarray()); + } }); } public initBankingForm(): void { @@ -99,7 +105,9 @@ export class BankingDetailsComponent implements OnInit { this._pd.saveForm(records).subscribe(data => { console.log('data', data); this.notifier.notify('success', 'Saved Successfully.'); - }) + }, error => { + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + }); } validateAllFormFields(formGroup: FormGroup) { Object.keys(formGroup.controls).forEach(field => { 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 de8a53594..a21f4548e 100644 --- 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 @@ -1,3 +1,4 @@ +

Current Loan Details

{ + console.log('value', value); + const control = this.currentLoanForm.controls['loan_details']; + if (value.status == 200) { + var result = Object.keys(value.records.loan_details).map(function(key) { + return value.records.loan_details[key]; + }); + this.currentLoanForm.controls['existing_loan'].setValue(value.records.existing_loan); + if (result.length > 0) { + result.forEach(val => { + control.push(this.createLoanDetail()); + }); + this.currentLoanForm.controls['loan_details'].setValue(result); + } else { + control.push(this.createLoanDetail()); + } + } else { + control.push(this.createLoanDetail()); + } + }) } public initCurrentloanForm(): void { this.currentLoanForm = this.fb.group({ existing_loan: ['', Validators.compose([Validators.required])], - loan_details: this.fb.array([this.createLoanDetail()]) + loan_details: this.fb.array([]) }); } createLoanDetail() { @@ -69,15 +95,17 @@ export class CurrentLoanComponent implements OnInit { return; } let records: any = {}; - records.pdid = '253'; - records.formid = '253'; - records.fk_createdby = '253'; + records.pdid = this.pdid; + records.formid = this.form_id; + records.fk_createdby = this.pdid; records.existing_loan = this.currentLoanForm.controls['existing_loan'].value; records.loan_details = this.currentLoanForm.controls['loan_details'].value; console.log('data', records); this._pd.saveForm(records).subscribe(data => { console.log('data', data); this.notifier.notify('success', 'Saved Successfully.'); + }, error => { + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); }) } validateAllFormFields(formGroup: FormGroup) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html index 65b02ca59..2c7dacbca 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html @@ -24,9 +24,9 @@ - - {{relation.name}} + + {{relations.name}} @@ -131,4 +131,5 @@ - \ No newline at end of file + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts index ce812d914..9936555b3 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts @@ -28,6 +28,8 @@ import {ActivatedRoute, Router} from "@angular/router"; styleUrls: ['./family-details.component.scss'] }) export class FamilyDetailsComponent implements OnInit { + @Input() pdid: number; + public currentLoanForm: FormGroup; private notifier: NotifierService; public familyForm: FormGroup; @@ -40,13 +42,21 @@ export class FamilyDetailsComponent implements OnInit { public ownership: AbstractControl; public ownershipOther: AbstractControl; public rent: AbstractControl; - + filteredStates: any = [ + 'Co-Applicant 1 to x', + 'Accountant', + 'Manager', + 'Relative of the applicant', + 'Friend of the Applicant', + 'DSA', + 'Other' + ]; relationData: any = []; occupationData: any = []; constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService) { - + this.notifier = notifier; } ngOnInit() { this.getRelation(); @@ -54,41 +64,50 @@ export class FamilyDetailsComponent implements OnInit { this.initFamilyForm(); let params: any = {}; params.pd_id = '251'; - params.pd_form_id = '251'; + params.pd_form_id = '555'; this._pd.retriveForm(params).subscribe(data => { console.log('data', data); - var result = Object.keys(data.records.non_earning_members).map(function(key) { - return data.records.non_earning_members[key]; - }); - var earning = Object.keys(data.records.earning_members).map(function(key) { - return data.records.earning_members[key]; - }); - this.familyForm.controls.person.setValue(data.records.person_met); - this.familyForm.controls.members.setValue(data.records.family_members); - this.familyForm.controls.years.setValue(data.records.no_of_years); - this.familyForm.controls.ownership.setValue(data.records.ownership); - this.familyForm.controls.rent.setValue(data.records.what_rent); const control = this.familyForm.controls['nonEarningMembers']; - if (result.length == 0) { - control.push(this.createNonMembers()); - } else { - result.forEach(datas => { - control.push(this.createNonMembers()); - }); - this.familyForm.controls.nonEarningMembers.setValue(result); - } const value = this.familyForm.controls['earningMembers']; - if(earning.length == 0) { - value.push(this.createMembers()); - } else { - earning.forEach(datas => { - value.push(this.createMembers()); + if (data.status == 200) { + var result = Object.keys(data.records.non_earning_members).map(function (key) { + return data.records.non_earning_members[key]; }); - this.familyForm.controls.earningMembers.setValue(earning); - + var earning = Object.keys(data.records.earning_members).map(function (key) { + return data.records.earning_members[key]; + }); + this.familyForm.controls.person.setValue(data.records.person_met); + if (data.records.person_met_other) { + this.familyForm.controls.personOther.setValue(data.records.person_met_other); + } + this.familyForm.controls.members.setValue(data.records.family_members); + this.familyForm.controls.years.setValue(data.records.no_of_years); + this.familyForm.controls.ownership.setValue(data.records.ownership); + if (data.records.ownership_others) { + this.familyForm.controls.ownershipOther.setValue(data.records.ownership_others); + } + this.familyForm.controls.rent.setValue(data.records.what_rent); + if (result.length == 0) { + control.push(this.createNonMembers()); + } else { + result.forEach(datas => { + control.push(this.createNonMembers()); + }); + this.familyForm.controls.nonEarningMembers.setValue(result); + } + if (earning.length == 0) { + value.push(this.createMembers()); + } else { + earning.forEach(datas => { + value.push(this.createMembers()); + }); + this.familyForm.controls.earningMembers.setValue(earning); + } + this.familyForm.controls.residence.setValue(data.records.residence); + } else { + value.push(this.createMembers()); + control.push(this.createNonMembers()); } - this.familyForm.controls.residence.setValue(data.records.residence); - }); } public initFamilyForm(): void { @@ -178,30 +197,30 @@ export class FamilyDetailsComponent implements OnInit { let records: any = {}; records.no_of_years = this.years.value; if (this.ownership.value == 'Others') { - records.ownership = this.ownershipOther.value; - } else { - records.ownership = this.ownership.value; + records.ownership_others = this.ownershipOther.value; } + records.ownership = this.ownership.value; records.residence = this.residence.value; if (this.ownership.value == 'Rented') { records.what_rent = this.rent.value; } if (this.person.value == 'Other') { - records.person_met = this.personOther.value; - } else { - records.person_met = this.person.value; + records.person_met_other = this.personOther.value; } + records.person_met = this.person.value; records.family_members = this.members.value; records.earning_members = this.familyForm.controls['earningMembers'].value; records.non_earning_members = this.familyForm.controls['nonEarningMembers'].value; records.pdid = '251'; - records.formid = '251'; + records.formid = '555'; records.fk_createdby = '251'; console.log('params', records); this._pd.saveForm(records).subscribe(data => { console.log('data', data); this.notifier.notify('success', 'Saved Successfully.'); - }) + }, error => { + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + }); } validateAllFormFields(formGroup: FormGroup) { Object.keys(formGroup.controls).forEach(field => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html index 25e8e81af..361ae1ff9 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html @@ -6,7 +6,7 @@ No
- +

Loan Details

@@ -27,7 +27,9 @@ - + + {{frq.name}} + + \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.scss index db319b869..100dc0b17 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.scss @@ -13,6 +13,7 @@ .address .button { float: right; width: 10px; + height: 10px; background: #62B013; color: white; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts index 72a564b11..49ddd9cf3 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts @@ -28,23 +28,48 @@ import {ActivatedRoute, Router} from '@angular/router'; styleUrls: ['./other-income.component.scss'] }) export class OtherIncomeComponent implements OnInit { + @Input() pdid: number; + @Input() form_id: number; public otherIncomeForm: FormGroup; private notifier: NotifierService; - frequencyData: any; + frequencyData: any = []; constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService) { - + this.notifier = notifier; } ngOnInit() { - this.initOtherincomeForm(); this.getFrequency(); + this.initOtherincomeForm(); + let params: any = {}; + params.pd_id = this.pdid; + params.pd_form_id = this.form_id; + this._pd.retriveForm(params).subscribe(value => { + console.log('value', value); + const control = this.otherIncomeForm.controls['income_details']; + if (value.status == 200) { + var result = Object.keys(value.records.income_details).map(function(key) { + return value.records.income_details[key]; + }); + this.otherIncomeForm.controls['other_income'].setValue(value.records.other_income); + if (result.length > 0) { + result.forEach(val => { + control.push(this.createDetail()); + }); + this.otherIncomeForm.controls['income_details'].setValue(result); + } else { + control.push(this.createDetail()); + } + } else { + control.push(this.createDetail()); + } + }) } public initOtherincomeForm(): void { this.otherIncomeForm = this.fb.group({ other_income: ['', Validators.compose([Validators.required])], - income_details: this.fb.array([this.createDetail()]) + income_details: this.fb.array([]) }); } createDetail() { @@ -79,15 +104,17 @@ export class OtherIncomeComponent implements OnInit { return; } let records: any = {}; - records.pdid = '25‎4'; - records.formid = '25‎4'; - records.fk_createdby = '25‎4'; + records.pdid = this.pdid; + records.formid = this.form_id; + records.fk_createdby = this.pdid; records.other_income = this.otherIncomeForm.controls['other_income'].value; records.income_details = this.otherIncomeForm.controls['income_details'].value; console.log('data', records); this._pd.saveForm(records).subscribe(data => { console.log('data', data); this.notifier.notify('success', 'Saved Successfully.'); + }, error => { + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); }) } validateAllFormFields(formGroup: FormGroup) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html index e7e216521..dcd846977 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html @@ -394,21 +394,21 @@ - + - + - + - + - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts index bf5b2f28e..8581ad68b 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts @@ -28,15 +28,6 @@ export class StartPdComponent implements OnInit, OnDestroy { getQuestionsLength: number; answerList: any = []; ansPDList: any = []; - filteredStates: any = [ - 'Co-Applicant 1 to x', - 'Accountant', - 'Manager', - 'Relative of the applicant', - 'Friend of the Applicant', - 'DSA', - 'Other' - ]; relationDetails: any = [1]; // errorMessage:any; // selectedCategory:any=[];