diff --git a/frontend/public/locales/en/common.json b/frontend/public/locales/en/common.json index 86a9aef8bca2026eac17266b780ec3327b740f68..4722618bad88b18348da54608c0353f33cba8d82 100644 --- a/frontend/public/locales/en/common.json +++ b/frontend/public/locales/en/common.json @@ -17,7 +17,9 @@ "lastName": "Last name", "dateOfBirth": "Date of birth", "nationalIdNumber": "National ID number", - "roleType": "Role" + "roleType": "Role", + "roleStartDate": "From", + "roleEndDate": "To" }, "loading": "Loading...", "termsHeader": "Terms", @@ -26,6 +28,7 @@ "lastNameRequired": "Last name required", "invalidIdNumber": "Invalid national ID number", "nationalIdNumberRequired": "National ID number required", - "roleTypeRequired": "Role type is required" + "roleTypeRequired": "Role type is required", + "roleEndRequired": "Role end date is required" } } diff --git a/frontend/public/locales/nb/common.json b/frontend/public/locales/nb/common.json index 23d7dc4e15e292d446dc7baf532d4325d0bb5e0c..b6e461f3befc9312e4870aec720898057e819b24 100644 --- a/frontend/public/locales/nb/common.json +++ b/frontend/public/locales/nb/common.json @@ -17,7 +17,9 @@ "lastName": "Etternavn", "dateOfBirth": "Fødselsdato", "nationalIdNumber": "Fødselsnummer", - "roleType": "Rolle" + "roleType": "Gjesterolle", + "roleStartDate": "Fra", + "roleEndDate": "Til" }, "loading": "Laster...", "termsHeader": "Vilkår", @@ -26,6 +28,7 @@ "lastNameRequired": "Etternavn er påkrevd", "invalidIdNumber": "Ugyldig fødselsnummer", "nationalIdNumberRequired": "Fødselsnummer er påkrevd", - "roleTypeRequired": "Rolletype er påkrevd" + "roleTypeRequired": "Rolletype er påkrevd", + "roleEndRequired": "Sluttdato for rolle er påkrevd" } } diff --git a/frontend/public/locales/nn/common.json b/frontend/public/locales/nn/common.json index 8d8b58ee226828e33c77936761f5dba46a5b62be..2edf056986b8c3cc68a7a0b130c024196f8bdb57 100644 --- a/frontend/public/locales/nn/common.json +++ b/frontend/public/locales/nn/common.json @@ -18,7 +18,9 @@ "lastName": "Etternamn", "dateOfBirth": "Fødselsdato", "nationalIdNumber": "Fødselsnummer", - "roleType": "Rolle" + "roleType": "Gjesterolle", + "roleStartDate": "Frå", + "roleEndDate": "Til" }, "loading": "Lastar...", "termsHeader": "Vilkår", @@ -27,6 +29,7 @@ "lastNameRequired": "Etternamn er påkrevd", "invalidIdNumber": "Ugyldig fødselsnummer", "nationalIdNumberRequired": "Fødselsnummer er påkrevd", - "roleTypeRequired": "Rolletype er påkrevd" + "roleTypeRequired": "Rolletype er påkrevd", + "roleEndRequired": "Sluttdato for rolle er påkrevd" } } diff --git a/frontend/src/routes/register/index.tsx b/frontend/src/routes/register/index.tsx index fdb1e0d1a15b539d48f2b9c0a2261b985caa903a..dc5a9a005c300e072c94f084610721c0edcac839 100644 --- a/frontend/src/routes/register/index.tsx +++ b/frontend/src/routes/register/index.tsx @@ -17,7 +17,8 @@ type RegisterFormData = { date_of_birth: Date national_id_number: string role_type: string - role_start: Date + role_start?: Date + role_end: Date } export default function Register() { @@ -135,9 +136,9 @@ export default function Register() { 'validation.roleTypeRequired').toString(), }} render={({ field }) => ( - <Select - labelId='roletype-select-label' + <TextField id='roletype-select' + select defaultValue='' error={!!errors.role_type} label={t('input.roleType')} @@ -148,17 +149,15 @@ export default function Register() { field.onChange(value) }} > - <MenuItem value={undefined}>{undefined}</MenuItem> { roletypes.map((roletype) => ( <MenuItem value={roletype.identifier}>{roletype.name_nb}</MenuItem> )) } - </Select> + </TextField> ) } /> - <Button type='submit' data-testid='register-submit'