Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issues Fixed

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-04-30 19:47:43 +05:30
parent ff347496b1
commit 2af1e7ba81
21 changed files with 160 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ng6-seed/src/app/_guard/token.interceptor.ts
View File

@ -7,12 +7,10 @@ import {
HttpHeaders HttpHeaders
} from '@angular/common/http'; } from '@angular/common/http';
// import { AuthGuard } from './auth.guard'; // import { AuthGuard } from './auth.guard';
import { Observable, of } from 'rxjs'; import { Observable, of, throwError } from 'rxjs';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { retry,catchError, map, tap } from 'rxjs/operators';
import { catchError, map, tap } from 'rxjs/operators';
import { HttpErrorResponse } from "@angular/common/http"; import { HttpErrorResponse } from "@angular/common/http";
import { CognitoService } from '../AwsService/cognito.service'; import { CognitoService } from '../AwsService/cognito.service';
@Injectable() @Injectable()
@ -28,7 +26,6 @@ export class TokenInterceptor implements HttpInterceptor{
//console.log(token); //console.log(token);
let requests = request.clone({ let requests = request.clone({
headers:new HttpHeaders({ headers:new HttpHeaders({
'Authorization': 'sparqvenba2018', 'Authorization': 'sparqvenba2018',
'Token': token.getIdToken().getJwtToken() 'Token': token.getIdToken().getJwtToken()
}) })
@ -38,6 +35,20 @@ export class TokenInterceptor implements HttpInterceptor{
) )
} }
// private handleError<T> (operation = 'operation', result?: T) {
// console.log(result);
// return (error: any): Observable<T> => {
// 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<T> (operation = 'operation', result?: T) { private handleError<T> (operation = 'operation', result?: T) {
return (error: any): Observable<T> => { return (error: any): Observable<T> => {
if(error instanceof HttpErrorResponse){ if(error instanceof HttpErrorResponse){
@ -46,7 +57,26 @@ export class TokenInterceptor implements HttpInterceptor{
localStorage.clear(); localStorage.clear();
this.router.navigate(['/authentication/login']); 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,
});
}
} }
}; };
} }

4
ng6-seed/src/app/layouts/role-menu-items.pipe.ts
View File

