Commit 6cb6d98f by chamath

S53527407 - Mobile UX - Messaging.

Message engine back button issue fixed.
parent a8e61d72
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { NgForm } from '@angular/forms'; import { NgForm } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import { MenuItem } from 'primeng/api'; import { MenuItem } from 'primeng/api';
import { Editor } from 'primeng/editor'; import { Editor } from 'primeng/editor';
import { FileUpload } from 'primeng/fileupload'; import { FileUpload } from 'primeng/fileupload';
import { Subscription } from 'rxjs/Subscription'; import { Subscription } from 'rxjs/Subscription';
import { environment } from '../../../environments/environment'; import { environment } from '../../../environments/environment';
import { AppService } from '../../app.service'; import { AppService } from '../../app.service';
import { ASSOCS } from '../../constants'; import { ASSOCS } from '../../constants';
import { ChatAttachmentModel } from '../../models/chat-attachment.model'; import { ChatAttachmentModel } from '../../models/chat-attachment.model';
...@@ -21,6 +19,7 @@ import { BaseComponent } from '../admin-portal/base/base.component'; ...@@ -21,6 +19,7 @@ import { BaseComponent } from '../admin-portal/base/base.component';
import { ApplicantPortalLayoutService } from '../applicant-portal/applicant-portal-layout/applicant-portal-layout.service'; import { ApplicantPortalLayoutService } from '../applicant-portal/applicant-portal-layout/applicant-portal-layout.service';
import { MessageEngineService } from './message-engine.service'; import { MessageEngineService } from './message-engine.service';
@Component({ @Component({
selector: 'app-message-engine', selector: 'app-message-engine',
templateUrl: './message-engine.component.html', templateUrl: './message-engine.component.html',
...@@ -51,8 +50,6 @@ export class MessageEngineComponent extends BaseComponent implements OnInit { ...@@ -51,8 +50,6 @@ export class MessageEngineComponent extends BaseComponent implements OnInit {
markedAsRead: boolean = false; markedAsRead: boolean = false;
constructor( constructor(
private router: Router,
private activatedRoute: ActivatedRoute,
private utilsService: UtilsService, private utilsService: UtilsService,
private saveService: SaveService, private saveService: SaveService,
private appService: AppService, private appService: AppService,
...@@ -65,7 +62,7 @@ export class MessageEngineComponent extends BaseComponent implements OnInit { ...@@ -65,7 +62,7 @@ export class MessageEngineComponent extends BaseComponent implements OnInit {
} }
goBack(): void { goBack(): void {
const url = `${environment.baseUrl}ApplicantPortal-JobApplication.htm?cms.rm=Page&JobID=${this.jobApplicationID}`; const url = `${environment.baseUrl}ApplicantPortal-JobApplication.htm?cms.rm=Page&JobID=${this.utilsService.getId(this.jobApplication.Job.ObjectID)}`;
if (window.history.length > 2) { if (window.history.length > 2) {
const cur_path = this.location.path(); const cur_path = this.location.path();
this.location.back(); this.location.back();
...@@ -132,6 +129,7 @@ export class MessageEngineComponent extends BaseComponent implements OnInit { ...@@ -132,6 +129,7 @@ export class MessageEngineComponent extends BaseComponent implements OnInit {
this.createdObjs = {}; this.createdObjs = {};
const assocs = [ const assocs = [
ASSOCS.JOB,
ASSOCS.MESSAGES, ASSOCS.MESSAGES,
[ASSOCS.MESSAGES, ASSOCS.SENT_BY].join('.'), [ASSOCS.MESSAGES, ASSOCS.SENT_BY].join('.'),
[ASSOCS.MESSAGES, ASSOCS.ATTACHMENTS].join('.'), [ASSOCS.MESSAGES, ASSOCS.ATTACHMENTS].join('.'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment