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 da629f705..2b1529809 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -546,6 +546,9 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { } else if (res.data == 'edit') { this.editGroup(this.roomId); + } else if (res.data == 'addUser') { + + this.addContacts(); } }); } @@ -820,25 +823,27 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { } async addContacts() { - + if(this.isAdmin) { - const modal = await this.modalController.create({ - component: GroupContactsPage, - componentProps: { - isCreated: this.isGroupCreated, - room: this.room, - members: this.members, - name: this.room.name, - }, - cssClass: 'contacts', - backdropDismiss: false - }); + const modal = await this.modalController.create({ + component: GroupContactsPage, + componentProps: { + isCreated: this.isGroupCreated, + room: this.room, + members: this.members, + name: this.room.name, + }, + cssClass: 'contacts', + backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss().then(() => { + this.getRoomInfo(); + }); + } - await modal.present(); - - modal.onDidDismiss().then(() => { - this.getRoomInfo(); - }); } async editGroup(roomId) { 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 031820182..5ac3f36a4 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -528,7 +528,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe }); await modal.present(); modal.onDidDismiss().then(res => { - + console.log(res) if (res.data == 'leave') { this.getRoomInfo(); this.closeAllDesktopComponents.emit(); @@ -546,6 +546,9 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe //this.closeAllDesktopComponents.emit(); this.openEditGroupPage.emit(this.roomId); + } else if (res.data == 'addUser') { + + this.openGroupContactsPage(); } else { @@ -616,24 +619,26 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe } async addContacts() { + if(this.isAdmin) { + const modal = await this.modalController.create({ + component: GroupContactsPage, + componentProps: { + isCreated: this.isGroupCreated, + room: this.room, + members: this.members, + name: this.room.name, + }, + cssClass: 'contacts', + backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss().then(() => { + //this.getRoomInfo(); + }); + } - const modal = await this.modalController.create({ - component: GroupContactsPage, - componentProps: { - isCreated: this.isGroupCreated, - room: this.room, - members: this.members, - name: this.room.name, - }, - cssClass: 'contacts', - backdropDismiss: false - }); - - await modal.present(); - - modal.onDidDismiss().then(() => { - //this.getRoomInfo(); - }); } diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index 3ae9c4475..855a51407 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -6,7 +6,7 @@
- +
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts index 633eb6cbe..2ee30fe75 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -5,8 +5,6 @@ import { ToastService } from 'src/app/services/toast.service'; import { ThemeService } from 'src/app/services/theme.service' import { SetRoomOwnerPage } from 'src/app/modals/set-room-owner/set-room-owner.page'; import { ChatSystemService } from 'src/app/services/chat/chat-system.service'; -import { HttpErrorResponse } from '@angular/common/http'; -import { SessionStore } from 'src/app/store/session.service'; @Component({ @@ -41,11 +39,11 @@ export class ChatPopoverPage implements OnInit { close(action:any){ if( window.innerWidth < 701){ this.popoverController.dismiss(action); - this.modalController.dismiss(action); + this.modalController.dismiss(action) } else{ this.popoverController.dismiss(action); - this.modalController.dismiss(action); + this.modalController.dismiss(action) } } @@ -126,16 +124,24 @@ export class ChatPopoverPage implements OnInit { } }); this.popoverController.dismiss('delete'); - this.modalController.dismiss('delete'); + this.modalController.dismiss('delete') } async openChangeGroupName(){ if( window.innerWidth < 701){ this.popoverController.dismiss('edit'); + this.modalController.dismiss('edit') } else{ - this.modalController.dismiss('edit'); + this.popoverController.dismiss('edit'); + this.modalController.dismiss('edit') } } + + async addUser() { + this.popoverController.dismiss('addUser'); + this.modalController.dismiss('addUser') + } + } diff --git a/version/git-version.ts b/version/git-version.ts index e3e80ed28..1a76ec54c 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "0b4cafda2", - "SHA": "0b4cafda22aba43e3e2acb6f454b2a8ae51ef467", + "shortSHA": "789c2f4e8", + "SHA": "789c2f4e8b10fe5ecb2975baf9b1a328f8f72607", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Mar 9 15:15:06 2023 +0100'", - "lastCommitMessage": "remove all date", - "lastCommitNumber": "4854", + "lastCommitTime": "'Thu Mar 9 15:18:19 2023 +0100'", + "lastCommitMessage": "remove json text", + "lastCommitNumber": "4855", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.html\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file