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.

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): Completed indictment overview #14780

Merged
merged 68 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
ba134ee
Implement frontend
oddsson May 2, 2024
12400df
Checkpoint
oddsson May 3, 2024
eec7642
Merge branch 'main' of github.com:island-is/island.is into j-s/comple…
oddsson May 3, 2024
8b2226f
Checkpoint
oddsson May 3, 2024
ba19b8e
Merge branch 'main' of github.com:island-is/island.is into j-s/comple…
oddsson May 3, 2024
32bfca5
Checkpoint
oddsson May 3, 2024
08080bc
Cleanup
oddsson May 3, 2024
813277b
Update apps/judicial-system/backend/src/app/modules/case/models/case.…
oddsson May 3, 2024
09362c8
Merge branch 'main' of github.com:island-is/island.is into j-s/comple…
oddsson May 6, 2024
93047a9
Merge branch 'j-s/complete-decision' of github.com:island-is/island.i…
oddsson May 6, 2024
1cdf51b
Merge branch 'main' of github.com:island-is/island.is into j-s/comple…
oddsson May 6, 2024
ec10f4a
Make CourtArrangements more generic
oddsson May 6, 2024
23a96cf
Merge branch 'main' of github.com:island-is/island.is into j-s/comple…
oddsson May 6, 2024
c5a4375
Checkpoint
oddsson May 6, 2024
66c4192
Add CaseFiles to summary screen
oddsson May 6, 2024
2432d74
Merge branch 'main' of github.com:island-is/island.is into j-s/comple…
oddsson May 6, 2024
c87ebbc
Checkpoint
oddsson May 6, 2024
83a5b96
Merge branch 'main' of github.com:island-is/island.is into j-s/comple…
oddsson May 6, 2024
fa76ee5
Merge branch 'j-s/complete-decision' of github.com:island-is/island.i…
oddsson May 6, 2024
45dd9c4
Merge branch 'main' of github.com:island-is/island.is into j-s/comple…
oddsson May 7, 2024
654dff9
Remove ruling decision from caseList
oddsson May 7, 2024
c65ca5c
Refactor
oddsson May 7, 2024
eed4883
Merge branch 'main' of github.com:island-is/island.is into j-s/comple…
oddsson May 7, 2024
968a1f1
Fixes auto dates in db
gudjong May 8, 2024
d683481
Merge branch 'main' of github.com:island-is/island.is into j-s/comple…
oddsson May 8, 2024
97e5592
Merge branch 'j-s/fix-auto-dates' of github.com:island-is/island.is i…
oddsson May 8, 2024
f402b2d
Error handling
oddsson May 8, 2024
d35c9e9
Merge branch 'main' into j-s/complete-decision
kodiakhq[bot] May 8, 2024
1b24468
Merge branch 'j-s/complete-decision' of github.com:island-is/island.i…
oddsson May 8, 2024
e724281
Rewrites case transitions
gudjong May 8, 2024
ad6afb2
Merge branch 'main' into j-s/transition-split
kodiakhq[bot] May 10, 2024
3a6c2e5
Merge branch 'main' of github.com:island-is/island.is into j-s/comple…
oddsson May 10, 2024
bf19aa7
Merge branch 'j-s/transition-split' of github.com:island-is/island.is…
oddsson May 10, 2024
9371259
Add ruling case file to summary page
oddsson May 10, 2024
7baf7be
Merge branch 'main' of github.com:island-is/island.is into j-s/comple…
oddsson May 10, 2024
16b705a
Add modal to summary page and transition case
oddsson May 10, 2024
124890a
Destroy everything regarding postponment when completing cases
oddsson May 10, 2024
b0ce4d1
Merge branch 'main' of github.com:island-is/island.is into j-s/comple…
oddsson May 10, 2024
c15969a
Use Table component for appealed cases
oddsson May 10, 2024
d35ea0a
Merge branch 'main' of github.com:island-is/island.is into j-s/comple…
oddsson May 10, 2024
24010f6
Merge
oddsson May 10, 2024
98afb4e
Added a Completed screen
oddsson May 10, 2024
ff89fb0
Merge branch 'main' of github.com:island-is/island.is into j-s/ind-ov…
oddsson May 10, 2024
bc73de1
Merge branch 'main' of github.com:island-is/island.is into j-s/ind-ov…
oddsson May 13, 2024
5153868
Routing
oddsson May 13, 2024
f16f457
Add CaseFileCategory CRIMINAL_RECORD_UPDATE
oddsson May 13, 2024
16a813d
Remove upload to court functionality
oddsson May 13, 2024
26cc3f9
Checkpoint
oddsson May 13, 2024
b803145
Merge branch 'main' of github.com:island-is/island.is into j-s/ind-ov…
oddsson May 13, 2024
b92b06b
Add CRIMINAL_RECORD_UPDATE file upload
oddsson May 13, 2024
159fed0
Merge branch 'main' of github.com:island-is/island.is into j-s/ind-ov…
oddsson May 13, 2024
c8d3dd4
Fix validation
oddsson May 13, 2024
1ff2291
Add title
oddsson May 13, 2024
1e8c17e
Merge branch 'main' of github.com:island-is/island.is into j-s/ind-ov…
oddsson May 14, 2024
8c796b8
Cleanup
oddsson May 14, 2024
9aa1920
Revert change
oddsson May 14, 2024
8a55f45
Revert change
oddsson May 14, 2024
2db796f
Revert change
oddsson May 14, 2024
190e4c2
Revert change
oddsson May 14, 2024
34f6efb
Revert change
oddsson May 14, 2024
34bf969
Revert change
oddsson May 14, 2024
2771da4
Cleanup
oddsson May 14, 2024
8b2a086
Cleanup
oddsson May 14, 2024
0a22587
Cleanup
oddsson May 14, 2024
c2bc010
Merge branch 'main' of github.com:island-is/island.is into j-s/ind-ov…
oddsson May 14, 2024
6ded74a
Merge branch 'main' into j-s/ind-overview
kodiakhq[bot] May 14, 2024
b554612
fix: force generate file
lodmfjord May 15, 2024
0677acb
Merge branch 'main' into j-s/ind-overview
kodiakhq[bot] May 15, 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
'use strict'

