peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
tiago.kayaya
2022-01-13 21:24:43 +01:00
parent 360748a5f4
commit c5ac6831b0
5 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/models/chatMethod.ts
+1
View File
@@ -65,6 +65,7 @@ interface FirstUnread {
}
export interface Message {
customFields:any;
_id: string;
rid: string;
msg: string;
src/app/pages/chat/chat.page.html
+10 -11
View File
@@ -118,30 +118,29 @@
(click)="openGroupMessagesPage(group.value.id)" class="item-content flex-grow-1 cursor-pointer">
<div class="item-title-time">
<div class="item-title" [class.item-title-active]="group.value.id ==idSelected">
{{group.value.name.split('-').join(' ')}}
<ion-label>{{group.value.name.split('-').join(' ')}}</ion-label>TT
<ion-label>{{group.value.name.split('-').join(' ')}}</ion-label>
</div>
<!-- <div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.lastMessage && !group.customFields.countDownDate">{{group.value.duration}}</div>
<div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.customFields.countDownDate">{{countDownDate(group.value.customFields.countDownDate, group.value.id)}}</div> -->
<div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.lastMessage && !group.value.customFields.countDownDate">{{group.value.duration}}</div>
<div class="item-date" [class.item-date-active]="group.value.id ==idSelected" *ngIf="group.value.customFields.countDownDate">{{countDownDate(group.value.customFields.countDownDate, group.value.id)}}</div>
</div>
<!-- <div *ngIf="group.value.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group.value.id ==idSelected">
<div class="item-message">{{group.value.lastMessage.u.name}}: {{group.lastMessage.msg}} </div>
<div class="item-files add-ellipsis" *ngIf="group.value.lastMessage.file">
<div *ngIf="group.value.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group.value.id ==idSelected">
<div class="item-message">{{group.value.lastMessage.u.name}}: {{group.value.lastMessage.msg}} </div>
<div class="item-files add-ellipsis" *ngIf="group.value.file">
<fa-icon *ngIf="group.value.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group.value.id == idSelected"></fa-icon>
<fa-icon *ngIf="group.value.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="group.value.id == idSelected"></fa-icon>
<span class="item-files-title"> {{group.value.lastMessage.file.name || group.value.lastMessage.file.subject}}</span>
<span class="item-files-title"> {{group.value.lastMessage.file.name || group.value.file.subject}}</span>
</div>
<div class="item-files" *ngIf="group.value.lastMessage.attachments">
<div class="item-files" *ngIf="group.value.attachments">
<div *ngIf="group.value.value.lastMessage.attachments[0].image_url">
<fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="group.value.id == idSelected"></fa-icon>
<span> Fotografia</span>
</div>
</div>
</div> -->
</div>
</div>
</div>
</ion-item-sliding>
<ion-item-sliding *ngIf="wsChatMethodsService.loadingWholeList || wsChatMethodsService.groupCount">
<ion-item-sliding *ngIf="wsChatMethodsService.loadingWholeList || wsChatMethodsService.groupCount < 1">
<div *ngFor="let n of numSequence(8); let i = index;" class="item item-hover width-100 d-flex ion-no-padding ion-no-margin">
<div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-group-chat-grey.svg"></ion-icon></div>
<div class="item-content flex-grow-1 cursor-pointer">
src/app/services/chat/message.service.ts
+3 -1
View File
@@ -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
src/app/services/chat/room.service.ts
+4 -2
View File
@@ -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
src/app/services/chat/ws-chat-methods.service.ts
+2 -1
View File
@@ -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()