diff --git a/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts b/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts index 691c040563a7..9a32bcb1af97 100644 --- a/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts +++ b/apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts @@ -217,6 +217,7 @@ export const include: Includeable[] = [ required: false, where: { commentType: { [Op.in]: commentTypes } }, }, + { model: Case, as: 'mergeCase', attributes }, ] export const order: OrderItem[] = [ diff --git a/apps/judicial-system/web/src/components/FormProvider/limitedAccessCase.graphql b/apps/judicial-system/web/src/components/FormProvider/limitedAccessCase.graphql index bf9cadbb55d0..594219f55ff9 100644 --- a/apps/judicial-system/web/src/components/FormProvider/limitedAccessCase.graphql +++ b/apps/judicial-system/web/src/components/FormProvider/limitedAccessCase.graphql @@ -161,5 +161,9 @@ query LimitedAccessCase($input: CaseQueryInput!) { created eventType } + mergeCase { + id + courtCaseNumber + } } } diff --git a/apps/judicial-system/web/src/components/TagCaseState/TagCaseState.strings.ts b/apps/judicial-system/web/src/components/TagCaseState/TagCaseState.strings.ts index 2fa55f78dae0..e79ae0ef00fa 100644 --- a/apps/judicial-system/web/src/components/TagCaseState/TagCaseState.strings.ts +++ b/apps/judicial-system/web/src/components/TagCaseState/TagCaseState.strings.ts @@ -73,9 +73,9 @@ export const strings = defineMessages({ description: 'Notað sem merki þegar mál í stöðu "Dómtekið" í málalista', }, completed: { - id: 'judicial.system.core:tag_case_state.completed', + id: 'judicial.system.core:tag_case_state.completed_v2', defaultMessage: - '{indictmentRulingDecision, select, RULING {Dómur} FINE {Viðurlagaákvörðun} DISMISSAL {Frávísun} CANCELLATION {Niðurfelling} other {Lokið}}', + '{indictmentRulingDecision, select, RULING {Dómur} FINE {Viðurlagaákvörðun} DISMISSAL {Frávísun} CANCELLATION {Niðurfelling} MERGE {Sameinað} other {Lokið}}', description: 'Notað sem merki þegar mál í stöðu "Dómþulur" í málalista', }, recalled: { diff --git a/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.tsx b/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.tsx index 7151e95d1b3a..cb2da97042f7 100644 --- a/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.tsx +++ b/apps/judicial-system/web/src/routes/Shared/IndictmentOverview/IndictmentOverview.tsx @@ -26,6 +26,7 @@ import { UserContext, } from '@island.is/judicial-system-web/src/components' import { + CaseIndictmentRulingDecision, CaseState, IndictmentDecision, UserRole, @@ -110,8 +111,10 @@ const IndictmentOverview: FC = () => { {caseIsClosed ? ( ) : (