diff --git a/src/components/formcomponents/boolean/boolean.tsx b/src/components/formcomponents/boolean/boolean.tsx index 40863013..237a969c 100644 --- a/src/components/formcomponents/boolean/boolean.tsx +++ b/src/components/formcomponents/boolean/boolean.tsx @@ -6,8 +6,10 @@ import { ThunkDispatch } from 'redux-thunk'; import { QuestionnaireItem, QuestionnaireResponseItemAnswer, QuestionnaireResponseItem, Questionnaire } from '../../../types/fhir'; import { ValidationProps } from '../../../types/formTypes/validation'; +import { Resources } from '../../../types/resources'; import Checkbox from '@helsenorge/designsystem-react/components/Checkbox'; +import FormGroup from '@helsenorge/designsystem-react/components/FormGroup'; import Label from '@helsenorge/designsystem-react/components/Label'; // import Validation from '@helsenorge/designsystem-react/components/Validation'; @@ -21,9 +23,7 @@ import { getValidationTextExtension } from '../../../util/extension'; import { getId, getText, getTextValidationErrorMessage, isReadOnly, isRequired, renderPrefix } from '../../../util/index'; import { mapStateToProps, mergeProps, mapDispatchToProps } from '../../../util/map-props'; import { Path } from '../../../util/refero-core'; -import { Resources } from '../../../types/resources'; import withCommonFunctions, { WithCommonFunctionsProps } from '../../with-common-functions'; -import FormGroup from '@helsenorge/designsystem-react/components/FormGroup'; export interface BooleanProps extends WithCommonFunctionsProps { item: QuestionnaireItem; @@ -80,7 +80,7 @@ const Boolean = ({ promptLoginMessage(); } }; - const filedState = getFieldState(getId(item.linkId)); + const { error } = getFieldState(getId(item.linkId)); const labelText = `${renderPrefix(item)} ${getText(item, onRenderMarkdown, questionnaire, resources)}`; if (pdf) { @@ -106,28 +106,25 @@ const Boolean = ({ // helpElement={this.props.renderHelpElement()} // validateOnExternalUpdate={true} // isStyleBlue - console.log('filedState', filedState); + console.log('filedState', error); console.log('getValidationTextExtension', getValidationTextExtension(item)); const getRequiredErrorMessage = (item: QuestionnaireItem): string | undefined => { return isRequired(item) ? resources?.formRequiredErrorMessage : undefined; }; return (
- {renderHelpButton()}} />} - required={isRequired(item)} - checked={getBooleanValue(answer, item)} - onChange={handleChange} - disabled={isReadOnly(item)} - className="page_refero__input" - errorText={filedState.error?.message} - error={filedState.invalid} - /> + + {renderHelpButton()}} />} + checked={getBooleanValue(answer, item)} + className="page_refero__input" + /> + {renderDeleteButton('page_refero__deletebutton--margin-top')} {repeatButton} {children ?
{children}
: null} diff --git a/src/components/formcomponents/choice-common/autosuggest-view.tsx b/src/components/formcomponents/choice-common/autosuggest-view.tsx index e8d18ab5..adcd5981 100644 --- a/src/components/formcomponents/choice-common/autosuggest-view.tsx +++ b/src/components/formcomponents/choice-common/autosuggest-view.tsx @@ -5,6 +5,7 @@ import { useFormContext } from 'react-hook-form'; import { AutoSuggestProps } from '../../../types/autoSuggestProps'; import { ValueSet, QuestionnaireItem, Questionnaire, Coding, QuestionnaireResponseItemAnswer } from '../../../types/fhir'; +import { Resources } from '../../../types/resources'; import Loader from '@helsenorge/designsystem-react/components/Loader'; import NotificationPanel from '@helsenorge/designsystem-react/components/NotificationPanel'; @@ -14,13 +15,12 @@ import Autosuggest, { Suggestion } from '@helsenorge/autosuggest/components/auto import { debounce } from '@helsenorge/core-utils/debounce'; import { OPEN_CHOICE_ID } from '../../../constants'; +import { OPEN_CHOICE_SYSTEM } from '../../../constants/codingsystems'; import ItemType from '../../../constants/itemType'; import { getValidationTextExtension } from '../../../util/extension'; import { isRequired, getId, getSublabelText } from '../../../util/index'; -import { Resources } from '../../../types/resources'; import Label from '../label'; import SubLabel from '../sublabel'; -import { OPEN_CHOICE_SYSTEM } from '../../../constants/codingsystems'; interface AutosuggestViewProps { handleChange: (code?: string, systemArg?: string, displayArg?: string) => void; diff --git a/src/components/formcomponents/choice/checkbox-view.tsx b/src/components/formcomponents/choice/checkbox-view.tsx index ae98c3a9..87c13574 100644 --- a/src/components/formcomponents/choice/checkbox-view.tsx +++ b/src/components/formcomponents/choice/checkbox-view.tsx @@ -43,6 +43,7 @@ const CheckboxView = ({ repeatButton, renderDeleteButton, onRenderMarkdown, + renderHelpButton, }: Props): JSX.Element | null => { if (!options) { return null; @@ -88,6 +89,7 @@ const CheckboxView = ({