From 2af1e7ba813d0a1512c73c5b5ef7c81a90314b84 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 30 Apr 2019 19:47:43 +0530 Subject: [PATCH] issues Fixed --- ng6-seed/src/app/_guard/token.interceptor.ts | 50 +++++++++++++++---- .../src/app/layouts/role-menu-items.pipe.ts | 4 +- .../list-pd/all-pd/all-pd.component.html | 6 +-- .../list-pd/all-pd/all-pd.component.ts | 7 ++- .../completed-pd/completed-pd.component.html | 7 ++- .../completed-pd/completed-pd.component.ts | 7 ++- .../inprogress-pd.component.html | 7 ++- .../inprogress-pd/inprogress-pd.component.ts | 7 ++- .../qc-completed-pd.component.html | 7 ++- .../qc-completed-pd.component.ts | 7 ++- .../scheduled-pd/scheduled-pd.component.html | 7 ++- .../scheduled-pd/scheduled-pd.component.ts | 7 ++- .../business-info/business-info.component.ts | 1 + .../general-info/general-info.component.html | 2 +- .../list-pd/view-pd/view-pd.component.html | 10 ++-- .../qc-list/qc-view/qc-view.component.html | 8 +-- .../app/reports/pd-mis/pd-mis.component.html | 18 +++++++ .../app/reports/pd-mis/pd-mis.component.scss | 18 +++++++ .../app/reports/pd-mis/pd-mis.component.ts | 24 ++++++--- ng6-seed/src/app/reports/reports.service.ts | 1 - ng6-seed/src/environments/environment.ts | 2 +- 21 files changed, 160 insertions(+), 47 deletions(-) diff --git a/ng6-seed/src/app/_guard/token.interceptor.ts b/ng6-seed/src/app/_guard/token.interceptor.ts index e5b78dc5e..2691fe140 100755 --- a/ng6-seed/src/app/_guard/token.interceptor.ts +++ b/ng6-seed/src/app/_guard/token.interceptor.ts @@ -7,12 +7,10 @@ import { HttpHeaders } from '@angular/common/http'; // import { AuthGuard } from './auth.guard'; -import { Observable, of } from 'rxjs'; +import { Observable, of, throwError } from 'rxjs'; import { Router } from '@angular/router'; - -import { catchError, map, tap } from 'rxjs/operators'; +import { retry,catchError, map, tap } from 'rxjs/operators'; import { HttpErrorResponse } from "@angular/common/http"; - import { CognitoService } from '../AwsService/cognito.service'; @Injectable() @@ -27,17 +25,30 @@ export class TokenInterceptor implements HttpInterceptor{ let token:any = this.shared.getAccessToken() ||""; //console.log(token); let requests = request.clone({ - headers:new HttpHeaders({ - + headers:new HttpHeaders({ 'Authorization': 'sparqvenba2018', 'Token': token.getIdToken().getJwtToken() - }) + }) }); return next.handle(requests).pipe( - catchError(this.handleError('role', [])) - ) + catchError(this.handleError('role', [])) + ) } + // private handleError (operation = 'operation', result?: T) { + // console.log(result); + // return (error: any): Observable => { + // if(error instanceof HttpErrorResponse){ + // console.error("Error: " + error.status); + // if(error.status == 401){ + // localStorage.clear(); + // this.router.navigate(['/authentication/login']); + // } + // return of(result as T); + // } + // }; + // } + private handleError (operation = 'operation', result?: T) { return (error: any): Observable => { if(error instanceof HttpErrorResponse){ @@ -46,7 +57,26 @@ export class TokenInterceptor implements HttpInterceptor{ localStorage.clear(); this.router.navigate(['/authentication/login']); } - return of(result as T); + else{ + let errorMessage = ''; + let type : number; + if (error.error instanceof ErrorEvent) { + // client-side error + errorMessage = `Error: ${error.error.message}`; + type = 1; + } else { + // server-side error + errorMessage = `Error Code: ${error.status}\nMessage: ${error.message}`; + type = 2; + } + // window.alert(errorMessage); + return throwError({error_status :type == 2 ? error.status : '', + error_message:error.message, + error_text :type == 2 ? error.statusText : '', + html_format :errorMessage, + error_type :type, + }); + } } }; } diff --git a/ng6-seed/src/app/layouts/role-menu-items.pipe.ts b/ng6-seed/src/app/layouts/role-menu-items.pipe.ts index 5ff451ac1..e801c9c0b 100644 --- a/ng6-seed/src/app/layouts/role-menu-items.pipe.ts +++ b/ng6-seed/src/app/layouts/role-menu-items.pipe.ts @@ -16,7 +16,7 @@ export class RoleMenuItemsPipe implements PipeTransform { case '6': return value.filter(val=>val.state!="setting" && val.state!="personal_discussion" && val.state!="reports"); case '7': return value.filter(val=>val.state!="setting" && val.state!="personal_discussion" && val.state!="reports"); case '10': return value; - default: return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); + // default: return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); } } // this is for vertical menu filter @@ -29,7 +29,7 @@ export class RoleMenuItemsPipe implements PipeTransform { case '6': return value.filter(val=>val.state!="setting" && val.state!="personal_discussion" && val.state!="reports"); case '7': return value.filter(val=>val.state!="setting" && val.state!="personal_discussion" && val.state!="reports"); case '10': return value; - default: return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); + // default: return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); } } else{ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index 285b1b93c..f750486f6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -72,8 +72,8 @@ - - {{details.applicant_name}} + + {{details.is_child == 0 ? details.applicant_name : 'Add On PD - ' + details.parent_pd_id }}
{{details.lender_applicant_id}} @@ -120,7 +120,7 @@ my_location - diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts index 1f1a6702c..d8da0411c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts @@ -100,7 +100,12 @@ export class AllPdComponent implements OnInit, OnChanges { this.dataSourceTab1 = null; this.recordStatus=true; } - }, error => this.errorMessage = error); + } + // , error => {this.errorMessage = error}); + ,error => { + this.errorMessage.push(error); + alert(error.html_format); + }); } pageChange(e) { console.log(e); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html index ae95eb38f..706b2e4aa 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html @@ -72,7 +72,10 @@ - {{details.applicant_name}}
+ + + {{details.is_child == 0 ? details.applicant_name : 'Add On PD - ' + details.parent_pd_id }} +
{{details.lender_applicant_id}} -({{details.customer_segment_abbr}} ) @@ -98,7 +101,7 @@ - diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts index 890a1aaea..8bff4e98d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts @@ -99,7 +99,12 @@ export class CompletedPdComponent implements OnInit, OnChanges { this.dataLengthTab4= null; this.recordStatus=true; } - }, error => this.errorMessage = error); + } + // , error => this.errorMessage = error); + ,error => { + this.errorMessage.push(error); + alert(error.html_format); + }); } pageChange(e) { console.log(e); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html index ec36e21ec..fd5e090b2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html @@ -69,7 +69,10 @@ - {{details.applicant_name}}
+ + + {{details.is_child == 0 ? details.applicant_name : 'Add On PD - ' + details.parent_pd_id }} +
{{details.lender_applicant_id}} -({{details.customer_segment_abbr}} ) @@ -95,7 +98,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts index 01f088775..cda591c71 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts @@ -93,7 +93,12 @@ export class InprogressPdComponent implements OnInit, OnChanges { this.dataLengthTab2 = null; this.recordStatus=true; } - }, error => this.errorMessage = error); + } + // , error => this.errorMessage = error); + ,error => { + this.errorMessage.push(error); + alert(error.html_format); + }); } pageChange(e) { console.log(e); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html index 61fb3c35e..3828cfeb0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html @@ -71,7 +71,10 @@ - {{details.applicant_name}}
+ + + {{details.is_child == 0 ? details.applicant_name : 'Add On PD - ' + details.parent_pd_id }} +
{{details.lender_applicant_id}} -({{details.customer_segment_abbr}} ) @@ -97,7 +100,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts index 801f151c1..079c49377 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts @@ -97,7 +97,12 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { this.dataLengthTab5 = null; this.recordStatus = true; } - }, error => this.errorMessage = error); + } + // , error => this.errorMessage = error); + ,error => { + this.errorMessage.push(error); + alert(error.html_format); + }); } pageChange(e) { console.log(e); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html index e246206ab..8bd5336e4 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html @@ -70,7 +70,10 @@ - {{details.applicant_name}}
+ + + {{details.is_child == 0 ? details.applicant_name : 'Add On PD - ' + details.parent_pd_id }} +
{{details.lender_applicant_id}} -({{details.customer_segment_abbr}} ) @@ -99,7 +102,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts index db2ce26a2..b9f2de48a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts @@ -95,7 +95,12 @@ export class ScheduledPdComponent implements OnInit, OnChanges { this.dataLengthTab3 = null; this.recordStatus=true; } - }, error => this.errorMessage = error); + } + // , error => this.errorMessage = error); + ,error => { + this.errorMessage.push(error); + alert(error.html_format); + }); } pageChange(e) { console.log(e); 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 4be692b10..e75a29073 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 @@ -109,6 +109,7 @@ export class BusinessInfoComponent implements OnInit { this.generalExistEntityType = this.pd_all_details.business_entity_type; this.generalExistEntityType_other = this.pd_all_details.business_entity_type_other; this.generalExistBusinessYear = this.pd_all_details.business_years; + console.log('this.generalExistBusinessYear',this.generalExistBusinessYear); this.generalExistBusinessMonth = this.pd_all_details.business_month; this.main_applicant = this.pd_all_details.pdmaster_details.main_applicant; this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id; 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 46b573381..4d62e2ca0 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 @@ -193,7 +193,7 @@ - + Relationship Between Individuals 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 0f0648e0e..7553116ac 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -120,9 +120,9 @@
- - - + + +
@@ -162,8 +162,8 @@
- - + +
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 8a92f15a9..436139187 100755 --- 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 @@ -125,8 +125,8 @@
- - + +
@@ -166,8 +166,8 @@ {{addresses.addtional_pd_data[0].pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : addresses.addtional_pd_data[0].pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : addresses.addtional_pd_data[0].pd_status | titlecase}}
- - + +
diff --git a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html index 0f540fb09..fad6339a3 100644 --- a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html +++ b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html @@ -11,6 +11,23 @@
+ +
+
+
+ error +

Error!

+ {{er.error_status}} +

{{er.error_text}}

+
+

Sorry, but the page you were trying to view does not exist

+

{{er.error_message}}

+
+
+
+
+ +
@@ -207,6 +224,7 @@
+
diff --git a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.scss b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.scss index f1b9fb714..53da6b2ce 100644 --- a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.scss +++ b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.scss @@ -61,4 +61,22 @@ font-weight: bold; font-size: 1.2rem !important; padding: 0 10px 0 10px; +} + +/* Error Text Font Size*/ +.error-text{ + font-size: 6rem !important; +} + +.error-icon{ + width: 100px; + font-size: 79px !important; +} + +.form-back{ + background-position: top center; + min-height: calc(100vh + 100px); + height: auto; + background-color: #fff !important; + color:red !important; } \ No newline at end of file diff --git a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts index 388e9dd44..157c7c392 100644 --- a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts +++ b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts @@ -27,6 +27,7 @@ export class PdMisComponent implements OnInit { public dataLength: number; public pageSize : number; public dataSource = new MatTableDataSource(); + error:any=[]; displayedColumns = ['serialno', 'applicant', @@ -62,7 +63,6 @@ export class PdMisComponent implements OnInit { this.reportsService.retirveDataForMISDailyReport().subscribe( data => { - if(data.dataStatus == true){ this.api_data = data.records; this.dataLength = data.records.length; @@ -79,6 +79,11 @@ export class PdMisComponent implements OnInit { this.dataLength = 0; // this.Loading = true; } + }, + error => { + this.error.push(error); + this.dataLength = 0; + this.Loading = false; }) } @@ -113,6 +118,7 @@ export class PdMisComponent implements OnInit { searchform(value:any){ this.reportsService.retirveDataForMISDailyReport().subscribe( + data => { if(data['dataStatus']==true) { @@ -124,13 +130,11 @@ export class PdMisComponent implements OnInit { if(value.city !== null && value.city != ''){ this.filtered_data = this.filterForCity(this.filtered_data,value.city); } - if(value.branch !== null && value.branch != ''){ // this.filtered_data = this.filtered_data.filter(val => val.branch == value.branch ); // this.filtered_data = this.filtered_data.filter(val => this.customFilter(val,value.brach,3)); this.filtered_data = this.filterForBranch(this.filtered_data,value.branch); } - if(value.from_date !== null && value.to_date !== null){ // console.log('value',value.from_date); // console.log('value',value.to_date); @@ -149,12 +153,18 @@ export class PdMisComponent implements OnInit { }) } this.dataSource.data = this.filtered_data; - } - else{ + } + else{ this.dataSource.data = this.filtered_data; this.dataLength = this.filtered_data.length; - } - }) + } + }, + error => { + this.error.push(error); + this.dataLength = 0; + this.Loading = false; + } + ); } filterForApplicantID(arrayData: any, Values: any) { diff --git a/ng6-seed/src/app/reports/reports.service.ts b/ng6-seed/src/app/reports/reports.service.ts index d673c6ffb..8c531b9d3 100644 --- a/ng6-seed/src/app/reports/reports.service.ts +++ b/ng6-seed/src/app/reports/reports.service.ts @@ -25,5 +25,4 @@ export class ReportsService { retirveDataForMISDailyReport(): Observable { return this._http.get(this.apiUrl + 'PD_MIS_report'); } - } diff --git a/ng6-seed/src/environments/environment.ts b/ng6-seed/src/environments/environment.ts index 67aab72f9..af7a9fb85 100755 --- a/ng6-seed/src/environments/environment.ts +++ b/ng6-seed/src/environments/environment.ts @@ -25,5 +25,5 @@ export const environment = { s3_endpoint: '', accessToken:'', //apiUrl:'http://localhost/sparqapi/api/' - apiEndpoint: 'https://ssa.sineedge.com/sparqapi/api/' + apiEndpoint: 'https://ssa.sineedge.com/sparqtest/api/' };