diff --git a/ng6-seed/src/app/error/404/error-404-component.html b/ng6-seed/src/app/error/404/error-404-component.html index b07de6d..f9c9981 100755 --- a/ng6-seed/src/app/error/404/error-404-component.html +++ b/ng6-seed/src/app/error/404/error-404-component.html @@ -1,4 +1,4 @@ -
+ + +
+
+ + +

PD Genie +

+ +
+

+ Oops!

+ {{errorMsgObject.title}} +

+ {{errorMsgObject.subtitle}}

+
+

{{errorMsgObject.message}}

+
+
+ +
+
+
\ No newline at end of file diff --git a/ng6-seed/src/app/error/404/error-404-component.scss b/ng6-seed/src/app/error/404/error-404-component.scss index e69de29..ebc348e 100755 --- a/ng6-seed/src/app/error/404/error-404-component.scss +++ b/ng6-seed/src/app/error/404/error-404-component.scss @@ -0,0 +1,9 @@ +.form-bg { + //background-image:url('http://www.ssa.sineedge.com/beta/assets/images/login.jpg') !important; + //background-image: url(../../../assets/images/login_o.jpg); + //background-color: #F44336; + background: url(../../../assets/images/bg.png) repeat-x 0 0 #ffffff; + height: 100vh !important; + background-position: center !important; + // min-height: calc(90vh + 90px) !important; + } \ No newline at end of file diff --git a/ng6-seed/src/app/error/404/error-404.component.ts b/ng6-seed/src/app/error/404/error-404.component.ts index 3aac1d4..70b40be 100755 --- a/ng6-seed/src/app/error/404/error-404.component.ts +++ b/ng6-seed/src/app/error/404/error-404.component.ts @@ -1,4 +1,6 @@ import { Component, OnInit,ViewEncapsulation } from '@angular/core'; +import { Router } from '@angular/router'; +import { LoaderService } from 'app/shared/loaderService/loader.service'; @Component({ selector: 'ms-error-404', @@ -7,12 +9,25 @@ import { Component, OnInit,ViewEncapsulation } from '@angular/core'; encapsulation: ViewEncapsulation.None }) export class ErrorOneComponent implements OnInit { + errorMsgObject: any; - constructor() {} + constructor(private router:Router, private loaderService:LoaderService) {} - ngOnInit() { + ngOnInit() { + // this.errorMsgObject ={ + // title:"404", + // subtitle:'Not Found', + // message:'The requested URL is not found on the server', + // is_homebtn:false + // } + this.errorMsgObject = this.loaderService.errorMsg - } + console.log(this.errorMsgObject); + } + + takeMeToHome() { + this.router.navigate(['/home']); + } } 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 0a602e5..6751679 100755 --- 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 @@ -23,6 +23,7 @@ import { EmployerInfoComponent } from '../pd-questions/employer-info/employer-in import { InputDialogComponent } from '../input-dialog/input-dialog.component'; import { PdCompleteStatusDialogueComponent } from '../pd-complete-status-dialogue/pd-complete-status-dialogue.component'; import { CognitoService } from 'app/AwsService/cognito.service'; +import { LoaderService } from 'app/shared/loaderService/loader.service'; const currentdate = new Date().toJSON().slice(0,19); @Component({ @@ -104,7 +105,8 @@ export class ViewPdComponent implements OnInit, OnDestroy { masterRandomString: any; is_from_link: boolean = false; constructor(notifier: NotifierService, private dialog: MatDialog, private _fb: FormBuilder, private changeRef:ChangeDetectorRef, - private _pd: PdTrigerService, private route: ActivatedRoute, private router: Router, private ListPdComponent: ListPdComponent,private cognitoService:CognitoService) { + private _pd: PdTrigerService, private route: ActivatedRoute, private router: Router, private ListPdComponent: ListPdComponent,private cognitoService:CognitoService, + private loaderService:LoaderService) { this.notifier = notifier; this.enableStartPD = false; this.roleAccessDetails=this._pd.getRoleAccessDetails(); @@ -137,7 +139,9 @@ export class ViewPdComponent implements OnInit, OnDestroy { } console.log("view pd ",this.viewID) if(this.viewID == 'undefined'){ - this.router.navigate(['/error']) + let msgObj ={title:'',subtitle: 'Invalid Link',is_homebtn:false,message:'The requested url is Invalid. Please contact info@pdgenie.com'} + this.loaderService.setErrorMsg({title:msgObj.title,subtitle:msgObj.subtitle,is_homebtn:false,message:msgObj.message}) + this.router.navigate(['/error'],{replaceUrl:true}) } } }) @@ -154,6 +158,12 @@ export class ViewPdComponent implements OnInit, OnDestroy { if (data.status == 200) { let masterData: any = data.records.pd_master_details; this.pdMasterData.push(masterData[0]); + console.log("sdffff",this.is_from_link,this.pdMasterData[0].pd_status) + if(this.is_from_link &&( this.pdMasterData[0].vendor_status == 'COMPLETED' || this.pdMasterData[0].vendor_status == 'QC_COMPLETED')) { + let msgObj ={title:'',subtitle: 'Invalid Link',is_homebtn:false,message:'The requested url is Invalid. Please contact info@pdgenie.com'} + this.loaderService.setErrorMsg({title:msgObj.title,subtitle:msgObj.subtitle,is_homebtn:false,message:msgObj.message}) + this.router.navigate(['/error'],{replaceUrl:true}) + } this.mandatoryFieldsValidations = masterData[1].mandatory_fields; this.pd_QC_Rating = Number(this.pdMasterData.qc_rating); this.pdApplicantData = data.records.applicants_details; diff --git a/ng6-seed/src/app/shared/loaderService/loader.service.ts b/ng6-seed/src/app/shared/loaderService/loader.service.ts index 94ae8dc..e4f472d 100755 --- a/ng6-seed/src/app/shared/loaderService/loader.service.ts +++ b/ng6-seed/src/app/shared/loaderService/loader.service.ts @@ -5,6 +5,12 @@ import { ProgressSpineerDialogComponent } from '../progress-spineer-dialog/progr export interface LoaderState { show: boolean; } +export interface errorMsgInterface { + title:string; + subtitle:string; + message:string; + is_homebtn:boolean +} @Injectable({ providedIn: 'root' }) @@ -12,7 +18,18 @@ export class LoaderService { private loaderSubject = new Subject(); loaderState = this.loaderSubject.asObservable(); spinnerdialogRef: MatDialogRef; - constructor(private dialog:MatDialog) { } + errorMsg:errorMsgInterface; + constructor(private dialog:MatDialog) { + this.errorMsg ={ + title:"404", + subtitle:'Not Found', + message:'The requested URL is not found on the server', + is_homebtn:false + } + } + setErrorMsg(obj:errorMsgInterface) { + this.errorMsg = obj + } show() { this.loaderSubject.next({ show: true }); }