Skip to content

Commit 040db50

Browse files
authored
Merge pull request #942 from ibi-group/prior-notice-time-field
Prior_Notice_Last_Time accept Time instead of Number
2 parents 8c54ef4 + a7f9de6 commit 040db50

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

lib/editor/util/validation.js

+9
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,15 @@ export function validate (
252252
}
253253
return false
254254
case 'TIME':
255+
const isValid = moment(value, 'HH:mm:ss', true).isValid()
256+
if (isRequiredButEmpty) {
257+
return emptyFieldValidationIssue()
258+
} else if (!valueDoesNotExist && !isValid) {
259+
return validationIssue('Field must be valid time')
260+
} else {
261+
return false
262+
}
263+
255264
case 'NUMBER':
256265
const isNotANumber = isNaN(value)
257266
if (isRequiredButEmpty) {

lib/types/reducers.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ export type EditorTables = {
129129
pickup_message: string,
130130
prior_notice_duration_max: number,
131131
prior_notice_duration_min: number,
132-
prior_notice_last_time: number,
132+
prior_notice_last_time: Date,
133133
prior_notice_start_day: number,
134-
prior_notice_start_time: number
134+
prior_notice_start_time: Date
135135
}>,
136136
calendar: Array<{
137137
description: string,

0 commit comments

Comments
 (0)