@ -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 '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 '7': return value.filter(val=>val.state!="setting" && val.state!="personal_discussion" && val.state!="reports");
case '10': return value; 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 // 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 '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 '7': return value.filter(val=>val.state!="setting" && val.state!="personal_discussion" && val.state!="reports");
case '10': return value; 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{ else{

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html
View File

@ -72,8 +72,8 @@
</ng-container> </ng-container>
<ng-container matColumnDef="Name"> <ng-container matColumnDef="Name">
<mat-cell class="cell" *matCellDef="let details;"> <mat-cell class="cell" *matCellDef="let details;">
<span *ngIf="details.applicant_name" mat-line> <span *ngIf="details.is_child" mat-line>
<b>{{details.applicant_name}}</b> <b>{{details.is_child == 0 ? details.applicant_name : 'Add On PD - ' + details.parent_pd_id }}</b>
</span> </span>
<br> <br>
<span class="fontsize"> {{details.lender_applicant_id}}</span> <span class="fontsize"> {{details.lender_applicant_id}}</span>
@ -120,7 +120,7 @@
<mat-icon>my_location</mat-icon> <mat-icon>my_location</mat-icon>
</button> </button>
</a> </a>
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" color="primary" (click)="viewPD(details.pd_id)" <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" color="primary" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id)"
matTooltip="View" matTooltipPosition="above"> matTooltip="View" matTooltipPosition="above">
<mat-icon>visibility</mat-icon> <mat-icon>visibility</mat-icon>
</button> </button>

7
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts
View File

@ -100,7 +100,12 @@ export class AllPdComponent implements OnInit, OnChanges {
this.dataSourceTab1 = null; this.dataSourceTab1 = null;
this.recordStatus=true; this.recordStatus=true;
} }
}, error => this.errorMessage = <any> error); }
// , error => {this.errorMessage = <any> error});
,error => {
this.errorMessage.push(error);
alert(error.html_format);
});
} }
pageChange(e) { pageChange(e) {
console.log(e); console.log(e);

7
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html
View File

@ -72,7 +72,10 @@
</ng-container> </ng-container>
<ng-container matColumnDef="Name"> <ng-container matColumnDef="Name">
<mat-cell class="cell" *matCellDef="let details;"> <mat-cell class="cell" *matCellDef="let details;">
<span *ngIf="details.applicant_name" mat-line><b>{{details.applicant_name}}</b></span><br> <!-- <span *ngIf="details.applicant_name" mat-line><b>{{details.applicant_name}}</b></span><br> -->
<span *ngIf="details.is_child" mat-line>
<b>{{details.is_child == 0 ? details.applicant_name : 'Add On PD - ' + details.parent_pd_id }}</b>
</span><br>
<span class="fontsize"> {{details.lender_applicant_id}}</span> <span class="fontsize" *ngIf="details.customer_segment_abbr">-({{details.customer_segment_abbr}} )</span> <span class="fontsize"> {{details.lender_applicant_id}}</span> <span class="fontsize" *ngIf="details.customer_segment_abbr">-({{details.customer_segment_abbr}} )</span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
@ -98,7 +101,7 @@
</ng-container> </ng-container>
<ng-container matColumnDef="Action"> <ng-container matColumnDef="Action">
<mat-cell class="cell center" *matCellDef="let details;"> <mat-cell class="cell center" *matCellDef="let details;">
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.pd_id)" matTooltip="View" <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id)" matTooltip="View"
matTooltipPosition="above" color="primary"><mat-icon>visibility</mat-icon></button> matTooltipPosition="above" color="primary"><mat-icon>visibility</mat-icon></button>
</mat-cell> </mat-cell>
</ng-container> </ng-container>

7
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts
View File

@ -99,7 +99,12 @@ export class CompletedPdComponent implements OnInit, OnChanges {
this.dataLengthTab4= null; this.dataLengthTab4= null;
this.recordStatus=true; this.recordStatus=true;
} }
}, error => this.errorMessage = <any> error); }
// , error => this.errorMessage = <any> error);
,error => {
this.errorMessage.push(error);
alert(error.html_format);
});
} }
pageChange(e) { pageChange(e) {
console.log(e); console.log(e);

7
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html
View File

@ -69,7 +69,10 @@
</ng-container> </ng-container>
<ng-container matColumnDef="Name"> <ng-container matColumnDef="Name">
<mat-cell class="cell" *matCellDef="let details;"> <mat-cell class="cell" *matCellDef="let details;">
<span *ngIf="details.applicant_name" mat-line><b>{{details.applicant_name}}</b></span><br> <!-- <span *ngIf="details.applicant_name" mat-line><b>{{details.applicant_name}}</b></span><br> -->
<span *ngIf="details.is_child" mat-line>
<b>{{details.is_child == 0 ? details.applicant_name : 'Add On PD - ' + details.parent_pd_id }}</b>
</span><br>
<span class="fontsize"> {{details.lender_applicant_id}}</span> <span class="fontsize" *ngIf="details.customer_segment_abbr">-({{details.customer_segment_abbr}} )</span> <span class="fontsize"> {{details.lender_applicant_id}}</span> <span class="fontsize" *ngIf="details.customer_segment_abbr">-({{details.customer_segment_abbr}} )</span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
@ -95,7 +98,7 @@
</ng-container> </ng-container>
<ng-container matColumnDef="Action"> <ng-container matColumnDef="Action">
<mat-cell class="cell center" *matCellDef="let details;"> <mat-cell class="cell center" *matCellDef="let details;">
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.pd_id)" matTooltip="View" matTooltipPosition="above" color="primary"><mat-icon>visibility</mat-icon></button> <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" ((click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id)" matTooltip="View" matTooltipPosition="above" color="primary"><mat-icon>visibility</mat-icon></button>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;"> <mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;">

7
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts
View File

@ -93,7 +93,12 @@ export class InprogressPdComponent implements OnInit, OnChanges {
this.dataLengthTab2 = null; this.dataLengthTab2 = null;
this.recordStatus=true; this.recordStatus=true;
} }
}, error => this.errorMessage = <any> error); }
// , error => this.errorMessage = <any> error);
,error => {
this.errorMessage.push(error);
alert(error.html_format);
});
} }
pageChange(e) { pageChange(e) {
console.log(e); console.log(e);

7
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html
View File

@ -71,7 +71,10 @@
</ng-container> </ng-container>
<ng-container matColumnDef="Name"> <ng-container matColumnDef="Name">
<mat-cell class="cell" *matCellDef="let details;"> <mat-cell class="cell" *matCellDef="let details;">
<span *ngIf="details.applicant_name" mat-line><b>{{details.applicant_name}}</b></span><br> <!-- <span *ngIf="details.applicant_name" mat-line><b>{{details.applicant_name}}</b></span><br> -->
<span *ngIf="details.is_child" mat-line>
<b>{{details.is_child == 0 ? details.applicant_name : 'Add On PD - ' + details.parent_pd_id }}</b>
</span><br>
<span class="fontsize"> {{details.lender_applicant_id}}</span> <span class="fontsize" *ngIf="details.customer_segment_abbr">-({{details.customer_segment_abbr}} )</span> <span class="fontsize"> {{details.lender_applicant_id}}</span> <span class="fontsize" *ngIf="details.customer_segment_abbr">-({{details.customer_segment_abbr}} )</span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
@ -97,7 +100,7 @@
</ng-container> </ng-container>
<ng-container matColumnDef="Action"> <ng-container matColumnDef="Action">
<mat-cell class="cell center" *matCellDef="let details;"> <mat-cell class="cell center" *matCellDef="let details;">
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.pd_id)" matTooltip="View" matTooltipPosition="above" color="primary"><mat-icon>visibility</mat-icon></button> <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id)" matTooltip="View" matTooltipPosition="above" color="primary"><mat-icon>visibility</mat-icon></button>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;"> <mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;">

7
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts
View File

@ -97,7 +97,12 @@ export class QcCompletedPdComponent implements OnInit, OnChanges {
this.dataLengthTab5 = null; this.dataLengthTab5 = null;
this.recordStatus = true; this.recordStatus = true;
} }
}, error => this.errorMessage = <any>error); }
// , error => this.errorMessage = <any>error);
,error => {
this.errorMessage.push(error);
alert(error.html_format);
});
} }
pageChange(e) { pageChange(e) {
console.log(e); console.log(e);

7
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html
View File

@ -70,7 +70,10 @@
</ng-container> </ng-container>
<ng-container matColumnDef="Name"> <ng-container matColumnDef="Name">
<mat-cell class="cell" *matCellDef="let details;"> <mat-cell class="cell" *matCellDef="let details;">
<span *ngIf="details.applicant_name" mat-line><b>{{details.applicant_name}}</b></span><br> <!-- <span *ngIf="details.applicant_name" mat-line><b>{{details.applicant_name}}</b></span><br> -->
<span *ngIf="details.is_child" mat-line>
<b>{{details.is_child == 0 ? details.applicant_name : 'Add On PD - ' + details.parent_pd_id }}</b>
</span><br>
<span class="fontsize"> {{details.lender_applicant_id}}</span> <span class="fontsize" *ngIf="details.customer_segment_abbr">-({{details.customer_segment_abbr}} )</span> <span class="fontsize"> {{details.lender_applicant_id}}</span> <span class="fontsize" *ngIf="details.customer_segment_abbr">-({{details.customer_segment_abbr}} )</span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
@ -99,7 +102,7 @@
</ng-container> </ng-container>
<ng-container matColumnDef="Action"> <ng-container matColumnDef="Action">
<mat-cell class="cell center" *matCellDef="let details;"> <mat-cell class="cell center" *matCellDef="let details;">
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.pd_id)" color="primary" matTooltip="View" matTooltipPosition="above"><mat-icon>visibility</mat-icon></button> <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id)" color="primary" matTooltip="View" matTooltipPosition="above"><mat-icon>visibility</mat-icon></button>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;"> <mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;">

7
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts
View File

@ -95,7 +95,12 @@ export class ScheduledPdComponent implements OnInit, OnChanges {
this.dataLengthTab3 = null; this.dataLengthTab3 = null;
this.recordStatus=true; this.recordStatus=true;
} }
}, error => this.errorMessage = <any> error); }
// , error => this.errorMessage = <any> error);
,error => {
this.errorMessage.push(error);
alert(error.html_format);
});
} }
pageChange(e) { pageChange(e) {
console.log(e); console.log(e);

1
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
View File

@ -109,6 +109,7 @@ export class BusinessInfoComponent implements OnInit {
this.generalExistEntityType = this.pd_all_details.business_entity_type; this.generalExistEntityType = this.pd_all_details.business_entity_type;
this.generalExistEntityType_other = this.pd_all_details.business_entity_type_other; this.generalExistEntityType_other = this.pd_all_details.business_entity_type_other;
this.generalExistBusinessYear = this.pd_all_details.business_years; this.generalExistBusinessYear = this.pd_all_details.business_years;
console.log('this.generalExistBusinessYear',this.generalExistBusinessYear);
this.generalExistBusinessMonth = this.pd_all_details.business_month; this.generalExistBusinessMonth = this.pd_all_details.business_month;
this.main_applicant = this.pd_all_details.pdmaster_details.main_applicant; this.main_applicant = this.pd_all_details.pdmaster_details.main_applicant;
this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id; this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id;

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
View File

@ -193,7 +193,7 @@
<!-- companies end --> <!-- companies end -->
<!-- Person Relationship Starts Here --> <!-- Person Relationship Starts Here -->
<mat-card *ngIf="_generalForm.controls.persons_with_relationships['controls'].length>0"> <mat-card *ngIf="_generalForm.controls.persons_with_relationships['controls'].length > 1">
<mat-card-header> <mat-card-header>
<mat-card-title> Relationship Between Individuals </mat-card-title> <mat-card-title> Relationship Between Individuals </mat-card-title>
</mat-card-header> </mat-card-header>

10
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
View File

@ -120,9 +120,9 @@
</div> </div>
<div fxFlex="60" align="right"> <div fxFlex="60" align="right">
<span><button *ngIf="roleAccessDetails.trigger && addresses.assigned_pd==null || addresses.assigned_pd==''" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate PD for this address' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button></span> <span><button *ngIf="roleAccessDetails.trigger && addresses.assigned_pd==null || addresses.assigned_pd==''" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate PD for this address' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button></span>
<span *ngIf="userRoleID == 10 || userRoleID == 3"><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.COMPLETED && master.pd_status!=pdStatusCheck.ADD_ON_PENDING && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button></span> <span *ngIf="userRoleID == 3 || userRoleID == 10"><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.COMPLETED && master.pd_status!=pdStatusCheck.ADD_ON_PENDING && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button></span>
<span *ngIf="userRoleID != 6 || userRoleID != 7 || userRoleID != 8 || userRoleID != 9 "><button *ngIf="roleAccessDetails.schedule && addresses.assigned_pd && master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.COMPLETED && master.pd_status!=pdStatusCheck.ADD_ON_PENDING && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master,addresses)"><mat-icon>schedule</mat-icon></button></span> <span *ngIf="userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 10"><button *ngIf="roleAccessDetails.schedule && addresses.assigned_pd && master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.COMPLETED && master.pd_status!=pdStatusCheck.ADD_ON_PENDING && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master,addresses)"><mat-icon>schedule</mat-icon></button></span>
<span *ngIf="userRoleID != 6 || userRoleID != 7 || userRoleID != 8 || userRoleID != 9 "><button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.TRIGGERED && enableStartPD" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,master.pd_status)"><mat-icon>question_answer</mat-icon></button></span> <span *ngIf="userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 10"><button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.TRIGGERED && enableStartPD" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,master.pd_status)"><mat-icon>question_answer</mat-icon></button></span>
</div> </div>
</div> </div>
</div> </div>
@ -162,8 +162,8 @@
</div> </div>
<div fxFlex="60" align="right"> <div fxFlex="60" align="right">
<span *ngIf="userRoleID == 10 || userRoleID == 3"><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.COMPLETED && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.ADD_ON_PENDING && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button></span> <span *ngIf="userRoleID == 10 || userRoleID == 3"><button *ngIf="roleAccessDetails.allocate && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.COMPLETED && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.ADD_ON_PENDING && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button></span>
<span *ngIf="userRoleID != 6 || userRoleID != 7 || userRoleID != 8 || userRoleID != 9 "><button *ngIf="roleAccessDetails.schedule && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.COMPLETED && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.ADD_ON_PENDING && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master,addresses)"><mat-icon>schedule</mat-icon></button></span> <span *ngIf="userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 10 "><button *ngIf="roleAccessDetails.schedule && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.COMPLETED && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.ADD_ON_PENDING && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master,addresses)"><mat-icon>schedule</mat-icon></button></span>
<span *ngIf="userRoleID != 6 || userRoleID != 7 || userRoleID != 8 || userRoleID != 9 "><button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.TRIGGERED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,addresses.addtional_pd_data[0].pd_status)"><mat-icon>question_answer</mat-icon></button></span> <span *ngIf="userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 10 "><button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.TRIGGERED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,addresses.addtional_pd_data[0].pd_status)"><mat-icon>question_answer</mat-icon></button></span>
</div> </div>
</div> </div>
<div fxLayout="row nowrap"> <div fxLayout="row nowrap">

8
ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html
View File

@ -125,8 +125,8 @@
</div> </div>
<div fxFlex="60" align="right"> <div fxFlex="60" align="right">
<button *ngIf="addresses.assigned_pd==null || addresses.assigned_pd==''" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate Address for Additional PD Process' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button> <button *ngIf="addresses.assigned_pd==null || addresses.assigned_pd==''" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate Address for Additional PD Process' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button>
<span *ngIf="userRoleID == 10 || userRoleID == 3"><button *ngIf="addresses.assigned_pd && master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button></span> <span *ngIf="userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 10"><button *ngIf="addresses.assigned_pd && master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button></span>
<span *ngIf="userRoleID != 6 || userRoleID != 7 || userRoleID != 8 || userRoleID != 9 "><button *ngIf="addresses.assigned_pd && master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master,addresses)"><mat-icon>schedule</mat-icon></button></span> <span *ngIf="userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 10"><button *ngIf="addresses.assigned_pd && master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master,addresses)"><mat-icon>schedule</mat-icon></button></span>
</div> </div>
</div> </div>
</div> </div>
@ -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}} {{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}}
</div> </div>
<div fxFlex="60" align="right"> <div fxFlex="60" align="right">
<span *ngIf="userRoleID == 10 || userRoleID == 3"><button *ngIf="addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button></span> <span *ngIf="userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 10"><button *ngIf="addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button></span>
<span *ngIf="userRoleID != 6 || userRoleID != 7 || userRoleID != 8 || userRoleID != 9 "><button *ngIf="addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master,addresses)"><mat-icon>schedule</mat-icon></button></span> <span *ngIf="userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 10"><button *ngIf="addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master,addresses)"><mat-icon>schedule</mat-icon></button></span>
</div> </div>
</div> </div>
<div fxLayout="row nowrap"> <div fxLayout="row nowrap">

18
ng6-seed/src/app/reports/pd-mis/pd-mis.component.html
View File

@ -11,6 +11,23 @@
<mat-card-content> <mat-card-content>
<div *ngIf="!Loading" class="report-card-container mat-elevation-z8"> <div *ngIf="!Loading" class="report-card-container mat-elevation-z8">
<div class="relative" *ngIf="error.length > 0;else anotherdata;">
<div class="form-back">
<div class="relative error-wrapper" *ngFor="let er of error let i = index;">
<mat-icon class="error-icon" style="color:red;">error</mat-icon>
<h1 style="color:red;"> Error! </h1>
<span *ngIf="er.error_type == 2" class="error-text" style="color:red;">{{er.error_status}}</span>
<h2 style="color:red;"> {{er.error_text}} </h2>
<div class="error-details" style="color:red;">
<p>Sorry, but the page you were trying to view does not exist</p>
<p *ngIf="er.error_type == 2" >{{er.error_message}}</p>
</div>
</div>
</div>
</div>
<ng-template #anotherdata>
<br/> <br/>
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header"> <div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 100%;"> <div class="ml-xs mr-xs" style="width: 100%;">
@ -207,6 +224,7 @@
<div *ngIf="dataLength == 0" class="nocontent ml-xs mr-xs" style="padding: 1rem !important;">No records found</div> <div *ngIf="dataLength == 0" class="nocontent ml-xs mr-xs" style="padding: 1rem !important;">No records found</div>
</div> </div>
<mat-paginator [length]="pageSize" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100,dataLength]" showFirstLastButtons></mat-paginator> <mat-paginator [length]="pageSize" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100,dataLength]" showFirstLastButtons></mat-paginator>
</ng-template>
</div> </div>
<div *ngIf="Loading"> <div *ngIf="Loading">
<div fxLayoutAlign="center"> <div fxLayoutAlign="center">

