diff --git a/src/app/models/chatMethod.ts b/src/app/models/chatMethod.ts index c813eb88d..2c47f0f4e 100644 --- a/src/app/models/chatMethod.ts +++ b/src/app/models/chatMethod.ts @@ -65,6 +65,7 @@ interface FirstUnread { } export interface Message { + customFields:any; _id: string; rid: string; msg: string; diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index d49c752c5..0ce60a14c 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -118,30 +118,29 @@ (click)="openGroupMessagesPage(group.value.id)" class="item-content flex-grow-1 cursor-pointer">
- {{group.value.name.split('-').join(' ')}} - {{group.value.name.split('-').join(' ')}}TT + {{group.value.name.split('-').join(' ')}}
- +
{{group.value.duration}}
+
{{countDownDate(group.value.customFields.countDownDate, group.value.id)}}
- + - +
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts index ffdf4c9cf..9ef101d5d 100644 --- a/src/app/services/chat/message.service.ts +++ b/src/app/services/chat/message.service.ts @@ -7,6 +7,7 @@ import { chatHistory, ChatMessage, File } from 'src/app/models/chatMethod' }) export class MessageService { + customFields channels = [] mentions = [] msg = '' @@ -20,7 +21,8 @@ export class MessageService { constructor() { } - setData({channels, mentions, msg ,rid ,ts, u, _id, _updatedAt, file, attachments}:Message) { + setData({customFields, channels, mentions, msg ,rid ,ts, u, _id, _updatedAt, file, attachments}:Message) { + this.customFields = customFields this.channels = channels this.mentions = mentions this.msg = msg diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index 55b0206b9..af1114b56 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -14,8 +14,9 @@ export class RoomService { lastMessage: MessageService; chatUser: ChatUserService[] = [] + customFields:any; id = '' - name = 'teste' + name = '' _updatedAt = {} private hasLoadHistory = false duration = '' @@ -27,7 +28,8 @@ export class RoomService { private MessageService: MessageService, ) {} - setData({id, name, lastMessage, _updatedAt}) { + setData({customFields, id, name, lastMessage, _updatedAt}) { + this.customFields = customFields this.id = id this.name = name this.lastMessage = lastMessage diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts index 8547f9384..aa7a30a8c 100644 --- a/src/app/services/chat/ws-chat-methods.service.ts +++ b/src/app/services/chat/ws-chat-methods.service.ts @@ -47,10 +47,11 @@ export class WsChatMethodsService { room = new RoomService(this.WsChatService, new MessageService()) room.setData({ + customFields: roomData.customFields, id: this.getRoomId(roomData), name: this.getRoomName(roomData), lastMessage: this.getRoomLastMessage(roomData), - _updatedAt: roomData._updatedAt['$date'] + _updatedAt: new Date(roomData._updatedAt['$date']) }) room.receiveMessage()