Commit a92e2ca6 by GD-A-150752

message-engine date-fix

parent ed6fe19e
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
"jquery": "3.2.1", "jquery": "3.2.1",
"jquery-ui-dist": "^1.12.1", "jquery-ui-dist": "^1.12.1",
"marked": "^0.5.1", "marked": "^0.5.1",
"moment": "2.18.1",
"nanoscroller": "^0.8.7", "nanoscroller": "^0.8.7",
"ng2-bootstrap": "^1.6.3", "ng2-bootstrap": "^1.6.3",
"ng2-select2": "^1.0.0-beta.16", "ng2-select2": "^1.0.0-beta.16",
......
...@@ -84,9 +84,6 @@ export class AdminPortalLayoutComponent implements OnInit, OnDestroy { ...@@ -84,9 +84,6 @@ export class AdminPortalLayoutComponent implements OnInit, OnDestroy {
} }
)); ));
this.jobId = '38048711';
this.showBubble = true;
if (this.deviceService.isMobile()) { if (this.deviceService.isMobile()) {
window.location.href = `${environment.baseUrl}extensions/adminportal/responsive_alert.jsp`; window.location.href = `${environment.baseUrl}extensions/adminportal/responsive_alert.jsp`;
} }
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</div> </div>
<div class="message-footer"> <div class="message-footer">
<div>via {{message.SentVia.Description}}</div> <div>via {{message.SentVia.Description}}</div>
<div>{{message.ObjectCreatedStr | oneitdate : 'dd/MM/yyyy HH:mm' : 'MM-dd-yyyy HH:mm'}}</div> <div>{{message.ObjectCreated | oneitdate : 'dd/MM/yyyy HH:mm'}}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</div> </div>
<div class="message-footer"> <div class="message-footer">
<div>via {{message.SentVia.Description}}</div> <div>via {{message.SentVia.Description}}</div>
<div>{{message.ObjectCreatedStr | oneitdate : 'dd/MM/yyyy HH:mm' : 'MM-dd-yyyy HH:mm'}}</div> <div>{{message.ObjectCreated | oneitdate : 'dd/MM/yyyy HH:mm'}}</div>
</div> </div>
</div> </div>
<div class="ui-g-12 ui-md-1 name owner {{embedded ? 'pad-5' : '' }}"> <div class="ui-g-12 ui-md-1 name owner {{embedded ? 'pad-5' : '' }}">
......
...@@ -136,6 +136,9 @@ export class MessageEngineApplicantViewComponent extends BaseComponent implement ...@@ -136,6 +136,9 @@ export class MessageEngineApplicantViewComponent extends BaseComponent implement
data => { data => {
this.jobApplication = data; this.jobApplication = data;
this.jobApplication.Messages = this.jobApplication.Messages || []; this.jobApplication.Messages = this.jobApplication.Messages || [];
this.jobApplication.Messages.forEach(msg => {
msg.ObjectCreated = new Date(msg.ObjectCreated);
});
// Assign current Job Application to new message // Assign current Job Application to new message
this.Message.JobApplication = this.jobApplication; this.Message.JobApplication = this.jobApplication;
this.Message.Attachments = []; this.Message.Attachments = [];
......
...@@ -16,5 +16,6 @@ export class MessageModel { ...@@ -16,5 +16,6 @@ export class MessageModel {
WorkFlowMessage: WorkflowMessageModel; WorkFlowMessage: WorkflowMessageModel;
JobApplication: JobApplicationModel; JobApplication: JobApplicationModel;
Attachments: Array<ChatAttachmentModel>; Attachments: Array<ChatAttachmentModel>;
ObjectCreated: Date;
ObjectCreatedStr: string; ObjectCreatedStr: string;
} }
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