-
- {{pdReportRecords?.billing_name}}
-
-
- {{pdReportRecords?.product_name}}
-
-
- {{pdReportRecords?.customer_segment_name}}
-
-
- {{pdReportRecords?.pd_type_name}}
-
-
- {{pdReportRecords?.pd_status}}
-
-
-
- {{applicants.applicant_name}} ,
-
-
-
-
-
-
{{data.name}}
-
-
{{dataQA.question}}
-
{{dataQA.answer}}
+
+
+
+
+ {{pdReportRecords?.billing_name}}
+
+
+ {{pdReportRecords?.product_name}}
+
+
+ {{pdReportRecords?.customer_segment_name}}
+
+
+ {{pdReportRecords?.pd_type_name}}
+
+
+ {{pdReportRecords?.pd_status}}
+
+
+
+ {{applicants.applicant_name}} ,
+
+
+
+
+
+
{{data.name}}
+
+
{{dataQA.question}}
+
{{dataQA.answer}}
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
-
-
+
\ No newline at end of file
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.ts
index 2793bbc28..b47b81f24 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.ts
@@ -1,3 +1,4 @@
+import { DomSanitizer, SafeResourceUrl, SafeUrl } from '@angular/platform-browser';
import {Component, ViewChild, OnInit, ViewEncapsulation, OnDestroy} from '@angular/core';
import {FormBuilder, FormGroup, Validators, FormControl, FormArray, AbstractControl} from '@angular/forms';
import {ActivatedRoute, Router} from '@angular/router';
@@ -5,6 +6,8 @@ import {NotifierService} from 'angular-notifier';
import {ListPdComponent} from './../list-pd.component';
import {PdTrigerService} from '../../../pd-service/pd-triger.service';
+import { MatDialog } from "@angular/material";
+import { ModelEditPdReportComponent} from './model-edit-pd-report/model-edit-pd-report.component';
@Component({
selector: 'app-pd-report',
@@ -12,27 +15,34 @@ import {PdTrigerService} from '../../../pd-service/pd-triger.service';
styleUrls: ['./pd-report.component.scss']
})
export class PdReportComponent implements OnInit {
+ Url : SafeUrl;
startPD: any;
+ public src = 'https://vadimdez.github.io/ng2-pdf-viewer/assets/pdf-test.pdf';
+ // public src = 'https://lender7.s3.ap-south-1.amazonaws.com/pd1/pd_report_original_version.pdf?X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAJ3QDSPT3LDSWRYUQ%2F20181207%2Fap-south-1%2Fs3%2Faws4_request&X-Amz-Date=20181207T122031Z&X-Amz-SignedHeaders=host&X-Amz-Expires=3600&X-Amz-Signature=fac718f35d195ecb45d1dc7049fbaf0fa3158f237deeedac3bae60f8ec22e822';
+ // public src;
pdReportRecords:any;
private notifier: NotifierService;
constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
- private router: Router, public pdTrigerService: PdTrigerService, private listPDComponent: ListPdComponent) {
+ private router: Router, public pdTrigerService: PdTrigerService, private listPDComponent: ListPdComponent,
+ private dialog: MatDialog, private sanitizer: DomSanitizer) {
this.startPD = this.route.snapshot.params['pdid'];
this.notifier = notifier;
+ // this.Url = this.sanitizer.bypassSecurityTrustResourceUrl("https://lender7.s3.ap-south-1.amazonaws.com/pd1/pd_report_original_version.pdf?X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAJ3QDSPT3LDSWRYUQ%2F20181207%2Fap-south-1%2Fs3%2Faws4_request&X-Amz-Date=20181207T122031Z&X-Amz-SignedHeaders=host&X-Amz-Expires=3600&X-Amz-Signature=fac718f35d195ecb45d1dc7049fbaf0fa3158f237deeedac3bae60f8ec22e822");
+
}
ngOnInit() {
this.listPDComponent.showListView(false);
this.getPdReportDetails();
+ this.getPdReportFinalTemplateDetails();
}
getPdReportDetails() {
this.pdTrigerService.getPdFinalReportDetails(this.startPD).subscribe(data => {
if (data.status == 200) {
// this.pdReportRecords = data.records.question_answers;
-
this.pdReportRecords = data.records;
// this.pdReportRecords = data.records.qu;
}
@@ -41,12 +51,39 @@ export class PdReportComponent implements OnInit {
})
}
+ getPdReportFinalTemplateDetails(){
+ this.pdTrigerService.getPDReportFinalDocument(this.startPD).subscribe(data => {
+ if (data.status == 200) {
+ // this.pdReportRecords = data.records.question_answers;
+ // this.src = data.records.pd_report_uri;
+ // alert(this.src);
+ // this.pdReportRecords = data.records.qu;
+ }
+ }, err=> {
+
+ })
+ }
+
// load pd view component
loadPdViewCompoent() {
this.router.navigate(['../../viewpd', this.startPD], {relativeTo: this.route});
}
+ // add questions popup model call
+ addNewQuestion() {
+ const dialogRef = this.dialog.open(ModelEditPdReportComponent, {
+ data: { startId : this.startPD},
+ disableClose: true
+ });
+ dialogRef.afterClosed()
+ .subscribe(dataresult => {
+ // this.getQuestionsMasters();
+ // this.getBranch();
+ // this.isPopupOpened = false;
+ });
+ }
+
}
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 4c3ee77ce..38cf332d9 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
@@ -1,6 +1,10 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
+
+import { CKEditorModule } from 'ng2-ckeditor';
+import { PdfViewerModule } from 'ng2-pdf-viewer';
+
import {
MatCardModule,
MatIconModule,
@@ -72,6 +76,7 @@ import {RentalInfoComponent} from "./list-pd/start-pd/forms/rental-info/rental-i
import { AllocationViewMoreComponent } from './list-pd/allocation-view-more/allocation-view-more.component';
import { PdRequirementComponent } from './list-pd/pd-requirement/pd-requirement.component';
import { GeneralInfoComponent } from './list-pd/start-pd/forms/general-info/general-info.component';
+import { ModelEditPdReportComponent } from './list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component';
/**
@@ -250,7 +255,7 @@ const pdCustomNotifierOptions: NotifierOptions = {
// AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}), OwlDateTimeModule,
// OwlNativeDateTimeModule,
// ],
- declarations: [RentalInfoComponent, TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent, AssessedIncomeComponent, AllocationViewMoreComponent, PdRequirementComponent, GeneralInfoComponent],
+ declarations: [RentalInfoComponent, TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent, AssessedIncomeComponent, AllocationViewMoreComponent, PdRequirementComponent, GeneralInfoComponent, ModelEditPdReportComponent],
// exports: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent],
// providers: [PdTrigerService, GetGeometricLocationService],
@@ -259,6 +264,8 @@ const pdCustomNotifierOptions: NotifierOptions = {
CommonModule,
ManagePdRoutingModule,
NotifierModule.withConfig(pdCustomNotifierOptions),
+ CKEditorModule,
+ PdfViewerModule,
MatCardModule,
MatIconModule,
MatInputModule,
@@ -286,7 +293,7 @@ const pdCustomNotifierOptions: NotifierOptions = {
providers: [PdTrigerService, GetGeometricLocationService],
entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent, AllocationViewMoreComponent, PersonalInfoComponent,
- ClientInfoComponent, SupplierInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent, GeneralInfoComponent, PdRequirementComponent],
+ ClientInfoComponent, SupplierInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent, GeneralInfoComponent, PdRequirementComponent, ModelEditPdReportComponent],
})
export class ManagePdModule {
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 93f3a277e..de7093371 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
@@ -289,6 +289,20 @@ getPDFormDetailsWithID(pdID, formID ):Observable
{
)
}
+ getPDReportFinalDocument(pdId: number){
+ return this._http.post(this.apiUrl+"generatePDReport ",{"records":{"pd_id":pdId}})
+ .pipe(
+ catchError(this.handleError('operation', []))
+ )
+ }
+
+ getActualPDReportModelTemplate(pdId: number) {
+ return this._http.post(this.apiUrl+"getLatestPDReportBlob ",{"records":{"pd_id":pdId}})
+ .pipe(
+ catchError(this.handleError('operation', []))
+ )
+ }
+
// inWords(num) {
// let a : any = ['','one ','two ','three ','four ', 'five ','six ','seven ','eight ','nine ','ten ','eleven ','twelve ','thirteen ','fourteen ','fifteen ','sixteen ','seventeen ','eighteen ','nineteen '];
diff --git a/ng6-seed/src/app/personal-discussion/personal-discussion.module.ts b/ng6-seed/src/app/personal-discussion/personal-discussion.module.ts
index c0ecf82ed..41ecee292 100755
--- a/ng6-seed/src/app/personal-discussion/personal-discussion.module.ts
+++ b/ng6-seed/src/app/personal-discussion/personal-discussion.module.ts
@@ -1,6 +1,9 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router';
+
+import { CKEditorModule } from 'ng2-ckeditor';
+import { PdfViewerModule } from 'ng2-pdf-viewer';
import {
MatCardModule,
MatIconModule,
@@ -27,6 +30,8 @@ import { personalDiscussionRoutes } from './personal-discussion.routing';
imports: [
CommonModule,
RouterModule.forChild(personalDiscussionRoutes),
+ CKEditorModule,
+ PdfViewerModule,
ManagePdModule,
MatCardModule,
MatIconModule,