diff --git a/frontend/public/locales/en/common.json b/frontend/public/locales/en/common.json
index 6d4e03f390ef77d41231ee8ceaf485a84b44bc8c..41b156943eda722ab70e73300565a957a5572433 100644
--- a/frontend/public/locales/en/common.json
+++ b/frontend/public/locales/en/common.json
@@ -44,7 +44,8 @@
"details": "Details",
"nationalIdNumber": "National ID number",
"validation": {
- "lastNameRequired": "Last name required",
+ "firstNameRequired": "First name is required",
+ "lastNameRequired": "Last name is required",
"dateOfBirthRequired": "Date of birth is required",
"invalidIdNumber": "Invalid national ID number",
"nationalIdNumberRequired": "National ID number required",
@@ -62,6 +63,9 @@
},
"registerWizardText": {
"registerPage": "Enter the contact information for the guest below. All fields are mandatory.",
- "summaryPage": "Check that the values are correct before saving."
+ "summaryPage": "Check that the values are correct before saving.",
+ "registerContactInfo": "Register contact info",
+ "registerPeriod": "Register period",
+ "registerPeriodText": "Enter role and duration."
}
}
diff --git a/frontend/public/locales/nb/common.json b/frontend/public/locales/nb/common.json
index fd083ac210a6a113fb08395e231752ee10f1863d..fd070f31b75832601321097de88988d4fb03b459 100644
--- a/frontend/public/locales/nb/common.json
+++ b/frontend/public/locales/nb/common.json
@@ -44,12 +44,13 @@
"details": "Detaljer",
"nationalIdNumber": "Fødselsnummer",
"validation": {
- "lastNameRequired": "Etternavn er påkrevd",
- "dateOfBirthRequired": "Fødselsdato er påkrevd",
+ "firstNameRequired": "Fornavn er obligatorisk",
+ "lastNameRequired": "Etternavn er obligatorisk",
+ "dateOfBirthRequired": "Fødselsdato er obligatorisk",
"invalidIdNumber": "Ugyldig fødselsnummer",
- "nationalIdNumberRequired": "Fødselsnummer er påkrevd",
- "roleTypeRequired": "Rolletype er påkrevd",
- "roleEndRequired": "Sluttdato for rolle er påkrevd",
+ "nationalIdNumberRequired": "Fødselsnummer er obligatorisk",
+ "roleTypeRequired": "Rolletype er obligatorisk",
+ "roleEndRequired": "Sluttdato for rolle er obligatorisk",
"emailRequired": "E-post er obligatorisk",
"invalidMobilePhoneNumber": "Ugyldig telefonnummer",
"invalidEmail": "Ugyldig e-postadresse"
@@ -62,6 +63,9 @@
},
"registerWizardText": {
"registerPage": "Fyll inn kontaktinformasjonen til gjesten under. Alle feltene er obligatoriske.",
- "summaryPage": "Sjekk at alt stemmer før lagring."
+ "summaryPage": "Sjekk at alt stemmer før lagring.",
+ "registerContactInfo": "Registrere kontaktinfo",
+ "registerPeriod": "Registrere periode",
+ "registerPeriodText": "Fyll inn rolle og periode."
}
}
diff --git a/frontend/public/locales/nn/common.json b/frontend/public/locales/nn/common.json
index ba148252190ae9fb31ddfd3fe01db40d25b2ad69..63d8ebd2cc92e28eaabef0ee8f115bbab2faefa9 100644
--- a/frontend/public/locales/nn/common.json
+++ b/frontend/public/locales/nn/common.json
@@ -45,12 +45,13 @@
"details": "Detaljer",
"nationalIdNumber": "Fødselsnummer",
"validation": {
- "lastNameRequired": "Etternamn er påkrevd",
- "dateOfBirthRequired": "Fødselsdato er påkrevd",
+ "firstNameRequired": "Fornamn er obligatorisk",
+ "lastNameRequired": "Etternamn er obligatorisk",
+ "dateOfBirthRequired": "Fødselsdato er obligatorisk",
"invalidIdNumber": "Ugyldig fødselsnummer",
- "nationalIdNumberRequired": "Fødselsnummer er påkrevd",
- "roleTypeRequired": "Rolletype er påkrevd",
- "roleEndRequired": "Sluttdato for rolle er påkrevd",
+ "nationalIdNumberRequired": "Fødselsnummer er obligatorisk",
+ "roleTypeRequired": "Rolletype er obligatorisk",
+ "roleEndRequired": "Sluttdato for rolle er obligatorisk",
"emailRequired": "E-post er obligatorisk",
"invalidMobilePhoneNumber": "Ugyldig telefonnummer",
"invalidEmail": "Ugyldig e-postadresse"
@@ -63,6 +64,9 @@
},
"registerWizardText": {
"registerPage": "Fyll inn kontaktinformasjonen til gjesten under. Alle feltene er obligatoriske.",
- "summaryPage": "Sjekk at alt stemmer før lagring."
+ "summaryPage": "Sjekk at alt stemmer før lagring.",
+ "registerContactInfo": "Registrere kontaktinfo",
+ "registerPeriod": "Registrere periode",
+ "registerPeriodText": "Fyll inn rolle og periode."
}
}
diff --git a/frontend/src/routes/register/index.tsx b/frontend/src/routes/register/index.tsx
index 4a92ee1b394647eca99a8e2acb6b834639e5ab23..accf9a58f53542cdf7f3495f02bba3beaab72a12 100644
--- a/frontend/src/routes/register/index.tsx
+++ b/frontend/src/routes/register/index.tsx
@@ -76,10 +76,10 @@ export default function StepRegistration() {
}
return (
- <Page header='Register as a guest'>
-
+ <Page>
{/* Stepper at top of wizard */}
- <Stepper activeStep={activeStep}>
+ <Stepper sx={{ paddingTop: '2rem' }}
+ activeStep={activeStep}>
{/* eslint-disable-next-line @typescript-eslint/no-unused-vars */}
{steps.map((label, index) => {
const stepProps = {}
@@ -105,9 +105,11 @@ export default function StepRegistration() {
)}
</Box>
- <Box sx={{ display: 'flex', flexDirection: 'row', pt: 2, color: 'primary.main' }}>
+ <Box sx={{ display: 'flex', flexDirection: 'row', pt: 2, color: 'primary.main', paddingBottom: '1rem'}}>
{activeStep === REGISTER_STEP && (
- <Button data-testid='button-next' onClick={handleNext}>
+ <Button data-testid='button-next'
+ sx={{ color: 'theme.palette.secondary', mr: 1 }}
+ onClick={handleNext}>
{t('button.next')}
</Button>
)}
diff --git a/frontend/src/routes/register/stepPersonForm.tsx b/frontend/src/routes/register/stepPersonForm.tsx
index b4e1b4e68bd3d784bb80e743b236aa2c953f22b9..9d0622b08e8f12bd0644a816f2738dfeda482ec4 100644
--- a/frontend/src/routes/register/stepPersonForm.tsx
+++ b/frontend/src/routes/register/stepPersonForm.tsx
@@ -1,4 +1,14 @@
-import { Box, FormControl, InputLabel, MenuItem, Select, SelectChangeEvent, Stack, TextField } from '@mui/material'
+import {
+ Box,
+ FormControl,
+ InputLabel,
+ MenuItem,
+ Select,
+ SelectChangeEvent,
+ Stack,
+ TextField,
+ Typography,
+} from '@mui/material'
import { Controller, SubmitHandler, useForm } from 'react-hook-form'
import { DatePicker } from '@mui/lab'
import React, { forwardRef, Ref, useEffect, useImperativeHandle, useState } from 'react'
@@ -81,7 +91,7 @@ const StepPersonForm = forwardRef((props: StepPersonFormProperties, ref: Ref<Per
}
register('role_type', {
- required: t('validation.roleTypeRequired').toString(),
+ required: t<string>('validation.roleTypeRequired'),
})
const handleRoleTypeChange = (event: any) => {
@@ -97,16 +107,22 @@ const StepPersonForm = forwardRef((props: StepPersonFormProperties, ref: Ref<Per
return (
<>
- <Box sx={{ typography: 'subtitle2' }}>
- {t('registerWizardText.registerPage')}
- </Box>
+ <Typography variant='h5' sx={{
+ paddingTop: '1rem',
+ paddingBottom: '1rem',
+ }}>{t('registerWizardText.registerContactInfo')}</Typography>
+ <Typography sx={{ paddingBottom: '2rem' }}>{t('registerWizardText.registerPage')}</Typography>
<Box sx={{ maxWidth: '30rem' }}>
<form onSubmit={onSubmit}>
<Stack spacing={2}>
<TextField
id='firstName'
label={t('input.firstName')}
- {...register(`first_name`)}
+ error={!!errors.first_name}
+ helperText={errors.first_name && errors.first_name.message}
+ {...register(`first_name`, {
+ required: t<string>('validation.firstNameRequired'),
+ })}
/>
<TextField
id='lastName'
@@ -114,7 +130,7 @@ const StepPersonForm = forwardRef((props: StepPersonFormProperties, ref: Ref<Per
error={!!errors.last_name}
helperText={errors.last_name && errors.last_name.message}
{...register(`last_name`, {
- required: t('validation.lastNameRequired').toString(),
+ required: t<string>('validation.lastNameRequired'),
})}
/>
<TextField
@@ -126,6 +142,9 @@ const StepPersonForm = forwardRef((props: StepPersonFormProperties, ref: Ref<Per
validate: isValidEmail,
})}
/>
+
+ <Typography variant='h5' sx={{ paddingTop: '1rem' }}>{t('registerWizardText.registerPeriod')}</Typography>
+ <Typography sx={{ paddingBottom: '1rem' }}>{t('registerWizardText.registerPeriodText')}</Typography>
<FormControl fullWidth>
<InputLabel id='ou-select-label'>{t('common:ou')}</InputLabel>
<Select