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 2020-01-08 08:19:57 +09:00
parent b8d59a0133
commit ce4d94957b
3 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html
View File

@ -186,13 +186,22 @@
</div>
</div>
<div class="chat-search-frame">
<div *ngIf="(eventListProcessing$ | async) || isTranslationProcess" style="position: absolute; width: 100%;">
<div
*ngIf="(eventListProcessing$ | async) || isTranslationProcess"
style="position: absolute; width: 100%;"
>
<mat-progress-bar mode="indeterminate"></mat-progress-bar>
</div>
<div *ngIf="isShowSearchArea" class="chat-search bg-accent-color">
<ucap-chat-search [totalCount]="searchTotalCount" [curIndex]="searchCurrentIndex"
(searchText)="onSearchChat($event)" (prevSearch)="onPrevSearch()" (nextSearch)="onNextSearch()"
(searchAndPrev)="onSearchAndPrev()" (closeSearchArea)="onCloseSearchArea()"></ucap-chat-search>
<ucap-chat-search
[totalCount]="searchTotalCount"
[curIndex]="searchCurrentIndex"
(searchText)="onSearchChat($event)"
(prevSearch)="onPrevSearch()"
(nextSearch)="onNextSearch()"
(searchAndPrev)="onSearchAndPrev()"
(closeSearchArea)="onCloseSearchArea()"
></ucap-chat-search>
</div>
</div>
</mat-toolbar>

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

@ -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,

1
projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.html
View File

@ -37,6 +37,7 @@
<div class="btns">
<button
*ngIf="false"
mat-stroked-button
(click)="onClickSearchAndPrev()"
class="btn-toggle"