18
ng6-seed/src/app/reports/pd-mis/pd-mis.component.scss
View File

@ -62,3 +62,21 @@
font-size: 1.2rem !important; font-size: 1.2rem !important;
padding: 0 10px 0 10px; 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;
}

18
ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts
View File

@ -27,6 +27,7 @@ export class PdMisComponent implements OnInit {
public dataLength: number; public dataLength: number;
public pageSize : number; public pageSize : number;
public dataSource = new MatTableDataSource(); public dataSource = new MatTableDataSource();
error:any=[];
displayedColumns = ['serialno', displayedColumns = ['serialno',
'applicant', 'applicant',
@ -62,7 +63,6 @@ export class PdMisComponent implements OnInit {
this.reportsService.retirveDataForMISDailyReport().subscribe( this.reportsService.retirveDataForMISDailyReport().subscribe(
data => { data => {
if(data.dataStatus == true){ if(data.dataStatus == true){
this.api_data = data.records; this.api_data = data.records;
this.dataLength = data.records.length; this.dataLength = data.records.length;
@ -79,6 +79,11 @@ export class PdMisComponent implements OnInit {
this.dataLength = 0; this.dataLength = 0;
// this.Loading = true; // 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){ searchform(value:any){
this.reportsService.retirveDataForMISDailyReport().subscribe( this.reportsService.retirveDataForMISDailyReport().subscribe(
data => { data => {
if(data['dataStatus']==true) if(data['dataStatus']==true)
{ {
@ -124,13 +130,11 @@ export class PdMisComponent implements OnInit {
if(value.city !== null && value.city != ''){ if(value.city !== null && value.city != ''){
this.filtered_data = this.filterForCity(this.filtered_data,value.city); this.filtered_data = this.filterForCity(this.filtered_data,value.city);
} }
if(value.branch !== null && value.branch != ''){ 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 => val.branch == value.branch );
// this.filtered_data = this.filtered_data.filter(val => this.customFilter(val,value.brach,3)); // this.filtered_data = this.filtered_data.filter(val => this.customFilter(val,value.brach,3));
this.filtered_data = this.filterForBranch(this.filtered_data,value.branch); this.filtered_data = this.filterForBranch(this.filtered_data,value.branch);
} }
if(value.from_date !== null && value.to_date !== null){ if(value.from_date !== null && value.to_date !== null){
// console.log('value',value.from_date); // console.log('value',value.from_date);
// console.log('value',value.to_date); // console.log('value',value.to_date);
@ -154,7 +158,13 @@ export class PdMisComponent implements OnInit {
this.dataSource.data = this.filtered_data; this.dataSource.data = this.filtered_data;
this.dataLength = this.filtered_data.length; this.dataLength = this.filtered_data.length;
} }
}) },
error => {
this.error.push(error);
this.dataLength = 0;
this.Loading = false;
}
);
} }
filterForApplicantID(arrayData: any, Values: any) { filterForApplicantID(arrayData: any, Values: any) {

1
ng6-seed/src/app/reports/reports.service.ts
View File

@ -25,5 +25,4 @@ export class ReportsService {
retirveDataForMISDailyReport(): Observable<any> { retirveDataForMISDailyReport(): Observable<any> {
return this._http.get(this.apiUrl + 'PD_MIS_report'); return this._http.get(this.apiUrl + 'PD_MIS_report');
} }
} }

2
ng6-seed/src/environments/environment.ts
View File

@ -25,5 +25,5 @@ export const environment = {
s3_endpoint: '', s3_endpoint: '',
accessToken:'', accessToken:'',
//apiUrl:'http://localhost/sparqapi/api/' //apiUrl:'http://localhost/sparqapi/api/'
apiEndpoint: 'https://ssa.sineedge.com/sparqapi/api/' apiEndpoint: 'https://ssa.sineedge.com/sparqtest/api/'
}; };