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

[19 현재 대화방은 전달 기능 불가능] 현재 대화방도 전달 가능하도록 수정.

Browse Source 
[30 대화 참여자 목록 프로필 정렬 오류] 프레즌스 정보가 없어도 공간 확보.
대화방 파일 expired 처리 수정.
This commit is contained in:
leejinho 2019-11-22 14:17:53 +09:00
parent 729a95e1eb
commit 1be22492f2
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -451,12 +451,13 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy {
} }
getCheckableRoom(roomInfo: RoomInfo) { getCheckableRoom(roomInfo: RoomInfo) {
if (!!this.data.ignoreRoom && this.data.ignoreRoom.length > 0) { // // 현재 방도 체크 전달 할수 있도록 수정. (끌어올리기 개념.)
return !( // if (!!this.data.ignoreRoom && this.data.ignoreRoom.length > 0) {
this.data.ignoreRoom.filter(room => room.roomSeq === roomInfo.roomSeq) // return !(
.length > 0 // this.data.ignoreRoom.filter(room => room.roomSeq === roomInfo.roomSeq)
); // .length > 0
} // );
// }
return true; return true;
} }
getCheckedRoom(roomInfo: RoomInfo) { getCheckedRoom(roomInfo: RoomInfo) {

2
projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/file.component.ts
View File

@ -42,7 +42,7 @@ export class FileComponent implements OnInit {
getExpiredFile() { getExpiredFile() {
if ( if (
!!this.eventInfoStatus && !!this.eventInfoStatus &&
this.eventInfoStatus.validFileBaseSeq < this.message.seq this.eventInfoStatus.validFileBaseSeq <= this.message.seq
) { ) {
return false; return false;
} else { } else {

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

@ -1,12 +1,7 @@
<!--체크박스 보여줄때는 <div class="list-item checkbox" matRipple> 클래스에 checkbox만 추가--> <!--체크박스 보여줄때는 <div class="list-item checkbox" matRipple> 클래스에 checkbox만 추가-->
<div class="list-item" *ngIf="userInfo" matRipple> <div class="list-item" *ngIf="userInfo" matRipple>
<!--pcOn , pcOut pcOff , pcOther--> <!--pcOn , pcOut pcOff , pcOther-->
<span <span class="presence" [ngClass]="getPresence(PresenceType.PC)"> </span>
class="presence"
[ngClass]="getPresence(PresenceType.PC)"
*ngIf="presence && presence.pcStatus"
>{{ presence.pcStatus }}
</span>
<dl class="item-default"> <dl class="item-default">
<dt> <dt>
<img <img

4
projects/ucap-webmessenger-ui/src/assets/scss/partials/_presence.scss
View File

@ -8,7 +8,7 @@
margin-right: 4px; margin-right: 4px;
border-radius: 100px; border-radius: 100px;
} }
.presence{ .presence {
@extend %presence; @extend %presence;
&.pcOn { &.pcOn {
background-color: #28ad66; background-color: #28ad66;
@ -16,7 +16,7 @@
&.pcOut { &.pcOut {
background-color: #f35b5b; background-color: #f35b5b;
} }
& .pcOff { &.pcOff {
background-color: #a29f9f; background-color: #a29f9f;
} }
&.pcOther { &.pcOther {