From 73d7f181ea070092123f06df0e2877bef7922040 Mon Sep 17 00:00:00 2001 From: Richard Park Date: Mon, 9 Dec 2019 11:28:27 +0900 Subject: [PATCH] validation of schedule send is modified --- .../src/lib/components/write.component.scss | 2 -- .../schedule-send.dialog.component.html | 32 ++++++++++++++----- .../schedule-send.dialog.component.scss | 15 +++++++++ .../dialogs/schedule-send.dialog.component.ts | 8 +++-- 4 files changed, 45 insertions(+), 12 deletions(-) diff --git a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss index aaae0544..5bb4af7e 100644 --- a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss +++ b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss @@ -22,12 +22,10 @@ } [contenteditable] { - transition: padding 0.3s ease-in-out; } [contenteditable]:hover, [contenteditable]:focus { - padding: 0.25em; } [contenteditable]:hover { diff --git a/projects/ucap-webmessenger-ui-message/src/lib/dialogs/schedule-send.dialog.component.html b/projects/ucap-webmessenger-ui-message/src/lib/dialogs/schedule-send.dialog.component.html index 29cafcd3..bd2919dd 100644 --- a/projects/ucap-webmessenger-ui-message/src/lib/dialogs/schedule-send.dialog.component.html +++ b/projects/ucap-webmessenger-ui-message/src/lib/dialogs/schedule-send.dialog.component.html @@ -101,14 +101,30 @@ -
-
- - +
+
+ + 현재 시각으로부터 30분 이후로만 설정 가능합니다. + +
+
+
+ + +
diff --git a/projects/ucap-webmessenger-ui-message/src/lib/dialogs/schedule-send.dialog.component.scss b/projects/ucap-webmessenger-ui-message/src/lib/dialogs/schedule-send.dialog.component.scss index b5636aec..d48f2547 100644 --- a/projects/ucap-webmessenger-ui-message/src/lib/dialogs/schedule-send.dialog.component.scss +++ b/projects/ucap-webmessenger-ui-message/src/lib/dialogs/schedule-send.dialog.component.scss @@ -1,3 +1,18 @@ .preset-button { width: 100%; } + +.actions-container { + display: flex; + position: fixed; + + .actions-message { + } + + .actions-spacer { + flex: 1 1 auto; + } + + .actions { + } +} diff --git a/projects/ucap-webmessenger-ui-message/src/lib/dialogs/schedule-send.dialog.component.ts b/projects/ucap-webmessenger-ui-message/src/lib/dialogs/schedule-send.dialog.component.ts index accde7e4..e49d9332 100644 --- a/projects/ucap-webmessenger-ui-message/src/lib/dialogs/schedule-send.dialog.component.ts +++ b/projects/ucap-webmessenger-ui-message/src/lib/dialogs/schedule-send.dialog.component.ts @@ -23,6 +23,8 @@ export class ScheduleSendDialogComponent implements OnInit { hourStep = 1; minuteStep = 10; + dateIsToEarly = false; + get selectedDate() { return this._selectedDate; } @@ -31,6 +33,8 @@ export class ScheduleSendDialogComponent implements OnInit { this.minuteStep * Math.round(v.minute() / this.minuteStep) ); this._selectedDate = v; + const aa = moment().add(30, 'minutes'); + this.dateIsToEarly = v.isBefore(moment().add(30, 'minutes')); } // tslint:disable-next-line: variable-name private _selectedDate: moment.Moment; @@ -59,10 +63,10 @@ export class ScheduleSendDialogComponent implements OnInit { } onHourSelected(hour: number) { - this.selectedDate.hour(hour); + this.selectedDate = this.selectedDate.hour(hour); } onMinuteSelected(minute: number) { - this.selectedDate.minute(minute); + this.selectedDate = this.selectedDate.minute(minute); } onClickPresetTommorowMorning() {