From 1be22492f27e2f91c5c330dbf920e777901b7ffa Mon Sep 17 00:00:00 2001 From: leejinho Date: Fri, 22 Nov 2019 14:17:53 +0900 Subject: [PATCH] =?UTF-8?q?[19=20=ED=98=84=EC=9E=AC=20=EB=8C=80=ED=99=94?= =?UTF-8?q?=EB=B0=A9=EC=9D=80=20=EC=A0=84=EB=8B=AC=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EB=B6=88=EA=B0=80=EB=8A=A5]=20=ED=98=84=EC=9E=AC=20=EB=8C=80?= =?UTF-8?q?=ED=99=94=EB=B0=A9=EB=8F=84=20=EC=A0=84=EB=8B=AC=20=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95.=20[3?= =?UTF-8?q?0=20=EB=8C=80=ED=99=94=20=EC=B0=B8=EC=97=AC=EC=9E=90=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=ED=94=84=EB=A1=9C=ED=95=84=20=EC=A0=95?= =?UTF-8?q?=EB=A0=AC=20=EC=98=A4=EB=A5=98]=20=ED=94=84=EB=A0=88=EC=A6=8C?= =?UTF-8?q?=EC=8A=A4=20=EC=A0=95=EB=B3=B4=EA=B0=80=20=EC=97=86=EC=96=B4?= =?UTF-8?q?=EB=8F=84=20=EA=B3=B5=EA=B0=84=20=ED=99=95=EB=B3=B4.=20?= =?UTF-8?q?=EB=8C=80=ED=99=94=EB=B0=A9=20=ED=8C=8C=EC=9D=BC=20expired=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dialogs/chat/create-chat.dialog.component.ts | 13 +++++++------ .../lib/components/message-box/file.component.ts | 2 +- .../lib/components/user-list-item.component.html | 7 +------ .../src/assets/scss/partials/_presence.scss | 4 ++-- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts index 0f88ec7f..164b976b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts @@ -451,12 +451,13 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy { } getCheckableRoom(roomInfo: RoomInfo) { - if (!!this.data.ignoreRoom && this.data.ignoreRoom.length > 0) { - return !( - this.data.ignoreRoom.filter(room => room.roomSeq === roomInfo.roomSeq) - .length > 0 - ); - } + // // 현재 방도 체크 전달 할수 있도록 수정. (끌어올리기 개념.) + // if (!!this.data.ignoreRoom && this.data.ignoreRoom.length > 0) { + // return !( + // this.data.ignoreRoom.filter(room => room.roomSeq === roomInfo.roomSeq) + // .length > 0 + // ); + // } return true; } getCheckedRoom(roomInfo: RoomInfo) { diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts index efc48ca4..1c089d36 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts @@ -42,7 +42,7 @@ export class FileComponent implements OnInit { getExpiredFile() { if ( !!this.eventInfoStatus && - this.eventInfoStatus.validFileBaseSeq < this.message.seq + this.eventInfoStatus.validFileBaseSeq <= this.message.seq ) { return false; } else { diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html index 73f9137a..82926569 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html @@ -1,12 +1,7 @@
- {{ presence.pcStatus }} - +