feat(j-s): Indictment overview for prison users

apps/judicial-system/api/src/app/modules/auth/auth.controller.ts

@@ -22,11 +22,13 @@ import {
   DEFENDER_CASES_ROUTE,
   EXPIRES_IN_MILLISECONDS,
   IDS_ID_TOKEN,
+  PRISON_CASES_ROUTE,
   USERS_ROUTE,
 } from '@island.is/judicial-system/consts'
 import {
   EventType,
   InstitutionType,
+  isPrisonSystemUser,
   UserRole,
 } from '@island.is/judicial-system/types'
 
@@ -241,6 +243,8 @@ export class AuthController {
             ? DEFENDER_CASES_ROUTE
             : user.institution?.type === InstitutionType.COURT_OF_APPEALS
             ? COURT_OF_APPEAL_CASES_ROUTE
+            : isPrisonSystemUser(user)
+            ? PRISON_CASES_ROUTE
             : CASES_ROUTE,
       }
     } else {

apps/judicial-system/backend/src/app/modules/case/case.service.ts

@@ -1485,6 +1485,16 @@ export class CaseService {
 
         return this.eventLogService.create(eventLogDTO, transaction)
       }
+
+      if (update.indictmentReviewDecision) {
+        const eventLogDTO = this.constructEventLogDTO(
+          EventType.INDICTMENT_REVIEWED,
+          theCase,
+          user,
+        )
+
+        return this.eventLogService.create(eventLogDTO, transaction)
+      }
     }
   }
 

apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts

@@ -105,6 +105,7 @@ export const attributes: (keyof Case)[] = [
   'indictmentHash',
   'courtSessionType',
   'indictmentReviewDecision',
+  'indictmentReviewerId',
 ]
 
 export interface LimitedAccessUpdateCase
@@ -164,6 +165,11 @@ export const include: Includeable[] = [
     as: 'appealJudge3',
     include: [{ model: Institution, as: 'institution' }],
   },
+  {
+    model: User,
+    as: 'indictmentReviewer',
+    include: [{ model: Institution, as: 'institution' }],
+  },
   { model: Case, as: 'parentCase', attributes },
   { model: Case, as: 'childCase', attributes },
   { model: Defendant, as: 'defendants' },

apps/judicial-system/web/pages/fangelsi/akaera/yfirlit/[id].ts

@@ -0,0 +1,3 @@
+import IndictmentOverview from '@island.is/judicial-system-web/src/routes/Prison/IndictmentOverview/IndictmentOverview'
+
+export default IndictmentOverview

apps/judicial-system/web/pages/fangelsi/krafa/yfirlit/[id].ts

@@ -0,0 +1,3 @@
+import { SignedVerdictOverview } from '@island.is/judicial-system-web/src/routes/Shared/SignedVerdictOverview/SignedVerdictOverview'
+
+export default SignedVerdictOverview

apps/judicial-system/web/pages/fangelsi/krofur.ts

@@ -0,0 +1,3 @@
+import PrisonCases from '@island.is/judicial-system-web/src/routes/Shared/Cases/PrisonCases'
+
+export default PrisonCases

apps/judicial-system/web/src/components/FormFooter/FormFooter.tsx

@@ -36,7 +36,7 @@ interface Props {
   infoBoxText?: string
 }
 
