diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html index f09d1009..e78adbd5 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html @@ -149,6 +149,7 @@ [selectedUserList]="selectedUserList" (checkAllUser)="onCheckAllUser($event)" (checkUser)="onCheckUser($event)" + (openProfile)="onClickOpenProfile($event)" (toggleUser)="onToggleUser($event)" class="organization-side" > diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html index f72bad85..fa09e77a 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html @@ -54,6 +54,7 @@ [selectedUserList]="selectedUserList" [isChecked]="getCheckedUser(userInfo)" (checkUser)="onCheckUser($event)" + (openProfile)="onClickOpenProfile($event)" (click)="onToggleUser(userInfo)" > Loading... @@ -74,6 +75,7 @@ [selectedUserList]="selectedUserList" [isChecked]="getCheckedUser(userInfo)" (checkUser)="onCheckUser($event)" + (openProfile)="onClickOpenProfile($event)" (click)="onToggleUser(userInfo)" > diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts index 3371b83d..bac83e4a 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts @@ -72,6 +72,10 @@ export class OrganizationComponent implements OnInit, OnDestroy { isChecked: boolean; userInfos: (UserInfo | UserInfoSS | UserInfoF | UserInfoDN)[]; }>(); + @Output() + openProfile = new EventEmitter< + UserInfo | UserInfoSS | UserInfoF | UserInfoDN + >(); companyList$: Observable; companyCode: string; @@ -329,6 +333,10 @@ export class OrganizationComponent implements OnInit, OnDestroy { this.toggleUser.emit(userInfo); } + onClickOpenProfile(userInfo: UserInfo | UserInfoSS | UserInfoF | UserInfoDN) { + this.openProfile.emit(userInfo); + } + onClickShowSelectedUserList() { this.logger.debug('onClickShowSelectedUserList', this.selectedUserList); } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html index adfa5a5e..737cf00f 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html @@ -86,25 +86,53 @@ - - - - - - - diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts index 26b198a7..bb6ecf4c 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts @@ -331,6 +331,26 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { } } + getShowContextMenu(menuType: string) { + if ( + menuType === 'OPEN_ROOM_USER' || + menuType === 'ADD_MEMBER' || + menuType === 'ADD_GROUP' || + menuType === 'EDIT_ROOM' + ) { + if ( + this.roomInfo.roomType === RoomType.Mytalk || + this.roomInfo.roomType === RoomType.Allim || + this.roomInfo.roomType === RoomType.Bot || + this.roomInfo.roomType === RoomType.Link + ) { + return false; + } + } + + return true; + } + readyToReply(): void { setTimeout(() => { this.focusReplyInput(); diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html index b27d2402..1d964527 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html @@ -1,4 +1,4 @@ -
+
@@ -7,11 +7,20 @@
- - -
- + + +
+ @@ -19,9 +28,18 @@ Select File.
-
- +
+ @@ -50,8 +68,11 @@
    -
  • {{ selectedFile.info.name }}
  • -
  • size : {{ selectedFile.info.size | ucapBytes }}
  • +
  • {{ selectedFile.info.name }}
  • +
  • + size : + {{ selectedFile.info.size | ucapBytes }} +
  • date : {{ selectedFile.info.sendDate | dateToStringFormat: 'YYYY.MM.DD' }}