ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

# 이슈처리 215, 216, 218

Browse Source
This commit is contained in:
leejinho 2020-02-06 10:24:47 +09:00
parent 6199b398b1
commit 7e6099a777
5 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts
View File

@ -137,7 +137,7 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewChecked {
for (const ru of roomUserShort) {
for (const u of ru.userInfos) {
if (u.seq !== this.loginRes.userSeq) {
if (!!u.name && '' !== u.name.trim()) {
if (!!u.name && '' !== u.name.trim() && u.isJoinRoom) {
recommendedWordList.push(u.name);
}
}
@ -285,7 +285,9 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewChecked {
value => roomInfo.roomSeq === value.roomSeq
);
if (-1 < i) {
return this.roomUserShortList[i].userInfos;
return this.roomUserShortList[i].userInfos.filter(
user => user.isJoinRoom
);
}
}
}

4
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts
View File

@ -608,6 +608,10 @@ export class OrganizationComponent
event.preventDefault();
event.stopPropagation();
if (userInfo.seq === this.loginRes.userSeq) {
return;
}
this.orgUserContextMenuPosition.x = event.clientX + 'px';
this.orgUserContextMenuPosition.y = event.clientY + 'px';
this.orgUserContextMenuTrigger.menu.focusFirstItem('mouse');

13
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html
View File

@ -59,7 +59,9 @@
<path d="M23 21v-2a4 4 0 0 0-3-3.87"></path>
<path d="M16 3.13a4 4 0 0 1 0 7.75"></path>
</svg>-->
<button class="icon-button"><i class="mid mid-24 mdi-account-multiple"></i></button>
<button class="icon-button">
<i class="mid mid-24 mdi-account-multiple"></i>
</button>
</ng-template>
<div class="mat-tab-frame">
<div>
@ -88,6 +90,7 @@
<ucap-profile-user-list-item
*ucapGroupExpansionPanelItem="let userInfo"
[userInfo]="userInfo"
[showPresence]="false"
[sessionVerinfo]="sessionVerinfo"
[selectedUserList]="selectedUserList"
[isChecked]="getCheckedUser(userInfo)"
@ -123,6 +126,7 @@
<ucap-profile-user-list-item
*ngFor="let userInfo of searchUserInfos"
[userInfo]="userInfo"
[showPresence]="false"
[sessionVerinfo]="sessionVerinfo"
[selectedUserList]="selectedUserList"
[isChecked]="getCheckedUser(userInfo)"
@ -141,7 +145,9 @@
matTooltip="{{ 'organization.chart' | translate }}"
matTooltipPosition="after"
>device_hub</mat-icon>-->
<button class="icon-button"><i class="mid mid-24 mdi-file-tree"></i></button>
<button class="icon-button">
<i class="mid mid-24 mdi-file-tree"></i>
</button>
</ng-template>
<div>
<app-layout-chat-left-sidenav-organization
@ -165,8 +171,7 @@
matTooltipPosition="before"
class="icon-button"
><i class="mid mid-24 mdi-chat"></i>
</mat-icon
>
</mat-icon>
</ng-template>
<div>
<ucap-room-list-item

1
projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html
View File

@ -3,6 +3,7 @@
<!--pcOn , pcOut pcOff , pcOther-->
<span
class="presence"
*ngIf="showPresence"
[ngClass]="getPresence(PresenceType.PC)"
[matTooltip]="getPresenceMsg()"
matTooltipPosition="after"

4
projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts
View File

@ -35,6 +35,8 @@ export class UserListItemComponent implements OnInit {
@Input()
presence: StatusBulkInfo | StatusInfo;
@Input()
showPresence = true;
@Input()
checkable = false;
@Input()
checkDisabled = false;
@ -77,7 +79,6 @@ export class UserListItemComponent implements OnInit {
break;
}
if (!!status) {
switch (status) {
case StatusCode.OnLine:
rtnClass = type + 'On';
@ -92,7 +93,6 @@ export class UserListItemComponent implements OnInit {
rtnClass = type + 'Off';
break;
}
}
return rtnClass;
}