diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html index 37a0b0072..c148ee174 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html @@ -4,7 +4,7 @@ (click)="closeEditMasterComponent()">close -
+
@@ -128,7 +128,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts index 170d2cbc5..38a4ed5d8 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts @@ -22,20 +22,32 @@ export class EditPdMasterComponent implements OnInit { pdTypeList:any; billingList:any; applicantLength:number; - draftStatus: string; - PDTriggerStatus: string; - enablePDButton: boolean + // draftStatus: string; + // PDTriggerStatus: string; + enablePDButton: boolean; + currentPDStatus: string; public _EditPDtriggerForm:FormGroup; public notifier: NotifierService; + // create values for status check + pdStatusCheck :any={ + "DRAFT" :'DRAFT', + "TRIGGERED" :'TRIGGERED', + "ALLOCATED" :'ALLOCATED', + "SCHEDULED" :'SCHEDULED', + "INPROGRESS" :'INPROGRESS', + "COMPLETED" :'COMPLETED', + "QC_COMPLETED" :'QC_COMPLETED', + }; constructor(private _fb: FormBuilder, private _pd: PdTrigerService, notifier: NotifierService,private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier=notifier + this.currentPDStatus = data.records.pd_status; } ngOnInit() { - this.draftStatus="DRAFT"; - this.PDTriggerStatus="TRIGGERED"; + // this.draftStatus="DRAFT"; + // this.PDTriggerStatus="TRIGGERED"; this.getLenderList(); this.getProductsList(); this.getCustomerSegmentList(); @@ -161,10 +173,11 @@ export class EditPdMasterComponent implements OnInit { this.billingList=this.billingList[0].billing_address; } submitPdDetails(formValue: any, status:string) { + let updateStatus = this.currentPDStatus == this.pdStatusCheck.DRAFT ? status : this.currentPDStatus == this.pdStatusCheck.TRIGGERED ? status : this.currentPDStatus; if(this._EditPDtriggerForm.valid){ let my_array = this._EditPDtriggerForm.value; Object.keys(my_array).forEach((key) => ( my_array[key] == null) && delete my_array[key]); - this._pd.editPdMasterDetails(my_array, status).subscribe(result => { + this._pd.editPdMasterDetails(my_array, updateStatus).subscribe(result => { if (result.status == 200) { this.notifier.notify('success', 'PD Master Updated.'); this.dialogRef.close(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html index c31d8643e..5b846cb0d 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html @@ -18,16 +18,15 @@ All - + + Scheduled + + + In Progress - - Scheduled - - - Completed diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts index 6c52da05f..7e47c51b4 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts @@ -71,7 +71,7 @@ export class ListPdComponent implements OnInit, OnDestroy { } pdListLoad(status: boolean){ this.viewPdList = status; - this.getTabIndex==0 ? this.allTabC.loadPDDetails() : this.getTabIndex==1 ? this.inprogressTabC.loadPDDetails() : this.getTabIndex==2 ? this.scheduledTabC.loadPDDetails() : this.getTabIndex==3 ? this.completedTabC.loadPDDetails() : this.qcCompletedTabC.loadPDDetails(); + this.getTabIndex==0 ? this.allTabC.loadPDDetails() : this.getTabIndex==1 ? this.scheduledTabC.loadPDDetails() : this.getTabIndex==2 ? this.inprogressTabC.loadPDDetails() : this.getTabIndex==3 ? this.completedTabC.loadPDDetails() : this.qcCompletedTabC.loadPDDetails(); } viewPDDetails(pdid:string){ @@ -82,7 +82,7 @@ export class ListPdComponent implements OnInit, OnDestroy { //get tab changes onTabClick(event: MatTabChangeEvent) { this.getTabIndex=event.index; - this.getTabIndex==0 ? this.allTabC.loadPDDetails() : this.getTabIndex==1 ? this.inprogressTabC.loadPDDetails() : this.getTabIndex==2 ? this.scheduledTabC.loadPDDetails() : this.getTabIndex==3 ? this.completedTabC.loadPDDetails() : this.qcCompletedTabC.loadPDDetails(); + this.getTabIndex==0 ? this.allTabC.loadPDDetails() : this.getTabIndex==1 ? this.scheduledTabC.loadPDDetails() : this.getTabIndex==2 ? this.inprogressTabC.loadPDDetails() : this.getTabIndex==3 ? this.completedTabC.loadPDDetails() : this.qcCompletedTabC.loadPDDetails(); } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html index ce4355898..d6feedecd 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html @@ -31,7 +31,7 @@ {{details.applicat_details[0].applicant_name}}
{{details.lender_full_name}}({{details.lender_applicant_id}})
-
+
@@ -42,7 +42,9 @@  {{details.city_name}}/{{details.state_name}}-{{details.pincode}}
{{details.product_abbr}}/{{details.subproduct_abbr}}
{{details.customer_segment_abbr}} {{details.loan_amount}}
- {{details.pd_date_of_initiation}} + {{details.pd_date_of_initiation}}
+ {{details.pd_status}} - {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.ts index c9ecbbf6b..42fd05aae 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.ts @@ -35,6 +35,18 @@ public dataSource = new MatTableDataSource(); @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; pdList:any[] = []; + + // create values for status check + pdStatusCheck :any={ + "DRAFT" :'DRAFT', + "TRIGGERED" :'TRIGGERED', + "ALLOCATED" :'ALLOCATED', + "SCHEDULED" :'SCHEDULED', + "INPROGRESS" :'INPROGRESS', + "COMPLETED" :'COMPLETED', + "QC_COMPLETED" :'QC_COMPLETED', + }; + constructor(notifier:NotifierService,private route: ActivatedRoute, private router: Router,private _pd: PdTrigerService,private dialog: MatDialog,private _geolocation: GetGeometricLocationService, private ListPdComponent : ListPdComponent) { this.notifier=notifier @@ -55,9 +67,10 @@ pdList:any[] = []; .subscribe( data => { if (data.status == 200) { - this.pdList = data.records; - this.pdListData = data.records; - this.dataLength = data.records.length; + let filterdList = data.records.filter(item=>item.pd_status!=this.pdStatusCheck.DRAFT) + this.pdList = filterdList; + this.pdListData = filterdList; + this.dataLength = filterdList.length; this.dataSource.data = this.pdListData; this.getMapViewLocations(this.pdList); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html index 468be7c96..18e6a2295 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html @@ -1,8 +1,10 @@ - + - + + + @@ -123,10 +125,10 @@
- arrow_backward + arrow_backward skip_previous skip_next - arrow_forward + arrow_forward
@@ -226,10 +228,10 @@
- arrow_backward - skip_previous + arrow_backward + skip_previous skip_next - arrow_forward + arrow_forward
@@ -322,10 +324,10 @@
- arrow_backward + arrow_backward skip_previous skip_next - arrow_forward + arrow_forward
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts index 081fbff11..2118ecebe 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts @@ -4,6 +4,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { NotifierService } from 'angular-notifier'; import { ListPdComponent } from './../list-pd.component'; import { PdTrigerService } from '../../../pd-service/pd-triger.service'; + @Component({ selector: 'app-start-pd', templateUrl: './start-pd.component.html', @@ -12,7 +13,6 @@ import { PdTrigerService } from '../../../pd-service/pd-triger.service'; export class StartPdComponent implements OnInit, OnDestroy { private notifier: NotifierService; public startPD:string; -public PDStatus: string; public mainApplicantName:string; //public remarks: string; errorMessage:any; @@ -29,6 +29,19 @@ selectedQuestionIndex:number; getQuestionsLength:number; answerList:any=[]; ansPDList:any=[]; +// create values for status check +pdStatusCheck :any={ + "DRAFT" :'DRAFT', + "TRIGGERED" :'TRIGGERED', + "ALLOCATED" :'ALLOCATED', + "SCHEDULED" :'SCHEDULED', + "INPROGRESS" :'INPROGRESS', + "COMPLETED" :'COMPLETED', + "QC_COMPLETED" :'QC_COMPLETED', +}; +currentPDStatus: string; +actualQuestions:number; +answeredQuestions :number; constructor(notifier: NotifierService, private fb: FormBuilder,private route: ActivatedRoute, private router: Router, private listPDComponent : ListPdComponent, private _pd: PdTrigerService,) { @@ -50,7 +63,6 @@ constructor(notifier: NotifierService, private fb: FormBuilder,private route: Ac this.loadTemplates(this.startPD); this.next=1; this.previous=2; - this.PDStatus="COMPLETED" } isMac(): boolean { let bool = false; @@ -68,11 +80,17 @@ loadTemplates(startID:string){ this.categoryList=data.records.question_answers; let filterApplicantName= data.records.pdapplicants_detials.filter(item => item.applicant_type == 1); this.mainApplicantName = filterApplicantName[0].applicant_name; + this.currentPDStatus = data.records.pdmaster_details.pd_status; + + this.actualQuestions = data.records.counts.overall_question_count; + this.answeredQuestions = data.records.counts.overall_answered_count; + } else{ this.pdMasterList=""; this.mainApplicantName=""; this.categoryList=[]; + this.currentPDStatus=""; } }, error => this.errorMessage = error); } @@ -110,6 +128,8 @@ loadTemplates(startID:string){ if (data.status == 200) { this.answerList=data.records.answers; this.ansPDList=data.records; + this.actualQuestions = data.records.counts.overall_question_count, + this.answeredQuestions = data.records.counts.overall_answered_count // this for options type questions if(this.selectedCategory.fk_question_answertype==1){ @@ -394,6 +414,7 @@ optionsMapItems(items) { } this._pd.editPdMasterDetails(update_array, status).subscribe(result => { if (result.status == 200) { + this.currentPDStatus=this.pdStatusCheck.COMPLETED; this.notifier.notify('success', 'PD Completed.'); } else { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index c5f55d7e7..ecc717ad6 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -7,11 +7,11 @@ {{master.pd_date_of_initiation}}
- - - + + + -
{{master.pd_allocated_to}} -{{master.pd_status_name}} +
{{master.pd_allocated_to}}
@@ -21,7 +21,7 @@
-
+
@@ -39,7 +39,7 @@

{{master.product_name}} / {{master.subproduct_name}}

{{master.pd_type_name}} /  {{master.loan_amount}}

{{master.addressline1}},{{master.addressline2}} ,{{master.addressline3}}

- +

{{master.pd_status}} - {{ (master.updatedon)? (master.updatedon | slice:0:10):(master.updatedon) }}

@@ -48,7 +48,7 @@
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index 0a0e2bf6a..34a139eee 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -29,6 +29,19 @@ export class ViewPdComponent implements OnInit, OnDestroy { viewID:string; viewParams:any; destroyType:number=1; + currentPDStatus:string; + + // create values for status check + pdStatusCheck :any={ + "DRAFT" :'DRAFT', + "TRIGGERED" :'TRIGGERED', + "ALLOCATED" :'ALLOCATED', + "SCHEDULED" :'SCHEDULED', + "INPROGRESS" :'INPROGRESS', + "COMPLETED" :'COMPLETED', + "QC_COMPLETED" :'QC_COMPLETED', + }; + // @Input() childData: string; // @Output() loadParent = new EventEmitter(); public _EditPDtriggerForm:FormGroup; @@ -54,6 +67,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { this.pdDocumentsData=data.records.pd_documnets; this.masterPdLogsData=data.records.pd_logs.master; //this.applicantPDLogsData= data.records.pd_logs.master; + this.currentPDStatus = data.records.pd_master_details[0].pd_status; } }, error => this.errorMessage = error); } 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 4385c0fb8..1ecb91ae6 100644 --- 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 @@ -83,6 +83,7 @@ const pdCustomNotifierOptions: NotifierOptions = { overlap: 150 } }; + @NgModule({ imports: [ CommonModule, diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html index afa3db741..b3c34a3a0 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html @@ -1,365 +1,372 @@ - - - - - - -
{{category.category_name}}
- - - - - - - {{ (questions.question.length>15)? (questions.question | slice:0:15)+'..':(questions.question) }} - - - - - - - - - - Category - -
-
- - -
- -
-

{{mainApplicantName}}

- {{pdMasterList.customer_segment_name}} -
-
-

{{pdMasterList.product_name}}/{{pdMasterList.subproduct_name}}

- {{pdMasterList.lender_full_name}}/{{pdMasterList.lender_applicant_id}} - -
- -
- -
- - -

No Records Found..

- - - - - - - - -
- -
{{optionsForm.controls.pd_question.value}}
-
-
+ + + + + - - - - - - {{option.pd_answer}} - - + + + +
{{category.category_name}}
+ + + + + + + {{ (questions.question.length>15)? (questions.question | slice:0:15)+'..':(questions.question) }} + + + + + + + + + + Category + +
+
+ - - - - -
-
- - - -
-
-
-
- -
-
-
-
- {{docs.pd_document_title}} - -
- -
-
-
-
-
+
+ +
+

{{mainApplicantName}}

+ {{pdMasterList.customer_segment_name}} +
+
+

{{pdMasterList.product_name}}/{{pdMasterList.subproduct_name}}

+ {{pdMasterList.lender_full_name}}/{{pdMasterList.lender_applicant_id}} + +
+ +
+ +
+ + +

No Records Found..

+ + + + + + + + + + +
{{optionsForm.controls.pd_question.value}}
+
+
+ + + + + + + {{option.pd_answer}} + + -
- - - -
- -
- - - -
-
- - Remarks - - - -
- -
- - arrow_backward - skip_previous - skip_next - arrow_forward - - -
- -
- - - - - - -
{{selectedCategory.question}}
- - - -
- -
- - skip_previous - skip_next - - -
-
- - - - - - - - - - -
- -
{{textBoxForm.controls.pd_question.value}}
-
-
- - - - - - Answers - - - - - - -
-
- - - -
+ + + + +
+
+ + + +
+
+
+
+ +
+
+
+
+ {{docs.pd_document_title}} + +
+ +
+
+
+
+
+ +
+ + + +
+ +
-
-
-
- -
-
-
-
- {{docs.pd_document_title}} - -
- -
-
-
-
-
- -
- - - -
- -
- - - -
-
- - Remarks - - - -
- -
- - arrow_backward - skip_previous - skip_next - arrow_forward - - -
- -
- - - - - -
{{selectedCategory.question}}
- - - -
- -
- - skip_previous - skip_next - - -
-
- - - - - - - - -
- -
{{checkBoxForm.controls.pd_question.value}}
-
-
- - - - - {{ control.controls.pd_answer.value }} - - - - -
-
+ + +
+
+ + Remarks + - - -
-
-
-
- -
-
-
-
- {{docs.pd_document_title}} - -
- -
-
-
-
+
- -
- - - -
- -
+ +
+ + arrow_backward + skip_previous + skip_next + arrow_forward + - - -
-
- - Remarks - - - -
- -
- - arrow_backward - skip_previous - skip_next - arrow_forward - - -
- -
- - - - - -
{{selectedCategory.question}}
- - - -
- -
- - skip_previous - skip_next - - -
-
+
+ +
+ + + + + + +
{{selectedCategory.question}}
+ + + +
+ +
+ + skip_previous + skip_next + - - - - - - - -
-
- - - - - +
+
+ + + + + + + + + + +
+ +
{{textBoxForm.controls.pd_question.value}}
+
+
+ + + + + + Answers + + + + + + +
+
+ + + +
+ +
+
+
+ +
+
+
+
+ {{docs.pd_document_title}} + +
+ +
+
+
+
+
+ +
+ + + +
+ +
+ + + +
+
+ + Remarks + + + +
+ +
+ + arrow_backward + skip_previous + skip_next + arrow_forward + + +
+ +
+ + +
+ + +
{{selectedCategory.question}}
+ + + +
+ +
+ + skip_previous + skip_next + + +
+
+ + + + + + + + +
+ +
{{checkBoxForm.controls.pd_question.value}}
+
+
+ + + + + {{ control.controls.pd_answer.value }} + + + + +
+
+ + + +
+
+
+
+ +
+
+
+
+ {{docs.pd_document_title}} + +
+ +
+
+
+
+
+ +
+ + + +
+ +
+ + + +
+
+ + Remarks + + + +
+ +
+ + arrow_backward + skip_previous + skip_next + arrow_forward + + +
+ +
+ + +
+ + +
{{selectedCategory.question}}
+ + + +
+ +
+ + skip_previous + skip_next + + +
+
+ + + + + + + + + +
+ + + + + + + + + \ No newline at end of file diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts index 5f5537db9..c0617707e 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts +++ b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts @@ -13,7 +13,6 @@ import { QcService } from './../../qc-service/qc.service'; export class QcStartComponent implements OnInit, OnDestroy { private notifier: NotifierService; public startPD:string; -public PDStatus: string; public mainApplicantName:string; //public remarks: string; errorMessage:any; @@ -30,6 +29,20 @@ selectedQuestionIndex:number; getQuestionsLength:number; answerList:any=[]; ansPDList:any=[]; +// create values for status check +pdStatusCheck :any={ + "DRAFT" :'DRAFT', + "TRIGGERED" :'TRIGGERED', + "ALLOCATED" :'ALLOCATED', + "SCHEDULED" :'SCHEDULED', + "INPROGRESS" :'INPROGRESS', + "COMPLETED" :'COMPLETED', + "QC_COMPLETED" :'QC_COMPLETED', +}; +currentPDStatus: string; +actualQuestions:number; +answeredQuestions :number; + constructor(notifier: NotifierService, private fb: FormBuilder,private route: ActivatedRoute, private router: Router, private QcListComponent : QcListComponent, private _qc: QcService,) { @@ -51,7 +64,6 @@ constructor(notifier: NotifierService, private fb: FormBuilder,private route: Ac this.loadTemplates(this.startPD); this.next=1; this.previous=2; - this.PDStatus="QC_COMPLETED" } isMac(): boolean { let bool = false; @@ -69,6 +81,10 @@ loadTemplates(startID:string){ this.categoryList=data.records.question_answers; let filterApplicantName= data.records.pdapplicants_detials.filter(item => item.applicant_type == 1); this.mainApplicantName = filterApplicantName[0].applicant_name; + this.currentPDStatus = data.records.pdmaster_details.pd_status; + + this.actualQuestions = data.records.counts.overall_question_count; + this.answeredQuestions = data.records.counts.overall_answered_count; } else{ this.pdMasterList=""; @@ -111,6 +127,8 @@ loadTemplates(startID:string){ if (data.status == 200) { this.answerList=data.records.answers; this.ansPDList=data.records; + this.actualQuestions = data.records.counts.overall_question_count; + this.answeredQuestions = data.records.counts.overall_answered_count; // this for options type questions if(this.selectedCategory.fk_question_answertype==1){ @@ -396,6 +414,8 @@ optionsMapItems(items) { this._qc.editPdMasterDetails(update_array, status).subscribe(result => { if (result.status == 200) { this.notifier.notify('success', 'QC Completed.'); + this.currentPDStatus = "QC_COMPLETED"; + } else { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html index e72779c5a..36d5a21c7 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html @@ -1,140 +1,145 @@ -
-
-
-

{{master.lender_full_name}} - {{master.lender_applicant_id}}

- {{master.pd_date_of_initiation}} -
-
- - - - -
{{master.pd_allocated_to}} -{{master.pd_status_name}} -
+ + +
+
+
+

{{master.lender_full_name}} - {{master.lender_applicant_id}}

+ {{master.pd_date_of_initiation}} +
+
+ + + + +
{{master.pd_allocated_to}} +
+ +
+ +
-
- -
- -
- - -
- - - -
- - -  {{master.city_name}} / {{master.state_name}}-{{master.pincode}} - - - -

{{master.product_name}} / {{master.subproduct_name}}

-

{{master.pd_type_name}} /  {{master.loan_amount}}

-

{{master.addressline1}},{{master.addressline2}} ,{{master.addressline3}}

- - - - - -
-
- - -
- -
- - Applicants - - - - - -

- -  {{applicant.applicant_name}}     - -  {{applicant.mobile_no}}
Main Applicant -    {{applicant.relation_name}} -

- - - - - - - - -

No Applicant

 - - - - -
- - -
- - - - - Documents - - - - - -

- {{documents.pd_document_title}}     - -  {{documents.pd_document_name}} -

- - - - -

No Document

 - - - - -
-
- - - - -
PD History
- - - - - -

{{masterHistory}}

- - - - - - +
+ + +
+ + - - -

No History

 - - - -
-
- -
+
+ + +  {{master.city_name}} / {{master.state_name}}-{{master.pincode}} + + + +

{{master.product_name}} / {{master.subproduct_name}}

+

{{master.pd_type_name}} /  {{master.loan_amount}}

+

{{master.addressline1}},{{master.addressline2}} ,{{master.addressline3}}

+

{{master.pd_status}} - {{ (master.updatedon)? (master.updatedon | slice:0:10):(master.updatedon) }}

+ + + + +
+
+ + +
+ +
+ + Applicants + + + + + +

+ +  {{applicant.applicant_name}}     + +  {{applicant.mobile_no}}
Main Applicant +    {{applicant.relation_name}} +

+ + + + + + + + +

No Applicant

 + + + + +
+ + +
+ + + + + Documents + + + + + +

+ {{documents.pd_document_title}}     + +  {{documents.pd_document_name}} +

+ + + + +

No Document

 + + + + +
+
+ + + + +
PD History
+ + + + + +

{{masterHistory}}

+ + + + + + + + + +

No History

 + + + +
+
+ +
+ + + diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts index c699b0fe8..ef3bad0c4 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts @@ -29,6 +29,18 @@ export class QcViewComponent implements OnInit, OnDestroy { viewID:string; viewParams:any; destroyType:number=1; + currentPDStatus:string; + + // create values for status check + pdStatusCheck :any={ + "DRAFT" :'DRAFT', + "TRIGGERED" :'TRIGGERED', + "ALLOCATED" :'ALLOCATED', + "SCHEDULED" :'SCHEDULED', + "INPROGRESS" :'INPROGRESS', + "COMPLETED" :'COMPLETED', + "QC_COMPLETED" :'QC_COMPLETED', + }; public _EditPDtriggerForm:FormGroup; constructor(notifier:NotifierService,private dialog: MatDialog,private _fb: FormBuilder, private _qc: QcService,private route: ActivatedRoute,private router: Router, private QcListComponent: QcListComponent) { @@ -52,6 +64,8 @@ export class QcViewComponent implements OnInit, OnDestroy { this.pdDocumentsData=data.records.pd_documnets; this.masterPdLogsData=data.records.pd_logs.master; //this.applicantPDLogsData= data.records.pd_logs.master; + this.currentPDStatus = data.records.pd_master_details[0].pd_status; + } }, error => this.errorMessage = error); }