From 370fa4457954f950a1abc1e806c918721980caa2 Mon Sep 17 00:00:00 2001 From: leejinho Date: Wed, 5 Feb 2020 09:32:46 +0900 Subject: [PATCH] =?UTF-8?q?bugfix=20::=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20?= =?UTF-8?q?=ED=83=80=EC=9E=85(P:=EC=9D=BC=EC=A0=95)=20=EC=97=90=20'XX=20?= =?UTF-8?q?=EC=A0=84=20=EC=95=8C=EB=A6=BC'=20=EB=AC=B8=EA=B5=AC=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/i18n/en.json | 2 ++ .../src/assets/i18n/ko.json | 2 ++ .../protocols/event-json/plan.event-json.ts | 4 +-- .../message-box/schedule.component.html | 3 +- .../message-box/schedule.component.ts | 30 ++++++++++++++++++- 5 files changed, 37 insertions(+), 4 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/en.json b/projects/ucap-webmessenger-app/src/assets/i18n/en.json index 57c687db..476cf86f 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/en.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/en.json @@ -253,6 +253,8 @@ "scheduleTypeUpdate": "[Event] Modified", "scheduleTypeDelete": "[Event] Deleted", "scheduleTypeDefault": "[Event] Processing..", + "scheduleTypePrefix": "[Event] ", + "scheduleTypeSurfixLeft": " left", "showPreviousEvents": "Show previous", "moreUnreadEventsWith": "There is unread messages({{countOfUnread}})" }, diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json index 7eeab21d..0fd8399b 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json @@ -253,6 +253,8 @@ "scheduleTypeUpdate": "[이벤트] 수정", "scheduleTypeDelete": "[이벤트] 삭제", "scheduleTypeDefault": "[이벤트] 조회중..", + "scheduleTypePrefix": "[이벤트] ", + "scheduleTypeSurfixLeft": " 전 알림", "showPreviousEvents": "이전 대화 보기", "moreUnreadEventsWith": "안읽은 메시지가 ({{countOfUnread}})개 더 있습니다." }, diff --git a/projects/ucap-webmessenger-protocol-event/src/lib/protocols/event-json/plan.event-json.ts b/projects/ucap-webmessenger-protocol-event/src/lib/protocols/event-json/plan.event-json.ts index 194e7aa8..dc496388 100644 --- a/projects/ucap-webmessenger-protocol-event/src/lib/protocols/event-json/plan.event-json.ts +++ b/projects/ucap-webmessenger-protocol-event/src/lib/protocols/event-json/plan.event-json.ts @@ -4,7 +4,7 @@ import { JsonAnalization } from '@ucap-webmessenger/api'; export interface PlanEventJson { planSeq?: number; title?: string; - contents?: PlanContentType; + contents?: PlanContentType | string; date?: string; endDate?: string; active?: boolean; @@ -23,7 +23,7 @@ export const decodePlanEventJson: EventJsonDecoder = ( return { planSeq: json.planSeq, title: json.title, - contents: json.contents as PlanContentType, + contents: json.contents, date: json.date, endDate: json.endDate, active: !!json.activeYn && 'Y' === json.activeYn ? true : false 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 079e7dcd..30a7a8d6 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 @@ -14,7 +14,8 @@ {{ 'chat.event.scheduleTypeDelete' | translate }} - {{ 'chat.event.scheduleTypeDefault' | translate }} + + {{ getAlertLeftTime() }} 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 0e93c281..b476f2c8 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 @@ -5,6 +5,7 @@ import { PlanContentType } from '@ucap-webmessenger/protocol-event'; import moment from 'moment'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'ucap-chat-message-box-schedule', @@ -19,7 +20,7 @@ export class ScheduleComponent implements OnInit { date: any; endDate: any; - constructor() {} + constructor(private translateService: TranslateService) {} ngOnInit() { if (!!this.message && !!this.message.sentMessageJson) { @@ -68,4 +69,31 @@ export class ScheduleComponent implements OnInit { } onClickSave(): void {} + + getAlertLeftTime(): string { + let content = this.message.sentMessageJson.contents; + if (content.indexOf('PLAN_CONTENTS_MINUTE') > -1) { + content = content.replace( + 'PLAN_CONTENTS_MINUTE', + this.translateService.instant('common.units.minute') + ); + } else if (content.indexOf('PLAN_CONTENTS_HOUR') > -1) { + content = content.replace( + 'PLAN_CONTENTS_HOUR', + this.translateService.instant('common.units.hour') + ); + } + + if (content.indexOf('PLAN_CONTENTS_AFTER') > -1) { + content = content.replace( + 'PLAN_CONTENTS_AFTER', + this.translateService.instant('chat.event.scheduleTypeSurfixLeft') + ); + } + + content = + this.translateService.instant('chat.event.scheduleTypePrefix') + content; + + return content; + } }