const replaceEnum = require('sequelize-replace-enum-postgres').default

module.exports = {
async up(queryInterface) {
return replaceEnum({
queryInterface,
tableName: 'case_file',
columnName: 'category',
newValues: [
'COURT_RECORD',
'RULING',
'COVER_LETTER',
'INDICTMENT',
'CRIMINAL_RECORD',
'COST_BREAKDOWN',
'CASE_FILE',
'PROSECUTOR_APPEAL_BRIEF',
'DEFENDANT_APPEAL_BRIEF',
'PROSECUTOR_APPEAL_BRIEF_CASE_FILE',
'DEFENDANT_APPEAL_BRIEF_CASE_FILE',
'PROSECUTOR_APPEAL_STATEMENT',
'DEFENDANT_APPEAL_STATEMENT',
'PROSECUTOR_APPEAL_STATEMENT_CASE_FILE',
'DEFENDANT_APPEAL_STATEMENT_CASE_FILE',
'PROSECUTOR_APPEAL_CASE_FILE',
'DEFENDANT_APPEAL_CASE_FILE',
'APPEAL_COURT_RECORD',
'APPEAL_RULING',
'CRIMINAL_RECORD_UPDATE', // new value
],
})
},

async down(queryInterface) {
return replaceEnum({
queryInterface,
tableName: 'case_file',
columnName: 'category',
newValues: [
'COURT_RECORD',
'RULING',
'COVER_LETTER',
'INDICTMENT',
'CRIMINAL_RECORD',
'COST_BREAKDOWN',
'CASE_FILE',
'PROSECUTOR_APPEAL_BRIEF',
'DEFENDANT_APPEAL_BRIEF',
'PROSECUTOR_APPEAL_BRIEF_CASE_FILE',
'DEFENDANT_APPEAL_BRIEF_CASE_FILE',
'PROSECUTOR_APPEAL_STATEMENT',
'DEFENDANT_APPEAL_STATEMENT',
'PROSECUTOR_APPEAL_STATEMENT_CASE_FILE',
'DEFENDANT_APPEAL_STATEMENT_CASE_FILE',
'PROSECUTOR_APPEAL_CASE_FILE',
'DEFENDANT_APPEAL_CASE_FILE',
'APPEAL_COURT_RECORD',
'APPEAL_RULING',
],
})
},
}
6 changes: 6 additions & 0 deletions apps/judicial-system/web/messages/Core/titles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,12 @@ export const titles = {
description:
'Notaður sem titill fyrir Niðurstaða úrskurðar skjá hjá dómstólum í ákærum',
},
completed: {
id: 'judicial.system.core:titles.court.indictments.completed',
defaultMessage: 'Máli lokið - Réttarvörslugátt',
description:
'Notaður sem titill fyrir Máli lokið skjá hjá dómstólum í ákærum',
},
}),
},
defender: {
Expand Down
3 changes: 3 additions & 0 deletions apps/judicial-system/web/pages/domur/akaera/lokid/[id].ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Completed from '@island.is/judicial-system-web/src/routes/Court/Indictments/Completed/Completed'

export default Completed
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@
const criminalRecords = cf?.filter(
(file) => file.category === CaseFileCategory.CRIMINAL_RECORD,
)
const criminalRecordUpdates = cf?.filter(

Check warning on line 82 in apps/judicial-system/web/src/components/IndictmentCaseFilesList/IndictmentCaseFilesList.tsx

View workflow job for this annotation

GitHub Actions / linting (judicial-system-web,judicial-system-xrd-api)

'criminalRecordUpdates' is assigned a value but never used. Allowed unused vars must match /^_[a-zA-Z0-9]*$/u
(file) => file.category === CaseFileCategory.CRIMINAL_RECORD_UPDATE,
)
const costBreakdowns = cf?.filter(
(file) => file.category === CaseFileCategory.COST_BREAKDOWN,
)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import { defineMessages } from 'react-intl'

const strings = defineMessages({
heading: {
id: 'judicial.system.court.indictments.completed.heading',
defaultMessage: 'Máli lokið',
description: 'Titill á Máli lokið síðu',
},
sendToPublicProsecutor: {
id: 'judicial.system.core:indictments.completed.send_to_public_prosecutor',
defaultMessage: 'Senda til ákæruvalds',
description:
'Notaður sem texti á takka til að senda mál til ríkissaksóknara.',
},
criminalRecordUpdateTitle: {
id: 'judicial.system.core:indictments.completed.criminal_record_update_title',
defaultMessage: 'Tilkynning til sakaskrár',
description:
'Notaður sem titill á Tilkynning til sakaskrár hluta á máli lokið skjá.',
},
serviceRequirementTitle: {
id: 'judicial.system.core:indictments.completed.service_requirement_title',
defaultMessage: 'Ákvörðun um birtingu dóms',
description:
'Notaður sem titill á Ákvörðun um birtingu dóms hluta á máli lokið skjá.',
},
serviceRequirementRequired: {
id: 'judicial.system.core:indictments.completed.service_requirement_required',
defaultMessage: 'Birta skal dómfellda dóminn',
description:
'Notaður sem texti í valmöguleika fyrir það þegar birta skal dómdfellda dóminn.',
},
serviceRequirementNotRequired: {
id: 'judicial.system.core:indictments.completed.service_requirement_not_required',
defaultMessage: 'Birting dóms ekki þörf',
description:
'Notaður sem texti í valmöguleika fyrir það þegar ekki skal birta dómdfellda dóminn.',
},
serviceRequirementNotApplicable: {
id: 'judicial.system.core:indictments.completed.service_requirement_not_applicable',
defaultMessage: 'Dómfelldi var viðstaddur dómsuppkvaðningu',
description:
'Notaður sem texti í valmöguleika fyrir það þegar birting dóms á ekki við.',
},
sentToPublicProsecutorModalTitle: {
id: 'judicial.system.core:indictments.completed.sent_to_public_prosecutor_modal_title',
defaultMessage: 'Mál sent til Ríkissaksóknara',
description:
'Notaður sem titill á staðfestingarmeldingu um að mál hafi verið sent til ákæruvalds.',
},
sentToPublicProsecutorModalMessage: {
id: 'judicial.system.core:indictments.completed.sent_to_public_prosecutor_modal_message',
defaultMessage: 'Gögn hafa verið send til Ríkissaksóknara til yfirlesturs.',
description:
'Notaður sem skilaboð í staðfestingarmeldingu um að mál hafi verið sent til ákæruvalds.',
},
})

export default strings
Loading
Loading