Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(j-s): Indictment decision tag on summary page #15378

Merged
merged 5 commits into from
Jul 1, 2024
Merged

feat(j-s): Indictment decision tag on summary page #15378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb378b3
feat(j-s): Indictment ruling decision tag on Summary page
unakb Jun 27, 2024
ea79fe4
Update Summary.tsx
unakb Jun 27, 2024
6653899
Merge branch 'main' into j-s/tag-indictment
unakb Jun 27, 2024
dc9c15f
Move ruling decision down
unakb Jul 1, 2024
7002687
Merge branch 'main' into j-s/tag-indictment
kodiakhq[bot] Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions apps/judicial-system/web/src/routes/Court/Indictments/Summary/Summary.strings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,10 @@ export const strings = defineMessages({
defaultMessage: 'Gögn hafa verið send ákæranda og verjanda.',
description: 'Notaður sem texti í staðfestingarglugga um að mál sé lokið.',
},
indictmentRulingDecisionTagText: {
id: 'judicial.system.core:indictments.summary.indictment_ruling_decision_tag_text',
defaultMessage:
'{indictmentRulingDecision, select, RULING {Dómur} FINE {Viðurlagaákvörðun} DISMISSAL {Frávísun} CANCELLATION {Niðurfelling} other {Lokið}}',
description: 'Notaður sem texti í TagCaseState til að birta úrskurð ákæru.',
},
})
41 changes: 39 additions & 2 deletions apps/judicial-system/web/src/routes/Court/Indictments/Summary/Summary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { FC, useContext, useState } from 'react'
import { useIntl } from 'react-intl'
import router from 'next/router'

import { Box, Text } from '@island.is/island-ui/core'
import { Box, Tag, TagVariant, Text } from '@island.is/island-ui/core'
import * as constants from '@island.is/judicial-system/consts'
import { core } from '@island.is/judicial-system-web/messages'
import {
Expand Down Expand Up @@ -83,6 +83,22 @@ const Summary: FC = () => {
[[] as CaseFile[], [] as CaseFile[]],
)

const getRulingDecisionTagColor = (
unakb marked this conversation as resolved.
Show resolved Hide resolved
indictmentRulingDecision: CaseIndictmentRulingDecision,
): TagVariant => {
switch (indictmentRulingDecision) {
case CaseIndictmentRulingDecision.FINE:
return 'mint'
case CaseIndictmentRulingDecision.CANCELLATION:
return 'rose'
case CaseIndictmentRulingDecision.DISMISSAL:
return 'blue'
case CaseIndictmentRulingDecision.RULING:
default:
return 'darkerBlue'
}
}
unakb marked this conversation as resolved.
Show resolved Hide resolved

return (
<PageLayout
workingCase={workingCase}
Expand All @@ -91,8 +107,29 @@ const Summary: FC = () => {
onNavigationTo={handleNavigationTo}
>
<PageHeader title={formatMessage(strings.htmlTitle)} />

<FormContentContainer>
<PageTitle>{formatMessage(strings.title)}</PageTitle>
<Box display="flex" justifyContent="spaceBetween">
<PageTitle>{formatMessage(strings.title)}</PageTitle>

{workingCase.indictmentRulingDecision && (
<Box marginTop={2}>
<Tag
variant={getRulingDecisionTagColor(
workingCase.indictmentRulingDecision,
)}
outlined
disabled
truncate
>
{formatMessage(strings.indictmentRulingDecisionTagText, {
indictmentRulingDecision:
workingCase.indictmentRulingDecision,
})}
</Tag>
</Box>
)}
</Box>
<Box component="section" marginBottom={1}>
<Text variant="h2" as="h2">
{formatMessage(core.caseNumber, {
Expand Down
Loading