mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 12:37:53 +00:00
visual alingment
This commit is contained in:
@@ -142,7 +142,9 @@ export class GroupContactsPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
FilterUserListedByTextSearch() {
|
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) {
|
if(a.wxFullName < b.wxFullName) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -122,10 +122,10 @@
|
|||||||
<div>
|
<div>
|
||||||
<div class="message-item-options d-flex justify-content-end">
|
<div class="message-item-options d-flex justify-content-end">
|
||||||
<fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
|
<fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
|
||||||
<mat-menu #beforeMenu="matMenu" xPosition="before">
|
<mat-menu class="d-block" #beforeMenu="matMenu" xPosition="before">
|
||||||
<button (click)="messageDelete(message)" class="menuButton">Apagar mensagem</button>
|
<button (click)="messageDelete(message)" class="menuButton d-block py-2 px-10">Apagar mensagem</button>
|
||||||
<button *ngIf="!message.hasAttachment" (click)="editMessage(message)" class="menuButton">Editar mensagem</button>
|
<button *ngIf="!message.hasAttachment" (click)="editMessage(message)" class="menuButton d-block py-2 px-10">Editar mensagem</button>
|
||||||
<button (click)="toggleEmojiPicker(message)" class="menuButton">Reagir mensagem</button>
|
<button (click)="toggleEmojiPicker(message)" class="menuButton d-block py-2 px-10">Reagir mensagem</button>
|
||||||
</mat-menu>
|
</mat-menu>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -27,6 +27,6 @@
|
|||||||
<button *ngIf="isAdmin && roomType == EnumRoomType.Group" (click)="setRoomOwner()" class="btn-cancel mt-10-em" shape="round">Adicionar admin</button>
|
<button *ngIf="isAdmin && roomType == EnumRoomType.Group" (click)="setRoomOwner()" class="btn-cancel mt-10-em" shape="round">Adicionar admin</button>
|
||||||
<div class="solid"></div>
|
<div class="solid"></div>
|
||||||
<button (click)="close('cancel')" full class="btn-cancel mobile-only mt-10-em" shape="round">Cancelar</button>
|
<button (click)="close('cancel')" full class="btn-cancel mobile-only mt-10-em" shape="round">Cancelar</button>
|
||||||
<button (click)="deleteGroup()" class="btn-delete" shape="round mt-10-em">Apagar grupo</button>
|
<button (click)="deleteGroup()" class="btn-delete mt-10-em" shape="round">Apagar grupo</button>
|
||||||
</div>
|
</div>
|
||||||
</ion-content>
|
</ion-content>
|
||||||
|
|||||||
@@ -153,8 +153,7 @@ export class ChatPopoverPage implements OnInit {
|
|||||||
async details() {
|
async details() {
|
||||||
const modal = await this.modalController.create({
|
const modal = await this.modalController.create({
|
||||||
component: RoomInfoPage,
|
component: RoomInfoPage,
|
||||||
cssClass: 'modal-aside',
|
cssClass: 'model profile-modal search-submodal',
|
||||||
backdropDismiss: true,
|
|
||||||
componentProps: {
|
componentProps: {
|
||||||
roomId: this.roomId
|
roomId: this.roomId
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -198,7 +198,9 @@ export class GroupContactsPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
FilterUserListedByTextSearch() {
|
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) {
|
if(a.wxFullName < b.wxFullName) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -139,10 +139,10 @@
|
|||||||
<div>
|
<div>
|
||||||
<div class="message-item-options d-flex justify-content-end">
|
<div class="message-item-options d-flex justify-content-end">
|
||||||
<fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
|
<fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
|
||||||
<mat-menu class="custom-menu" #beforeMenu="matMenu" xPosition="before">
|
<mat-menu class="custom-menu d-block" #beforeMenu="matMenu" xPosition="before">
|
||||||
<button (click)="messageDelete(message)" class="menuButton">Apagar mensagem</button>
|
<button (click)="messageDelete(message)" class="menuButton d-block py-2 px-10">Apagar mensagem</button>
|
||||||
<button *ngIf="!message.hasAttachment" (click)="editMessage(message)" class="menuButton">Editar mensagem</button>
|
<button *ngIf="!message.hasAttachment" (click)="editMessage(message)" class="menuButton d-block py-2 px-10">Editar mensagem</button>
|
||||||
<button (click)="toggleEmojiPicker(message)" class="menuButton">Reagir mensagem</button>
|
<button (click)="toggleEmojiPicker(message)" class="menuButton d-block py-2 px-10">Reagir mensagem</button>
|
||||||
</mat-menu>
|
</mat-menu>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "7a7a60a33",
|
"shortSHA": "ed3b19962",
|
||||||
"SHA": "7a7a60a3332bebb040da3756daeb12273d36abee",
|
"SHA": "ed3b19962236fd8851b2067cd5ff59a06f3bee68",
|
||||||
"branch": "feature/chat-new-api-peter",
|
"branch": "feature/chat-new-api-peter",
|
||||||
"lastCommitAuthor": "'Peter Maquiran'",
|
"lastCommitAuthor": "'Peter Maquiran'",
|
||||||
"lastCommitTime": "'Thu Oct 10 11:45:34 2024 +0100'",
|
"lastCommitTime": "'Thu Oct 10 12:19:09 2024 +0100'",
|
||||||
"lastCommitMessage": "fix server room duplication",
|
"lastCommitMessage": "register component",
|
||||||
"lastCommitNumber": "6092",
|
"lastCommitNumber": "6093",
|
||||||
"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 <file>...\" 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",
|
"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 <file>...\" 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"
|
"changeAuthor": "peter.maquiran"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user