From 92ab91ef09ff323e779fd46f606a5e9934bdf1ce Mon Sep 17 00:00:00 2001 From: leejinho Date: Tue, 7 Jan 2020 13:45:11 +0900 Subject: [PATCH 01/11] =?UTF-8?q?#=20=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=2086=20=EB=8C=80=ED=99=94=EB=B0=A9=20=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=ED=9B=84=20=EC=9A=B0=ED=81=B4=EB=A6=AD=20=EB=A9=94=EB=89=B4=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=20=EC=8B=9C=20=EA=B2=80=EC=83=89=20=ED=95=84?= =?UTF-8?q?=ED=84=B0=20=ED=92=80=EB=A0=A4=EC=A7=90=2096=20=EB=8C=80?= =?UTF-8?q?=ED=99=94=EB=B0=A9=20=EA=B2=80=EC=83=89=20=ED=95=84=ED=84=B0=20?= =?UTF-8?q?=ED=9B=84=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=88=98=EC=8B=A0?= =?UTF-8?q?=EC=8B=9C=20=EA=B2=80=EC=83=89=ED=95=84=ED=84=B0=20=ED=92=80?= =?UTF-8?q?=EB=A0=A4=EC=A7=90=20::=2086=EA=B3=BC=20=EB=8F=99=EC=9D=BC=20?= =?UTF-8?q?=EA=B1=B4=EC=9C=BC=EB=A1=9C=20=ED=94=84=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EB=9E=A8=20=EA=B0=9C=EC=84=A0=20=ED=9B=84=20=EC=A0=95=EC=83=81?= =?UTF-8?q?=EB=8F=99=EC=9E=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 112 즐겨찾기 그룹 쪽지 보내기 동작 되지 않음 :: 즐겨찾기 그룹에 대한 더보기 메뉴 핸들링 및 쪽지 보내기 버그 처리 완료. 114 트레이에서 로그아웃 선택 시 팝업 오류 :: ngZone.run 으로 처리함. --- .../components/left-sidenav/chat.component.ts | 10 ++++- .../left-sidenav/group.component.ts | 38 +++++++++++++++---- .../src/app/services/native.service.ts | 4 +- .../src/assets/i18n/ko.json | 2 +- .../components/expansion-panel.component.ts | 6 +++ 5 files changed, 49 insertions(+), 11 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts index 6a05c4d1..fe7cf6e3 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts @@ -128,7 +128,6 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewChecked { .pipe( tap(([room, roomUser, roomUserShort]) => { this.roomList = room; - this.searchRoomList = room; this.roomUserList = roomUser; this.roomUserShortList = roomUserShort; @@ -159,6 +158,15 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewChecked { this.recommendedWordList = [...recommendedWordList]; + if (!!this.isSearch) { + this.searchRoomList = room.filter( + roomInfo => + this.searchRoomList.filter( + sInfo => sInfo.roomSeq === roomInfo.roomSeq + ).length > 0 + ); + } + if (!!this.psDirectiveRef) { this.psDirectiveRef.update(); } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts index 9d7d6b7e..4d1f5bea 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts @@ -105,6 +105,8 @@ export class GroupComponent implements OnInit, OnDestroy { groupBuddyListSubscription: Subscription; favoritBuddyList$: Observable; + favoritBuddyList: UserInfo[] = []; + companyList$: Observable; companyCode: string; @@ -229,9 +231,10 @@ export class GroupComponent implements OnInit, OnDestroy { .pipe(select(AppStore.MessengerSelector.SyncSelector.selectAllBuddy2)) .pipe( map(buddyInfoList => { - return buddyInfoList + this.favoritBuddyList = buddyInfoList .filter(buddy => buddy.isFavorit) .sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0)); + return this.favoritBuddyList; }) ); } @@ -371,7 +374,11 @@ export class GroupComponent implements OnInit, OnDestroy { menuType === 'EDIT_MEMBER' || menuType === 'DELETE' ) { - if (!group || group === undefined) { + if ( + !group || + group === undefined || + (group.seq < 0 && group.name === 'Favorit') + ) { return false; } @@ -395,7 +402,11 @@ export class GroupComponent implements OnInit, OnDestroy { } // 그룹원 0명인 그룹 메뉴 정리 - if (menuType === 'CHAT') { + if ( + menuType === 'CHAT' || + menuType === 'SEND_MESSAGE' || + menuType === 'DIV1' + ) { if (!!group && !!group.userSeqs && group.userSeqs.length > 0) { return true; } else { @@ -652,11 +663,22 @@ export class GroupComponent implements OnInit, OnDestroy { break; case 'SEND_MESSAGE': { - const curGroupBuddyList = this.groupBuddyList.filter( - groupInfo => groupInfo.group.seq === group.seq - ); + let receiverList: UserInfo[] = []; + const isFavGroup = + group.seq < 0 && group.name === 'Favorit' ? true : false; - if (!!curGroupBuddyList && curGroupBuddyList.length > 0) { + if (!!isFavGroup) { + receiverList = this.favoritBuddyList; + } else { + const curGroupBuddyList = this.groupBuddyList.filter( + groupInfo => groupInfo.group.seq === group.seq + ); + if (!!curGroupBuddyList && curGroupBuddyList.length > 0) { + receiverList = curGroupBuddyList[0].buddyList; + } + } + + if (receiverList.length > 0) { this.dialogService.open< MessageWriteDialogComponent, MessageWriteDialogData, @@ -669,7 +691,7 @@ export class GroupComponent implements OnInit, OnDestroy { data: { loginRes: this.loginRes, environmentsInfo: this.environmentsInfo, - receiverList: curGroupBuddyList[0].buddyList + receiverList } }); } diff --git a/projects/ucap-webmessenger-app/src/app/services/native.service.ts b/projects/ucap-webmessenger-app/src/app/services/native.service.ts index f10c25e1..03e44528 100644 --- a/projects/ucap-webmessenger-app/src/app/services/native.service.ts +++ b/projects/ucap-webmessenger-app/src/app/services/native.service.ts @@ -37,7 +37,9 @@ export class AppNativeService { subscribe(): void { this.nativeService.logout().subscribe(() => { - this.store.dispatch(AuthenticationStore.logoutConfirmation()); + this.ngZone.run(() => { + this.store.dispatch(AuthenticationStore.logoutConfirmation()); + }); }); this.nativeService.changeStatus().subscribe(statusCode => {}); this.nativeService.showSetting().subscribe(() => { diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json index 7a40679c..3893d01e 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json @@ -679,7 +679,7 @@ "addMemberToRoom": "대화 상대 추가", "addMemberToGroup": "그룹 멤버로 추가", "modifyRoomMember": "대화방 멤버 편집", - "ejectFromRoom": "Eject from room", + "ejectFromRoom": "강제 퇴장", "confirmEjectFromRoom": "{{targetMember}} 님을 대화방에서 퇴장 시키겠습니까?", "badgeDescriptionForUnread": "확인하지 않은 메시지가 있습니다." }, diff --git a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.ts b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.ts index e4e05178..e3c010fb 100644 --- a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.ts +++ b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.ts @@ -85,6 +85,12 @@ export class ExpansionPanelComponent } else { const groupNode: GroupNode = { nodeType: NodeType.Favorit, + groupDetail: { + seq: -9999, + name: NodeType.Favorit, + isActive: true, + userSeqs: userInfoList.map(userInfo => userInfo.seq) + } as GroupDetailData, children: [] }; From 5d1b35dda7d122ab58962ac7884578f140e66432 Mon Sep 17 00:00:00 2001 From: leejinho Date: Tue, 7 Jan 2020 13:45:34 +0900 Subject: [PATCH 02/11] =?UTF-8?q?=EB=8C=80=ED=99=94=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/messages.component.ts | 51 +++++++++++--- .../src/app/store/messenger/event/actions.ts | 5 ++ .../src/app/store/messenger/event/effects.ts | 68 ++++++++++++++++++- .../src/app/store/messenger/event/reducers.ts | 10 ++- 4 files changed, 124 insertions(+), 10 deletions(-) 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 6bdf2bc4..2ce56571 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 @@ -60,10 +60,7 @@ import { } from '@app/types'; import { RoomInfo, UserInfo, RoomType } from '@ucap-webmessenger/protocol-room'; import { tap, take, map, catchError, finalize } from 'rxjs/operators'; -import { - FileInfo, - FormComponent as UCapUiChatFormComponent -} from '@ucap-webmessenger/ui-chat'; +import { FormComponent as UCapUiChatFormComponent } from '@ucap-webmessenger/ui-chat'; import { KEY_VER_INFO } from '@app/types'; import { VersionInfo2Response } from '@ucap-webmessenger/api-public'; import { @@ -148,6 +145,8 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { userInfoList: UserInfo[]; userInfoListSubscription: Subscription; eventListProcessing$: Observable; + searchEventListProcessing: boolean; + searchEventListProcessingSubscription: Subscription; eventInfoStatus: InfoResponse; eventInfoStatusSubscription: Subscription; sessionVerInfo: VersionInfo2Response; @@ -166,7 +165,7 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { interval: any; /** About Searching */ - isShowSearchArea = true; + isShowSearchArea = false; moreSearchProcessing = false; searchText = ''; searchedList: Info[]; @@ -258,6 +257,25 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { select(AppStore.MessengerSelector.EventSelector.infoListProcessing) ); + this.searchEventListProcessingSubscription = this.store + .pipe( + select( + AppStore.MessengerSelector.EventSelector.infoSearchListProcessing + ), + tap(process => { + this.searchEventListProcessing = process; + if (!process && this.isShowSearchArea) { + this.doSearchTextInEvent(this.searchText); + this.snackBarService.open('대화검색을 마쳤습니다.', '확인', { + duration: 3000, + verticalPosition: 'top', + horizontalPosition: 'center' + }); + } + }) + ) + .subscribe(); + this.eventRemain$ = this.store.pipe( select(AppStore.MessengerSelector.EventSelector.remainInfo), tap(remainInfo => { @@ -298,9 +316,9 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { if (this.moreSearchProcessing) { const baseseq = this.baseEventSeq; - setTimeout(() => { - this.onSearchChat(this.searchText, baseseq); - }, 800); + // setTimeout(() => { + // this.doSearchTextInEvent(this.searchText, baseseq); + // }, 800); this.baseEventSeq = infoList[0].seq; } else { if (!!infoList && infoList.length > 0) { @@ -365,6 +383,9 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { if (!!this.eventInfoStatusSubscription) { this.eventInfoStatusSubscription.unsubscribe(); } + if (!!this.searchEventListProcessingSubscription) { + this.searchEventListProcessingSubscription.unsubscribe(); + } clearInterval(this.interval); } @@ -1487,6 +1508,19 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { onSearchChat(searchText: string, baseSeq?: number) { this.searchText = searchText; + // CASE :: searching text after retrieve All event Infos. + this.store.dispatch( + EventStore.infoAll({ + roomSeq: this.roomInfo.roomSeq, + baseSeq: this.eventList[0].seq, + requestCount: + environment.productConfig.CommonSetting.eventRequestDefaultCount * 2 + }) + ); + + // this.doSearchTextInEvent(searchText); + } + doSearchTextInEvent(searchText: string, baseSeq?: number): void { this.searchedList = this.eventList.filter(event => { let contents = ''; if (event.type === EventType.Character) { @@ -1568,6 +1602,7 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { this.moreSearchProcessing = true; this.eventMorePosition = this.psChatContent.directiveRef.elementRef.nativeElement.scrollHeight; + // Case :: retrieve event infos step by step until include searchtext in event.. this.store.dispatch( EventStore.infoForSearch({ req: { diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/event/actions.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/event/actions.ts index e31c8a5c..437b3bcf 100644 --- a/projects/ucap-webmessenger-app/src/app/store/messenger/event/actions.ts +++ b/projects/ucap-webmessenger-app/src/app/store/messenger/event/actions.ts @@ -48,6 +48,11 @@ export const infoForSearchEnd = createAction( props() ); +export const infoAll = createAction( + '[Messenger::Event] Info All', + props() +); + export const fileInfo = createAction( '[Messenger::Event] File Info', props<{ req: FileInfoRequest }>() diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/event/effects.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/event/effects.ts index ce89f127..3026374e 100644 --- a/projects/ucap-webmessenger-app/src/app/store/messenger/event/effects.ts +++ b/projects/ucap-webmessenger-app/src/app/store/messenger/event/effects.ts @@ -82,7 +82,8 @@ import { fileInfoFailure, roomOpenAfterForward, infoForSearch, - infoForSearchEnd + infoForSearchEnd, + infoAll } from './actions'; import { SessionStorageService } from '@ucap-webmessenger/web-storage'; import { @@ -388,6 +389,71 @@ export class Effects { { dispatch: false } ); + infoAll$ = createEffect( + () => { + let infoList: Info[]; + + return this.actions$.pipe( + ofType(infoAll), + tap(() => { + infoList = []; + }), + withLatestFrom( + this.store.pipe( + select( + (state: any) => + state.messenger.event.infoSearchListProcessing as boolean + ) + ) + ), + switchMap(([req, processing]) => { + return this.eventProtocolService.info(req).pipe( + map(async res => { + switch (res.SSVC_TYPE) { + case SSVC_TYPE_EVENT_INFO_DATA: + infoList.push(...(res as InfoData).infoList); + break; + case SSVC_TYPE_EVENT_INFO_RES: + { + this.store.dispatch( + infoMoreSuccess({ + infoList, + res: res as InfoResponse, + remainInfo: + infoList.length === req.requestCount ? true : false + }) + ); + + if (infoList.length > 0) { + if (infoList.length === req.requestCount && processing) { + // 재귀 + this.store.dispatch( + infoAll({ + roomSeq: req.roomSeq, + baseSeq: infoList[0].seq, + requestCount: req.requestCount + }) + ); + } else { + if (infoList.length < req.requestCount) { + this.store.dispatch(infoForSearchEnd({})); + } + } + } else { + this.store.dispatch(infoForSearchEnd({})); + } + } + break; + } + }), + catchError(error => of(infoFailure({ error }))) + ); + }) + ); + }, + { dispatch: false } + ); + fileInfo$ = createEffect( () => { let fileInfoList: FileInfo[]; diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/event/reducers.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/event/reducers.ts index 03de3a0f..893992de 100644 --- a/projects/ucap-webmessenger-app/src/app/store/messenger/event/reducers.ts +++ b/projects/ucap-webmessenger-app/src/app/store/messenger/event/reducers.ts @@ -15,7 +15,8 @@ import { infoMoreSuccess, fileInfoSuccess, infoForSearch, - infoForSearchEnd + infoForSearchEnd, + infoAll } from './actions'; import * as AuthenticationStore from '@app/store/account/authentication'; import * as ChatStore from '@app/store/messenger/chat'; @@ -42,6 +43,13 @@ export const reducer = createReducer( infoSearchListProcessing: false }; }), + on(infoAll, (state, action) => { + return { + ...state, + infoListProcessing: true, + infoSearchListProcessing: true + }; + }), on(infoSuccess, (state, action) => { return { From 4f8695e5a378b95b88cf2493c33f28864cef1eae Mon Sep 17 00:00:00 2001 From: leejinho Date: Tue, 7 Jan 2020 16:17:27 +0900 Subject: [PATCH 03/11] =?UTF-8?q?#=20=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=2049=20=EB=8C=80=ED=99=94=EB=B0=A9=EC=9D=B4=EB=A6=84=20?= =?UTF-8?q?=EB=B9=88=EC=B9=B8=EC=9C=BC=EB=A1=9C=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=8B=9C=20=EC=88=AB=EC=9E=90=EB=A1=9C=20=EB=B3=B4=EC=97=AC?= =?UTF-8?q?=EC=A7=90=20::=20=EC=95=84=EC=98=88=20=EB=B9=88=EA=B0=92?= =?UTF-8?q?=EC=9D=B4=EB=A9=B4=20=EC=A0=80=EB=A0=87=EA=B2=8C=20=EB=90=98?= =?UTF-8?q?=EA=B3=A0,=20'=20'=EB=B9=88=EC=B9=B8=20=ED=95=98=EB=82=98?= =?UTF-8?q?=EB=A5=BC=20=EB=84=A3=EC=9C=BC=EB=A9=B4=20=EC=B4=88=EA=B8=B0?= =?UTF-8?q?=ED=99=94=20=EB=90=98=EB=8A=94=EB=8D=B0=20=EC=9D=B4=EB=A5=BC=20?= =?UTF-8?q?=ED=95=84=EC=88=98=EC=9E=85=EB=A0=A5=ED=95=98=EB=8F=84=EB=A1=9D?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=ED=95=98=EC=97=AC=20=EC=B2=98=EB=A6=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 83 빈칸 입력 후 그룹 추가 시 추가되지 않음 :: 필수입력으로 처리 및 빈문자열 유효성 검사 --- .../right-drawer/album-box.component.html | 5 ++-- .../chat/create-chat.dialog.component.ts | 23 +++++++++++++++++-- .../chat/edit-chat-room.dialog.component.html | 7 +++++- .../chat/edit-chat-room.dialog.component.ts | 7 ++++-- .../group/select-group.dialog.component.html | 2 +- .../lib/dialogs/alert.dialog.component.html | 2 +- 6 files changed, 36 insertions(+), 10 deletions(-) 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 33f4e6ad..45ddc55a 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 @@ -66,10 +66,9 @@ + >
  • {{ selectedFile.info.name }}
    • 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 bda43023..2530bcf8 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 @@ -52,7 +52,10 @@ import { ConfirmDialogComponent, ConfirmDialogResult, ConfirmDialogData, - DialogService + DialogService, + AlertDialogComponent, + AlertDialogResult, + AlertDialogData } from '@ucap-webmessenger/ui'; export interface CreateChatDialogData { @@ -619,6 +622,22 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy { return; } + if (this.inputForm.get('groupName').value.trim().length === 0) { + this.dialogService.open< + AlertDialogComponent, + AlertDialogData, + AlertDialogResult + >(AlertDialogComponent, { + data: { + title: '', + html: `그룹명은 필수입력입니다.` + } + }); + + this.inputForm.setValue({ groupName: '' }); + return; + } + let cfmMsg = `새로운 그룹을 추가하시겠습니까?`; if (this.selectedUserList.length === 0) { cfmMsg += `
    빈 그룹으로 생성됩니다.`; @@ -649,7 +668,7 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy { selectedRoom: this.selectedRoom, groupName: this.data.type === UserSelectDialogType.NewGroup - ? this.inputForm.get('groupName').value + ? this.inputForm.get('groupName').value.trim() : '', oldGroup: this.data.type === UserSelectDialogType.EditMember diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.html index 5b3325d3..e2904400 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.html @@ -47,7 +47,12 @@ > No - diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.ts index dd29bec1..8ff84817 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.ts @@ -1,6 +1,6 @@ import { RoomInfo } from '@ucap-webmessenger/protocol-room'; import { Component, OnInit, Inject } from '@angular/core'; -import { FormGroup, FormBuilder } from '@angular/forms'; +import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; export interface EditChatRoomDialogData { @@ -50,7 +50,10 @@ export class EditChatRoomDialogComponent implements OnInit { ngOnInit(): void { this.inputForm = this.formBuilder.group({ - roomName: [this.data.roomInfo.roomName], + roomName: [ + this.data.roomInfo.roomName, + !this.data.roomInfo.isTimeRoom ? [Validators.required] : [] + ], changeTarget: ['me'], timerInterval: [this.data.roomInfo.timeRoomInterval] }); diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html index 2452d9d9..91def65e 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html @@ -11,7 +11,7 @@ class="mat-mini-fab mat-button-base mat-accent mat-elevation-z" > add - 새 그룹 추가 + {{ 'group.addNew' | translate }}
    diff --git a/projects/ucap-webmessenger-ui/src/lib/dialogs/alert.dialog.component.html b/projects/ucap-webmessenger-ui/src/lib/dialogs/alert.dialog.component.html index 37e8206f..c4bd857f 100644 --- a/projects/ucap-webmessenger-ui/src/lib/dialogs/alert.dialog.component.html +++ b/projects/ucap-webmessenger-ui/src/lib/dialogs/alert.dialog.component.html @@ -1,5 +1,5 @@ - + {{ data.title }} From d828fb20e2752ffed84769eeba35e2bc7ac7b45c Mon Sep 17 00:00:00 2001 From: khk Date: Tue, 7 Jan 2020 17:42:31 +0900 Subject: [PATCH 04/11] =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=83=89?= =?UTF-8?q?=EC=83=81=EB=B3=80=EA=B2=BD=20=EC=A7=84=ED=96=89=EC=A4=91=20(?= =?UTF-8?q?=EB=B3=B4=EC=95=88=EC=98=88=EC=A0=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/lib/components/message-box/schedule.component.html | 5 +++-- .../src/lib/components/message-box/schedule.component.scss | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.html index 84d8abf8..be93d414 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.html +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.html @@ -21,11 +21,12 @@
    • - 날짜날짜{{ date | ucapDate: 'YYYY.MM.DD' }}
    • - 시간{{ date | ucapDate: 'a hh:mm' }} + 시간{{ date | ucapDate: 'a hh:mm' }}
    • {{ message.sentMessageJson.title }} diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.scss index 9ef0a9b3..c774bd49 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.scss @@ -3,10 +3,11 @@ text-align: left; padding: 4px; .event-header { - padding: 10px 10px 10px 36px; + padding: 10px; font-size: 14px; font-weight: 600; - background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-calendar'%3E%3Crect x='3' y='4' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='16' y1='2' x2='16' y2='6'%3E%3C/line%3E%3Cline x1='8' y1='2' x2='8' y2='6'%3E%3C/line%3E%3Cline x1='3' y1='10' x2='21' y2='10'%3E%3C/line%3E%3C/svg%3E"); + text-align: center; + //background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-calendar'%3E%3Crect x='3' y='4' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='16' y1='2' x2='16' y2='6'%3E%3C/line%3E%3Cline x1='8' y1='2' x2='8' y2='6'%3E%3C/line%3E%3Cline x1='3' y1='10' x2='21' y2='10'%3E%3C/line%3E%3C/svg%3E"); background-repeat: no-repeat; background-position: 10px center; border-radius: 3px 3px 0 0; @@ -18,6 +19,7 @@ border-radius: 0 0 6px 6px; background-color: #ffffff; li { + color: #333333; &.event-title { margin-bottom: 10px; padding-bottom: 10px; @@ -37,6 +39,7 @@ justify-content: center; font-size: 0.96em; margin-bottom: 2px; + color: #777777; } } &.event-content { From 7171f8b0e0a69b201d8bc0b5cfebfd2f82e295f8 Mon Sep 17 00:00:00 2001 From: leejinho Date: Tue, 7 Jan 2020 17:45:43 +0900 Subject: [PATCH 05/11] =?UTF-8?q?#=20=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=20124=206=EA=B0=9C=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EB=B0=9C?= =?UTF-8?q?=EC=8B=A0=20=EC=8B=9C=20'=EC=97=AC=EA=B8=B0=EA=B9=8C=EC=A7=80?= =?UTF-8?q?=20=EC=9D=BD=EC=97=88=EC=8A=B5=EB=8B=88=EB=8B=A4.'=20=EB=B3=B4?= =?UTF-8?q?=EC=97=AC=EC=A7=90=20::=20=EB=B2=84=EA=B7=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../messenger/components/messages.component.html | 1 + .../messenger/components/messages.component.ts | 12 +++++++++++- .../src/lib/components/messages.component.ts | 7 ++++--- 3 files changed, 16 insertions(+), 4 deletions(-) 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 e067daba..92487036 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 @@ -239,6 +239,7 @@ [minShowReadHere]=" environment.productConfig.CommonSetting.readHereShowMinimumEventCount " + [initRoomLastEventSeq]="initRoomLastEventSeq" [translationSimpleview]="translationSimpleview" (moreEvent)="onMoreEvent($event)" (massDetail)="onMassDetail($event)" 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 95d61e71..739e1079 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 @@ -192,6 +192,7 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { /** About ReadHere */ firstcheckReadHere = true; clearReadHere = false; + initRoomLastEventSeq: number; snackBarPreviewEvent: MatSnackBarRef; @@ -358,7 +359,16 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { this.eventInfoStatusSubscription = this.store .pipe( select(AppStore.MessengerSelector.EventSelector.infoStatus), - tap(res => (this.eventInfoStatus = res)) + tap(res => { + this.eventInfoStatus = res; + + if (!!res) { + const elist = this.eventList; + if (res.baseSeq === 0 && elist.length > 0) { + this.initRoomLastEventSeq = elist[elist.length - 1].seq; + } + } + }) ) .subscribe(); diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts index fac5f2d6..403564f4 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts @@ -30,7 +30,6 @@ export class MessagesComponent implements OnInit { set eventList(elist: Info[]) { if (!!elist && elist.length > 0) { this.firstEventSeq = elist[0].seq; - this.lastEventSeq = elist[elist.length - 1].seq; } this.messages = elist; @@ -52,6 +51,8 @@ export class MessagesComponent implements OnInit { @Input() minShowReadHere = 10; @Input() + initRoomLastEventSeq: number; + @Input() translationSimpleview = false; @Output() @@ -86,7 +87,6 @@ export class MessagesComponent implements OnInit { moment = moment; firstEventSeq = 0; - lastEventSeq = 0; existReadHere = false; constructor(private logger: NGXLogger, private datePipe: DatePipe) {} @@ -186,7 +186,8 @@ export class MessagesComponent implements OnInit { if ( !!this.roomInfo && !!this.roomInfo.lastReadEventSeq && - this.lastEventSeq - this.roomInfo.lastReadEventSeq > 5 + this.initRoomLastEventSeq - this.roomInfo.lastReadEventSeq > + this.minShowReadHere ) { if ( this.roomInfo.roomType === RoomType.Single || From a4d0ccd497808871f356d4c9f52b8a30e5efd8c6 Mon Sep 17 00:00:00 2001 From: leejinho Date: Tue, 7 Jan 2020 17:46:06 +0900 Subject: [PATCH 06/11] =?UTF-8?q?=EC=9D=BC=EC=A0=95=20=EC=9C=A0=EC=9E=85?= =?UTF-8?q?=EC=8B=9C=20=EB=8C=80=ED=99=94=EB=B0=A9=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EC=99=80=20=EC=AA=BD=EC=A7=80=20=EB=A9=94=EC=8B=9C?= =?UTF-8?q?=EC=A7=80=20=EC=95=88=EB=82=98=EC=98=A4=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message-box/schedule.component.ts | 2 +- .../src/lib/utils/string.util.ts | 21 ++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.ts index c16f1b4e..e163e7e5 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.ts +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.ts @@ -26,7 +26,7 @@ export class ScheduleComponent implements OnInit { if (!!this.message.sentMessageJson.date) { let str_date = this.message.sentMessageJson.date .replace(/ /g, '') - // .replace(/\n/g, '') + .replace(/\n/g, '') .replace(/(\([월,화,수,목,금,토,일]\))/g, ''); if (str_date.indexOf('오전') > -1) { str_date = str_date.replace('오전', ' '); diff --git a/projects/ucap-webmessenger-ui/src/lib/utils/string.util.ts b/projects/ucap-webmessenger-ui/src/lib/utils/string.util.ts index 90324351..68a5eec7 100644 --- a/projects/ucap-webmessenger-ui/src/lib/utils/string.util.ts +++ b/projects/ucap-webmessenger-ui/src/lib/utils/string.util.ts @@ -4,7 +4,9 @@ import { FileEventJson, MassTextEventJson, TranslationEventJson, - MassTranslationEventJson + MassTranslationEventJson, + PlanEventJson, + PlanContentType } from '@ucap-webmessenger/protocol-event'; import { FileType } from '@ucap-webmessenger/protocol-file'; @@ -206,6 +208,23 @@ export class StringUtil { eventMessage = m.original; } break; + case EventType.Plan: + const m = finalEventMessage as PlanEventJson; + switch (m.contents) { + case PlanContentType.New: + eventMessage = '새로운 일정이 등록되었습니다.'; + break; + case PlanContentType.Update: + eventMessage = '일정이 수정되었습니다.'; + break; + case PlanContentType.Delete: + eventMessage = '일정이 취소되었습니다.'; + break; + default: + eventMessage = '일정이 업데이트 되었습니다.'; + break; + } + break; default: { From a863e10685c7922402d7446c4a23697ad1261815 Mon Sep 17 00:00:00 2001 From: khk Date: Tue, 7 Jan 2020 19:30:58 +0900 Subject: [PATCH 07/11] =?UTF-8?q?=EB=8C=80=ED=99=94=EB=B0=A9=20=EA=B2=80?= =?UTF-8?q?=EC=83=89(=20=EB=94=94=EC=9E=90=EC=9D=B8=EC=A0=81=EC=9A=A9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/messages.component.html | 30 ++-- .../components/messages.component.scss | 27 ++-- .../src/lib/components/search.component.html | 38 ++++- .../src/lib/components/search.component.scss | 149 +++++++++++++----- 4 files changed, 173 insertions(+), 71 deletions(-) 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 92487036..9db6baab 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 @@ -185,27 +185,19 @@ +
      +
      + +
      +
      + +
      +
      -
      -
      - -
      -
      - -
      -
      +
      + - - {{ curIndex }} / {{ totalCount }} +
      +
      +
      + + {{ curIndex }} / {{ totalCount }} +
      diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.scss index bfb83a0c..4c1c7444 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.scss @@ -4,6 +4,7 @@ justify-items: center; .search-form { flex-flow: row; + padding: 0 10px 0 20px; flex: 1 1 auto; form { display: flex; @@ -17,53 +18,123 @@ color: rgba(0, 0, 0, 0.54); } } - .text-amount { - display: inline-flex; - width: 80px; - align-self: center; - } } } - .btns { - display: flex; - flex: 0 0 0%; + .text-amount { + display: inline-flex; + min-width: 80px; + padding: 0 10px; + align-self: center; + font-size: 0.7em; + justify-content: center; + border-radius: 50px; + margin-right: 10px; } } -.mat-form-field-label, -.mat-hint { - color: rgba(0, 0, 0, 0.54); -} - -::ng-deep .btns { - border: 1px solid #dddddd; - border-radius: 4px; - height: 42px; - .mat-stroked-button { - border: none; - min-width: 40px; - height: 42px; - padding: 0 10px; - &.btn-toggle { - display: flex; - border-right: 1px solid #dddddd; - justify-items: center; - &:last-child { - border-right: none; +::ng-deep .search-form { + .mat-form-field-appearance-legacy { + .mat-form-field-wrapper { + color: #ffffff; + padding-bottom: 0.8em; + .mat-form-field-infix { + .mat-input-element { + font-size: 1em; + } } - .mat-button-wrapper { - display: flex; - line-height: inherit; - justify-content: center; - justify-items: center; - width: 20px; - height: 20px; - svg { - width: 100%; - height: 100%; - stroke: #555555; + .mat-form-field-suffix { + button { + position: relative; + transform: translateY(4px); + .mat-button-wrapper { + width: 100%; + height: 100%; + display: flex; + justify-content: center; + font-size: 1.2em; + } + } + } + .mat-form-field-label { + color: rgba(255, 255, 255, 0.7) !important; + } + .mat-form-field-underline { + height: 0; + .mat-form-field-ripple { + top: 6px; + height: 1px; + overflow: hidden; + display: none; } } } } + .icon-search { + height: 100%; + display: flex; + align-self: center; + color: #ffffff; + margin-right: 10px; + } +} + +::ng-deep .chatroom-search { + position: relative; + .btns { + display: flex; + flex: 0 0 0%; + height: 40px; + margin-top: 10px; + //border: 1px solid #ffffff; + border-radius: 50px; + .mat-stroked-button { + border: none; + min-width: 40px; + height: 40px; + padding: 0 10px; + overflow: hidden; + border-radius: 50%; + background-color: (0, 0, 0, 0.7); + &.btn-toggle { + display: flex; + //border-right: 1px solid #ffffff; + justify-items: center; + .mat-button-wrapper { + display: flex; + line-height: inherit; + justify-content: center; + justify-items: center; + width: 20px; + height: 20px; + svg { + width: 100%; + height: 100%; + stroke: #ffffff; + } + } + } + } + } + .btn-close-searchbox { + width: 3em; + height: 100%; + //background: #0367a6; + stroke: #ffffff; + border: none; + display: flex; + justify-content: center; + justify-items: center; + svg { + stroke: #ffffff; + } + } +} + +.stroke-bar { + width: 1px; + height: 20px; + background-color: rgba(255, 255, 255, 0.3); + margin: 0 10px; + display: inline-flex; + align-self: center; } From b8d59a0133e68bf866c70283380bbe6e8fbf7405 Mon Sep 17 00:00:00 2001 From: khk Date: Tue, 7 Jan 2020 19:32:07 +0900 Subject: [PATCH 08/11] =?UTF-8?q?sass=EB=B3=80=EA=B2=BD=EB=82=B4=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/scss/global/_default.scss | 5 +++++ .../src/lib/components/tree.component.scss | 21 ++++++++++++------- .../src/assets/scss/partials/_general.scss | 3 +++ .../src/assets/scss/partials/_presence.scss | 2 +- .../float-action-button.component.scss | 10 +++++---- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss index 6346aee1..d4b8294d 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss +++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss @@ -403,4 +403,9 @@ $daesang-grey: ( } } } + .chat-search-frame { + .chat-search { + background-color: mat-color($accent, 600, 0.7); + } + } } diff --git a/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.scss b/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.scss index 9fe606d4..5c5e01f7 100644 --- a/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.scss +++ b/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.scss @@ -1,4 +1,4 @@ -.organization-tree { +::ng-deep .organization-tree { padding: 5px; .tree-node-closer-container { @@ -10,7 +10,7 @@ width: 15px; height: 40px; position: absolute; - border: 1px dotted grey; + border: 1px dotted #cccccc; border-width: 0 0 1px 1px; top: -40px; // left: 20px; @@ -19,7 +19,7 @@ width: 15px; height: 40px; position: absolute; - border: 1px dotted grey; + border: 1px dotted #cccccc; border-width: 0 0 1px 1px; top: 0px; // left: 20px; @@ -74,10 +74,17 @@ background-color: #eef9fd; border: 1px solid #cee1e8; border-radius: 4px; - padding-bottom: 10px; - - .tree-node-expand-btn { - background-color: transparent; + //padding-bottom: 10px; + button { + line-height: normal; + .mat-button-wrapper { + width: 24px; + height: 24px; + .tree-node-expand-btn { + background-color: transparent; + font-size: 20px; + } + } } } } diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_general.scss b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_general.scss index d1c55201..bad43a32 100644 --- a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_general.scss +++ b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_general.scss @@ -72,3 +72,6 @@ input { a { cursor: pointer; } +[class*='btn'] { + cursor: pointer; +} diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_presence.scss b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_presence.scss index f64201b6..2ff2ec84 100644 --- a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_presence.scss +++ b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_presence.scss @@ -6,7 +6,7 @@ align-items: center; text-indent: -10000000px; margin-right: 4px; - border-radius: 100px; + border-radius: 50%; } .presence { @extend %presence; diff --git a/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.scss b/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.scss index 4273023d..5886bc6b 100644 --- a/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.scss +++ b/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.scss @@ -1,4 +1,4 @@ -.fab-container { +::ng-deep .btn-main-float { position: absolute; bottom: 15px; right: 40px; @@ -12,9 +12,11 @@ flex-direction: column-reverse; align-items: center; margin-bottom: 5px; - - button { - margin-bottom: 17px; + } + button { + margin-bottom: 17px; + .mat-button-wrapper { + line-height: normal; } } } From ce4d94957ba1dd97eb59210ded3e33e6876f523a Mon Sep 17 00:00:00 2001 From: leejinho Date: Wed, 8 Jan 2020 08:19:57 +0900 Subject: [PATCH 09/11] =?UTF-8?q?=EB=8C=80=ED=99=94=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/messages.component.html | 17 ++++++--- .../message-box/schedule.component.ts | 36 +++++++++---------- .../src/lib/components/search.component.html | 1 + 3 files changed, 32 insertions(+), 22 deletions(-) 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 9db6baab..4e3619a9 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 @@ -186,13 +186,22 @@
      -
      +
      - +
      diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.ts index e163e7e5..0e93c281 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.ts +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.ts @@ -24,39 +24,39 @@ export class ScheduleComponent implements OnInit { ngOnInit() { if (!!this.message && !!this.message.sentMessageJson) { if (!!this.message.sentMessageJson.date) { - let str_date = this.message.sentMessageJson.date + let strDate = this.message.sentMessageJson.date .replace(/ /g, '') .replace(/\n/g, '') .replace(/(\([월,화,수,목,금,토,일]\))/g, ''); - if (str_date.indexOf('오전') > -1) { - str_date = str_date.replace('오전', ' '); - } else if (str_date.indexOf('오후') > -1) { - str_date = str_date.replace('오후', ' '); - const arr = str_date.split(' '); - let h = Number(arr[1].split(':')[0]) + 12; - str_date = arr[0] + ' ' + h + ':' + arr[1].split(':')[1]; + if (strDate.indexOf('오전') > -1) { + strDate = strDate.replace('오전', ' '); + } else if (strDate.indexOf('오후') > -1) { + strDate = strDate.replace('오후', ' '); + const arr = strDate.split(' '); + const h = Number(arr[1].split(':')[0]) + 12; + strDate = arr[0] + ' ' + h + ':' + arr[1].split(':')[1]; } - this.date = moment(str_date).toDate(); + this.date = moment(strDate).toDate(); if (this.date === 'Invalid Date') { this.date = this.message.sentMessageJson.date.replace(/\n/g, ''); } } // if (!!this.message.sentMessageJson.endDate) { - // let str_endDate = this.message.sentMessageJson.endDate + // let strEndDate = this.message.sentMessageJson.endDate // .replace(/ /g, '') // .replace(/\n/g, '') // .replace(/(\([월,화,수,목,금,토,일]\))/g, ''); - // if (str_endDate.indexOf('오전') > -1) { - // str_endDate = str_endDate.replace('오전', ' '); - // } else if (str_endDate.indexOf('오후') > -1) { - // str_endDate = str_endDate.replace('오후', ' '); - // const arr = str_endDate.split(' '); - // let h = Number(arr[1].split(':')[0]) + 12; - // str_endDate = arr[0] + ' ' + h + ':' + arr[1].split(':')[1]; + // if (strEndDate.indexOf('오전') > -1) { + // strEndDate = strEndDate.replace('오전', ' '); + // } else if (strEndDate.indexOf('오후') > -1) { + // strEndDate = strEndDate.replace('오후', ' '); + // const arr = strEndDate.split(' '); + // const h = Number(arr[1].split(':')[0]) + 12; + // strEndDate = arr[0] + ' ' + h + ':' + arr[1].split(':')[1]; // } - // this.endDate = moment(str_endDate).toDate(); + // this.endDate = moment(strEndDate).toDate(); // if (this.endDate === 'Invalid Date') { // this.endDate = this.message.sentMessageJson.endDate.replace( // /\n/g, diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.html index e002647f..571633fb 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.html +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.html @@ -37,6 +37,7 @@