-const FormFooter: FC<React.PropsWithChildren<Props>> = ({
+const FormFooter: FC<Props> = ({
   previousUrl,
   previousIsDisabled,
   previousButtonText,

apps/judicial-system/web/src/components/FormProvider/limitedAccessCase.graphql

@@ -146,6 +146,17 @@ query LimitedAccessCase($input: CaseQueryInput!) {
     postponedIndefinitelyExplanation
     indictmentDecision
     indictmentRulingDecision
+    indictmentCompletedDate
+    indictmentReviewDecision
+    indictmentReviewer {
+      id
+      name
+    }
     courtSessionType
+    eventLogs {
+      id
+      created
+      eventType
+    }
   }
 }

apps/judicial-system/web/src/components/Header/Header.tsx

@@ -31,6 +31,7 @@ import {
   isAdminUser,
   isCourtOfAppealsUser,
   isDefenceUser,
+  isPrisonSystemUser,
 } from '@island.is/judicial-system/types'
 import { api } from '@island.is/judicial-system-web/src/services'
 
@@ -96,6 +97,8 @@ const HeaderContainer = () => {
       ? constants.USERS_ROUTE
       : isCourtOfAppealsUser(user)
       ? constants.COURT_OF_APPEAL_CASES_ROUTE
+      : isPrisonSystemUser(user)
+      ? constants.PRISON_CASES_ROUTE
       : constants.CASES_ROUTE
 
   const handleLogout = () => {

apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.strings.ts

@@ -23,6 +23,11 @@ export const strings = defineMessages({
     defaultMessage: 'Verjandi',
     description: 'Notað til að birta titil á verjanda í ákæru.',
   },
+  verdictDisplayedDate: {
+    id: 'judicial.system.core:info_card.defendant_info.verdict_displayed_date',
+    defaultMessage: 'Dómur birtur {date}',
+    description: 'Notað til að birta dagsetningu þegar dómur var birtur.',
+  },
   noDefenderAssigned: {
     id: 'judicial.system.core:info_card.defendant_info.no_defender_assigned',
     defaultMessage: 'Ekki skráður',

apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.tsx

@@ -27,14 +27,17 @@ interface DefendantInfoProps {
   displayDefenderInfo: boolean
   displayAppealExpirationInfo?: boolean
   defendantInfoActionButton?: DefendantInfoActionButton
+  displayVerdictViewDate?: boolean
 }
 
-export const DefendantInfo: FC<DefendantInfoProps> = ({
-  defendant,
-  displayDefenderInfo,
-  displayAppealExpirationInfo,
-  defendantInfoActionButton,
-}) => {
+export const DefendantInfo: FC<DefendantInfoProps> = (props) => {
+  const {
+    defendant,
+    displayDefenderInfo,
+    displayAppealExpirationInfo,
+    defendantInfoActionButton,
+    displayVerdictViewDate,
+  } = props
   const { formatMessage } = useIntl()
 
   const getAppealExpirationInfo = (viewDate?: string) => {
@@ -76,15 +79,13 @@ export const DefendantInfo: FC<DefendantInfoProps> = ({
             {defendant.address && `, ${defendant.address}`}
           </Text>
         </span>
-
         {displayAppealExpirationInfo && (
           <Box>
             <Text as="span">
               {getAppealExpirationInfo(defendant.verdictViewDate ?? '')}
             </Text>
           </Box>
         )}
-
         {displayDefenderInfo && (
           <Box display="flex" key={defendant.defenderName} role="paragraph">
             <Text as="span">{`${formatMessage(strings.defender)}: ${
@@ -106,8 +107,14 @@ export const DefendantInfo: FC<DefendantInfoProps> = ({
             )}
           </Box>
         )}
+        {displayVerdictViewDate && (
+          <Text>
+            {formatMessage(strings.verdictDisplayedDate, {
+              date: formatDate(defendant.verdictViewDate, 'PPP'),
+            })}
+          </Text>
+        )}
       </div>
-
       {defendantInfoActionButton && (
         <Box>
           <Button

apps/judicial-system/web/src/components/InfoCard/InfoCard.tsx

@@ -39,6 +39,7 @@ interface Props {
     items: Defendant[]
     defendantInfoActionButton?: DefendantInfoActionButton
     displayAppealExpirationInfo?: boolean
+    displayVerdictViewDate?: boolean
   }
   defenders?: Defender[]
   icon?: IconMapIcon
@@ -130,6 +131,7 @@ const InfoCard: FC<Props> = (props) => {
                   defendantInfoActionButton={
                     defendants.defendantInfoActionButton
                   }
+                  displayVerdictViewDate={defendants.displayVerdictViewDate}
                 />
               ))}
             </Box>

apps/judicial-system/web/src/components/InfoCard/InfoCardClosedIndictment/InfoCardClosedIndictment.spec.ts

@@ -44,7 +44,7 @@ describe('getAdditionalDataSections', () => {
       {
         data: [
           { title: 'Yfirlestur', value: 'John Doe' },
-          { title: 'Ákvörðun', value: 'Una' },
+          { title: 'Ákvörðun', value: 'Una dómi' },
         ],
       },
     ])

apps/judicial-system/web/src/components/InfoCard/InfoCardClosedIndictment/InfoCardClosedIndictment.tsx

@@ -4,6 +4,7 @@ import { IntlFormatters, useIntl } from 'react-intl'
 import { Text } from '@island.is/island-ui/core'
 import {
   capitalize,
+  formatDate,
   readableIndictmentSubtypes,
 } from '@island.is/judicial-system/formatters'
 import { core } from '@island.is/judicial-system-web/messages'
@@ -17,12 +18,15 @@ import { strings } from '../InfoCardIndictment.strings'
 export interface Props {
   defendantInfoActionButton?: DefendantInfoActionButton
   displayAppealExpirationInfo?: boolean
+  displayVerdictViewDate?: boolean
+  indictmentReviewedDate?: string | null
 }
 
 export const getAdditionalDataSections = (
   formatMessage: IntlFormatters['formatMessage'],
   reviewerName?: string | null,
   reviewDecision?: IndictmentCaseReviewDecision | null,
+  indictmendReviewedDate?: string | null,
 ): DataSection[] => [
   ...(reviewerName
     ? [
@@ -43,6 +47,14 @@ export const getAdditionalDataSections = (
                   },
                 ]
               : []),
+            ...(indictmendReviewedDate
+              ? [
+                  {
+                    title: formatMessage(strings.indictmentReviewedDateTitle),
+                    value: formatDate(indictmendReviewedDate, 'PPP'),
+                  },
+                ]
+              : []),
           ],
         },
       ]
@@ -53,7 +65,12 @@ const InfoCardClosedIndictment: FC<Props> = (props) => {
   const { workingCase } = useContext(FormContext)
   const { formatMessage } = useIntl()
 
-  const { defendantInfoActionButton, displayAppealExpirationInfo } = props
+  const {
+    defendantInfoActionButton,
+    displayAppealExpirationInfo,
+    displayVerdictViewDate,
+    indictmentReviewedDate,
+  } = props
 
   return (
     <InfoCard
@@ -117,13 +134,15 @@ const InfoCardClosedIndictment: FC<Props> = (props) => {
               items: workingCase.defendants,
               defendantInfoActionButton: defendantInfoActionButton,
               displayAppealExpirationInfo,
+              displayVerdictViewDate,
             }
           : undefined
       }
       additionalDataSections={getAdditionalDataSections(
         formatMessage,
         workingCase.indictmentReviewer?.name,
         workingCase.indictmentReviewDecision,
+        indictmentReviewedDate,
       )}
     />
   )

apps/judicial-system/web/src/components/InfoCard/InfoCardIndictment.strings.ts

@@ -38,14 +38,19 @@ export const strings = defineMessages({
     description: 'Notaður sem titill á "dómfelldu" hluta af yfirliti ákæru.',
   },
   reviewTagAppealed: {
-    id: 'judicial.system.core:info_card_indictment.review_tag_appealed',
-    defaultMessage: 'Áfrýjun',
+    id: 'judicial.system.core:info_card_indictment.review_tag_appealed_v1',
+    defaultMessage: 'Áfrýja dómi',
     description:
       'Notað sem texti á tagg fyrir "Áfrýjun" tillögu í yfirliti ákæru.',
   },
   reviewTagAccepted: {
-    id: 'judicial.system.core:info_card_indictment.review_tag_completed',
-    defaultMessage: 'Una',
+    id: 'judicial.system.core:info_card_indictment.review_tag_completed_v1',
+    defaultMessage: 'Una dómi',
     description: 'Notað sem texti á tagg fyrir "Una" tillögu í yfirliti ákæru.',
   },
+  indictmentReviewedDateTitle: {
+    id: 'judicial.system.core:info_card_indictment.indictment_reviewed_date_title',
+    defaultMessage: 'Dagsetning áritunar',
+    description: 'Notaður sem titill á "Dagsetning" hluta af yfirliti ákæru.',
+  },
 })

apps/judicial-system/web/src/routes/Prison/IndictmentOverview/IndictmentOverview.strings.ts

@@ -0,0 +1,29 @@
+import { defineMessages } from 'react-intl'
+
+export const strings = defineMessages({
+  htmlTitle: {
+    id: 'judicial.system.core:indictment_overview.html_title',
+    defaultMessage: 'Yfirlit ákæru - Réttarvörslugátt',
+    description: 'Titill á yfirliti ákæru',
+  },
+  title: {
+    id: 'judicial.system.core:indictment_overview.title',
+    defaultMessage: 'Dómur til fullnustu',
+    description: 'Notaður sem titill á yfirliti ákæru fyrir fangelsi',
+  },
+  indictmentCompletedTitle: {
+    id: 'judicial.system.core:indictment_overview.indictment_completed_title',
+    defaultMessage: 'Dómsuppkvaðning {date}',
+    description: 'Titill á yfirliti ákæru fyrir fangelsi',
+  },
+  infoCardDefendantsTitle: {
+    id: 'judicial.system.core:indictment_overview.info_card_defendants_title',
+    defaultMessage: 'Dómfelld{count, plural, one {i} other {u}}',
+    description: 'Titill á upplýsingakorti um dómfelldu',
+  },
+  verdictTitle: {
+    id: 'judicial.system.core:indictment_overview.verdict_title',
+    defaultMessage: 'Dómur',
+    description: 'Titill á Dómur hluta',
+  },
+})