diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.ts index 11d5b16f..34a470cf 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.ts @@ -61,6 +61,7 @@ import { } from '../../dialogs/message/message-write.dialog.component'; import { UserInfo } from '@ucap-webmessenger/protocol-sync'; import { EmployeeType } from '@ucap-webmessenger/protocol-room'; +import { map } from 'rxjs/operators'; export interface MessageTypeData { displayName: string; @@ -142,19 +143,39 @@ export class MessageBoxComponent }); this.messageRetrieveList$ = this.store.pipe( - select(AppStore.MessengerSelector.MessageSelector.selectAllReceiveList) + select(AppStore.MessengerSelector.MessageSelector.selectAllReceiveList), + map(list => + list.sort((a, b) => + a.regDate > b.regDate ? -1 : a.regDate < b.regDate ? 1 : 0 + ) + ) ); this.messageSendList$ = this.store.pipe( - select(AppStore.MessengerSelector.MessageSelector.selectAllSendList) + select(AppStore.MessengerSelector.MessageSelector.selectAllSendList), + map(list => + list.sort((a, b) => + a.regDate > b.regDate ? -1 : a.regDate < b.regDate ? 1 : 0 + ) + ) ); this.messageReservationList$ = this.store.pipe( select( AppStore.MessengerSelector.MessageSelector.selectAllReservationList + ), + map(list => + list.sort((a, b) => + a.regDate > b.regDate ? -1 : a.regDate < b.regDate ? 1 : 0 + ) ) ); this.messageSearchList$ = this.store.pipe( - select(AppStore.MessengerSelector.MessageSelector.selectAllSearchList) + select(AppStore.MessengerSelector.MessageSelector.selectAllSearchList), + map(list => + list.sort((a, b) => + a.regDate > b.regDate ? -1 : a.regDate < b.regDate ? 1 : 0 + ) + ) ); this.messageDetailInfo = this.store diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.html index 0d9e110d..da00235c 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.html @@ -1,6 +1,11 @@ - - {{ 'accounts.changePassword' | translate }} + + {{ 'accounts.changePassword' | translate }}
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.html index bd42e33c..72850943 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.html @@ -1,6 +1,11 @@ - - {{ 'settings.label' | translate }} + + {{ 'settings.label' | translate }} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html index aebb11ec..f6a91939 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html @@ -1,6 +1,11 @@ - - {{ data.title }} + + {{ data.title }} @@ -63,7 +68,7 @@ -
+
@@ -149,7 +154,7 @@ -
+
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss index 25101ef4..9455060d 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss @@ -1,47 +1,67 @@ -.mat-card-header { - .mat-card-header-text { - margin: 0; - } - .btn-dialog-close { - font-size: 20px; - display: flex; - margin-left: auto; - align-self: flex-start; - color: #444444; +.dialog-creat-chat { + & > .mat-card-header { + .btn-dialog-close { + font-size: 20px; + display: flex; + margin-left: auto; + align-self: flex-start; + color: #444444; + } } } -//조직도 레이아웃 변경 -::ng-deep .dialog-org { - .ps__rail-y { - left: auto !important; - } - - .oraganization-tab { +.dialog-tab-grouplist { + height: 380px; + width: 100%; + .group { width: 100%; - height: 380px; - border-bottom: 1px solid #dddddd; - position: relative; - .oraganization-tab-tree { - display: inline-flex; - width: 50%; - height: 100% !important; - border-right: 1px solid #dddddd; - overflow: auto; - .tab-tree-frame { - width: 100%; - height: 100%; + height: calc(100% - 50px); + &-expansion { + .list-item { + height: 60px; } } - .select-list { - display: inline-flex; - flex-direction: column; - width: 50%; - height: 100% !important; - overflow: auto; - .search-list { + &-list-item { + width: 100%; + } + } +} + +::ng-deep .dialog-tab-orglist { + width: 100%; + height: 380px; + border-bottom: 1px solid #dddddd; + position: relative; + .oraganization { + .ps__rail-y { + left: auto !important; + } + &-tab { + width: 100%; + height: 380px; + border-bottom: 1px solid #dddddd; + position: relative; + &-tree { + display: inline-flex; + width: 50%; + height: 100% !important; + border-right: 1px solid #dddddd; overflow: auto; - height: calc(100% - 40px); + .tab-tree-frame { + width: 100%; + height: 100%; + } + } + .select-list { + display: inline-flex; + flex-direction: column; + width: 50%; + height: 100% !important; + overflow: auto; + .search-list { + overflow: auto; + height: calc(100% - 40px); + } } } } @@ -82,7 +102,7 @@ } } -::ng-deep .mat-dialog-container { +/*::ng-deep .mat-dialog-container { .mat-tab-body-wrapper { height: 380px; width: 100%; @@ -123,3 +143,4 @@ width: 100%; height: 100%; } +*/ 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 86c233fe..d6dc4cd8 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 @@ -1,6 +1,11 @@ - - {{ data.title }} + + {{ data.title }} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.html index 03e5800e..83f6fdeb 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.html @@ -1,6 +1,11 @@ - {{ data.title }} + {{ data.title }} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.html index 9f37505d..c1ed29e2 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.html @@ -1,6 +1,11 @@ - - {{ data.title }} + + {{ data.title }} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.html index 9c0121a0..86ffaa4e 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.html @@ -1,6 +1,10 @@ - - + + {{ 'message.type.messageTypeReceiving' | translate diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.html index 9192de70..6407d57d 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.html @@ -1,6 +1,10 @@ - - + + {{ (isModify ? 'message.modify' : 'message.sendTo') | translate }} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html index cd66128d..3f30b878 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html @@ -1,6 +1,11 @@ - - {{ 'settings.label' | translate }} + + {{ 'settings.label' | translate }} diff --git a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html index 406909bd..556c2ebc 100644 --- a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html +++ b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html @@ -4,7 +4,7 @@
- +