diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index e2bcdf702..1973776d9 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -1,15 +1,18 @@ - +
{{users.name}} - + + +
@@ -31,7 +34,7 @@ - + @@ -40,7 +43,8 @@
- + + @@ -54,9 +58,11 @@ {{last ? scrollToBottom() : ''}}
-
+
- + + @@ -69,32 +75,36 @@
- +
image -
-
- - - - - - - - {{file.title}} -
+
+ + + + + + + + {{file.title}}
-
- - {{file.description}} - • - {{msg.file.type.replace('application/','').toUpperCase()}} - +
+
+ + {{file.description}} + • + {{msg.file.type.replace('application/','').toUpperCase()}} +
@@ -103,12 +113,51 @@
-
+ +
+
+
+ + + + + +
+
+ {{msg.u.name}} + {{showDateDuration(msg._updatedAt)}} +
+
+ {{msg.msg}} +
+
+
+ + TTTT + image +
+
+
+ {{last ? scrollToBottom() : ''}} +
+
+
+ + +
{{msg.u.name}} criou esta reunião
-
- De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}
- {{msg.file.venue}}
+
+ + De {{showDateDuration(msg.file.start_date)}} a + {{showDateDuration(msg.file.end_date)}} +
+ + + {{msg.file.venue}} +
{{last ? scrollToBottom() : ''}}
@@ -156,7 +205,8 @@
- + @@ -164,14 +214,17 @@
- - + \ No newline at end of file diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index 4b5328704..320cf23f8 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -109,7 +109,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy console.log("Chat route", this.route.url) this.setStatus('online'); - this.getMessageDB(); + //this.getMessageDB(); } onPressingMessage() { @@ -272,55 +272,57 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy } - getImageFromStorage (element) { - let image; - if (typeof element.file != 'undefined') { - if (typeof element.file.guid != 'undefined') { - let imageguid = this.storage.get(element.file.guid); - if (imageguid) { - image = imageguid; - console.log('IMAGE STORAGE', image) - } else { - image = ""; - console.log('IMAGE STORAGE', image) - } - } else { - image = ""; - } - } - console.log('IMAGE STORAGE RETURN', image.__zone_symbol__value) - return image.__zone_symbol__value; - } - - transformData(res) { + async transformData(res) { let mgsArray = []; - res.forEach(async element => { + res.map(async element => { - let chatmsg = { - _id: element._id, - attachments: element.attachments, - channels: element.channels, - file: element.file, - mentions: element.mentions, - msg: element.msg, - rid: element.rid, - ts: element.ts, - u: element.u, - _updatedAt: element._updatedAt, - image_url: this.getImageFromStorage(element), + if (element.file) { + if (element.file.guid) { + await this.storage.get(element.file.guid).then((image) => { + let chatmsg = { + _id: element._id, + attachments: element.attachments, + channels: element.channels, + file: { + guid: element.file.guid, + image_url: image, + type: element.file.type + }, + mentions: element.mentions, + msg: element.msg, + rid: element.rid, + ts: element.ts, + u: element.u, + _updatedAt: element._updatedAt, + + } + + mgsArray.push(chatmsg) + + }) + } + } else { + let chatmsg = { + _id: element._id, + attachments: element.attachments, + channels: element.channels, + mentions: element.mentions, + msg: element.msg, + rid: element.rid, + ts: element.ts, + u: element.u, + _updatedAt: element._updatedAt, + } + + mgsArray.push(chatmsg) } - mgsArray.push(chatmsg) - - }); - console.log('Web TRANSFORM MSG', mgsArray) - this.storage.remove('chatmsg').then(() => { + await this.storage.remove('chatmsg').then(() => { console.log('MSG REMOVE FROM STORAGE') }); - this.storage.set('chatmsg', mgsArray).then(() => { - console.log('MSG SAVED ON STORAGE') - this.getMessageDB(); + await this.storage.set('chatmsg', mgsArray).then((value) => { + console.log('MSG SAVED ON STORAGE', value) }); } @@ -328,10 +330,9 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy loadMessages() { //this.showLoader = true; const roomId = this.roomId - this.chatService.getRoomMessages(this.roomId).subscribe(res => { + this.chatService.getRoomMessages(this.roomId).subscribe(async res => { console.log('ALL MSG FROM CHATROCK', res); - this.transformData(res['messages']); - this.getMessageDB(); + await this.transformData(res['messages']); //this.getFileFromLakeFS(); /* this.messages = res['messages'].reverse(); this.chatMessageStore.add(roomId, this.messages) */ @@ -705,10 +706,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy // Show Error //showMessage(response.statusText); console.log('ALL MSG FROM CHATROCK', res); - /* this.transformData(res['messages']); - this.getMessageDB(); */ - this.transformData(res['messages']); + /* this.transformData(res['messages']);*/ + await this.transformData(res['messages']); this.getMessageDB(); + /* this.messages = res['messages'].reverse(); this.chatMessageStore.add(roomId, this.messages) */ @@ -827,7 +828,9 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy } async openPreview(msg) { - if (msg.image_url = "") { + if (msg.file.image_url === null) { + this.downloadFileMsg(msg) + } else { const modal = await this.modalController.create({ component: ViewMediaPage, cssClass: 'modal modal-desktop', @@ -838,8 +841,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy } }); modal.present(); - } else { - this.downloadFileMsg(msg) } }