From 32f14d64215bae838b2ce9b2726bec4b8d661ac5 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Thu, 13 Dec 2018 18:37:47 +0530 Subject: [PATCH 01/27] entity branch details added : kdk --- .../entity-branch-add.component.html | 25 ++++ .../entity-branch-add.component.scss | 14 ++ .../entity-branch-add.component.spec.ts | 25 ++++ .../entity-branch-add.component.ts | 125 ++++++++++++++++++ .../entity-edit/entity.edit.component.html | 6 + .../src/app/settings/entity/entity.module.ts | 4 +- .../settings/service/entity/entity.service.ts | 16 +++ 7 files changed, 214 insertions(+), 1 deletion(-) create mode 100644 ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.html create mode 100644 ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.scss create mode 100644 ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.spec.ts create mode 100644 ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.ts diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.html new file mode 100644 index 000000000..4df9dc3d9 --- /dev/null +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.html @@ -0,0 +1,25 @@ +
+ + + check +
+
+ + + + + edit + check + delete + + + +
+ + +
+
+
+

No Records Found...

+
\ No newline at end of file diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.scss b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.scss new file mode 100644 index 000000000..53f8de38e --- /dev/null +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.scss @@ -0,0 +1,14 @@ +.inlist{ + display: flex; + flex-wrap: wrap; +} + +.inlist > * { + width: 350px; +} + +.list-item { + border: 1px solid gray; + margin: 2px; + border-radius: 6px; +} \ No newline at end of file diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.spec.ts b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.spec.ts new file mode 100644 index 000000000..205a0c98f --- /dev/null +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EntityBranchAddComponent } from './entity-branch-add.component'; + +describe('EntityBranchAddComponent', () => { + let component: EntityBranchAddComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EntityBranchAddComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EntityBranchAddComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.ts b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.ts new file mode 100644 index 000000000..23dc8426d --- /dev/null +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.ts @@ -0,0 +1,125 @@ +import { Component, ViewChild, OnInit, OnDestroy, Input, Inject } from '@angular/core'; +import { MatPaginator, MatSort, MatTableDataSource, MatDialog, MatDialogRef, MAT_DIALOG_DATA, PageEvent } from '@angular/material'; +import { FormGroup, FormControl, FormBuilder, Validators, FormArray } from '@angular/forms'; +import { ActivatedRoute, Router } from '@angular/router'; +import { DataSource } from '@angular/cdk/table'; +import { Observable } from 'rxjs/Observable'; + +import { NotifierService } from 'angular-notifier'; + +import { MastersService } from './../../../service/masters/masters.service'; +import { EntityService } from './../../../service/entity/entity.service'; + +@Component({ + selector: 'app-entity-branch-add', + templateUrl: './entity-branch-add.component.html', + styleUrls: ['./entity-branch-add.component.scss'] +}) +export class EntityBranchAddComponent implements OnInit { + + @Input() public entityId: number; + public newElement = { name: '' }; + public listOfBranch = []; + + /** +* Notifier service +*/ + private notifier: NotifierService; + + constructor( + notifier: NotifierService, + private entityService: EntityService, + private mastersService: MastersService, + private _formBuilder: FormBuilder) { + this.notifier = notifier; + } + + ngOnInit() { + this.entityService.getEntityBranchList(this.entityId).subscribe(data => { + if (data.dataStatus) { + this.listOfBranch = data.records; + } + }, err => { + + }) + } + + + // public listOfBranch = [ + // { + // "entity_lender_branch_id": 1, + // "branch_name": "Dev Test Branch 1", + // "isactive": "1", + // "fk_createdby": "1", + // "fk_updatedby": "1", + // "fk_entity_id": "1" + // }, + // { + // "entity_lender_branch_id": 2, + // "branch_name": "Dev Test Branch 2", + // "isactive": "1", + // "fk_createdby": "1", + // "fk_updatedby": "1", + // "fk_entity_id": "1" + // }, + // { + // "entity_lender_branch_id": 3, + // "branch_name": "Dev Test Branch 3", + // "isactive": "1", + // "fk_createdby": "1", + // "fk_updatedby": "1", + // "fk_entity_id": "1" + // } + // ]; + + addItem(): void { + let data = { + "entity_lender_branch_id": null, + "branch_name": this.newElement.name, + "isactive": "1", + "fk_createdby": null, + "fk_updatedby": null, + "fk_entity_id": this.entityId.toString() + } + this.listOfBranch.push(data); + this.newElement.name = ''; + } + + public currentElement = -1; + editItem(i): void { + this.currentElement = i; + } + + deleteItem(i): void { + this.listOfBranch.splice(i, 1); + } + + saveBranch(): void { + this.entityService.updateEntityIdBranchInfoDetails(this.listOfBranch).subscribe(data => { + if (data.dataStatus) { + this.notifier.notify('success', 'Your Changes Updated.!'); + } else { + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + } + }, err => { + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + }) + } + + reset(): void { + this.listOfBranch = []; + this.ngOnInit(); + } +} + + +// "records": [ +// { +// "entity_lender_branch_id": null, +// "branch_name": "Dev Test Branch", +// "isactive": "1", +// "fk_createdby": "1", +// "fk_updatedby": "1", +// "fk_entity_id": "1" +// } +// ] \ No newline at end of file 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 a94cc5b09..486a28bc6 100755 --- 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 @@ -239,6 +239,12 @@ + + + + + + - + Yes @@ -151,7 +151,7 @@ + formControlName="limit" (keypress)="keyPress($event)" required autocomplete="off">
- + - +
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 885aba086..238832be3 100755 --- 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 @@ -37,6 +37,7 @@ export class BankingDetailsComponent implements OnInit { public applicants: any; m_accountType= []; m_btLenderList = []; + salaryField : boolean; constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, @@ -57,6 +58,8 @@ export class BankingDetailsComponent implements OnInit { this.initBankingForm(); this.getM_AccountType(); this.getM_BTLenderList(); + + this.salaryField = this.pd_cus_segment.substring(0,2) == 'SE' ? false : true ; // this.pd_cus_segment = this.pd_all_details.pdmaster_details.customer_segment_abbr.toUpperCase(); // // console.log("(0,3): " + this.pd_cus_segment.substring(0,3)); // // console.log(this.pd_all_details.pdmaster_details); @@ -123,7 +126,8 @@ export class BankingDetailsComponent implements OnInit { bank_name: ['', Validators.compose([Validators.required])], other_bank: [''], account_type: ['', Validators.compose([Validators.required])], - salary: ['', Validators.compose([Validators.required])], + //salary: ['', Validators.compose([Validators.required])], + salary: this.pd_cus_segment.substring(0,2) == 'SE' ? [''] : ['', Validators.compose([Validators.required])], limit: ['', Validators.compose([Validators.required])], //is_main: ['', Validators.compose([Validators.required])], //is_main: [this.pd_cus_segment == 'SAL' ? '' : '', Validators.compose([Validators.required])], @@ -188,13 +192,13 @@ export class BankingDetailsComponent implements OnInit { } selectedAccTypeChanges(event: any){ - console.log('First Time',event); - console.log('First Time Value',event.value); + // console.log('First Time',event); + // console.log('First Time Value',event.value); if(event.value == 2) { const control = this.bankingForm.controls['itemRows']; - console.log('Inside If Condition'); - console.log(control); - console.log(control.controls); + // console.log('Inside If Condition'); + // console.log(control); + // console.log(control.controls); control.controls[0].get('limit').clearValidators(); control.controls[0].get('limit').updateValueAndValidity(); @@ -208,7 +212,7 @@ export class BankingDetailsComponent implements OnInit { } else{ - alert('sd'); + //alert('sd'); } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html index e8d72e1a7..c173c61fd 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html @@ -18,12 +18,12 @@
- + {{"₹"}} {{loanAmtInWords}} Only - - {{ enduse.name }} + + {{ enduse.name }} - +
- + {{"₹"}} {{balTxrfAmtInWords}} Only @@ -67,18 +67,18 @@ - + - + {{"₹"}} {{topUpAmtInWords}} Only
- + {{"₹"}} {{ownContributionInWords}} Only @@ -96,14 +96,14 @@ - +
- + @@ -133,7 +133,7 @@ --> - + - + @@ -155,7 +155,7 @@ + formControlName="percentage_of_construction" (keypress)="keyPress($event)" required autocomplete="off"> + +
+
+ + +
+
+ + + Branch Name Required.! + + + + + {{ city.name }} + + City Required.! + +
+ + + +
+
+
+ + +
+
+ + + + +
+
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.ts b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.ts index a6b927778..517aad7ac 100644 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.ts +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.ts @@ -18,9 +18,15 @@ import { EntityService } from './../../../service/entity/entity.service'; export class EntityBranchAddComponent implements OnInit { @Input() public entityId: number; - public newElement = { name: '' }; + public newElement: any= {}; + public listofCity = []; public listOfBranch = []; + public m_city: any = []; + + public _addEntityBranchFrom: FormGroup; + public submitted = false; + /** * Notifier service */ @@ -32,18 +38,89 @@ export class EntityBranchAddComponent implements OnInit { private mastersService: MastersService, private _formBuilder: FormBuilder) { this.notifier = notifier; + this._addEntityBranchFrom = this._formBuilder.group({ + branch_details: this._formBuilder.array([ + // this.addRegionFormData(null, null), + ]) + }) } ngOnInit() { this.entityService.getEntityBranchList(this.entityId).subscribe(data => { if (data.dataStatus) { - this.listOfBranch = data.records; + this.listofCity = data.records; + this.m_city = data.records.city_master; + // this.listOfBranch = data.records; + this.setFormDatas(data.records.branch_details); } }, err => { - }) } + setFormDatas(record) { + if (record.length > 0) { + for (let val of record) { + let vals = { + entity_lender_branch_id: val.entity_lender_branch_id, + branch_name: val.branch_name, + fk_entity_id: val.fk_entity_id, + fk_region_id: val.fk_region_id, + fk_city_id: val.fk_city_id, + fk_updatedby: val.fk_updatedby, + fk_createdby: val.fk_createdby, + isactive: val.isactive, + }; + this.addRegionFormData(vals, null); + } + } + } + + // convenience getter for easy access to form fields + get f() { return this._addEntityBranchFrom.controls; } + + // Dynamic Form field creation Functionality : START ===> + initRegionFormLoad(data) { + return this._formBuilder.group({ + entity_lender_branch_id: [data.entity_lender_branch_id], + branch_name: [data.branch_name, Validators.compose([Validators.required])], + fk_city_id: [data.fk_city_id, Validators.compose([Validators.required])], + fk_entity_id: [data.fk_entity_id], + fk_updatedby: [data.fk_updatedby], + fk_createdby: [data.fk_createdby], + isactive: [data.isactive], + }); + } + addRegionFormData(data, e) { + if (data == null) { + let newDate = { + entity_lender_branch_id: null, + branch_name:null, + fk_entity_id: this.entityId, + fk_createdby: null, + fk_updatedby: null, + fk_city_id: null, + isactive: 1, + } + const control = this._addEntityBranchFrom.controls['branch_details']; + control.push(this.initRegionFormLoad(newDate)); + } else { + const control = this._addEntityBranchFrom.controls['branch_details']; + control.push(this.initRegionFormLoad(data)); + } + } + + deleteEntityBranch(inx, e) { + e.stopPropagation(); + const control = this._addEntityBranchFrom.controls['branch_details']; + // let dataS = control.controls[inx].value; + if(control.controls[inx].value['entity_lender_branch_id'] !== null){ + console.log( this._addEntityBranchFrom.controls['branch_details']['controls'][inx].controls.isactive); + this._addEntityBranchFrom.controls['branch_details']['controls'][inx].controls.isactive.setValue("0"); + console.log( this._addEntityBranchFrom.controls['branch_details']['controls'][inx].controls.isactive.value); + } else { + control.removeAt(inx); + } + } // public listOfBranch = [ // { @@ -72,17 +149,17 @@ export class EntityBranchAddComponent implements OnInit { // } // ]; - addItem(): void { - let data = { - "entity_lender_branch_id": null, - "branch_name": this.newElement.name, - "isactive": "1", - "fk_createdby": null, - "fk_updatedby": null, - "fk_entity_id": this.entityId.toString() - } - this.listOfBranch.push(data); - this.newElement.name = ''; + addItem(prop): void { + // let data = { + // "entity_lender_branch_id": null, + // "branch_name": this.newElement.name, + // "isactive": "1", + // "fk_createdby": null, + // "fk_updatedby": null, + // "fk_entity_id": this.entityId.toString() + // } + // this.listOfBranch.push(data); + // this.newElement.name = ''; } public currentElement = -1; @@ -98,8 +175,48 @@ export class EntityBranchAddComponent implements OnInit { } } + /** To Save/Edited Popup Data */ + onSubmit() { + alert(); + this.submitted = true; + // stop here if form is invalid + if (this._addEntityBranchFrom.invalid) { + // this.errorMessage = "Please Fill All Mandate Fields."; + return; + } else { + var formValues = this._addEntityBranchFrom.value; + //To Remove The "Null" With Key also + Object.keys(formValues).forEach((key) => (formValues[key] == null) && delete formValues[key]); + alert(JSON.stringify(formValues.branch_details)); + // this.entityService.updateEntityIdRegionInfoDetails(formValues.region_lender).subscribe( + // dataresult => { + // if (dataresult.status == 200) { + // console.log(dataresult); + // this.notifier.notify('success', 'Your Changes Updated.!'); + // const arr = this._editEntityRegionFrom.controls.region_lender; + // arr.controls.splice(0); + // // this.getEntityIDRegionInfoDetails(); + // } + // else { + // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + // // this.errorMessage = "Something Wents Wrong Try Again.!"; + // } + // }, error => { + // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + // // this.errorMessage = "Some Thing Wents Wrong Try Again.!"; + // }); + } + } + + saveBranch(): void { - this.entityService.updateEntityIdBranchInfoDetails(this.listOfBranch).subscribe(data => { +// alert(); + var formValues = this._addEntityBranchFrom.value; + //To Remove The "Null" With Key also + Object.keys(formValues).forEach((key) => (formValues[key] == null) && delete formValues[key]); + // alert(JSON.stringify(formValues.branch_details)); + + this.entityService.updateEntityIdBranchInfoDetails(formValues.branch_details).subscribe(data => { if (data.dataStatus) { this.notifier.notify('success', 'Your Changes Updated.!'); } else { 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 90a324cf4..17b31563b 100755 --- 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 @@ -234,18 +234,18 @@ - - - - - - + + + + + +
- +
@@ -140,14 +140,14 @@
- +
- +
@@ -170,17 +170,17 @@ - +
- +
- +
@@ -195,10 +195,10 @@
- + - + @@ -209,10 +209,12 @@ No NAN + - - - .00 + + + +
@@ -225,7 +227,7 @@
- +
@@ -233,7 +235,7 @@
- +
@@ -261,24 +263,30 @@
- +
- +
- +
- +
+ + + + +
+
- +
@@ -292,10 +300,7 @@
- - - + class="mr-1 mb-1 hover-icon" (click)="addSupplierDetails($event,1); false">add
@@ -306,83 +311,285 @@
- - - -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - + + + +
+
+ + +
+
+
+ + +
+
+ + + {{ asset.name }} + + +
+ +
+ +
+
+
+
+
+ + + {{ prop.name }} + +
- +
+ + + +
+
+
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - + +
+
+
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+
+ + + +
+
+ + + {{ freqn.name }} + + +
+
+ + + +
+
+
+
+ + + +
+
+
+
+
+
+ +
+
+
+
+
+
+ + + {{ ins_type.name }} + +
- + + + + + +
+ + + +
+
+ + + +
+
+
+
+ + +
+
+
+
+
+ + + + + + + + + + + + Yes + No + NAN + + + + + + + +
+
+
+
-
+ +
+ + +
+
+
+ + + +
+
+
+ +
+ + + +
+
+
+
+
+
+ + + Yes + No + +
-
+
+ + + +
+
+ + + +
+
+ + + +
+ + + +
+
+ + + +
+
+ + + +
+
+
+ + +
+
+
+ +
+ +
+ + + + + + +
+
+ + + + +
+
-
+
@@ -412,11 +619,79 @@
- -
+
+
+
- - +
+
+
+
+ Nivi SKM + +
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+ Nivi SKM + +
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+ Nivi SKM + +
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+ Nivi SKM + +
+ +
+
+
+
+
+ +
+ + + @@ -424,7 +699,7 @@
Remarks - +
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 47119531b..38fabb3d4 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,6 +35,7 @@ export class AssetsInfoComponent implements OnInit { public _assetsQuesFrom: FormGroup; public submitted = false; public m_assets_type = []; + // public m_assets_type = [ // { // 'id': "1", @@ -274,9 +275,11 @@ public m_investmentType = []; assets_details: this._formBuilder.array([ // this.initDetails(), ]), + business_assets_details : this._formBuilder.array([]), assets_form_remark:[value.assets_form_remark || 'check'] }); this.addAssetsDetailsWithData(value.assets_details); + this.addAssetsDetailsWithData2(value.business_assets_details); } else { this._assetsQuesFrom = this._formBuilder.group({ pdid: [this.pdid], @@ -284,6 +287,9 @@ public m_investmentType = []; assets_details: this._formBuilder.array([ this.initDetails(), ]), + business_assets_details : this._formBuilder.array([ + this.initnewDetails(), + ]), assets_form_remark:[''] }); } @@ -308,56 +314,90 @@ public m_investmentType = []; //purchase_month: ['', Validators.compose([])], emi: [''], emi_paid: [''], + original_loan_tenure: [''], + balance_tenure: [''], elapsed_tenure: [''], - balance_tenure: [''] }); } + initnewDetails() { + 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([])], + // purchase_year: ['', Validators.compose([])], + //purchase_month: ['', Validators.compose([])], + business_emi: [''], + business_emi_paid: [''], + business_original_loan_tenure: [''], + business_balance_tenure: [''], + business_elapsed_tenure: [''], + }); + } show: boolean; - selectedAssetsType(e: any, i: any): void { + selectedAssetsType(e: any, i: any,flag : any): void { + console.log(e); + console.log(i); + console.log(flag); let val = i; - const arr = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; - arr.controls.splice(0); + if(flag == 1){ + const arr = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + arr.controls.splice(0); + } + else if(flag == 2){ + const arr = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray; + arr.controls.splice(0); + } + switch (e.value) { case '1': { let val = i; - const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + const control = (flag == 1) ? (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray + : (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; control.push(this.loadProperty()); break; } case '2': { - const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + const control = (flag == 1) ? (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray + : (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; control.push(this.load_Four_Weeler()); break; } case '3': { - const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + const control = (flag == 1) ? (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray + : (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; control.push(this.load_Two_Weeler()); break; } case '4': { - const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + const control = (flag == 1) ? (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray + : (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; //control.push(this.loadJwellDescription()); break; } case '5': { - const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + const control = (flag == 1) ? (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray + : (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; control.push(this.loadConsumerDurableDescription()); break; } case '6': { - const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + const control = (flag == 1) ? (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray + : (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; control.push(this.loadInsuranceDescription()); break; } case '7': { - const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + const control = (flag == 1) ? (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray + : (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; control.push(this.loadInvestDescription()); break; } case '8': { - const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + const control = (flag == 1) ? (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray + : (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('details') as FormArray ; control.push(this.otherAssetsDescription()); break; } @@ -410,7 +450,7 @@ public m_investmentType = []; loadInvestDescription() { return this._formBuilder.group({ investments_type: ['', Validators.compose([Validators.required])], - other_investment_type:[''], + other_investments_type:[''], amount_of_invest: ['', Validators.compose([Validators.required])], bank_name: ['', Validators.compose([Validators.required])] }); @@ -433,6 +473,14 @@ public m_investmentType = []; loadPropertyWithData(data) { return this._formBuilder.group({ property_type: [data.property_type, Validators.compose([Validators.required])] + //property_type:[''] + }); + } + + loadPropertyWithData2(data) { + return this._formBuilder.group({ + property_type: [data.property_type, Validators.compose([Validators.required])] + //property_type:[''] }); } @@ -500,12 +548,29 @@ public m_investmentType = []; // purchase_month: [data.purchase_month, Validators.compose([])], emi: [data.emi || 0], emi_paid: [data.emi_paid || ''], - elapsed_tenure: [data.elapsed_tenure || ''], - balance_tenure: [data.balance_tenure || ''] + original_loan_tenure: [data.original_loan_tenure || ''], + balance_tenure: [data.balance_tenure || ''], + elapsed_tenure: [data.elapsed_tenure || ''] + }); + } + initnewDetailsWithdata(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([])], + // purchase_year: [data.purchase_year, Validators.compose([])], + // purchase_month: [data.purchase_month, Validators.compose([])], + business_emi: [data.business_emi || 0], + business_emi_paid: [data.business_emi_paid || ''], + business_original_loan_tenure: [data.business_original_loan_tenure || ''], + business_balance_tenure: [data.business_balance_tenure || ''], + business_elapsed_tenure: [data.business_elapsed_tenure || ''] }); } loadDetails: boolean; addAssetsDetailsWithData(supp_data) { + console.log(supp_data); var result = Object.keys(supp_data).map(function (key) { return supp_data[key]; }); @@ -519,6 +584,7 @@ public m_investmentType = []; // purchase_month: val.purchase_month, emi: val.emi, emi_paid: val.emi_paid, + original_loan_tenure: val.original_loan_tenure, elapsed_tenure: val.elapsed_tenure, balance_tenure: val.balance_tenure }; @@ -530,6 +596,39 @@ public m_investmentType = []; this.loadDetails = true; } + addAssetsDetailsWithData2(supp_data) { + + console.log(supp_data); + + var result = Object.keys(supp_data).map(function (key) { + return supp_data[key]; + }); + if (result.length > 0) { + for (let val of result) { + let vals = { + 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, + // purchase_year: val.purchase_year, + // purchase_month: val.purchase_month, + business_emi: val.business_emi, + business_emi_paid: val.business_emi_paid, + business_original_loan_tenure: val.business_original_loan_tenure, + business_elapsed_tenure: val.business_elapsed_tenure, + business_balance_tenure: val.business_balance_tenure + }; + // const control = this._assetsQuesFrom.controls['assets_details']; + // control.push(this.initDetailsWithdata(vals)); + // this.setAssetsDetailsWithData(vals.business_assets_mode, val.details, control.length - 1) + + const control = this._assetsQuesFrom.controls['business_assets_details']; + control.push(this.initnewDetailsWithdata(vals)); + this.setAssetsDetailsWithData2(vals.business_assets_mode, val.business_details, control.length - 1) + } + } + //this.loadDetails = true; + } + setAssetsDetailsWithData(assets_details_mode: any, datas: any, i: any): void { let val = i; // var data = Object.keys(datas).map(function (key) { @@ -539,6 +638,7 @@ public m_investmentType = []; let data = datas; const arr = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; arr.controls.splice(0); + switch (assets_details_mode) { case '1': { const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; @@ -586,13 +686,76 @@ public m_investmentType = []; } } - addSupplierDetails(e) { + setAssetsDetailsWithData2(assets_details_mode: any, datas: any, i: any): void { + let val = i; + let data = datas; + const arr = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; + arr.controls.splice(0); + + switch (assets_details_mode) { + case '1': { + const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; + control.push(this.loadPropertyWithData2(data)); + break; + } + case '2': { + const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; + control.push(this.load_Four_WeelerWithData(data)); + break; + } + case '3': { + const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; + control.push(this.load_Two_WeelerWithData(data)); + break; + } + case '4': { + break; + } + case '5': { + const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; + control.push(this.loadConsumerDurableDescriptionWithData(data)); + break; + } + case '6': { + const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; + control.push(this.loadInsuranceDescriptionWithData(data)); + break; + } + case '7': { + const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; + control.push(this.loadInvestDescriptionWithData(data)); + break; + } + case '8': { + const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; + control.push(this.otherAssetsDescriptionWithData(data)); + break; + } + default: { + break; + } + } + } + + addSupplierDetails(e,flag) { + console.log(flag); + console.log(e); + if(flag == 1){ const control = this._assetsQuesFrom.controls['assets_details']; control.push(this.initDetails()); + }else if(flag == 2){ + const control = this._assetsQuesFrom.controls['business_assets_details']; + control.push(this.initnewDetails()); + } } - removeLanguage(i: number) { + removeLanguage(i: number,flag) { + if(flag == 1){ const control = this._assetsQuesFrom.controls['assets_details']; control.removeAt(i); + }else if(flag == 2){ + const control = this._assetsQuesFrom.controls['business_assets_details']; + control.removeAt(i); + } } public paymentModeTextBox: number; @@ -621,8 +784,19 @@ public m_investmentType = []; answerFormValues.assets_details.map(val => { if (val.emi == '0') { val.emi_paid = ''; - val.elapsed_tenure = ''; + val.original_loan_tenure = ''; val.balance_tenure = ''; + val.elapsed_tenure = ''; + } + }); + + //To Remove The "Null" With Key also + answerFormValues.business_assets_details.map(val => { + if (val.business_emi == '0') { + val.business_emi_paid = ''; + val.business_original_loan_tenure = ''; + val.business_balance_tenure = ''; + val.business_elapsed_tenure = ''; } }); @@ -664,6 +838,19 @@ public m_investmentType = []; event.preventDefault(); } } + + loanCalc(details) + { + //console.log(details.value); + let ElapsedValues; + + if(details.value.original_loan_tenure != null && details.value.original_loan_tenure != '' && details.value.balance_tenure != null && details.value.balance_tenure != ''){ + ElapsedValues = details.value.original_loan_tenure - details.value.balance_tenure ; + details.controls['elapsed_tenure'].setValue(ElapsedValues); + } + + } + // { // 'main_raw_materials': 'sdkjfal', // 'supplier_details' ; [ From a39d8af38e470d963e69355d1150b6eb5665a796 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 15 Dec 2018 18:24:00 +0530 Subject: [PATCH 08/27] address : ps --- .../forms/address/address.component.html | 41 +++--- .../forms/address/address.component.ts | 139 +++++++++++++----- 2 files changed, 120 insertions(+), 60 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 4ebefbf78..5829feb40 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 @@ -22,7 +22,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -48,7 +48,7 @@ + formControlName="locality_others" autocomplete="off"> @@ -87,11 +87,11 @@ - + - + @@ -102,35 +102,33 @@ - + - + - + - +
+ *ngFor="let item of addressForm.controls.additional_premises['controls']; let i = index;" [formGroupName]="i"> - - {{i+1}} . {{PremisesLabel[i]}} - - +

{{i+1}} . {{PremisesLabel[i]}}

+ + formControlName="no_of_additional_units" autocomplete="off"> - + {{CL.name}} @@ -148,18 +146,17 @@ - + - + + formControlName="premises_remarks" style="width: 65%;" autocomplete="off"> -
- + -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
+ 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 17184cacd..80d5f4766 100755 --- 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 @@ -251,6 +251,25 @@ export class AddressComponent implements OnInit { }) }); } + public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } +}; /*221118 review doc s.no 3.f addNeighbour() { const control = this.addressForm.controls['neighbourhood']; 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 91eced0f1..9800a1c2e 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,112 +280,96 @@ -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts index d65a250c7..f8a6e5b87 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts @@ -53,7 +53,25 @@ salesMonthWiseExpandedItems: any=[] this.notifier = notifier; this.form_id = 16; } - +public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } +}; ngOnInit() { this.initAssessedIncomeForm(); 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 092096a10..da50ef8ee 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 @@ -309,112 +309,96 @@ -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- + 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 47119531b..12c2a2261 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 @@ -170,7 +170,25 @@ public m_investmentType = []; this.notifier = notifier; } - + public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } +}; ngOnInit() { 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 4aab1bb4c..5db1ff5fb 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,116 +192,96 @@ -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- + 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 93daffb4d..d80b9fcfd 100755 --- 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 @@ -52,7 +52,25 @@ export class BankingDetailsComponent implements OnInit { } - + public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } +}; ngOnInit() { this.step = 0; 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 a4205fc9c..0d921b9be 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,115 +388,96 @@ -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
+ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts index cfd137a6b..94a3ee5e6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts @@ -51,7 +51,25 @@ export class BusinessInfoComponent implements OnInit { this.form_id = 13; this.notifier = notifier; } - + public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } +}; ngOnInit() { this.getRelation(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html index 1c5b4410b..b37cb7159 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html @@ -112,115 +112,96 @@ -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
+ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts index dc3036915..d8fac2c96 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts @@ -103,7 +103,25 @@ private notifier: NotifierService; this.form_id = 2; this.notifier = notifier; } - +public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } +}; ngOnInit() { this.getM_FreqOfPurchase(); this.getM_PaymentModeType(); 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 13baa7d37..dcc253f18 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,116 +107,96 @@ -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts index 8051e3cd6..8a35d1bfc 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts @@ -53,6 +53,25 @@ export class CurrentLoanComponent implements OnInit { this.notifier = notifier; this.applicants = this.pd_all_details.pdapplicants_detials; } + public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } +}; ngOnInit() { this.getMasterDetails('BTLENDERLIST',1); this.getMasterDetails('FREQUENCY',2); 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 85afc2099..ccaeb1c8d 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,112 +128,96 @@ -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts index 71724ff1f..463626707 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts @@ -49,7 +49,25 @@ export class EmploymentInfoComponent implements OnInit { this.notifier = notifier; } - + public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } +}; ngOnInit() { this.pd_cus_segment=this.pd_all_details.pdmaster_details.customer_segment_abbr.toUpperCase(); this.initemploymentForm(); 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 98a1ddd7e..aa4aca658 100755 --- 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 @@ -170,112 +170,96 @@ -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html index 3dcb3ce04..fca7c549a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html @@ -139,112 +139,96 @@ -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts index a42325a7e..4eaaad74f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts @@ -48,6 +48,25 @@ export class FinancialInfoComponent implements OnInit { this.form_id = 14; this.notifier = notifier; } + public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } +}; ngOnInit() { this.initstockForm(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html index da870e697..e3b05b4f2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html @@ -51,111 +51,96 @@ -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
+ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts index 47d33a058..8530de8d8 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts @@ -32,7 +32,25 @@ export class LenderRepresentativeComponent implements OnInit { this.form_id = 15; this.notifier = notifier; } - + public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } +}; ngOnInit() { this.initRepresentative(); let params: any = {}; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html index c173c61fd..5754e395d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html @@ -183,111 +183,96 @@ -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
+ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts index 37b4f213d..0b227700e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts @@ -82,7 +82,25 @@ export class LoanDetailsComponent implements OnInit { this.pdid= this.pd_all_details.pdmaster_details.pd_id; this.notifier = notifier; } - + public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } +}; ngOnInit() { console.clear(); console.log(this.pd_all_details); 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 45b0df9b9..1b3a0f32f 100755 --- 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 @@ -93,108 +93,96 @@ -
-
-
-
-
-
-
-
- Nivi SKM - -
- -
-
+
+
+
+
+
+
Image 1
+
+
+
+
+
+
+
Image 2
+
+
+
+
+
+
+
Image 3
+
+
+
+
+
+
+
Image 2
+
+
+
+
+
+
+
Image 3
+
+
+
+
+
+
+
Image 1
+
+
+
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
-
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
+ +
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 53760597b..1e7bb0909 100755 --- 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 @@ -55,7 +55,25 @@ export class OtherIncomeComponent implements OnInit { this.form_id = 9; this.notifier = notifier; } - +public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } +}; ngOnInit() { console.clear(); this.getFrequency(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html index a1c0fc84f..f56e8be59 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html @@ -209,111 +209,96 @@ -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
+ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts index b41f5119f..24e4c76cf 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts @@ -66,7 +66,25 @@ export class PersonalInfoComponent implements OnInit { this.notifier = notifier; this.form_id = 3; } - +public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } +}; ngOnInit() { this.initFormDetails() this.loadPDDetails(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html index e6a766540..77b619fd5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html @@ -204,111 +204,96 @@ -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
+ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts index 4de812beb..72ba6052e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts @@ -36,7 +36,25 @@ export class RentalInfoComponent implements OnInit { this.notifier = notifier; this.form_id = 17; } - + public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } +}; ngOnInit() { this.step = 0; this.inintRentalForm(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html index 1df3ba854..fdb89868b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html @@ -123,112 +123,96 @@ -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts index 852581817..6b9cb444a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts @@ -47,6 +47,25 @@ export class StockComponent implements OnInit { this.form_id = 11; this.notifier = notifier; } + public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } +}; ngOnInit() { this.initstockForm(); this.getUOM(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html index 01198a3f5..172160c01 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html @@ -4,15 +4,11 @@

{{pageTitle}}
- - +
-

- - - + + - @@ -27,8 +23,7 @@
-
- +
@@ -98,17 +93,13 @@
-
- - +
- - - +
@@ -121,126 +112,104 @@ - -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
- + - - - - + + -
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss index 2ee011993..411bc5979 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss @@ -17,6 +17,9 @@ .mat-card-actions { background-color: white; } + ::ng-deep .cdk-global-overlay-wrapper{ + justify-content: center !important; +} mat-form-field { margin: 0 2%; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts index 6fe83ad3f..a56a76238 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts @@ -53,6 +53,25 @@ export class SupplierInfoComponent implements OnInit { this.form_id = 1; this.notifier = notifier; } + public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } +}; ngOnInit() { // this.getM_FreqOfPurchase(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts index 25ce4b54e..17dce719b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts @@ -80,6 +80,8 @@ import { ModelEditPdReportComponent } from './list-pd/pd-report/model-edit-pd-re import { OtherApplicantDetailsComponent } from './list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component'; import { NeighbourHoodComponent } from './list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component'; +// import ngx-viewer module +import { NgxViewerModule } from 'ngx-viewer'; /** * Custom angular notifier options @@ -265,6 +267,7 @@ const pdCustomNotifierOptions: NotifierOptions = { imports: [ CommonModule, ManagePdRoutingModule, + NgxViewerModule, NotifierModule.withConfig(pdCustomNotifierOptions), CKEditorModule, PdfViewerModule, diff --git a/ng6-seed/src/assets/styles/app.scss b/ng6-seed/src/assets/styles/app.scss index b8044770c..e6edd5b3e 100755 --- a/ng6-seed/src/assets/styles/app.scss +++ b/ng6-seed/src/assets/styles/app.scss @@ -44,6 +44,7 @@ Author: TrendSetter Themes @import "scss/core"; @import "scss/material"; @import "scss/utilities/utilities"; +@import '~viewerjs/dist/viewer.css'; /* Add application styles & imports to this file! */ From 61884e4b9234b03b3f2421d4cf3172941b47e879 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Mon, 17 Dec 2018 18:53:49 +0530 Subject: [PATCH 10/27] family details changed to other family details : kdk --- .../family-details.component.html | 553 ++++++++++-------- .../family-details.component.ts | 302 +++++----- 2 files changed, 447 insertions(+), 408 deletions(-) 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 98a1ddd7e..88d691015 100755 --- 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 @@ -1,13 +1,14 @@

-
- {{pageTitle}} -
-
- -
+
+ {{pageTitle}} +
+
+ +

- + @@ -17,58 +18,173 @@ - - + + +
+ + + + {{person.name}} + + + +
+
+
Residence Details
+ + + + + + + + + + + + + + + + + + + + + {{ownerShip.name}} + + + + + + + + + + + +
+
+ + + +
+ +
+
+
+ +
+ + + + + + + + {{relation.name}} + + + + + + +
+
+ + + + {{earnings.type}} + + + +
+
+ + + + + {{segment.name}} + + + + + + + + + + + + +
+
+ + + + {{occupation.name}} + + + + + + + + + +
+ +
+
+
+ + + + + + + + +
-
- - - - - -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
- - - - - - + + + + + +
+
+
+
+ +
+
+
+
+ Nivi SKM + +
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+ Nivi SKM + +
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+ Nivi SKM + +
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+ Nivi SKM + +
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+ Nivi SKM + +
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+ Nivi SKM + +
+ +
+
+
+
+
+ +
+ + + + + + -
- - Remarks - - -
-
+
+ + Remarks + + +
+
- +
- + - + @@ -311,7 +390,7 @@

Family Details

--> - - + --> \ 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 510290b23..86a235c49 100755 --- 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 @@ -34,18 +34,24 @@ export class FamilyDetailsComponent implements OnInit { pdid : string; form_id : number; - public currentLoanForm: FormGroup; private notifier: NotifierService; public familyForm: FormGroup; - // public person: AbstractControl; - // public personOther: AbstractControl; - public members: AbstractControl; - public residence: AbstractControl; - public years: AbstractControl; - public ownership: AbstractControl; - public ownershipOther: AbstractControl; - public rent: AbstractControl; + selectPerson = [{ + name : 'person 1', + id : 111 + }, { + name : 'person 2', + id : 222 + }]; + + earningStatus = [{ + type: 'Earning', + id: 1 + }, { + type: 'Non Earning', + id: 2 + }] relationData: any = []; occupationData: any = []; @@ -68,7 +74,7 @@ export class FamilyDetailsComponent implements OnInit { this.getMasterDetails('OCCUPATIONMEMBERS',2); //this.getMasterDetails('PERSONSMET',3); this.getMasterDetails('RESIDENCEOWNERSHIP',4); - this.getMasterDetails('CUSTOMERSEGMENT',5) + this.getMasterDetails('CUSTOMERSEGMENT',5); this.initFamilyForm(); let params: any = {}; params.pd_id = this.pdid; @@ -77,131 +83,118 @@ export class FamilyDetailsComponent implements OnInit { const control = this.familyForm.controls['nonEarningMembers']; const value = this.familyForm.controls['earningMembers']; if (data.status == 200) { - 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); - // 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); + this.familyForm.controls.selected_person.setValue(data.records.selected_person); + this.familyForm.controls.residence_place.setValue(data.records.residence_place); + this.familyForm.controls.residence_city.setValue(data.records.residence_city); + this.familyForm.controls.residence_state.setValue(data.records.residence_state); + this.familyForm.controls.residence_pin.setValue(data.records.residence_pin); + this.familyForm.controls.residence_No_of_years.setValue(data.records.residence_No_of_years); + this.familyForm.controls.residence_ownership.setValue(data.records.residence_ownership); + this.familyForm.controls.ownershipOther.setValue(data.records.ownershipOther); + this.familyForm.controls.rent.setValue(data.records.rent); + this.familyForm.controls.total_number_of_family_members.setValue(data.records.total_number_of_family_members); this.familyForm.controls.family_details_form_remark.setValue(data.records.family_details_form_remark); - - 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); + this.generateFamilyMembersDetailsGetData(data.records.family_members_details); } else { - value.push(this.createMembers()); - control.push(this.createNonMembers()); + // value.push(this.createMembers()); + // control.push(this.createNonMembers()); } }); } + + initgenerateFamilyMembersDetailsGet(val): FormGroup { + return this.fb.group({ + family_member_name : [val.family_member_name, Validators.compose([])], + family_member_relationship : [val.family_member_relationship, Validators.compose([])], + family_member_age : [val.family_member_age, Validators.compose([])], + family_member_earning_status : [val.family_member_earning_status, Validators.compose([])], + earning_segment: [val.earning_segment, Validators.compose([])], + earning_gross_income_per_month: [val.earning_gross_income_per_month, Validators.compose([])], + earning_name_of_the_employer_or_business: [val.earning_name_of_the_employer_or_business, Validators.compose([])], + earning_number_of_years_in_employment_or_business: [val.earning_number_of_years_in_employment_or_business, Validators.compose([])], + non_earning_occupation: [val.non_earning_occupation, Validators.compose([])], + non_earning_if_others: [val.non_earning_if_others, Validators.compose([])], + non_earning_if_retired_from: [val.non_earning_if_retired_from, Validators.compose([])], + }) + } + + generateFamilyMembersDetailsGetData(data) { + var result = Object.keys(data).map(function (key) { + return data[key]; + }); + if (result.length > 0) { + for (let val of result) { + const control = this.familyForm.controls['family_members_details']; + control.push(this.initgenerateFamilyMembersDetailsGet(val)); + } + } + } + + onSearchChange(e):void { + e.preventDefault(); + } public initFamilyForm(): void { this.familyForm = this.fb.group({ - // person: ['', Validators.compose([Validators.required])], + selected_person: ['', Validators.compose([Validators.required])], // personOther: [''], - members: ['', Validators.compose([Validators.required])], - residence: ['', Validators.compose([Validators.required])], - years: ['', Validators.compose([Validators.required])], - ownership: ['', Validators.compose([Validators.required])], + // members: ['', Validators.compose([Validators.required])], + residence_place: ['', Validators.compose([])], + residence_city: ['', Validators.compose([])], + residence_state: ['', Validators.compose([])], + residence_pin: ['', Validators.compose([])], + residence_No_of_years: ['', Validators.compose([])], + residence_ownership: ['', Validators.compose([])], ownershipOther: [''], rent: [''], - earningMembers: this.fb.array([]), - nonEarningMembers: this.fb.array([]), + + total_number_of_family_members: ['', Validators.compose([Validators.min(1), Validators.max(20)])], + + family_members_details: this.fb.array([]), + // earningMembers: this.fb.array([]), + // nonEarningMembers: this.fb.array([]), family_details_form_remark: [''] }); - // this.person = this.familyForm.controls['person']; - // this.personOther = this.familyForm.controls['personOther']; - this.members = this.familyForm.controls['members']; - this.residence = this.familyForm.controls['residence']; - this.years = this.familyForm.controls['years']; - this.ownership = this.familyForm.controls['ownership']; - this.ownershipOther = this.familyForm.controls['ownershipOther']; - this.rent = this.familyForm.controls['rent']; - } - createMembers(): FormGroup { - return this.fb.group({ - earning_member_name : ['', Validators.compose([Validators.required])], - earning_member_age : ['', Validators.compose([Validators.required])], - relation: ['', Validators.compose([Validators.required])], - segment: ['', Validators.compose([Validators.required])], - income: ['', Validators.compose([Validators.required])], - employer_name: ['', Validators.compose([Validators.required])], - }); - } - createNonMembers(): FormGroup { - return this.fb.group({ - non_earning_member_name : ['', Validators.compose([Validators.required])], - non_earning_member_age : ['', Validators.compose([Validators.required])], - relationship: ['', Validators.compose([Validators.required])], - occupation: ['', Validators.compose([Validators.required])], - retired: [''], - others_occupation : [''] - }); } - addearningMembers() { - - const control = this.familyForm.controls['earningMembers']; - //this.earnMemberArrCount = control.length; - if(control.length == this.familyForm.controls['members'].value) - { + getNumberOfFamilyMemberDetails(){ + // alert(this.familyForm.controls.total_number_of_family_members.valid); + if(this.familyForm.controls.total_number_of_family_members.valid){ + let totalMem = this.familyForm.get('total_number_of_family_members').value; + const control = this.familyForm.controls.family_members_details; + if(totalMem > control.length) { + let len = totalMem - control.length; + for(let i = 0; i < len; i++){ + control.push(this.generateFamilyMembersDetailsGet()); + } + } else if (totalMem < control.length) { + // control.controls.slice(0, totalMem); + control.controls = []; + for(let i = 0; i < totalMem; i++){ + control.push(this.generateFamilyMembersDetailsGet()); + } + } + } else { - }else{ - control.push(this.createMembers()); - //console.log('Add earn member',this.familyForm.controls['members'].value); } - - // console.log(this.earnMemberArrCount); - // console.log(this.nonEarnMemberArrCount); } - addMembers() { - const control = this.familyForm.controls['nonEarningMembers']; - this.count++; - // this.nonEarnMemberArrCount = control.length; - // console.log(this.earnMemberArrCount); - // console.log(this.nonEarnMemberArrCount); - // if(control.length == this.familyForm.controls['members'].value) - // { + + generateFamilyMembersDetailsGet(): FormGroup { + return this.fb.group({ + family_member_name : ['', Validators.compose([])], + family_member_relationship : ['', Validators.compose([])], + family_member_age : ['', Validators.compose([])], + family_member_earning_status : ['', Validators.compose([])], + earning_segment: ['', Validators.compose([])], + earning_gross_income_per_month: ['', Validators.compose([])], + earning_name_of_the_employer_or_business: ['', Validators.compose([])], + earning_number_of_years_in_employment_or_business: ['', Validators.compose([])], + non_earning_occupation: ['', Validators.compose([])], + non_earning_if_others: ['', Validators.compose([])], + non_earning_if_retired_from: ['', Validators.compose([])], + }) + } - // }else{ - // control.push(this.createNonMembers()); - // } - - - } - deleteEarningMembers(index) { - const control = this.familyForm.controls['earningMembers']; - control.removeAt(index); - } - deleteMembers(index) { - const control = this.familyForm.controls['nonEarningMembers']; - control.removeAt(index); - } // get all master details getMasterDetails(table:string,type:number){ this._pd.getAllMasterDatas(table).subscribe( @@ -231,43 +224,10 @@ export class FamilyDetailsComponent implements OnInit { if (!this.familyForm.valid) { return; } - let records: any = {}; - records.no_of_years = this.years.value; - if (this.ownership.value == 4) { - records.ownership_others = this.ownershipOther.value; - } - records.ownership = this.ownership.value; - records.residence = this.residence.value; - if (this.ownership.value == 3) { - records.what_rent = this.rent.value; - } - // if (this.person.value == 8) { - // 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; - // filter re conditions - let non_earning_members_filter = this.familyForm.controls['nonEarningMembers'].value.map(function(obj) { - - console.log(obj.occupation); - if(obj.occupation==3){ - return obj; - } - else{ - obj.retired=''; - return obj; - } - if(obj.occupation==9){ - return obj; - } - else{ - obj.others_occupation=''; - return obj; - } - }); - records.non_earning_members = non_earning_members_filter; - records.family_details_form_remark = this.familyForm.controls['family_details_form_remark'].value; + var records = this.familyForm.value; + //To Remove The "Null" With Key also + Object.keys(records).forEach((key) => (records[key] == null) && delete records[key]); + // records.other_family_details = answerFormValues; records.pdid = this.pdid; records.formid = '6'; // records.fk_createdby = '251'; @@ -277,25 +237,25 @@ export class FamilyDetailsComponent implements OnInit { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); }); } - validateAllFormFields(formGroup: FormGroup) { - Object.keys(formGroup.controls).forEach(field => { - const control = formGroup.get(field); - if (control instanceof FormControl) { - control.markAsTouched({onlySelf: true}); - } else if (control instanceof FormGroup) { - this.validateAllFormFields(control); - } - }); - } + // validateAllFormFields(formGroup: FormGroup) { + // Object.keys(formGroup.controls).forEach(field => { + // const control = formGroup.get(field); + // if (control instanceof FormControl) { + // control.markAsTouched({onlySelf: true}); + // } else if (control instanceof FormGroup) { + // this.validateAllFormFields(control); + // } + // }); + // } - /** On Key Press Event For Age */ - keyPress(event: any) { - const pattern = /[0-9]/; + // /** On Key Press Event For Age */ + // keyPress(event: any) { + // const pattern = /[0-9]/; - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } + // let inputChar = String.fromCharCode(event.charCode); + // if (event.keyCode != 8 && !pattern.test(inputChar)) { + // event.preventDefault(); + // } + // } } From b9c4076d876fd834746d81ac8f5964b0dd5281a6 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Tue, 18 Dec 2018 10:55:03 +0530 Subject: [PATCH 11/27] assets family details component changes : kdk --- .../start-pd/forms/assets-info/assets-info.component.html | 1 - .../forms/family-details/family-details.component.html | 6 ------ .../forms/family-details/family-details.component.ts | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) 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 3b6c72f0f..99fa55fac 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 @@ -406,7 +406,6 @@
-
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 112618380..6d2bd2762 100755 --- 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 @@ -357,12 +357,6 @@ - - - -
- - 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 86a235c49..0567b13c9 100755 --- 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 @@ -30,7 +30,7 @@ import {ActivatedRoute, Router} from "@angular/router"; }) export class FamilyDetailsComponent implements OnInit { //@Input() pdid: number; - pageTitle: string ="Family Details"; + pageTitle: string ="Other Family Details"; pdid : string; form_id : number; From 92c498a762331607d75357a110bfa07bb0e12fb6 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 18 Dec 2018 12:10:06 +0530 Subject: [PATCH 12/27] UI Changes --- .../family-details.component.html | 117 +----------------- 1 file changed, 4 insertions(+), 113 deletions(-) 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 6d2bd2762..6729a36d9 100755 --- 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 @@ -246,120 +246,10 @@ - - - -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
- - - - + +
@@ -449,7 +339,8 @@
-
+ + From 3db4eb664ed20baa3f2fff54f5a3582007e0952f Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 18 Dec 2018 12:44:06 +0530 Subject: [PATCH 13/27] address,asset,stock : ps --- .../forms/address/address.component.html | 12 +- .../forms/address/address.component.ts | 337 +++++++--- .../assets-info/assets-info.component.html | 604 ++++++++++-------- .../assets-info/assets-info.component.ts | 58 +- .../start-pd/forms/stock/stock.component.html | 134 +++- .../start-pd/forms/stock/stock.component.ts | 368 +++++++++-- .../pd-service/pd-triger.service.ts | 7 + 7 files changed, 1056 insertions(+), 464 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 5829feb40..1f715afe1 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 @@ - - +

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])], @@ -357,8 +349,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; @@ -383,59 +379,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/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 d4645df51..292ea4a38 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,6 +14,306 @@ + + +
+
+ + +
+
+
+ + +
+
+ + + {{ 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 - - -
-
- - - -
-
- - - -
-
- - - -
- - - -
-
- - - -
-
- - - -
-
-
- - - - - - -
- -
- - - - - - - - - -
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 38fabb3d4..2c5988782 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; } @@ -181,6 +185,7 @@ public m_investmentType = []; this.getM_PropertyType(); this.getM_InvestmentType(); this.getM_FreqOfPurchase(); + this.getM_Relation(); //this.getM_InsuranceType(); } @@ -222,7 +227,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); @@ -279,7 +295,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], @@ -288,7 +304,7 @@ public m_investmentType = []; this.initDetails(), ]), business_assets_details : this._formBuilder.array([ - this.initnewDetails(), + this.initBusinessDetails(), ]), assets_form_remark:[''] }); @@ -310,6 +326,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: [''], @@ -320,12 +338,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: [''], @@ -544,6 +564,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], @@ -553,12 +575,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], @@ -580,6 +604,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, @@ -596,7 +622,7 @@ public m_investmentType = []; this.loadDetails = true; } - addAssetsDetailsWithData2(supp_data) { + addBusinessAssetsDetailsWithData(supp_data) { console.log(supp_data); @@ -609,6 +635,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, @@ -622,7 +650,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) } } @@ -745,7 +773,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) { @@ -839,8 +867,9 @@ public m_investmentType = []; } } - loanCalc(details) + loanCalc(details ,flag) { + if(flag == 1){ //console.log(details.value); let ElapsedValues; @@ -848,6 +877,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/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html index 1df3ba854..23fa1c544 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html @@ -18,7 +18,7 @@
- +

Raw Materials

@@ -26,39 +26,50 @@

- + - + + formControlName="stock_observed" required + (selectionChange)="RawMaterialValidation($event)"> Yes No -
- + + - + {{uom.name}} - + - - + + + {{"₹"}} {{rawValueInWords}} Only - - + + + + Yes + No + -
+ + Please comment on the stock level observed? + + + +
+ +
+
+ + +

Stock of Goods Traded

+ +

+
+ + + + + + + Yes + No + + + + + + + + + {{"₹"}} {{tradedGoodsValueInWords}} Only + + + + + + + + Yes + No + + + + Please comment on the Traded Goods stock level observed? + + + + + + + +
+
+ + + +
+
@@ -238,7 +330,7 @@
- Please comment on the stock level observed? + Remarks
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts index 852581817..a1a25df07 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts @@ -38,8 +38,15 @@ export class StockComponent implements OnInit { public stockForm: FormGroup; private notifier: NotifierService; public uomData : any = []; - rawmaterial : any; + rawmaterial : any; + goodsValueInWords : any; + rawValueInWords : any; + tradedGoodsValueInWords : any; + rawMaterialAccess: boolean; + finishedGoodsAccess: boolean; + tradeConcernAccess: boolean; + constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService,@Inject(MAT_DIALOG_DATA) public pd_all_details: any) { @@ -50,90 +57,185 @@ export class StockComponent implements OnInit { ngOnInit() { this.initstockForm(); this.getUOM(); - this.setSku('data',0); + //this.setSku('data',0); let params: any = {}; + let activityArray : any = []; params.pd_id = this.pdid; params.pd_form_id = this.form_id; + this._pd.stockFormAccess({pd_id:this.pdid}).subscribe(value => { + console.log(value); + const rawMaterial = this.stockForm.controls['raw_materials']; + const finishedGoods = this.stockForm.controls['finished_goods']; + const tradedGoods = this.stockForm.controls['traded_goods']; + + if (value.status == 200) { + console.log('value.records',value.records); + value.records.type_of_activity.forEach(val => { + //console.log(val); + //console.log(val.type_of_activity_id); + this.rawMaterialAccess = true; + this.finishedGoodsAccess = true; + this.tradeConcernAccess = true; + if(val.type_of_activity_id == 1){ + rawMaterial.push(this.createRawmaterial()); + finishedGoods.push(this.createGoods()); + tradedGoods.push(this.createTradedGoods()); + } + else if(val.type_of_activity_id == 2){ + rawMaterial.push(this.createRawmaterial()); + finishedGoods.push(this.createGoods()); + } + else if(val.type_of_activity_id == 3){ + rawMaterial.push(this.createRawmaterial()); + finishedGoods.push(this.createGoods()); + } + // else if(val.type_of_activity_id == 4){ + // } + + }); + this._pd.retriveForm({pd_id:this.pdid,pd_form_id:'1'}).subscribe(value => { - console.log('Raw material Name',value.records.main_raw_materials); - - + //console.log('Raw material Name',value.records.main_raw_materials); + // const faControl = (this.stockForm.controls['raw_materials']).at(1); - const control = (this.stockForm.controls['raw_materials']).at(0); - console.log(control); + //const control = (this.stockForm.controls['raw_materials']).at(0); + //console.log(control); // this.stockForm.controls['raw_materials'].setValue(value.records.main_raw_materials); - if (value.status == 200) { - this.rawmaterial = value.records.main_raw_materials; - }else{ this.rawmaterial = ''; } + // if (value.status == 200) { + // this.rawmaterial = value.records.main_raw_materials; + // }else{ this.rawmaterial = ''; } }) + this._pd.retriveForm(params).subscribe(value => { - console.log('value', value); - const rawMaterial = this.stockForm.controls['raw_materials']; - const finishedGoods = this.stockForm.controls['finished_goods']; + //console.log('value', value); + if (value.status == 200) { - let result = Object.keys(value.records.raw_materials).map(function(key) { - return value.records.raw_materials[key]; - }); - let result_Goods = Object.keys(value.records.finished_goods).map(function(key) { - return value.records.finished_goods[key]; - }); + console.log('data',value); + // Raw Material Access is True means., Data have to load, + if(this.rawMaterialAccess == true){ + + let result = Object.keys(value.records.raw_materials).map(function(key) { + return value.records.raw_materials[key]; + }); + + if (result.length > 0) { + + result.forEach(val => { + + //this.RawMaterialValidation(val.stock_observed); + rawMaterial.push(this.createRawmaterial()); + if(val.raw_value != '' && val.raw_value != null ){ this.rawValueInWords = this._pd.convertNumberToWords(val.raw_value); } + }); + this.stockForm.controls['raw_materials'].setValue(result); + } else { + rawMaterial.push(this.createRawmaterial()); + } + } + + // Finished Goods Access is TRUE Means., data have to load., + if(this.finishedGoodsAccess == true){ + let result_Goods = Object.keys(value.records.finished_goods).map(function(key) { + return value.records.finished_goods[key]; + }); + + if (result_Goods.length > 0) { + + result_Goods.forEach(val => { + + //this.GoodsValidation(val.goods_observed); + finishedGoods.push(this.createGoods()); + if(val.goods_value != '' && val.goods_value != null ){ this.goodsValueInWords = this._pd.convertNumberToWords(val.goods_value); } + }); + this.stockForm.controls['finished_goods'].setValue(result_Goods); + } else { + finishedGoods.push(this.createGoods()); + } + } + + //TradeConcern Access is TRUE Means., data have to load., + if(this.tradeConcernAccess == true){ + let result_Traded_Goods = Object.keys(value.records.finished_goods).map(function(key) { + return value.records.traded_goods[key]; + }); + + if (result_Traded_Goods.length > 0) { + + result_Traded_Goods.forEach(val => { + + + tradedGoods.push(this.createTradedGoods()); + if(val.traded_goods_value != '' && val.traded_goods_value != null ) + { this.tradedGoodsValueInWords = this._pd.convertNumberToWords(val.traded_goods_value); } + }); + this.stockForm.controls['traded_goods'].setValue(result_Traded_Goods); + } else { + tradedGoods.push(this.createTradedGoods()); + } + } + + this.stockForm.controls['stock_remarks'].setValue(value.records.stock_remarks); - if (result.length > 0) { - result.forEach(val => { - rawMaterial.push(this.createRawmaterial()); - }); - this.stockForm.controls['raw_materials'].setValue(result); - } else { - rawMaterial.push(this.createRawmaterial()); - } - if (result_Goods.length > 0) { - result_Goods.forEach(val => { - finishedGoods.push(this.createGoods()); - }); - this.stockForm.controls['finished_goods'].setValue(result_Goods); - } else { - finishedGoods.push(this.createGoods()); - } + } else { - rawMaterial.push(this.createRawmaterial()); - finishedGoods.push(this.createGoods()); + // rawMaterial.push(this.createRawmaterial()); + // finishedGoods.push(this.createGoods()); + // tradedGoods.push(this.createTradedGoods()); } }) } +}); +} + public initstockForm(): void { this.stockForm = this.fb.group({ stock_remarks: ['', Validators.compose([Validators.required])], raw_materials: this.fb.array([]), - finished_goods: this.fb.array([]) + finished_goods: this.fb.array([]), + traded_goods: this.fb.array([]) }); } - setSku(sku: string, index: number) { + //setSku(sku: string, index: number) { // const faControl = // (this.stockForm.controls['raw_materials']).at(index); // faControl['controls'].raw_name.setValue(sku); - } + // } createRawmaterial() { return this.fb.group({ raw_name: ['', Validators.compose([Validators.required])], stock_observed:['', Validators.compose([Validators.required])], - raw_quantity: ['', Validators.compose([Validators.required])], - raw_uom: ['', Validators.compose([Validators.required])], + raw_quantity: [''], + raw_uom: [''], other_uom : [''], - raw_value: ['', Validators.compose([Validators.required])], - rawmaterial_value: ['', Validators.compose([Validators.required])], - is_sufficiant_raw: ['', Validators.compose([Validators.required])], + raw_value: [''], + rawmaterial_value: [''], + is_sufficiant_raw: [''], + rawmaterial_remarks:[''] }); } createGoods() { return this.fb.group({ goods_name: ['', Validators.compose([Validators.required])], - goods_quantity: ['', Validators.compose([Validators.required])], - goods_value: ['', Validators.compose([Validators.required])], - finished_goods_value: ['', Validators.compose([Validators.required])], - is_sufficiant_goods: ['', Validators.compose([Validators.required])], + goods_observed: ['', Validators.compose([Validators.required])], + goods_quantity: [''], + goods_value: [''], + finished_goods_value: [''], + is_sufficiant_goods: [''], + finishedgoods_remarks:[''] + }); + } + + createTradedGoods() { + return this.fb.group({ + traded_goods_name: ['', Validators.compose([Validators.required])], + traded_goods_observed: ['', Validators.compose([Validators.required])], + traded_goods_quantity: [''], + estimated_traded_goods_value: [''], + traded_goods_value: [''], + is_sufficiant_traded_goods: [''], + traded_goods_remarks:[''] }); } addRawMaterials() { @@ -152,6 +254,15 @@ export class StockComponent implements OnInit { const control = this.stockForm.controls['finished_goods']; control.removeAt(index); } + addTradedGoods() { + const control = this.stockForm.controls['traded_goods']; + control.push(this.createTradedGoods()); + } + deleteTradedGoods(index) { + const control = this.stockForm.controls['traded_goods']; + control.removeAt(index); + } + submitDetails() { if (!this.stockForm.valid) { return; @@ -160,12 +271,16 @@ export class StockComponent implements OnInit { records.pdid = this.pdid; records.formid = this.form_id; records.fk_createdby = this.pdid; - records.raw_materials = this.stockForm.controls['raw_materials'].value; + if(this.rawMaterialAccess == true){ + records.raw_materials = this.stockForm.controls['raw_materials'].value; } + if(this.finishedGoodsAccess == true){ + records.finished_goods = this.stockForm.controls['finished_goods'].value;} + if(this.tradeConcernAccess == true){ + records.traded_goods = this.stockForm.controls['traded_goods'].value; } records.stock_remarks = this.stockForm.controls['stock_remarks'].value; - records.finished_goods = this.stockForm.controls['finished_goods'].value; - console.log('data', records); + //console.log('data', records); this._pd.saveForm(records).subscribe(data => { - console.log('data', data); + //console.log('data', data); this.notifier.notify('success', 'Saved Successfully.'); }, error => { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); @@ -201,4 +316,151 @@ export class StockComponent implements OnInit { event.preventDefault(); } } + + /** To Convert Amount into Words */ + inWords(e,flag:number){ + switch(flag){ + case 1 : + this.rawValueInWords = this._pd.convertNumberToWords(e.target.value); + break; + case 2 : + this.goodsValueInWords = this._pd.convertNumberToWords(e.target.value); + break; + case 3 : + this.tradedGoodsValueInWords = this._pd.convertNumberToWords(e.target.value); + break; + default: + break; + } + } + + // Validation Dynamically Add And Remove + GoodsValidation(event: any){ + // console.log('First Time',event); + // console.log('First Time Value',event.value); + + const control = this.stockForm.controls['finished_goods']; + + if(event.value == 'no') { + + control.controls[0].get('goods_quantity').setValidators([Validators.required]); + control.controls[0].get('goods_quantity').updateValueAndValidity(); + + control.controls[0].get('goods_value').setValidators([Validators.required]); + control.controls[0].get('goods_value').updateValueAndValidity(); + + control.controls[0].get('finished_goods_value').setValidators([Validators.required]); + control.controls[0].get('finished_goods_value').updateValueAndValidity(); + + control.controls[0].get('is_sufficiant_goods').setValidators([Validators.required]); + control.controls[0].get('is_sufficiant_goods').updateValueAndValidity(); + + + } + else + if(event.value == 'yes') { + + control.controls[0].get('goods_quantity').clearValidators(); + control.controls[0].get('goods_quantity').updateValueAndValidity(); + + control.controls[0].get('goods_value').clearValidators(); + control.controls[0].get('goods_value').updateValueAndValidity(); + + control.controls[0].get('finished_goods_value').clearValidators(); + control.controls[0].get('finished_goods_value').updateValueAndValidity(); + + control.controls[0].get('is_sufficiant_goods').clearValidators(); + control.controls[0].get('is_sufficiant_goods').updateValueAndValidity(); + + + + } + + } + + RawMaterialValidation(event: any){ + // console.log('First Time',event); + // console.log('First Time Value',event.value); + + const control = this.stockForm.controls['raw_materials']; + + if(event.value == 'no') { + + control.controls[0].get('raw_quantity').setValidators([Validators.required]); + control.controls[0].get('raw_quantity').updateValueAndValidity(); + + control.controls[0].get('raw_uom').setValidators([Validators.required]); + control.controls[0].get('raw_uom').updateValueAndValidity(); + + control.controls[0].get('raw_value').setValidators([Validators.required]); + control.controls[0].get('raw_value').updateValueAndValidity(); + + control.controls[0].get('rawmaterial_value').setValidators([Validators.required]); + control.controls[0].get('rawmaterial_value').updateValueAndValidity(); + + control.controls[0].get('is_sufficiant_raw').setValidators([Validators.required]); + control.controls[0].get('is_sufficiant_raw').updateValueAndValidity(); + + + } + else + if(event.value == 'yes') { + + control.controls[0].get('raw_quantity').clearValidators(); + control.controls[0].get('raw_quantity').updateValueAndValidity(); + + control.controls[0].get('raw_uom').clearValidators(); + control.controls[0].get('raw_uom').updateValueAndValidity(); + + control.controls[0].get('raw_value').clearValidators(); + control.controls[0].get('raw_value').updateValueAndValidity(); + + control.controls[0].get('rawmaterial_value').clearValidators(); + control.controls[0].get('rawmaterial_value').updateValueAndValidity(); + + control.controls[0].get('is_sufficiant_raw').clearValidators(); + control.controls[0].get('is_sufficiant_raw').updateValueAndValidity(); + } + + } + + TradedGoodsValidation(event: any){ + console.log('First Time',event); + console.log('First Time Value',event.value); + + const control = this.stockForm.controls['tradeded_goods']; + + if(event.value == 'no') { + + control.controls[0].get('traded_goods_quantity').setValidators([Validators.required]); + control.controls[0].get('traded_goods_quantity').updateValueAndValidity(); + + control.controls[0].get('estimated_traded_goods_value').setValidators([Validators.required]); + control.controls[0].get('estimated_traded_goods_value').updateValueAndValidity(); + + control.controls[0].get('traded_goods_value').setValidators([Validators.required]); + control.controls[0].get('traded_goods_value').updateValueAndValidity(); + + control.controls[0].get('is_sufficiant_traded_goods').setValidators([Validators.required]); + control.controls[0].get('is_sufficiant_traded_goods').updateValueAndValidity(); + } + else + if(event.value == 'yes') { + + control.controls[0].get('traded_goods_quantity').clearValidators(); + control.controls[0].get('traded_goods_quantity').updateValueAndValidity(); + + control.controls[0].get('estimated_traded_goods_value').clearValidators(); + control.controls[0].get('estimated_traded_goods_value').updateValueAndValidity(); + + control.controls[0].get('traded_goods_value').clearValidators(); + control.controls[0].get('traded_goods_value').updateValueAndValidity(); + + control.controls[0].get('is_sufficiant_traded_goods').clearValidators(); + control.controls[0].get('is_sufficiant_traded_goods').updateValueAndValidity(); + + } + + } + } diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index f281ec28c..cd65ca0f4 100755 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -417,6 +417,13 @@ convertNumberToWords(amount) { ) } + stockFormAccess(pdid: any): Observable { + + return this._http.post(this.apiUrl+"getTypeOfActivetyFromBusinessForm",{"records":pdid}) + .pipe( + catchError(this.handleError('operation', [])) + ) + } // private handleError(operation = 'operation', result?: T) { // return (error: any): Observable => { // return of(result as T); From 84f4dc31c748704777c4561cf1416a7221366810 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 18 Dec 2018 14:19:53 +0530 Subject: [PATCH 14/27] UI Changes --- .../forms/assessed-income/assessed-income.component.html | 4 +++- .../forms/banking-details/banking-details.component.html | 4 +++- .../start-pd/forms/business-info/business-info.component.html | 3 ++- .../start-pd/forms/current-loan/current-loan.component.html | 4 +++- .../forms/employment-info/employment-info.component.html | 4 +++- .../forms/financial-info/financial-info.component.html | 4 +++- .../lender-representative.component.html | 3 ++- .../start-pd/forms/loan-details/loan-details.component.html | 2 ++ .../start-pd/forms/other-income/other-income.component.html | 4 +++- .../start-pd/forms/personal-info/personal-info.component.html | 3 ++- .../start-pd/forms/rental-info/rental-info.component.html | 4 +++- .../list-pd/start-pd/forms/stock/stock.component.html | 4 +++- 12 files changed, 32 insertions(+), 11 deletions(-) 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 @@
-
+
+
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 @@ +
@@ -281,7 +282,8 @@
-
+ + 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 @@ +
@@ -478,7 +479,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 @@ +
@@ -196,7 +197,8 @@
-
+ + 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 @@ +
@@ -217,7 +218,8 @@
-
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html index fca7c549a..f3a333eb0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html @@ -139,6 +139,7 @@ +
@@ -228,7 +229,8 @@
-
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html index e3b05b4f2..e1e868f49 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html @@ -51,6 +51,7 @@ +
@@ -141,7 +142,7 @@
- +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html index 5754e395d..dbb9413e2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html @@ -183,6 +183,7 @@ +
@@ -273,6 +274,7 @@
+
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 1b3a0f32f..14f8677f1 100755 --- 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 @@ -93,6 +93,7 @@ +
@@ -182,7 +183,8 @@
-
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html index f56e8be59..2571dd94a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html @@ -209,6 +209,7 @@ +
@@ -299,7 +300,7 @@
- +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html index 77b619fd5..c419c40d6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html @@ -204,6 +204,7 @@ +
@@ -293,7 +294,8 @@
-
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html index fdb89868b..f19986989 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html @@ -123,6 +123,7 @@ +
@@ -212,7 +213,8 @@
-
+ + From 66149c5a459c5319712c1632bc238632506fb4b2 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 18 Dec 2018 15:17:07 +0530 Subject: [PATCH 15/27] UI changes --- .../manage-pd/list-pd/list-pd.component.html | 4 ++-- .../manage-pd/list-pd/list-pd.component.scss | 6 +++++- .../list-pd/map-pd-view/map-pd-view.component.html | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html index 718444dc0..4d90d020c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html @@ -7,8 +7,8 @@
- - + +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.scss index 123db6e6c..fda61348d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.scss @@ -20,4 +20,8 @@ } .mat-tab-label-active{ color: red !important; - } \ No newline at end of file + } + .mat-fab.mat-accent{ + color:red !important; + background-color: #fff !important; + } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html index 8a6caf518..706b6cfcb 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html @@ -10,7 +10,7 @@
- +
From 38f9c5a30e032cdbf0b7b475536cdebcb61260b4 Mon Sep 17 00:00:00 2001 From: venbaSriram Date: Tue, 18 Dec 2018 19:09:21 +0530 Subject: [PATCH 16/27] FIlter Completed PD List --- ng6-seed/package-lock.json | 41 +++- .../list-pd/all-pd/all-pd.component.html | 189 ++++++++++++------ .../list-pd/all-pd/all-pd.component.ts | 116 ++++++++++- .../completed-pd/completed-pd.component.html | 62 ++++++ .../completed-pd/completed-pd.component.ts | 120 ++++++++++- .../inprogress-pd.component.html | 60 ++++++ .../inprogress-pd/inprogress-pd.component.ts | 113 ++++++++++- .../qc-completed-pd.component.html | 60 ++++++ .../qc-completed-pd.component.ts | 134 +++++++++++-- .../scheduled-pd/scheduled-pd.component.html | 60 ++++++ .../scheduled-pd/scheduled-pd.component.ts | 110 +++++++++- .../manage-pd/manage-pd.module.ts | 4 +- .../pd-service/pd-triger.service.ts | 13 ++ .../entity-branch-add.component.html | 0 .../entity-branch-add.component.scss | 0 .../entity-branch-add.component.spec.ts | 0 .../entity-branch-add.component.ts | 0 17 files changed, 990 insertions(+), 92 deletions(-) mode change 100644 => 100755 ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.html mode change 100644 => 100755 ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.scss mode change 100644 => 100755 ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.spec.ts mode change 100644 => 100755 ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.ts diff --git a/ng6-seed/package-lock.json b/ng6-seed/package-lock.json index 23fae016e..fba034b3c 100755 --- a/ng6-seed/package-lock.json +++ b/ng6-seed/package-lock.json @@ -4344,12 +4344,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4364,17 +4366,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -4491,7 +4496,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -4503,6 +4509,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4517,6 +4524,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4524,12 +4532,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4548,6 +4558,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -4628,7 +4639,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -4640,6 +4652,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -4761,6 +4774,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7313,6 +7327,14 @@ } } }, + "ngx-viewer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ngx-viewer/-/ngx-viewer-1.0.1.tgz", + "integrity": "sha512-9nYfxsxco/x8zLjdVOAhi4SFMZhSgtHBGTmcns9ebQn5nCBwHbk9O62K5ZIWkfOElr9ey1KA+DmppH32YGkXEA==", + "requires": { + "tslib": "^1.9.0" + } + }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -10695,6 +10717,11 @@ "extsprintf": "^1.2.0" } }, + "viewerjs": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.3.1.tgz", + "integrity": "sha512-FBO2pN5XKx2yYpfZpQFSI89GhN4PvIhI2gCyahTsLzIUQzKIIRTQyAOMG5Dey7rgMMGU+JsmpfL2q/eARiB7Dg==" + }, "vm-browserify": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index bc3b23a62..66a483b14 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -1,58 +1,135 @@ - - - - + + + + +
+ filter_list Filter
+ - - -
{{(details.pd_type_name | slice:0:1)}}
- - - - - - {{details.applicat_details[0].applicant_name}}
- {{details.lender_applicant_id}} -({{details.customer_segment_abbr}} ) - - - - - {{details.lender_full_name}}
- {{details.product_abbr}}/{{details.subproduct_abbr}}
- {{details.loan_amount}} - - - - - {{details.pd_date_of_initiation}}
- {{details.city_name}}-{{details.pincode}} - - - - - {{details.pd_status}} - QC COMPLETED
- {{ (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.pd_type_name | slice:0:1)}} +
+ + + + + + + {{details.applicat_details[0].applicant_name}} + +
+ {{details.lender_applicant_id}} + -({{details.customer_segment_abbr}} ) + + + + + {{details.lender_full_name}} +
+ {{details.product_abbr}}/{{details.subproduct_abbr}} +
+ + {{details.loan_amount}} + + + + + {{details.pd_date_of_initiation}} +
+ + {{details.city_name}}-{{details.pincode}} + + + + + {{details.pd_status}} + QC COMPLETED +
+ {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + + {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + + {{details.scheduled_on}} + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts index 28ace0589..797aaf8e5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts @@ -1,6 +1,9 @@ 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 { FormGroup, FormBuilder } from '@angular/forms'; +import { DatePipe } from '@angular/common'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-all-pd', @@ -11,6 +14,16 @@ import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/m }) export class AllPdComponent implements OnInit, OnChanges { + xpandStatus: boolean = false; + PRODUCTS: any; + ENTITY: any; + CITY: any; + tempStore = new MatTableDataSource(); + PDType: any; + pdStatus: any; + searchForm:FormGroup; + pipe = new DatePipe('en-US'); + public notifier : NotifierService; recordStatus: boolean; errorMessage:any[]=[]; tabStatus:string="ALL"; @@ -34,12 +47,26 @@ export class AllPdComponent implements OnInit, OnChanges { pageSize = 10; pageEvent: PageEvent; - constructor(private _pd: PdTrigerService) { + constructor(private _pd: PdTrigerService,private _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.dataSourceTab1.paginator = this.paginator; @@ -65,7 +92,7 @@ export class AllPdComponent implements OnInit, OnChanges { this.PdListData = data.records; this.dataLengthTab1 = data.records.length; this.dataSourceTab1.data = this.PdListData; - + this.tempStore.data = this.PdListData; } else{ this.PdListData=[]; @@ -87,4 +114,89 @@ export class AllPdComponent implements OnInit, OnChanges { 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); + } + }); + + 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'); + console.log(JSON.stringify(this.searchForm.value)); + this._pd.overAllSearchFormDetails(this.searchForm.value).subscribe(res=> + { + this.xpandStatus = false; + if(res['dataStatus']==true) + { + this.dataSourceTab1 = res['records']; + }else{ + // this.notifier.notify('warning', 'No Records Found'); + this.dataSourceTab1 = this.tempStore; + } + }) + } + } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html index 037c35c73..636d06a12 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html @@ -1,4 +1,66 @@ + + + + +
filter_list Filter
+ + + + +
+ + + {{type.type_name}} + +     + + + {{status.pd_status_name}} + + + + + + +     + + + + + + + + {{pro.name}} + +     + + + {{city.name}} + +     + + + {{ent.full_name}} + + + + +     + + + +
+ +
+ + + +
+ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts index 9111f5670..cdb1fc207 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-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 { FormGroup, FormBuilder } from '@angular/forms'; +import { DatePipe } from '@angular/common'; @Component({ selector: 'app-completed-pd', @@ -11,11 +13,23 @@ import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/m }) export class CompletedPdComponent implements OnInit, OnChanges { + xpandStatus: boolean = false; + PRODUCTS: any; + CITY: any; + ENTITY: any; + PDType: any; + pdStatus: any; recordStatus: boolean; errorMessage:any[]=[]; tabStatus:string="COMPLETED"; + pipe = new DatePipe('en-US'); + public dataLengthTab4: number; public dataSourceTab4 = new MatTableDataSource(); + tempStore = new MatTableDataSource(); + + searchForm:FormGroup; + displayedColumns = ['PDType','Name','Lenderid','Address','Status','Action']; @ViewChild(MatPaginator) paginator: MatPaginator; @@ -33,12 +47,26 @@ export class CompletedPdComponent 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.dataSourceTab4.paginator = this.paginator; @@ -63,7 +91,7 @@ export class CompletedPdComponent implements OnInit, OnChanges { this.completedPdListData = data.records; this.dataLengthTab4 = data.records.length; this.dataSourceTab4.data = this.completedPdListData; - + this.tempStore.data } else{ this.completedPdListData=[]; @@ -85,6 +113,94 @@ export class CompletedPdComponent implements OnInit, OnChanges { 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.dataSourceTab4 = res['records']; + }else{ + // this.notifier.notify('warning', 'No Records Found'); + this.dataSourceTab4 = this.tempStore; + } + }) + } + } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html index b4ecb5c24..c5ee76270 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html @@ -1,4 +1,64 @@ + + + +
filter_list Filter
+ + + + +
+ + + {{type.type_name}} + +     + + + {{status.pd_status_name}} + + + + + + +     + + + + + + + + {{pro.name}} + +     + + + {{city.name}} + +     + + + {{ent.full_name}} + + + + +     + + + +
+ +
+ + + +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts index e58bf5688..fd001d504 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-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-inprogress-pd', @@ -9,11 +11,19 @@ import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/m encapsulation: ViewEncapsulation.None }) export class InprogressPdComponent implements OnInit, OnChanges { + xpandStatus: boolean = false; + PRODUCTS: any; + ENTITY: any; + CITY: any; + PDType: any; + pdStatus: any; recordStatus: boolean; errorMessage:any[]=[]; tabStatus:string="INPROGRESS"; + pipe = new DatePipe('en-US'); public dataLengthTab2: number; public dataSourceTab2 = new MatTableDataSource(); + tempStore = new MatTableDataSource(); displayedColumns = ['PDType','Name','Lenderid','Address','Status','Action']; @ViewChild(MatPaginator) paginator: MatPaginator; @@ -30,13 +40,27 @@ export class InprogressPdComponent implements OnInit, OnChanges { pageIndex = 0; pageSize = 10; pageEvent: PageEvent; + searchForm:FormGroup; + constructor(private _pd: PdTrigerService,public _fb:FormBuilder) { - constructor(private _pd: PdTrigerService) { + 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.dataSourceTab2.paginator = this.paginator; @@ -61,7 +85,7 @@ export class InprogressPdComponent implements OnInit, OnChanges { this.progressPdListData = data.records; this.dataLengthTab2 = data.records.length; this.dataSourceTab2.data = this.progressPdListData; - + this.tempStore.data = this.progressPdListData; } else{ this.progressPdListData=[]; @@ -82,4 +106,89 @@ export class InprogressPdComponent implements OnInit, OnChanges { 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.dataSourceTab2 = res['records']; + }else{ + // this.notifier.notify('warning', 'No Records Found'); + this.dataSourceTab2 = this.tempStore; + } + }) + } } 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 @@ + + + +
filter_list Filter
+ + + + +
+ + + {{type.type_name}} + +     + + + {{status.pd_status_name}} + + + + + + +     + + + + + + + + {{pro.name}} + +     + + + {{city.name}} + +     + + + {{ent.full_name}} + + + + +     + + + +
+ +
+ + + +
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 @@ + + + +
filter_list Filter
+ + + + +
+ + + {{type.type_name}} + +     + + + {{status.pd_status_name}} + + + + + + +     + + + + + + + + {{pro.name}} + +     + + + {{city.name}} + +     + + + {{ent.full_name}} + + + + +     + + + +
+ +
+ + + +
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/manage-pd.module.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts index 17dce719b..342fb2374 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts @@ -15,7 +15,7 @@ import { MatToolbarModule, MatSelectModule, MatListModule, MatGridListModule, MatTabsModule, MatCheckboxModule, MatBadgeModule, MatExpansionModule, MatStepperModule, MatSidenavModule, - MatMenuModule, MatButtonToggleModule, + MatMenuModule, MatButtonToggleModule,MatChipsModule, MatAutocompleteModule, MatDatepickerModule } from '@angular/material'; import {MatSlideToggleModule} from '@angular/material/slide-toggle'; @@ -273,6 +273,7 @@ const pdCustomNotifierOptions: NotifierOptions = { PdfViewerModule, MatCardModule, MatIconModule, + MatAutocompleteModule, MatInputModule, MatRadioModule, MatTableModule, @@ -282,6 +283,7 @@ const pdCustomNotifierOptions: NotifierOptions = { MatToolbarModule, FlexLayoutModule, NgxDatatableModule, + MatChipsModule, FormsModule,MatSlideToggleModule, MatSelectModule, MatListModule,MatGridListModule, MatTabsModule, MatBadgeModule, MatCheckboxModule,MatStepperModule,MatSidenavModule ,MatMenuModule, MatButtonToggleModule, ReactiveFormsModule, diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index f281ec28c..9f45d2ea7 100755 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -422,4 +422,17 @@ convertNumberToWords(amount) { // return of(result as T); // }; // } + + /**Search Filter + * Sriram + */ + + overAllSearchFormDetails(searchItem) + { + let records = {'records':searchItem}; + return this._http.post(this.apiUrl+'filterPDList',records).pipe( + catchError(this.handleError('operation', [])) + ); + } + } diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.html old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.scss b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.scss old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.spec.ts b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.spec.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.ts b/ng6-seed/src/app/settings/entity/entity-edit/entity-branch-add/entity-branch-add.component.ts old mode 100644 new mode 100755 From e7269b49a8c5e13568d1625039ca6cbac49f4183 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 19 Dec 2018 13:13:02 +0530 Subject: [PATCH 17/27] UI changes --- ng6-seed/src/app/dashboard/dashboard.component.html | 2 +- ng6-seed/src/app/dashboard/dashboard.component.scss | 1 + .../list-pd/map-pd-view/map-pd-view.component.html | 2 +- .../list-pd/start-pd/start-pd.component.html | 11 ++++++++--- .../list-pd/start-pd/start-pd.component.scss | 10 ++++++++++ .../manage-pd/list-pd/view-pd/view-pd.component.html | 8 ++++---- .../manage-pd/list-pd/view-pd/view-pd.component.scss | 3 +++ 7 files changed, 28 insertions(+), 9 deletions(-) diff --git a/ng6-seed/src/app/dashboard/dashboard.component.html b/ng6-seed/src/app/dashboard/dashboard.component.html index c77268923..32e8a812f 100755 --- a/ng6-seed/src/app/dashboard/dashboard.component.html +++ b/ng6-seed/src/app/dashboard/dashboard.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/ng6-seed/src/app/dashboard/dashboard.component.scss b/ng6-seed/src/app/dashboard/dashboard.component.scss index b76a73e1f..540704696 100755 --- a/ng6-seed/src/app/dashboard/dashboard.component.scss +++ b/ng6-seed/src/app/dashboard/dashboard.component.scss @@ -19,6 +19,7 @@ li display:inline-block; //float:left; } + .example-full-width { width: 95%; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html index 706b6cfcb..f8b2e10b0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html @@ -1,5 +1,5 @@ -
+
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 1be646df3..3c40f3481 100755 --- 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 @@ -14,11 +14,16 @@
- +
- + - {{ (formButton.form_name.length>17)? (formButton.form_name | slice:0:17)+'..':(formButton.form_name) }} +
+ {{ (formButton.form_name.length>17)? (formButton.form_name | slice:0:17)+'..':(formButton.form_name) }} +
+
+ Q{{formButton.pd_form_order}} +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss index 1c43c6bb5..38778876d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss @@ -11,6 +11,16 @@ mat-card.parent_mat_card > { max-height:52vh; overflow:auto; } + .user-thumb { + position: absolute; + bottom: -35%; + // img { + // border: 5px solid $white; + // border-radius: 100%; + // height: 75px; + // width: 75px; + // } +} // @media only screen and (max-width:319px) { // mat-card-content { // max-height: 350px; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 26ce99179..2cec78216 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -75,7 +75,7 @@
- Applicants + Applicants @@ -101,7 +101,7 @@
- Additional Requirements + Additional Requirements @@ -123,7 +123,7 @@ - +
Documents
 @@ -145,7 +145,7 @@ - +
PD History
 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss index 85e145279..bdf8de1d6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss @@ -5,4 +5,7 @@ } .minheight { min-height: 100%; +} +::ng-deep .body-container{ + padding: 0rem !important; } \ No newline at end of file From b4dedbd7927c0cac99e333e8f4a6a7e3074132e8 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Wed, 19 Dec 2018 17:29:31 +0530 Subject: [PATCH 18/27] client , supplier form details changes: kdk --- .../client-info/client-info.component.html | 504 ++++++-------- .../client-info/client-info.component.ts | 653 ++++++++++++------ .../supplier-info.component.html | 359 ++++------ .../supplier-info/supplier-info.component.ts | 459 +++++++----- .../pd-service/pd-triger.service.ts | 18 +- 5 files changed, 1066 insertions(+), 927 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html index b37cb7159..82e871951 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html @@ -1,313 +1,203 @@ - - -

-
{{pageTitle}}
-
- - -
-

- - - - - - - - -
-
- - - - -
- -
-
- - - - -
-
- - - - -
-
- - - - Valid Mobile Number Requried - Valid Mobile Number Requried - -
-
-
-
- - - {{ pm.name }} - - -
-
- - - - -
-
- - - - -
-
-
-
- - - {{ feq.name }} - - -
-
- - - - -
- -
- - - -
-
- -
- - - - - - - - -
- +

+
{{pageTitle}}
+
+ +
+

+
+ + + +
Manufacturing Product Details
+
+
+
+
+ +
Raw Material #{{l+1}}
+
+ + + {{ pm.name }} + + + + + + + + +
- - -
+
+ + + + + + {{ pm.name }} + + + + + +
+
+ + + +
+
- - - - - - - - - - - - - - - +
+
+ + + +
+ +
+
+
+
+ + +
Trading Product Details
+
+
+
+
+ +
Trading Product #{{l+1}}
+
+ + + {{ pm.name }} + + + + + + + + + +
+
+ + + + + + {{ pm.name }} + + + + + +
+
+ + + +
+ +
+
+
+ + + +
+ +
+
+
+
+ + + +
Service Provider Product Details
+
+
+
+
+ +
Service Provider Product #{{l+1}}
+
+ + + {{ pm.name }} + + + + + + + + + +
+
+ + + + + + {{ pm.name }} + + + + + +
+
+ + + +
+ +
+
+
+ + + +
+ +
+
+
+
+ + +
Retail Trading Product Details
+
Retail Trading Details Not applicable here !!
+ + +
- -
-
- - -
- - - - - - \ No newline at end of file + + +
\ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts index d8fac2c96..dce48115a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts @@ -30,120 +30,440 @@ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; }) export class ClientInfoComponent implements OnInit { - pageTitle: string ="Client Details"; - + pageTitle: string = "Client Details"; + //@Input() pdid: number; - pdid : number; + pdid: string; form_id: number; - - loadDataStatus: boolean=true; - - public _clientQuesFrom: FormGroup; + public _supplierQuesFrom: FormGroup; public submitted = false; - public m_paymentModeType= []; - // public m_paymentModeType= [ - // { - // 'id': "1", - // 'name': 'Immediate Or Advanced Payment' - // }, - // { - // 'id': "2", - // 'name': 'Credit' - // }, - // { - // 'id': "3", - // 'name': 'Combination of Both' - // }, - // ]; - public m_freqOfPurchase= []; - // public m_freqOfPurchase= [ - // { - // 'id': "1", - // 'name': 'Daily' - // }, - // { - // 'id': "2", - // 'name': 'Weekly' - // }, - // { - // 'id': "3", - // 'name': 'Monthly' - // }, - // { - // 'id': "4", - // 'name': 'Every 3 months' - // }, - // { - // 'id': "5", - // 'name': 'Half yearly' - // }, - // { - // 'id': "6", - // 'name': 'Yearly' - // }, - // { - // 'id': "7", - // 'name': 'As and when required' - // }, - // { - // 'id': "8", - // 'name': 'Others' - // } - // ] -private notifier: NotifierService; + public m_paymentModeType = []; + private notifier: NotifierService; + + + public m_manufacturingProducts = [ + { + id: 1, + name: 'Manufac prd 1' + }, { + id: 2, + name: 'Manufac prd 2' + } + ]; + public m_tradingProducts = [ + { + id: 1, + name: 'trading prd 1' + }, { + id: 2, + name: 'trading prd 2' + } + ]; + public m_suplierProducts = [ + { + id: 1, + name: 'service prd 1' + }, { + id: 2, + name: 'service prd 2' + } + ]; constructor( notifier: NotifierService, private _formBuilder: FormBuilder, private pdTrigerService: PdTrigerService, - @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { - this.pdid = this.pd_all_details.pdmaster_details.pd_id; - this.form_id = 2; - this.notifier = notifier; -} -public viewerOptions: any = { - navbar: false, - toolbar: { - zoomIn: 4, - zoomOut: 4, - oneToOne: 4, - reset: 4, - prev: 4, - play: { - show: 4, - size: 'large', - }, - next: 4, - rotateLeft: 4, - rotateRight: 4, - flipHorizontal: 4, - flipVertical: 4, + @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { + this.pdid = this.pd_all_details.pdmaster_details.pd_id; + this.form_id = 2; + this.notifier = notifier; } -}; - ngOnInit() { - this.getM_FreqOfPurchase(); - this.getM_PaymentModeType(); - this.getClientFormDetails(); - } - - -// ================== - - getM_FreqOfPurchase() { - this.pdTrigerService.getAllMasterDatas('FREQUENCY').subscribe( - data => { - this.m_freqOfPurchase = data.records.filter(data => data.isactive == 1); + public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', }, - error => { - // this.notifier.notify('warning', 'No Category Records Found.!'); - // this.m_assets_type = "No Category Records Found."; - } - ) + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } + }; + + noRecordsFound: Boolean = false; + ngOnInit() { + + this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe(data => { + // if(data.dataStatus === undefined){ + let datas = { + "profession_name": "Others", + "type_of_activity": [ + { + "type_of_activity_id": 1, + "name": "Manufacturing Details" + }, + { + "type_of_activity_id": 2, + "name": "Retail trading" + }, + { + "type_of_activity_id": 3, + "name": "Wholesale trading" + }, + { + "type_of_activity_id": 4, + "name": "Service Providers" + } + ] + }; + this.initFormLoadDetails(datas.type_of_activity); + // }else { + // this.notifier.notify('warning', 'No Category Records Found.!'); + // this.noRecordsFound = false; + // } + }, err => { + this.notifier.notify('warning', 'No Category Records Found.!'); + this.noRecordsFound = false; + }) + + // this.getM_FreqOfPurchase(); + this.getM_PaymentModeType(); + // this.getPdSupplierFormDetails(); } - getM_PaymentModeType() { + retaildTradingForm: Boolean = false; + initFormLoadDetails(record) { + this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '2').subscribe( + data => { + if (data.dataStatus) { + let dataForm = data.records; + if (dataForm !== undefined) { + this._supplierQuesFrom = this._formBuilder.group({ + pdid: [this.pdid], + formid: ['1'], + manufacturing_details: this._formBuilder.array([this.manufacturingFormCreation(record)]), + trade_details: this._formBuilder.array([this.tradingFormCreation(record)]), + service_provider_details: this._formBuilder.array([this.serviceProviderFormCreation(record)]), + supplier_info_form_remark: [dataForm.supplier_info_form_remark || null] + // wholesale_trade_details: this._formBuilder.array([this.tradingFormCreation(record)]), + }); + // Load form details for manufacturing + let arr = record.filter(data => data.type_of_activity_id === 1); + if (arr.length > 0) { + let api_main_raw_materials = Object.keys(dataForm.main_raw_materials).map(function (key) { + return dataForm.main_raw_materials[key]; + }); + this.initManufacturingProductsDetails(api_main_raw_materials); + this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(dataForm.main_raw_materials_total_payments_percent_on_credit || null); + } + + // Load form details for the wholeshale trading details + let arr1 = record.filter(data => data.type_of_activity_id === 3); + if (arr1.length > 0) { + let api_trading_products = Object.keys(dataForm.trading_products).map(function (key) { + return dataForm.trading_products[key]; + }); + this.initTradingProductsDetails(api_trading_products); + this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(dataForm.trading_products_total_payments_percent_on_credit || null); + } + + // Load form details for the service provider prduct details + let arr2 = record.filter(data => data.type_of_activity_id === 4); + if (arr2.length > 0) { + let api_service_provider_products = Object.keys(dataForm.service_products).map(function (key) { + return dataForm.service_products[key]; + }); + this.initServiceProviderProductsDetails(api_service_provider_products); + this._supplierQuesFrom.controls['service_provider_details']['controls'][0].controls['service_products_total_payments_percent_on_credit'].setValue(dataForm.service_products_total_payments_percent_on_credit || null); + } + // Load form details for the retail trading details + let arr3 = record.filter(data => data.type_of_activity_id === 2); + if (arr3.length > 0) { + this.retaildTradingForm = true; + } + this.noRecordsFound = true; + } else { + this._supplierQuesFrom = this._formBuilder.group({ + pdid: [this.pdid], + formid: ['1'], + manufacturing_details: this._formBuilder.array([this.manufacturingFormCreation(record)]), + trade_details: this._formBuilder.array([this.tradingFormCreation(record)]), + service_provider_details: this._formBuilder.array([this.serviceProviderFormCreation(record)]), + supplier_info_form_remark: [dataForm.supplier_info_form_remark || null] + // wholesale_trade_details: this._formBuilder.array([this.tradingFormCreation(record)]), + }); + let arr = record.filter(data => data.type_of_activity_id === 1); + if (arr.length > 0) { + this.initManufacturingProductsDetails(null); + this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(null); + } + let arr1 = record.filter(data => data.type_of_activity_id === 3); + if (arr1.length > 0) { + this.initTradingProductsDetails(null); + this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(dataForm.trading_products_total_payments_percent_on_credit || null); + } + let arr2 = record.filter(data => data.type_of_activity_id === 4); + if (arr2.length > 0) { + let api_service_provider_products = Object.keys(dataForm.service_products).map(function (key) { + return dataForm.service_products[key]; + }); + this.initServiceProviderProductsDetails(api_service_provider_products); + this._supplierQuesFrom.controls['service_provider_details']['controls'][0].controls['service_products_total_payments_percent_on_credit'].setValue(dataForm.service_products_total_payments_percent_on_credit || null); + } + // Load form details for the retail trading details + let arr3 = record.filter(data => data.type_of_activity_id === 2); + if (arr3.length > 0) { + this.retaildTradingForm = true; + } + this.noRecordsFound = true; + } + } else { + this._supplierQuesFrom = this._formBuilder.group({ + pdid: [this.pdid], + formid: ['1'], + manufacturing_details: this._formBuilder.array([this.manufacturingFormCreation(record)]), + trade_details: this._formBuilder.array([this.tradingFormCreation(record)]), + service_provider_details: this._formBuilder.array([this.serviceProviderFormCreation(record)]), + supplier_info_form_remark: [] + // wholesale_trade_details: this._formBuilder.array([this.tradingFormCreation(record)]), + }); + let arr = record.filter(data => data.type_of_activity_id === 1); + if (arr.length > 0) { + this.initManufacturingProductsDetails(null); + this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(null); + } + let arr1 = record.filter(data => data.type_of_activity_id === 3); + if (arr1.length > 0) { + this.initTradingProductsDetails(null); + this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(null); + } + let arr2 = record.filter(data => data.type_of_activity_id === 4); + if (arr2.length > 0) { + this.initServiceProviderProductsDetails(null); + this._supplierQuesFrom.controls['service_provider_details']['controls'][0].controls['service_products_total_payments_percent_on_credit'].setValue(null); + } + // Load form details for the retail trading details + let arr3 = record.filter(data => data.type_of_activity_id === 2); + if (arr3.length > 0) { + this.retaildTradingForm = true; + } + this.noRecordsFound = true; + } + }, err => { + + } + ); + } + + + manufacturingForm: Boolean = false; + manufacturingFormCreation(val) { + let arr = val.filter(data => data.type_of_activity_id === 1); + if (arr.length > 0) { + this.manufacturingForm = true; + return this._formBuilder.group({ + main_raw_materials: this._formBuilder.array([]), + main_raw_materials_total_payments_percent_on_credit: [] + }) + // } + } else { + return; + } + } + + tradingForm: Boolean = false; + tradingFormCreation(val) { + let arr = val.filter(data => data.type_of_activity_id === 3); + if (arr.length > 0) { + this.tradingForm = true; + return this._formBuilder.group({ + trading_products: this._formBuilder.array([]), + trading_products_total_payments_percent_on_credit: [] + }); + } else { + return; + } + } + + serviceProviderForm: Boolean = false; + serviceProviderFormCreation(val) { + let arr = val.filter(data => data.type_of_activity_id === 4); + if (arr.length > 0) { + this.serviceProviderForm = true; + return this._formBuilder.group({ + service_products: this._formBuilder.array([]), + service_products_total_payments_percent_on_credit: [] + }); + } else { + return; + } + } + + initManufacturingProductsDetails(datas) { + const control = this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials']; + if (datas === null) { + control.push(this.initManufacturingProducts(null)); + } else { + for (let val of datas) { + control.push(this.initManufacturingProducts(val)); + } + } + } + + initManufacturingProducts(records) { + if (records === null) { + return this._formBuilder.group({ + manufacturing_product_name: [''], + manufacturing_client_name: [''], + manufacturing_contact_person_name: [''], + manufacturing_contact_person_mobile_number: [''], + manufacturing_payment_type: [''], + manufacturing_credit_days: [''], + }) + } else { + return this._formBuilder.group({ + manufacturing_product_name: [records.manufacturing_raw_material_name || null], + manufacturing_client_name: [records.manufacturing_client_name || null], + manufacturing_contact_person_name: [records.manufacturing_contact_person_name || null], + manufacturing_contact_person_mobile_number: [records.manufacturing_contact_person_mobile_number || null], + manufacturing_payment_type: [records.manufacturing_payment_type || null], + manufacturing_credit_days: [records.manufacturing_credit_days || null], + }) + } + } + + initTradingProductsDetails(datas) { + const control = this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products']; + if (datas === null) { + control.push(this.initTradingProducts(null)); + } else { + for (let val of datas) { + control.push(this.initTradingProducts(val)); + } + } + } + + initTradingProducts(records) { + if (records === null) { + return this._formBuilder.group({ + trade_product_name: [''], + trade_client_name: [''], + trade_product_contact_person_name: [''], + trade_product_contact_person_mobile_number: [''], + trade_product_payment_type: [''], + trade_product_frequency_of_purchase: [''], + trade_product_credit_days: [''], + }) + } else { + return this._formBuilder.group({ + trade_product_name: [records.trade_product_name], + trade_client_name: [records.trade_client_name], + trade_product_contact_person_name: [records.trade_product_contact_person_name], + trade_product_contact_person_mobile_number: [records.trade_product_contact_person_mobile_number], + trade_product_payment_type: [records.trade_product_payment_type], + trade_product_frequency_of_purchase: [records.trade_product_frequency_of_purchase], + trade_product_credit_days: [records.trade_product_credit_days], + }) + } + } + + initServiceProviderProductsDetails(datas) { + const control = this._supplierQuesFrom.controls['service_provider_details']['controls'][0].controls['service_products']; + if (datas === null) { + control.push(this.initServiceProviderProducts(null)); + } else { + for (let val of datas) { + control.push(this.initServiceProviderProducts(val)); + } + } + } + + initServiceProviderProducts(records) { + if (records === null) { + return this._formBuilder.group({ + service_provider_product_name: [''], + service_provider_client_name: [''], + service_provider_product_contact_person_name: [''], + service_provider_product_contact_person_mobile_number: [''], + service_provider_product_payment_type: [''], + service_provider_product_frequency_of_purchase: [''], + service_provider_product_credit_days: [''], + }) + } else { + return this._formBuilder.group({ + service_provider_product_name: [records.service_provider_product_name], + service_provider_client_name: [records.service_provider_client_name], + service_provider_product_contact_person_name: [records.service_provider_product_contact_person_name], + service_provider_product_contact_person_mobile_number: [records.service_provider_product_contact_person_mobile_number], + service_provider_product_payment_type: [records.service_provider_product_payment_type], + service_provider_product_frequency_of_purchase: [records.service_provider_product_frequency_of_purchase], + service_provider_product_credit_days: [records.service_provider_product_credit_days], + }) + } + } + + addMoreRawMaterials(e): void { + // e.stropPropagation(); + const control = this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials']; + // console.log(control); + control.push(this.initManufacturingProducts(null)); + } + + removeRawMaterials(inx): void { + const control = this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials']; + control.removeAt(inx); + } + + addMoretradeProduct(e): void { + // e.stropPropagation(); + const control = this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products']; + // console.log(control); + control.push(this.initTradingProducts(null)); + } + + removeTradingProduct(inx): void { + const control = this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products']; + control.removeAt(inx); + } + + addMoreServiceProduct(e): void { + // e.stropPropagation(); + const control = this._supplierQuesFrom.controls['service_provider_details']['controls'][0].controls['service_products']; + // console.log(control); + control.push(this.initServiceProviderProducts(null)); + } + + removeServiceProduct(inx): void { + const control = this._supplierQuesFrom.controls['service_provider_details']['controls'][0].controls['service_products']; + control.removeAt(inx); + } + + + // ================== + + //getM_FreqOfPurchase() { + // this.pdTrigerService.getAllMasterDatas('FREQUENCY').subscribe( + // data => { + // this.m_freqOfPurchase = data.records.filter(data => data.isactive == 1); + // }, + // error => { + // this.notifier.notify('warning', 'No Category Records Found.!'); + // this.m_assets_type = "No Category Records Found."; + /// } + // ) + // } + + getM_PaymentModeType() { this.pdTrigerService.getAllMasterDatas('PAYMENTMODE').subscribe( data => { this.m_paymentModeType = data.records.filter(data => data.isactive == 1); @@ -156,147 +476,35 @@ public viewerOptions: any = { } -// ================== + // ================== -apiLoadFinish: boolean = false; - getClientFormDetails() { - this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '2').subscribe( - data => { - if (data) { - if(data.dataStatus){ - this.formLoadData(data.records) - } else { - this.formLoadData(null) - } - this.apiLoadFinish = true; - } else { - // this.noRecordFound = true; - } - } - ); - } - - formLoadData(val) { - if(val !== null) { - let value = val; - this._clientQuesFrom = this._formBuilder.group({ - pdid: [this.pdid], - formid: ['2'], - client_details: this._formBuilder.array([ - // this.initDetails(), - ]) - }); - this.addClientDetailsWithData(value.client_details); - } else { - this._clientQuesFrom = this._formBuilder.group({ - pdid: [this.pdid], - formid: ['2'], - client_details: this._formBuilder.array([ - this.initDetails(), - ]) - }); - } - } - - // convenience getter for easy access to form fields - get f() { return this._clientQuesFrom.controls; } - - // Dynamic Form field creation Functionality : START ===> - initDetails() { - return this._formBuilder.group({ - client_name: ['', Validators.compose([Validators.required])], - contact_person: ['', Validators.compose([Validators.required])], - mobile_number: ['', Validators.compose([Validators.required, Validators.minLength(10), Validators.maxLength(10)])], - payment_mode: ['', Validators.compose([Validators.required])], - per_of_immediate_advance_payment:[''], - credit_period:[''], - frequency_of_purchase: ['', Validators.compose([Validators.required])], - freq_purchase_others_text_value: [''] - }); - } - - initDetailsWithdata(data) { - return this._formBuilder.group({ - client_name: [data.client_name, Validators.compose([Validators.required])], - contact_person: [data.contact_person, Validators.compose([Validators.required])], - mobile_number: [data.mobile_number, Validators.compose([Validators.required, Validators.minLength(10), Validators.maxLength(10)])], - payment_mode: [data.payment_mode, Validators.compose([Validators.required])], - per_of_immediate_advance_payment:[data.per_of_immediate_advance_payment || ''], - credit_period:[data.credit_period || ''], - frequency_of_purchase: [data.frequency_of_purchase, Validators.compose([Validators.required])], - freq_purchase_others_text_value: [data.freq_purchase_others_text_value || ''] - }); - } - - addClientDetailsWithData(supp_data) { - -var result = Object.keys(supp_data).map(function(key) { - return supp_data[key]; -}); - if (result.length > 0) { - for (let val of result) { - let vals = { - client_name: val.client_name, - contact_person: val.contact_person, - mobile_number: val.mobile_number, - payment_mode: val.payment_mode, - per_of_immediate_advance_payment: val.per_of_immediate_advance_payment, - credit_period: val.credit_period, - frequency_of_purchase: val.frequency_of_purchase, - freq_purchase_others_text_value: val.freq_purchase_others_text_value - }; - const control = this._clientQuesFrom.controls['client_details']; - control.push(this.initDetailsWithdata(vals)); - } - } - } - - addSupplierDetails(e) { - const control = this._clientQuesFrom.controls['client_details']; - control.push(this.initDetails()); - } - removeLanguage(i: number) { - const control = this._clientQuesFrom.controls['client_details']; - control.removeAt(i); - } - - public paymentModeTextBox: number; - selectedPM(e) { - this.paymentModeTextBox = e.value; - // this.f.supplier_details.controls.get('payment_mode_value'); - } - public freqPurchaseTextBox: number; - selectedFreqPurchase(e){ - this.freqPurchaseTextBox = e.value; - } - /** To Save/Edited Popup Data */ onSubmit() { this.submitted = true; // stop here if form is invalid - if (this._clientQuesFrom.invalid) { + if (this._supplierQuesFrom.invalid) { return; } else { - var answerFormValues = this._clientQuesFrom.value; + var answerFormValues = this._supplierQuesFrom.value; - // To Remove The "Null" With Key also + //To Remove The "Null" With Key also Object.keys(answerFormValues).forEach((key) => (answerFormValues[key] == null) && delete answerFormValues[key]); - + console.log(JSON.stringify(answerFormValues)); // Add BRANCH data with help Service File this.pdTrigerService.savePDFormDetailsWithID(answerFormValues).subscribe( dataresult => { if (dataresult.status == 200) { // console.log(dataresult); - this.notifier.notify('success', 'Record Saved Successfully.!'); + this.notifier.notify('success', 'Record Saved Successfully.!'); // this.dialogRef.close(); // alert("sample alert for Saving"); } else { - this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); // this.errorMessage = "Some Thing Wents Wrong Try Again !"; } }, error => { - this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); // this.errorMessage = "Something Wents Wrong Try Again !"; // this.dialogRef.close(); }); @@ -309,8 +517,9 @@ var result = Object.keys(supp_data).map(function(key) { onReset() { // this._addQuesFrom.reset(); } - /** On Key Press Event For Mobile Number */ - keyPress(event: any) { + + /** On Key Press Event For Mobile Number */ + keyPress(event: any) { const pattern = /[0-9]/; let inputChar = String.fromCharCode(event.charCode); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html index 172160c01..bea4ae748 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html @@ -1,229 +1,134 @@ -
-
- -

-
{{pageTitle}}
-
- -
-

- - - - - -
-
- - - - - You must Include Raw Material Details. - - - -
-
-
-
- - - -
- -
-
- - - - -
-
- - - - -
-
- - - - Valid Mobile Number Requried - Vaild Mobile Number Requried - - -
-
-
-
- - - {{ pm.name }} - - -
-
- - - -
-
- - - -
-
-
- - - - - - -
-
- - - - - -
+

+
{{pageTitle}}
+
+ +
+

+
+ + + +
Manufacturing Product Details
+
+
+
+
+ +
Raw Material #{{l+1}}
+
+ + + + + + + + + +
+
+ + + + + + {{ pm.name }} + + + + + +
+
+ + + +
+
- -
- -
- - - - - - - - - - - - +
+
+ + + +
+ +
+
+
+
+ + +
Trading Product Details
+
+
+
+
+ +
Trading Product #{{l+1}}
+
+ + + + + + + + + +
+
+ + + + + + {{ pm.name }} + + + + + +
+
+ + + +
+ +
+
+
+ + + +
+ +
+
+
+
+ + +
Service Provider Product Details
+
Service Provider Details Not applicable here !!
+ + +
- -
-
- - - -
- - - -
- \ No newline at end of file + + Remarks + + +
+
+ +
+ + +
\ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts index a56a76238..f25701393 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit, Inject, - Output,Input + Output, Input } from '@angular/core'; import { @@ -31,69 +31,313 @@ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; }) export class SupplierInfoComponent implements OnInit { - - pageTitle: string ="Supplier Details"; - + + pageTitle: string = "Supplier Details"; + //@Input() pdid: number; - pdid : string; - form_id:number; + pdid: string; + form_id: number; public _supplierQuesFrom: FormGroup; public submitted = false; - public m_paymentModeType= []; + public m_paymentModeType = []; private notifier: NotifierService; constructor( - notifier: NotifierService, - private _formBuilder: FormBuilder, - private pdTrigerService: PdTrigerService, - @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { - this.pdid = this.pd_all_details.pdmaster_details.pd_id; - this.form_id = 1; - this.notifier = notifier; + notifier: NotifierService, + private _formBuilder: FormBuilder, + private pdTrigerService: PdTrigerService, + @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { + this.pdid = this.pd_all_details.pdmaster_details.pd_id; + this.form_id = 1; + this.notifier = notifier; } public viewerOptions: any = { - navbar: false, - toolbar: { - zoomIn: 4, - zoomOut: 4, - oneToOne: 4, - reset: 4, - prev: 4, - play: { - show: 4, - size: 'large', - }, - next: 4, - rotateLeft: 4, - rotateRight: 4, - flipHorizontal: 4, - flipVertical: 4, - } -}; + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } + }; + noRecordsFound: Boolean = false; ngOnInit() { - // this.getM_FreqOfPurchase(); + + this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe(data => { + // if(data.dataStatus === undefined){ + let datas = { + "profession_name": "Others", + "type_of_activity": [ + { + "type_of_activity_id": 1, + "name": "Manufacturing Details" + }, + { + "type_of_activity_id": 2, + "name": "Retail trading" + }, + { + "type_of_activity_id": 4, + "name": "Service Provider" + } + ] + }; + this.initFormLoadDetails(datas.type_of_activity); + // }else { + // this.notifier.notify('warning', 'No Category Records Found.!'); + // this.noRecordsFound = false; + // } + }, err => { + this.notifier.notify('warning', 'No Category Records Found.!'); + this.noRecordsFound = false; + }) + + // this.getM_FreqOfPurchase(); this.getM_PaymentModeType(); - this.getPdSupplierFormDetails(); + // this.getPdSupplierFormDetails(); } -// ================== + + serviceProviderForm: Boolean = false; + initFormLoadDetails(record) { + this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '1').subscribe( + data => { + if(data.dataStatus){ + let dataForm = data.records; + if(dataForm !== undefined) { + this._supplierQuesFrom = this._formBuilder.group({ + pdid: [this.pdid], + formid: ['1'], + manufacturing_details: this._formBuilder.array([this.manufacturingFormCreation(record)]), + trade_details: this._formBuilder.array([this.tradingFormCreation(record)]), + supplier_info_form_remark: [dataForm.supplier_info_form_remark || null] + // wholesale_trade_details: this._formBuilder.array([this.tradingFormCreation(record)]), + }); + let arr = record.filter(data => data.type_of_activity_id === 1); + if(arr.length > 0) { + let api_main_raw_materials = Object.keys(dataForm.main_raw_materials).map(function (key) { + return dataForm.main_raw_materials[key]; + }); + this.initManufacturingProductsDetails(api_main_raw_materials); + this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(dataForm.main_raw_materials_total_payments_percent_on_credit || null); + } + let arr1 = record.filter(data => data.type_of_activity_id === 2 || 3); + if(arr1.length > 0) { + let api_trading_products = Object.keys(dataForm.trading_products).map(function (key) { + return dataForm.trading_products[key]; + }); + this.initTradingProductsDetails(api_trading_products); + this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(dataForm.trading_products_total_payments_percent_on_credit || null); + } + this.noRecordsFound = true; + } else { + this._supplierQuesFrom = this._formBuilder.group({ + pdid: [this.pdid], + formid: ['1'], + manufacturing_details: this._formBuilder.array([this.manufacturingFormCreation(record)]), + trade_details: this._formBuilder.array([this.tradingFormCreation(record)]), + supplier_info_form_remark: [dataForm.supplier_info_form_remark || null] + // wholesale_trade_details: this._formBuilder.array([this.tradingFormCreation(record)]), + }); + let arr = record.filter(data => data.type_of_activity_id === 1); + if(arr.length > 0) { + this.initManufacturingProductsDetails(null); + this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(null); + } + let arr1 = record.filter(data => data.type_of_activity_id === 2 || 3); + if(arr1.length > 0) { + this.initTradingProductsDetails(null); + this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(dataForm.trading_products_total_payments_percent_on_credit || null); + } + this.noRecordsFound = true; + } + let arr2 = record.filter(data => data.type_of_activity_id === 4); + if(arr2.length > 0) { + this.serviceProviderForm = true; + } + } else { + this._supplierQuesFrom = this._formBuilder.group({ + pdid: [this.pdid], + formid: ['1'], + manufacturing_details: this._formBuilder.array([this.manufacturingFormCreation(record)]), + trade_details: this._formBuilder.array([this.tradingFormCreation(record)]), + supplier_info_form_remark: [] + // wholesale_trade_details: this._formBuilder.array([this.tradingFormCreation(record)]), + }); + let arr = record.filter(data => data.type_of_activity_id === 1); + if(arr.length > 0) { + this.initManufacturingProductsDetails(null); + this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(null); + } + let arr1 = record.filter(data => data.type_of_activity_id === 2 || 3); + if(arr1.length > 0) { + this.initTradingProductsDetails(null); + this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(null); + } + let arr2 = record.filter(data => data.type_of_activity_id === 4); + if(arr2.length > 0) { + this.serviceProviderForm = true; + } + this.noRecordsFound = true; + } + }, err => { + + } + ); + } + + + manufacturingForm: Boolean = false; + manufacturingFormCreation(val) { + let arr = val.filter(data => data.type_of_activity_id === 1); + if (arr.length > 0) { + this.manufacturingForm = true; + return this._formBuilder.group({ + main_raw_materials: this._formBuilder.array([]), + main_raw_materials_total_payments_percent_on_credit: [] + }) + // } + } else { + return; + } + } + + tradingForm: Boolean = false; + tradingFormCreation(val) { + let arr = val.filter(data => data.type_of_activity_id === 2 || 3); + if (arr.length > 0) { + this.tradingForm = true; + return this._formBuilder.group({ + trading_products: this._formBuilder.array([]), + trading_products_total_payments_percent_on_credit: [] + }); + } else { + return; + } + } + + initManufacturingProductsDetails(datas) { + const control = this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials']; + if(datas === null){ + control.push(this.initManufacturingProducts(null)); + } else { + for (let val of datas) { + control.push(this.initManufacturingProducts(val)); + } + } + } + + initManufacturingProducts(records) { + if(records === null) { + return this._formBuilder.group({ + manufacturing_raw_material_name: [''], + manufacturing_supplier_name: [''], + manufacturing_contact_person_name: [''], + manufacturing_contact_person_mobile_number: [''], + manufacturing_payment_type: [''], + manufacturing_credit_days: [''], + manufacturing_frequency_of_purchase: [''], + }) + } else { + return this._formBuilder.group({ + manufacturing_raw_material_name: [records.manufacturing_raw_material_name || null], + manufacturing_supplier_name: [records.manufacturing_supplier_name || null], + manufacturing_contact_person_name: [records.manufacturing_contact_person_name || null], + manufacturing_contact_person_mobile_number: [records.manufacturing_contact_person_mobile_number || null], + manufacturing_payment_type: [records.manufacturing_payment_type || null], + manufacturing_credit_days: [records.manufacturing_credit_days || null], + manufacturing_frequency_of_purchase: [records.manufacturing_frequency_of_purchase || null], + }) + } + } + + initTradingProductsDetails(datas) { + const control = this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products']; + if(datas === null){ + control.push(this.initTradingProducts(null)); + } else { + for (let val of datas) { + control.push(this.initTradingProducts(val)); + } + } + } + + initTradingProducts(records) { + if(records === null) { + return this._formBuilder.group({ + trade_product_name: [''], + trade_supplier_name: [''], + trade_product_contact_person_name: [''], + trade_product_contact_person_mobile_number: [''], + trade_product_payment_type: [''], + trade_product_frequency_of_purchase: [''], + trade_product_credit_days: [''], + }) + } else { + return this._formBuilder.group({ + trade_product_name: [records.trade_product_name], + trade_supplier_name: [records.trade_supplier_name], + trade_product_contact_person_name: [records.trade_product_contact_person_name], + trade_product_contact_person_mobile_number: [records.trade_product_contact_person_mobile_number], + trade_product_payment_type: [records.trade_product_payment_type], + trade_product_frequency_of_purchase: [records.trade_product_frequency_of_purchase], + trade_product_credit_days: [records.trade_product_credit_days], + }) + } + } + + addMoreRawMaterials(e): void { + // e.stropPropagation(); + const control = this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials']; + // console.log(control); + control.push(this.initManufacturingProducts(null)); + } + + removeRawMaterials(inx): void { + const control = this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials']; + control.removeAt(inx); + } + + addMoretradeProduct(e): void { + // e.stropPropagation(); + const control = this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products']; + // console.log(control); + control.push(this.initTradingProducts(null)); + } + + removeTradingProduct(inx): void { + const control = this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products']; + control.removeAt(inx); + } + + // ================== //getM_FreqOfPurchase() { - // this.pdTrigerService.getAllMasterDatas('FREQUENCY').subscribe( - // data => { - // this.m_freqOfPurchase = data.records.filter(data => data.isactive == 1); - // }, - // error => { - // this.notifier.notify('warning', 'No Category Records Found.!'); - // this.m_assets_type = "No Category Records Found."; - /// } - // ) - // } + // this.pdTrigerService.getAllMasterDatas('FREQUENCY').subscribe( + // data => { + // this.m_freqOfPurchase = data.records.filter(data => data.isactive == 1); + // }, + // error => { + // this.notifier.notify('warning', 'No Category Records Found.!'); + // this.m_assets_type = "No Category Records Found."; + /// } + // ) + // } - getM_PaymentModeType() { + getM_PaymentModeType() { this.pdTrigerService.getAllMasterDatas('PAYMENTMODE').subscribe( data => { this.m_paymentModeType = data.records.filter(data => data.isactive == 1); @@ -106,123 +350,8 @@ export class SupplierInfoComponent implements OnInit { } -// ================== + // ================== -apiLoadFinish: boolean = false; - getPdSupplierFormDetails() { - this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '1').subscribe( - data => { - if (data) { - if(data.dataStatus){ - this.formLoadData(data.records) - } else { - this.formLoadData(null) - } - this.apiLoadFinish = true; - } else { - // this.noRecordFound = true; - } - } - ); - } - - formLoadData(val) { - if(val !== null) { - let value = val; - this._supplierQuesFrom = this._formBuilder.group({ - pdid: [this.pdid], - formid: ['1'], - main_raw_materials: [value.main_raw_materials, Validators.compose([Validators.required])], - supplier_details: this._formBuilder.array([ - // this.initDetails(), - ]) - }); - this.addSupplierDetailsWithData(value.supplier_details); - } else { - this._supplierQuesFrom = this._formBuilder.group({ - pdid: [this.pdid], - formid: ['1'], - main_raw_materials: [null, Validators.compose([Validators.required])], - supplier_details: this._formBuilder.array([ - this.initDetails(), - ]) - }); - } - } - - // convenience getter for easy access to form fields - get f() { return this._supplierQuesFrom.controls; } - - // Dynamic Form field creation Functionality : START ===> - initDetails() { - return this._formBuilder.group({ - supplier_name: ['', Validators.compose([Validators.required])], - contact_person: ['', Validators.compose([Validators.required])], - mobile_number: ['', Validators.compose([Validators.required, Validators.minLength(10), Validators.maxLength(10)])], - payment_mode: ['', Validators.compose([Validators.required])], - per_of_immediate_advance_payment:[''], - credit_period:[''], - // frequency_of_purchase: ['', Validators.compose([Validators.required])], - // freq_purchase_others_text_value: [''] - }); - } - - initDetailsWithdata(data) { - return this._formBuilder.group({ - supplier_name: [data.supplier_name, Validators.compose([Validators.required])], - contact_person: [data.contact_person, Validators.compose([Validators.required])], - mobile_number: [data.mobile_number, Validators.compose([Validators.required, Validators.minLength(10), Validators.maxLength(10)])], - payment_mode: [data.payment_mode, Validators.compose([Validators.required])], - per_of_immediate_advance_payment:[data.per_of_immediate_advance_payment || ''], - credit_period:[data.credit_period || ''], - //frequency_of_purchase: [data.frequency_of_purchase, Validators.compose([Validators.required])], - //freq_purchase_others_text_value: [data.freq_purchase_others_text_value || ''] - }); - } - - addSupplierDetailsWithData(supp_data) { - var result = Object.keys(supp_data).map(function(key) { - return supp_data[key]; - }); - if (result.length > 0) { - for (let val of result) { - let vals = { - supplier_name: val.supplier_name, - contact_person: val.contact_person, - mobile_number: val.mobile_number, - payment_mode: val.payment_mode, - per_of_immediate_advance_payment: val.per_of_immediate_advance_payment, - credit_period: val.credit_period - // frequency_of_purchase: val.frequency_of_purchase, - // freq_purchase_others_text_value: val.freq_purchase_others_text_value - }; - const control = this._supplierQuesFrom.controls['supplier_details']; - control.push(this.initDetailsWithdata(vals)); - } - } - } - - addSupplierDetails(e) { - const control = this._supplierQuesFrom.controls['supplier_details']; - control.push(this.initDetails()); - } - removeLanguage(i: number) { - const control = this._supplierQuesFrom.controls['supplier_details']; - control.removeAt(i); - } - - public paymentModeTextBox: number; - selectedPM(e) { - this.paymentModeTextBox = e.value; - // this.f.supplier_details.controls.get('payment_mode_value'); - } - - public freqPurchaseTextBox: number; - selectedFreqPurchase(e){ - this.freqPurchaseTextBox = e.value; - } - - /** To Save/Edited Popup Data */ onSubmit() { this.submitted = true; @@ -234,7 +363,7 @@ apiLoadFinish: boolean = false; //To Remove The "Null" With Key also Object.keys(answerFormValues).forEach((key) => (answerFormValues[key] == null) && delete answerFormValues[key]); - // alert(JSON.stringify(answerFormValues)); + console.log(JSON.stringify(answerFormValues)); //Add BRANCH data with help Service File this.pdTrigerService.savePDFormDetailsWithID(answerFormValues).subscribe( dataresult => { @@ -253,8 +382,8 @@ apiLoadFinish: boolean = false; // this.errorMessage = "Something Wents Wrong Try Again !"; // this.dialogRef.close(); }); - //After Saving the BRANCH data then popup close - // this.dialogRef.close(); + // //After Saving the BRANCH data then popup close + // // this.dialogRef.close(); } } diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index f281ec28c..fb7e5aa53 100755 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -282,14 +282,14 @@ getPDFormDetailsWithID(pdID, formID ):Observable { // get Pd Final report Question Answer - getPdFinalReportDetails(pdId: number) { + getPdFinalReportDetails(pdId: number): Observable { return this._http.post(this.apiUrl+"getFinalPDReportQuestions",{"pd_id":pdId}) .pipe( catchError(this.handleError('operation', [])) ) } - getPDReportFinalDocument(pdId: any){ + getPDReportFinalDocument(pdId: any): Observable{ pdId.fk_createdby = this._aws.getlocale(); return this._http.post(this.apiUrl+"generatePDReport",{"records": pdId}) .pipe( @@ -297,28 +297,28 @@ getPDFormDetailsWithID(pdID, formID ):Observable { ) } - getActualPDReportModelTemplate(pdId: any) { + getActualPDReportModelTemplate(pdId: any) : Observable{ return this._http.post(this.apiUrl+"getLatestPDReportBlob ",{"records":{"pd_id":pdId}}) .pipe( catchError(this.handleError('operation', [])) ) } - updatePDReportDetails(records: any){ + updatePDReportDetails(records: any): Observable{ return this._http.post(this.apiUrl+"saveNewVersionOfPDReport ",{"records": records}) .pipe( catchError(this.handleError('operation', [])) ) } - getPdDocVersionList(pdId: number){ + getPdDocVersionList(pdId: number): Observable{ return this._http.post(this.apiUrl+"getListOfPDReportVersions",{"records":{"pd_id":pdId}}) .pipe( catchError(this.handleError('operation', [])) ) } - swapOlderPDReportToLatest(pdId: any){ + swapOlderPDReportToLatest(pdId: any): Observable{ pdId.fk_createdby = this._aws.getlocale(); alert(JSON.stringify(pdId)); return this._http.post(this.apiUrl+"swapOlderPDReportToLatest",{"records": pdId}) @@ -327,6 +327,12 @@ getPDFormDetailsWithID(pdID, formID ):Observable { ) } +getTypeofActivityForSuppliedInfoForm(pd_id: any): Observable{ + return this._http.post(this.apiUrl+"getTypeOfActivetyFromBusinessForm", {"records": { "pd_id" : pd_id }}) + .pipe( + catchError(this.handleError('operation', [])) + ) + } From 85efbafe4ccb121870ed3ebdbf1aadc25d83d91b Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 19 Dec 2018 17:35:54 +0530 Subject: [PATCH 19/27] finanical form chnges : ps --- .../financial-info.component.html | 52 +++- .../financial-info.component.scss | 6 +- .../financial-info.component.ts | 242 ++++++++++++++++-- 3 files changed, 261 insertions(+), 39 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html index fca7c549a..20af6c3f6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html @@ -13,7 +13,6 @@ - @@ -61,16 +60,18 @@ - + - + + {{SalesStatement[i]}} - + + @@ -96,33 +97,60 @@

Actual Values as per Customer

+ + + Yes + No + +

+ - + - + - + + + Net Profit + Net Loss + + + + + - + - + + + + + + + + + + + {{details.controls['estimate_variation'].value}} {{details.controls['estimate_year'].value}} + + -