From 92f10ff64c55625f74431507672ea72f0150105b Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 9 Feb 2022 14:51:00 +0100 Subject: [PATCH 1/3] save --- src/app/pages/publications/publications.page.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 61fee0fc9..1cc20f8e8 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -103,7 +103,7 @@ export class PublicationsPage implements OnInit { hideRefreshButton() { window.onresize = (event) => { - if (window.innerWidth < 801) { + if (window.innerWidth < 701) { this.hideRefreshBtn = false; this.showSlidingOptions = false; } @@ -112,7 +112,7 @@ export class PublicationsPage implements OnInit { this.showSlidingOptions = true; } } - if (window.innerWidth < 801) { + if (window.innerWidth < 701) { this.hideRefreshBtn = false; this.showSlidingOptions = false; } @@ -375,7 +375,7 @@ export class PublicationsPage implements OnInit { this.closeDesktopComponent(); // OpenModal - if (window.innerWidth <= 800) { + if (window.innerWidth < 701) { /* let item = this.publicationFolderList; */ const modal = await this.modalController.create({ component: ViewPublicationsPage, From a9e68cafce5ab45cda8797ef8d382b1ceb7b5b43 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 9 Feb 2022 15:03:13 +0100 Subject: [PATCH 2/3] save --- src/app/shared/chat/group-messages/group-messages.page.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 99cde18f3..402175eaa 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -555,7 +555,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe const formData = new FormData(); formData.append("blobFile", blob); - this.wsChatMethodsService.getDmRoom(roomId).send({ + this.wsChatMethodsService.getGroupRoom(roomId).send({ file: { "type": "application/img", "guid": '' @@ -638,7 +638,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe const formData = new FormData(); formData.append("blobFile", file); - this.wsChatMethodsService.getDmRoom(roomId).send({ + this.wsChatMethodsService.getGroupRoom(roomId).send({ file: { "type": "application/img", "guid": '' From d04e50312ed03bf24ea37cd952874b769c2adbba Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 9 Feb 2022 15:09:47 +0100 Subject: [PATCH 3/3] save --- .../group-messages/group-messages.page.ts | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) 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 e9d318a5a..dfe16ba9b 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -97,7 +97,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { private AttachmentsService: AttachmentsService, private storage: Storage, private processesService: ProcessesService, - + private CameraService: CameraService, ) { this.loggedUserChat = authService.ValidatedUserChat['data']; @@ -112,7 +112,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory(); this.wsChatMethodsService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked; this.wsChatMethodsService.openRoom(this.roomId) - + setTimeout(()=>{ this.scrollToBottomClicked() }, 50) @@ -199,7 +199,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { changeInput() { - this.wsChatMethodsService.getDmRoom(this.roomId).typing() + this.wsChatMethodsService.getGroupRoom(this.roomId).typing() } async goToEvent(eventId: any) { @@ -437,11 +437,11 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { } } - + async takePicture() { const roomId = this.roomId - + const image = await this.CameraService.takePicture(); await this.fileService.saveImage(image) const lastphoto: any = await this.fileService.loadFiles(); @@ -451,7 +451,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { const formData = new FormData(); formData.append("blobFile", blob); - this.wsChatMethodsService.getDmRoom(roomId).send({ + this.wsChatMethodsService.getGroupRoom(roomId).send({ file: { "type": "application/img", "guid": '' @@ -466,11 +466,11 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { }) } - + async addImage() { this.addFileToChat(['image/apng', 'image/jpeg', 'image/png']) } - + async addFile() { this.addFileToChat(['.doc', '.docx', '.pdf']) } @@ -492,7 +492,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { if(data.selected) { const loader = this.toastService.loading(); - this.wsChatMethodsService.getDmRoom(this.roomId).send({ + this.wsChatMethodsService.getGroupRoom(this.roomId).send({ file:{ "name": res.data.selected.Assunto, "type": "application/webtrix", @@ -528,8 +528,8 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { const formData = new FormData(); formData.append("blobFile", file); - - this.wsChatMethodsService.getDmRoom(this.roomId).send({ + + this.wsChatMethodsService.getGroupRoom(this.roomId).send({ file: { "type": "application/img", "guid": '' @@ -544,7 +544,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { }) } - + async openChatOptions(ev?: any) { console.log(this.members); const roomId = this.roomId;