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 9bc3985e8..85f0fceef 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 @@ -189,47 +189,12 @@ -
+
-
-
+
+
-
Image 1
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 1
+
{{doc.document_name}}
@@ -237,96 +202,24 @@ + + +

No Files

+ + 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 3842dfc2f..279e2c066 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 @@ -55,6 +55,7 @@ export class AddressComponent implements OnInit { uomData: any = []; addressesList: any = []; + documentsAndFilesList: any = []; otherPincodeFlag: any = []; /**Declaration of FormField Variables */ @@ -125,7 +126,7 @@ export class AddressComponent implements OnInit { data.records.addresses.forEach((datas, index) => { let obj = { 'address': datas.address, - 'address_type': datas.address_type, + 'address_type': datas.address_type.toString(), 'address_type_others': datas.address_type_others, 'state': datas.state, 'city': datas.city, @@ -214,6 +215,26 @@ export class AddressComponent implements OnInit { // control.push(this.createAddresses(null)); // } }); + + this._pd.retriveFile(this.pdid,'5',null).subscribe(data => { + if (data.status == 200) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + }); } loadPDAddressesDetails() { @@ -249,6 +270,7 @@ export class AddressComponent implements OnInit { control.push(this.createAddresses(obj)); }); } + this.addressForm.controls.address_form_remark.setValue(''); // else{ // control.push(this.createAddresses(null)); // } @@ -289,6 +311,20 @@ export class AddressComponent implements OnInit { // this.uom = this.addressForm.controls['uom']; } + // pdf(url){ + // this._pd.downloadPDF(url).subscribe(res => { + // const fileURL = URL.createObjectURL(res); + // window.open(fileURL, '_blank'); + // }); + // // this._pd.downloadPDF(url).subscribe(res => { + // // const fileURL = URL.createObjectURL(res); + // window.open(url, '_blank'); + // // }); + // } + pdf(fileURL){ + window.open(fileURL); + } + /** FOR Adress */ createAddresses(AddressDetails): FormGroup { if (AddressDetails != null) { 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 9e8ca1f90..9e634c278 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 @@ -266,7 +266,8 @@
+ autocomplete="off" required> + Asset's Description Required
+ picture_as_pdf + {{doc.document_title}} + +
+
+
+
- -
-
-
-
Image 3
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 1
-
-
-
-
-
-
-
- - picture_as_pdf - version_111 - -
-
- - picture_as_pdf - version_111 - -
-
- - picture_as_pdf - version_111 - -
-
- - picture_as_pdf - version_111 - -
-
- - picture_as_pdf - version_111 - -
-
- - picture_as_pdf - version_111 - -
-
-
-
- - picture_as_pdf - version_111 - -
-
- - picture_as_pdf - version_111 - -
-
- - picture_as_pdf - version_111 - -
-
- - picture_as_pdf - version_111 - -
-
- - picture_as_pdf - version_111 - -
-
- - picture_as_pdf - version_111 - -
-
-
-
- - - + + +

No Files

+ + + + 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 ccfacf5f2..8c2117916 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 @@ -68,6 +68,7 @@ export class AssetsInfoComponent implements OnInit { existCompanyList: any = []; mergeCompanyApplicant: any = []; currentYear: any = new Date().getFullYear(); + documentsAndFilesList: any = []; constructor( notifier: NotifierService, private _formBuilder: FormBuilder, @@ -145,8 +146,31 @@ export class AssetsInfoComponent implements OnInit { //this.getM_InsuranceType(); this.getM_Vehicle_Type(); this.getM_UOM_Type(); - } + this.pdTrigerService.retriveFile(this.pdid,'5',null).subscribe(data => { + if (data.status == 200) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + }); + + } + pdf(fileURL){ + window.open(fileURL); + } // ====================== @@ -324,11 +348,7 @@ export class AssetsInfoComponent implements OnInit { const arr = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; arr.controls.splice(0); } - // else if(flag == 2){ - // const arr = ; - // arr.controls.splice(0); - // } - + switch (e.value) { case '1': { const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; @@ -412,7 +432,7 @@ export class AssetsInfoComponent implements OnInit { otherAssetsDescription() { return this._formBuilder.group({ - any_other_assets: [''], + any_other_assets: ['',Validators.compose([Validators.required])], //name_of_the_owner:[''], //other_owner:[''], //relation:[''], @@ -497,7 +517,7 @@ export class AssetsInfoComponent implements OnInit { otherAssetsDescriptionWithData(data) { return this._formBuilder.group({ - any_other_assets: [data.any_other_assets], + any_other_assets: [data.any_other_assets,Validators.compose([Validators.required])], // name_of_the_owner:[data.name_of_the_owner], // other_owner:[data.other_owner], // relation:[data.relation], 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 ac25c3500..a05b7671a 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 @@ -217,49 +217,13 @@ - -
-
+ +
-
-
+
+
-
Image 1
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 1
+
{{doc.document_name}}
@@ -267,99 +231,27 @@ - - + + +

No Files

+ + + + + 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 975270a4a..7d11658b3 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 @@ -49,7 +49,7 @@ export class BankingDetailsComponent implements OnInit { existCompanyList: any = []; mergeCompanyApplicant: any = []; - + documentsAndFilesList: any = []; constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService, @@ -161,6 +161,27 @@ export class BankingDetailsComponent implements OnInit { control.push(this.createBankarray()); } }); + + this._pd.retriveFile(this.pdid,'7',null).subscribe(data => { + if (data.status == 200) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + }); + } // ====================== @@ -373,4 +394,9 @@ export class BankingDetailsComponent implements OnInit { itemrow.controls.vintage_month.setValue(Math.floor(converted_month)); } + + pdf(fileURL){ + window.open(fileURL); + } + } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html index dbf07472e..479270992 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html @@ -271,7 +271,8 @@
+ autocomplete="off" required> + Asset's Description Required
@@ -381,148 +382,40 @@ - -
-
-
-
-
-
-
Image 1
-
+ +
+
+
+
+
+
{{doc.document_name}}
+
+
+
-
-
-
-
-
Image 2
-
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
+
+
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 1
-
-
-
- -
-
- + + +

No Files

+ + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts index 768642715..052047e3e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts @@ -86,7 +86,7 @@ export class BusinessAssetsInfoComponent implements OnInit { this.generalExistBusinessYear = this.pd_all_details.business_years; this.generalExistBusinessMonth = this.pd_all_details.business_month; } - + documentsAndFilesList: any = []; /** init Function */ ngOnInit() { console.clear(); @@ -122,7 +122,25 @@ export class BusinessAssetsInfoComponent implements OnInit { this.getM_Address_Type(); this.getM_Vehicle_Type(); this.getM_Address_Type(); - + this.pdTrigerService.retriveFile(this.pdid,'22',this.company_id).subscribe(data => { + if (data.status == 200) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + }); } @@ -446,7 +464,7 @@ export class BusinessAssetsInfoComponent implements OnInit { otherBusinessAssetsDescription() { return this._formBuilder.group({ - any_other_assets: [''], + any_other_assets: ['',Validators.compose([Validators.required])], }); } @@ -467,7 +485,7 @@ export class BusinessAssetsInfoComponent implements OnInit { otherBusinessAssetsDescriptionWithData(data) { return this._formBuilder.group({ - any_other_assets: [data.any_other_assets], + any_other_assets: [data.any_other_assets,Validators.compose([Validators.required])], }); } @@ -1010,7 +1028,9 @@ export class BusinessAssetsInfoComponent implements OnInit { selectedAddressType(e: any) { this.placeholderName = 'Was any business activity seen at the ' + e + ' during PD visit?'; } - + pdf(fileURL){ + window.open(fileURL); +} /** For Docs Tab */ public viewerOptions: any = { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html index 7d98bcf20..8f0ac0104 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html @@ -148,49 +148,13 @@ - -
-
+ +
-
-
+
+
-
Image 1
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 1
+
{{doc.document_name}}
@@ -198,99 +162,27 @@ - - + + +

No Files

+ + + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts index f0d9288f7..4855810af 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts @@ -78,7 +78,9 @@ export class BusinessBankingDetailsComponent implements OnInit { this.generalExistBusinessYear = this.pd_all_details.business_years; this.generalExistBusinessMonth = this.pd_all_details.business_month; } - + pdf(fileURL){ + window.open(fileURL); + } public viewerOptions: any = { navbar: false, toolbar: { @@ -98,7 +100,7 @@ export class BusinessBankingDetailsComponent implements OnInit { flipVertical: 4, } }; - + documentsAndFilesList: any = []; ngOnInit() { this.step = 0; this.initBankingForm(); @@ -159,6 +161,25 @@ export class BusinessBankingDetailsComponent implements OnInit { control.push(this.createBankarray()); } }); + this._pd.retriveFile(this.pdid,'21',this.company_id).subscribe(data => { + if (data.status == 200) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + }); } // ====================== 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 57bf1b88f..f7b117b09 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 @@ -1651,148 +1651,40 @@ - -
-
+ +
-
-
+
+
-
Image 1
+
{{doc.document_name}}
-
-
-
-
Image 2
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 1
-
-
-
-
-
+
+ - + + +

No Files

+ + + + 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 ec9bcade3..885c1a0a6 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 @@ -115,6 +115,10 @@ export class BusinessInfoComponent implements OnInit { this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } + documentsAndFilesList: any = []; + pdf(fileURL){ + window.open(fileURL); + } public viewerOptions: any = { navbar: false, toolbar: { @@ -618,7 +622,27 @@ export class BusinessInfoComponent implements OnInit { val.toUpperCase() == 'YES' ? this.businessForm.addControl('peak_period_of_business', new FormControl('', Validators.required)) : this.businessForm.removeControl('peak_period_of_business'); val.toUpperCase() == 'YES' ? this.businessForm.addControl('month_of_business_run', new FormControl('', Validators.required)) : this.businessForm.removeControl('month_of_business_run'); }); - + + + this._pd.retriveFile(this.pdid,this.form_id,this.company_id).subscribe(data => { + if (data.status == 200) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + }); } public initBusinessForm(): void { 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 bc684f16c..e38ed1700 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 @@ -13,6 +13,9 @@
+ + +
Manufacturing Product Details
@@ -421,6 +424,48 @@
Retail Trading Product Details
Retail Trading Details Not applicable here !!
--> + + + + + +
+
+
+
+
+
{{doc.document_name}}
+
+
+
+
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
+
+
+
+
+ + +

No Files

+ + + + + + + +
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 9a8296e9d..286ffa73c 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 @@ -94,6 +94,9 @@ export class ClientInfoComponent implements OnInit { this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } + pdf(fileURL){ + window.open(fileURL); +} public viewerOptions: any = { navbar: false, toolbar: { @@ -116,6 +119,7 @@ export class ClientInfoComponent implements OnInit { noRecordsFound: Boolean = false; errorMessage: any = ''; + documentsAndFilesList: any = []; ngOnInit() { this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid, this.company_id).subscribe(data => { if (data.dataStatus) { @@ -180,7 +184,27 @@ export class ClientInfoComponent implements OnInit { // this.getPdSupplierFormDetails(); this.getMasterDetails('COMPANYRELATIONSHIPS', 1); this.getMasterDetails('TITLES', 2); - } + + this.pdTrigerService.retriveFile(this.pdid,this.form_id,this.company_id).subscribe(data => { + if (data.status == 200) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + }); +} // retaildTradingForm: Boolean = false; initFormLoadDetails(record) { 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 825a3c6d2..5da02f8f5 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 @@ -194,49 +194,13 @@ - -
-
+ +
-
-
+
+
-
Image 1
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 1
+
{{doc.document_name}}
@@ -244,99 +208,27 @@ - - + + +

No Files

+ + + + + 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 c08b81f43..3cc45955b 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 @@ -59,6 +59,9 @@ export class CurrentLoanComponent implements OnInit { this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } + pdf(fileURL){ + window.open(fileURL); + } public viewerOptions: any = { navbar: false, toolbar: { @@ -78,6 +81,7 @@ export class CurrentLoanComponent implements OnInit { flipVertical: 4, } }; + documentsAndFilesList: any = []; ngOnInit() { this.getMasterDetails('BTLENDERLIST', 1); this.getMasterDetails('FREQUENCY', 2); @@ -371,6 +375,26 @@ export class CurrentLoanComponent implements OnInit { }); } }) + + this._pd.retriveFile(this.pdid,this.form_id,null).subscribe(data => { + if (data.status == 200) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + }); } checkTenure(details) { let originalTenure = details.value.original_tenure; 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 aa6e1b63d..827d20355 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 @@ -277,49 +277,13 @@ - -
-
+ +
-
-
+
+
-
Image 1
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 1
+
{{doc.document_name}}
@@ -327,99 +291,27 @@ - - + + +

No Files

+ + + + + 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 f1091d8b2..d97d598ca 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 @@ -74,6 +74,9 @@ export class EmploymentInfoComponent implements OnInit { this.generalExistBusinessMonth=12; + } + pdf(fileURL){ + window.open(fileURL); } public viewerOptions: any = { navbar: false, @@ -94,6 +97,7 @@ export class EmploymentInfoComponent implements OnInit { flipVertical: 4, } }; + documentsAndFilesList: any = []; ngOnInit() { this.pd_cus_segment = this.pd_all_details.pdmaster_details.customer_segment_abbr.toUpperCase(); this.initemploymentForm(); @@ -179,7 +183,26 @@ export class EmploymentInfoComponent implements OnInit { this.company_relationship_list.push({ 'company_relationship_id': 0, 'name': 'Not Applicable' }); } }); - } + this._pd.retriveFile(this.pdid,this.form_id,null).subscribe(data => { + if (data.status == 200) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + }); + } public initemploymentForm(): void { this.employmentForm = this.fb.group({ 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 d5439ea7d..17eca5ceb 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 @@ -261,49 +261,13 @@ - -
-
+ +
-
-
+
+
-
Image 1
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 1
+
{{doc.document_name}}
@@ -311,99 +275,27 @@ - - + + +

No Files

+ + + + + 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 45ff323c0..69599be94 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 @@ -54,7 +54,7 @@ export class FamilyDetailsComponent implements OnInit { pincodeData: any = []; earningStatus = [{ id: 1, type: 'Earning' }, { id: 2, type: 'Non Earning' }] - + documentsAndFilesList : any = []; /** constructor Of the class */ constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, @@ -157,8 +157,30 @@ export class FamilyDetailsComponent implements OnInit { this.initFamilyForm(null); } }); - } + this._pd.retriveFile(this.pdid,'6',null).subscribe(data => { + if (data.status == 200) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + }); + } + pdf(fileURL){ + window.open(fileURL); + } initgenerateFamilyMembersDetailsGet(val): FormGroup { return this.fb.group({ family_member_name: [val.family_member_name, Validators.compose([])], 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 c8721abcc..fe12eb421 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 @@ -512,149 +512,40 @@ -
-
-
-
-
-
-
Image 1
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 1
-
+
+
+
+
+
+
{{doc.document_name}}
-
-
- + + + +

No Files

+ + + - - +
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 c8e4d9057..d3b49460d 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 @@ -76,7 +76,8 @@ export class FinancialInfoComponent implements OnInit { {id:5, name:'Forfaiting'}, {id:1, name:'Others'}] // values = [0, 1, 2, 3]; - + documentsAndFilesList: any = []; + constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, @@ -200,8 +201,29 @@ export class FinancialInfoComponent implements OnInit { //estimated_val.push(this.createValue('')); } }) + this._pd.retriveFile(this.pdid,this.form_id,this.company_id).subscribe(data => { + if (data.status == 200) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + }); + } + pdf(fileURL){ + window.open(fileURL); } - /** financial Form Controls */ public initstockForm(): void { this.financialForm = this.fb.group({ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html index 779006273..e4dcbbf9a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html @@ -14,6 +14,9 @@
+ + + @@ -179,7 +182,6 @@
-
--> - + + + + + +
+
+
+
+
+
{{doc.document_name}}
+
+
+
+
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
+
+
+
+
+ + +

No Files

+ + + + + + +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts index b662b2995..fff02c6d4 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts @@ -77,7 +77,7 @@ export class GeneralInfoComponent implements OnInit { this.disableAfterSubmit = false; } /********************** Constructor Section Ends Here ****************/ - + documentsAndFilesList: any = []; /** ng Oninit Section */ ngOnInit() { let get_max_date = this.pd_all_details.pdmaster_details.pd_date_of_initiation ? this.pd_all_details.pdmaster_details.pd_date_of_initiation.split('/').reverse().join("/") : ''; @@ -114,7 +114,28 @@ export class GeneralInfoComponent implements OnInit { this.CompanySource.data = ComapnyControl.controls; }); - } + this._pd.retriveFile(this.pdid,'18',null).subscribe(data => { + console.log(data); + if (data.status == 200) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + console.log('this.documentsAndFilesList',this.documentsAndFilesList); + }); +} /***************************** ng Oninit Section Ends Here **********************************/ /** init form */ @@ -307,14 +328,14 @@ export class GeneralInfoComponent implements OnInit { // create companies if (element.company_name != '' && element.company_name != null) { - let setCompanyValues: any = { company_order_id: companyControl.controls.length + 1, company_name: element.company_name, is_company_applicant: element.is_company_applicant, business_entity_type: element.business_entity_type, business_entity_type_other: element.business_entity_type_other, business_years: element.business_years, business_month: element.business_month, business_date_object: element.business_date_object, is_new: element.is_new, is_active: true } + let setCompanyValues: any = { company_order_id: companyControl.controls.length + 1, company_name: element.company_name, is_company_applicant: element.is_company_applicant, business_entity_type: element.business_entity_type, business_entity_type_other: element.business_entity_type_other, business_years: element.business_years, business_month: element.business_month, business_date_object: element.business_date_object, is_new: element.is_new, is_active: true, associate_pd_id:this.pdid } companyControl.push(this.createCompanies(setCompanyValues)) } }); companyWithRelationshipsControl.push(this.createCompaniesRelationship()); // check company if null update one row if (companyControl.controls.length == 0) { - let setCompanyValues: any = { company_order_id: companyControl.controls.length + 1, company_name: '', is_company_applicant: false, business_entity_type: '', business_entity_type_other: '', business_years: '', business_month: '', business_date_object: '', is_active: true, is_new: false } + let setCompanyValues: any = { company_order_id: companyControl.controls.length + 1, company_name: '', is_company_applicant: false, business_entity_type: '', business_entity_type_other: '', business_years: '', business_month: '', business_date_object: '', is_active: true, is_new: false, associate_pd_id:this.pdid} companyControl.push(this.createCompanies(setCompanyValues)) } @@ -367,7 +388,7 @@ export class GeneralInfoComponent implements OnInit { business_date_object: [elementValue.business_date_object], is_active: [elementValue.is_active], is_new: [elementValue.is_new], - + associate_pd_id:[this.pdid] }); } @@ -811,5 +832,27 @@ export class GeneralInfoComponent implements OnInit { }); } /******************* validate all form group and form array fields ENd Here ********/ - + pdf(fileURL){ + window.open(fileURL); +} +/** For DOCS Tab */ +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, + } +}; } \ No newline at end of file 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 97fbe3fa9..5f4977e9c 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 @@ -63,49 +63,13 @@ - -
-
+ +
-
-
+
+
-
Image 1
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 1
+
{{doc.document_name}}
@@ -113,99 +77,27 @@ - - + + +

No Files

+ + + + + 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 830e70cdd..c4e153422 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 @@ -59,6 +59,9 @@ export class LenderRepresentativeComponent implements OnInit { // setAutohide = true; // autoHide = 1000000; // addExtraClass = false; + pdf(fileURL){ + window.open(fileURL); + } public viewerOptions: any = { navbar: false, toolbar: { @@ -85,6 +88,7 @@ export class LenderRepresentativeComponent implements OnInit { // config.panelClass = this.addExtraClass ? ['party'] : null; // this.snackBar.open(this.message, this.action && this.actionButtonLabel, config); // } + documentsAndFilesList: any = []; ngOnInit() { // this.message.main_applicant = this.main_applicant; // this.message.lender_applicant_id = this.lender_applicant_id; @@ -116,6 +120,25 @@ export class LenderRepresentativeComponent implements OnInit { // control.push(this.createLRDetail()); // } }) + this._pd.retriveFile(this.pdid,this.form_id,'null').subscribe(data => { + if (data.status == 200) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + }); } public initRepresentative(): void { this.representativeForm = this.fb.group({ 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 df9040d81..b659840bb 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 @@ -231,49 +231,13 @@ - -
-
+ +
-
-
+
+
-
Image 1
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 1
+
{{doc.document_name}}
@@ -281,100 +245,27 @@ - - - + + +

No Files

+ + + + + 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 69ef3c7ab..3f48ff128 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 @@ -108,7 +108,7 @@ export class LoanDetailsComponent implements OnInit { this.isContribution = true; } } - + documentsAndFilesList: any = []; /** init Fns */ ngOnInit() { this.initloanDetailsForm(); @@ -310,6 +310,25 @@ export class LoanDetailsComponent implements OnInit { this.loanDetailsForm.controls['owner_name'].updateValueAndValidity(); } + this._pd.retriveFile(this.pdid,this.form_id,'null').subscribe(data => { + if (data.status == 200) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + }); } getM_EndUseofLoad() { @@ -865,7 +884,9 @@ export class LoanDetailsComponent implements OnInit { }) } - + pdf(fileURL){ + window.open(fileURL); + } /** For DOCS tab */ public viewerOptions: any = { navbar: false, diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html index d16a60612..fd6b31111 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html @@ -220,6 +220,42 @@ + + +
+
+
+
+
+
{{doc.document_name}}
+
+
+
+
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
+
+
+
+
+ + +

No Files

+ + + + + + picture_as_pdf + {{doc.document_title}} +
-
- - picture_as_pdf - version_111 - -
-
- - picture_as_pdf - version_111 - -
-
- - picture_as_pdf - version_111 - -
-
- - picture_as_pdf - version_111 - -
-
- - picture_as_pdf - version_111 - -
-
-
-
- - + + +

No Files

+ + + + + 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 701f634e4..24246a164 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 @@ -79,7 +79,9 @@ export class OtherIncomeComponent implements OnInit { this.applicants = this.applicants.filter(val => val.applicant_type == 0 || val.applicant_type == 1); this.applicants.push({ 'pd_co_applicant_id': '0', 'applicant_name': 'Others' }); } - + pdf(fileURL){ + window.open(fileURL); + } public viewerOptions: any = { navbar: false, toolbar: { @@ -99,6 +101,7 @@ export class OtherIncomeComponent implements OnInit { flipVertical: 4, } }; + documentsAndFilesList: any = []; ngOnInit() { this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data => { if (data.dataStatus) { @@ -167,6 +170,25 @@ export class OtherIncomeComponent implements OnInit { //control.push(this.createDetail()); } }) + this._pd.retriveFile(this.pdid,this.form_id,'null').subscribe(data => { + if (data.status == 200) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + }); } public initOtherincomeForm(): void { this.otherIncomeForm = this.fb.group({ 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 dc2619111..457bdd21b 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 @@ -385,55 +385,13 @@ - -
-
+ +
-
-
+
+
-
Image 1
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 2
-
-
-
-
-
-
-
Image 3
-
-
-
-
-
-
-
Image 1
+
{{doc.document_name}}
@@ -441,99 +399,27 @@ - - + + +

No Files

+ + + + + 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 4a332126a..71cee6742 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 @@ -73,7 +73,9 @@ export class StockComponent implements OnInit { this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } - + pdf(fileURL){ + window.open(fileURL); +} /** CSS For Docs Testing */ public viewerOptions: any = { navbar: false, @@ -94,7 +96,7 @@ export class StockComponent implements OnInit { flipVertical: 4, } }; - + documentsAndFilesList: any = []; ngOnInit() { this._pd.getProductsFromBusinessAndSupplier(this.pdid, this.company_id).subscribe(data => { @@ -122,7 +124,26 @@ export class StockComponent implements OnInit { this.getUOM(); - } + this._pd.retriveFile(this.pdid,this.form_id,this.company_id).subscribe(data => { + if (data.status == 200) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + }); +} public initstockForms(record) { 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 5b3e0661e..c9a3a3f83 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 @@ -13,6 +13,9 @@
+ + +
Manufacturing Product Details
@@ -285,6 +288,48 @@
Service Provider Product Details
Service Provider Details Not applicable here !!
+ + + + + +
+
+
+
+
+
{{doc.document_name}}
+
+
+
+
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
+
+
+
+
+ + +

No Files

+ + + + + + + +
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 ad1893441..77062f311 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 @@ -58,6 +58,9 @@ export class SupplierInfoComponent implements OnInit { this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } + pdf(fileURL){ + window.open(fileURL); +} public viewerOptions: any = { navbar: false, toolbar: { @@ -80,6 +83,7 @@ export class SupplierInfoComponent implements OnInit { noRecordsFound: Boolean = false; errorMessage: any = ''; + documentsAndFilesList: any = []; ngOnInit() { this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid, this.company_id).subscribe(data => { @@ -142,7 +146,26 @@ export class SupplierInfoComponent implements OnInit { // this.getPdSupplierFormDetails(); this.getMasterDetails('COMPANYRELATIONSHIPS', 1); this.getMasterDetails('TITLES', 2); - } + this.pdTrigerService.retriveFile(this.pdid,this.form_id,this.company_id).subscribe(data => { + if (data.status == 200) { + if(data.records.length>0){ + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type' : splitted[1] == 'pdf'?'pdf':'image' + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else{ + this.documentsAndFilesList = []; + } + }); +} serviceProviderForm: Boolean = false; 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 43027f8ee..942f8b2e4 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 @@ -63,6 +63,30 @@ export class PdTrigerService { catchError(this.handleError('role', [])) ) } + + /* To get Files., */ + retriveFile(PDID,FormID,CompanyID): Observable { + return this._http.post(this.apiUrl + 'getPDImages', { "records":{ "pd_id":PDID,"form_id":FormID,"company_id":CompanyID}}) + .pipe( + catchError(this.handleError('role', [])) + ) + } + + // downloadPDF(url): any { + // return this._http.get(url, { responseType: ResponseContentType.Blob }).map( + // (res) => { + // return new Blob([res.blob()], { type: 'application/pdf' }) + // } + // } + + downloadPDF(url): any { + + return this._http.get>(url).map( + (res) => { + return new Blob([], { type: 'application/pdf' }); + }); + } + /* To get addresses From T_PD_ADDRESS table., * Used In 1) edit pd trigger component * 2) Address Form