Skip to content
Snippets Groups Projects
Commit f7d4ceff authored by Marte Fossum's avatar Marte Fossum
Browse files

Merge branch 'confimationbox-change-period-role' into 'master'

Show confirmation or error box when changing role period

See merge request !372
parents 2d1aa961 deb69071
No related branches found
No related tags found
1 merge request!372Show confirmation or error box when changing role period
Pipeline #177726 passed
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
"consentInfoHead": "Consent information", "consentInfoHead": "Consent information",
"choiceDate": "Choice date", "choiceDate": "Choice date",
"consentName": "Consent type", "consentName": "Consent type",
"periodChanged": "Period changed",
"registeredInfo": "Registererd information on you", "registeredInfo": "Registererd information on you",
"registeredInfoExplanation": "Here is the contact information, roles and consent information that is registered on you.", "registeredInfoExplanation": "Here is the contact information, roles and consent information that is registered on you.",
"roleInfoHead": "Roles and periods", "roleInfoHead": "Roles and periods",
...@@ -196,6 +197,7 @@ ...@@ -196,6 +197,7 @@
}, },
"error": { "error": {
"error": "Error", "error": "Error",
"changePeriodFailed": "Failed to change period",
"invitationCreationFailedHeader": "Failed to create invite", "invitationCreationFailedHeader": "Failed to create invite",
"errorStatusCode": "Status code: {{statusCode}} (<3>{{statusText}}</3>)", "errorStatusCode": "Status code: {{statusCode}} (<3>{{statusText}}</3>)",
"genericServerErrorBody": "Message:<1>{{errorBodyText}}</1>", "genericServerErrorBody": "Message:<1>{{errorBodyText}}</1>",
......
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
"consentInfoHead": "Samtykkeinformasjon", "consentInfoHead": "Samtykkeinformasjon",
"choiceDate": "Valgdato", "choiceDate": "Valgdato",
"consentName": "Samtykketype", "consentName": "Samtykketype",
"periodChanged": "Rolleperiode endret",
"registeredInfo": "Registrert informasjon om deg", "registeredInfo": "Registrert informasjon om deg",
"registeredInfoExplanation": "Her er en oversikt over kontaktinformasjon, roller og samtykker som er registrert om deg.", "registeredInfoExplanation": "Her er en oversikt over kontaktinformasjon, roller og samtykker som er registrert om deg.",
"roleInfoHead": "Roller og perioder", "roleInfoHead": "Roller og perioder",
...@@ -196,6 +197,7 @@ ...@@ -196,6 +197,7 @@
}, },
"error": { "error": {
"error": "Feil", "error": "Feil",
"changePeriodFailed": "Kunne ikke endre periode",
"invitationCreationFailedHeader": "Kunne ikke opprette invitasjon", "invitationCreationFailedHeader": "Kunne ikke opprette invitasjon",
"errorStatusCode": "Statuskode: {{statusCode}} (<3>{{statusText}}</3>)", "errorStatusCode": "Statuskode: {{statusCode}} (<3>{{statusText}}</3>)",
"genericServerErrorBody": "Melding:<1>{{errorBodyText}}</1>", "genericServerErrorBody": "Melding:<1>{{errorBodyText}}</1>",
......
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
"consentInfoHead": "Samtykkeinformasjon", "consentInfoHead": "Samtykkeinformasjon",
"choiceDate": "Valdato", "choiceDate": "Valdato",
"consentName": "Samtykketype", "consentName": "Samtykketype",
"periodChanged": "Rolleperiode endra",
"registeredInfo": "Registrert informasjon om deg", "registeredInfo": "Registrert informasjon om deg",
"registeredInfoExplanation": "Her er ei oversikt over kontaktinformasjon, roller og samtykke som er registrert om deg.", "registeredInfoExplanation": "Her er ei oversikt over kontaktinformasjon, roller og samtykke som er registrert om deg.",
"roleInfoTableText": "Gjesteroller", "roleInfoTableText": "Gjesteroller",
...@@ -196,6 +197,7 @@ ...@@ -196,6 +197,7 @@
}, },
"error": { "error": {
"error": "Feil", "error": "Feil",
"changePeriodFailed": "Kunne ikkje endre periode",
"invitationCreationFailedHeader": "Kunne ikkje opprette invitasjon", "invitationCreationFailedHeader": "Kunne ikkje opprette invitasjon",
"errorStatusCode": "Statuskode: {{statusCode}} (<3>{{statusText}}</3>)", "errorStatusCode": "Statuskode: {{statusCode}} (<3>{{statusText}}</3>)",
"genericServerErrorBody": "Melding:<1>{{errorBodyText}}</1>", "genericServerErrorBody": "Melding:<1>{{errorBodyText}}</1>",
......
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import format from 'date-fns/format' import format from 'date-fns/format'
import { addDays } from 'date-fns/fp' import { addDays } from 'date-fns/fp'
import { Button, Table, TableBody, TextField, Typography } from '@mui/material' import {
Alert,
Button,
Table,
TableBody,
TextField,
Typography,
} from '@mui/material'
import TableHeadMui from '@mui/material/TableHead' import TableHeadMui from '@mui/material/TableHead'
import { styled } from '@mui/system' import { styled } from '@mui/system'
import TableContainerMui from '@mui/material/TableContainer' import TableContainerMui from '@mui/material/TableContainer'
...@@ -106,6 +113,9 @@ export default function GuestRoleInfo({ ...@@ -106,6 +113,9 @@ export default function GuestRoleInfo({
const [t] = useTranslation('common') const [t] = useTranslation('common')
const { displayContactAtUnit, displayComment } = useFeatureContext() const { displayContactAtUnit, displayComment } = useFeatureContext()
const navigate = useNavigate() const navigate = useNavigate()
const [showPeriodChange, setShowPeriodChange] = useState<Boolean>(false)
const [showPeriodChangeFailed, setShowPeriodChangeFailed] =
useState<Boolean>(false)
const [role, setRole] = useState<Role>({ const [role, setRole] = useState<Role>({
id: '', id: '',
name_nb: '', name_nb: '',
...@@ -168,6 +178,7 @@ export default function GuestRoleInfo({ ...@@ -168,6 +178,7 @@ export default function GuestRoleInfo({
}) })
.then((result) => { .then((result) => {
if (result !== null) { if (result !== null) {
setShowPeriodChange(true)
console.log('result', result) console.log('result', result)
} }
// Reload the guest so that the information on the overview page is updated // Reload the guest so that the information on the overview page is updated
...@@ -177,6 +188,7 @@ export default function GuestRoleInfo({ ...@@ -177,6 +188,7 @@ export default function GuestRoleInfo({
reset(data) reset(data)
}) })
.catch((error) => { .catch((error) => {
setShowPeriodChangeFailed(true)
console.log('error', error) console.log('error', error)
}) })
} }
...@@ -218,6 +230,16 @@ export default function GuestRoleInfo({ ...@@ -218,6 +230,16 @@ export default function GuestRoleInfo({
</Typography> </Typography>
</> </>
)} )}
{showPeriodChange && (
<Alert severity="success" sx={{ marginBottom: '1rem' }}>
{t('guestInfo.periodChanged')}
</Alert>
)}
{showPeriodChangeFailed && (
<Alert severity="error" sx={{ marginBottom: '1rem' }}>
{t('error.changePeriodFailed')}
</Alert>
)}
<form onSubmit={onSubmit}> <form onSubmit={onSubmit}>
<TableContainer> <TableContainer>
<Table sx={{ minWidth: 650 }} aria-label="simple table"> <Table sx={{ minWidth: 650 }} aria-label="simple table">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment