@@ -7,7 +7,7 @@ import { QuestionnaireItem, QuestionnaireResponseItemAnswer } from 'fhir/r4';
7
7
import { format , isValid } from 'date-fns' ;
8
8
import { DatePicker , DateTimePickerWrapper , DateTime } from '@helsenorge/datepicker/components/DatePicker' ;
9
9
10
- import { DateFormat , DateTimeUnit } from '../../../types/dateTypes' ;
10
+ import { DateFormat , DateTimeUnit , TimeUnit } from '../../../types/dateTypes' ;
11
11
12
12
import { newDateTimeValueAsync } from '../../../actions/newValue' ;
13
13
import { GlobalState , useAppDispatch } from '../../../reducers' ;
@@ -22,6 +22,7 @@ import {
22
22
validateMinutes ,
23
23
parseStringToDate ,
24
24
getPDFValueForDate ,
25
+ validateTimeDigits ,
25
26
} from '../../../util/date-utils' ;
26
27
import { isRequired , getId , isReadOnly } from '../../../util/index' ;
27
28
import styles from '../common-styles.module.css' ;
@@ -173,6 +174,9 @@ const DateTimeInput = ({ linkId, path, pdf, id, idWithLinkIdAndItemIndex, childr
173
174
message : resources ?. formRequiredErrorMessage || '' ,
174
175
} ,
175
176
validate : {
177
+ validDigits : value => {
178
+ return value ? validateTimeDigits ( value , TimeUnit . Hours , resources ) : true ;
179
+ } ,
176
180
validHours : value => {
177
181
return doesAnyFieldsHaveValue ( ) ? validateHours ( Number ( value ) , resources ) : true ;
178
182
} ,
@@ -186,6 +190,9 @@ const DateTimeInput = ({ linkId, path, pdf, id, idWithLinkIdAndItemIndex, childr
186
190
message : resources ?. formRequiredErrorMessage || '' ,
187
191
} ,
188
192
validate : {
193
+ validDigits : value => {
194
+ return value ? validateTimeDigits ( value , TimeUnit . Minutes , resources ) : true ;
195
+ } ,
189
196
validMinutes : value => {
190
197
return doesAnyFieldsHaveValue ( ) ? validateMinutes ( Number ( value ) , resources ) : true ;
191
198
} ,
0 commit comments