diff --git a/src/app/ui/chat/component/group-contacts/group-contacts.page.ts b/src/app/ui/chat/component/group-contacts/group-contacts.page.ts index 5aaa76895..b04d54191 100644 --- a/src/app/ui/chat/component/group-contacts/group-contacts.page.ts +++ b/src/app/ui/chat/component/group-contacts/group-contacts.page.ts @@ -142,7 +142,9 @@ export class GroupContactsPage implements OnInit { } FilterUserListedByTextSearch() { - return this.allChatUsers.filter( e => e.wxFullName.toLowerCase().includes(this.textSearch.toLowerCase())).sort((a,b) => { + const currentMemberIds = this.currentMembers.map(e => e.wxUserId) + const allSelectableUsers = this.allChatUsers.filter(e => !currentMemberIds.includes(e.wxUserId)) + return allSelectableUsers.filter( e => e.wxFullName.toLowerCase().includes(this.textSearch.toLowerCase())).sort((a,b) => { if(a.wxFullName < b.wxFullName) { return -1; } diff --git a/src/app/ui/chat/component/messages/messages.page.html b/src/app/ui/chat/component/messages/messages.page.html index 86e516368..c5f0505ed 100644 --- a/src/app/ui/chat/component/messages/messages.page.html +++ b/src/app/ui/chat/component/messages/messages.page.html @@ -122,10 +122,10 @@
- - - - + + + +
diff --git a/src/app/ui/chat/modal/chat-popover/chat-popover.page.html b/src/app/ui/chat/modal/chat-popover/chat-popover.page.html index 7401c5f55..ea6af89a8 100644 --- a/src/app/ui/chat/modal/chat-popover/chat-popover.page.html +++ b/src/app/ui/chat/modal/chat-popover/chat-popover.page.html @@ -27,6 +27,6 @@
- +
diff --git a/src/app/ui/chat/modal/chat-popover/chat-popover.page.ts b/src/app/ui/chat/modal/chat-popover/chat-popover.page.ts index db71eaa2a..f3d5ecff8 100644 --- a/src/app/ui/chat/modal/chat-popover/chat-popover.page.ts +++ b/src/app/ui/chat/modal/chat-popover/chat-popover.page.ts @@ -153,8 +153,7 @@ export class ChatPopoverPage implements OnInit { async details() { const modal = await this.modalController.create({ component: RoomInfoPage, - cssClass: 'modal-aside', - backdropDismiss: true, + cssClass: 'model profile-modal search-submodal', componentProps: { roomId: this.roomId } diff --git a/src/app/ui/chat/modal/group-contacts/group-contacts.page.ts b/src/app/ui/chat/modal/group-contacts/group-contacts.page.ts index 569aa59ea..a4bbc473c 100644 --- a/src/app/ui/chat/modal/group-contacts/group-contacts.page.ts +++ b/src/app/ui/chat/modal/group-contacts/group-contacts.page.ts @@ -198,7 +198,9 @@ export class GroupContactsPage implements OnInit { } FilterUserListedByTextSearch() { - return this.allChatUsers.filter( e => e.wxFullName.toLowerCase().includes(this.textSearch.toLowerCase())).sort((a,b) => { + const currentMemberIds = this.currentMembers.map(e => e.wxUserId) + const allSelectableUsers = this.allChatUsers.filter(e => !currentMemberIds.includes(e.wxUserId)) + return allSelectableUsers.filter( e => e.wxFullName.toLowerCase().includes(this.textSearch.toLowerCase())).sort((a,b) => { if(a.wxFullName < b.wxFullName) { return -1; } diff --git a/src/app/ui/chat/modal/messages/messages.page.html b/src/app/ui/chat/modal/messages/messages.page.html index 5734eb3b9..7bdbe8c08 100644 --- a/src/app/ui/chat/modal/messages/messages.page.html +++ b/src/app/ui/chat/modal/messages/messages.page.html @@ -139,10 +139,10 @@
- - - - + + + +
diff --git a/version/git-version.ts b/version/git-version.ts index b426ba4fa..f7a04692b 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "7a7a60a33", - "SHA": "7a7a60a3332bebb040da3756daeb12273d36abee", + "shortSHA": "ed3b19962", + "SHA": "ed3b19962236fd8851b2067cd5ff59a06f3bee68", "branch": "feature/chat-new-api-peter", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Oct 10 11:45:34 2024 +0100'", - "lastCommitMessage": "fix server room duplication", - "lastCommitNumber": "6092", - "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is ahead of 'origin/feature/chat-new-api-peter' by 7 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/ui/chat/chat-routing.module.ts\n\tmodified: src/app/ui/chat/component/contacts/contacts.page.html\n\tmodified: src/app/ui/chat/component/group-contacts/group-contacts.page.html\n\tmodified: src/app/ui/chat/modal/messages/contacts/contacts.page.html", + "lastCommitTime": "'Thu Oct 10 12:19:09 2024 +0100'", + "lastCommitMessage": "register component", + "lastCommitNumber": "6093", + "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is ahead of 'origin/feature/chat-new-api-peter' by 8 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/ui/chat/component/group-contacts/group-contacts.page.ts\n\tmodified: src/app/ui/chat/component/messages/messages.page.html\n\tmodified: src/app/ui/chat/modal/chat-popover/chat-popover.page.html\n\tmodified: src/app/ui/chat/modal/chat-popover/chat-popover.page.ts\n\tmodified: src/app/ui/chat/modal/group-contacts/group-contacts.page.ts\n\tmodified: src/app/ui/chat/modal/messages/messages.page.html\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file