diff --git a/ng6-seed/package.json b/ng6-seed/package.json index 8ec6b0d32..657e251a7 100755 --- a/ng6-seed/package.json +++ b/ng6-seed/package.json @@ -57,6 +57,7 @@ "ngx-mat-daterange-picker": "^1.1.4", "ngx-mat-select-search": "^1.3.1", "ngx-perfect-scrollbar": "5.0.0-7", + "ngx-viewer": "^1.0.1", "perfect-scrollbar": "^1.3.0", "quill": "^1.2.0", "rxjs": "^6.3.1", @@ -66,6 +67,7 @@ "sortablejs": "^1.6.0", "sweetalert2": "^7.28.4", "tether": "^1.4.0", + "viewerjs": "^1.3.1", "zone.js": "^0.8.26" }, "devDependencies": { 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 1f715afe1..78a36ac59 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html @@ -239,111 +239,96 @@ -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
- -
+
+
+
+
+
+
Image 1
+
+
+
+
+
+
+
Image 2
+
+
+
+
+
+
+
Image 3
+
+
+
+
+
+
+
Image 2
+
+
+
+
+
+
+
Image 3
+
+
+
+
+
+
+
Image 1
+
+
+
+
+
+
+ + +
+
+
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 cf4d33aac..0db065a3e 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 @@ -291,6 +291,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 - -
- -
-
-
-
-
- -
- +
+
+
+
+
+
Image 1
+
+
+
+
+
+
+
Image 2
+
+
+
+
+
+
+
Image 3
+
+
+
+
+
+
+
Image 2
+
+
+
+
+
+
+
Image 3
+
+
+
+
+
+
+
Image 1
+
+
+
+
+
+
+ + +
+
+
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 292ea4a38..140440a93 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -314,7 +314,7 @@ - +
@@ -637,118 +637,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/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 2c5988782..5dd5e0f4f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts @@ -175,7 +175,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..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 @@ -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 - -
- -
-
-
-
-
- -
- +
+
+
+
+
+
+
Image 1
+
+
+
+
+
+
+
Image 2
+
+
+
+
+
+
+
Image 3
+
+
+
+
+
+
+
Image 2
+
+
+
+
+
+
+
Image 3
+
+
+
+
+
+
+
Image 1
+
+
+
+
+ +
+
@@ -283,22 +348,22 @@ -
- - Remarks - - -
-
+
+ + Remarks + + +
+
- +
- + - + @@ -311,7 +376,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..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,22 +30,28 @@ 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; - 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(); + // } + // } } 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 23fa1c544..5f7e594a9 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 @@ -215,112 +215,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 a1a25df07..619b4856b 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 @@ -54,6 +54,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! */