From e1ac8583f3a9a64ce0bc0162d4d2b8c70bc552a5 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 28 Mar 2023 16:11:59 +0100 Subject: [PATCH] change reference --- config.xml | 1 + .../pages/chat/group-messages/group-messages.page.ts | 4 ++-- src/app/pages/chat/messages/messages.page.ts | 6 +++--- src/app/services/chat/message.service.ts | 2 +- .../chat/group-messages/group-messages.page.ts | 2 +- src/app/shared/chat/messages/messages.page.ts | 10 ++++++---- version/git-version.ts | 12 ++++++------ 7 files changed, 20 insertions(+), 17 deletions(-) diff --git a/config.xml b/config.xml index 17e317687..d592cd3bc 100644 --- a/config.xml +++ b/config.xml @@ -20,6 +20,7 @@ + diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 106979ccf..171a9db0d 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -1136,7 +1136,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { modal.present(); } else { this.downloadFileFromBrowser("file", str) - this.downloadFileFromBrowser(msg.attachments[0].name, str) + this.downloadFileFromBrowser(msg.attachments[0].title, str) } } else { @@ -1153,7 +1153,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { }); modal.present(); } else { - this.openFile(str, msg.attachments[0].name, msg.file.type); + this.openFile(str, msg.attachments[0].title, msg.file.type); } } } diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index f04104503..592381c34 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -1067,9 +1067,9 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { } else { this.downloadFileFromBrowser("file", str) - this.downloadFileFromBrowser(msg.attachments[0].name, str) + this.downloadFileFromBrowser(msg.attachments[0].title, str) - this.downloadFileFromBrowser(msg.attachments[0].name, str) + this.downloadFileFromBrowser(msg.attachments[0].title, str) } @@ -1087,7 +1087,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { }); modal.present(); } else { - this.openFile(str, msg.attachments[0].name, msg.file.type); + this.openFile(str, msg.attachments[0].title, msg.file.type); } } diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts index a0c279faf..141ba951d 100644 --- a/src/app/services/chat/message.service.ts +++ b/src/app/services/chat/message.service.ts @@ -290,7 +290,7 @@ export class MessageService { clearTimeout(this.functionTimer); this.redefinedMessage(ChatMessage) - console.log() + // console.log() } ).catch((error) => { clearTimeout(this.functionTimer); diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 249aa5739..a2aa7f835 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -1112,7 +1112,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe this.downloadFileFromBrowser("file", str) } } else { - this.openFile(str, msg.attachments[0].name, msg.file.type); + this.openFile(str, msg.attachments[0].title, msg.file.type); } } diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index 089665e26..496a57568 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -1057,11 +1057,14 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy this.downloadFileMsg(msg) } else { - var str = msg.attachments[0].image_url; + + var str = msg.attachments[0].image_url str = str.substring(1, ((str.length) - 1)); if (this.platform.is('desktop') || this.platform.is('mobileweb')) { + console.log('hello') + console.log(msg) if (msg.file.type == "application/img") { const modal = await this.modalController.create({ @@ -1081,11 +1084,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy } else { - this.openFile(str, msg.attachments[0].name, msg.file.type); + this.openFile(str, msg.attachments[0].title, msg.file.type); + // this.downloadFileFromBrowser("file", str) } - - } } diff --git a/version/git-version.ts b/version/git-version.ts index 95fd6cf95..11140ee9c 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "7c03c3f82", - "SHA": "7c03c3f822d7af32096a855cd83877bf61532e65", + "shortSHA": "6f99c792d", + "SHA": "6f99c792dcb13965ba29278b58b374766f4fa8a4", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Mar 20 16:10:11 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "4883", + "lastCommitTime": "'Wed Mar 22 15:31:01 2023 +0100'", + "lastCommitMessage": "fix sayings", + "lastCommitNumber": "4884", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: dockerfile\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.ts\n\tmodified: src/app/models/envarioment.ts\n\tmodified: src/app/models/user.model.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/popover/despachos-options/despachos-options.page.html\n\tmodified: src/app/shared/popover/despachos-options/despachos-options.page.ts\n\tmodified: src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html\n\tmodified: src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified: src/environments/suport/doneIt.ts\n\tmodified: src/environments/suport/oapr.ts\n\tmodified: version/git-version.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: config.xml\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/messages/messages.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file