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 ballon

Browse Source
This commit is contained in:
Peter Maquiran
2024-09-04 10:58:26 +01:00
parent 100d64f799
commit 0f3096b25e
11 changed files with 123 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/ui/chat/component/messages/messages.page.html
+4 -4
View File
@@ -48,9 +48,9 @@
*ngFor="let message of messages1[roomId]; let messageIndex = index" class="messages-list-item-wrapper px-10-em"
[ngClass]="{
'info-meeting': message.messageType == IMessageType.information && !message.ballon,
'info-ballon': message.ballon,
'my-message': message.messageType == IMessageType.normal && message?.sender?.wxUserId === SessionStore.user.UserId,
'other-message': message.messageType == IMessageType.normal && message?.sender?.wxUserId !== SessionStore.user.UserId
'info-ballon': message.ballon == true,
'my-message': message.messageType == IMessageType.normal && message?.sender?.wxUserId === SessionStore.user.UserId && !message.ballon,
'other-message': message.messageType == IMessageType.normal && message?.sender?.wxUserId !== SessionStore.user.UserId && !message.ballon
}"
>
<div class="message-container rotate-div" *ngIf="message.showMessage">
@@ -148,7 +148,7 @@
<div class="message-container rotate-div" *ngIf="message.isDeleted == true">
Mensagem foi eliminada
</div>
<div *ngIf="message.messageType == IMessageType.information" class="text-center">
<div *ngIf="message.messageType == IMessageType.information && !message.ballon" class="text-center">
{{ message.message }}
</div>
<div *ngIf="message.ballon" class="text-center ballon">
src/app/ui/chat/component/messages/messages.page.ts
+57 -3
View File
@@ -351,7 +351,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
async loadAttachment() {
for(const message of this.messages1[this.roomId]) {
if(message.hasAttachment) {
if(message.hasAttachment && message.attachments[0].source != MessageAttachmentSource.Webtrix) {
if(message.$id) {
this.chatServiceService.getMessageAttachmentByMessageId(message).then((result)=> {
@@ -422,6 +422,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.messageReceiveSubject?.unsubscribe();
this.messageReceiveSubject = this.chatServiceService.listenToIncomingMessage(this.roomId).subscribe(async (message) => {
const date = whatsappDate(message.sentAt, false)
if(!this.date[date]) {
this.date[date] = true
const Ballon = XBallon(message)
this.messages1[this.roomId].push(Ballon)
}
this.messages1[this.roomId].push(new MessageViewModal(message))
if(message.hasAttachment) {
@@ -754,8 +761,19 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
safeFile: this.sanitiser.bypassSecurityTrustResourceUrl(this.audioRecordedDataUrl)
}]
this.chatServiceService.sendMessage(message, this.roomType)
message.sentAt = new Date().toISOString()
const date = whatsappDate(message.sentAt, false)
if(!this.date[date]) {
this.date[date] = true
const Ballon = XBallon(message)
this.messages1[this.roomId].push(Ballon)
}
this.messages1[this.roomId].push(message)
this.chatServiceService.sendMessage(message, this.roomType)
setTimeout(() => {
this.scrollToBottomClicked()
}, 100)
@@ -811,6 +829,14 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
message.sentAt = new Date().toISOString()
this.textField = ''
const date = whatsappDate(message.sentAt, false)
if(!this.date[date]) {
this.date[date] = true
const Ballon = XBallon(message)
this.messages1[this.roomId].push(Ballon)
}
this.messages1[this.roomId].push(message)
setTimeout(() => {
this.scrollToBottomClicked()
@@ -997,7 +1023,14 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
mimeType: 'image/'+picture.value.format
}]
this.messages1[this.roomId].push(new MessageViewModal(message))
const date = whatsappDate(message.sentAt, false)
if(!this.date[date]) {
this.date[date] = true
const Ballon = XBallon(message)
this.messages1[this.roomId].push(Ballon)
}
setTimeout(() => {
this.scrollToBottomClicked()
}, 100)
@@ -1053,6 +1086,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
docId: res.data.selected.Id,
}]
const date = whatsappDate(message.sentAt, false)
if(!this.date[date]) {
this.date[date] = true
const Ballon = XBallon(message)
this.messages1[this.roomId].push(Ballon)
}
this.messages1[this.roomId].push(new MessageViewModal(message))
setTimeout(() => {
this.scrollToBottomClicked()
@@ -1143,6 +1183,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
description: ''
}]
const date = whatsappDate(message.sentAt, false)
if(!this.date[date]) {
this.date[date] = true
const Ballon = XBallon(message)
this.messages1[this.roomId].push(Ballon)
}
this.messages1[this.roomId].push(message)
setTimeout(() => {
this.scrollToBottomClicked()
@@ -1199,6 +1246,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
mimeType: file.value.type
}]
const date = whatsappDate(message.sentAt, false)
if(!this.date[date]) {
this.date[date] = true
const Ballon = XBallon(message)
this.messages1[this.roomId].push(Ballon)
}
this.messages1[this.roomId].push(message)
setTimeout(() => {
this.scrollToBottomClicked()
src/app/ui/chat/store/model/message.ts
+1 -1
View File
@@ -27,7 +27,7 @@ export class MessageViewModal {
messageUiType!: 'info-meeting'| 'my-message'| 'other-message'
showReaction = false
showMessage = false
ballo = false
ballon = false
constructor(model?: IMessage) {
if(model) {
src/app/ui/chat/utils/messageBallon.ts
+3 -1
View File
@@ -1,6 +1,7 @@
import { SessionStore } from "src/app/store/session.service";
import { MessageViewModal } from "../store/model/message";
import { whatsappDate } from "../../shared/utils/whatappdate";
import { IMessageType } from "src/app/core/chat/entity/message";
export function XBallon(message: any) {
const MessageBallon = new MessageViewModal(message as any)
@@ -9,7 +10,8 @@ export function XBallon(message: any) {
MessageBallon.isDeleted = false
MessageBallon.sentAt = message.sentAt
MessageBallon.message = whatsappDate(message.sentAt, false)
MessageBallon.ballo = true
MessageBallon.messageType == IMessageType.information
MessageBallon.ballon = true
MessageBallon.sender = {
userPhoto: '',
wxeMail: SessionStore.user.Email,