Merge branch 'developer-prod' of bitbucket.org:equilibriumito/gabinete-digital-fo into chat/labels3

This commit is contained in:
Peter Maquiran
2023-09-12 21:16:42 +01:00
43 changed files with 1383 additions and 603 deletions
+12 -1
View File
@@ -719,6 +719,15 @@ export class RoomService {
return JSON.parse(str);
}
formatDateToDDMMYYYY(dateStamp) {
const date = new Date(dateStamp);
const day = date.getDate().toString().padStart(2, '0');
const month = (date.getMonth() + 1).toString().padStart(2, '0'); // Month is zero-based
const year = date.getFullYear();
return `${day}-${month}-${year}`;
}
sortArrayISODate(messages: any): any[] {
@@ -794,7 +803,6 @@ export class RoomService {
const messages = this.sortArrayISODate(await MessageModel.filter({rid:this.id}).execute()).reverse()
console.log('MessageModel', messages)
for (let ChatMessage of messages) {
@@ -804,6 +812,7 @@ export class RoomService {
const wewMessage = await this.simplePrepareMessage(ChatMessage)
wewMessage.from = 'Offline'
wewMessage.loadHistory = this.hasLoadHistory
wewMessage.messageModelInstance = ChatMessage
@@ -811,6 +820,8 @@ export class RoomService {
if(wewMessage.offline == false) {
const message = await this.prepareCreate({message:ChatMessage})
message.from = 'Offline'
message.loadHistory = this.hasLoadHistory
wewMessage.messageModelInstance = ChatMessage