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

fix message statud bag

Browse Source
This commit is contained in:
Peter Maquiran
2024-08-26 09:59:30 +01:00
parent c9b50620fe
commit 0f94af5f4e
18 changed files with 285 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/ui/chat/component/messages/messages.page.ts
+11 -10
View File
@@ -68,7 +68,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
roomType!: RoomType
RoomTypeEnum = RoomType
@Input() roomId: string;
@Input() showMessages: string;
@@ -147,6 +147,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
@ViewChild('imageModal') imageModal: TemplateRef<any>;
totalMembers = 0
members: MemberTable[] = []
constructor(
public popoverController: PopoverController,
@@ -200,6 +201,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.roomMembers$ = this.MemberListLocalRepository.getRoomMemberByIdLive(this.roomId).pipe(
tap((members) => {
this.totalMembers = members.length
this.members = members
for(const member of members) {
if(member.wxUserId == SessionStore.user.UserId) {
this.isAdmin = member.isAdmin
@@ -210,7 +212,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.roomStatus$ = this.MemberListLocalRepository.allMemberOnline(this.roomId)
this.chatServiceService.getRoomById(this.roomId)
this.messageTypingSubject?.unsubscribe()
this.messageTypingSubject = this.userTypingLocalRepository.getUserTypingLiveByRoomId(this.roomId).subscribe((e) => {
const arrayNames = e.filter((b)=> b.userId != SessionStore.user.UserId).map(e => e.userName)
@@ -218,14 +220,12 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
const uniqueArray = [...new Set(arrayNames)];
console.log({uniqueArray})
if(uniqueArray.length >= 1) {
(this.myInputRef.nativeElement as HTMLDivElement).innerHTML = uniqueArray + '...'
} else {
(this.myInputRef.nativeElement as HTMLDivElement).innerHTML = ''
}
}) as any
}
@@ -246,7 +246,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
}
allViewed(message: MessageEntity) {
return message.info.filter(e => typeof e.readAt == 'string').length == this.totalMembers
const totalMembers = this.members.filter((e) => message.sender.wxUserId != e.wxUserId ).length
return message.info.filter(e => typeof e.readAt == 'string' && message.sender.wxUserId != e.memberId ).length == totalMembers
}
async getMessages() {
@@ -258,9 +259,9 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.messages1[this.roomId] = []
this.messages1[this.roomId] = messages
if(messages.length >= 1) {
this.messages1[this.roomId].push(LastMessage)
}
// if(messages.length >= 1) {
// this.messages1[this.roomId].push(LastMessage)
// }
this.loadAttachment()
setTimeout(() => {
@@ -1001,7 +1002,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
]
});
await alert.present();
})
}