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

검색시 본인 검색되지만 선택이 필요할 경우에는 선택되지 않도록 수정.

Browse Source
This commit is contained in:
leejinho 2019-12-20 11:33:14 +09:00
parent c289df1c47
commit 1de4d72472
5 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,11 +275,12 @@ export class GroupComponent implements OnInit, OnDestroy {
switch (res.SSVC_TYPE) { switch (res.SSVC_TYPE) {
case SSVC_TYPE_QUERY_DEPT_USER_DATA: case SSVC_TYPE_QUERY_DEPT_USER_DATA:
const userInfos = (res as DeptUserData).userInfos; const userInfos = (res as DeptUserData).userInfos;
searchUserInfos.push( // searchUserInfos.push(
...userInfos.filter( // ...userInfos.filter(
userInfo => userInfo.seq !== this.loginRes.userSeq // userInfo => userInfo.seq !== this.loginRes.userSeq
) // )
); // );
searchUserInfos.push(...userInfos);
break; break;
case SSVC_TYPE_QUERY_DEPT_USER_RES: case SSVC_TYPE_QUERY_DEPT_USER_RES:
{ {

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

@ -267,11 +267,12 @@ export class OrganizationComponent
switch (res.SSVC_TYPE) { switch (res.SSVC_TYPE) {
case SSVC_TYPE_QUERY_DEPT_USER_DATA: case SSVC_TYPE_QUERY_DEPT_USER_DATA:
const userInfos = (res as DeptUserData).userInfos; const userInfos = (res as DeptUserData).userInfos;
searchUserInfos.push( // searchUserInfos.push(
...userInfos.filter( // ...userInfos.filter(
userInfo => userInfo.seq !== this.loginRes.userSeq // userInfo => userInfo.seq !== this.loginRes.userSeq
) // )
); // );
searchUserInfos.push(...userInfos);
break; break;
case SSVC_TYPE_QUERY_DEPT_USER_RES: case SSVC_TYPE_QUERY_DEPT_USER_RES:
{ {

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

@ -118,7 +118,7 @@
[sessionVerinfo]="sessionVerinfo" [sessionVerinfo]="sessionVerinfo"
[selectedUserList]="selectedUserList" [selectedUserList]="selectedUserList"
[isChecked]="getCheckedUser(userInfo)" [isChecked]="getCheckedUser(userInfo)"
[checkable]="true" [checkable]="userInfo.seq !== loginRes.userSeq"
[checkDisabled]="!getCheckableUser(userInfo)" [checkDisabled]="!getCheckableUser(userInfo)"
(checkUser)="onCheckUser($event)" (checkUser)="onCheckUser($event)"
(click)="onToggleUser(userInfo)" (click)="onToggleUser(userInfo)"

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

@ -324,11 +324,12 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy {
switch (res.SSVC_TYPE) { switch (res.SSVC_TYPE) {
case SSVC_TYPE_QUERY_DEPT_USER_DATA: case SSVC_TYPE_QUERY_DEPT_USER_DATA:
const userInfos = (res as DeptUserData).userInfos; const userInfos = (res as DeptUserData).userInfos;
searchUserInfos.push( // searchUserInfos.push(
...userInfos.filter( // ...userInfos.filter(
userInfo => userInfo.seq !== this.loginRes.userSeq // userInfo => userInfo.seq !== this.loginRes.userSeq
) // )
); // );
searchUserInfos.push(...userInfos);
break; break;
case SSVC_TYPE_QUERY_DEPT_USER_RES: case SSVC_TYPE_QUERY_DEPT_USER_RES:
{ {
@ -507,6 +508,10 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy {
this.changeDetectorRef.detectChanges(); this.changeDetectorRef.detectChanges();
} }
onToggleUser(userInfo: UserInfo | UserInfoSS | UserInfoF | UserInfoDN) { onToggleUser(userInfo: UserInfo | UserInfoSS | UserInfoF | UserInfoDN) {
if (userInfo.seq === this.loginRes.userSeq) {
return;
}
if (this.data.type === UserSelectDialogType.EditChatMember) { if (this.data.type === UserSelectDialogType.EditChatMember) {
if ( if (
this.data.curRoomUser.filter(user => user.seq === userInfo.seq).length > this.data.curRoomUser.filter(user => user.seq === userInfo.seq).length >

2
projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html
View File

@ -1,5 +1,5 @@
<div class="chat-messages" #scrollMe> <div class="chat-messages" #scrollMe>
<div class="message-row" *ngIf="eventRemain"> <div class="message-row" *ngIf="eventRemain && messages.length > 0">
<button mat-button (click)="onClickMore($event)"> <button mat-button (click)="onClickMore($event)">
이전 대화 보기 이전 대화 보기
<span <span